From 17f544a0af209c421c0fc647008e078bc6b9d8bd Mon Sep 17 00:00:00 2001 From: Alan Rominger Date: Wed, 19 Jul 2023 11:05:53 -0400 Subject: [PATCH 1/2] Re-run the updater script after upstream removal of future --- requirements/requirements.txt | 2 -- 1 file changed, 2 deletions(-) diff --git a/requirements/requirements.txt b/requirements/requirements.txt index 40b1490dd4b5..c6a15cdc6530 100644 --- a/requirements/requirements.txt +++ b/requirements/requirements.txt @@ -158,8 +158,6 @@ frozenlist==1.3.3 # via # aiohttp # aiosignal -future==0.18.3 - # via django-radius gitdb==4.0.10 # via gitpython gitpython==3.1.30 From 2758a85eeddd1338a1c230e620f096df0657548c Mon Sep 17 00:00:00 2001 From: Alan Rominger Date: Wed, 19 Jul 2023 11:10:14 -0400 Subject: [PATCH 2/2] Update comment in git requirements --- licenses/future.txt | 19 ------------------- requirements/requirements_git.txt | 4 ++-- 2 files changed, 2 insertions(+), 21 deletions(-) delete mode 100644 licenses/future.txt diff --git a/licenses/future.txt b/licenses/future.txt deleted file mode 100644 index 4c904dba8fe2..000000000000 --- a/licenses/future.txt +++ /dev/null @@ -1,19 +0,0 @@ -Copyright (c) 2013-2019 Python Charmers Pty Ltd, Australia - -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in -all copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN -THE SOFTWARE. diff --git a/requirements/requirements_git.txt b/requirements/requirements_git.txt index a4ddd9658685..f04010b84e49 100644 --- a/requirements/requirements_git.txt +++ b/requirements/requirements_git.txt @@ -1,7 +1,7 @@ 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 +# 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