Upgrade to django 1.11

This requires a bump in django filter which needs django_filters adding
to INSTALLED_APPS
This commit is contained in:
Frank Hamand 2017-04-05 14:21:58 +01:00
parent a5af188372
commit f99ef6d445
4 changed files with 8 additions and 6 deletions

View File

@ -1,6 +1,7 @@
master
------
* Upgrade to Django 1.11
* Allow user filter for LDAP to be configured
- Set the AUTH_LDAP_USER_FILTER setting to change it (defaults to "(uid=%(user)s)")
* Update cabot-alert-hipchat plugin to 2.0.2

View File

@ -7,7 +7,7 @@ amqp = ">=2.1.4"
celery = ">=4,<5"
djangorestframework = "*"
django-jsonify = "*"
django-filter = "!=1.0.2"
django-filter = "*"
django-auth-ldap = "*"
anyjson = "*"
dj-database-url = "*"
@ -20,10 +20,10 @@ python-dateutil = "*"
pytz = "*"
redis = "*"
requests = "*"
twilio = "*"
twilio = ">=5,<6"
whitenoise = "*"
coreapi = "*"
Django = ">=1.10,<1.11"
Django = ">=1.11,<2"
django_polymorphic = "*"
django_compressor = "*"
Markdown = "*"

View File

@ -139,6 +139,7 @@ INSTALLED_APPS = (
'django.contrib.admin',
# Uncomment the next line to enable admin documentation:
# 'django.contrib.admindocs',
'django_filters',
'compressor',
'polymorphic',
'jsonify',

View File

@ -6,11 +6,11 @@ celery==4.0.2
coreapi==2.3.0
coreschema==0.0.4
dj-database-url==0.4.2
Django==1.10.6
Django==1.11
django-appconf==1.0.2
django-auth-ldap==1.2.10
django-compressor==2.1.1
django-filter==1.0.1 # rq.filter: !=1.0.2
django-filter==1.0.2
django-jsonify==0.3.0
django-polymorphic==1.1
djangorestframework==3.6.2
@ -21,7 +21,7 @@ gunicorn==19.7.1
httplib2==0.10.3
icalendar==3.11.3
itypes==1.1.0
Jinja2==2.9.5
Jinja2==2.9.6
kombu==4.0.2
Markdown==2.6.8
MarkupSafe==1.0