Update CI files for branch 2.20

.ci/scripts/check_release.py

@@ -99,9 +99,9 @@ def main(options: argparse.Namespace, template_config: dict[str, t.Any]) -> int:
 
     # Warning: This will not work if branch names contain "/" but we don't really care here.
     heads = [h.split("/")[-1] for h in repo.git.branch("--remote").split("\n")]
-    available_branches = [h for h in heads if re.fullmatch(RELEASE_BRANCH_REGEX, h)]
-    available_branches.sort(key=lambda ver: Version(ver))
-    available_branches.append(DEFAULT_BRANCH)
+    available_branches = sorted(
+        {h for h in heads if re.fullmatch(RELEASE_BRANCH_REGEX, h)}, key=lambda ver: Version(ver)
+    ) + [DEFAULT_BRANCH]
 
     branches = options.branches
     if branches == "supported":

.ci/scripts/check_requirements.py

@@ -9,7 +9,6 @@
 import warnings
 from packaging.requirements import Requirement
 
-
 CHECK_MATRIX = [
     ("pyproject.toml", True, True, True),
     ("requirements.txt", True, True, True),

.ci/scripts/collect_changes.py

@@ -25,7 +25,6 @@
 from git import GitCommandError, Repo
 from packaging.version import parse as parse_version
 
-
 PYPI_PROJECT = "pulp_container"
 
 # Read Towncrier settings

.github/workflows/build.yml

@@ -46,15 +46,15 @@ jobs:
           pulpcore-manager openapi --file "api.json"
           pulpcore-manager openapi --bindings --component "container" --file "container-api.json"
       - name: "Upload Package whl"
-        uses: "actions/upload-artifact@v5"
+        uses: "actions/upload-artifact@v7"
         with:
           name: "plugin_package"
           path: "pulp_container/dist/"
           if-no-files-found: "error"
           retention-days: 5
           overwrite: true
       - name: "Upload API specs"
-        uses: "actions/upload-artifact@v5"
+        uses: "actions/upload-artifact@v7"
         with:
           name: "api_spec"
           path: |
@@ -73,7 +73,7 @@ jobs:
           GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN }}"
           GITHUB_CONTEXT: "${{ github.event.pull_request.commits_url }}"
       - name: "Upload python client packages"
-        uses: "actions/upload-artifact@v5"
+        uses: "actions/upload-artifact@v7"
         with:
           name: "python-client.tar"
           path: |
@@ -82,7 +82,7 @@ jobs:
           retention-days: 5
           overwrite: true
       - name: "Upload python client docs"
-        uses: "actions/upload-artifact@v5"
+        uses: "actions/upload-artifact@v7"
         with:
           name: "python-client-docs.tar"
           path: |
@@ -100,7 +100,7 @@ jobs:
           GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN }}"
           GITHUB_CONTEXT: "${{ github.event.pull_request.commits_url }}"
       - name: "Upload Ruby client"
-        uses: "actions/upload-artifact@v5"
+        uses: "actions/upload-artifact@v7"
         with:
           name: "ruby-client.tar"
           path: |

.github/workflows/publish.yml

@@ -30,7 +30,7 @@ jobs:
       id-token: "write"
 
     steps:
-      - uses: "actions/download-artifact@v4"
+      - uses: "actions/download-artifact@v8"
         with:
           name: "plugin_package"
           path: "dist/"
@@ -53,7 +53,7 @@ jobs:
           path: "pulp_container"
 
       - name: "Download Python client"
-        uses: "actions/download-artifact@v4"
+        uses: "actions/download-artifact@v8"
         with:
           name: "python-client.tar"
           path: "pulp_container/"
@@ -82,7 +82,7 @@ jobs:
           path: "pulp_container"
 
       - name: "Download Ruby client"
-        uses: "actions/download-artifact@v4"
+        uses: "actions/download-artifact@v8"
         with:
           name: "ruby-client.tar"
           path: "pulp_container/"

.github/workflows/scripts/stage-changelog-for-default-branch.py

@@ -12,16 +12,13 @@
 from git import Repo
 from git.exc import GitCommandError
 
