Merge branch 'main' into extra-normalization

pypa · Sep 12, 2023 · 99bea32 · 99bea32
2 parents c94d81a + 8c24fd2
commit 99bea32
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 2 deletions.
diff --git a/tests/functional/test_install_extras.py b/tests/functional/test_install_extras.py
@@ -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"),
     ],
 )

diff --git a/tests/requirements-common_wheels.txt b/tests/requirements-common_wheels.txt
@@ -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