External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-05-07 17:37:37 -02:30
Code Issues Packages Projects Releases Wiki Activity

Apply critical dependency upgrades

Browse Source
This commit is contained in:
AlanCoding
2019-04-12 15:26:32 -04:00
parent 8383568e3c
commit 235011f5e9
5 changed files with 15 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
awx/__init__.py
View File

@@ -37,9 +37,9 @@ if HAS_DJANGO is True:
# This line exists to make sure we don't regress on FIPS support if we # This line exists to make sure we don't regress on FIPS support if we
# upgrade Django; if you're upgrading Django and see this error, # upgrade Django; if you're upgrading Django and see this error,
# update the version check below, and confirm that FIPS still works. # update the version check below, and confirm that FIPS still works.
if django.__version__ != '1.11.16': if django.__version__ != '1.11.20':
raise RuntimeError("Django version other than 1.11.16 detected {}. \ raise RuntimeError("Django version other than 1.11.20 detected {}. \
Subclassing BaseDatabaseSchemaEditor is known to work for Django 1.11.16 \ Subclassing BaseDatabaseSchemaEditor is known to work for Django 1.11.20 \
and may not work in newer Django versions.".format(django.__version__)) and may not work in newer Django versions.".format(django.__version__))

6
awx/wsgi.py
View File

@@ -41,10 +41,10 @@ if social_django.__version__ != '2.1.0':
still works".format(social_django.__version__)) still works".format(social_django.__version__))
if django.__version__ != '1.11.16': if django.__version__ != '1.11.20':
raise RuntimeError("Django version other than 1.11.16 detected {}. \ raise RuntimeError("Django version other than 1.11.20 detected {}. \
Inherit from WSGIHandler to support short-circuit Django Middleware. \ Inherit from WSGIHandler to support short-circuit Django Middleware. \
This is known to work for Django 1.11.16 and may not work with other, \ This is known to work for Django 1.11.20 and may not work with other, \
even minor, versions.".format(django.__version__)) even minor, versions.".format(django.__version__))

2
requirements/requirements.in
View File

@@ -8,7 +8,7 @@ channels==1.1.8
celery==4.2.1 celery==4.2.1
daphne==1.3.0 # Last before backwards-incompatible channels 2 upgrade daphne==1.3.0 # Last before backwards-incompatible channels 2 upgrade
defusedxml==0.5.0 # py36 support https://github.com/tiran/defusedxml/pull/4 defusedxml==0.5.0 # py36 support https://github.com/tiran/defusedxml/pull/4
Django==1.11.16 Django==1.11.20
django-auth-ldap==1.7.0 django-auth-ldap==1.7.0
django-cors-headers==2.4.0 django-cors-headers==2.4.0
django-crum==0.7.2 django-crum==0.7.2

10
requirements/requirements.txt
View File

@@ -26,7 +26,7 @@ cffi==1.12.1 # via cryptography
channels==1.1.8 channels==1.1.8
chardet==3.0.4 # via requests chardet==3.0.4 # via requests
constantly==15.1.0 # via twisted constantly==15.1.0 # via twisted
cryptography==2.5 # via adal, azure-keyvault, pyopenssl cryptography==2.6.1 # via adal, azure-keyvault, pyopenssl
daphne==1.3.0 daphne==1.3.0
defusedxml==0.5.0 defusedxml==0.5.0
django-auth-ldap==1.7.0 django-auth-ldap==1.7.0
@@ -41,7 +41,7 @@ django-radius==1.3.3
django-solo==1.1.3 django-solo==1.1.3
django-split-settings==0.3.0 django-split-settings==0.3.0
django-taggit==0.22.2 django-taggit==0.22.2
django==1.11.16 django==1.11.20
djangorestframework-yaml==1.0.3 djangorestframework-yaml==1.0.3
djangorestframework==3.7.7 djangorestframework==3.7.7
future==0.16.0 # via django-radius future==0.16.0 # via django-radius
@@ -96,7 +96,7 @@ python-radius==1.0
python3-openid==3.1.0 # via social-auth-core python3-openid==3.1.0 # via social-auth-core
python3-saml==1.4.0 python3-saml==1.4.0
pytz==2018.9 # via celery, django, irc, tempora, twilio pytz==2018.9 # via celery, django, irc, tempora, twilio
pyyaml==3.13 # via djangorestframework-yaml pyyaml==5.1 # via djangorestframework-yaml
requests-futures==0.9.7 requests-futures==0.9.7
requests-oauthlib==1.2.0 # via msrest, social-auth-core requests-oauthlib==1.2.0 # via msrest, social-auth-core
requests[security]==2.21.0 requests[security]==2.21.0
@@ -121,5 +121,5 @@ xmlsec==1.3.3 # via python3-saml
zope.interface==4.6.0 # via twisted zope.interface==4.6.0 # 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:
# pip pip==19.0.3
# setuptools setuptools==41.0.0

6
requirements/requirements_ansible.txt
View File

@@ -44,7 +44,7 @@ cffi==1.11.5 # via bcrypt, cryptography, pynacl
chardet==3.0.4 # via requests chardet==3.0.4 # via requests
colorama==0.3.9 # via azure-cli-core, knack colorama==0.3.9 # via azure-cli-core, knack
configparser==3.5.0 # via entrypoints configparser==3.5.0 # via entrypoints
cryptography==2.1.4 # via adal, azure-keyvault, azure-storage, paramiko, pyopenssl, requests-kerberos, requests-ntlm, secretstorage cryptography==2.6.1 # via adal, azure-keyvault, azure-storage, paramiko, pyopenssl, requests-kerberos, requests-ntlm, secretstorage
decorator==4.2.1 # via openstacksdk decorator==4.2.1 # via openstacksdk
deprecation==2.0 # via openstacksdk deprecation==2.0 # via openstacksdk
docutils==0.14 # via botocore docutils==0.14 # via botocore
@@ -79,7 +79,7 @@ openstacksdk==0.23.0
os-service-types==1.2.0 # via openstacksdk os-service-types==1.2.0 # via openstacksdk
ovirt-engine-sdk-python==4.2.4 ovirt-engine-sdk-python==4.2.4
packaging==17.1 packaging==17.1
paramiko==2.4.0 # via azure-cli-core, ncclient paramiko==2.4.2 # via azure-cli-core, ncclient
pbr==3.1.1 # via keystoneauth1, openstacksdk, os-service-types, stevedore pbr==3.1.1 # via keystoneauth1, openstacksdk, os-service-types, stevedore
pexpect==4.6.0 pexpect==4.6.0
psutil==5.4.3 psutil==5.4.3
@@ -97,7 +97,7 @@ pyparsing==2.2.0 # via packaging
python-dateutil==2.6.1 # via adal, azure-storage, botocore python-dateutil==2.6.1 # via adal, azure-storage, botocore
pyvmomi==6.5 pyvmomi==6.5
pywinrm[kerberos]==0.3.0 pywinrm[kerberos]==0.3.0
pyyaml==3.12 # via azure-cli-core, knack, openstacksdk, os-client-config pyyaml==5.1 # via azure-cli-core, knack, openstacksdk, os-client-config
requests-credssp==0.1.0 requests-credssp==0.1.0
requests-kerberos==0.12.0 # via pywinrm requests-kerberos==0.12.0 # via pywinrm
requests-ntlm==1.1.0 # via pywinrm requests-ntlm==1.1.0 # via pywinrm