Skip to content

Commit

Permalink
Merge pull request pytest-dev#2799 from blueyed/cleanup-tox.ini
Browse files Browse the repository at this point in the history
minor: cleanup tox.ini
  • Loading branch information
nicoddemus authored Sep 27, 2017
2 parents de0d19c + 8759671 commit c0c859c
Showing 1 changed file with 0 additions and 5 deletions.
5 changes: 0 additions & 5 deletions tox.ini
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,6 @@ deps =
requests

[testenv:py26]
commands = pytest --lsof -ra {posargs:testing}
# pinning mock to last supported version for python 2.6
deps =
hypothesis<3.0
Expand Down Expand Up @@ -117,17 +116,13 @@ commands=
pytest -ra {posargs:testing/python/approx.py}

[testenv:py27-pluggymaster]
passenv={[testenv]passenv}
commands={[testenv]commands}
setenv=
_PYTEST_SETUP_SKIP_PLUGGY_DEP=1
deps =
{[testenv]deps}
git+https://github.com/pytest-dev/pluggy.git@master

[testenv:py35-pluggymaster]
passenv={[testenv:py27-pluggymaster]passenv}
commands={[testenv:py27-pluggymaster]commands}
setenv=
_PYTEST_SETUP_SKIP_PLUGGY_DEP=1
deps =
Expand Down

0 comments on commit c0c859c

Please sign in to comment.