Treat rebuilds as PEP 440 local versions (+test.N) instead of Maven-style .letters-dash suffixes.

Python versions group on the public version (everything before +); release is the local identifier. Catalog still keeps the newest pulp_created unit per public version.

Assisted-By: Cursor

Author: TenSt

docs/user/guides/catalog.md

@@ -34,8 +34,8 @@ http GET "${BASE_ADDR}/pulp/api/v3/repositories/python/python/${REPO_PK}/package
 
 - `versions` is the list of version numbers, newest first (PEP 440, so `1.10` before `1.9`).
 - `latest_releases` is the same versions with extra metadata. `release` is filled when
-  that version has a rebuild (for example `5.3.17.rhlw-00001` is shown as version
-  `5.3.17` with `release` `rhlw-00001`); otherwise it is empty.
+  that version has a rebuild (for example `5.3.17+test.1` is shown as version
+  `5.3.17` with `release` `test.1`); otherwise it is empty.
 - `created_at` is when that version was added to the repository.
 - `last_updated` is when **any** file for the package last changed in this repository
   version, including a rebuild of an older version.
@@ -99,8 +99,8 @@ http GET "${BASE_ADDR}/pulp/api/v3/content/python/packages/" \
   repository_version=="${LATEST_VERSION_HREF}"
 ```
 
-Each content row includes `base_version`: the version without a rebuild suffix
-(equal to `version` when there is none).
+Each content row includes `base_version`: the version without a PEP 440 local
+version (equal to `version` when there is none).
 
 To fetch a single version, omit `collapse_builds` and filter by `name`, `version`,
 and `packagetype`:

pulp_python/app/catalog.py

@@ -15,7 +15,7 @@
 
 
 def base_version_annotation(field_name="version"):
-    """SQL expression that strips a trailing rebuild suffix from ``version``.
+    """SQL expression that strips a PEP 440 local version from ``version``.
 
     Uses ``versions.BUILD_SUFFIX_PATTERN`` (POSIX) so Python ``strip_build_suffix``
     and this ``REGEXP_REPLACE`` stay aligned. Implemented with ``REGEXP_REPLACE``
@@ -34,7 +34,7 @@ def base_version_annotation(field_name="version"):
 def collapse_python_builds(queryset):
     """Keep one content unit per ``(name_normalized, base_version)``.
 
-    ``base_version`` is ``version`` with a trailing rebuild suffix stripped.
+    ``base_version`` is ``version`` with a PEP 440 local version stripped.
     The unit with the latest ``pulp_created`` is kept. Callers that want one
     row per logical version (not per wheel/sdist) should also filter
     ``packagetype``.

pulp_python/app/serializers.py

@@ -234,8 +234,8 @@ class PythonPackageContentSerializer(core_serializers.SingleArtifactContentUploa
     )
     base_version = serializers.SerializerMethodField(
         help_text=_(
-            "The package version with a trailing rebuild suffix stripped "
-            "(matching %s). Equal to version when no suffix is present."
+            "The package version with a PEP 440 local version stripped "
+            "(matching %s). Equal to version when no local version is present."
         )
         % BUILD_SUFFIX_PATTERN,
     )
@@ -659,13 +659,13 @@ class PythonPackageReleaseSerializer(serializers.Serializer):
     """One logical version on the repository package index."""
 
     version = serializers.CharField(
-        help_text=_("Logical version key (rebuild suffix stripped)."),
+        help_text=_("Logical version key (PEP 440 local version stripped)."),
     )
     release = serializers.CharField(
         help_text=_(
-            "Rebuild/release qualifier within the version line "
-            "(e.g. rhlw-00001 or rhlw-00001-n0001). "
-            "Empty when the selected unit has no rebuild suffix."
+            "PEP 440 local identifier within the version line "
+            "(e.g. test.1 or test.1.n1). "
+            "Empty when the selected unit has no local version."
         ),
         allow_blank=True,
     )

pulp_python/app/versions.py

@@ -8,8 +8,8 @@
 
 from packaging.version import InvalidVersion, Version
 
-# Last dot-segment is a rebuild if it is letters, dash, rest of that segment.
-BUILD_SUFFIX_PATTERN = r"\.[a-zA-Z]+-[^.]+$"
+# PEP 440 local version: ``+`` through the end of the string (POSIX, shared with SQL).
+BUILD_SUFFIX_PATTERN = r"\+.*$"
 BUILD_SUFFIX_RE = re.compile(BUILD_SUFFIX_PATTERN)
 
 PACKAGE_INDEX_ORDERING_FIELDS = frozenset({"name", "name_normalized", "last_updated"})
@@ -18,25 +18,24 @@
 
 
 def strip_build_suffix(version):
-    """Return ``version`` with a trailing rebuild suffix removed, else unchanged.
+    """Return ``version`` with a PEP 440 local version removed, else unchanged.
 
-    A rebuild is the last dot-segment matching ``BUILD_SUFFIX_PATTERN``.
+    A rebuild is the local version (``+`` through the end of the string).
     """
     if not version:
         return version
     return BUILD_SUFFIX_RE.sub("", version)
 
 
 def rebuild_release(version):
-    """Return the rebuild qualifier without the leading dot, or an empty string."""
+    """Return the PEP 440 local identifier without the leading ``+``, or empty."""
     if not version:
         return ""
     base = strip_build_suffix(version)
     if version == base:
         return ""
-    if version.startswith(base + "."):
-        return version[len(base) + 1 :]
-    return ""
+    # strip_build_suffix removes ``+local``; skip the ``+``.
+    return version[len(base) + 1 :]
 
 
 def version_sort_key(version):

pulp_python/app/viewsets.py

@@ -720,9 +720,9 @@ class PythonPackageContentFilter(core_viewsets.ContentFilter):
     collapse_builds = drf_filters.BooleanFilter(
         method="filter_collapse_builds",
         help_text=(
-            "When true, collapse rebuilds of the same logical version: strip a trailing "
-            f"suffix matching {BUILD_SUFFIX_PATTERN} from version, then keep one content unit "
-            "per (name_normalized, base_version) with the latest pulp_created. "
+            "When true, collapse rebuilds of the same logical version: strip a PEP 440 "
+            f"local version matching {BUILD_SUFFIX_PATTERN} from version, then keep one "
+            "content unit per (name_normalized, base_version) with the latest pulp_created. "
             "Pass packagetype=sdist so wheel and sdist files are not collapsed together. "
             "Default false."
         ),

pulp_python/tests/functional/api/test_catalog.py

@@ -361,7 +361,7 @@ def test_package_list_ordering_last_updated(
         tmp_path,
         repo,
         later_name,
-        "1.0.0.rhlw-00003",
+        "1.0.0+test.3",
     )
     after_rebuild = _api_get(
         bindings_cfg, f"{repo.pulp_href}packages/", ordering="-last_updated", limit=100
@@ -372,7 +372,7 @@ def test_package_list_ordering_last_updated(
     assert set(zzz["versions"]) == {"2.0.0", "1.0.0"}
     assert zzz["versions"][0] == "2.0.0"
     rebuild_rel = next(rel for rel in zzz["latest_releases"] if rel["version"] == "1.0.0")
-    assert rebuild_rel["release"] == "rhlw-00003"
+    assert rebuild_rel["release"] == "test.3"
     assert zzz["last_updated"] == rebuild_rel["created_at"]
     public_rel = next(rel for rel in zzz["latest_releases"] if rel["version"] == "2.0.0")
     assert public_rel["release"] == ""
@@ -392,7 +392,7 @@ def test_public_and_predisclosure_collapse_to_logical_version(
         tmp_path,
         repo,
         name,
-        "5.3.17.rhlw-00001-n0001",
+        "5.3.17+test.1.n1",
     )
 
     pkgs = _api_get(bindings_cfg, f"{repo.pulp_href}packages/")
@@ -402,7 +402,7 @@ def test_public_and_predisclosure_collapse_to_logical_version(
     assert pkg["versions"] == ["5.3.17"]
     assert len(pkg["latest_releases"]) == 1
     assert pkg["latest_releases"][0]["version"] == "5.3.17"
-    assert pkg["latest_releases"][0]["release"] == "rhlw-00001-n0001"
+    assert pkg["latest_releases"][0]["release"] == "test.1.n1"
 
     metrics = _api_get(bindings_cfg, f"{repo.pulp_href}metrics/")
     assert metrics == {"package_count": 1, "version_count": 1, "build_count": 2}
@@ -432,7 +432,7 @@ def test_public_and_predisclosure_collapse_to_logical_version(
     assert collapsed["count"] == 1
     kept = collapsed["results"][0]
     assert kept["base_version"] == "5.3.17"
-    assert kept["version"] == "5.3.17.rhlw-00001-n0001"
+    assert kept["version"] == "5.3.17+test.1.n1"
 
 
 @pytest.mark.parallel

pulp_python/tests/unit/test_catalog.py

@@ -16,26 +16,29 @@
 )
 
 
+# A rebuild is a PEP 440 local version: from ``+`` through the end of the
+# string. The public version is everything before ``+``. ``release`` is the
+# local identifier without the leading ``+``.
 @pytest.mark.parametrize(
     "version,expected",
     [
         ("0.1", "0.1"),
         ("5.3.17", "5.3.17"),
         ("5.3.18", "5.3.18"),
         ("5.3.180", "5.3.180"),
-        ("5.3.17.rhlw-00001", "5.3.17"),
-        ("5.3.18.rhlw-00003", "5.3.18"),
-        ("5.3.17.rhlw-00001-n0001", "5.3.17"),
-        ("5.3.18.lw-1", "5.3.18"),
-        ("1.0.0.abc-1", "1.0.0"),
-        ("1.0.0.ABC-99", "1.0.0"),
-        ("1.0.foo-bar", "1.0"),
-        ("1.0.rhlw-١", "1.0"),
+        ("5.3.17+test.1", "5.3.17"),
+        ("5.3.18+test.2", "5.3.18"),
+        ("5.3.17+test.1.n1", "5.3.17"),
+        ("5.3.17+test.1.n1.hf2", "5.3.17"),
+        ("1.0.0+foo.bar", "1.0.0"),
+        ("1.2.3a1+test.1", "1.2.3a1"),
+        ("1!1.2.3+test.1", "1!1.2.3"),
+        ("1.0+", "1.0"),
         ("4.3.0-redhat-1", "4.3.0-redhat-1"),
         ("5.3.18-anything", "5.3.18-anything"),
         ("5.3.18.anything", "5.3.18.anything"),
-        ("1.0.rhlw-00003.extra", "1.0.rhlw-00003.extra"),
-        ("1.0.rhlw-", "1.0.rhlw-"),
+        ("5.3.17.test-00001", "5.3.17.test-00001"),
+        ("1.0.test-1.extra", "1.0.test-1.extra"),
         ("", ""),
         (None, None),
     ],
@@ -48,17 +51,17 @@ def test_strip_build_suffix(version, expected):
     "version,expected",
     [
         ("5.3.18", ""),
-        ("5.3.17.rhlw-00001", "rhlw-00001"),
-        ("5.3.18.rhlw-00003", "rhlw-00003"),
-        ("5.3.17.rhlw-00001-n0001", "rhlw-00001-n0001"),
-        ("5.3.18.lw-1", "lw-1"),
-        ("0.1.rhlw-00003", "rhlw-00003"),
-        ("1.0.foo-bar", "foo-bar"),
-        ("1.0.rhlw-١", "rhlw-١"),
+        ("5.3.17+test.1", "test.1"),
+        ("5.3.18+test.2", "test.2"),
+        ("5.3.17+test.1.n1", "test.1.n1"),
+        ("5.3.17+test.1.n1.hf2", "test.1.n1.hf2"),
+        ("1.0.0+foo.bar", "foo.bar"),
+        ("1.2.3a1+test.1", "test.1"),
+        ("1.0+", ""),
         ("5.3.18.anything", ""),
         ("4.3.0-redhat-1", ""),
         ("5.3.18-anything", ""),
-        ("1.0.rhlw-", ""),
+        ("5.3.17.test-00001", ""),
         ("", ""),
         (None, ""),
     ],