From 23e700a1ef1f37f4d5f4951fdb49cb3552df34e1 Mon Sep 17 00:00:00 2001 From: Jeff Bradberry Date: Wed, 16 Feb 2022 13:29:35 -0500 Subject: [PATCH] Upgrade to Django 3.2 - upgrades - Django 3.2.12 - pytz 2021.3 (from 2019.3) - oauthlib 3.2.0 (from 3.1.0) - requests-oauthlib 1.3.1 (from 1.3.0) - django-guid 3.2.1 (from 2.2.1) - django-solo 2.0.0 (from 1.1.3) - django-taggit 2.1.0 (from 1.2.0) - netaddr 0.8.0 (from 0.7.19) - pyrad 2.4 (from 2.3) - django-radius devel (from 1.3.3) - future devel (from 0.16.0) - django-guid, django-solo, and django-taggit are upgraded to fix the AppConfig deprecation warning. FIXME: django-guid devel has the fix, but it hasn't been released yet. - Released versions of django-radius have a hard-coded pin to future==0.16.0, which has a Python warning due to an improperly escaped character. This is fixed in future devel, so for now we are pinning to references to the git repos. - netaddr had a bunch of Python syntax and deprecation warnings --- .../{future.txt => python-future.txt} | 0 requirements/requirements.in | 5 ++-- requirements/requirements.txt | 27 ++++++++++--------- requirements/requirements_git.txt | 3 +++ 4 files changed, 19 insertions(+), 16 deletions(-) rename docs/licenses/{future.txt => python-future.txt} (100%) diff --git a/docs/licenses/future.txt b/docs/licenses/python-future.txt similarity index 100% rename from docs/licenses/future.txt rename to docs/licenses/python-future.txt diff --git a/requirements/requirements.in b/requirements/requirements.in index d7ace60d6b..48f4153086 100644 --- a/requirements/requirements.in +++ b/requirements/requirements.in @@ -9,17 +9,16 @@ cryptography>=3.2 Cython<3 # Since the bump to PyYAML 5.4.1 this is now a mandatory dep daphne distro -django==3.1.14 # see UPGRADE BLOCKERs +django==3.2.12 # see UPGRADE BLOCKERs django-auth-ldap django-cors-headers>=3.5.0 django-crum django-extensions>=2.2.9 # https://github.com/ansible/awx/pull/6441 -django-guid==2.2.1 # see https://pypi.org/project/django-guid/ for supported versions +django-guid==3.2.1 django-oauth-toolkit==1.4.1 django-polymorphic django-pglocks django-qsstats-magic -django-radius==1.3.3 # FIX auth does not work with later versions django-redis django-solo django-split-settings diff --git a/requirements/requirements.txt b/requirements/requirements.txt index 8ce2162d25..1349f34ffd 100644 --- a/requirements/requirements.txt +++ b/requirements/requirements.txt @@ -86,7 +86,7 @@ dictdiffer==0.8.1 # via openshift distro==1.5.0 # via -r /awx_devel/requirements/requirements.in -django==3.1.14 +django==3.2.12 # via # -r /awx_devel/requirements/requirements.in # channels @@ -96,6 +96,7 @@ django==3.1.14 # django-guid # django-oauth-toolkit # django-polymorphic + # django-solo # django-taggit # djangorestframework django-auth-ldap==4.0.0 @@ -106,7 +107,7 @@ django-crum==0.7.9 # via -r /awx_devel/requirements/requirements.in django-extensions==2.2.9 # via -r /awx_devel/requirements/requirements.in -django-guid==2.2.1 +django-guid==3.2.1 # via -r /awx_devel/requirements/requirements.in django-oauth-toolkit==1.4.1 # via -r /awx_devel/requirements/requirements.in @@ -116,15 +117,14 @@ django-polymorphic==3.1.0 # via -r /awx_devel/requirements/requirements.in django-qsstats-magic==1.1.0 # via -r /awx_devel/requirements/requirements.in -django-radius==1.3.3 - # via -r /awx_devel/requirements/requirements.in + # via -r /awx_devel/requirements/requirements_git.txt django-redis==4.5.0 # via -r /awx_devel/requirements/requirements.in -django-solo==1.1.3 +django-solo==2.0.0 # via -r /awx_devel/requirements/requirements.in django-split-settings==1.0.0 # via -r /awx_devel/requirements/requirements.in -django-taggit==1.2.0 +django-taggit==2.1.0 # via -r /awx_devel/requirements/requirements.in djangorestframework==3.13.1 # via -r /awx_devel/requirements/requirements.in @@ -132,8 +132,9 @@ djangorestframework-yaml==2.0.0 # via -r /awx_devel/requirements/requirements.in docutils==0.16 # via python-daemon -future==0.16.0 - # via django-radius + # via + # -r /awx_devel/requirements/requirements_git.txt + # django-radius gitdb==4.0.2 # via gitpython gitpython==3.1.7 @@ -214,9 +215,9 @@ multidict==4.7.5 # via # aiohttp # yarl -netaddr==0.7.19 +netaddr==0.8.0 # via pyrad -oauthlib==3.1.0 +oauthlib==3.2.0 # via # django-oauth-toolkit # requests-oauthlib @@ -267,7 +268,7 @@ pyparsing==2.4.6 # via # -r /awx_devel/requirements/requirements.in # packaging -pyrad==2.3 +pyrad==2.4 # via django-radius pyrsistent==0.15.7 # via jsonschema @@ -292,7 +293,7 @@ python3-openid==3.1.0 # via social-auth-core python3-saml==1.13.0 # via -r /awx_devel/requirements/requirements.in -pytz==2019.3 +pytz==2021.3 # via # django # djangorestframework @@ -325,7 +326,7 @@ requests==2.26.0 # requests-oauthlib # social-auth-core # twilio -requests-oauthlib==1.3.0 +requests-oauthlib==1.3.1 # via # kubernetes # msrest diff --git a/requirements/requirements_git.txt b/requirements/requirements_git.txt index 01b668ee18..ab13d9aed2 100644 --- a/requirements/requirements_git.txt +++ b/requirements/requirements_git.txt @@ -1,3 +1,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 +git+https://github.com/ansible/django-radius.git@develop#egg=django-radius +git+https://github.com/PythonCharmers/python-future@master#egg=future