symposion_app Changeset - 6557e2983b68

Changeset - 6557e2983b68

Parent rev.

Child rev.

[Not reviewed]

0 2 0

Sachi King - 7 years ago 2017-03-31 00:54:47
nakato@nakato.io

Support Django 1.10

Few minor changes to support Django 1.10

2 files changed with 7 insertions and 7 deletions:

pinaxcon/settings.py

requirements.txt

0 comments (0 inline, 0 general)

pinaxcon/settings.py

➞

Show inline comments

@@ ... / @@ -18,102 +18,102 @@ DATABASES = { @@
+}
 CACHES = {
     'default': {
         'BACKEND': 'django.core.cache.backends.dummy.DummyCache',
+    }
+}
 ALLOWED_HOSTS = ['lca2018.org']
 TIME_ZONE = "Australia/Sydney"
 DATE_FORMAT = "j F Y"
 LANGUAGE_CODE = "en-au"
 SITE_ID = int(os.environ.get("SITE_ID", 1))
 USE_I18N = True
 USE_L10N = True
 USE_TZ = True
 MEDIA_ROOT = os.path.join(PACKAGE_ROOT, "site_media", "media")
 MEDIA_URL = "/site_media/media/"
 STATIC_ROOT = os.path.join(PROJECT_ROOT, "static", "distx")
 STATIC_URL = "/static/dist/"
 STATICFILES_DIRS = [
     os.path.join(PROJECT_ROOT, "static", "dist"),
+]
 STATICFILES_FINDERS = [
     "django.contrib.staticfiles.finders.FileSystemFinder",
     "django.contrib.staticfiles.finders.AppDirectoriesFinder",
+]
 SECRET_KEY = os.environ.get("DJANGO_SECRET_KEY", get_random_string(length=64))
 TEMPLATES = [
+    {
         "BACKEND": "django.template.backends.django.DjangoTemplates",
         "DIRS": [
             os.path.join(PACKAGE_ROOT, "templates"),
         ],
         "APP_DIRS": True,
         "OPTIONS": {
             "debug": DEBUG,
             "context_processors": [
                 "django.contrib.auth.context_processors.auth",
                 "django.core.context_processors.debug",
                 "django.core.context_processors.i18n",
                 "django.core.context_processors.media",
                 "django.core.context_processors.static",
                 "django.core.context_processors.tz",
                 "django.core.context_processors.request",
                 "django.template.context_processors.debug",
                 "django.template.context_processors.i18n",
                 "django.template.context_processors.media",
                 "django.template.context_processors.static",
                 "django.template.context_processors.tz",
                 "django.template.context_processors.request",
                 "django.contrib.messages.context_processors.messages",
                 "pinax_theme_bootstrap.context_processors.theme",
                 "symposion.reviews.context_processors.reviews",
             ],
         },
     },
+]
 MIDDLEWARE_CLASSES = [
     "django.contrib.sessions.middleware.SessionMiddleware",
     "django.middleware.common.CommonMiddleware",
     "django.middleware.csrf.CsrfViewMiddleware",
     "django.contrib.auth.middleware.AuthenticationMiddleware",
     "django.contrib.auth.middleware.SessionAuthenticationMiddleware",
     "django.contrib.messages.middleware.MessageMiddleware",
     "debug_toolbar.middleware.DebugToolbarMiddleware",
     "reversion.middleware.RevisionMiddleware",
     "django.middleware.clickjacking.XFrameOptionsMiddleware",
     'pinaxcon.monkey_patch.MonkeyPatchMiddleware',
+]
 ROOT_URLCONF = "pinaxcon.urls"
 # Python dotted path to the WSGI application used by Django's runserver.
 WSGI_APPLICATION = "pinaxcon.wsgi.application"
 INSTALLED_APPS = [
     "django.contrib.admin",
     "django.contrib.auth",
     "django.contrib.contenttypes",
     "django.contrib.messages",
     "django.contrib.sessions",
     "django.contrib.sites",
     "django.contrib.staticfiles",
     "django.contrib.humanize",
     "debug_toolbar",
     'djangosaml2',
     # theme
     "bootstrapform",
     "pinax_theme_bootstrap",
     # external
     "easy_thumbnails",
     "taggit",
     "reversion",
     "metron",

requirements.txt

➞

Show inline comments

 # Should use latest 1.9 for security
 Django==1.9.7
 pinax-theme-bootstrap==7.3.0
 metron==1.3.7
 pinax-eventlog==1.1.1
 django-formset-js==0.5.0
 dj-static==0.0.6
 dj-database-url==0.4.0
 pylibmc==1.5.1
 raven==5.27.0
 django-debug-toolbar==1.6
 djangosaml2
 -e git+https://github.com/nakato/django-gapc-storage.git@master#egg=django-gapc-storage
 # database
 mysqlclient>=1.3.3
 # For testing
-django-nose==1.4.3
+django-nose>=1.4.4
 coverage==4.0.3
 -e git+https://gitlab.com/lca2018/symposion.git@lca2018#egg=symposion
 -e git+https://github.com/chrisjrn/registrasion.git@master#egg=registrasion
 -e git+https://github.com/chrisjrn/registrasion-stripe.git@master#egg=registrasion-stripe

0 comments (0 inline, 0 general)