Skip to content

Commit

Permalink
Update to Django 1.8
Browse files Browse the repository at this point in the history
  • Loading branch information
nikolas committed Apr 22, 2015
1 parent d1965aa commit e9b597f
Show file tree
Hide file tree
Showing 4 changed files with 24 additions and 24 deletions.
17 changes: 8 additions & 9 deletions dmt/settings_shared.py
Original file line number Diff line number Diff line change
Expand Up @@ -72,27 +72,26 @@
)

TEMPLATE_CONTEXT_PROCESSORS = (
'django.core.context_processors.debug',
'django.core.context_processors.request',
'django.template.context_processors.debug',
'django.template.context_processors.request',
'django.contrib.auth.context_processors.auth',
'django.contrib.messages.context_processors.messages',
'stagingcontext.staging_processor',
'gacontext.ga_processor',
'djangowind.context.context_processor',
'django.core.context_processors.static',
'django.template.context_processors.static',
'dmt.main.contextprocessors.graphite_base_processor',
)

MIDDLEWARE_CLASSES = [
'django.contrib.sessions.middleware.SessionMiddleware',
'django.middleware.common.CommonMiddleware',
'django.middleware.csrf.CsrfViewMiddleware',
'django.contrib.auth.middleware.AuthenticationMiddleware',
'django.contrib.messages.middleware.MessageMiddleware',
'django_statsd.middleware.GraphiteRequestTimingMiddleware',
'django_statsd.middleware.GraphiteMiddleware',
'django.middleware.common.CommonMiddleware',
'django.contrib.sessions.middleware.SessionMiddleware',
'django.contrib.messages.middleware.MessageMiddleware',
'django.contrib.auth.middleware.AuthenticationMiddleware',
'django.contrib.flatpages.middleware.FlatpageFallbackMiddleware',
'django.middleware.transaction.TransactionMiddleware',
'impersonate.middleware.ImpersonateMiddleware',
'debug_toolbar.middleware.DebugToolbarMiddleware',
'waffle.middleware.WaffleMiddleware',
Expand Down Expand Up @@ -130,7 +129,7 @@
'interval',
'rest_framework',
'taggit',
'taggit_templatetags',
'taggit_templatetags2',
'djcelery',
'bootstrap3',
'emoji',
Expand Down
3 changes: 2 additions & 1 deletion manage.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
#!ve/bin/python
import os, sys
import os
import sys

if __name__ == "__main__":
os.environ.setdefault("DJANGO_SETTINGS_MODULE", "dmt.settings")
Expand Down
28 changes: 14 additions & 14 deletions requirements.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Django==1.7.7
Django==1.8
CommonMark==0.5.4
django-markwhat==1.3
uuid==1.30
Expand Down Expand Up @@ -34,15 +34,16 @@ six==1.9.0
python-dateutil==2.4.0
pytz==2014.7
simpleduration==0.1.0
factory_boy==2.4.1
factory_boy==2.5.2
python-ldap==2.4.18
anyjson==0.3.3
amqp==1.4.6
amqplib==1.0.2
kombu==3.0.23
librabbitmq==1.6.1
billiard==3.3.0.18
celery==3.1.16
django-celery==3.1.16
celery==3.1.18
enum34==1.0.3
parse-type==0.3.4
parse==1.6.5
Expand All @@ -56,36 +57,35 @@ whitelistaffilmapper==0.1.0
boto==2.36.0
unicodecsv==0.9.4
XlsxWriter==0.6.1
splinter==0.7.0
splinter==0.7.2
shortuuid==0.4.2

djangowind==0.13.3
django-staticmedia==0.2.2
django-annoying==0.8.0
django-appconf==0.6
django-compressor==1.5
django-annoying==0.8.1
django-appconf==1.0.1
django_compressor==1.5
django-statsd-mozilla==0.3.14
raven==5.2.0
django-bootstrap-form==3.2
django-debug-toolbar==1.2.2
django-debug-toolbar==1.3.0
django-waffle==0.10.1
django-jenkins==0.16.3
django-jenkins==0.17.0
django-smoketest==0.3.0
django-extensions==1.4.5
django-extensions==1.5.2
django-stagingcontext==0.1.0
django-ga-context==0.1.0
django-impersonate==0.9
django-pgsql-interval-field==0.9.3
django-filter==0.9.2
djangorestframework==3.1.1
django-taggit==0.12.1a
django-taggit==0.13.0
django-templatetag-sugar==1.0
django-taggit-templatetags==0.4.6dev
django-celery==3.1.16
django-taggit-templatetags2==1.4.0
django-casper==0.0.2c
django-bootstrap3==5.2.0
django-emoji==2.0.0
django-behave==0.1.3
django-behave==0.1.4
django-oauth2-provider==0.2.6.1
django-extra-views==0.6.5
bleach==1.4.1
Expand Down
Binary file not shown.

0 comments on commit e9b597f

Please sign in to comment.