aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.travis.yml2
-rw-r--r--tox.ini12
2 files changed, 4 insertions, 10 deletions
diff --git a/.travis.yml b/.travis.yml
index bf1f01e6..5c0aa194 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -94,7 +94,7 @@ matrix:
env: TOXENV=py37 DOCKER=pyca/cryptography-runner-ubuntu-rolling
- python: 2.7
services: docker
- env: TOXENV=randomorder DOCKER=pyca/cryptography-runner-ubuntu-rolling
+ env: TOXENV=py27-randomorder DOCKER=pyca/cryptography-runner-ubuntu-rolling
- python: 2.7
services: docker
env: TOXENV=py27 DOCKER=pyca/cryptography-runner-fedora
diff --git a/tox.ini b/tox.ini
index f242779c..b64f85bb 100644
--- a/tox.ini
+++ b/tox.ini
@@ -4,8 +4,9 @@ envlist = py27,pypy,py34,py35,py36,py37,docs,pep8,packaging
[testenv]
extras =
- test
- idna: idna
+ test
+ idna: idna
+ randomorder: pytest-random
deps =
# This must be kept in sync with .travis/install.sh and azure-pipelines.yml
coverage
@@ -64,13 +65,6 @@ extras =
commands =
flake8 .
-[testenv:randomorder]
-deps =
- {[testenv]deps}
- pytest-randomly
-commands =
- pytest --capture=no --strict {posargs}
-
[testenv:packaging]
deps =
check-manifest