Skip to content

Commit f2de347

Browse files
committed
Skip pip@main tests for Python 3.6, no longer supported. Fixes #2874. Use pip pinned range to resolve pip version based on a repeatable pattern.
1 parent 8c3aa84 commit f2de347

File tree

1 file changed

+9
-4
lines changed

1 file changed

+9
-4
lines changed

setuptools/tests/test_virtualenv.py

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -76,9 +76,14 @@ def skip_network(param):
7676
return param if network else mark(param, pytest.mark.skip(reason="no network"))
7777

7878
network_versions = [
79-
mark('pip==19.3.1', pytest.mark.xfail(reason='pypa/pip#6599')),
80-
'pip==20.0.2',
81-
'https://github.com/pypa/pip/archive/main.zip',
79+
mark('pip<20', pytest.mark.xfail(reason='pypa/pip#6599')),
80+
'pip<20.1',
81+
'pip<21',
82+
'pip<22',
83+
mark(
84+
'https://github.com/pypa/pip/archive/main.zip',
85+
pytest.mark.skipif('sys.version_info < (3, 7)'),
86+
),
8287
]
8388

8489
versions = itertools.chain(
@@ -103,7 +108,7 @@ def test_pip_upgrade_from_source(pip_version, tmp_src, virtualenv):
103108
if pip_version is None:
104109
upgrade_pip = ()
105110
else:
106-
upgrade_pip = ('python -m pip install -U {pip_version} --retries=1',)
111+
upgrade_pip = ('python -m pip install -U "{pip_version}" --retries=1',)
107112
virtualenv.run(' && '.join((
108113
'pip uninstall -y setuptools',
109114
'pip install -U wheel',

0 commit comments

Comments
 (0)