Commit 5b128e8c authored by mergify[bot]'s avatar mergify[bot] Committed by GitHub

Merge pull request #1803 from benoit-pierre/fix_travis_py34

tests: fix `test_pip_upgrade_from_source` on Python 3.4
parents 38b9010b d694f544
...@@ -8,6 +8,8 @@ from pytest_fixture_config import yield_requires_config ...@@ -8,6 +8,8 @@ from pytest_fixture_config import yield_requires_config
import pytest_virtualenv import pytest_virtualenv
from setuptools.extern import six
from .textwrap import DALS from .textwrap import DALS
from .test_easy_install import make_nspkg_sdist from .test_easy_install import make_nspkg_sdist
...@@ -75,9 +77,12 @@ def _get_pip_versions(): ...@@ -75,9 +77,12 @@ def _get_pip_versions():
'pip==10.0.1', 'pip==10.0.1',
'pip==18.1', 'pip==18.1',
'pip==19.0.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] + [ versions = [None] + [
pytest.param(v, **({} if network else {'marks': pytest.mark.skip})) pytest.param(v, **({} if network else {'marks': pytest.mark.skip}))
for v in network_versions for v in network_versions
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment