From 845962eecc82f3445555efe07180ae1f0cadb408 Mon Sep 17 00:00:00 2001 From: thedoubl3j Date: Thu, 20 Feb 2025 09:51:26 -0500 Subject: [PATCH] Add pygithub for new app token support * fixed git requirements file with new * added new github dep and relevant deps it needs --- requirements/requirements.in | 1 + requirements/requirements.txt | 21 +++++++++++++++++---- requirements/requirements_git.txt | 2 +- 3 files changed, 19 insertions(+), 5 deletions(-) diff --git a/requirements/requirements.in b/requirements/requirements.in index 3d6e87abf4c9..339a7d8e50fc 100644 --- a/requirements/requirements.in +++ b/requirements/requirements.in @@ -45,6 +45,7 @@ prometheus_client psycopg psutil pygerduty +PyGithub <= 2.6.0 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) python-daemon>3.0.0 diff --git a/requirements/requirements.txt b/requirements/requirements.txt index 9c7b3911f43e..18ea730743c1 100644 --- a/requirements/requirements.txt +++ b/requirements/requirements.txt @@ -40,7 +40,7 @@ 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 +# awx-plugins-core @ git+https://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 @@ -79,7 +79,9 @@ cachetools==5.5.0 # msrest # requests cffi==1.17.1 - # via cryptography + # via + # cryptography + # pynacl channels==4.2.0 # via # -r /awx_devel/requirements/requirements.in @@ -115,6 +117,7 @@ deprecated==1.2.15 # 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 django==4.2.16 @@ -142,7 +145,9 @@ django-crum==0.7.9 django-extensions==3.2.3 # via -r /awx_devel/requirements/requirements.in django-flags==5.0.13 - # via -r /awx_devel/requirements/requirements.in + # via + # -r /awx_devel/requirements/requirements.in + # django-ansible-base django-guid==3.5.0 # via -r /awx_devel/requirements/requirements.in django-oauth-toolkit==1.7.1 @@ -366,12 +371,17 @@ pycparser==2.22 # via cffi pygerduty==0.38.3 # via -r /awx_devel/requirements/requirements.in +pygithub==2.6.0 + # 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 /awx_devel/requirements/requirements.in @@ -427,6 +437,7 @@ requests==2.32.3 # msal # msrest # opentelemetry-exporter-otlp-proto-http + # pygithub # python-dsv-sdk # python-tss-sdk # requests-oauthlib @@ -490,12 +501,14 @@ 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 @@ -527,4 +540,4 @@ setuptools==70.3.0 # incremental # setuptools-rust # setuptools-scm - # zope-interface \ No newline at end of file + # zope-interface diff --git a/requirements/requirements_git.txt b/requirements/requirements_git.txt index 8f76bc1d5865..cfd354be4c70 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 \ No newline at end of file +awx_plugins.interfaces @ git+https://github.com/ansible/awx_plugins.interfaces.git