Skip to content
New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

#

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

Add Github dep for new cred support if used #15850

Merged
merged 5 commits into from
Feb 20, 2025
Merged

Add Github dep for new cred support if used #15850

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
845962e
Add pygithub for new app token support
thedoubl3j Feb 20, 2025
2b9e33d
add required licenses
arrestle Feb 20, 2025
01a3085
Add artifacts to satisfy license check
AlanCoding Feb 20, 2025
f9c4d0d
Remove duplicated license
AlanCoding Feb 20, 2025
5d167b6
Update cred test to list new cred
thedoubl3j Feb 20, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions requirements/requirements.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,7 @@ prometheus_client
psycopg
psutil
pygerduty
PyGithub <= 2.6.0
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@thedoubl3j it's a transitive dep. Isn't this file supposed to list direct deps? The correct thing to do would be to depend on awx-plugins-core [credentials-github-app] that declares the dependency.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You are correct. Put up #15853

I was a bit panicked to merge this PR yesterday, because it was breaking checks and presumably the installs. If we have an outright missing dependency, I'd hope that we could ignore all checks and force it through. After that, fine to do cleanup.

The way this is a floating dependency on awx-plugins-core, honestly, our best-case scenario would have been to add it to requirements.in a day before merging the plugins patch. Then merge the plugins patch, then update the requirements. Otherwise - pin the plugins version.

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
Expand Down
21 changes: 17 additions & 4 deletions requirements/requirements.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -427,6 +437,7 @@ requests==2.32.3
# msal
# msrest
# opentelemetry-exporter-otlp-proto-http
# pygithub
# python-dsv-sdk
# python-tss-sdk
# requests-oauthlib
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -527,4 +540,4 @@ setuptools==70.3.0
# incremental
# setuptools-rust
# setuptools-scm
# zope-interface
# zope-interface
2 changes: 1 addition & 1 deletion requirements/requirements_git.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Loading