summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNed Batchelder <ned@nedbatchelder.com>2016-12-31 08:16:00 -0500
committerNed Batchelder <ned@nedbatchelder.com>2016-12-31 08:16:00 -0500
commit42f65f4b2494aee7c75585e0108c59428c304e83 (patch)
treecafebfd725ce3fd8f37d684444eb9dc6f3110c70
parent942b08171922538358416d95fdc1f8db7e6d0be4 (diff)
downloadpython-coveragepy-git-42f65f4b2494aee7c75585e0108c59428c304e83.tar.gz
Install pytest where we run igor
-rw-r--r--appveyor.yml2
-rw-r--r--requirements/dev.pip4
-rw-r--r--tox.ini2
3 files changed, 5 insertions, 3 deletions
diff --git a/appveyor.yml b/appveyor.yml
index d66dfb81..897a76d3 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -113,7 +113,7 @@ install:
- "pip install --disable-pip-version-check --user --upgrade virtualenv"
# Install requirements.
- - "%CMD_IN_ENV% pip install -r requirements/tox.pip -r requirements/wheel.pip"
+ - "%CMD_IN_ENV% pip install -r requirements/dev.pip -r requirements/wheel.pip"
# Make a python3.4.bat file in the current directory so that tox will find it
# and python3.4 will mean what we want it to.
diff --git a/requirements/dev.pip b/requirements/dev.pip
index f127e293..67a912f0 100644
--- a/requirements/dev.pip
+++ b/requirements/dev.pip
@@ -7,13 +7,15 @@
# PyPI requirements for running tests.
-r tox.pip
+# for igor and linting.
+pytest==3.0.5
+
# for linting.
greenlet==0.4.11
mock==2.0.0
PyContracts==1.7.15
pyenchant==1.6.8
pylint==1.6.4
-pytest
unittest-mixins==1.1.1
# for kitting.
diff --git a/tox.ini b/tox.ini
index d8fc19c2..8e698ccf 100644
--- a/tox.ini
+++ b/tox.ini
@@ -10,7 +10,7 @@ usedevelop = True
deps =
# https://requires.io/github/nedbat/coveragepy/requirements/
- pytest>=3.0.5
+ pytest==3.0.5
pytest-xdist==1.15.0
pytest-warnings==0.2.0
pip==9.0.1