Introduce pytest command as recommended entry point

Fixes #1629
This commit is contained in:
Dave Hunt
2016-06-21 16:16:57 +02:00
parent 54872e94b4
commit ef9dd14963
55 changed files with 272 additions and 274 deletions

26
tox.ini
View File

@@ -7,7 +7,7 @@ envlist=
py27-nobyte,doctesting,py27-cxfreeze
[testenv]
commands= py.test --lsof -rfsxX {posargs:testing}
commands= pytest --lsof -rfsxX {posargs:testing}
passenv = USER USERNAME
deps=
hypothesis
@@ -16,7 +16,7 @@ deps=
requests
[testenv:py26]
commands= py.test --lsof -rfsxX {posargs:testing}
commands= pytest --lsof -rfsxX {posargs:testing}
# pinning mock to last supported version for python 2.6
deps=
hypothesis<3.0
@@ -30,10 +30,10 @@ deps=pytest-xdist>=1.13
mock
nose
commands=
py.test -n3 -rfsxX --runpytest=subprocess {posargs:testing}
pytest -n3 -rfsxX --runpytest=subprocess {posargs:testing}
[testenv:genscript]
commands= py.test --genscript=pytest1
commands= pytest --genscript=pytest1
[testenv:linting]
basepython = python2.7
@@ -48,26 +48,26 @@ deps=pytest-xdist>=1.13
nose
hypothesis
commands=
py.test -n1 -rfsxX {posargs:testing}
pytest -n1 -rfsxX {posargs:testing}
[testenv:py35-xdist]
deps={[testenv:py27-xdist]deps}
commands=
py.test -n3 -rfsxX {posargs:testing}
pytest -n3 -rfsxX {posargs:testing}
[testenv:py27-pexpect]
changedir=testing
platform=linux|darwin
deps=pexpect
commands=
py.test -rfsxX test_pdb.py test_terminal.py test_unittest.py
pytest -rfsxX test_pdb.py test_terminal.py test_unittest.py
[testenv:py35-pexpect]
changedir=testing
platform=linux|darwin
deps={[testenv:py27-pexpect]deps}
commands=
py.test -rfsxX test_pdb.py test_terminal.py test_unittest.py
pytest -rfsxX test_pdb.py test_terminal.py test_unittest.py
[testenv:py27-nobyte]
deps=pytest-xdist>=1.13
@@ -76,21 +76,21 @@ distribute=true
setenv=
PYTHONDONTWRITEBYTECODE=1
commands=
py.test -n3 -rfsxX {posargs:testing}
pytest -n3 -rfsxX {posargs:testing}
[testenv:py27-trial]
deps=twisted
commands=
py.test -rsxf {posargs:testing/test_unittest.py}
pytest -rsxf {posargs:testing/test_unittest.py}
[testenv:py35-trial]
platform=linux|darwin
deps={[testenv:py27-trial]deps}
commands=
py.test -rsxf {posargs:testing/test_unittest.py}
pytest -rsxf {posargs:testing/test_unittest.py}
[testenv:doctest]
commands=py.test --doctest-modules _pytest
commands=pytest --doctest-modules _pytest
deps=
[testenv:doc]
@@ -107,7 +107,7 @@ commands=
basepython = python
changedir=doc/en
deps=PyYAML
commands= py.test -rfsxX {posargs}
commands= pytest -rfsxX {posargs}
[testenv:regen]
changedir=doc/en