diff options
author | Hao Liu <44379968+TheRealHaoLiu@users.noreply.github.com> | 2024-10-02 20:28:17 +0200 |
---|---|---|
committer | jessicamack <jmack@redhat.com> | 2024-10-15 23:43:32 +0200 |
commit | 31e47706b99d7e217943c96e543ba827c2399fcd (patch) | |
tree | a79a2f1e955ae4ce9d3ff75abcad085609e92fde /requirements | |
parent | Remove sso app (#15550) (diff) | |
download | awx-31e47706b99d7e217943c96e543ba827c2399fcd.tar.xz awx-31e47706b99d7e217943c96e543ba827c2399fcd.zip |
3rd party auth removal cleanup
- Sequentiallize auth config removal migrations
- Remove references to third party auth
- update license files
- lint fix
- Remove unneeded docs
- Remove unreferenced file
- Remove social auth references from docs
- Remove rest of sso dir
- Remove references to third part auth in docs
- Removed screenshots of UI listing removed settings
- Remove AuthView references
- Remove unused imports
...
Co-Authored-By: jessicamack <21223244+jessicamack@users.noreply.github.com>
Diffstat (limited to 'requirements')
-rw-r--r-- | requirements/README.md | 12 | ||||
-rw-r--r-- | requirements/requirements.txt | 60 | ||||
-rwxr-xr-x | requirements/updater.sh | 2 |
3 files changed, 28 insertions, 46 deletions
diff --git a/requirements/README.md b/requirements/README.md index d29b81c902..4978d0bf40 100644 --- a/requirements/README.md +++ b/requirements/README.md @@ -49,18 +49,6 @@ Make sure to delete the old tarball if it is an upgrade. Anything pinned in `*.in` files involves additional manual work in order to upgrade. Some information related to that work is outlined here. -### social-auth-app-django - -django-social keeps a list of backends in memory that it gathers -based on the value of `settings.AUTHENTICATION_BACKENDS` *at import time*: -https://github.com/python-social-auth/social-app-django/blob/c1e2795b00b753d58a81fa6a0261d8dae1d9c73d/social_django/utils.py#L13 - -Our `settings.AUTHENTICATION_BACKENDS` can *change* -dynamically as settings are changed (i.e., if somebody -configures Github OAuth2 integration), so we need to -_overwrite_ this in-memory value at the top of every request so -that we have the latest version - ### django-oauth-toolkit Versions later than 1.4.1 throw an error about id_token_id, due to the diff --git a/requirements/requirements.txt b/requirements/requirements.txt index 7e0d8eb8f9..94a462052f 100644 --- a/requirements/requirements.txt +++ b/requirements/requirements.txt @@ -25,10 +25,6 @@ asgiref==3.7.2 # django-cors-headers asn1==2.7.0 # via -r /awx_devel/requirements/requirements.in -async-timeout==4.0.3 - # via - # aiohttp - # redis attrs==23.2.0 # via # aiohttp @@ -43,6 +39,11 @@ autocommand==2.2.2 # via jaraco-text automat==22.10.0 # via twisted + # 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 + # awx-plugins-core azure-common==1.1.28 # via # azure-keyvault-certificates @@ -56,9 +57,13 @@ azure-core==1.30.0 # azure-keyvault-secrets # msrest azure-identity==1.15.0 - # via -r /awx_devel/requirements/requirements.in + # via + # -r /awx_devel/requirements/requirements.in + # awx-plugins-core azure-keyvault==4.2.0 - # via -r /awx_devel/requirements/requirements.in + # via + # -r /awx_devel/requirements/requirements.in + # awx-plugins-core azure-keyvault-certificates==4.7.0 # via azure-keyvault azure-keyvault-keys==4.8.0 @@ -66,7 +71,9 @@ azure-keyvault-keys==4.8.0 azure-keyvault-secrets==4.7.0 # via azure-keyvault boto3==1.34.47 - # via -r /awx_devel/requirements/requirements.in + # via + # -r /awx_devel/requirements/requirements.in + # awx-plugins-core botocore==1.34.47 # via # -r /awx_devel/requirements/requirements.in @@ -163,8 +170,6 @@ djangorestframework-yaml==2.0.0 # via -r /awx_devel/requirements/requirements.in docutils==0.20.1 # via python-daemon -ecdsa==0.18.0 - # via python-jose enum-compat==0.0.3 # via asn1 filelock==3.13.1 @@ -200,10 +205,7 @@ idna==3.6 # twisted # yarl importlib-metadata==6.2.1 - # via - # ansible-runner - # markdown - # opentelemetry-api + # via opentelemetry-api incremental==22.10.0 # via twisted inflect==7.0.0 @@ -277,13 +279,13 @@ msgpack==1.0.5 msrest==0.7.1 # via msrestazure msrestazure==0.6.4 - # via -r /awx_devel/requirements/requirements.in + # via + # -r /awx_devel/requirements/requirements.in + # awx-plugins-core multidict==6.0.5 # via # aiohttp # yarl -netaddr==1.2.1 - # via pyrad oauthlib==3.2.2 # via # django-oauth-toolkit @@ -355,7 +357,6 @@ ptyprocess==0.7.0 pyasn1==0.5.1 # via # pyasn1-modules - # python-jose # rsa # service-identity pyasn1-modules==0.3.0 @@ -393,13 +394,15 @@ python-dateutil==2.8.2 # kubernetes # receptorctl python-dsv-sdk==1.0.4 - # via -r /awx_devel/requirements/requirements.in + # via + # -r /awx_devel/requirements/requirements.in + # awx-plugins-core python-string-utils==1.0.0 # via openshift python-tss-sdk==1.2.2 - # via -r /awx_devel/requirements/requirements.in -python3-openid==3.2.0 - # via -r /awx_devel/requirements/requirements_git.txt + # via + # -r /awx_devel/requirements/requirements.in + # awx-plugins-core pytz==2024.1 # via # irc @@ -408,6 +411,7 @@ pyyaml==6.0.1 # via # -r /awx_devel/requirements/requirements.in # ansible-runner + # awx-plugins-core # djangorestframework-yaml # kubernetes # receptorctl @@ -427,6 +431,7 @@ requests==2.31.0 # via # -r /awx_devel/requirements/requirements.in # adal + # awx-plugins-core # azure-core # django-ansible-base # django-oauth-toolkit @@ -447,9 +452,7 @@ rpds-py==0.18.0 # jsonschema # referencing rsa==4.9 - # via - # google-auth - # python-jose + # via google-auth s3transfer==0.10.0 # via boto3 semantic-version==2.10.0 @@ -465,13 +468,11 @@ six==1.16.0 # automat # azure-core # django-pglocks - # ecdsa # isodate # kubernetes # msrestazure # openshift # pygerduty - # pyrad # python-dateutil slack-sdk==3.27.0 # via -r /awx_devel/requirements/requirements.in @@ -481,16 +482,10 @@ sqlparse==0.4.4 # via # -r /awx_devel/requirements/requirements.in # django - # via -r /awx_devel/requirements/requirements.in tempora==5.5.1 # via # irc # jaraco-logging -tomli==2.0.1 - # via - # maturin - # setuptools-rust - # setuptools-scm twilio==8.13.0 # via -r /awx_devel/requirements/requirements.in twisted[tls]==23.10.0 @@ -501,7 +496,6 @@ txaio==23.1.1 # via autobahn typing-extensions==4.9.0 # via - # asgiref # azure-core # azure-keyvault-certificates # azure-keyvault-keys diff --git a/requirements/updater.sh b/requirements/updater.sh index 4b16d8db38..92b466282d 100755 --- a/requirements/updater.sh +++ b/requirements/updater.sh @@ -16,7 +16,7 @@ _cleanup() { generate_requirements() { venv="`pwd`/venv" echo $venv - /usr/bin/python3 -m venv "${venv}" + /usr/bin/python3.11 -m venv "${venv}" # shellcheck disable=SC1090 source ${venv}/bin/activate |