Merge pull request #4410 from jbradberry/upgrade-django-2.2.4

Upgrade to django 2.2.4

Reviewed-by: https://github.com/softwarefactory-project-zuul[bot]

awx/__init__.py

@@ -40,7 +40,7 @@ if HAS_DJANGO is True:
     # but will support the `usedforsecurity` keyword on RHEL and Centos systems.
 
     # Keep an eye on https://code.djangoproject.com/ticket/28401
-    target_version = '2.2.2'
+    target_version = '2.2.4'
     if django.__version__ != target_version:
         raise RuntimeError(
             "Django version other than {target} detected: {current}. "

requirements/requirements.in

@@ -7,7 +7,7 @@ channels==1.1.8
 celery==4.3.0
 daphne==1.3.0   # Last before backwards-incompatible channels 2 upgrade
 twisted[tls]>=17.1   # from daphne, see https://github.com/django/daphne/pull/257
-Django==2.2.2
+Django==2.2.4
 django-auth-ldap==1.7.0
 django-cors-headers==2.4.0
 django-crum==0.7.2

requirements/requirements.txt

@@ -35,7 +35,7 @@ django-radius==1.3.3
 django-solo==1.1.3
 django-split-settings==0.3.0
 django-taggit==0.22.2
-django==2.2.2
+django==2.2.4
 djangorestframework-yaml==1.0.3
 djangorestframework==3.9.4
 

requirements/requirements_ansible.txt

@@ -83,7 +83,7 @@ paramiko==2.6.0           # via azure-cli-core, ncclient
 pbr==5.2.0                # via keystoneauth1, openstacksdk, os-service-types, stevedore
 psutil==5.4.3
 pyasn1-modules==0.2.5     # via google-auth
-pyasn1==0.4.5             # via paramiko, pyasn1-modules, requests-credssp, rsa
+pyasn1==0.4.5             # via pyasn1-modules, requests-credssp, rsa
 pycparser==2.19           # via cffi
 pycurl==7.43.0.1
 pygments==2.3.1           # via azure-cli-core, knack

tools/docker-compose/Dockerfile

@@ -46,6 +46,7 @@ RUN yum -y install acl \
   nodejs \
   openldap-devel \
   openssh-server \
+  patch \
   postgresql-contrib \
   postgresql-devel \
   python-devel \