Use released version of django-radius (ansible#15103)

jessicamack · Apr 12, 2024 · e3af658 · e3af658
1 parent e8a3b96
commit e3af658
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 9 deletions.
diff --git a/requirements/requirements.in b/requirements/requirements.in
@@ -22,6 +22,7 @@ django-guid==3.2.1
 django-oauth-toolkit<2.0.0      # Version 2.0.0 has breaking changes that will need to be worked out before upgrading
 django-polymorphic
 django-pglocks
+django-radius
 django-solo
 django-split-settings==1.0.0    # We hit a strange issue where the release process errored when upgrading past 1.0.0 see UPGRADE BLOCKERS
 djangorestframework

diff --git a/requirements/requirements.txt b/requirements/requirements.txt
@@ -1,7 +1,8 @@
 adal==1.2.7
     # via msrestazure
 aiohttp==3.9.3
-    # via -r /awx_devel/requirements/requirements.in
+    # via
+    #   -r /awx_devel/requirements/requirements.in
     #   aiohttp-retry
     #   twilio
 aiohttp-retry==2.8.3
@@ -158,7 +159,8 @@ django-pglocks==1.0.4
     # via -r /awx_devel/requirements/requirements.in
 django-polymorphic==3.1.0
     # via -r /awx_devel/requirements/requirements.in
-    # via -r /awx_devel/requirements/requirements_git.txt
+django-radius==1.5.1
+    # via -r /awx_devel/requirements/requirements.in
 django-solo==2.2.0
     # via -r /awx_devel/requirements/requirements.in
 django-split-settings==1.0.0
@@ -281,7 +283,7 @@ msal-extensions==1.1.0
 msgpack==1.0.5
     # via
     #   -r /awx_devel/requirements/requirements.in
-    #    channels-redis
+    #   channels-redis
 msrest==0.7.1
     # via msrestazure
 msrestazure==0.6.4
@@ -340,9 +342,7 @@ pycparser==2.21
 pydantic==2.5.0
     # via inflect
 pydantic-core==2.14.1
-    # via
-    #   -r /awx_devel/requirements/requirements.in
-    #   pydantic
+    # via pydantic
 pygerduty==0.38.3
     # via -r /awx_devel/requirements/requirements.in
 pyjwt[crypto]==2.8.0

diff --git a/requirements/requirements_git.txt b/requirements/requirements_git.txt
@@ -1,8 +1,5 @@
 git+https://github.com/ansible/system-certifi.git@devel#egg=certifi
 # Remove pbr from requirements.in when moving ansible-runner to requirements.in
 git+https://github.com/ansible/ansible-runner.git@devel#egg=ansible-runner
-# django-radius library has not released since several dependency fixes were made
-# specifically need https://github.com/robgolding/django-radius/pull/27
-git+https://github.com/ansible/django-radius.git@develop#egg=django-radius
 git+https://github.com/ansible/python3-saml.git@devel#egg=python3-saml
 django-ansible-base @ git+https://github.com/ansible/django-ansible-base@devel#egg=django-ansible-base[rest_filters,jwt_consumer,resource_registry,rbac]