Link standalone versions from joint release PEPs

Author: BHUVANSH855

pep_sphinx_extensions/pep_zero_generator/pep_index_generator.py

@@ -67,22 +67,11 @@ def build_release_peps(peps: list[parser.PEP]) -> dict[str, int]:
     (e.g. "2.6, 3.0"), so individual versions also resolve.
     """
     release_peps: dict[str, int] = {}
-    release_versions = {
-        pep.python_version
-        for pep in peps
-        if pep.python_version and "release" in pep.topic
-    }
 
     for pep in peps:
-        if not pep.python_version or "release" not in pep.topic:
-            continue
-
-        release_peps[pep.python_version] = pep.number
-
-        if "," in pep.python_version:
+        if pep.python_version and "release" in pep.topic:
             for version in map(str.strip, pep.python_version.split(",")):
-                if version not in release_versions:
-                    release_peps[version] = pep.number
+                release_peps[version] = pep.number
 
     return release_peps
 

pep_sphinx_extensions/pep_zero_generator/writer.py

@@ -88,26 +88,19 @@ def emit_pep_row(
         self.emit_text(f"     - :pep:`{title.replace('`', '')} <{number}>`")
         self.emit_text(f"     - {authors}")
         if python_version is not None:
-            pep_number = self.release_peps.get(python_version)
+            linked_versions = []
 
-            if pep_number is not None:
-                self.emit_text(
-                    f"     - :pep:`{python_version} <{pep_number}>`"
-                )
-            else:
-                versions = [version.strip() for version in python_version.split(",")]
-
-                linked_versions = []
-                for version in versions:
-                    release_pep = self.release_peps.get(version)
-                    if release_pep is not None:
-                        linked_versions.append(
-                            f":pep:`{version} <{release_pep}>`"
-                        )
-                    else:
-                        linked_versions.append(version)
-
-                self.emit_text(f"     - {', '.join(linked_versions)}")
+            for version in map(str.strip, python_version.split(",")):
+                release_pep = self.release_peps.get(version)
+
+                if release_pep is not None:
+                    linked_versions.append(
+                        f":pep:`{version} <{release_pep}>`"
+                    )
+                else:
+                    linked_versions.append(version)
+
+            self.emit_text(f"     - {', '.join(linked_versions)}")
 
     def emit_column_headers(self, *, include_version=True) -> None:
         """Output the column headers for the PEP indices."""

pep_sphinx_extensions/tests/pep_zero_generator/test_pep_index_generator.py

@@ -18,6 +18,5 @@ def test_build_release_peps_links_individual_versions_from_joint_release_pep():
 
     release_peps = pep_index_generator.build_release_peps(peps)
 
-    assert release_peps["2.6, 3.0"] == 361
     assert release_peps["2.6"] == 361
     assert release_peps["3.0"] == 361

pep_sphinx_extensions/tests/pep_zero_generator/test_writer.py

@@ -88,22 +88,29 @@ def test_sort_authors():
     assert out == ["Aardvark, Alfred", "lowercase, laurence", "Zebra, Zoë"]
 
 
+release_peps = {
+    "2.4": 320,
+    "2.5": 356,
+    "2.6": 361,
+}
+
+
 @pytest.mark.parametrize(
-    ("python_version", "release_peps", "expected"),
+    ("python_version", "expected"),
     [
-        ("3.14", {"3.14": 745}, "     - :pep:`3.14 <745>`"),
-        ("2.6, 3.0", {"2.6, 3.0": 361}, "     - :pep:`2.6, 3.0 <361>`"),
-        ("2.7, 3.1", {"2.7, 3.1": 375}, "     - :pep:`2.7, 3.1 <375>`"),
+        ("3.14", "     - 3.14"),
         (
             "2.4, 2.5, 2.6",
-            {"2.4, 2.5, 2.6": 320},
-            "     - :pep:`2.4, 2.5, 2.6 <320>`",
+            "     - :pep:`2.4 <320>`, :pep:`2.5 <356>`, :pep:`2.6 <361>`",
+        ),
+        (
+            "2.4, 2.9",
+            "     - :pep:`2.4 <320>`, 2.9",
         ),
     ],
 )
 def test_emit_pep_row_links_python_version_to_release_pep(
     python_version,
-    release_peps,
     expected,
 ):
     # Arrange