From 3eaa0a202d227ed609aa550c71ba887272be1929 Mon Sep 17 00:00:00 2001 From: Andrea Restle-Lay Date: Fri, 14 Feb 2025 09:03:18 -0500 Subject: [PATCH 1/3] fix: aap-38589 --- awx/main/utils/common.py | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-) diff --git a/awx/main/utils/common.py b/awx/main/utils/common.py index 2f45bb7c8fed..af28df0a8196 100644 --- a/awx/main/utils/common.py +++ b/awx/main/utils/common.py @@ -329,12 +329,19 @@ def update_scm_url(scm_type, url, username=True, password=True, check_special_ca # Special handling for github/bitbucket SSH URLs. if check_special_cases: - special_git_hosts = ('github.com', 'bitbucket.org', 'altssh.bitbucket.org') - if scm_type == 'git' and parts.scheme.endswith('ssh') and parts.hostname in special_git_hosts and netloc_username != 'git': - raise ValueError(_('Username must be "git" for SSH access to %s.') % parts.hostname) - if scm_type == 'git' and parts.scheme.endswith('ssh') and parts.hostname in special_git_hosts and netloc_password: - # raise ValueError('Password not allowed for SSH access to %s.' % parts.hostname) - netloc_password = '' + special_hosts = ('github.com', 'bitbucket.org', 'altssh.bitbucket.org') + allowed_git_usernames = {'git', 'x-access-token'} + + if scm_type == 'git' and parts.scheme.endswith('ssh'): + is_github_host = parts.hostname in special_hosts or parts.hostname.endswith('.github.com') + is_bitbucket_host = parts.hostname in special_hosts or parts.hostname.endswith('.bitbucket.com') or 'bitbucket' in parts.hostname + + if is_github_host and netloc_username not in allowed_git_usernames: + raise ValueError(_('Username must be "git" or "x-access-token" (for github app) for SSH access to %s.') % parts.hostname) + + if (is_github_host or is_bitbucket_host) and netloc_password: + # raise ValueError('Password not allowed for SSH access to %s.' % parts.hostname) + netloc_password = '' if netloc_username and parts.scheme != 'file' and scm_type not in ("insights", "archive"): netloc = u':'.join([urllib.parse.quote(x, safe='') for x in (netloc_username, netloc_password) if x]) From d0b6a0af75c598b4c7a7bc5738ca76e6cc4186dd Mon Sep 17 00:00:00 2001 From: Andrea Restle-Lay Date: Fri, 14 Feb 2025 13:03:20 -0500 Subject: [PATCH 2/3] fix: aap-38589 --- requirements/requirements.in | 1 + requirements/requirements.txt | 204 ++++++++++++++++------------------ 2 files changed, 94 insertions(+), 111 deletions(-) diff --git a/requirements/requirements.in b/requirements/requirements.in index 181bce15290d..a4576d9129ef 100644 --- a/requirements/requirements.in +++ b/requirements/requirements.in @@ -43,6 +43,7 @@ pexpect==4.7.0 # see library notes prometheus_client psycopg psutil +PyGithub pygerduty pyopenssl>=23.2.0 # resolve dep conflict from cryptography pin above pyparsing==2.4.6 # Upgrading to v3 of pyparsing introduce errors on smart host filtering: Expected 'or' term, found 'or' (at char 15), (line:1, col:16) diff --git a/requirements/requirements.txt b/requirements/requirements.txt index e88a669ca433..7df5d1e56e9e 100644 --- a/requirements/requirements.txt +++ b/requirements/requirements.txt @@ -1,10 +1,16 @@ +# +# This file is autogenerated by pip-compile with Python 3.12 +# by the following command: +# +# pip-compile --allow-unsafe --strip-extras requirements/requirements.in +# adal==1.2.7 # via msrestazure aiohappyeyeballs==2.4.4 # via aiohttp aiohttp==3.11.11 # via - # -r /awx_devel/requirements/requirements.in + # -r requirements/requirements.in # aiohttp-retry # twilio aiohttp-retry==2.8.3 @@ -12,21 +18,18 @@ aiohttp-retry==2.8.3 aiosignal==1.3.2 # via aiohttp ansi2html==1.9.2 - # via -r /awx_devel/requirements/requirements.in -# git+https://github.com/ansible/ansible-runner.git@devel # git requirements installed separately - # via -r /awx_devel/requirements/requirements_git.txt + # via -r requirements/requirements.in asciichartpy==1.5.25 - # via -r /awx_devel/requirements/requirements.in + # via -r requirements/requirements.in asgiref==3.8.1 # via # channels # channels-redis # daphne # django - # django-ansible-base # django-cors-headers asn1==2.7.1 - # via -r /awx_devel/requirements/requirements.in + # via -r requirements/requirements.in attrs==24.3.0 # via # aiohttp @@ -40,10 +43,6 @@ autocommand==2.2.2 # via jaraco-text automat==24.8.1 # via twisted -# awx-plugins-core @ git+https://git@github.com/ansible/awx-plugins.git@devel # git requirements installed separately - # via -r /awx_devel/requirements/requirements_git.txt -awx-plugins.interfaces @ git+https://github.com/ansible/awx_plugins.interfaces.git - # via -r /awx_devel/requirements/requirements_git.txt azure-core==1.32.0 # via # azure-identity @@ -52,40 +51,39 @@ azure-core==1.32.0 # azure-keyvault-secrets # msrest azure-identity==1.19.0 - # via -r /awx_devel/requirements/requirements.in + # via -r requirements/requirements.in azure-keyvault==4.2.0 - # via -r /awx_devel/requirements/requirements.in + # via -r requirements/requirements.in azure-keyvault-certificates==4.9.0 # via azure-keyvault azure-keyvault-keys==4.10.0 # via azure-keyvault azure-keyvault-secrets==4.9.0 # via azure-keyvault -backports-tarfile==1.2.0 - # via jaraco-context boto3==1.35.96 - # via -r /awx_devel/requirements/requirements.in + # via -r requirements/requirements.in botocore==1.35.96 # via - # -r /awx_devel/requirements/requirements.in + # -r requirements/requirements.in # boto3 # s3transfer cachetools==5.5.0 # via google-auth -# git+https://github.com/ansible/system-certifi.git@devel # git requirements installed separately +certifi==2025.1.31 # via - # -r /awx_devel/requirements/requirements_git.txt # kubernetes # msrest # requests cffi==1.17.1 - # via cryptography + # via + # cryptography + # pynacl channels==4.2.0 # via - # -r /awx_devel/requirements/requirements.in + # -r requirements/requirements.in # channels-redis channels-redis==4.2.1 - # via -r /awx_devel/requirements/requirements.in + # via -r requirements/requirements.in charset-normalizer==3.4.1 # via requests click==8.1.8 @@ -94,34 +92,33 @@ constantly==23.10.4 # via twisted cryptography==41.0.7 # via - # -r /awx_devel/requirements/requirements.in + # -r requirements/requirements.in # adal # autobahn # azure-identity # azure-keyvault-keys - # django-ansible-base # jwcrypto # msal # pyjwt # pyopenssl # service-identity cython==3.0.11 - # via -r /awx_devel/requirements/requirements.in + # via -r requirements/requirements.in daphne==4.1.2 - # via -r /awx_devel/requirements/requirements.in + # via -r requirements/requirements.in deprecated==1.2.15 # via # opentelemetry-api # opentelemetry-exporter-otlp-proto-grpc # opentelemetry-exporter-otlp-proto-http # opentelemetry-semantic-conventions + # pygithub distro==1.9.0 - # via -r /awx_devel/requirements/requirements.in + # via -r requirements/requirements.in django==4.2.16 # via - # -r /awx_devel/requirements/requirements.in + # -r requirements/requirements.in # channels - # django-ansible-base # django-cors-headers # django-crum # django-extensions @@ -131,42 +128,34 @@ django==4.2.16 # django-polymorphic # django-solo # djangorestframework -# django-ansible-base @ git+https://github.com/ansible/django-ansible-base@devel # git requirements installed separately - # via -r /awx_devel/requirements/requirements_git.txt django-cors-headers==4.6.0 - # via -r /awx_devel/requirements/requirements.in + # via -r requirements/requirements.in django-crum==0.7.9 - # via - # -r /awx_devel/requirements/requirements.in - # django-ansible-base + # via -r requirements/requirements.in django-extensions==3.2.3 - # via -r /awx_devel/requirements/requirements.in + # via -r requirements/requirements.in django-flags==5.0.13 - # via -r /awx_devel/requirements/requirements.in + # via -r requirements/requirements.in django-guid==3.5.0 - # via -r /awx_devel/requirements/requirements.in + # via -r requirements/requirements.in django-oauth-toolkit==1.7.1 - # via -r /awx_devel/requirements/requirements.in + # via -r requirements/requirements.in django-polymorphic==3.1.0 - # via -r /awx_devel/requirements/requirements.in + # via -r requirements/requirements.in django-solo==2.4.0 - # via -r /awx_devel/requirements/requirements.in + # via -r requirements/requirements.in django-split-settings==1.3.2 - # via - # -r /awx_devel/requirements/requirements.in - # django-ansible-base + # via -r requirements/requirements.in djangorestframework==3.15.2 - # via - # -r /awx_devel/requirements/requirements.in - # django-ansible-base + # via -r requirements/requirements.in djangorestframework-yaml==2.0.0 - # via -r /awx_devel/requirements/requirements.in + # via -r requirements/requirements.in durationpy==0.9 # via kubernetes enum-compat==0.0.3 # via asn1 filelock==3.16.1 - # via -r /awx_devel/requirements/requirements.in + # via -r requirements/requirements.in frozenlist==1.5.0 # via # aiohttp @@ -174,7 +163,7 @@ frozenlist==1.5.0 gitdb==4.0.12 # via gitpython gitpython==3.1.44 - # via -r /awx_devel/requirements/requirements.in + # via -r requirements/requirements.in google-auth==2.37.0 # via kubernetes googleapis-common-protos==1.66.0 @@ -183,7 +172,7 @@ googleapis-common-protos==1.66.0 # opentelemetry-exporter-otlp-proto-http grpcio==1.69.0 # via - # -r /awx_devel/requirements/requirements.in + # -r requirements/requirements.in # opentelemetry-exporter-otlp-proto-grpc hiredis==3.1.0 # via redis @@ -199,14 +188,10 @@ idna==3.10 # yarl importlib-metadata==8.5.0 # via opentelemetry-api -importlib-resources==6.5.2 - # via irc incremental==24.7.2 # via twisted -inflection==0.5.1 - # via django-ansible-base irc==20.5.0 - # via -r /awx_devel/requirements/requirements.in + # via -r requirements/requirements.in isodate==0.7.2 # via # azure-keyvault-certificates @@ -231,15 +216,15 @@ jaraco-text==4.0.0 # irc # jaraco-collections jinja2==3.1.5 - # via -r /awx_devel/requirements/requirements.in + # via -r requirements/requirements.in jmespath==1.0.1 # via # boto3 # botocore json-log-formatter==1.1 - # via -r /awx_devel/requirements/requirements.in + # via -r requirements/requirements.in jsonschema==4.23.0 - # via -r /awx_devel/requirements/requirements.in + # via -r requirements/requirements.in jsonschema-specifications==2024.10.1 # via jsonschema jwcrypto==1.5.6 @@ -249,11 +234,11 @@ kubernetes==31.0.0 lockfile==0.12.2 # via python-daemon markdown==3.7 - # via -r /awx_devel/requirements/requirements.in + # via -r requirements/requirements.in markupsafe==3.0.2 # via jinja2 maturin==1.8.1 - # via -r /awx_devel/requirements/requirements.in + # via -r requirements/requirements.in more-itertools==10.5.0 # via # irc @@ -268,12 +253,12 @@ msal-extensions==1.2.0 # via azure-identity msgpack==1.1.0 # via - # -r /awx_devel/requirements/requirements.in + # -r requirements/requirements.in # channels-redis msrest==0.7.1 # via msrestazure msrestazure==0.6.4.post1 - # via -r /awx_devel/requirements/requirements.in + # via -r requirements/requirements.in multidict==6.1.0 # via # aiohttp @@ -284,10 +269,10 @@ oauthlib==3.2.2 # kubernetes # requests-oauthlib openshift==0.13.2 - # via -r /awx_devel/requirements/requirements.in + # via -r requirements/requirements.in opentelemetry-api==1.29.0 # via - # -r /awx_devel/requirements/requirements.in + # -r requirements/requirements.in # opentelemetry-exporter-otlp-proto-grpc # opentelemetry-exporter-otlp-proto-http # opentelemetry-instrumentation @@ -295,7 +280,7 @@ opentelemetry-api==1.29.0 # opentelemetry-sdk # opentelemetry-semantic-conventions opentelemetry-exporter-otlp==1.29.0 - # via -r /awx_devel/requirements/requirements.in + # via -r requirements/requirements.in opentelemetry-exporter-otlp-proto-common==1.29.0 # via # opentelemetry-exporter-otlp-proto-grpc @@ -307,7 +292,7 @@ opentelemetry-exporter-otlp-proto-http==1.29.0 opentelemetry-instrumentation==0.50b0 # via opentelemetry-instrumentation-logging opentelemetry-instrumentation-logging==0.50b0 - # via -r /awx_devel/requirements/requirements.in + # via -r requirements/requirements.in opentelemetry-proto==1.29.0 # via # opentelemetry-exporter-otlp-proto-common @@ -315,7 +300,7 @@ opentelemetry-proto==1.29.0 # opentelemetry-exporter-otlp-proto-http opentelemetry-sdk==1.29.0 # via - # -r /awx_devel/requirements/requirements.in + # -r requirements/requirements.in # opentelemetry-exporter-otlp-proto-grpc # opentelemetry-exporter-otlp-proto-http opentelemetry-semantic-conventions==0.50b0 @@ -324,21 +309,18 @@ opentelemetry-semantic-conventions==0.50b0 # opentelemetry-sdk packaging==24.2 # via - # ansible-runner # opentelemetry-instrumentation # setuptools-scm pbr==6.1.0 - # via -r /awx_devel/requirements/requirements.in + # via -r requirements/requirements.in pexpect==4.7.0 - # via - # -r /awx_devel/requirements/requirements.in - # ansible-runner + # via -r requirements/requirements.in pkgconfig==1.5.5 - # via -r /awx_devel/requirements/requirements.in + # via -r requirements/requirements.in portalocker==2.10.1 # via msal-extensions prometheus-client==0.21.1 - # via -r /awx_devel/requirements/requirements.in + # via -r requirements/requirements.in propcache==0.2.1 # via # aiohttp @@ -348,9 +330,9 @@ protobuf==5.29.3 # googleapis-common-protos # opentelemetry-proto psutil==6.1.1 - # via -r /awx_devel/requirements/requirements.in + # via -r requirements/requirements.in psycopg==3.2.3 - # via -r /awx_devel/requirements/requirements.in + # via -r requirements/requirements.in ptyprocess==0.7.0 # via pexpect pyasn1==0.6.1 @@ -365,23 +347,25 @@ pyasn1-modules==0.4.1 pycparser==2.22 # via cffi pygerduty==0.38.3 - # via -r /awx_devel/requirements/requirements.in -pyjwt[crypto]==2.10.1 + # via -r requirements/requirements.in +pygithub==2.5.0 + # via -r requirements/requirements.in +pyjwt==2.10.1 # via # adal - # django-ansible-base # msal + # pygithub # twilio +pynacl==1.5.0 + # via pygithub pyopenssl==24.3.0 # via - # -r /awx_devel/requirements/requirements.in + # -r requirements/requirements.in # twisted pyparsing==2.4.6 - # via -r /awx_devel/requirements/requirements.in + # via -r requirements/requirements.in python-daemon==3.1.2 - # via - # -r /awx_devel/requirements/requirements.in - # ansible-runner + # via -r requirements/requirements.in python-dateutil==2.9.0.post0 # via # adal @@ -390,27 +374,26 @@ python-dateutil==2.9.0.post0 # receptorctl # tempora python-dsv-sdk==1.0.4 - # via -r /awx_devel/requirements/requirements.in + # via -r requirements/requirements.in python-string-utils==1.0.0 # via openshift python-tss-sdk==1.2.3 - # via -r /awx_devel/requirements/requirements.in + # via -r requirements/requirements.in pytz==2024.2 # via irc pyyaml==6.0.2 # via - # -r /awx_devel/requirements/requirements.in - # ansible-runner + # -r requirements/requirements.in # djangorestframework-yaml # kubernetes # receptorctl pyzstd==0.16.2 - # via -r /awx_devel/requirements/requirements.in + # via -r requirements/requirements.in receptorctl==1.5.2 - # via -r /awx_devel/requirements/requirements.in -redis[hiredis]==5.2.1 + # via -r requirements/requirements.in +redis==5.2.1 # via - # -r /awx_devel/requirements/requirements.in + # -r requirements/requirements.in # channels-redis referencing==0.35.1 # via @@ -418,15 +401,15 @@ referencing==0.35.1 # jsonschema-specifications requests==2.32.3 # via - # -r /awx_devel/requirements/requirements.in + # -r requirements/requirements.in # adal # azure-core - # django-ansible-base # django-oauth-toolkit # kubernetes # msal # msrest # opentelemetry-exporter-otlp-proto-http + # pygithub # python-dsv-sdk # python-tss-sdk # requests-oauthlib @@ -448,9 +431,9 @@ semantic-version==2.10.0 service-identity==24.2.0 # via twisted setuptools-rust==1.10.2 - # via -r /awx_devel/requirements/requirements.in -setuptools-scm[toml]==8.1.0 - # via -r /awx_devel/requirements/requirements.in + # via -r requirements/requirements.in +setuptools-scm==8.1.0 + # via -r requirements/requirements.in six==1.17.0 # via # azure-core @@ -460,23 +443,22 @@ six==1.17.0 # pygerduty # python-dateutil slack-sdk==3.34.0 - # via -r /awx_devel/requirements/requirements.in + # via -r requirements/requirements.in smmap==5.0.2 # via gitdb sqlparse==0.5.3 # via - # -r /awx_devel/requirements/requirements.in + # -r requirements/requirements.in # django - # django-ansible-base tempora==5.8.0 # via # irc # jaraco-logging twilio==9.4.2 - # via -r /awx_devel/requirements/requirements.in -twisted[tls]==24.11.0 + # via -r requirements/requirements.in +twisted==24.11.0 # via - # -r /awx_devel/requirements/requirements.in + # -r requirements/requirements.in # daphne txaio==23.1.1 # via autobahn @@ -490,21 +472,22 @@ typing-extensions==4.12.2 # jwcrypto # opentelemetry-sdk # psycopg + # pygithub # twisted urllib3==2.3.0 # via # botocore - # django-ansible-base # kubernetes + # pygithub # requests uwsgi==2.0.28 - # via -r /awx_devel/requirements/requirements.in + # via -r requirements/requirements.in uwsgitop==0.12 - # via -r /awx_devel/requirements/requirements.in + # via -r requirements/requirements.in websocket-client==1.8.0 # via kubernetes wheel==0.45.1 - # via -r /awx_devel/requirements/requirements.in + # via -r requirements/requirements.in wrapt==1.17.0 # via # deprecated @@ -518,14 +501,13 @@ zope-interface==7.2 # The following packages are considered to be unsafe in a requirements file: pip==21.2.4 - # via -r /awx_devel/requirements/requirements.in + # via -r requirements/requirements.in setuptools==70.3.0 # via - # -r /awx_devel/requirements/requirements.in + # -r requirements/requirements.in # asciichartpy # autobahn # incremental # setuptools-rust # setuptools-scm # zope-interface - From fd8692e114914b9127d373787f55310f9e8bdb87 Mon Sep 17 00:00:00 2001 From: Andrea Restle-Lay Date: Sat, 15 Feb 2025 05:19:25 -0500 Subject: [PATCH 3/3] revert requirements changes and instead pip install PyGithub in the docker container --- requirements/requirements.in | 2 +- requirements/requirements.txt | 205 ++++++++++++++++-------------- requirements/requirements_git.txt | 2 +- 3 files changed, 113 insertions(+), 96 deletions(-) diff --git a/requirements/requirements.in b/requirements/requirements.in index a4576d9129ef..3d6e87abf4c9 100644 --- a/requirements/requirements.in +++ b/requirements/requirements.in @@ -1,3 +1,4 @@ + aiohttp>=3.9.4 # CVE-2024-30251 ansi2html # Used to format the stdout from jobs into html for display asciichartpy @@ -43,7 +44,6 @@ pexpect==4.7.0 # see library notes prometheus_client psycopg psutil -PyGithub pygerduty pyopenssl>=23.2.0 # resolve dep conflict from cryptography pin above pyparsing==2.4.6 # Upgrading to v3 of pyparsing introduce errors on smart host filtering: Expected 'or' term, found 'or' (at char 15), (line:1, col:16) diff --git a/requirements/requirements.txt b/requirements/requirements.txt index 7df5d1e56e9e..9c7b3911f43e 100644 --- a/requirements/requirements.txt +++ b/requirements/requirements.txt @@ -1,16 +1,10 @@ -# -# This file is autogenerated by pip-compile with Python 3.12 -# by the following command: -# -# pip-compile --allow-unsafe --strip-extras requirements/requirements.in -# adal==1.2.7 # via msrestazure aiohappyeyeballs==2.4.4 # via aiohttp aiohttp==3.11.11 # via - # -r requirements/requirements.in + # -r /awx_devel/requirements/requirements.in # aiohttp-retry # twilio aiohttp-retry==2.8.3 @@ -18,18 +12,21 @@ aiohttp-retry==2.8.3 aiosignal==1.3.2 # via aiohttp ansi2html==1.9.2 - # via -r requirements/requirements.in + # via -r /awx_devel/requirements/requirements.in +# git+https://github.com/ansible/ansible-runner.git@devel # git requirements installed separately + # via -r /awx_devel/requirements/requirements_git.txt asciichartpy==1.5.25 - # via -r requirements/requirements.in + # via -r /awx_devel/requirements/requirements.in asgiref==3.8.1 # via # channels # channels-redis # daphne # django + # django-ansible-base # django-cors-headers asn1==2.7.1 - # via -r requirements/requirements.in + # via -r /awx_devel/requirements/requirements.in attrs==24.3.0 # via # aiohttp @@ -43,6 +40,10 @@ autocommand==2.2.2 # via jaraco-text automat==24.8.1 # via twisted +# awx-plugins-core @ git+https://git@github.com/ansible/awx-plugins.git@devel # git requirements installed separately + # via -r /awx_devel/requirements/requirements_git.txt +awx-plugins.interfaces @ git+https://github.com/ansible/awx_plugins.interfaces.git + # via -r /awx_devel/requirements/requirements_git.txt azure-core==1.32.0 # via # azure-identity @@ -51,39 +52,40 @@ azure-core==1.32.0 # azure-keyvault-secrets # msrest azure-identity==1.19.0 - # via -r requirements/requirements.in + # via -r /awx_devel/requirements/requirements.in azure-keyvault==4.2.0 - # via -r requirements/requirements.in + # via -r /awx_devel/requirements/requirements.in azure-keyvault-certificates==4.9.0 # via azure-keyvault azure-keyvault-keys==4.10.0 # via azure-keyvault azure-keyvault-secrets==4.9.0 # via azure-keyvault +backports-tarfile==1.2.0 + # via jaraco-context boto3==1.35.96 - # via -r requirements/requirements.in + # via -r /awx_devel/requirements/requirements.in botocore==1.35.96 # via - # -r requirements/requirements.in + # -r /awx_devel/requirements/requirements.in # boto3 # s3transfer cachetools==5.5.0 # via google-auth -certifi==2025.1.31 +# git+https://github.com/ansible/system-certifi.git@devel # git requirements installed separately # via + # -r /awx_devel/requirements/requirements_git.txt # kubernetes # msrest # requests cffi==1.17.1 - # via - # cryptography - # pynacl + # via cryptography channels==4.2.0 # via - # -r requirements/requirements.in + # -r /awx_devel/requirements/requirements.in # channels-redis channels-redis==4.2.1 - # via -r requirements/requirements.in + # via -r /awx_devel/requirements/requirements.in charset-normalizer==3.4.1 # via requests click==8.1.8 @@ -92,33 +94,34 @@ constantly==23.10.4 # via twisted cryptography==41.0.7 # via - # -r requirements/requirements.in + # -r /awx_devel/requirements/requirements.in # adal # autobahn # azure-identity # azure-keyvault-keys + # django-ansible-base # jwcrypto # msal # pyjwt # pyopenssl # service-identity cython==3.0.11 - # via -r requirements/requirements.in + # via -r /awx_devel/requirements/requirements.in daphne==4.1.2 - # via -r requirements/requirements.in + # via -r /awx_devel/requirements/requirements.in deprecated==1.2.15 # via # opentelemetry-api # opentelemetry-exporter-otlp-proto-grpc # opentelemetry-exporter-otlp-proto-http # opentelemetry-semantic-conventions - # pygithub distro==1.9.0 - # via -r requirements/requirements.in + # via -r /awx_devel/requirements/requirements.in django==4.2.16 # via - # -r requirements/requirements.in + # -r /awx_devel/requirements/requirements.in # channels + # django-ansible-base # django-cors-headers # django-crum # django-extensions @@ -128,34 +131,42 @@ django==4.2.16 # django-polymorphic # django-solo # djangorestframework +# django-ansible-base @ git+https://github.com/ansible/django-ansible-base@devel # git requirements installed separately + # via -r /awx_devel/requirements/requirements_git.txt django-cors-headers==4.6.0 - # via -r requirements/requirements.in + # via -r /awx_devel/requirements/requirements.in django-crum==0.7.9 - # via -r requirements/requirements.in + # via + # -r /awx_devel/requirements/requirements.in + # django-ansible-base django-extensions==3.2.3 - # via -r requirements/requirements.in + # via -r /awx_devel/requirements/requirements.in django-flags==5.0.13 - # via -r requirements/requirements.in + # via -r /awx_devel/requirements/requirements.in django-guid==3.5.0 - # via -r requirements/requirements.in + # via -r /awx_devel/requirements/requirements.in django-oauth-toolkit==1.7.1 - # via -r requirements/requirements.in + # via -r /awx_devel/requirements/requirements.in django-polymorphic==3.1.0 - # via -r requirements/requirements.in + # via -r /awx_devel/requirements/requirements.in django-solo==2.4.0 - # via -r requirements/requirements.in + # via -r /awx_devel/requirements/requirements.in django-split-settings==1.3.2 - # via -r requirements/requirements.in + # via + # -r /awx_devel/requirements/requirements.in + # django-ansible-base djangorestframework==3.15.2 - # via -r requirements/requirements.in + # via + # -r /awx_devel/requirements/requirements.in + # django-ansible-base djangorestframework-yaml==2.0.0 - # via -r requirements/requirements.in + # via -r /awx_devel/requirements/requirements.in durationpy==0.9 # via kubernetes enum-compat==0.0.3 # via asn1 filelock==3.16.1 - # via -r requirements/requirements.in + # via -r /awx_devel/requirements/requirements.in frozenlist==1.5.0 # via # aiohttp @@ -163,7 +174,7 @@ frozenlist==1.5.0 gitdb==4.0.12 # via gitpython gitpython==3.1.44 - # via -r requirements/requirements.in + # via -r /awx_devel/requirements/requirements.in google-auth==2.37.0 # via kubernetes googleapis-common-protos==1.66.0 @@ -172,7 +183,7 @@ googleapis-common-protos==1.66.0 # opentelemetry-exporter-otlp-proto-http grpcio==1.69.0 # via - # -r requirements/requirements.in + # -r /awx_devel/requirements/requirements.in # opentelemetry-exporter-otlp-proto-grpc hiredis==3.1.0 # via redis @@ -188,10 +199,14 @@ idna==3.10 # yarl importlib-metadata==8.5.0 # via opentelemetry-api +importlib-resources==6.5.2 + # via irc incremental==24.7.2 # via twisted +inflection==0.5.1 + # via django-ansible-base irc==20.5.0 - # via -r requirements/requirements.in + # via -r /awx_devel/requirements/requirements.in isodate==0.7.2 # via # azure-keyvault-certificates @@ -216,15 +231,15 @@ jaraco-text==4.0.0 # irc # jaraco-collections jinja2==3.1.5 - # via -r requirements/requirements.in + # via -r /awx_devel/requirements/requirements.in jmespath==1.0.1 # via # boto3 # botocore json-log-formatter==1.1 - # via -r requirements/requirements.in + # via -r /awx_devel/requirements/requirements.in jsonschema==4.23.0 - # via -r requirements/requirements.in + # via -r /awx_devel/requirements/requirements.in jsonschema-specifications==2024.10.1 # via jsonschema jwcrypto==1.5.6 @@ -234,11 +249,11 @@ kubernetes==31.0.0 lockfile==0.12.2 # via python-daemon markdown==3.7 - # via -r requirements/requirements.in + # via -r /awx_devel/requirements/requirements.in markupsafe==3.0.2 # via jinja2 maturin==1.8.1 - # via -r requirements/requirements.in + # via -r /awx_devel/requirements/requirements.in more-itertools==10.5.0 # via # irc @@ -253,12 +268,12 @@ msal-extensions==1.2.0 # via azure-identity msgpack==1.1.0 # via - # -r requirements/requirements.in + # -r /awx_devel/requirements/requirements.in # channels-redis msrest==0.7.1 # via msrestazure msrestazure==0.6.4.post1 - # via -r requirements/requirements.in + # via -r /awx_devel/requirements/requirements.in multidict==6.1.0 # via # aiohttp @@ -269,10 +284,10 @@ oauthlib==3.2.2 # kubernetes # requests-oauthlib openshift==0.13.2 - # via -r requirements/requirements.in + # via -r /awx_devel/requirements/requirements.in opentelemetry-api==1.29.0 # via - # -r requirements/requirements.in + # -r /awx_devel/requirements/requirements.in # opentelemetry-exporter-otlp-proto-grpc # opentelemetry-exporter-otlp-proto-http # opentelemetry-instrumentation @@ -280,7 +295,7 @@ opentelemetry-api==1.29.0 # opentelemetry-sdk # opentelemetry-semantic-conventions opentelemetry-exporter-otlp==1.29.0 - # via -r requirements/requirements.in + # via -r /awx_devel/requirements/requirements.in opentelemetry-exporter-otlp-proto-common==1.29.0 # via # opentelemetry-exporter-otlp-proto-grpc @@ -292,7 +307,7 @@ opentelemetry-exporter-otlp-proto-http==1.29.0 opentelemetry-instrumentation==0.50b0 # via opentelemetry-instrumentation-logging opentelemetry-instrumentation-logging==0.50b0 - # via -r requirements/requirements.in + # via -r /awx_devel/requirements/requirements.in opentelemetry-proto==1.29.0 # via # opentelemetry-exporter-otlp-proto-common @@ -300,7 +315,7 @@ opentelemetry-proto==1.29.0 # opentelemetry-exporter-otlp-proto-http opentelemetry-sdk==1.29.0 # via - # -r requirements/requirements.in + # -r /awx_devel/requirements/requirements.in # opentelemetry-exporter-otlp-proto-grpc # opentelemetry-exporter-otlp-proto-http opentelemetry-semantic-conventions==0.50b0 @@ -309,18 +324,21 @@ opentelemetry-semantic-conventions==0.50b0 # opentelemetry-sdk packaging==24.2 # via + # ansible-runner # opentelemetry-instrumentation # setuptools-scm pbr==6.1.0 - # via -r requirements/requirements.in + # via -r /awx_devel/requirements/requirements.in pexpect==4.7.0 - # via -r requirements/requirements.in + # via + # -r /awx_devel/requirements/requirements.in + # ansible-runner pkgconfig==1.5.5 - # via -r requirements/requirements.in + # via -r /awx_devel/requirements/requirements.in portalocker==2.10.1 # via msal-extensions prometheus-client==0.21.1 - # via -r requirements/requirements.in + # via -r /awx_devel/requirements/requirements.in propcache==0.2.1 # via # aiohttp @@ -330,9 +348,9 @@ protobuf==5.29.3 # googleapis-common-protos # opentelemetry-proto psutil==6.1.1 - # via -r requirements/requirements.in + # via -r /awx_devel/requirements/requirements.in psycopg==3.2.3 - # via -r requirements/requirements.in + # via -r /awx_devel/requirements/requirements.in ptyprocess==0.7.0 # via pexpect pyasn1==0.6.1 @@ -347,25 +365,23 @@ pyasn1-modules==0.4.1 pycparser==2.22 # via cffi pygerduty==0.38.3 - # via -r requirements/requirements.in -pygithub==2.5.0 - # via -r requirements/requirements.in -pyjwt==2.10.1 + # via -r /awx_devel/requirements/requirements.in +pyjwt[crypto]==2.10.1 # via # adal + # django-ansible-base # msal - # pygithub # twilio -pynacl==1.5.0 - # via pygithub pyopenssl==24.3.0 # via - # -r requirements/requirements.in + # -r /awx_devel/requirements/requirements.in # twisted pyparsing==2.4.6 - # via -r requirements/requirements.in + # via -r /awx_devel/requirements/requirements.in python-daemon==3.1.2 - # via -r requirements/requirements.in + # via + # -r /awx_devel/requirements/requirements.in + # ansible-runner python-dateutil==2.9.0.post0 # via # adal @@ -374,26 +390,27 @@ python-dateutil==2.9.0.post0 # receptorctl # tempora python-dsv-sdk==1.0.4 - # via -r requirements/requirements.in + # via -r /awx_devel/requirements/requirements.in python-string-utils==1.0.0 # via openshift python-tss-sdk==1.2.3 - # via -r requirements/requirements.in + # via -r /awx_devel/requirements/requirements.in pytz==2024.2 # via irc pyyaml==6.0.2 # via - # -r requirements/requirements.in + # -r /awx_devel/requirements/requirements.in + # ansible-runner # djangorestframework-yaml # kubernetes # receptorctl pyzstd==0.16.2 - # via -r requirements/requirements.in + # via -r /awx_devel/requirements/requirements.in receptorctl==1.5.2 - # via -r requirements/requirements.in -redis==5.2.1 + # via -r /awx_devel/requirements/requirements.in +redis[hiredis]==5.2.1 # via - # -r requirements/requirements.in + # -r /awx_devel/requirements/requirements.in # channels-redis referencing==0.35.1 # via @@ -401,15 +418,15 @@ referencing==0.35.1 # jsonschema-specifications requests==2.32.3 # via - # -r requirements/requirements.in + # -r /awx_devel/requirements/requirements.in # adal # azure-core + # django-ansible-base # django-oauth-toolkit # kubernetes # msal # msrest # opentelemetry-exporter-otlp-proto-http - # pygithub # python-dsv-sdk # python-tss-sdk # requests-oauthlib @@ -431,9 +448,9 @@ semantic-version==2.10.0 service-identity==24.2.0 # via twisted setuptools-rust==1.10.2 - # via -r requirements/requirements.in -setuptools-scm==8.1.0 - # via -r requirements/requirements.in + # via -r /awx_devel/requirements/requirements.in +setuptools-scm[toml]==8.1.0 + # via -r /awx_devel/requirements/requirements.in six==1.17.0 # via # azure-core @@ -443,22 +460,23 @@ six==1.17.0 # pygerduty # python-dateutil slack-sdk==3.34.0 - # via -r requirements/requirements.in + # via -r /awx_devel/requirements/requirements.in smmap==5.0.2 # via gitdb sqlparse==0.5.3 # via - # -r requirements/requirements.in + # -r /awx_devel/requirements/requirements.in # django + # django-ansible-base tempora==5.8.0 # via # irc # jaraco-logging twilio==9.4.2 - # via -r requirements/requirements.in -twisted==24.11.0 + # via -r /awx_devel/requirements/requirements.in +twisted[tls]==24.11.0 # via - # -r requirements/requirements.in + # -r /awx_devel/requirements/requirements.in # daphne txaio==23.1.1 # via autobahn @@ -472,22 +490,21 @@ typing-extensions==4.12.2 # jwcrypto # opentelemetry-sdk # psycopg - # pygithub # twisted urllib3==2.3.0 # via # botocore + # django-ansible-base # kubernetes - # pygithub # requests uwsgi==2.0.28 - # via -r requirements/requirements.in + # via -r /awx_devel/requirements/requirements.in uwsgitop==0.12 - # via -r requirements/requirements.in + # via -r /awx_devel/requirements/requirements.in websocket-client==1.8.0 # via kubernetes wheel==0.45.1 - # via -r requirements/requirements.in + # via -r /awx_devel/requirements/requirements.in wrapt==1.17.0 # via # deprecated @@ -501,13 +518,13 @@ zope-interface==7.2 # The following packages are considered to be unsafe in a requirements file: pip==21.2.4 - # via -r requirements/requirements.in + # via -r /awx_devel/requirements/requirements.in setuptools==70.3.0 # via - # -r requirements/requirements.in + # -r /awx_devel/requirements/requirements.in # asciichartpy # autobahn # incremental # setuptools-rust # setuptools-scm - # zope-interface + # zope-interface \ No newline at end of file diff --git a/requirements/requirements_git.txt b/requirements/requirements_git.txt index cfd354be4c70..8f76bc1d5865 100644 --- a/requirements/requirements_git.txt +++ b/requirements/requirements_git.txt @@ -3,4 +3,4 @@ git+https://github.com/ansible/system-certifi.git@devel#egg=certifi git+https://github.com/ansible/ansible-runner.git@devel#egg=ansible-runner django-ansible-base @ git+https://github.com/ansible/django-ansible-base@devel#egg=django-ansible-base[rest-filters,jwt_consumer,resource-registry,rbac,feature-flags] awx-plugins-core @ git+https://github.com/ansible/awx-plugins.git@devel#egg=awx-plugins-core -awx_plugins.interfaces @ git+https://github.com/ansible/awx_plugins.interfaces.git +awx_plugins.interfaces @ git+https://github.com/ansible/awx_plugins.interfaces.git \ No newline at end of file