Merge pull request #2799 from blueyed/cleanup-tox.ini
minor: cleanup tox.ini
This commit is contained in:
commit
c0c859ce99
5
tox.ini
5
tox.ini
|
@ -28,7 +28,6 @@ deps =
|
||||||
requests
|
requests
|
||||||
|
|
||||||
[testenv:py26]
|
[testenv:py26]
|
||||||
commands = pytest --lsof -ra {posargs:testing}
|
|
||||||
# pinning mock to last supported version for python 2.6
|
# pinning mock to last supported version for python 2.6
|
||||||
deps =
|
deps =
|
||||||
hypothesis<3.0
|
hypothesis<3.0
|
||||||
|
@ -117,8 +116,6 @@ commands=
|
||||||
pytest -ra {posargs:testing/python/approx.py}
|
pytest -ra {posargs:testing/python/approx.py}
|
||||||
|
|
||||||
[testenv:py27-pluggymaster]
|
[testenv:py27-pluggymaster]
|
||||||
passenv={[testenv]passenv}
|
|
||||||
commands={[testenv]commands}
|
|
||||||
setenv=
|
setenv=
|
||||||
_PYTEST_SETUP_SKIP_PLUGGY_DEP=1
|
_PYTEST_SETUP_SKIP_PLUGGY_DEP=1
|
||||||
deps =
|
deps =
|
||||||
|
@ -126,8 +123,6 @@ deps =
|
||||||
git+https://github.com/pytest-dev/pluggy.git@master
|
git+https://github.com/pytest-dev/pluggy.git@master
|
||||||
|
|
||||||
[testenv:py35-pluggymaster]
|
[testenv:py35-pluggymaster]
|
||||||
passenv={[testenv:py27-pluggymaster]passenv}
|
|
||||||
commands={[testenv:py27-pluggymaster]commands}
|
|
||||||
setenv=
|
setenv=
|
||||||
_PYTEST_SETUP_SKIP_PLUGGY_DEP=1
|
_PYTEST_SETUP_SKIP_PLUGGY_DEP=1
|
||||||
deps =
|
deps =
|
||||||
|
|
Loading…
Reference in New Issue