summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--tox.ini9
1 files changed, 8 insertions, 1 deletions
diff --git a/tox.ini b/tox.ini
index 29037c3..a80dac3 100644
--- a/tox.ini
+++ b/tox.ini
@@ -10,7 +10,7 @@ usedevelop = True
deps =
# https://requires.io/github/nedbat/coveragepy/requirements/
- pip==8.1.1
+ pip==8.1.2
nose==1.3.7
mock==1.3.0
PyContracts==1.7.9
@@ -21,6 +21,10 @@ deps =
# setuptools no longer supports Python 3.2
pypy3_24: setuptools==21.0.0
+# Windows can't update the pip version with pip running, so use Python
+# to install things.
+install_command = python -m pip install -U {opts} {packages}
+
passenv = *
setenv =
pypy,pypy{24,26,40,51,3_24}: COVERAGE_NO_EXTENSION=no C extension under PyPy
@@ -42,6 +46,9 @@ commands =
python setup.py --quiet build_ext --inplace
python igor.py test_with_tracer c {posargs}
+[testenv:py26]
+install_command = python -m pip.__main__ install -U {opts} {packages}
+
[testenv:pypy]
# The "pypy" environment is for Travis. Probably can make Travis use one of
# the other environments...