Update CI files for branch 2.15

.ci/scripts/schema.py

@@ -7,6 +7,7 @@
 But some pulp paths start with curly brackets e.g. {artifact_href}
 This script modifies drf-spectacular schema validation to accept slashes and curly brackets.
 """
+
 import json
 from drf_spectacular.validation import JSON_SCHEMA_SPEC_PATH
 

.github/template_gitref

@@ -1 +1 @@
-2021.08.26-324-gb820cc2
+2021.08.26-326-ge5addc7

.github/workflows/scripts/script.sh

@@ -31,6 +31,7 @@ if [[ "$TEST" = "docs" ]]; then
   if [[ "$GITHUB_WORKFLOW" == "Container CI" ]]; then
     towncrier build --yes --version 4.0.0.ci
   fi
+  # Legacy Docs Build
   cd docs
   make PULP_URL="$PULP_URL" diagrams html
   tar -cvf docs.tar ./_build

lint_requirements.txt

@@ -6,7 +6,7 @@
 # For more info visit https://github.com/pulp/plugin_template
 
 # python packages handy for developers, but not required by pulp
-black==23.12.1
+black==24.3.0
 check-manifest
 flake8
 flake8-black

pulp_container/app/registry_api.py

@@ -4,6 +4,7 @@
 . _Plugin Writer's Guide:
     http://docs.pulpproject.org/plugins/plugin-writer/index.html
 """
+
 import base64
 import binascii
 import json

pulp_container/app/tasks/sync_stages.py

@@ -485,9 +485,12 @@ async def create_listed_manifest(self, manifest_data):
 
             manifest = Manifest(
                 digest=digest,
-                schema_version=2
-                if manifest_data["mediaType"] in (MEDIA_TYPE.MANIFEST_V2, MEDIA_TYPE.MANIFEST_OCI)
-                else 1,
+                schema_version=(
+                    2
+                    if manifest_data["mediaType"]
+                    in (MEDIA_TYPE.MANIFEST_V2, MEDIA_TYPE.MANIFEST_OCI)
+                    else 1
+                ),
                 media_type=manifest_data["mediaType"],
             )
 

pulp_container/app/viewsets.py

@@ -4,6 +4,7 @@
 . _Plugin Writer's Guide:
     http://docs.pulpproject.org/plugins/plugin-writer/index.html
 """
+
 import logging
 
 from django.db import IntegrityError

pulp_container/tests/functional/api/test_content_cache.py

@@ -1,4 +1,5 @@
 """Tests related to the Redis content caching."""
+
 import os
 import requests
 import unittest

pulp_container/tests/functional/api/test_crud_distributions.py

@@ -1,4 +1,5 @@
 """Tests that CRUD distributions."""
+
 import json
 import unittest
 

pulp_container/tests/functional/api/test_crud_remotes.py

@@ -1,4 +1,5 @@
 """Tests that CRUD container remotes."""
+
 from random import choice
 import unittest
 

pulp_container/tests/functional/api/test_pull_content.py

@@ -1,4 +1,5 @@
 """Tests that verify that images served by Pulp can be pulled."""
+
 import contextlib
 import hashlib
 import json

pulp_container/tests/functional/api/test_pulpimportexport.py

@@ -4,6 +4,7 @@
 NOTE: assumes ALLOWED_EXPORT_PATHS setting contains "/tmp" - all tests will fail if this is not
 the case.
 """
+
 import pytest
 import uuid
 

pulp_container/tests/functional/api/test_push_content.py

@@ -1,4 +1,5 @@
 """Tests that verify that images can be pushed to Pulp."""
+
 import json
 import pytest
 import requests

pulp_container/tests/functional/api/test_push_signatures.py

@@ -1,4 +1,5 @@
 """Tests that verify that an image signature can be pushed to Pulp."""
+
 import base64
 import json
 import pytest

pulp_container/tests/functional/api/test_rbac_push_repositories.py

@@ -1,4 +1,5 @@
 """Tests that verify that RBAC for push repository works properly."""
+
 import pytest
 
 from pulp_smash import utils

pulp_container/tests/functional/api/test_rbac_remotes.py

@@ -1,4 +1,5 @@
 """Tests that container remotes have RBAC."""
+
 from random import choice
 import pytest
 

pulp_container/tests/functional/api/test_rbac_repo_content.py

@@ -1,4 +1,5 @@
 """Tests that verify that RBAC for content works properly."""
+
 import pytest
 
 from pulp_smash.pulp3.bindings import monitor_task

pulp_container/tests/functional/api/test_rbac_repo_versions.py

@@ -1,4 +1,5 @@
 """Tests that verify that RBAC for repository versions work properly."""
+
 import pytest
 
 from pulp_smash import utils

pulp_container/tests/functional/api/test_rbac_sync_repositories.py

@@ -1,4 +1,5 @@
 """Tests that container sync repositories have RBAC."""
+
 import pytest
 
 from pulp_smash import utils

pulp_container/tests/functional/api/test_recursive_add.py

@@ -1,4 +1,5 @@
 """Tests that recursively add container content to repositories."""
+
 from pulp_smash.pulp3.bindings import (
     delete_orphans,
     monitor_task,

pulp_container/tests/functional/api/test_recursive_remove.py

@@ -1,4 +1,5 @@
 """Tests that recursively remove container content from repositories."""
+
 import unittest
 
 from urllib.parse import urlparse

pulp_container/tests/functional/api/test_repositories_list.py

@@ -1,4 +1,5 @@
 """Tests for fetching the list of all repositories."""
+
 import unittest
 
 from urllib.parse import urljoin

pulp_container/tests/functional/api/test_sync.py

@@ -1,4 +1,5 @@
 """Tests that sync container plugin repositories."""
+
 import pytest
 from pulpcore.tests.functional import PulpTaskError
 

pulp_container/tests/functional/api/test_tagging_images.py

@@ -1,4 +1,5 @@
 """Tests for tagging and untagging images."""
+
 import unittest
 
 from urllib.parse import urlparse

pulp_container/tests/functional/api/test_token_authentication.py

@@ -1,4 +1,5 @@
 """Tests for token authentication."""
+
 import aiohttp
 import asyncio
 import unittest

pulp_container/tests/functional/utils.py

@@ -1,4 +1,5 @@
 """Utilities for tests for the container plugin."""
+
 import pytest
 import requests
 

template_config.yml

@@ -1,7 +1,7 @@
 # This config represents the latest values used when running the plugin-template. Any settings that
 # were not present before running plugin-template have been added with their default values.
 
-# generated with [email protected]319-ga283c28
+# generated with [email protected]326-ge5addc7
 
 api_root: /pulp/
 black: true
@@ -82,4 +82,6 @@ test_performance: false
 test_reroute: true
 test_s3: true
 use_issue_template: true
+use_legacy_docs: true
+use_unified_docs: false