External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-01-23 23:41:23 -03:30
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'devel' into ldap-doc

Browse Source
This commit is contained in:
Yanis Guenane 2018-10-18 15:53:34 +02:00 committed by GitHub
commit 3f2068e74e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
awx/wsgi.py
View File

@ -41,10 +41,10 @@ if social_django.__version__ != '2.1.0':
still works".format(social_django.__version__))
if django.__version__ != '1.11.11':
raise RuntimeError("Django version other than 1.11.11 detected {}. \
if django.__version__ != '1.11.16':
raise RuntimeError("Django version other than 1.11.16 detected {}. \
Inherit from WSGIHandler to support short-circuit Django Middleware. \
This is known to work for Django 1.11.11 and may not work with other, \
This is known to work for Django 1.11.16 and may not work with other, \
even minor, versions.".format(django.__version__))

2
requirements/requirements.in
View File

@ -7,7 +7,7 @@ channels==1.1.8
celery==4.2.1
daphne==1.3.0 # Last before backwards-incompatible channels 2 upgrade
decorator==4.2.1
Django==1.11.11
Django==1.11.16
django-auth-ldap==1.2.8
django-crum==0.7.2
django-extensions==2.0.0

2
requirements/requirements.txt
View File

@ -37,7 +37,7 @@ django-radius==1.1.0
django-solo==1.1.3
django-split-settings==0.3.0
django-taggit==0.22.2
django==1.11.11
django==1.11.16
djangorestframework-yaml==1.0.3
djangorestframework==3.7.7
enum34==1.1.6 # via cryptography