Skip to content

Commit 9bbf14d

Browse files
committed
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://...)
1 parent c42d966 commit 9bbf14d

File tree

1 file changed

+18
-3
lines changed

1 file changed

+18
-3
lines changed

tox.ini

Lines changed: 18 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,14 +21,11 @@ envlist =
2121
[testenv]
2222
commands = pytest --lsof -ra {posargs:testing}
2323
passenv = USER USERNAME
24-
setenv=
25-
pluggymaster: _PYTEST_SETUP_SKIP_PLUGGY_DEP=1
2624
deps =
2725
hypothesis>=3.5.2
2826
nose
2927
mock
3028
requests
31-
pluggymaster: git+https://github.com/pytest-dev/pluggy.git@master
3229

3330
[testenv:py26]
3431
commands = pytest --lsof -ra {posargs:testing}
@@ -120,6 +117,24 @@ deps=numpy
120117
commands=
121118
pytest -ra {posargs:testing/python/approx.py}
122119

120+
[testenv:py27-pluggymaster]
121+
passenv={[testenv]passenv}
122+
commands={[testenv]commands}
123+
setenv=
124+
_PYTEST_SETUP_SKIP_PLUGGY_DEP=1
125+
deps =
126+
{[testenv]deps}
127+
git+https://github.com/pytest-dev/pluggy.git@master
128+
129+
[testenv:py35-pluggymaster]
130+
passenv={[testenv]passenv}
131+
commands={[testenv]commands}
132+
setenv=
133+
_PYTEST_SETUP_SKIP_PLUGGY_DEP=1
134+
deps =
135+
{[testenv]deps}
136+
git+https://github.com/pytest-dev/pluggy.git@master
137+
123138
[testenv:docs]
124139
skipsdist = True
125140
usedevelop = True

0 commit comments

Comments
 (0)