From fd1684e70b3fc996fcbc8419d1d9e407ee440255 Mon Sep 17 00:00:00 2001
From: Daniel Hahler <git@thequod.de>
Date: Sun, 10 Feb 2019 13:53:19 +0100
Subject: [PATCH 1/4] tox: use deps for pluggymaster testenvs

https://github.com/tox-dev/tox/issues/706 has been fixed.
---
 tox.ini | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/tox.ini b/tox.ini
index 6c216fd71..66897b9aa 100644
--- a/tox.ini
+++ b/tox.ini
@@ -116,11 +116,13 @@ commands = {[testenv:py27-numpy]commands}
 setenv=
     {[testenv]setenv}
     _PYTEST_SETUP_SKIP_PLUGGY_DEP=1
-    # NOTE: using env instead of "{[testenv]deps}", because of https://github.com/tox-dev/tox/issues/706.
-    _PYTEST_TOX_EXTRA_DEP=git+https://github.com/pytest-dev/pluggy.git@master
+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

From f73fa47b1fe151ffac268c8e61c4cf8e4dbb0a1b Mon Sep 17 00:00:00 2001
From: Daniel Hahler <git@thequod.de>
Date: Sun, 10 Feb 2019 13:54:58 +0100
Subject: [PATCH 2/4] Use coverage with pluggymaster

---
 .travis.yml  | 4 ++--
 appveyor.yml | 2 --
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 6489a1647..66d06fccd 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -17,10 +17,10 @@ env:
     # Specialized factors for py27.
     - TOXENV=py27-nobyte
     - TOXENV=py27-xdist
-    - TOXENV=py27-pluggymaster PYTEST_NO_COVERAGE=1
+    - TOXENV=py27-pluggymaster
     # Specialized factors for py37.
     - TOXENV=py37-pexpect,py37-trial,py37-numpy
-    - TOXENV=py37-pluggymaster PYTEST_NO_COVERAGE=1
+    - TOXENV=py37-pluggymaster
     - TOXENV=py37-freeze PYTEST_NO_COVERAGE=1
 
 matrix:
diff --git a/appveyor.yml b/appveyor.yml
index 9a50d5bd0..2dea0180f 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -13,11 +13,9 @@ environment:
   # Specialized factors for py27.
   - TOXENV: "py27-trial,py27-numpy,py27-nobyte"
   - TOXENV: "py27-pluggymaster"
-    PYTEST_NO_COVERAGE: "1"
   # Specialized factors for py37.
   - TOXENV: "py37-trial,py37-numpy"
   - TOXENV: "py37-pluggymaster"
-    PYTEST_NO_COVERAGE: "1"
   - TOXENV: "py37-freeze"
     PYTEST_NO_COVERAGE: "1"
 

From 82b8ec37fc53b6ab823142bb3a8bd0f777dcffe5 Mon Sep 17 00:00:00 2001
From: Daniel Hahler <git@thequod.de>
Date: Sun, 10 Feb 2019 13:57:44 +0100
Subject: [PATCH 3/4] Bump tox minversion

For https://github.com/tox-dev/tox/commit/c611a16afe653e7e96bda5da1949f630cbe37656
---
 tox.ini | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tox.ini b/tox.ini
index 66897b9aa..60e78c508 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,6 +1,6 @@
 [tox]
 isolated_build = True
-minversion = 3.3
+minversion = 3.5.3
 distshare = {homedir}/.tox/distshare
 # make sure to update environment list in travis.yml and appveyor.yml
 envlist =

From 5e2d740829f815b50bab3258db42bc66938814ab Mon Sep 17 00:00:00 2001
From: Daniel Hahler <git@thequod.de>
Date: Sun, 10 Feb 2019 14:02:56 +0100
Subject: [PATCH 4/4] tox: cleanup/revisit deps

---
 tox.ini | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/tox.ini b/tox.ini
index 60e78c508..b6625e7a3 100644
--- a/tox.ini
+++ b/tox.ini
@@ -25,7 +25,8 @@ commands =
     coverage: coverage report
 passenv = USER USERNAME COVERAGE_* TRAVIS
 setenv =
-    # configuration if a user runs tox with a "coverage" factor, for example "tox -e py37-coverage"
+    # Configuration to run with coverage similar to Travis/Appveyor, e.g.
+    # "tox -e py37-coverage".
     coverage: _PYTEST_TOX_COVERAGE_RUN=coverage run -m
     coverage: _PYTEST_TOX_EXTRA_DEP=coverage-enable-subprocess
     coverage: COVERAGE_FILE={toxinidir}/.coverage
@@ -52,8 +53,8 @@ commands = pre-commit run --all-files --show-diff-on-failure
 [testenv:py27-xdist]
 extras = testing
 deps =
+    {[testenv]deps}
     pytest-xdist>=1.13
-    {env:_PYTEST_TOX_EXTRA_DEP:}
 commands =
     {env:_PYTEST_TOX_COVERAGE_RUN:} pytest -n auto {posargs}
 
@@ -61,15 +62,15 @@ commands =
 # NOTE: copied from above due to https://github.com/tox-dev/tox/issues/706.
 extras = testing
 deps =
+    {[testenv]deps}
     pytest-xdist>=1.13
-    {env:_PYTEST_TOX_EXTRA_DEP:}
 commands = {[testenv:py27-xdist]commands}
 
 [testenv:py27-pexpect]
 platform = linux|darwin
 deps =
+    {[testenv]deps}
     pexpect
-    {env:_PYTEST_TOX_EXTRA_DEP:}
 commands =
     {env:_PYTEST_TOX_COVERAGE_RUN:} pytest {posargs:testing/test_pdb.py testing/test_terminal.py testing/test_unittest.py}
 
@@ -81,8 +82,8 @@ commands = {[testenv:py27-pexpect]commands}
 [testenv:py27-nobyte]
 extras = testing
 deps =
+    {[testenv]deps}
     pytest-xdist>=1.13
-    {env:_PYTEST_TOX_EXTRA_DEP:}
 distribute = true
 setenv =
     {[testenv]setenv}
@@ -92,8 +93,8 @@ commands =
 
 [testenv:py27-trial]
 deps =
+    {[testenv]deps}
     twisted
-    {env:_PYTEST_TOX_EXTRA_DEP:}
 commands =
     {env:_PYTEST_TOX_COVERAGE_RUN:} pytest {posargs:testing/test_unittest.py}
 
@@ -103,8 +104,8 @@ commands = {[testenv:py27-trial]commands}
 
 [testenv:py27-numpy]
 deps =
+    {[testenv]deps}
     numpy
-    {env:_PYTEST_TOX_EXTRA_DEP:}
 commands=
   {env:_PYTEST_TOX_COVERAGE_RUN:} pytest {posargs:testing/python/approx.py}
 
@@ -138,8 +139,8 @@ commands =
 basepython = python3
 skipsdist = True
 deps =
+    {[testenv]deps}
     PyYAML
-    {env:_PYTEST_TOX_EXTRA_DEP:}
 commands =
     {env:_PYTEST_TOX_COVERAGE_RUN:} pytest doc/en
     {env:_PYTEST_TOX_COVERAGE_RUN:} pytest --doctest-modules --pyargs _pytest