From 6c9e2502a524b235c99f9a54d23c384d5233a717 Mon Sep 17 00:00:00 2001 From: John Westcott IV Date: Mon, 10 Apr 2023 10:58:13 -0400 Subject: Unpinning future --- licenses/future.txt | 19 +++++++++++++++++++ licenses/python-future.txt | 19 ------------------- requirements/requirements.txt | 5 ++--- requirements/requirements_git.txt | 2 +- 4 files changed, 22 insertions(+), 23 deletions(-) create mode 100644 licenses/future.txt delete mode 100644 licenses/python-future.txt diff --git a/licenses/future.txt b/licenses/future.txt new file mode 100644 index 0000000000..4c904dba8f --- /dev/null +++ b/licenses/future.txt @@ -0,0 +1,19 @@ +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/licenses/python-future.txt b/licenses/python-future.txt deleted file mode 100644 index 4c904dba8f..0000000000 --- a/licenses/python-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.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 -- cgit v1.2.3