Merge pull request pytest-dev#4877 from blueyed/pluggymaster

tox: generic pluggymaster factor, remove env hack

setup.py

@@ -1,5 +1,3 @@
-import os
-
 from setuptools import setup
 
 # TODO: if py gets upgrade to >=1.6,
@@ -15,15 +13,10 @@
     'funcsigs;python_version<"3.0"',
     'pathlib2>=2.2.0;python_version<"3.6"',
     'colorama;sys_platform=="win32"',
+    "pluggy>=0.7",
 ]
 
 
-# if _PYTEST_SETUP_SKIP_PLUGGY_DEP is set, skip installing pluggy;
-# used by tox.ini to test with pluggy master
-if "_PYTEST_SETUP_SKIP_PLUGGY_DEP" not in os.environ:
-    INSTALL_REQUIRES.append("pluggy>=0.7")
-
-
 def main():
     setup(
         use_scm_version={"write_to": "src/_pytest/_version.py"},

tox.ini

@@ -47,6 +47,7 @@ extras = testing
 deps =
     numpy: numpy
     pexpect: pexpect
+    pluggymaster: git+https://github.com/pytest-dev/pluggy.git@master
     xdist: pytest-xdist>=1.13
     {env:_PYTEST_TOX_EXTRA_DEP:}
 platform = {env:_PYTEST_TOX_PLATFORM:.*}
@@ -78,18 +79,6 @@ commands =
 deps = {[testenv:py27-trial]deps}
 commands = {[testenv:py27-trial]commands}
 
-[testenv:py27-pluggymaster]
-setenv=
-    {[testenv]setenv}
-    _PYTEST_SETUP_SKIP_PLUGGY_DEP=1
-deps =
-    {[testenv]deps}
-    git+https://github.com/pytest-dev/pluggy.git@master
-
-[testenv:py37-pluggymaster]
-setenv = {[testenv:py27-pluggymaster]setenv}
-deps = {[testenv:py27-pluggymaster]deps}
-
 [testenv:docs]
 basepython = python3
 skipsdist = True