Update CI for python 3.12

Author: gerrod3

.github/workflows/build.yml

@@ -33,7 +33,7 @@ jobs:
           path: "pulp-openapi-generator"
       - uses: "actions/setup-python@v6"
         with:
-          python-version: "3.11"
+          python-version: "3.12"
       - name: "Install uv"
         uses: "astral-sh/setup-uv@v7"
         with:

.github/workflows/create-branch.yml

@@ -38,7 +38,7 @@ jobs:
 
       - uses: "actions/setup-python@v6"
         with:
-          python-version: "3.11"
+          python-version: "3.12"
       - name: "Install uv"
         uses: "astral-sh/setup-uv@v7"
         with:

.github/workflows/lint.yml

@@ -29,7 +29,7 @@ jobs:
 
       - uses: "actions/setup-python@v6"
         with:
-          python-version: "3.11"
+          python-version: "3.12"
       - name: "Install uv"
         uses: "astral-sh/setup-uv@v7"
         with:

.github/workflows/release.yml

@@ -33,7 +33,7 @@ jobs:
 
       - uses: "actions/setup-python@v6"
         with:
-          python-version: "3.11"
+          python-version: "3.12"
       - name: "Install uv"
         uses: "astral-sh/setup-uv@v7"
         with:

.github/workflows/update_ci.yml

@@ -34,7 +34,7 @@ jobs:
 
       - uses: "actions/setup-python@v6"
         with:
-          python-version: "3.11"
+          python-version: "3.12"
       - name: "Install uv"
         uses: "astral-sh/setup-uv@v7"
         with:

CHANGES/+bandersnatch-8.feature

@@ -1 +1 @@
-Upgraded Bandersnatch to 8.0. Full-index syncs now list packages via the PEP 691 Simple JSON API, falling back to HTML `/simple/` when JSON is unavailable.
+Upgraded Bandersnatch to 8.0. Full-index syncs now list packages from either the JSON or HTML representation of the Simple API.

pulp_python/app/tasks/sync.py

@@ -1,14 +1,14 @@
 import asyncio
+import json
 import logging
 from functools import partial
-from urllib.parse import urljoin, urlparse
+from urllib.parse import urlparse
 
-from aiohttp import ClientError
 from bandersnatch.configuration import BandersnatchConfig
 from bandersnatch.master import Master
 from bandersnatch.mirror import Mirror
 from packaging.requirements import Requirement
-from pypi_simple import IndexPage
+from pypi_simple import ACCEPT_ANY, IndexPage, UnsupportedContentTypeError
 
 from pulpcore.plugin.download import HttpDownloader
 from pulpcore.plugin.exceptions import SyncError
@@ -168,36 +168,28 @@ def __init__(self, serial, master, workers, deferred_download, python_stage, pro
 
     async def determine_packages_to_sync(self):
         """
-        Called when includes wasn't specified. List all projects from the remote
-        via the PEP 691 Simple JSON API, falling back to HTML /simple/.
+        Called when includes wasn't specified. List all projects from the remote's simple index.
         """
         logger.info("Syncing all packages from %s", self.master.url)
-        try:
-            simple_index = await self.master.fetch_simple_index()
-            if not isinstance(simple_index, dict) or "projects" not in simple_index:
-                raise ValueError("Simple JSON index is missing a projects list")
-            for project in simple_index["projects"]:
-                name = project.get("name")
-                if name is None:
-                    continue
-                # _last-serial is a PyPI extension; default to 0 when absent
-                self.packages_to_sync[name] = project.get("_last-serial", 0)
-            self.target_serial = max(
-                [self.synced_serial or 0] + [int(v) for v in self.packages_to_sync.values()]
-            )
-        except (ClientError, ValueError, TypeError, AttributeError) as exc:
-            logger.info(
-                "Failed to list packages via Simple JSON API (%s); "
-                "falling back to HTML simple index.",
-                exc,
-            )
-            url = urljoin(self.remote.url, "simple/")
-            downloader = self.remote.get_downloader(url=url)
-            result = await downloader.run()
-            with open(result.path) as f:
-                index = IndexPage.from_html(f.read())
-            self.packages_to_sync.update({p: 0 for p in index.projects})
-            self.target_serial = result.headers.get(PYPI_LAST_SERIAL, 0)
+        url = f"{self.remote.url.rstrip('/')}/simple/"
+        downloader = self.remote.get_downloader(url=url)
+        result = await downloader.run(
+            extra_data={"request_kwargs": {"headers": {"Accept": ACCEPT_ANY}}}
+        )
+
+        content_type = result.headers.get("Content-Type", "text/html").partition(";")[0].lower()
+        with open(result.path, "rb") as f:
+            content = f.read()
+
+        if content_type == "application/vnd.pypi.simple.v1+json":
+            index = IndexPage.from_json_data(json.loads(content))
+        elif content_type in {"application/vnd.pypi.simple.v1+html", "text/html"}:
+            index = IndexPage.from_html(content)
+        else:
+            raise UnsupportedContentTypeError(url, content_type)
+
+        self.packages_to_sync = {project: 0 for project in index.projects}
+        self.target_serial = index.last_serial or result.headers.get(PYPI_LAST_SERIAL, 0)
 
         self._filter_packages()
         if self.target_serial:

pulp_python/tests/functional/api/test_download_content.py

@@ -48,7 +48,7 @@ def test_full_fixtures_to_pulp_sync(
 ):
     """
     This test checks that Pulp can fully sync another Python Package repository that is not
-    PyPI. This lists projects via the Simple JSON API, falling back to HTML /simple/.
+    PyPI. This lists projects from the remote's Simple API index.
     """
     # Repository we are syncing from is the fixtures (default url)
     remote = python_remote_factory(includes=[], prereleases=True)