Merge pull request #10564 from sarabrajsingh/bump-django-to-2.2.20

bumped django version to 2.2.20 in devel SUMMARY Bumped Django version from 2.2.16 -> 2.2.20 for the devel environment. All builds, tests and tests consuming the AWX_USE_FIPS flag passed in Jenkins. AWX Issue - ansible/tower#4930 ISSUE TYPE Feature Pull Request COMPONENT NAME API AWX VERSION awx: 19.2.2 Reviewed-by: Alan Rominger <arominge@redhat.com>
ansible · Jul 1, 2021 · be93178 · be93178
2 parents f88b380 + 46cd62f
commit be93178
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 2 deletions.
diff --git a/requirements/README.md b/requirements/README.md
@@ -16,6 +16,12 @@ then run the script:
 NOTE: `./updater.sh` uses /usr/bin/python3.6, to match the current python version
 (3.6) used to build releases.
 
+##### Note - watch out for the updater script, using paths local to your machine instead of generalized paths; ie
+```bash
+    # via -r /awx_devel/requirements/requirements.in <-RIGHT
+    # via -r /home/foo/bar/awx/requirements/requirements.in <-WRONG
+```
+
 #### Upgrading Unpinned Dependency
 
 If you require a new version of a dependency that does not have a pinned version

diff --git a/requirements/requirements.in b/requirements/requirements.in
@@ -10,7 +10,7 @@ cryptography<3.0.0
 Cython<3 # Since the bump to PyYAML 5.4.1 this is now a mandatory dep
 daphne
 distro
-django==2.2.16  # see UPGRADE BLOCKERs
+django==2.2.20  # see UPGRADE BLOCKERs
 django-auth-ldap
 django-cors-headers>=3.5.0
 django-crum

diff --git a/requirements/requirements.txt b/requirements/requirements.txt
@@ -85,7 +85,7 @@ dictdiffer==0.8.1
     # via openshift
 distro==1.5.0
     # via -r /awx_devel/requirements/requirements.in
-django==2.2.16
+django==2.2.20
     # via
     #   -r /awx_devel/requirements/requirements.in
     #   channels