Merge branch 'master' into merge-master-into-features
Preparing for 3.0
This commit is contained in:
5
tox.ini
5
tox.ini
@@ -82,13 +82,12 @@ commands=
|
||||
[testenv:py27-trial]
|
||||
deps=twisted
|
||||
commands=
|
||||
pytest -rsxf {posargs:testing/test_unittest.py}
|
||||
py.test -ra {posargs:testing/test_unittest.py}
|
||||
|
||||
[testenv:py35-trial]
|
||||
platform=linux|darwin
|
||||
deps={[testenv:py27-trial]deps}
|
||||
commands=
|
||||
pytest -rsxf {posargs:testing/test_unittest.py}
|
||||
py.test -ra {posargs:testing/test_unittest.py}
|
||||
|
||||
[testenv:doctest]
|
||||
commands=pytest --doctest-modules _pytest
|
||||
|
||||
Reference in New Issue
Block a user