diff options
| author | mergify[bot] <37929162+mergify[bot]@users.noreply.github.com> | 2019-07-23 09:59:40 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-07-23 09:59:40 +0000 |
| commit | 5b128e8c82f4886b4ff110219de80a61bf8aa3b0 (patch) | |
| tree | 5b27469f63627d44f8af97b6d9e0804635c947bd /setuptools | |
| parent | 38b9010bc3527e89561c7a985e0908a3071b7ff5 (diff) | |
| parent | d694f54455d4b3884f74b72b54acbd8aeb94caed (diff) | |
| download | external_python_setuptools-5b128e8c82f4886b4ff110219de80a61bf8aa3b0.tar.gz external_python_setuptools-5b128e8c82f4886b4ff110219de80a61bf8aa3b0.tar.bz2 external_python_setuptools-5b128e8c82f4886b4ff110219de80a61bf8aa3b0.zip | |
Merge pull request #1803 from benoit-pierre/fix_travis_py34
tests: fix `test_pip_upgrade_from_source` on Python 3.4
Diffstat (limited to 'setuptools')
| -rw-r--r-- | setuptools/tests/test_virtualenv.py | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/setuptools/tests/test_virtualenv.py b/setuptools/tests/test_virtualenv.py index d7b98c77..74a1284c 100644 --- a/setuptools/tests/test_virtualenv.py +++ b/setuptools/tests/test_virtualenv.py @@ -8,6 +8,8 @@ from pytest_fixture_config import yield_requires_config import pytest_virtualenv +from setuptools.extern import six + from .textwrap import DALS from .test_easy_install import make_nspkg_sdist @@ -75,9 +77,12 @@ def _get_pip_versions(): 'pip==10.0.1', 'pip==18.1', 'pip==19.0.1', - 'https://github.com/pypa/pip/archive/master.zip', ] + # Pip's master dropped support for 3.4. + if not six.PY34: + network_versions.append('https://github.com/pypa/pip/archive/master.zip') + versions = [None] + [ pytest.param(v, **({} if network else {'marks': pytest.mark.skip})) for v in network_versions |