Skip to content

Commit e422469

Browse files
committed
Merge pull request #109 from helgi/django_1.9
feat(*): update django from 1.8 to 1.9
2 parents e404eaa + 6c823f7 commit e422469

3 files changed

Lines changed: 5 additions & 15 deletions

File tree

rootfs/deis/context_processors.py

Lines changed: 0 additions & 9 deletions
This file was deleted.

rootfs/deis/settings.py

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -99,8 +99,7 @@
9999
"django.template.context_processors.request",
100100
"django.template.context_processors.static",
101101
"django.template.context_processors.tz",
102-
"django.contrib.messages.context_processors.messages",
103-
"deis.context_processors.site"
102+
"django.contrib.messages.context_processors.messages"
104103
],
105104
},
106105
},
@@ -112,6 +111,7 @@
112111
'django.contrib.sessions.middleware.SessionMiddleware',
113112
'django.contrib.auth.middleware.AuthenticationMiddleware',
114113
'django.contrib.messages.middleware.MessageMiddleware',
114+
'django.contrib.sites.middleware.CurrentSiteMiddleware',
115115
'api.middleware.APIVersionMiddleware',
116116
'deis.middleware.PlatformVersionMiddleware',
117117
# Uncomment the next line for simple clickjacking protection:
@@ -140,8 +140,7 @@
140140
'rest_framework.authtoken',
141141
'corsheaders',
142142
# Deis apps
143-
'api',
144-
'registry',
143+
'api'
145144
)
146145

147146
AUTHENTICATION_BACKENDS = (
@@ -313,7 +312,7 @@
313312

314313
DATABASES = {
315314
'default': {
316-
'ENGINE': 'django.db.backends.postgresql_psycopg2',
315+
'ENGINE': 'django.db.backends.postgresql',
317316
'NAME': os.environ.get('DEIS_DATABASE_NAME', 'deis'),
318317
'USER': os.environ.get('DEIS_DATABASE_USER', ''),
319318
'PASSWORD': os.environ.get('DEIS_DATABASE_PASSWORD', ''),

rootfs/requirements.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# Deis controller requirements
22
#
3-
Django==1.8.7
3+
Django==1.9
44
django-cors-headers==1.1.0
55
django-guardian==1.3.2
66
djangorestframework==3.3.2

0 commit comments

Comments
 (0)