summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlanCoding <arominge@redhat.com>2019-04-12 21:26:32 +0200
committerAlanCoding <arominge@redhat.com>2019-04-12 21:26:48 +0200
commit235011f5e9ebac73572ca390779bd4722b05f65a (patch)
treeda3112ef94ffee7b17992e9d857d369db3d675e9
parentMerge pull request #3672 from rooftopcellist/metrics_content_types (diff)
downloadawx-235011f5e9ebac73572ca390779bd4722b05f65a.tar.xz
awx-235011f5e9ebac73572ca390779bd4722b05f65a.zip
Apply critical dependency upgrades
-rw-r--r--awx/__init__.py6
-rw-r--r--awx/wsgi.py6
-rw-r--r--requirements/requirements.in2
-rw-r--r--requirements/requirements.txt10
-rw-r--r--requirements/requirements_ansible.txt6
5 files changed, 15 insertions, 15 deletions
diff --git a/awx/__init__.py b/awx/__init__.py
index be3e704a5a..0963e7fc91 100644
--- a/awx/__init__.py
+++ b/awx/__init__.py
@@ -37,9 +37,9 @@ if HAS_DJANGO is True:
# 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,
# update the version check below, and confirm that FIPS still works.
- if django.__version__ != '1.11.16':
- raise RuntimeError("Django version other than 1.11.16 detected {}. \
- Subclassing BaseDatabaseSchemaEditor is known to work for Django 1.11.16 \
+ if django.__version__ != '1.11.20':
+ raise RuntimeError("Django version other than 1.11.20 detected {}. \
+ Subclassing BaseDatabaseSchemaEditor is known to work for Django 1.11.20 \
and may not work in newer Django versions.".format(django.__version__))
diff --git a/awx/wsgi.py b/awx/wsgi.py
index b18eac744b..656c96460b 100644
--- a/awx/wsgi.py
+++ b/awx/wsgi.py
@@ -41,10 +41,10 @@ if social_django.__version__ != '2.1.0':
still works".format(social_django.__version__))
-if django.__version__ != '1.11.16':
- raise RuntimeError("Django version other than 1.11.16 detected {}. \
+if django.__version__ != '1.11.20':
+ raise RuntimeError("Django version other than 1.11.20 detected {}. \
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__))
diff --git a/requirements/requirements.in b/requirements/requirements.in
index b03208a3ed..d3d80ff986 100644
--- a/requirements/requirements.in
+++ b/requirements/requirements.in
@@ -8,7 +8,7 @@ channels==1.1.8
celery==4.2.1
daphne==1.3.0 # Last before backwards-incompatible channels 2 upgrade
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-cors-headers==2.4.0
django-crum==0.7.2
diff --git a/requirements/requirements.txt b/requirements/requirements.txt
index cd8533fc53..44b841407c 100644
--- a/requirements/requirements.txt
+++ b/requirements/requirements.txt
@@ -26,7 +26,7 @@ cffi==1.12.1 # via cryptography
channels==1.1.8
chardet==3.0.4 # via requests
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
defusedxml==0.5.0
django-auth-ldap==1.7.0
@@ -41,7 +41,7 @@ django-radius==1.3.3
django-solo==1.1.3
django-split-settings==0.3.0
django-taggit==0.22.2
-django==1.11.16
+django==1.11.20
djangorestframework-yaml==1.0.3
djangorestframework==3.7.7
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-saml==1.4.0
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-oauthlib==1.2.0 # via msrest, social-auth-core
requests[security]==2.21.0
@@ -121,5 +121,5 @@ xmlsec==1.3.3 # via python3-saml
zope.interface==4.6.0 # via twisted
# The following packages are considered to be unsafe in a requirements file:
-# pip
-# setuptools
+pip==19.0.3
+setuptools==41.0.0
diff --git a/requirements/requirements_ansible.txt b/requirements/requirements_ansible.txt
index f784719888..cd4a8d44b6 100644
--- a/requirements/requirements_ansible.txt
+++ b/requirements/requirements_ansible.txt
@@ -44,7 +44,7 @@ cffi==1.11.5 # via bcrypt, cryptography, pynacl
chardet==3.0.4 # via requests
colorama==0.3.9 # via azure-cli-core, knack
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
deprecation==2.0 # via openstacksdk
docutils==0.14 # via botocore
@@ -79,7 +79,7 @@ openstacksdk==0.23.0
os-service-types==1.2.0 # via openstacksdk
ovirt-engine-sdk-python==4.2.4
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
pexpect==4.6.0
psutil==5.4.3
@@ -97,7 +97,7 @@ pyparsing==2.2.0 # via packaging
python-dateutil==2.6.1 # via adal, azure-storage, botocore
pyvmomi==6.5
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-kerberos==0.12.0 # via pywinrm
requests-ntlm==1.1.0 # via pywinrm