Skip to content

Commit

Permalink
Updrade to django 1.8.16
Browse files Browse the repository at this point in the history
  • Loading branch information
dterei committed Nov 28, 2016
1 parent f808575 commit 031b987
Show file tree
Hide file tree
Showing 3 changed files with 22 additions and 18 deletions.
32 changes: 17 additions & 15 deletions memcachier_algebra/settings.py
Original file line number Diff line number Diff line change
Expand Up @@ -83,11 +83,25 @@
STATICFILES_DIRS = [
os.path.join(PROJECT_ROOT, 'static')
]
STATICFILES_FINDERS = (
'django.contrib.staticfiles.finders.FileSystemFinder',
'django.contrib.staticfiles.finders.AppDirectoriesFinder',
)

## Templates
## =========

TEMPLATE_LOADERS = (
'django.template.loaders.filesystem.Loader',
'django.template.loaders.app_directories.Loader',
)
TEMPLATE_DIRS = (
os.path.join(PROJECT_ROOT, 'templates'),
)

## Other Settings
## ==============
DEBUG = True
TEMPLATE_DEBUG = DEBUG
ADMINS = ()
MANAGERS = ADMINS
TIME_ZONE = 'America/Los_Angeles'
Expand All @@ -99,18 +113,8 @@
MEDIA_ROOT = ''
MEDIA_URL = ''

STATICFILES_FINDERS = (
'django.contrib.staticfiles.finders.FileSystemFinder',
'django.contrib.staticfiles.finders.AppDirectoriesFinder',
)

SECRET_KEY = 'l&nd6u%i-s)2c)s5=^i2#v*4)%i9j-g^yo=)z#(#+5pe)o_=%v'

TEMPLATE_LOADERS = (
'django.template.loaders.filesystem.Loader',
'django.template.loaders.app_directories.Loader',
)

MIDDLEWARE_CLASSES = (
'django.middleware.common.CommonMiddleware',
'django.contrib.sessions.middleware.SessionMiddleware',
Expand All @@ -123,10 +127,6 @@

WSGI_APPLICATION = 'memcachier_algebra.wsgi.application'

TEMPLATE_DIRS = (
os.path.join(PROJECT_ROOT, 'templates'),
)

INSTALLED_APPS = (
'django.contrib.auth',
'django.contrib.contenttypes',
Expand Down Expand Up @@ -159,3 +159,5 @@
},
}
}

TEST_RUNNER = 'django.test.runner.DiscoverRunner'
6 changes: 4 additions & 2 deletions memcachier_algebra/urls.py
Original file line number Diff line number Diff line change
@@ -1,9 +1,11 @@
from django.conf.urls import patterns, include, url
from django.contrib.staticfiles.urls import staticfiles_urlpatterns
from memcachier_algebra import views


urlpatterns = patterns('',
url(r'^compute$', 'memcachier_algebra.views.compute', name='compute'),
url(r'^$', 'memcachier_algebra.views.home', name='home'),
url(r'^compute$', views.compute),
url(r'^$', views.home),
)

urlpatterns += staticfiles_urlpatterns()
2 changes: 1 addition & 1 deletion requirements.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Django==1.6.11
Django==1.8.16
dj-database-url==0.4.1
django-pylibmc==0.6.1
gunicorn==19.6.0
Expand Down

0 comments on commit 031b987

Please sign in to comment.