[stable-4.5] Update pulp container to 2.10.7 and bump version to 2.5.2 (

#1429) * Update pulp container to 2.10.7 and Bump version to 4.5.2 No-Issue
ansible · Aug 24, 2022 · 4f067a9 · 4f067a9
1 parent c7b0dde
commit 4f067a9
Show file tree

Hide file tree

Showing 13 changed files with 102 additions and 105 deletions.
diff --git a/.github/workflows/scripts/before_install.sh b/.github/workflows/scripts/before_install.sh
@@ -132,7 +132,7 @@ fi
 
 cd ..
 
-git clone --depth=1 https://github.com/pulp/pulp_container.git --branch 2.10.2
+git clone --depth=1 https://github.com/pulp/pulp_container.git --branch 2.10.7
 cd pulp_container
 
 if [ -n "$PULP_CONTAINER_PR_NUMBER" ]; then

diff --git a/.github/workflows/scripts/install.sh b/.github/workflows/scripts/install.sh
@@ -35,7 +35,7 @@ fi
 if [ -e $REPO_ROOT/../pulp_container ]; then
   PULP_CONTAINER=./pulp_container
 else
-  PULP_CONTAINER=git+https://github.com/pulp/pulp_container.git@2.10.2
+  PULP_CONTAINER=git+https://github.com/pulp/pulp_container.git@2.10.7
 fi
 
 if [ -e $REPO_ROOT/../galaxy-importer ]; then

diff --git a/CHANGES.rst b/CHANGES.rst
@@ -13,7 +13,9 @@ Changelog
 
 .. towncrier release notes start
 
-4.5.1 (2022-08-22)
+4.5.2 (2022-08-23)
+==================
+
 Features
 --------
 
@@ -41,6 +43,9 @@ Misc
 ----
 
 
+4.5.0 (2022-05-04)
+==================
+
 Features
 --------
 

diff --git a/galaxy_ng/__init__.py b/galaxy_ng/__init__.py
@@ -1,3 +1,3 @@
-__version__ = "4.5.1"
+__version__ = "4.5.2"
 
 default_app_config = "galaxy_ng.app.PulpGalaxyPluginAppConfig"
diff --git a/galaxy_ng/app/__init__.py b/galaxy_ng/app/__init__.py
@@ -6,7 +6,7 @@ class PulpGalaxyPluginAppConfig(PulpPluginAppConfig):
 
     name = "galaxy_ng.app"
     label = "galaxy"
-    version = "4.5.1"
+    version = "4.5.2"
 
     def ready(self):
         super().ready()

diff --git a/galaxy_ng/tests/functional/api/test_container_repository_tags.py b/galaxy_ng/tests/functional/api/test_container_repository_tags.py
@@ -4,7 +4,7 @@
 
 from pulpcore.client.galaxy_ng.exceptions import ApiException
 from pulp_container.tests.functional.api import rbac_base
-from pulp_container.tests.functional.constants import DOCKERHUB_PULP_FIXTURE_1
+from pulp_container.tests.functional.constants import PULP_FIXTURE_1
 from pulp_smash import cli
 
 from galaxy_ng.tests.functional.utils import TestCaseUsingBindings
@@ -37,11 +37,11 @@ def setUpClass(cls):
         cls.registry_name = urlparse(cls.cfg.get_base_url()).netloc
         admin_user, admin_password = cls.cfg.pulp_auth
         cls.user_admin = {"username": admin_user, "password": admin_password}
-        cls._pull(f"{DOCKERHUB_PULP_FIXTURE_1}:manifest_a")
+        cls._pull(f"{PULP_FIXTURE_1}:manifest_a")
 
     def test_list_container_repository_tags(self):
         image_name = "foo/bar"
-        image_path = f"{DOCKERHUB_PULP_FIXTURE_1}:manifest_a"
+        image_path = f"{PULP_FIXTURE_1}:manifest_a"
         local_url = "/".join([self.registry_name, f"{image_name}:1.0"])
 
         # expect the Container Repository Tags not to exist yet

diff --git a/galaxy_ng/tests/functional/api/test_container_sync_and_manifest_lists.py b/galaxy_ng/tests/functional/api/test_container_sync_and_manifest_lists.py
@@ -1,11 +1,3 @@
-import unittest
-
-from urllib.parse import urlparse
-
-from pulpcore.client.galaxy_ng.exceptions import ApiException
-from pulp_container.tests.functional.api import rbac_base
-from pulp_container.tests.functional.constants import DOCKERHUB_PULP_FIXTURE_1
-from pulp_smash import cli
 from pulp_smash.pulp3.bindings import monitor_task
 
 from galaxy_ng.tests.functional.utils import TestCaseUsingBindings

diff --git a/requirements/requirements.common.txt b/requirements/requirements.common.txt
@@ -1,5 +1,5 @@
 #
-# This file is autogenerated by pip-compile with python 3.9
+# This file is autogenerated by pip-compile
 # To update, run:
 #
 #    pip-compile --output-file=requirements/requirements.common.txt setup.py
@@ -41,10 +41,10 @@ backoff==1.11.1
     # via pulpcore
 bindep==2.10.2
     # via ansible-builder
-bleach==3.3.1
-    # via galaxy-importer
 bleach-allowlist==1.0.3
     # via galaxy-importer
+bleach==3.3.1
+    # via galaxy-importer
 bracex==2.2.1
     # via wcmatch
 certifi==2021.10.8
@@ -76,21 +76,6 @@ diff-match-patch==20200713
     # via django-import-export
 distro==1.7.0
     # via bindep
-django==3.2.13
-    # via
-    #   django-auth-ldap
-    #   django-automated-logging
-    #   django-currentuser
-    #   django-filter
-    #   django-guardian
-    #   django-guid
-    #   django-import-export
-    #   django-lifecycle
-    #   django-picklefield
-    #   djangorestframework
-    #   drf-nested-routers
-    #   drf-spectacular
-    #   pulpcore
 django-auth-ldap==4.0.0
     # via galaxy-ng (setup.py)
 django-automated-logging==6.1.3
@@ -113,14 +98,29 @@ django-picklefield==3.0.1
     # via django-automated-logging
 django-prometheus==2.2.0
     # via galaxy-ng (setup.py)
-djangorestframework==3.13.1
+django==3.2.13
     # via
-    #   drf-access-policy
+    #   django-auth-ldap
+    #   django-automated-logging
+    #   django-currentuser
+    #   django-filter
+    #   django-guardian
+    #   django-guid
+    #   django-import-export
+    #   django-lifecycle
+    #   django-picklefield
+    #   djangorestframework
     #   drf-nested-routers
     #   drf-spectacular
     #   pulpcore
 djangorestframework-queryfields==1.0.0
     # via pulpcore
+djangorestframework==3.13.1
+    # via
+    #   drf-access-policy
+    #   drf-nested-routers
+    #   drf-spectacular
+    #   pulpcore
 drf-access-policy==1.1.0
     # via pulpcore
 drf-nested-routers==0.93.4
@@ -216,19 +216,19 @@ psycopg2==2.9.3
     # via pulpcore
 pulp-ansible==0.13.2
     # via galaxy-ng (setup.py)
-pulp-container==2.10.2
+pulp-container==2.10.7
     # via galaxy-ng (setup.py)
 pulpcore==3.18.6
     # via
     #   galaxy-ng (setup.py)
     #   pulp-ansible
     #   pulp-container
+pyasn1-modules==0.2.8
+    # via python-ldap
 pyasn1==0.4.8
     # via
     #   pyasn1-modules
     #   python-ldap
-pyasn1-modules==0.2.8
-    # via python-ldap
 pycares==4.1.2
     # via aiodns
 pycodestyle==2.7.0
@@ -277,14 +277,14 @@ pyyaml==5.4.1
     #   tablib
 redis==3.4.1
     # via pulpcore
+requests-oauthlib==1.3.1
+    # via social-auth-core
 requests==2.27.1
     # via
     #   galaxy-importer
     #   pyjwkest
     #   requests-oauthlib
     #   social-auth-core
-requests-oauthlib==1.3.1
-    # via social-auth-core
 requirements-parser==0.5.0
     # via ansible-builder
 resolvelib==0.5.4
@@ -293,10 +293,10 @@ rich==12.2.0
     # via
     #   ansible-lint
     #   enrich
-ruamel-yaml==0.17.21
+ruamel.yaml.clib==0.2.6
+    # via ruamel.yaml
+ruamel.yaml==0.17.21
     # via ansible-lint
-ruamel-yaml-clib==0.2.6
-    # via ruamel-yaml
 semantic-version==2.10.0
     # via
     #   galaxy-importer

diff --git a/requirements/requirements.insights.txt b/requirements/requirements.insights.txt
@@ -1,5 +1,5 @@
 #
-# This file is autogenerated by pip-compile with python 3.9
+# This file is autogenerated by pip-compile
 # To update, run:
 #
 #    pip-compile --output-file=requirements/requirements.insights.txt requirements/requirements.insights.in setup.py
@@ -43,10 +43,10 @@ backoff==1.11.1
     # via pulpcore
 bindep==2.10.2
     # via ansible-builder
-bleach==3.3.1
-    # via galaxy-importer
 bleach-allowlist==1.0.3
     # via galaxy-importer
+bleach==3.3.1
+    # via galaxy-importer
 boto3==1.21.37
     # via
     #   -r requirements/requirements.insights.in
@@ -87,22 +87,6 @@ diff-match-patch==20200713
     # via django-import-export
 distro==1.7.0
     # via bindep
-django==3.2.13
-    # via
-    #   django-auth-ldap
-    #   django-automated-logging
-    #   django-currentuser
-    #   django-filter
-    #   django-guardian
-    #   django-guid
-    #   django-import-export
-    #   django-lifecycle
-    #   django-picklefield
-    #   django-storages
-    #   djangorestframework
-    #   drf-nested-routers
-    #   drf-spectacular
-    #   pulpcore
 django-auth-ldap==4.0.0
     # via galaxy-ng (setup.py)
 django-automated-logging==6.1.3
@@ -127,14 +111,30 @@ django-prometheus==2.2.0
     # via galaxy-ng (setup.py)
 django-storages[boto3]==1.12.3
     # via -r requirements/requirements.insights.in
-djangorestframework==3.13.1
+django==3.2.13
     # via
-    #   drf-access-policy
+    #   django-auth-ldap
+    #   django-automated-logging
+    #   django-currentuser
+    #   django-filter
+    #   django-guardian
+    #   django-guid
+    #   django-import-export
+    #   django-lifecycle
+    #   django-picklefield
+    #   django-storages
+    #   djangorestframework
     #   drf-nested-routers
     #   drf-spectacular
     #   pulpcore
 djangorestframework-queryfields==1.0.0
     # via pulpcore
+djangorestframework==3.13.1
+    # via
+    #   drf-access-policy
+    #   drf-nested-routers
+    #   drf-spectacular
+    #   pulpcore
 drf-access-policy==1.1.0
     # via pulpcore
 drf-nested-routers==0.93.4
@@ -236,19 +236,19 @@ psycopg2==2.9.3
     # via pulpcore
 pulp-ansible==0.13.2
     # via galaxy-ng (setup.py)
-pulp-container==2.10.2
+pulp-container==2.10.7
     # via galaxy-ng (setup.py)
 pulpcore==3.18.6
     # via
     #   galaxy-ng (setup.py)
     #   pulp-ansible
     #   pulp-container
+pyasn1-modules==0.2.8
+    # via python-ldap
 pyasn1==0.4.8
     # via
     #   pyasn1-modules
     #   python-ldap
-pyasn1-modules==0.2.8
-    # via python-ldap
 pycares==4.1.2
     # via aiodns
 pycodestyle==2.7.0
@@ -299,14 +299,14 @@ pyyaml==5.4.1
     #   tablib
 redis==3.4.1
     # via pulpcore
+requests-oauthlib==1.3.1
+    # via social-auth-core
 requests==2.27.1
     # via
     #   galaxy-importer
     #   pyjwkest
     #   requests-oauthlib
     #   social-auth-core
-requests-oauthlib==1.3.1
-    # via social-auth-core
 requirements-parser==0.5.0
     # via ansible-builder
 resolvelib==0.5.4
@@ -315,10 +315,10 @@ rich==12.2.0
     # via
     #   ansible-lint
     #   enrich
-ruamel-yaml==0.17.21
+ruamel.yaml.clib==0.2.6
+    # via ruamel.yaml
+ruamel.yaml==0.17.21
     # via ansible-lint
-ruamel-yaml-clib==0.2.6
-    # via ruamel-yaml
 s3transfer==0.5.2
     # via boto3
 semantic-version==2.10.0