Updated Settings

- Cleaned template settings, taking advantage of Django 1.8 changes
- Removed unnecessary permissions scope from OIDC login requests
- Moved get_lms_url to ecommerce.settings module

ECOM-2178

ecommerce/courses/publishers.py

@@ -5,7 +5,7 @@ from django.conf import settings
 import requests
 
 from ecommerce.courses.utils import mode_for_seat
-from ecommerce.settings.base import get_lms_url
+from ecommerce.settings import get_lms_url
 
 
 logger = logging.getLogger(__name__)

ecommerce/courses/tests/test_publishers.py

@@ -13,7 +13,7 @@ from testfixtures import LogCapture
 from ecommerce.courses.models import Course
 from ecommerce.courses.publishers import LMSPublisher
 from ecommerce.extensions.catalogue.tests.mixins import CourseCatalogTestMixin
-from ecommerce.settings.base import get_lms_url
+from ecommerce.settings import get_lms_url
 
 
 EDX_API_KEY = 'edx'

ecommerce/extensions/checkout/signals.py

@@ -8,7 +8,7 @@ from ecommerce.courses.utils import mode_for_seat
 from ecommerce.extensions.analytics.utils import is_segment_configured, parse_tracking_context, log_exceptions
 from ecommerce.extensions.checkout.utils import get_provider_data
 from ecommerce.notifications.notifications import send_notification
-from ecommerce.settings.base import get_lms_url
+from ecommerce.settings import get_lms_url
 from oscar.core.loading import get_class
 
 

ecommerce/extensions/checkout/tests/test_signals.py

@@ -9,7 +9,7 @@ from waffle.models import Switch
 from ecommerce.courses.models import Course
 from ecommerce.extensions.catalogue.tests.mixins import CourseCatalogTestMixin
 from ecommerce.extensions.checkout.signals import send_course_purchase_email
-from ecommerce.settings.base import get_lms_url
+from ecommerce.settings import get_lms_url
 
 
 class SignalTests(CourseCatalogTestMixin, TestCase):

ecommerce/extensions/checkout/tests/test_utils.py

@@ -6,7 +6,7 @@ import requests
 from requests import ConnectionError, Timeout
 
 from ecommerce.extensions.checkout.utils import get_provider_data
-from ecommerce.settings.base import get_lms_url
+from ecommerce.settings import get_lms_url
 
 
 @ddt.ddt

ecommerce/extensions/checkout/utils.py

@@ -3,7 +3,7 @@ import requests
 
 from django.conf import settings
 
-from ecommerce.settings.base import get_lms_url
+from ecommerce.settings import get_lms_url
 
 
 logger = logging.getLogger(__name__)

ecommerce/settings/__init__.py

+from urlparse import urljoin
+
+
+def get_lms_url(path):
+    from django.conf import settings
+    return urljoin(settings.LMS_URL_ROOT, path)

ecommerce/settings/base.py

@@ -2,9 +2,7 @@
 import os
 from os.path import basename, normpath
 from sys import path
-from urlparse import urljoin
 
-from django.conf import settings
 from oscar import OSCAR_MAIN_TEMPLATE_DIR
 
 from ecommerce.settings._oscar import *
@@ -29,9 +27,6 @@ path.append(DJANGO_ROOT)
 # DEBUG CONFIGURATION
 # See: https://docs.djangoproject.com/en/dev/ref/settings/#debug
 DEBUG = False
-
-# See: https://docs.djangoproject.com/en/dev/ref/settings/#template-debug
-TEMPLATE_DEBUG = DEBUG
 # END DEBUG CONFIGURATION
 
 
