mirror of
https://github.com/pypa/pip
synced 2023-12-13 21:30:23 +01:00
Merge branch 'main' into extra-normalization
This commit is contained in:
commit
99bea32523
2 changed files with 17 additions and 2 deletions
|
@ -159,7 +159,19 @@ def test_install_fails_if_extra_at_end(
|
|||
"specified_extra, requested_extra",
|
||||
[
|
||||
("Hop_hOp-hoP", "Hop_hOp-hoP"),
|
||||
("Hop_hOp-hoP", "hop-hop-hop"),
|
||||
pytest.param(
|
||||
"Hop_hOp-hoP",
|
||||
"hop-hop-hop",
|
||||
marks=pytest.mark.xfail(
|
||||
"sys.version_info < (3, 8)",
|
||||
reason=(
|
||||
"matching a normalized extra request against an"
|
||||
"unnormalized extra in metadata requires PEP 685 support "
|
||||
"in either packaging or the build tool. Setuptools "
|
||||
"implements this in 68.2, which requires 3.8+"
|
||||
),
|
||||
),
|
||||
),
|
||||
("hop-hop-hop", "Hop_hOp-hoP"),
|
||||
],
|
||||
)
|
||||
|
|
|
@ -6,7 +6,10 @@
|
|||
# (Adjust artifact directory used based on preference and operating system)
|
||||
|
||||
# Implements new extra normalization.
|
||||
setuptools >= 68.2
|
||||
setuptools >= 68.2 ; python_version >= '3.8'
|
||||
setuptools >= 40.8.0, != 60.6.0 ; python_version < '3.8'
|
||||
|
||||
wheel
|
||||
|
||||
# As required by pytest-cov.
|
||||
coverage >= 4.4
|
||||
|
|
Loading…
Reference in a new issue