Skip to content

Commit 80082fa

Browse files
committed
Merge branch 'master' into fix_889_and_non-ascii_in_setup.cfg_take_2
2 parents 62e4c1d + 050c0cb commit 80082fa

File tree

2 files changed

+2
-1
lines changed

2 files changed

+2
-1
lines changed

tests/requirements.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,3 +10,4 @@ coverage>=4.5.1
1010
pytest-cov>=2.5.1
1111
paver; python_version>="3.6"
1212
futures; python_version=="2.7"
13+
pip==18.1 # Temporary workaround for #1644.

tox.ini

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ deps=-rtests/requirements.txt
1212
# Changed from default (`python -m pip ...`)
1313
# to prevent the current working directory
1414
# from being added to `sys.path`.
15-
install_command={envbindir}/pip install {opts} {packages}
15+
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}
1616
# Same as above.
1717
list_dependencies_command={envbindir}/pip freeze
1818
setenv=COVERAGE_FILE={toxworkdir}/.coverage.{envname}

0 commit comments

Comments
 (0)