summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNed Batchelder <ned@nedbatchelder.com>2018-08-22 14:12:05 -0400
committerNed Batchelder <ned@nedbatchelder.com>2018-08-24 06:54:17 -0400
commit870bc0ac4c133876a5a5ab71df1024863bda60c0 (patch)
tree88d74435236b70848b3a6dac4f3ce495ec9ac5ad
parenta6c969b19c6dacecac6ba7706326660084bbe131 (diff)
downloadpython-coveragepy-git-870bc0ac4c133876a5a5ab71df1024863bda60c0.tar.gz
Consolidate testing requirements
-rw-r--r--requirements/dev.pip3
-rw-r--r--requirements/pytest.pip6
-rw-r--r--tox.ini4
3 files changed, 6 insertions, 7 deletions
diff --git a/requirements/dev.pip b/requirements/dev.pip
index d7ed3131..c2cfcb1b 100644
--- a/requirements/dev.pip
+++ b/requirements/dev.pip
@@ -12,10 +12,7 @@ pip==18.0.0
# for linting.
greenlet==0.4.14
-mock==2.0.0
-PyContracts==1.8.3
pylint==1.9.2
-unittest-mixins==1.4
check-manifest==0.37
readme_renderer==21.0
diff --git a/requirements/pytest.pip b/requirements/pytest.pip
index e8c59d29..139c6479 100644
--- a/requirements/pytest.pip
+++ b/requirements/pytest.pip
@@ -7,3 +7,9 @@ pytest==3.7.1
pluggy>=0.7 # pytest needs this, but pip doesn't understand
pytest-xdist==1.22.5
flaky==3.4.0
+mock==2.0.0
+PyContracts==1.8.3
+
+# Our testing mixins
+unittest-mixins==1.6
+#-e/Users/ned/unittest_mixins
diff --git a/tox.ini b/tox.ini
index f6917f8b..06782dc9 100644
--- a/tox.ini
+++ b/tox.ini
@@ -15,10 +15,6 @@ deps =
-rrequirements/pytest.pip
pip==18.0
setuptools==40.0.0
- mock==2.0.0
- PyContracts==1.8.3
- unittest-mixins==1.6
- #-e/Users/ned/unittest_mixins
# gevent 1.3 causes a failure: https://bitbucket.org/ned/coveragepy/issues/663/gevent-132-on-windows-fails
py{27,34,35,36}: gevent==1.2.2
py{27,34,35,36,37}: eventlet==0.24.1