Skip to content

Commit

Permalink
Merge pull request #1803 from benoit-pierre/fix_travis_py34
Browse files Browse the repository at this point in the history
tests: fix `test_pip_upgrade_from_source` on Python 3.4
  • Loading branch information
mergify[bot] authored Jul 23, 2019
2 parents 38b9010 + d694f54 commit 5b128e8
Showing 1 changed file with 6 additions and 1 deletion.
7 changes: 6 additions & 1 deletion setuptools/tests/test_virtualenv.py
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,8 @@

import pytest_virtualenv

from setuptools.extern import six

from .textwrap import DALS
from .test_easy_install import make_nspkg_sdist

Expand Down Expand Up @@ -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
Expand Down

0 comments on commit 5b128e8

Please sign in to comment.