Upgrade to Django 3.1

- upgrades
  - Django 3.1.14
  - djangorestframework 3.13.1 (from 3.12.1)
  - djangorestframework-yaml 2.0.0 (from 1.0.3)
  - django-polymorphic 3.1.0 (from 2.1.2)
  - social-auth-core 4.2.0 (from 3.3.1)
  - social-auth-app-django 5.0.0 (from 3.1.0)
  - django-auth-ldap 4.0.0 (from 2.1.0)
  - django-crum 0.7.9 (from 0.7.5)

- django-jsonfield is removed
This commit is contained in:
Jeff Bradberry
2022-02-02 13:18:47 -05:00
parent faa12880a9
commit 65d17fb316
12 changed files with 34 additions and 63 deletions

View File

@@ -1,23 +0,0 @@
Copyright (c) 2012, Matthew Schinckel.
All rights reserved.
Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions are met:
* Redistributions of source code must retain the above copyright
notice, this list of conditions and the following disclaimer.
* Redistributions in binary form must reproduce the above copyright
notice, this list of conditions and the following disclaimer in the
documentation and/or other materials provided with the distribution.
* The names of its contributors may not be used to endorse or promote products
derived from this software without specific prior written permission.
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
DISCLAIMED. IN NO EVENT SHALL MATTHEW SCHINCKEL BE LIABLE FOR ANY DIRECT,
INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

View File

@@ -9,13 +9,12 @@ cryptography>=3.2
Cython<3 # Since the bump to PyYAML 5.4.1 this is now a mandatory dep Cython<3 # Since the bump to PyYAML 5.4.1 this is now a mandatory dep
daphne daphne
distro distro
django==3.0.14 # see UPGRADE BLOCKERs django==3.1.14 # see UPGRADE BLOCKERs
django-auth-ldap django-auth-ldap
django-cors-headers>=3.5.0 django-cors-headers>=3.5.0
django-crum django-crum
django-extensions>=2.2.9 # https://github.com/ansible/awx/pull/6441 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==2.2.1 # see https://pypi.org/project/django-guid/ for supported versions
django-jsonfield==1.4.1
django-oauth-toolkit==1.4.1 django-oauth-toolkit==1.4.1
django-polymorphic django-polymorphic
django-pglocks django-pglocks
@@ -25,7 +24,7 @@ django-redis
django-solo django-solo
django-split-settings django-split-settings
django-taggit django-taggit
djangorestframework>=3.12.1 djangorestframework==3.13.1
djangorestframework-yaml djangorestframework-yaml
GitPython>=3.1.1 # minimum to fix https://github.com/ansible/awx/issues/6119 GitPython>=3.1.1 # minimum to fix https://github.com/ansible/awx/issues/6119
irc irc
@@ -47,8 +46,8 @@ python-ldap>=3.3.1 # https://github.com/python-ldap/python-ldap/issues/270
pyyaml>=5.4.1 # minimum to fix https://github.com/yaml/pyyaml/issues/478 pyyaml>=5.4.1 # minimum to fix https://github.com/yaml/pyyaml/issues/478
receptorctl==1.1.1 receptorctl==1.1.1
schedule==0.6.0 schedule==0.6.0
social-auth-core==3.3.1 # see UPGRADE BLOCKERs social-auth-core==4.2.0 # see UPGRADE BLOCKERs
social-auth-app-django==3.1.0 # see UPGRADE BLOCKERs social-auth-app-django==5.0.0 # see UPGRADE BLOCKERs
redis redis
requests requests
slack-sdk slack-sdk

View File