@@ -150,40 +145,37 @@ FIXTURE_DIRS = (
 
 # TEMPLATE CONFIGURATION
 # See: https://docs.djangoproject.com/en/dev/ref/settings/#template-context-processors
-TEMPLATE_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.contrib.messages.context_processors.messages',
-    'django.core.context_processors.request',
-    'oscar.apps.search.context_processors.search_form',
-    'oscar.apps.promotions.context_processors.promotions',
-    'oscar.apps.checkout.context_processors.checkout',
-    'oscar.apps.customer.notifications.context_processors.notifications',
-    'oscar.core.context_processors.metadata',
-    'ecommerce.core.context_processors.core',
-)
-
-# See: https://docs.djangoproject.com/en/dev/ref/settings/#template-loaders
-TEMPLATE_LOADERS = (
-    'django.template.loaders.filesystem.Loader',
-    'django.template.loaders.app_directories.Loader',
-)
-
-# See: https://docs.djangoproject.com/en/dev/ref/settings/#template-dirs
-TEMPLATE_DIRS = (
-    normpath(join(DJANGO_ROOT, 'templates')),
-    # Templates which override default Oscar templates
-    normpath(join(DJANGO_ROOT, 'templates/oscar')),
-    OSCAR_MAIN_TEMPLATE_DIR,
-)
-
-ALLOWED_INCLUDE_ROOTS = (
-    normpath(join(SITE_ROOT, 'templates')),
-)
+TEMPLATES = [
+    {
+        'BACKEND': 'django.template.backends.django.DjangoTemplates',
+        'APP_DIRS': True,
+        'DIRS': (
+            normpath(join(DJANGO_ROOT, 'templates')),
+            # Templates which override default Oscar templates
+            normpath(join(DJANGO_ROOT, 'templates/oscar')),
+            OSCAR_MAIN_TEMPLATE_DIR,
+        ),
+        'OPTIONS': {
+            'context_processors': (
+                'django.contrib.auth.context_processors.auth',
+                '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.contrib.messages.context_processors.messages',
+                'django.template.context_processors.request',
+                'oscar.apps.search.context_processors.search_form',
+                'oscar.apps.promotions.context_processors.promotions',
+                'oscar.apps.checkout.context_processors.checkout',
+                'oscar.apps.customer.notifications.context_processors.notifications',
+                'oscar.core.context_processors.metadata',
+                'ecommerce.core.context_processors.core',
+            ),
+            'debug': True,  # Django will only display debug pages if the global DEBUG setting is set to True.
+        }
+    },
+]
 # END TEMPLATE CONFIGURATION
 
 
@@ -216,13 +208,6 @@ ECOMMERCE_URL_ROOT = None
 # Absolute URL used to construct LMS URLs.
 LMS_URL_ROOT = None
 
-
-def get_lms_url(path):
-    # This function accesses Django settings because other settings modules override
-    # LMS_URL_ROOT; we don't always want this function to use the value of LMS_URL_ROOT
-    # defined in this module.
-    return urljoin(settings.LMS_URL_ROOT, path)
-
 # The location of the LMS heartbeat page
 LMS_HEARTBEAT_URL = None
 
@@ -383,8 +368,6 @@ SOCIAL_AUTH_EDX_OIDC_ID_TOKEN_DECRYPTION_KEY = SOCIAL_AUTH_EDX_OIDC_SECRET
 
 # Redirect successfully authenticated users to the Oscar dashboard.
 LOGIN_REDIRECT_URL = '/dashboard/'
-
-EXTRA_SCOPE = ['permissions']
 # END AUTHENTICATION
 
 

ecommerce/settings/local.py

@@ -4,6 +4,7 @@ from __future__ import absolute_import
 import os
 from os.path import join, normpath
 
+from ecommerce.settings import get_lms_url
 from ecommerce.settings.base import *
 from ecommerce.settings.logger import get_logger_config
 

ecommerce/settings/test.py

 from __future__ import absolute_import
 
-import os
-
+from ecommerce.settings import get_lms_url
 from ecommerce.settings.base import *
 from ecommerce.settings.logger import get_logger_config
 
@@ -30,6 +29,7 @@ class DisableMigrations(object):
 
     For more context, see http://goo.gl/Fr4qyE.
     """
+
     def __contains__(self, item):
         """Make it appear as if all apps are contained in the dictionary."""
         return True
@@ -38,6 +38,7 @@ class DisableMigrations(object):
         """Force Django to look for migrations in a nonexistent package."""
         return 'notmigrations'
 
+
 if str(os.environ.get('DISABLE_MIGRATIONS')) == 'True':
     MIGRATION_MODULES = DisableMigrations()
 # END TEST SETTINGS

package.json

@@ -2,7 +2,7 @@
   "name": "edx-ecommerce",
   "repository": {
     "type": "git",
-    "url": "git://github.com/edx/edx-ecommerce"
+    "url": "git://github.com/edx/ecommerce"
   },
   "dependencies": {
     "bower": "^1.4.1",