From ed857eb0339eec6eae071d8d03f7b1b08afe2f30 Mon Sep 17 00:00:00 2001 From: Bruno Rocha Date: Mon, 29 Jan 2024 11:54:08 +0000 Subject: [PATCH] fix: bump pulp_ansible to enable re-upload of deleted collection version on stable-4.9 (#2045) fix: bump pulp_ansible to enable re-uploads Issue: AAH-2588 --- CHANGES/2588.bugfix | 1 + galaxy_ng/app/settings.py | 1 + .../integration/api/test_repositories.py | 1 + .../tests/integration/cli/test_cli_flow.py | 1 + requirements/requirements.common.txt | 198 +++++++++--------- requirements/requirements.insights.txt | 198 +++++++++--------- requirements/requirements.standalone.txt | 198 +++++++++--------- setup.py | 7 +- 8 files changed, 312 insertions(+), 293 deletions(-) create mode 100644 CHANGES/2588.bugfix diff --git a/CHANGES/2588.bugfix b/CHANGES/2588.bugfix new file mode 100644 index 000000000..334f6554f --- /dev/null +++ b/CHANGES/2588.bugfix @@ -0,0 +1 @@ +bump pulp_ansible to enable re-upload of deleted collection version diff --git a/galaxy_ng/app/settings.py b/galaxy_ng/app/settings.py index 323233428..bde094efd 100644 --- a/galaxy_ng/app/settings.py +++ b/galaxy_ng/app/settings.py @@ -15,6 +15,7 @@ 'django.middleware.clickjacking.XFrameOptionsMiddleware', 'django.middleware.locale.LocaleMiddleware', 'django_guid.middleware.guid_middleware', + "pulpcore.middleware.DomainMiddleware", # END: Pulp standard middleware 'django_prometheus.middleware.PrometheusAfterMiddleware', ] diff --git a/galaxy_ng/tests/integration/api/test_repositories.py b/galaxy_ng/tests/integration/api/test_repositories.py index 518abd9ef..b8e798b16 100644 --- a/galaxy_ng/tests/integration/api/test_repositories.py +++ b/galaxy_ng/tests/integration/api/test_repositories.py @@ -30,6 +30,7 @@ class TestRepositories: @pytest.mark.all @pytest.mark.repositories + @pytest.mark.skip(reason="pulp is changing how this works") def test_cant_upload_same_collection_same_repo(self, galaxy_client): """ Verifies that the same collection / version cannot be uploaded to the same repo diff --git a/galaxy_ng/tests/integration/cli/test_cli_flow.py b/galaxy_ng/tests/integration/cli/test_cli_flow.py index 96267be9d..6ac038d12 100644 --- a/galaxy_ng/tests/integration/cli/test_cli_flow.py +++ b/galaxy_ng/tests/integration/cli/test_cli_flow.py @@ -73,6 +73,7 @@ def test_publish_newer_certified_collection_version( @pytest.mark.all @pytest.mark.cli +@pytest.mark.skip(reason="pulp is changing how this works") def test_publish_same_collection_version(ansible_config, galaxy_client): """Test you cannot publish same collection version already published.""" diff --git a/requirements/requirements.common.txt b/requirements/requirements.common.txt index f5b308618..aea2b0e0f 100644 --- a/requirements/requirements.common.txt +++ b/requirements/requirements.common.txt @@ -1,24 +1,24 @@ # -# This file is autogenerated by pip-compile with Python 3.10 -# by the following command: +# This file is autogenerated by pip-compile with python 3.8 +# To update, run: # # pip-compile --output-file=requirements/requirements.common.txt setup.py # -aiodns==3.0.0 +aiodns==3.1.1 # via pulpcore -aiofiles==23.1.0 +aiofiles==23.2.1 # via pulpcore -aiohttp==3.8.5 +aiohttp==3.9.1 # via pulpcore aiosignal==1.3.1 # via aiohttp -ansible-builder==3.0.0 +ansible-builder==1.2.0 # via galaxy-importer -ansible-core==2.15.5 +ansible-core==2.13.13 # via # ansible-lint # galaxy-importer -ansible-lint==6.14.3 +ansible-lint==6.13.1 # via galaxy-importer asgiref==3.7.2 # via django @@ -27,6 +27,7 @@ async-lru==2.0.4 async-timeout==4.0.3 # via # aiohttp + # pulpcore # redis asyncio-throttle==1.0.2 # via pulpcore @@ -37,46 +38,50 @@ attrs==22.2.0 # jsonschema backoff==2.2.1 # via + # opentelemetry-exporter-otlp-proto-common # opentelemetry-exporter-otlp-proto-grpc # opentelemetry-exporter-otlp-proto-http # pulpcore +backports-zoneinfo==0.2.1 ; python_version < "3.9" + # via + # django + # galaxy-ng (setup.py) + # psycopg bindep==2.11.0 # via ansible-builder -black==23.10.1 +black==24.1.0 # via ansible-lint bleach==3.3.1 # via galaxy-importer bleach-allowlist==1.0.3 # via galaxy-importer -boto3==1.28.78 +boto3==1.34.28 # via galaxy-ng (setup.py) -botocore==1.31.78 +botocore==1.34.28 # via # boto3 # s3transfer bracex==2.4 # via wcmatch -certifi==2023.7.22 +certifi==2023.11.17 # via requests cffi==1.16.0 # via # cryptography # pycares charset-normalizer==3.3.2 - # via - # aiohttp - # requests -click==8.1.3 + # via requests +click==8.1.7 # via # black # pulpcore -cryptography==41.0.1 +cryptography==42.0.0 # via # ansible-core # pulpcore # pyjwt # social-auth-core -defusedxml==0.8.0rc2 +defusedxml==0.7.1 # via # odfpy # python3-openid @@ -88,11 +93,11 @@ deprecated==1.2.14 # opentelemetry-exporter-otlp-proto-http diff-match-patch==20230430 # via django-import-export -distro==1.8.0 +distro==1.9.0 # via # bindep # galaxy-ng (setup.py) -django==4.2.7 +django==4.2.9 # via # django-auth-ldap # django-filter @@ -108,15 +113,15 @@ django==4.2.7 # social-auth-app-django django-auth-ldap==4.0.0 # via galaxy-ng (setup.py) -django-filter==23.2 +django-filter==23.5 # via pulpcore -django-guid==3.3.0 +django-guid==3.4.0 # via pulpcore -django-import-export==3.3.1 +django-import-export==3.3.6 # via pulpcore django-ipware==3.0.7 # via galaxy-ng (setup.py) -django-lifecycle==1.0.0 +django-lifecycle==1.1.2 # via pulpcore django-picklefield==3.1 # via galaxy-ng (setup.py) @@ -128,13 +133,13 @@ djangorestframework==3.14.0 # drf-nested-routers # drf-spectacular # pulpcore -djangorestframework-queryfields==1.0.0 +djangorestframework-queryfields==1.1.0 # via pulpcore drf-access-policy==1.5.0 # via pulpcore -drf-nested-routers==0.93.4 +drf-nested-routers==0.93.5 # via pulpcore -drf-spectacular==0.26.2 +drf-spectacular==0.26.5 # via # galaxy-ng (setup.py) # pulpcore @@ -150,41 +155,46 @@ filelock==3.13.1 # via ansible-lint flake8==6.1.0 # via galaxy-importer -frozenlist==1.4.0 +frozenlist==1.4.1 # via # aiohttp # aiosignal future==0.18.3 # via pyjwkest -galaxy-importer==0.4.16 +galaxy-importer==0.4.19 # via # galaxy-ng (setup.py) # pulp-ansible gitdb==4.0.11 # via gitpython -gitpython==3.1.40 +gitpython==3.1.41 # via pulp-ansible -googleapis-common-protos==1.61.0 +googleapis-common-protos==1.62.0 # via # opentelemetry-exporter-otlp-proto-grpc # opentelemetry-exporter-otlp-proto-http -grpcio==1.59.2 +grpcio==1.60.0 # via opentelemetry-exporter-otlp-proto-grpc -gunicorn==20.1.0 +gunicorn==21.2.0 # via pulpcore -idna==3.4 +idna==3.6 # via # requests # yarl importlib-metadata==6.0.1 # via + # markdown # opentelemetry-api # pulpcore +importlib-resources==6.1.1 + # via + # jsonschema + # pulp-glue inflection==0.5.1 # via drf-spectacular insights-analytics-collector==0.3.2 # via galaxy-ng (setup.py) -jinja2==3.1.2 +jinja2==3.1.3 # via # ansible-core # pulpcore @@ -194,20 +204,19 @@ jmespath==1.0.1 # botocore jsonschema==4.17.3 # via - # ansible-builder # ansible-lint # drf-spectacular # pulp-ansible # pulp-container -markdown==3.5.1 +markdown==3.5.2 # via galaxy-importer markdown-it-py==3.0.0 # via rich markuppy==1.14 # via tablib -markupsafe==2.1.3 +markupsafe==2.1.4 # via jinja2 -marshmallow==3.20.1 +marshmallow==3.20.2 # via galaxy-ng (setup.py) mccabe==0.7.0 # via flake8 @@ -229,7 +238,7 @@ odfpy==1.4.1 # via tablib openpyxl==3.1.2 # via tablib -opentelemetry-api==1.18.0 +opentelemetry-api==1.22.0 # via # opentelemetry-distro # opentelemetry-exporter-otlp-proto-grpc @@ -238,49 +247,47 @@ opentelemetry-api==1.18.0 # opentelemetry-instrumentation-django # opentelemetry-instrumentation-wsgi # opentelemetry-sdk -opentelemetry-distro[otlp]==0.39b0 - # via - # opentelemetry-distro - # pulpcore -opentelemetry-exporter-otlp==1.18.0 +opentelemetry-distro[otlp]==0.43b0 + # via pulpcore +opentelemetry-exporter-otlp==1.22.0 # via opentelemetry-distro -opentelemetry-exporter-otlp-proto-common==1.18.0 +opentelemetry-exporter-otlp-proto-common==1.22.0 # via # opentelemetry-exporter-otlp-proto-grpc # opentelemetry-exporter-otlp-proto-http -opentelemetry-exporter-otlp-proto-grpc==1.18.0 +opentelemetry-exporter-otlp-proto-grpc==1.22.0 # via opentelemetry-exporter-otlp -opentelemetry-exporter-otlp-proto-http==1.18.0 +opentelemetry-exporter-otlp-proto-http==1.22.0 # via # opentelemetry-exporter-otlp # pulpcore -opentelemetry-instrumentation==0.39b0 +opentelemetry-instrumentation==0.43b0 # via # opentelemetry-distro # opentelemetry-instrumentation-django # opentelemetry-instrumentation-wsgi -opentelemetry-instrumentation-django==0.39b0 +opentelemetry-instrumentation-django==0.43b0 # via pulpcore -opentelemetry-instrumentation-wsgi==0.39b0 +opentelemetry-instrumentation-wsgi==0.43b0 # via # opentelemetry-instrumentation-django # pulpcore -opentelemetry-proto==1.18.0 +opentelemetry-proto==1.22.0 # via # opentelemetry-exporter-otlp-proto-common # opentelemetry-exporter-otlp-proto-grpc # opentelemetry-exporter-otlp-proto-http -opentelemetry-sdk==1.18.0 +opentelemetry-sdk==1.22.0 # via # opentelemetry-distro # opentelemetry-exporter-otlp-proto-grpc # opentelemetry-exporter-otlp-proto-http -opentelemetry-semantic-conventions==0.39b0 +opentelemetry-semantic-conventions==0.43b0 # via # opentelemetry-instrumentation-django # opentelemetry-instrumentation-wsgi # opentelemetry-sdk -opentelemetry-util-http==0.39b0 +opentelemetry-util-http==0.43b0 # via # opentelemetry-instrumentation-django # opentelemetry-instrumentation-wsgi @@ -291,47 +298,46 @@ packaging==23.2 # bindep # black # bleach - # django-lifecycle + # gunicorn # marshmallow # pulp-glue parsley==1.3 # via bindep -pathspec==0.11.2 +pathspec==0.12.1 # via - # ansible-lint # black # yamllint -pbr==5.11.1 +pbr==6.0.0 # via bindep pillow==10.0.1 # via pulp-ansible -platformdirs==3.11.0 +pkgutil-resolve-name==1.3.10 + # via jsonschema +platformdirs==4.1.0 # via black -prometheus-client==0.18.0 +prometheus-client==0.19.0 # via django-prometheus -protobuf==4.23.2 +protobuf==4.25.2 # via # googleapis-common-protos # opentelemetry-proto # pulpcore -psycopg[binary]==3.1.9 - # via - # psycopg - # pulpcore -psycopg-binary==3.1.9 +psycopg[binary]==3.1.17 + # via pulpcore +psycopg-binary==3.1.17 # via psycopg -pulp-ansible==0.20.2 +pulp-ansible==0.20.3 # via galaxy-ng (setup.py) -pulp-container==2.15.2 +pulp-container==2.15.4 # via galaxy-ng (setup.py) -pulp-glue==0.21.4 +pulp-glue==0.23.2 # via pulpcore -pulpcore==3.28.18 +pulpcore==3.28.22 # via # galaxy-ng (setup.py) # pulp-ansible # pulp-container -pyasn1==0.5.0 +pyasn1==0.5.1 # via # pyasn1-modules # python-ldap @@ -343,11 +349,11 @@ pycodestyle==2.11.1 # via flake8 pycparser==2.21 # via cffi -pycryptodomex==3.19.0 +pycryptodomex==3.20.0 # via pyjwkest pyflakes==3.1.0 # via flake8 -pygments==2.16.1 +pygments==2.17.2 # via rich pygtrie==2.5.0 # via pulpcore @@ -356,7 +362,6 @@ pyjwkest==1.4.2 pyjwt[crypto]==2.7.0 # via # pulp-container - # pyjwt # social-auth-core pyparsing==3.1.1 # via drf-access-policy @@ -364,15 +369,15 @@ pyrsistent==0.20.0 # via jsonschema python-dateutil==2.8.2 # via botocore -python-gnupg==0.5.0 +python-gnupg==0.5.2 # via pulpcore -python-ldap==3.4.3 +python-ldap==3.4.4 # via django-auth-ldap python3-openid==3.2.0 # via social-auth-core pytz==2023.3.post1 # via djangorestframework -pyyaml==6.0 +pyyaml==6.0.1 # via # ansible-builder # ansible-core @@ -383,7 +388,7 @@ pyyaml==6.0 # pulpcore # tablib # yamllint -redis==4.5.5 +redis==5.0.1 # via pulpcore requests==2.31.0 # via @@ -398,15 +403,15 @@ requests-oauthlib==1.3.1 # via social-auth-core requirements-parser==0.5.0 # via ansible-builder -resolvelib==1.0.1 +resolvelib==0.8.1 # via ansible-core -rich==13.6.0 +rich==13.7.0 # via ansible-lint ruamel-yaml==0.17.40 # via ansible-lint ruamel-yaml-clib==0.2.8 # via ruamel-yaml -s3transfer==0.7.0 +s3transfer==0.10.0 # via boto3 semantic-version==2.10.0 # via @@ -423,7 +428,7 @@ smmap==5.0.1 # via gitdb social-auth-app-django==5.4.0 # via galaxy-ng (setup.py) -social-auth-core==4.5.0 +social-auth-core==4.5.1 # via # galaxy-ng (setup.py) # social-auth-app-django @@ -432,39 +437,36 @@ sqlparse==0.4.4 subprocess-tee==0.4.1 # via ansible-lint tablib[html,ods,xls,xlsx,yaml]==3.5.0 - # via - # django-import-export - # tablib + # via django-import-export tomli==2.0.1 # via black -types-setuptools==68.2.0.0 +types-setuptools==69.0.0.20240125 # via requirements-parser -typing-extensions==4.8.0 +typing-extensions==4.9.0 # via # asgiref # async-lru # black # opentelemetry-sdk # psycopg + # rich uritemplate==4.1.1 # via drf-spectacular url-normalize==1.4.3 # via pulpcore -urllib3==2.0.7 +urllib3==1.26.18 # via # botocore # requests -urlman==2.0.1 - # via django-lifecycle -uuid6==2023.5.2 +uuid6==2024.1.12 # via pulpcore wcmatch==8.5 # via ansible-lint webencodings==0.5.1 # via bleach -whitenoise==6.4.0 +whitenoise==6.6.0 # via pulpcore -wrapt==1.15.0 +wrapt==1.16.0 # via # deprecated # opentelemetry-instrumentation @@ -472,14 +474,16 @@ xlrd==2.0.1 # via tablib xlwt==1.3.0 # via tablib -yamllint==1.32.0 +yamllint==1.33.0 # via ansible-lint -yarl==1.9.2 +yarl==1.9.4 # via # aiohttp # pulpcore zipp==3.17.0 - # via importlib-metadata + # via + # importlib-metadata + # importlib-resources # The following packages are considered to be unsafe in a requirements file: # setuptools diff --git a/requirements/requirements.insights.txt b/requirements/requirements.insights.txt index 5d5ded3ff..c38f28ff7 100644 --- a/requirements/requirements.insights.txt +++ b/requirements/requirements.insights.txt @@ -1,24 +1,24 @@ # -# This file is autogenerated by pip-compile with Python 3.10 -# by the following command: +# This file is autogenerated by pip-compile with python 3.8 +# To update, run: # # pip-compile --output-file=requirements/requirements.insights.txt requirements/requirements.insights.in setup.py # -aiodns==3.0.0 +aiodns==3.1.1 # via pulpcore -aiofiles==23.1.0 +aiofiles==23.2.1 # via pulpcore -aiohttp==3.8.5 +aiohttp==3.9.1 # via pulpcore aiosignal==1.3.1 # via aiohttp -ansible-builder==3.0.0 +ansible-builder==1.2.0 # via galaxy-importer -ansible-core==2.15.5 +ansible-core==2.13.13 # via # ansible-lint # galaxy-importer -ansible-lint==6.14.3 +ansible-lint==6.13.1 # via galaxy-importer app-common-python==0.2.6 # via -r requirements/requirements.insights.in @@ -29,6 +29,7 @@ async-lru==2.0.4 async-timeout==4.0.3 # via # aiohttp + # pulpcore # redis asyncio-throttle==1.0.2 # via pulpcore @@ -39,50 +40,54 @@ attrs==22.2.0 # jsonschema backoff==2.2.1 # via + # opentelemetry-exporter-otlp-proto-common # opentelemetry-exporter-otlp-proto-grpc # opentelemetry-exporter-otlp-proto-http # pulpcore +backports-zoneinfo==0.2.1 ; python_version < "3.9" + # via + # django + # galaxy-ng (setup.py) + # psycopg bindep==2.11.0 # via ansible-builder -black==23.10.1 +black==24.1.0 # via ansible-lint bleach==3.3.1 # via galaxy-importer bleach-allowlist==1.0.3 # via galaxy-importer -boto3==1.28.78 +boto3==1.34.28 # via # -r requirements/requirements.insights.in # django-storages # galaxy-ng (setup.py) # watchtower -botocore==1.31.78 +botocore==1.34.28 # via # boto3 # s3transfer bracex==2.4 # via wcmatch -certifi==2023.7.22 +certifi==2023.11.17 # via requests cffi==1.16.0 # via # cryptography # pycares charset-normalizer==3.3.2 - # via - # aiohttp - # requests -click==8.1.3 + # via requests +click==8.1.7 # via # black # pulpcore -cryptography==41.0.1 +cryptography==42.0.0 # via # ansible-core # pulpcore # pyjwt # social-auth-core -defusedxml==0.8.0rc2 +defusedxml==0.7.1 # via # odfpy # python3-openid @@ -94,11 +99,11 @@ deprecated==1.2.14 # opentelemetry-exporter-otlp-proto-http diff-match-patch==20230430 # via django-import-export -distro==1.8.0 +distro==1.9.0 # via # bindep # galaxy-ng (setup.py) -django==4.2.7 +django==4.2.9 # via # django-auth-ldap # django-filter @@ -115,15 +120,15 @@ django==4.2.7 # social-auth-app-django django-auth-ldap==4.0.0 # via galaxy-ng (setup.py) -django-filter==23.2 +django-filter==23.5 # via pulpcore -django-guid==3.3.0 +django-guid==3.4.0 # via pulpcore -django-import-export==3.3.1 +django-import-export==3.3.6 # via pulpcore django-ipware==3.0.7 # via galaxy-ng (setup.py) -django-lifecycle==1.0.0 +django-lifecycle==1.1.2 # via pulpcore django-picklefield==3.1 # via galaxy-ng (setup.py) @@ -137,13 +142,13 @@ djangorestframework==3.14.0 # drf-nested-routers # drf-spectacular # pulpcore -djangorestframework-queryfields==1.0.0 +djangorestframework-queryfields==1.1.0 # via pulpcore drf-access-policy==1.5.0 # via pulpcore -drf-nested-routers==0.93.4 +drf-nested-routers==0.93.5 # via pulpcore -drf-spectacular==0.26.2 +drf-spectacular==0.26.5 # via # galaxy-ng (setup.py) # pulpcore @@ -159,41 +164,46 @@ filelock==3.13.1 # via ansible-lint flake8==6.1.0 # via galaxy-importer -frozenlist==1.4.0 +frozenlist==1.4.1 # via # aiohttp # aiosignal future==0.18.3 # via pyjwkest -galaxy-importer==0.4.16 +galaxy-importer==0.4.19 # via # galaxy-ng (setup.py) # pulp-ansible gitdb==4.0.11 # via gitpython -gitpython==3.1.40 +gitpython==3.1.41 # via pulp-ansible -googleapis-common-protos==1.61.0 +googleapis-common-protos==1.62.0 # via # opentelemetry-exporter-otlp-proto-grpc # opentelemetry-exporter-otlp-proto-http -grpcio==1.59.2 +grpcio==1.60.0 # via opentelemetry-exporter-otlp-proto-grpc -gunicorn==20.1.0 +gunicorn==21.2.0 # via pulpcore -idna==3.4 +idna==3.6 # via # requests # yarl importlib-metadata==6.0.1 # via + # markdown # opentelemetry-api # pulpcore +importlib-resources==6.1.1 + # via + # jsonschema + # pulp-glue inflection==0.5.1 # via drf-spectacular insights-analytics-collector==0.3.2 # via galaxy-ng (setup.py) -jinja2==3.1.2 +jinja2==3.1.3 # via # ansible-core # pulpcore @@ -203,22 +213,21 @@ jmespath==1.0.1 # botocore jsonschema==4.17.3 # via - # ansible-builder # ansible-lint # drf-spectacular # pulp-ansible # pulp-container logstash-formatter==0.5.17 # via -r requirements/requirements.insights.in -markdown==3.5.1 +markdown==3.5.2 # via galaxy-importer markdown-it-py==3.0.0 # via rich markuppy==1.14 # via tablib -markupsafe==2.1.3 +markupsafe==2.1.4 # via jinja2 -marshmallow==3.20.1 +marshmallow==3.20.2 # via galaxy-ng (setup.py) mccabe==0.7.0 # via flake8 @@ -240,7 +249,7 @@ odfpy==1.4.1 # via tablib openpyxl==3.1.2 # via tablib -opentelemetry-api==1.18.0 +opentelemetry-api==1.22.0 # via # opentelemetry-distro # opentelemetry-exporter-otlp-proto-grpc @@ -249,49 +258,47 @@ opentelemetry-api==1.18.0 # opentelemetry-instrumentation-django # opentelemetry-instrumentation-wsgi # opentelemetry-sdk -opentelemetry-distro[otlp]==0.39b0 - # via - # opentelemetry-distro - # pulpcore -opentelemetry-exporter-otlp==1.18.0 +opentelemetry-distro[otlp]==0.43b0 + # via pulpcore +opentelemetry-exporter-otlp==1.22.0 # via opentelemetry-distro -opentelemetry-exporter-otlp-proto-common==1.18.0 +opentelemetry-exporter-otlp-proto-common==1.22.0 # via # opentelemetry-exporter-otlp-proto-grpc # opentelemetry-exporter-otlp-proto-http -opentelemetry-exporter-otlp-proto-grpc==1.18.0 +opentelemetry-exporter-otlp-proto-grpc==1.22.0 # via opentelemetry-exporter-otlp -opentelemetry-exporter-otlp-proto-http==1.18.0 +opentelemetry-exporter-otlp-proto-http==1.22.0 # via # opentelemetry-exporter-otlp # pulpcore -opentelemetry-instrumentation==0.39b0 +opentelemetry-instrumentation==0.43b0 # via # opentelemetry-distro # opentelemetry-instrumentation-django # opentelemetry-instrumentation-wsgi -opentelemetry-instrumentation-django==0.39b0 +opentelemetry-instrumentation-django==0.43b0 # via pulpcore -opentelemetry-instrumentation-wsgi==0.39b0 +opentelemetry-instrumentation-wsgi==0.43b0 # via # opentelemetry-instrumentation-django # pulpcore -opentelemetry-proto==1.18.0 +opentelemetry-proto==1.22.0 # via # opentelemetry-exporter-otlp-proto-common # opentelemetry-exporter-otlp-proto-grpc # opentelemetry-exporter-otlp-proto-http -opentelemetry-sdk==1.18.0 +opentelemetry-sdk==1.22.0 # via # opentelemetry-distro # opentelemetry-exporter-otlp-proto-grpc # opentelemetry-exporter-otlp-proto-http -opentelemetry-semantic-conventions==0.39b0 +opentelemetry-semantic-conventions==0.43b0 # via # opentelemetry-instrumentation-django # opentelemetry-instrumentation-wsgi # opentelemetry-sdk -opentelemetry-util-http==0.39b0 +opentelemetry-util-http==0.43b0 # via # opentelemetry-instrumentation-django # opentelemetry-instrumentation-wsgi @@ -302,47 +309,46 @@ packaging==23.2 # bindep # black # bleach - # django-lifecycle + # gunicorn # marshmallow # pulp-glue parsley==1.3 # via bindep -pathspec==0.11.2 +pathspec==0.12.1 # via - # ansible-lint # black # yamllint -pbr==5.11.1 +pbr==6.0.0 # via bindep pillow==10.0.1 # via pulp-ansible -platformdirs==3.11.0 +pkgutil-resolve-name==1.3.10 + # via jsonschema +platformdirs==4.1.0 # via black -prometheus-client==0.18.0 +prometheus-client==0.19.0 # via django-prometheus -protobuf==4.23.2 +protobuf==4.25.2 # via # googleapis-common-protos # opentelemetry-proto # pulpcore -psycopg[binary]==3.1.9 - # via - # psycopg - # pulpcore -psycopg-binary==3.1.9 +psycopg[binary]==3.1.17 + # via pulpcore +psycopg-binary==3.1.17 # via psycopg -pulp-ansible==0.20.2 +pulp-ansible==0.20.3 # via galaxy-ng (setup.py) -pulp-container==2.15.2 +pulp-container==2.15.4 # via galaxy-ng (setup.py) -pulp-glue==0.21.4 +pulp-glue==0.23.2 # via pulpcore -pulpcore==3.28.18 +pulpcore==3.28.22 # via # galaxy-ng (setup.py) # pulp-ansible # pulp-container -pyasn1==0.5.0 +pyasn1==0.5.1 # via # pyasn1-modules # python-ldap @@ -354,11 +360,11 @@ pycodestyle==2.11.1 # via flake8 pycparser==2.21 # via cffi -pycryptodomex==3.19.0 +pycryptodomex==3.20.0 # via pyjwkest pyflakes==3.1.0 # via flake8 -pygments==2.16.1 +pygments==2.17.2 # via rich pygtrie==2.5.0 # via pulpcore @@ -367,7 +373,6 @@ pyjwkest==1.4.2 pyjwt[crypto]==2.7.0 # via # pulp-container - # pyjwt # social-auth-core pyparsing==3.1.1 # via drf-access-policy @@ -375,15 +380,15 @@ pyrsistent==0.20.0 # via jsonschema python-dateutil==2.8.2 # via botocore -python-gnupg==0.5.0 +python-gnupg==0.5.2 # via pulpcore -python-ldap==3.4.3 +python-ldap==3.4.4 # via django-auth-ldap python3-openid==3.2.0 # via social-auth-core pytz==2023.3.post1 # via djangorestframework -pyyaml==6.0 +pyyaml==6.0.1 # via # ansible-builder # ansible-core @@ -394,7 +399,7 @@ pyyaml==6.0 # pulpcore # tablib # yamllint -redis==4.5.5 +redis==5.0.1 # via pulpcore requests==2.31.0 # via @@ -409,15 +414,15 @@ requests-oauthlib==1.3.1 # via social-auth-core requirements-parser==0.5.0 # via ansible-builder -resolvelib==1.0.1 +resolvelib==0.8.1 # via ansible-core -rich==13.6.0 +rich==13.7.0 # via ansible-lint ruamel-yaml==0.17.40 # via ansible-lint ruamel-yaml-clib==0.2.8 # via ruamel-yaml -s3transfer==0.7.0 +s3transfer==0.10.0 # via boto3 semantic-version==2.10.0 # via @@ -434,7 +439,7 @@ smmap==5.0.1 # via gitdb social-auth-app-django==5.4.0 # via galaxy-ng (setup.py) -social-auth-core==4.5.0 +social-auth-core==4.5.1 # via # galaxy-ng (setup.py) # social-auth-app-django @@ -443,31 +448,28 @@ sqlparse==0.4.4 subprocess-tee==0.4.1 # via ansible-lint tablib[html,ods,xls,xlsx,yaml]==3.5.0 - # via - # django-import-export - # tablib + # via django-import-export tomli==2.0.1 # via black -types-setuptools==68.2.0.0 +types-setuptools==69.0.0.20240125 # via requirements-parser -typing-extensions==4.8.0 +typing-extensions==4.9.0 # via # asgiref # async-lru # black # opentelemetry-sdk # psycopg + # rich uritemplate==4.1.1 # via drf-spectacular url-normalize==1.4.3 # via pulpcore -urllib3==2.0.7 +urllib3==1.26.18 # via # botocore # requests -urlman==2.0.1 - # via django-lifecycle -uuid6==2023.5.2 +uuid6==2024.1.12 # via pulpcore watchtower==3.0.1 # via -r requirements/requirements.insights.in @@ -475,9 +477,9 @@ wcmatch==8.5 # via ansible-lint webencodings==0.5.1 # via bleach -whitenoise==6.4.0 +whitenoise==6.6.0 # via pulpcore -wrapt==1.15.0 +wrapt==1.16.0 # via # deprecated # opentelemetry-instrumentation @@ -485,14 +487,16 @@ xlrd==2.0.1 # via tablib xlwt==1.3.0 # via tablib -yamllint==1.32.0 +yamllint==1.33.0 # via ansible-lint -yarl==1.9.2 +yarl==1.9.4 # via # aiohttp # pulpcore zipp==3.17.0 - # via importlib-metadata + # via + # importlib-metadata + # importlib-resources # The following packages are considered to be unsafe in a requirements file: # setuptools diff --git a/requirements/requirements.standalone.txt b/requirements/requirements.standalone.txt index 50c05e76a..4c605ac49 100644 --- a/requirements/requirements.standalone.txt +++ b/requirements/requirements.standalone.txt @@ -1,24 +1,24 @@ # -# This file is autogenerated by pip-compile with Python 3.10 -# by the following command: +# This file is autogenerated by pip-compile with python 3.8 +# To update, run: # # pip-compile --output-file=requirements/requirements.standalone.txt requirements/requirements.standalone.in setup.py # -aiodns==3.0.0 +aiodns==3.1.1 # via pulpcore -aiofiles==23.1.0 +aiofiles==23.2.1 # via pulpcore -aiohttp==3.8.5 +aiohttp==3.9.1 # via pulpcore aiosignal==1.3.1 # via aiohttp -ansible-builder==3.0.0 +ansible-builder==1.2.0 # via galaxy-importer -ansible-core==2.15.5 +ansible-core==2.13.13 # via # ansible-lint # galaxy-importer -ansible-lint==6.14.3 +ansible-lint==6.13.1 # via galaxy-importer asgiref==3.7.2 # via django @@ -27,6 +27,7 @@ async-lru==2.0.4 async-timeout==4.0.3 # via # aiohttp + # pulpcore # redis asyncio-throttle==1.0.2 # via pulpcore @@ -37,46 +38,50 @@ attrs==22.2.0 # jsonschema backoff==2.2.1 # via + # opentelemetry-exporter-otlp-proto-common # opentelemetry-exporter-otlp-proto-grpc # opentelemetry-exporter-otlp-proto-http # pulpcore +backports-zoneinfo==0.2.1 ; python_version < "3.9" + # via + # django + # galaxy-ng (setup.py) + # psycopg bindep==2.11.0 # via ansible-builder -black==23.10.1 +black==24.1.0 # via ansible-lint bleach==3.3.1 # via galaxy-importer bleach-allowlist==1.0.3 # via galaxy-importer -boto3==1.28.78 +boto3==1.34.28 # via galaxy-ng (setup.py) -botocore==1.31.78 +botocore==1.34.28 # via # boto3 # s3transfer bracex==2.4 # via wcmatch -certifi==2023.7.22 +certifi==2023.11.17 # via requests cffi==1.16.0 # via # cryptography # pycares charset-normalizer==3.3.2 - # via - # aiohttp - # requests -click==8.1.3 + # via requests +click==8.1.7 # via # black # pulpcore -cryptography==41.0.1 +cryptography==42.0.0 # via # ansible-core # pulpcore # pyjwt # social-auth-core -defusedxml==0.8.0rc2 +defusedxml==0.7.1 # via # odfpy # python3-openid @@ -88,11 +93,11 @@ deprecated==1.2.14 # opentelemetry-exporter-otlp-proto-http diff-match-patch==20230430 # via django-import-export -distro==1.8.0 +distro==1.9.0 # via # bindep # galaxy-ng (setup.py) -django==4.2.7 +django==4.2.9 # via # django-auth-ldap # django-filter @@ -108,15 +113,15 @@ django==4.2.7 # social-auth-app-django django-auth-ldap==4.0.0 # via galaxy-ng (setup.py) -django-filter==23.2 +django-filter==23.5 # via pulpcore -django-guid==3.3.0 +django-guid==3.4.0 # via pulpcore -django-import-export==3.3.1 +django-import-export==3.3.6 # via pulpcore django-ipware==3.0.7 # via galaxy-ng (setup.py) -django-lifecycle==1.0.0 +django-lifecycle==1.1.2 # via pulpcore django-picklefield==3.1 # via galaxy-ng (setup.py) @@ -128,13 +133,13 @@ djangorestframework==3.14.0 # drf-nested-routers # drf-spectacular # pulpcore -djangorestframework-queryfields==1.0.0 +djangorestframework-queryfields==1.1.0 # via pulpcore drf-access-policy==1.5.0 # via pulpcore -drf-nested-routers==0.93.4 +drf-nested-routers==0.93.5 # via pulpcore -drf-spectacular==0.26.2 +drf-spectacular==0.26.5 # via # galaxy-ng (setup.py) # pulpcore @@ -150,41 +155,46 @@ filelock==3.13.1 # via ansible-lint flake8==6.1.0 # via galaxy-importer -frozenlist==1.4.0 +frozenlist==1.4.1 # via # aiohttp # aiosignal future==0.18.3 # via pyjwkest -galaxy-importer==0.4.16 +galaxy-importer==0.4.19 # via # galaxy-ng (setup.py) # pulp-ansible gitdb==4.0.11 # via gitpython -gitpython==3.1.40 +gitpython==3.1.41 # via pulp-ansible -googleapis-common-protos==1.61.0 +googleapis-common-protos==1.62.0 # via # opentelemetry-exporter-otlp-proto-grpc # opentelemetry-exporter-otlp-proto-http -grpcio==1.59.2 +grpcio==1.60.0 # via opentelemetry-exporter-otlp-proto-grpc -gunicorn==20.1.0 +gunicorn==21.2.0 # via pulpcore -idna==3.4 +idna==3.6 # via # requests # yarl importlib-metadata==6.0.1 # via + # markdown # opentelemetry-api # pulpcore +importlib-resources==6.1.1 + # via + # jsonschema + # pulp-glue inflection==0.5.1 # via drf-spectacular insights-analytics-collector==0.3.2 # via galaxy-ng (setup.py) -jinja2==3.1.2 +jinja2==3.1.3 # via # ansible-core # pulpcore @@ -194,20 +204,19 @@ jmespath==1.0.1 # botocore jsonschema==4.17.3 # via - # ansible-builder # ansible-lint # drf-spectacular # pulp-ansible # pulp-container -markdown==3.5.1 +markdown==3.5.2 # via galaxy-importer markdown-it-py==3.0.0 # via rich markuppy==1.14 # via tablib -markupsafe==2.1.3 +markupsafe==2.1.4 # via jinja2 -marshmallow==3.20.1 +marshmallow==3.20.2 # via galaxy-ng (setup.py) mccabe==0.7.0 # via flake8 @@ -229,7 +238,7 @@ odfpy==1.4.1 # via tablib openpyxl==3.1.2 # via tablib -opentelemetry-api==1.18.0 +opentelemetry-api==1.22.0 # via # opentelemetry-distro # opentelemetry-exporter-otlp-proto-grpc @@ -238,49 +247,47 @@ opentelemetry-api==1.18.0 # opentelemetry-instrumentation-django # opentelemetry-instrumentation-wsgi # opentelemetry-sdk -opentelemetry-distro[otlp]==0.39b0 - # via - # opentelemetry-distro - # pulpcore -opentelemetry-exporter-otlp==1.18.0 +opentelemetry-distro[otlp]==0.43b0 + # via pulpcore +opentelemetry-exporter-otlp==1.22.0 # via opentelemetry-distro -opentelemetry-exporter-otlp-proto-common==1.18.0 +opentelemetry-exporter-otlp-proto-common==1.22.0 # via # opentelemetry-exporter-otlp-proto-grpc # opentelemetry-exporter-otlp-proto-http -opentelemetry-exporter-otlp-proto-grpc==1.18.0 +opentelemetry-exporter-otlp-proto-grpc==1.22.0 # via opentelemetry-exporter-otlp -opentelemetry-exporter-otlp-proto-http==1.18.0 +opentelemetry-exporter-otlp-proto-http==1.22.0 # via # opentelemetry-exporter-otlp # pulpcore -opentelemetry-instrumentation==0.39b0 +opentelemetry-instrumentation==0.43b0 # via # opentelemetry-distro # opentelemetry-instrumentation-django # opentelemetry-instrumentation-wsgi -opentelemetry-instrumentation-django==0.39b0 +opentelemetry-instrumentation-django==0.43b0 # via pulpcore -opentelemetry-instrumentation-wsgi==0.39b0 +opentelemetry-instrumentation-wsgi==0.43b0 # via # opentelemetry-instrumentation-django # pulpcore -opentelemetry-proto==1.18.0 +opentelemetry-proto==1.22.0 # via # opentelemetry-exporter-otlp-proto-common # opentelemetry-exporter-otlp-proto-grpc # opentelemetry-exporter-otlp-proto-http -opentelemetry-sdk==1.18.0 +opentelemetry-sdk==1.22.0 # via # opentelemetry-distro # opentelemetry-exporter-otlp-proto-grpc # opentelemetry-exporter-otlp-proto-http -opentelemetry-semantic-conventions==0.39b0 +opentelemetry-semantic-conventions==0.43b0 # via # opentelemetry-instrumentation-django # opentelemetry-instrumentation-wsgi # opentelemetry-sdk -opentelemetry-util-http==0.39b0 +opentelemetry-util-http==0.43b0 # via # opentelemetry-instrumentation-django # opentelemetry-instrumentation-wsgi @@ -291,47 +298,46 @@ packaging==23.2 # bindep # black # bleach - # django-lifecycle + # gunicorn # marshmallow # pulp-glue parsley==1.3 # via bindep -pathspec==0.11.2 +pathspec==0.12.1 # via - # ansible-lint # black # yamllint -pbr==5.11.1 +pbr==6.0.0 # via bindep pillow==10.0.1 # via pulp-ansible -platformdirs==3.11.0 +pkgutil-resolve-name==1.3.10 + # via jsonschema +platformdirs==4.1.0 # via black -prometheus-client==0.18.0 +prometheus-client==0.19.0 # via django-prometheus -protobuf==4.23.2 +protobuf==4.25.2 # via # googleapis-common-protos # opentelemetry-proto # pulpcore -psycopg[binary]==3.1.9 - # via - # psycopg - # pulpcore -psycopg-binary==3.1.9 +psycopg[binary]==3.1.17 + # via pulpcore +psycopg-binary==3.1.17 # via psycopg -pulp-ansible==0.20.2 +pulp-ansible==0.20.3 # via galaxy-ng (setup.py) -pulp-container==2.15.2 +pulp-container==2.15.4 # via galaxy-ng (setup.py) -pulp-glue==0.21.4 +pulp-glue==0.23.2 # via pulpcore -pulpcore==3.28.18 +pulpcore==3.28.22 # via # galaxy-ng (setup.py) # pulp-ansible # pulp-container -pyasn1==0.5.0 +pyasn1==0.5.1 # via # pyasn1-modules # python-ldap @@ -343,11 +349,11 @@ pycodestyle==2.11.1 # via flake8 pycparser==2.21 # via cffi -pycryptodomex==3.19.0 +pycryptodomex==3.20.0 # via pyjwkest pyflakes==3.1.0 # via flake8 -pygments==2.16.1 +pygments==2.17.2 # via rich pygtrie==2.5.0 # via pulpcore @@ -356,7 +362,6 @@ pyjwkest==1.4.2 pyjwt[crypto]==2.7.0 # via # pulp-container - # pyjwt # social-auth-core pyparsing==3.1.1 # via drf-access-policy @@ -364,15 +369,15 @@ pyrsistent==0.20.0 # via jsonschema python-dateutil==2.8.2 # via botocore -python-gnupg==0.5.0 +python-gnupg==0.5.2 # via pulpcore -python-ldap==3.4.3 +python-ldap==3.4.4 # via django-auth-ldap python3-openid==3.2.0 # via social-auth-core pytz==2023.3.post1 # via djangorestframework -pyyaml==6.0 +pyyaml==6.0.1 # via # ansible-builder # ansible-core @@ -383,7 +388,7 @@ pyyaml==6.0 # pulpcore # tablib # yamllint -redis==4.5.5 +redis==5.0.1 # via pulpcore requests==2.31.0 # via @@ -398,15 +403,15 @@ requests-oauthlib==1.3.1 # via social-auth-core requirements-parser==0.5.0 # via ansible-builder -resolvelib==1.0.1 +resolvelib==0.8.1 # via ansible-core -rich==13.6.0 +rich==13.7.0 # via ansible-lint ruamel-yaml==0.17.40 # via ansible-lint ruamel-yaml-clib==0.2.8 # via ruamel-yaml -s3transfer==0.7.0 +s3transfer==0.10.0 # via boto3 semantic-version==2.10.0 # via @@ -423,7 +428,7 @@ smmap==5.0.1 # via gitdb social-auth-app-django==5.4.0 # via galaxy-ng (setup.py) -social-auth-core==4.5.0 +social-auth-core==4.5.1 # via # galaxy-ng (setup.py) # social-auth-app-django @@ -432,39 +437,36 @@ sqlparse==0.4.4 subprocess-tee==0.4.1 # via ansible-lint tablib[html,ods,xls,xlsx,yaml]==3.5.0 - # via - # django-import-export - # tablib + # via django-import-export tomli==2.0.1 # via black -types-setuptools==68.2.0.0 +types-setuptools==69.0.0.20240125 # via requirements-parser -typing-extensions==4.8.0 +typing-extensions==4.9.0 # via # asgiref # async-lru # black # opentelemetry-sdk # psycopg + # rich uritemplate==4.1.1 # via drf-spectacular url-normalize==1.4.3 # via pulpcore -urllib3==2.0.7 +urllib3==1.26.18 # via # botocore # requests -urlman==2.0.1 - # via django-lifecycle -uuid6==2023.5.2 +uuid6==2024.1.12 # via pulpcore wcmatch==8.5 # via ansible-lint webencodings==0.5.1 # via bleach -whitenoise==6.4.0 +whitenoise==6.6.0 # via pulpcore -wrapt==1.15.0 +wrapt==1.16.0 # via # deprecated # opentelemetry-instrumentation @@ -472,14 +474,16 @@ xlrd==2.0.1 # via tablib xlwt==1.3.0 # via tablib -yamllint==1.32.0 +yamllint==1.33.0 # via ansible-lint -yarl==1.9.2 +yarl==1.9.4 # via # aiohttp # pulpcore zipp==3.17.0 - # via importlib-metadata + # via + # importlib-metadata + # importlib-resources # The following packages are considered to be unsafe in a requirements file: # setuptools diff --git a/setup.py b/setup.py index c202478e7..d2678af0c 100644 --- a/setup.py +++ b/setup.py @@ -112,8 +112,8 @@ def _format_pulp_requirement(plugin, specifier=None, ref=None, gh_namespace="pul requirements = [ "galaxy-importer>=0.4.16,<0.5.0", - "pulpcore>=3.28.12,<3.29.0", - "pulp_ansible>=0.20.0,<0.21.0", + "pulpcore>=3.28.21,<3.29.0", + "pulp_ansible>=0.20.3,<0.21.0", "django-prometheus>=2.0.0", "drf-spectacular", "pulp-container>=2.15.0,<2.16.0", @@ -128,6 +128,9 @@ def _format_pulp_requirement(plugin, specifier=None, ref=None, gh_namespace="pul "marshmallow<4.0.0,>=3.6.1", "django-picklefield<4.0.0,>=3.0.1", "django-ipware<4.0.0,>=3.0.0", + # to fix a compatibility issue + 'backports.zoneinfo==0.2.1;python_version<"3.9"', + "setuptools<66", ]