summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJason R. Coombs <jaraco@jaraco.com>2019-01-26 17:48:41 -0500
committerGitHub <noreply@github.com>2019-01-26 17:48:41 -0500
commit050c0cbdd776ebed369de6c6d51bdc88fa16eadf (patch)
tree20e319af0e16ad015bff8f81cd778322226d63b1
parentf8b9c426b4b3bd074ecfac71026af23a8a41b0dc (diff)
parent3fc1e22cc2bf43d0266b9193e024c2e9e722a600 (diff)
downloadpython-setuptools-git-050c0cbdd776ebed369de6c6d51bdc88fa16eadf.tar.gz
Merge pull request #1647 from benoit-pierre/fix_py27_job
tests: temporary pin pip to fix the Python 2.7 job
-rw-r--r--tests/requirements.txt1
-rw-r--r--tox.ini2
2 files changed, 2 insertions, 1 deletions
diff --git a/tests/requirements.txt b/tests/requirements.txt
index d301168a..f944df27 100644
--- a/tests/requirements.txt
+++ b/tests/requirements.txt
@@ -10,3 +10,4 @@ coverage>=4.5.1
pytest-cov>=2.5.1
paver; python_version>="3.6"
futures; python_version=="2.7"
+pip==18.1 # Temporary workaround for #1644.
diff --git a/tox.ini b/tox.ini
index a2f850df..a31cb1c5 100644
--- a/tox.ini
+++ b/tox.ini
@@ -12,7 +12,7 @@ deps=-rtests/requirements.txt
# Changed from default (`python -m pip ...`)
# to prevent the current working directory
# from being added to `sys.path`.
-install_command={envbindir}/pip install {opts} {packages}
+install_command=python -c 'import sys; sys.path.remove(""); from pkg_resources import load_entry_point; load_entry_point("pip", "console_scripts", "pip")()' install {opts} {packages}
# Same as above.
list_dependencies_command={envbindir}/pip freeze
setenv=COVERAGE_FILE={toxworkdir}/.coverage.{envname}