summaryrefslogtreecommitdiff
path: root/setuptools
diff options
context:
space:
mode:
authorJason R. Coombs <jaraco@jaraco.com>2017-09-13 16:36:13 -0400
committerGitHub <noreply@github.com>2017-09-13 16:36:13 -0400
commit501a30c660bf2e080871941bc53f5c25e69b0d17 (patch)
tree9d95fb90f664bacbb57f0d61b6d8645b400a253f /setuptools
parent5d163b5bf846b86dfebf335548deb1398262c8b8 (diff)
parent6cffeac651ba21ea52e8e85c1e652882f236660f (diff)
downloadpython-setuptools-git-501a30c660bf2e080871941bc53f5c25e69b0d17.tar.gz
Merge pull request #1147 from benoit-pierre/fix_travis_2.6_job
fix `test_pip_upgrade_from_source` test on Python 2.6
Diffstat (limited to 'setuptools')
-rw-r--r--setuptools/tests/test_virtualenv.py4
1 files changed, 4 insertions, 0 deletions
diff --git a/setuptools/tests/test_virtualenv.py b/setuptools/tests/test_virtualenv.py
index 17b8793c..9dbd3c86 100644
--- a/setuptools/tests/test_virtualenv.py
+++ b/setuptools/tests/test_virtualenv.py
@@ -1,5 +1,6 @@
import glob
import os
+import sys
from pytest import yield_fixture
from pytest_fixture_config import yield_requires_config
@@ -39,6 +40,9 @@ def test_pip_upgrade_from_source(virtualenv):
Check pip can upgrade setuptools from source.
"""
dist_dir = virtualenv.workspace
+ if sys.version_info < (2, 7):
+ # Python 2.6 support was dropped in wheel 0.30.0.
+ virtualenv.run('pip install -U "wheel<0.30.0"')
# Generate source distribution / wheel.
virtualenv.run(' && '.join((
'cd {source}',