diff options
| author | Daniel Hahler <git@thequod.de> | 2019-02-28 22:44:24 +0100 |
|---|---|---|
| committer | Daniel Hahler <git@thequod.de> | 2019-03-01 09:12:16 +0100 |
| commit | c30ab1014ea65ad032fba3c84b196381201c476c (patch) | |
| tree | 0b065879aa202e9a802ef865978e4caec525bb93 /tox.ini | |
| parent | df8869cf1a3a0e2a2c5a1c7ce7a6b5e1793c7997 (diff) | |
| download | pytest-c30ab1014ea65ad032fba3c84b196381201c476c.tar.gz | |
tox: add generic nobyte and numpy factors
Remove `py27-nobyte` from tox.ini, which was using xdist already.
Therefore this also removes `py27-xdist` from Travis.
"nobyte" was added in 036557ac to test that test_assertrewrite.py works
with a global PYTHONDONTWRITEBYTECODE=1 setting.
"numpy" is only a special dependency, and can be run together with
nobyte/xdist.
Diffstat (limited to 'tox.ini')
| -rw-r--r-- | tox.ini | 28 |
1 files changed, 4 insertions, 24 deletions
@@ -14,7 +14,7 @@ envlist = pypy pypy3 {py27,py37}-{pexpect,xdist,trial,numpy,pluggymaster} - py27-nobyte + py27-nobyte-xdist doctesting py37-freeze docs @@ -35,12 +35,15 @@ setenv = coverage: COVERAGE_FILE={toxinidir}/.coverage coverage: COVERAGE_PROCESS_START={toxinidir}/.coveragerc + nobyte: PYTHONDONTWRITEBYTECODE=1 + pexpect: _PYTEST_TOX_PLATFORM=linux|darwin pexpect: _PYTEST_TOX_DEFAULT_POSARGS={env:_PYTEST_TOX_DEFAULT_POSARGS:testing/test_pdb.py testing/test_terminal.py testing/test_unittest.py} xdist: _PYTEST_TOX_DEFAULT_POSARGS={env:_PYTEST_TOX_DEFAULT_POSARGS:-n auto} extras = testing deps = + numpy: numpy pexpect: pexpect xdist: pytest-xdist>=1.13 {env:_PYTEST_TOX_EXTRA_DEP:} @@ -61,18 +64,6 @@ basepython = python3 deps = pre-commit>=1.11.0 commands = pre-commit run --all-files --show-diff-on-failure -[testenv:py27-nobyte] -extras = testing -deps = - {[testenv]deps} - pytest-xdist>=1.13 -distribute = true -setenv = - {[testenv]setenv} - PYTHONDONTWRITEBYTECODE=1 -commands = - {env:_PYTEST_TOX_COVERAGE_RUN:} pytest -n auto {posargs} - [testenv:py27-trial] deps = {[testenv]deps} @@ -85,17 +76,6 @@ commands = deps = {[testenv:py27-trial]deps} commands = {[testenv:py27-trial]commands} -[testenv:py27-numpy] -deps = - {[testenv]deps} - numpy -commands= - {env:_PYTEST_TOX_COVERAGE_RUN:} pytest {posargs:testing/python/approx.py} - -[testenv:py37-numpy] -deps = {[testenv:py27-numpy]deps} -commands = {[testenv:py27-numpy]commands} - [testenv:py27-pluggymaster] setenv= {[testenv]setenv} |