summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJohn Westcott IV <john.westcott.iv@redhat.com>2023-04-10 16:58:13 +0200
committerJohn Westcott IV <john.westcott.iv@redhat.com>2023-04-10 18:25:15 +0200
commit6c9e2502a524b235c99f9a54d23c384d5233a717 (patch)
tree6ae2f5c058428c1e497d728f09e54d032f341a37
parentFixes bug where attempting to edit a schedule with stringified extra_data thr... (diff)
downloadawx-6c9e2502a524b235c99f9a54d23c384d5233a717.tar.xz
awx-6c9e2502a524b235c99f9a54d23c384d5233a717.zip
Unpinning future
-rw-r--r--licenses/future.txt (renamed from licenses/python-future.txt)0
-rw-r--r--requirements/requirements.txt5
-rw-r--r--requirements/requirements_git.txt2
3 files changed, 3 insertions, 4 deletions
diff --git a/licenses/python-future.txt b/licenses/future.txt
index 4c904dba8f..4c904dba8f 100644
--- a/licenses/python-future.txt
+++ b/licenses/future.txt
diff --git a/requirements/requirements.txt b/requirements/requirements.txt
index 217356b5ca..4b74fe3119 100644
--- a/requirements/requirements.txt
+++ b/requirements/requirements.txt
@@ -149,9 +149,8 @@ frozenlist==1.3.3
# via
# aiohttp
# aiosignal
- # via
- # -r /awx_devel/requirements/requirements_git.txt
- # django-radius
+future==0.18.3
+ # via django-radius
gitdb==4.0.10
# via gitpython
gitpython==3.1.30
diff --git a/requirements/requirements_git.txt b/requirements/requirements_git.txt
index df424cca95..a4ddd96586 100644
--- a/requirements/requirements_git.txt
+++ b/requirements/requirements_git.txt
@@ -2,6 +2,6 @@ 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 has an aggressive pin of future==0.16.0, see https://github.com/robgolding/django-radius/pull/25
+# There is a PR against django-radius that would fix this: https://github.com/robgolding/django-radius/pull/27
git+https://github.com/ansible/django-radius.git@develop#egg=django-radius
-git+https://github.com/PythonCharmers/python-future@master#egg=future
git+https://github.com/ansible/python3-saml.git@devel#egg=python3-saml