Merge branch 'main' into fix/greater-than-dev-postrelease-exclusion

# Conflicts:
#	tests/test_specifiers.py

Author: notatallshaw

src/packaging/specifiers.py

@@ -60,15 +60,12 @@ def _post_base(version: Version) -> Version:
     return version.__replace__(post=None, dev=None, local=None)
 
 
-def _base_version(version: Version) -> Version:
-    if (
-        version.pre is None
-        and version.post is None
-        and version.dev is None
-        and version.local is None
-    ):
-        return version
-    return version.__replace__(pre=None, post=None, dev=None, local=None)
+def _earliest_prerelease(version: Version) -> Version:
+    """Earliest pre-release of *version*.
+
+    1.2 -> 1.2.dev0, 1.2.post1 -> 1.2.post1.dev0.
+    """
+    return version.__replace__(dev=0, local=None)
 
 
 class InvalidSpecifier(ValueError):
@@ -569,14 +566,12 @@ def _compare_less_than(self, prospective: Version, spec_str: str) -> bool:
         if not prospective < spec:
             return False
 
-        # This special case is here so that, unless the specifier itself
-        # includes is a pre-release version, that we do not accept pre-release
-        # versions for the version mentioned in the specifier (e.g. <3.1 should
-        # not match 3.1.dev0, but should match 3.0.dev0).
+        # The spec says: "<V MUST NOT allow a pre-release of the specified
+        # version unless the specified version is itself a pre-release."
         if (
             not spec.is_prerelease
             and prospective.is_prerelease
-            and _base_version(prospective) == _base_version(spec)
+            and prospective >= _earliest_prerelease(spec)
         ):
             return False
 

tests/test_specifiers.py

@@ -817,6 +817,35 @@ def test_specifier_prereleases_detection(
             # >V.devN: locals and different bases
             (">1.0.dev1", "1.1.post0", None, None, True),
             (">1.0.dev1", "0.9.post0", None, None, False),
+            # <V.postN: pre-releases of V.postN itself are excluded
+            ("<1.0.post1", "1.0.post1.dev0", None, None, False),
+            ("<1.0.post0", "1.0.post0.dev0", None, None, False),
+            # <V.postN: pre-releases of the base release are NOT
+            # pre-releases of V.postN, so they are accepted
+            ("<1.0.post1", "1.0.dev0", None, None, True),
+            ("<1.0.post1", "1.0a1", None, None, True),
+            ("<1.0.post1", "1.0rc1", None, None, True),
+            ("<1.0.post0", "1.0.dev0", None, None, True),
+            ("<1.0.post0", "1.0a1", None, None, True),
+            ("<1.0.post0", "1.0b1", None, None, True),
+            ("<1.0.post0", "1.0rc2", None, None, True),
+            # <V.postN: dev of a different post is not a pre-release
+            # of V.postN either
+            ("<1.0.post1", "1.0.post0.dev0", None, None, True),
+            ("<1.0.post2", "1.0.post1.dev0", None, None, True),
+            # <V.postN: non-pre-release versions below V.postN
+            ("<1.0.post1", "1.0", None, None, True),
+            ("<1.0.post1", "1.0.post0", None, None, True),
+            ("<1.0.post1", "0.9", None, None, True),
+            ("<1.0.post0", "1.0", None, None, True),
+            # <V.postN: higher post numbers
+            ("<1.0.post10", "1.0.dev0", None, None, True),
+            ("<1.0.post10", "1.0.post9.dev0", None, None, True),
+            ("<1.0.post10", "1.0.post9", None, None, True),
+            # <V.postN: locals and different bases
+            ("<1.0.post1", "1.0+local", None, None, True),
+            ("<1.0.post1", "1.0.post0+local", None, None, True),
+            ("<1.0.post1", "0.9.dev0", None, None, True),
             ("<=2.0", "1.0.dev1", False, None, False),
             ("<=2.0a1", "1.0.dev1", False, None, False),
             ("<=2.0", "1.0.dev1", None, False, False),
@@ -1987,6 +2016,26 @@ def test_filter_exclusionary_bridges(
             # != can remove some versions but post-releases still match
             (">1.0.dev1,!=1.0,<=2.0", None, "1.0.post0", True),
             (">1.0.dev1,!=1.0,!=1.0.post0,<=2.0", None, "1.0.post1", True),
+            # <V.postN combined with other specifiers: pre-releases of
+            # the base release are accepted (they are not pre-releases
+            # of V.postN).
+            ("==1.0.dev0,<1.0.post1", None, "1.0.dev0", True),
+            ("==1.0a1,<1.0.post0", None, "1.0a1", True),
+            ("==1.0.post0.dev0,<1.0.post1", None, "1.0.post0.dev0", True),
+            (">=1.0,<1.0.post1", None, "1.0", True),
+            (">=1.0,<1.0.post1", None, "1.0.post0", True),
+            # 1.0.dev0 < 1.0, so it fails >=1.0 regardless of <
+            (">=1.0,<1.0.post1", True, "1.0.dev0", False),
+            # With a lower bound that includes pre-releases
+            (">=1.0.dev0,<1.0.post1", True, "1.0.dev0", True),
+            (">=1.0.dev0,<1.0.post1", True, "1.0.a1", True),
+            (">=1.0.dev0,<1.0.post1", True, "1.0.post0.dev0", True),
+            # != can remove non-pre-releases but pre-releases still match
+            (">=1.0.dev0,<1.0.post1,!=1.0,!=1.0.post0", True, "1.0.dev0", True),
+            (">=1.0.dev0,<1.0.post1,!=1.0,!=1.0.post0", True, "1.0.post0.dev0", True),
+            # Post-release survivors still match
+            (">=1.0.dev0,<1.0.post2,!=1.0,!=1.0.post0", True, "1.0.post1", True),
+            (">=1.0.dev0,<1.0.post2,!=1.0", True, "1.0.post0", True),
         ],
     )
     def test_contains_exclusionary_bridges(