-
-helper = textwrap.dedent(
-    """\
+helper = textwrap.dedent("""\
         Stage the changelog for a release on main branch.
 
         Example:
             $ python .github/workflows/scripts/stage-changelog-for-default-branch.py 3.4.0
 
-    """
-)
+    """)
 
 parser = argparse.ArgumentParser(formatter_class=argparse.RawTextHelpFormatter, description=helper)
 

.github/workflows/test.yml

@@ -122,7 +122,7 @@ jobs:
           docker logs pulp 2>&1 | grep -i pulpcore.deprecation | tee deprecations-${{ matrix.env.TEST }}.txt
 
       - name: "Upload Deprecations"
-        uses: "actions/upload-artifact@v5"
+        uses: "actions/upload-artifact@v7"
         with:
           name: "deprecations-${{ matrix.env.TEST }}"
           path: "pulp_container/deprecations-${{ matrix.env.TEST }}.txt"

lint_requirements.txt

@@ -5,7 +5,7 @@
 #
 # For more info visit https://github.com/pulp/plugin_template
 
-black==24.3.0
+black~=26.3  # Pin style to the year. https://black.readthedocs.io/en/stable/faq.html#how-stable-is-black-s-style
 bump-my-version
 check-manifest
 flake8

pulp_container/app/models.py

@@ -34,7 +34,6 @@
 from pulp_container.app.utils import get_content_data
 from pulp_container.constants import MEDIA_TYPE, SIGNATURE_TYPE
 
-
 logger = getLogger(__name__)
 
 

pulp_container/app/serializers.py

@@ -253,25 +253,21 @@ class ContainerRemoteSerializer(RemoteSerializer):
         child=serializers.CharField(max_length=255),
         allow_null=True,
         required=False,
-        help_text=_(
-            """
+        help_text=_("""
             A list of tags to include during sync.
             Wildcards *, ? are recognized.
             'include_tags' is evaluated before 'exclude_tags'.
-            """
-        ),
+            """),
     )
     exclude_tags = serializers.ListField(
         child=serializers.CharField(max_length=255),
         allow_null=True,
         required=False,
-        help_text=_(
-            """
+        help_text=_("""
             A list of tags to exclude during sync.
             Wildcards *, ? are recognized.
             'exclude_tags' is evaluated after 'include_tags'.
-            """
-        ),
+            """),
     )
 
     policy = serializers.ChoiceField(

pulp_container/app/tasks/synchronize.py

@@ -13,7 +13,6 @@
 from .sync_stages import ContainerFirstStage, ContainerContentSaver
 from pulp_container.app.models import ContainerRemote, ContainerRepository
 
-
 log = logging.getLogger(__name__)
 
 

pulp_container/app/urls.py

@@ -14,7 +14,6 @@
     VersionView,
 )
 
-
 router = SimpleRouter(trailing_slash=False)
 
 head_route = Route(

pulp_container/app/viewsets.py

@@ -45,7 +45,6 @@
 
 from pulp_container.app import models, serializers, tasks
 
-
 log = logging.getLogger(__name__)
 
 

pulp_container/constants.py

@@ -1,6 +1,5 @@
 from types import SimpleNamespace
 
-
 MEDIA_TYPE = SimpleNamespace(
     MANIFEST_V1="application/vnd.docker.distribution.manifest.v1+json",
     MANIFEST_V1_SIGNED="application/vnd.docker.distribution.manifest.v1+prettyjws",

pulp_container/tests/functional/api/test_build_images.py

@@ -18,13 +18,11 @@
 def containerfile_name():
     """A fixture for a basic container file used for building images."""
     with NamedTemporaryFile() as containerfile:
-        containerfile.write(
-            b"""FROM busybox:latest
+        containerfile.write(b"""FROM busybox:latest
 # Copy a file using COPY statement. Use the relative path specified in the 'artifacts' parameter.
 COPY foo/bar/example.txt /tmp/inside-image.txt
 # Print the content of the file when the container starts
-CMD ["cat", "/tmp/inside-image.txt"]"""
-        )
+CMD ["cat", "/tmp/inside-image.txt"]""")
         containerfile.flush()
         yield containerfile.name