Skip to content

Commit 028ce3c

Browse files
authored
Fix failing tests (pypa#3953)
2 parents b545fc7 + d636bba commit 028ce3c

File tree

2 files changed

+14
-8
lines changed

2 files changed

+14
-8
lines changed

setuptools/tests/test_virtualenv.py

Lines changed: 13 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -58,25 +58,31 @@ def access_pypi():
5858
pytest.param(
5959
'pip<20.1',
6060
marks=pytest.mark.xfail(
61-
'sys.version_info > (3, 12)',
62-
reason="pip 22 requried for Python 3.12 and later",
61+
'sys.version_info >= (3, 12)',
62+
reason="pip 23.1.2 required for Python 3.12 and later",
6363
),
6464
),
6565
pytest.param(
6666
'pip<21',
6767
marks=pytest.mark.xfail(
68-
'sys.version_info > (3, 12)',
69-
reason="pip 22 requried for Python 3.12 and later",
68+
'sys.version_info >= (3, 12)',
69+
reason="pip 23.1.2 required for Python 3.12 and later",
7070
),
7171
),
7272
pytest.param(
7373
'pip<22',
7474
marks=pytest.mark.xfail(
75-
'sys.version_info > (3, 12)',
76-
reason="pip 22 requried for Python 3.12 and later",
75+
'sys.version_info >= (3, 12)',
76+
reason="pip 23.1.2 required for Python 3.12 and later",
77+
),
78+
),
79+
pytest.param(
80+
'pip<23',
81+
marks=pytest.mark.xfail(
82+
'sys.version_info >= (3, 12)',
83+
reason="pip 23.1.2 required for Python 3.12 and later",
7784
),
7885
),
79-
'pip<23',
8086
pytest.param(
8187
'https://github.com/pypa/pip/archive/main.zip',
8288
marks=pytest.mark.xfail(reason='#2975'),

tox.ini

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ deps =
1010
# Ideally all the dependencies should be set as "extras"
1111
setenv =
1212
PYTHONWARNDEFAULTENCODING = 1
13-
SETUPTOOLS_ENFORCE_DEPRECATION = 1
13+
SETUPTOOLS_ENFORCE_DEPRECATION = 0 # temporarily disable
1414
commands =
1515
pytest {posargs}
1616
usedevelop = True

0 commit comments

Comments
 (0)