pulp-ansible 0.24.6__py3-none-any.whl → 0.25.1__py3-none-any.whl

pulp_ansible/app/__init__.py

@@ -8,5 +8,5 @@ class PulpAnsiblePluginAppConfig(PulpPluginAppConfig):
 
     name = "pulp_ansible.app"
     label = "ansible"
-    version = "0.24.6"
+    version = "0.25.1"
     python_package_name = "pulp-ansible"

pulp_ansible/app/settings.py

@@ -2,7 +2,7 @@ import socket
 
 LOGGING = {
     "loggers": {
-        "pulp_ansible.app.tasks.collection.import_collection": {
+        "pulp_ansible.app.tasks.upload.process_collection_artifact": {
             "level": "INFO",
             "handlers": ["collection_import"],
             "propagate": False,

pulp_ansible/app/tasks/collections.py

@@ -43,6 +43,7 @@ from pulpcore.plugin.stages import (
     DeclarativeArtifact,
     DeclarativeContent,
     DeclarativeVersion,
+    GenericDownloader,
     QueryExistingArtifacts,
     QueryExistingContents,
     RemoteArtifactSaver,
@@ -847,9 +848,11 @@ class CollectionSyncFirstStage(Stage):
     @staticmethod
     def _get_response_next_value(api_version, response):
         if api_version == 2:
-            return response["next"]
+            return response.get("next")
+        elif links := response.get("links"):
+            return links.get("next")
         else:
-            return response["links"]["next"]
+            return None
 
     def _collection_list_downloader(self, api_version, collection_endpoint, page_num, page_size):
         if api_version == 2:
@@ -1082,7 +1085,7 @@ class DeclarativeFailsafeArtifact(DeclarativeArtifact):
             return None
 
 
-class DocsBlobDownloader(ArtifactDownloader):
+class DocsBlobDownloader(GenericDownloader):
     """
     Stage for downloading docs_blob.
 
@@ -1094,6 +1097,9 @@ class DocsBlobDownloader(ArtifactDownloader):
         kwargs: unused keyword arguments passed along to :class:`~pulpcore.plugin.stages.Stage`.
     """
 
+    PROGRESS_REPORTING_MESSAGE = "Downloading Docs Blob"
+    PROGRESS_REPORTING_CODE = "sync.downloading.docs_blob"
+
     async def _handle_content_unit(self, d_content):
         """Handle one content unit.
 

pulp_ansible/tests/functional/api/collection/test_sync.py

@@ -368,7 +368,7 @@ def test_sync_progress_report(
         "Parsing CollectionVersion Metadata",
         "Parsing Namespace Metadata",
         "Downloading Artifacts",
-        # "Downloading Docs Blob",  # This reuses the "Downloading Artifacts" name.
+        "Downloading Docs Blob",
         "Associating Content",
     }
 

{pulp_ansible-0.24.6.dist-info → pulp_ansible-0.25.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pulp-ansible
-Version: 0.24.6
+Version: 0.25.1
 Summary: Pulp plugin to manage Ansible content, e.g. roles
 Author-email: Pulp Ansible Plugin Project Developers <pulp-dev@redhat.com>
 Project-URL: Homepage, https://pulpproject.org

{pulp_ansible-0.24.6.dist-info → pulp_ansible-0.25.1.dist-info}/RECORD

@@ -1,6 +1,6 @@
 pulp_ansible/__init__.py,sha256=WXL3JyOZzh4tALN4OBNgqj412O2LXVr8iYSn14Av0_o,67
 pulp_ansible/pytest_plugin.py,sha256=1x_Nb39VqNmI8KMEA4RS0fkvOPpkpp-7Dwzo9mjvyJQ,8763
-pulp_ansible/app/__init__.py,sha256=mDhkFHdCGWmtbozFcPCAcTg1a95m_gUn76eo104xcFA,279
+pulp_ansible/app/__init__.py,sha256=Ri3VbFUqIn36m0F2sUOMrEAKMkITFikjc_Rwt3a9tRg,279
 pulp_ansible/app/constants.py,sha256=cRrWMbJU-v1nCY2CjmGTOFGzz5aggn4ZKIs4-zeYADQ,78
 pulp_ansible/app/downloaders.py,sha256=0xrAXzhTMJ6ywvs6XyYNAKvRzYb_UZR6A5_WgaHvuiE,8331
 pulp_ansible/app/fields.py,sha256=yV3FL-47K-nxbiBxgzWi1hk3tfLsRdgic59LiwT2Fvs,624
@@ -9,7 +9,7 @@ pulp_ansible/app/logutils.py,sha256=My4XivZMYLKeJqPHFwk3pIZSGlspALhI93vZxwWzlSY,
 pulp_ansible/app/modelresource.py,sha256=Kqhmhd53JPfOthoOzLPxN1TnGERJBFckvwQoJfaIKnw,7839
 pulp_ansible/app/models.py,sha256=N-xlOAKttNzC6_3XifFSDIlUssURy8tr3EVxvQVpqe0,22648
 pulp_ansible/app/serializers.py,sha256=ffC1kgmdoQUwmthc8fJHr9dJu8BYk8-wyeN2E58m8dY,35450
-pulp_ansible/app/settings.py,sha256=daYdJuf9-rwAJHb2gjJzFplvlHh5yW-vg9ZoZHebyvg,1180
+pulp_ansible/app/settings.py,sha256=M9OdR-EiHjmskVCGHBjHkBMts66kx4F22sS2dgb7YAw,1186
 pulp_ansible/app/urls.py,sha256=PM-kGhBX7eQTJgsomUCxbIUHpIhyVZCyDUywQ21KAxU,8443
 pulp_ansible/app/utils.py,sha256=ClI_WvVy73kOZQB2mS8Gftf80Vye7pOxrbodTmPQgmk,1686
 pulp_ansible/app/viewsets.py,sha256=nZ1GqhGVDqThF2BFTwDgjXeXbts-7kiHoBYSs_MHHCo,44349
@@ -91,7 +91,7 @@ pulp_ansible/app/migrations/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMp
 pulp_ansible/app/schema/__init__.py,sha256=eGi2QVJ0kJgXwiDNjQsvqWDSr3EA8TFqFZATTY8xwT8,207
 pulp_ansible/app/schema/copy_config.json,sha256=AJz8riON7_rh-L7jM5iev2Imc5UKjlNvGfwF7KrFH7Y,568
 pulp_ansible/app/tasks/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-pulp_ansible/app/tasks/collections.py,sha256=IHja_YobZNu5HSBqyfeKVJLzX2zh2yeHycL0b1boY7s,50636
+pulp_ansible/app/tasks/collections.py,sha256=tL4Ph4UEeChObxSbzn0ao32xNnrjSKMU2DCLyJjECDE,50840
 pulp_ansible/app/tasks/collectionversion_index.py,sha256=_cnQeWRpFXrreTJM9aaEc2HuknTksZa0lLZ7XUfmQ_c,9401
 pulp_ansible/app/tasks/copy.py,sha256=dO_DnLT5hck6GpZomEHurrDHJM0Wkh2B0_wgHHOtbuY,5563
 pulp_ansible/app/tasks/deletion.py,sha256=f-VNTMzDMQiJpCLN34fY5gwhAGlh3RACj4VWc_tOaP0,3579
@@ -118,7 +118,7 @@ pulp_ansible/tests/functional/api/collection/test_crud_collection_versions.py,sh
 pulp_ansible/tests/functional/api/collection/test_marks.py,sha256=QBYGdZKO_XJWeU6qnI0-ohYXLJ5ybM4sRYCVyyBVLQE,4769
 pulp_ansible/tests/functional/api/collection/test_remote.py,sha256=Nnd2lrZoJ8F2Xez_v7c5avTRyrn99UAuCgYKMTAsrn8,2343
 pulp_ansible/tests/functional/api/collection/test_signatures.py,sha256=Oos2kyUMzzhlD7o7VoJqSHMxnA7_gdm0Sna2bhmv79c,8492
-pulp_ansible/tests/functional/api/collection/test_sync.py,sha256=UYxaD1rM6iMjZ2gV-hQ8OiC8EWa-iSiKm8Y6UZy5cAM,14869
+pulp_ansible/tests/functional/api/collection/test_sync.py,sha256=ITeATktxSpXbV4emJ8xXl4EGuebBRmrBdDRarVmSgJ8,14818
 pulp_ansible/tests/functional/api/collection/v3/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 pulp_ansible/tests/functional/api/collection/v3/test_client_configuration.py,sha256=Tk8PdvG2Y1mZs5pUm2z91Tlpxaw0_8TvhshNbioMkKg,648
 pulp_ansible/tests/functional/api/collection/v3/test_collection.py,sha256=HSzkFt5HHURk56TqJBy6ZziMBKyraMxzbb1_r1fF4Js,12790
@@ -160,9 +160,9 @@ pulp_ansible/tests/unit/migrations/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQe
 pulp_ansible/tests/unit/migrations/conftest.py,sha256=61n56aJuwEuAcUS27xnmnEDx6Ie7M5zxh851doWm7Ok,438
 pulp_ansible/tests/unit/migrations/test_0057_collection_version_sha256_migrate.py,sha256=NmU-frZNO1qHvhdxfw-bwPTEkqN4Wdc3dEs9dWME47o,2174
 pulp_ansible/tests/unit/migrations/test_x_repo_search_migration.py,sha256=IrC_V_Gss4nqhkdL-60upcEzGcz8IsiI2d-MfUtFY-g,657
-pulp_ansible-0.24.6.dist-info/licenses/LICENSE,sha256=2ylvL381vKOhdO-w6zkrOxe9lLNBhRQpo9_0EbHC_HM,18046
-pulp_ansible-0.24.6.dist-info/METADATA,sha256=-O2U9fWtDSBlVxj3URNQPE9DXaSW1X3EWvJrjLwgh7Y,3207
-pulp_ansible-0.24.6.dist-info/WHEEL,sha256=pxyMxgL8-pra_rKaQ4drOZAegBVuX-G_4nRHjjgWbmo,91
-pulp_ansible-0.24.6.dist-info/entry_points.txt,sha256=6PFqCdT7Yn7U5MlioYRsyyWbJDcZI2aAJuzc7yXHqGk,119
-pulp_ansible-0.24.6.dist-info/top_level.txt,sha256=5Rrg5DSM_F9wH8vu8Fxjb5EmroC-I8RVKp05fhXH6kQ,13
-pulp_ansible-0.24.6.dist-info/RECORD,,
+pulp_ansible-0.25.1.dist-info/licenses/LICENSE,sha256=2ylvL381vKOhdO-w6zkrOxe9lLNBhRQpo9_0EbHC_HM,18046
+pulp_ansible-0.25.1.dist-info/METADATA,sha256=AAZQBK7wlPhive3yk3CL-80va6B0e8rmc3kAp_8EhMk,3207
+pulp_ansible-0.25.1.dist-info/WHEEL,sha256=0CuiUZ_p9E4cD6NyLD6UG80LBXYyiSYZOKDm5lp32xk,91
+pulp_ansible-0.25.1.dist-info/entry_points.txt,sha256=6PFqCdT7Yn7U5MlioYRsyyWbJDcZI2aAJuzc7yXHqGk,119
+pulp_ansible-0.25.1.dist-info/top_level.txt,sha256=5Rrg5DSM_F9wH8vu8Fxjb5EmroC-I8RVKp05fhXH6kQ,13
+pulp_ansible-0.25.1.dist-info/RECORD,,

{pulp_ansible-0.24.6.dist-info → pulp_ansible-0.25.1.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (79.0.0)
+Generator: setuptools (80.3.1)
 Root-Is-Purelib: true
 Tag: py3-none-any