Skip to content

Commit

Permalink
Skip pip@main tests for Python 3.6, no longer supported. Fixes #2874.…
Browse files Browse the repository at this point in the history
… Use pip pinned range to resolve pip version based on a repeatable pattern.
  • Loading branch information
jaraco committed Nov 12, 2021
1 parent 8c3aa84 commit f2de347
Showing 1 changed file with 9 additions and 4 deletions.
13 changes: 9 additions & 4 deletions setuptools/tests/test_virtualenv.py
Original file line number Diff line number Diff line change
Expand Up @@ -76,9 +76,14 @@ def skip_network(param):
return param if network else mark(param, pytest.mark.skip(reason="no network"))

network_versions = [
mark('pip==19.3.1', pytest.mark.xfail(reason='pypa/pip#6599')),
'pip==20.0.2',
'https://github.com/pypa/pip/archive/main.zip',
mark('pip<20', pytest.mark.xfail(reason='pypa/pip#6599')),
'pip<20.1',
'pip<21',
'pip<22',
mark(
'https://github.com/pypa/pip/archive/main.zip',
pytest.mark.skipif('sys.version_info < (3, 7)'),
),
]

versions = itertools.chain(
Expand All @@ -103,7 +108,7 @@ def test_pip_upgrade_from_source(pip_version, tmp_src, virtualenv):
if pip_version is None:
upgrade_pip = ()
else:
upgrade_pip = ('python -m pip install -U {pip_version} --retries=1',)
upgrade_pip = ('python -m pip install -U "{pip_version}" --retries=1',)
virtualenv.run(' && '.join((
'pip uninstall -y setuptools',
'pip install -U wheel',
Expand Down

0 comments on commit f2de347

Please sign in to comment.