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

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

Browse Source 
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>
This commit is contained in:
softwarefactory-project-zuul[bot]
2021-07-01 14:11:15 +00:00
committed by GitHub
parent f88b3806f2 46cd62f3f0
commit be93178e65
3 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
requirements/README.md
View File

@@ -16,6 +16,12 @@ then run the script:
NOTE: `./updater.sh` uses /usr/bin/python3.6, to match the current python version NOTE: `./updater.sh` uses /usr/bin/python3.6, to match the current python version
(3.6) used to build releases. (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 #### Upgrading Unpinned Dependency
If you require a new version of a dependency that does not have a pinned version If you require a new version of a dependency that does not have a pinned version

2
requirements/requirements.in
View File

@@ -10,7 +10,7 @@ cryptography<3.0.0
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==2.2.16 # see UPGRADE BLOCKERs django==2.2.20 # 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

2
requirements/requirements.txt
View File

@@ -85,7 +85,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==2.2.16 django==2.2.20
# via # via
# -r /awx_devel/requirements/requirements.in # -r /awx_devel/requirements/requirements.in
# channels # channels