summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNed Batchelder <ned@nedbatchelder.com>2018-07-22 18:22:56 -0400
committerNed Batchelder <ned@nedbatchelder.com>2018-07-22 18:22:56 -0400
commitf6f0958b761927ef2a30dcf22642685eba3683d5 (patch)
tree28d8989b61e2e528e86c0bdd7638e48cc041a5f6
parent9a9fe6958412ff9ce447355081c74f7acb3bf857 (diff)
downloadpython-coveragepy-git-f6f0958b761927ef2a30dcf22642685eba3683d5.tar.gz
Update testing requirements (stop an xdist crash)
-rw-r--r--requirements/dev.pip2
-rw-r--r--requirements/pytest.pip2
-rw-r--r--requirements/tox.pip2
-rw-r--r--requirements/wheel.pip2
-rw-r--r--tox.ini4
5 files changed, 7 insertions, 5 deletions
diff --git a/requirements/dev.pip b/requirements/dev.pip
index 965c5f48..f9fa8265 100644
--- a/requirements/dev.pip
+++ b/requirements/dev.pip
@@ -4,6 +4,8 @@
# Requirements for doing local development work on coverage.py.
# https://requires.io/github/nedbat/coveragepy/requirements/
+pip==18.0.0
+
# PyPI requirements for running tests.
-r tox.pip
-r pytest.pip
diff --git a/requirements/pytest.pip b/requirements/pytest.pip
index 6b2433ad..b23977b7 100644
--- a/requirements/pytest.pip
+++ b/requirements/pytest.pip
@@ -3,6 +3,6 @@
# The pytest specifics used by coverage.py
-pytest==3.6.2
+pytest==3.6.3
pytest-xdist==1.22.2
flaky==3.4.0
diff --git a/requirements/tox.pip b/requirements/tox.pip
index a209ac7f..43b921c6 100644
--- a/requirements/tox.pip
+++ b/requirements/tox.pip
@@ -1,4 +1,4 @@
# The version of tox used by coverage.py
-tox==3.0.0
+tox==3.1.2
# Adds env recreation on requirements file changes.
tox-battery==0.5.1
diff --git a/requirements/wheel.pip b/requirements/wheel.pip
index 9c6bf0ca..30ac5455 100644
--- a/requirements/wheel.pip
+++ b/requirements/wheel.pip
@@ -1,3 +1,3 @@
# Things needed to make wheels for coverage.py
-setuptools==39.2.0
+setuptools==40.0.0
wheel==0.31.1
diff --git a/tox.ini b/tox.ini
index beeb8567..102a7f54 100644
--- a/tox.ini
+++ b/tox.ini
@@ -13,8 +13,8 @@ deps =
# Check here for what might be out of date:
# https://requires.io/github/nedbat/coveragepy/requirements/
-rrequirements/pytest.pip
- pip==10.0.1
- setuptools==39.2.0
+ pip==18.0
+ setuptools==40.0.0
mock==2.0.0
PyContracts==1.8.3
unittest-mixins==1.4