From 2970c1df24e8492a16fc4681cfb08aba4e7f7a36 Mon Sep 17 00:00:00 2001
From: Daniel Hahler <git@thequod.de>
Date: Sun, 3 Mar 2019 13:12:03 +0100
Subject: [PATCH 1/2] tox: generic pluggymaster factor

---
 tox.ini | 16 ++++------------
 1 file changed, 4 insertions(+), 12 deletions(-)

diff --git a/tox.ini b/tox.ini
index 1fc20cb5f..3f954e1d4 100644
--- a/tox.ini
+++ b/tox.ini
@@ -42,11 +42,15 @@ setenv =
     pexpect: _PYTEST_TOX_PLATFORM=linux|darwin
     pexpect: _PYTEST_TOX_POSARGS_PEXPECT=testing/test_pdb.py testing/test_terminal.py testing/test_unittest.py
 
+    # TODO: remove?!
+    pluggymaster: _PYTEST_SETUP_SKIP_PLUGGY_DEP=1
+
     xdist: _PYTEST_TOX_POSARGS_XDIST=-n auto
 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 +82,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

From c4aa57bc4c3ffc71e9842f14251ee6c60b8953c3 Mon Sep 17 00:00:00 2001
From: Daniel Hahler <git@thequod.de>
Date: Sun, 3 Mar 2019 13:15:13 +0100
Subject: [PATCH 2/2] tox/setup.py: remove _PYTEST_SETUP_SKIP_PLUGGY_DEP=1 hack

---
 setup.py | 9 +--------
 tox.ini  | 3 ---
 2 files changed, 1 insertion(+), 11 deletions(-)

diff --git a/setup.py b/setup.py
index 89e48c6b5..cd4765440 100644
--- a/setup.py
+++ b/setup.py
@@ -1,5 +1,3 @@
-import os
-
 from setuptools import setup
 
 # TODO: if py gets upgrade to >=1.6,
@@ -15,15 +13,10 @@ INSTALL_REQUIRES = [
     '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"},
diff --git a/tox.ini b/tox.ini
index 3f954e1d4..97cac6f6b 100644
--- a/tox.ini
+++ b/tox.ini
@@ -42,9 +42,6 @@ setenv =
     pexpect: _PYTEST_TOX_PLATFORM=linux|darwin
     pexpect: _PYTEST_TOX_POSARGS_PEXPECT=testing/test_pdb.py testing/test_terminal.py testing/test_unittest.py
 
-    # TODO: remove?!
-    pluggymaster: _PYTEST_SETUP_SKIP_PLUGGY_DEP=1
-
     xdist: _PYTEST_TOX_POSARGS_XDIST=-n auto
 extras = testing
 deps =