@@ -9,7 +9,7 @@ ansiconv==1.0.0
# via -r /awx_devel/requirements/requirements.in # via -r /awx_devel/requirements/requirements.in
asciichartpy==1.5.25 asciichartpy==1.5.25
# via -r /awx_devel/requirements/requirements.in # via -r /awx_devel/requirements/requirements.in
asgiref==3.2.5 asgiref==3.5.0
# via # via
# channels # channels
# channels-redis # channels-redis
@@ -86,7 +86,7 @@ dictdiffer==0.8.1
# via openshift # via openshift
distro==1.5.0 distro==1.5.0
# via -r /awx_devel/requirements/requirements.in # via -r /awx_devel/requirements/requirements.in
django==3.0.14 django==3.1.14
# via # via
# -r /awx_devel/requirements/requirements.in # -r /awx_devel/requirements/requirements.in
# channels # channels
@@ -94,28 +94,25 @@ django==3.0.14
# django-cors-headers # django-cors-headers
# django-crum # django-crum
# django-guid # django-guid
# django-jsonfield
# django-oauth-toolkit # django-oauth-toolkit
# django-polymorphic # django-polymorphic
# django-taggit # django-taggit
# djangorestframework # djangorestframework
django-auth-ldap==2.1.0 django-auth-ldap==4.0.0
# via -r /awx_devel/requirements/requirements.in # via -r /awx_devel/requirements/requirements.in
django-cors-headers==3.7.0 django-cors-headers==3.7.0
# via -r /awx_devel/requirements/requirements.in # via -r /awx_devel/requirements/requirements.in
django-crum==0.7.5 django-crum==0.7.9
# via -r /awx_devel/requirements/requirements.in # via -r /awx_devel/requirements/requirements.in
django-extensions==2.2.9 django-extensions==2.2.9
# via -r /awx_devel/requirements/requirements.in # via -r /awx_devel/requirements/requirements.in
django-guid==2.2.1 django-guid==2.2.1
# via -r /awx_devel/requirements/requirements.in # via -r /awx_devel/requirements/requirements.in
django-jsonfield==1.4.1
# via -r /awx_devel/requirements/requirements.in
django-oauth-toolkit==1.4.1 django-oauth-toolkit==1.4.1
# via -r /awx_devel/requirements/requirements.in # via -r /awx_devel/requirements/requirements.in
django-pglocks==1.0.4 django-pglocks==1.0.4
# via -r /awx_devel/requirements/requirements.in # via -r /awx_devel/requirements/requirements.in
django-polymorphic==2.1.2 django-polymorphic==3.1.0
# via -r /awx_devel/requirements/requirements.in # via -r /awx_devel/requirements/requirements.in
django-qsstats-magic==1.1.0 django-qsstats-magic==1.1.0
# via -r /awx_devel/requirements/requirements.in # via -r /awx_devel/requirements/requirements.in
@@ -129,9 +126,9 @@ django-split-settings==1.0.0
# via -r /awx_devel/requirements/requirements.in # via -r /awx_devel/requirements/requirements.in
django-taggit==1.2.0 django-taggit==1.2.0
# via -r /awx_devel/requirements/requirements.in # via -r /awx_devel/requirements/requirements.in
djangorestframework==3.12.1 djangorestframework==3.13.1
# via -r /awx_devel/requirements/requirements.in # via -r /awx_devel/requirements/requirements.in
djangorestframework-yaml==1.0.3 djangorestframework-yaml==2.0.0
# via -r /awx_devel/requirements/requirements.in # via -r /awx_devel/requirements/requirements.in
docutils==0.16 docutils==0.16
# via python-daemon # via python-daemon
@@ -163,23 +160,23 @@ isodate==0.6.1
# via # via
# msrest # msrest
# python3-saml # python3-saml
jaraco.classes==3.1.0 jaraco-classes==3.1.0
# via jaraco.collections # via jaraco-collections
jaraco.collections==3.0.0 jaraco-collections==3.0.0
# via irc # via irc
jaraco.functools==3.0.0 jaraco-functools==3.0.0
# via # via
# irc # irc
# jaraco.text # jaraco-text
# tempora # tempora
jaraco.logging==3.0.0 jaraco-logging==3.0.0
# via irc # via irc
jaraco.stream==3.0.0 jaraco-stream==3.0.0
# via irc # via irc
jaraco.text==3.2.0 jaraco-text==3.2.0
# via # via
# irc # irc
# jaraco.collections # jaraco-collections
jinja2==3.0.3 jinja2==3.0.3
# via # via
# -r /awx_devel/requirements/requirements.in # -r /awx_devel/requirements/requirements.in
@@ -203,8 +200,8 @@ markupsafe==2.0.1
more-itertools==8.2.0 more-itertools==8.2.0
# via # via
# irc # irc
# jaraco.classes # jaraco-classes
# jaraco.functools # jaraco-functools
msgpack==1.0.0 msgpack==1.0.0
# via channels-redis # via channels-redis
msrest==0.6.11 msrest==0.6.11
@@ -259,7 +256,7 @@ pygerduty==0.38.2
# via -r /awx_devel/requirements/requirements.in # via -r /awx_devel/requirements/requirements.in
pyhamcrest==2.0.2 pyhamcrest==2.0.2
# via twisted # via twisted
pyjwt==1.7.1 pyjwt==2.3.0
# via # via
# adal # adal
# social-auth-core # social-auth-core
@@ -298,6 +295,7 @@ python3-saml==1.13.0
pytz==2019.3 pytz==2019.3
# via # via
# django # django
# djangorestframework
# irc # irc
# tempora # tempora
# twilio # twilio
@@ -334,7 +332,7 @@ requests-oauthlib==1.3.0
# social-auth-core # social-auth-core
rsa==4.7.2 rsa==4.7.2
# via google-auth # via google-auth
ruamel.yaml==0.16.10 ruamel-yaml==0.16.10
# via openshift # via openshift
schedule==0.6.0 schedule==0.6.0
# via -r /awx_devel/requirements/requirements.in # via -r /awx_devel/requirements/requirements.in
@@ -346,13 +344,12 @@ six==1.14.0
# automat # automat
# cryptography # cryptography
# django-extensions # django-extensions
# django-jsonfield
# django-pglocks # django-pglocks
# google-auth # google-auth
# isodate # isodate
# jaraco.collections # jaraco-collections
# jaraco.logging # jaraco-logging
# jaraco.text # jaraco-text
# jsonschema # jsonschema
# kubernetes # kubernetes
# openshift # openshift
@@ -361,8 +358,6 @@ six==1.14.0
# pyrad # pyrad
# pyrsistent # pyrsistent
# python-dateutil # python-dateutil
# social-auth-app-django
# social-auth-core
# tacacs-plus # tacacs-plus
# twilio # twilio
# websocket-client # websocket-client
@@ -370,20 +365,20 @@ slack-sdk==3.11.2
# via -r /awx_devel/requirements/requirements.in # via -r /awx_devel/requirements/requirements.in
smmap==3.0.1 smmap==3.0.1
# via gitdb # via gitdb
social-auth-app-django==3.1.0 social-auth-app-django==5.0.0
# via -r /awx_devel/requirements/requirements.in # via -r /awx_devel/requirements/requirements.in
social-auth-core==3.3.1 social-auth-core==4.2.0
# via # via
# -r /awx_devel/requirements/requirements.in # -r /awx_devel/requirements/requirements.in
# social-auth-app-django # social-auth-app-django
sqlparse==0.3.1 sqlparse==0.3.1
# via django # via django
tacacs_plus==1.0 tacacs-plus==1.0
# via -r /awx_devel/requirements/requirements.in # via -r /awx_devel/requirements/requirements.in
tempora==2.1.0 tempora==2.1.0
# via # via
# irc # irc
# jaraco.logging # jaraco-logging
twilio==6.37.0 twilio==6.37.0
# via -r /awx_devel/requirements/requirements.in # via -r /awx_devel/requirements/requirements.in
twisted[tls]==20.3.0 twisted[tls]==20.3.0
@@ -410,7 +405,7 @@ xmlsec==1.3.12
# via python3-saml # via python3-saml
yarl==1.4.2 yarl==1.4.2
# via aiohttp # via aiohttp
zope.interface==5.0.0 zope-interface==5.0.0
# via twisted # via twisted
# The following packages are considered to be unsafe in a requirements file: # The following packages are considered to be unsafe in a requirements file:
@@ -425,4 +420,4 @@ setuptools==58.2.0
# kubernetes # kubernetes
# markdown # markdown
# python-daemon # python-daemon
# zope.interface # zope-interface