Merge branch 'master' into fix_889_and_non-ascii_in_setup.cfg_take_2

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}