tox.ini: make "tox -e py37" etc work

pytest-dev · Aug 22, 2019 · 2ef0090 · 2ef0090
1 parent a1c6c35
commit 2ef0090
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 18 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -17,21 +17,21 @@ jobs:
     - python: '3.6'
       env: TOXENV=docs
     - python: '2.7'
-      env: TOXENV=py27-pytestrelease-coverage
+      env: TOXENV=py27-coverage
     - python: '3.4'
-      env: TOXENV=py34-pytestrelease-coverage
+      env: TOXENV=py34-coverage
     - python: '3.5'
-      env: TOXENV=py35-pytestrelease-coverage
+      env: TOXENV=py35-coverage
     - python: '3.6'
-      env: TOXENV=py36-pytestrelease-coverage
+      env: TOXENV=py36-coverage
     - python: 'pypy2.7-6.0'
-      env: TOXENV=pypy-pytestrelease-coverage
+      env: TOXENV=pypy-coverage
     - python: 'pypy3.5-6.0'
-      env: TOXENV=pypy3-pytestrelease-coverage
+      env: TOXENV=pypy3-coverage
     - python: '3.7'
-      env: TOXENV=py37-pytestrelease-coverage
+      env: TOXENV=py37-coverage
     - python: '3.8-dev'
-      env: TOXENV=py38-pytestrelease-coverage
+      env: TOXENV=py38-coverage
     - python: '3.6'
       env: TOXENV=py36-pytestmaster-coverage
     - python: '3.6'

diff --git a/appveyor.yml b/appveyor.yml
@@ -3,12 +3,12 @@ environment:
   # note: please use "tox --listenvs" to populate the build matrix below
   - TOXENV: "linting"
   - TOXENV: "docs"
-  - TOXENV: "py27-pytestrelease"
-  - TOXENV: "py34-pytestrelease"
-  - TOXENV: "py35-pytestrelease"
-  - TOXENV: "py36-pytestrelease"
-  - TOXENV: "py37-pytestrelease"
-  - TOXENV: "pypy-pytestrelease"
+  - TOXENV: "py27"
+  - TOXENV: "py34"
+  - TOXENV: "py35"
+  - TOXENV: "py36"
+  - TOXENV: "py37"
+  - TOXENV: "pypy"
   - TOXENV: "py36-pytestmaster"
   - TOXENV: "py36-pytestfeatures"
 

diff --git a/tox.ini b/tox.ini
@@ -1,5 +1,5 @@
 [tox]
-envlist=linting,docs,py{27,34,35,36,37,38,py,py3}-pytestrelease,py{36,37}-pytest{master,features}
+envlist=linting,docs,py{27,34,35,36,37,38,py,py3},py{36,37}-pytest{master,features}
 
 [testenv]
 commands=
@@ -9,11 +9,11 @@ commands=
 setenv=
   _PYTEST_SETUP_SKIP_PLUGGY_DEP=1
   coverage: _PLUGGY_TOX_CMD=coverage run -m pytest
+  pytestmaster: _PYTEST_DEP=git+https://github.com/pytest-dev/pytest.git@master
+  pytestfeatures: _PYTEST_DEP=git+https://github.com/pytest-dev/pytest.git@features
 deps=
-  pytestrelease: pytest
-  pytestmaster: git+https://github.com/pytest-dev/pytest.git@master
-  pytestfeatures: git+https://github.com/pytest-dev/pytest.git@features
   coverage: coverage
+  {env:_PYTEST_DEP:pytest}
 
 [testenv:benchmark]
 commands=pytest {posargs:testing/benchmark.py}