Create explicit 'pluggymaster' env definitions
For some reason, the previous approach brakes 'coveralls' because pip still tries to install the 'pluggy' master requirement (git+https://...)
This commit is contained in:
parent
c42d966a40
commit
9bbf14d0f6
21
tox.ini
21
tox.ini
|
@ -21,14 +21,11 @@ envlist =
|
||||||
[testenv]
|
[testenv]
|
||||||
commands = pytest --lsof -ra {posargs:testing}
|
commands = pytest --lsof -ra {posargs:testing}
|
||||||
passenv = USER USERNAME
|
passenv = USER USERNAME
|
||||||
setenv=
|
|
||||||
pluggymaster: _PYTEST_SETUP_SKIP_PLUGGY_DEP=1
|
|
||||||
deps =
|
deps =
|
||||||
hypothesis>=3.5.2
|
hypothesis>=3.5.2
|
||||||
nose
|
nose
|
||||||
mock
|
mock
|
||||||
requests
|
requests
|
||||||
pluggymaster: git+https://github.com/pytest-dev/pluggy.git@master
|
|
||||||
|
|
||||||
[testenv:py26]
|
[testenv:py26]
|
||||||
commands = pytest --lsof -ra {posargs:testing}
|
commands = pytest --lsof -ra {posargs:testing}
|
||||||
|
@ -120,6 +117,24 @@ deps=numpy
|
||||||
commands=
|
commands=
|
||||||
pytest -ra {posargs:testing/python/approx.py}
|
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]passenv}
|
||||||
|
commands={[testenv]commands}
|
||||||
|
setenv=
|
||||||
|
_PYTEST_SETUP_SKIP_PLUGGY_DEP=1
|
||||||
|
deps =
|
||||||
|
{[testenv]deps}
|
||||||
|
git+https://github.com/pytest-dev/pluggy.git@master
|
||||||
|
|
||||||
[testenv:docs]
|
[testenv:docs]
|
||||||
skipsdist = True
|
skipsdist = True
|
||||||
usedevelop = True
|
usedevelop = True
|
||||||
|
|
Loading…
Reference in New Issue