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

Merge pull request #6508 from ryanpetrello/django-extensions-bump

Browse Source 
bump django-extensions version to address a bug in shell_plus

Reviewed-by: https://github.com/apps/softwarefactory-project-zuul
This commit is contained in:
softwarefactory-project-zuul[bot]
2020-03-31 19:16:49 +00:00
committed by GitHub
parent cfa0fdaa12 42336355bb
commit 6b9cacb85f
3 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
awx/settings/development.py
View File

@@ -40,7 +40,6 @@ NOTEBOOK_ARGUMENTS = [
] ]
# print SQL queries in shell_plus # print SQL queries in shell_plus
SHELL_PLUS = 'ipython'
SHELL_PLUS_PRINT_SQL = False SHELL_PLUS_PRINT_SQL = False
# show colored logs in the dev environment # show colored logs in the dev environment

2
requirements/requirements.in
View File

@@ -10,7 +10,7 @@ django==2.2.11 # see UPGRADE BLOCKERs
django-auth-ldap django-auth-ldap
django-cors-headers django-cors-headers
django-crum django-crum
django-extensions django-extensions>=2.2.9 # https://github.com/ansible/awx/pull/6441
django-jsonfield==1.2.0 # see UPGRADE BLOCKERs django-jsonfield==1.2.0 # see UPGRADE BLOCKERs
django-oauth-toolkit==1.1.3 # see UPGRADE BLOCKERs django-oauth-toolkit==1.1.3 # see UPGRADE BLOCKERs
django-polymorphic django-polymorphic

2
requirements/requirements.txt
View File

@@ -26,7 +26,7 @@ dictdiffer==0.8.1 # via openshift
django-auth-ldap==2.1.0 # via -r /awx_devel/requirements/requirements.in django-auth-ldap==2.1.0 # via -r /awx_devel/requirements/requirements.in
django-cors-headers==3.2.1 # via -r /awx_devel/requirements/requirements.in django-cors-headers==3.2.1 # via -r /awx_devel/requirements/requirements.in
django-crum==0.7.5 # via -r /awx_devel/requirements/requirements.in django-crum==0.7.5 # via -r /awx_devel/requirements/requirements.in
django-extensions==2.2.8 # via -r /awx_devel/requirements/requirements.in django-extensions==2.2.9 # via -r /awx_devel/requirements/requirements.in
django-jsonfield==1.2.0 # via -r /awx_devel/requirements/requirements.in django-jsonfield==1.2.0 # via -r /awx_devel/requirements/requirements.in
django-oauth-toolkit==1.1.3 # via -r /awx_devel/requirements/requirements.in django-oauth-toolkit==1.1.3 # via -r /awx_devel/requirements/requirements.in
django-pglocks==1.0.4 # via -r /awx_devel/requirements/requirements.in django-pglocks==1.0.4 # via -r /awx_devel/requirements/requirements.in