Commit dfb61898 by Clinton Blackburn Committed by GitHub

Added support for specifying extra apps via external configuration (#230)

ECOM-5173
parent 1bde4a3c
...@@ -21,16 +21,16 @@ ALLOWED_HOSTS = [] ...@@ -21,16 +21,16 @@ ALLOWED_HOSTS = []
# Application definition # Application definition
INSTALLED_APPS = ( INSTALLED_APPS = [
'django.contrib.admin', 'django.contrib.admin',
'django.contrib.auth', 'django.contrib.auth',
'django.contrib.contenttypes', 'django.contrib.contenttypes',
'django.contrib.sessions', 'django.contrib.sessions',
'django.contrib.messages', 'django.contrib.messages',
'django.contrib.staticfiles' 'django.contrib.staticfiles'
) ]
THIRD_PARTY_APPS = ( THIRD_PARTY_APPS = [
'release_util', 'release_util',
'rest_framework', 'rest_framework',
'rest_framework_swagger', 'rest_framework_swagger',
...@@ -42,9 +42,9 @@ THIRD_PARTY_APPS = ( ...@@ -42,9 +42,9 @@ THIRD_PARTY_APPS = (
'dry_rest_permissions', 'dry_rest_permissions',
'compressor', 'compressor',
'django_filters', 'django_filters',
) ]
PROJECT_APPS = ( PROJECT_APPS = [
'course_discovery.apps.core', 'course_discovery.apps.core',
'course_discovery.apps.ietf_language_tags', 'course_discovery.apps.ietf_language_tags',
'course_discovery.apps.api', 'course_discovery.apps.api',
...@@ -52,14 +52,14 @@ PROJECT_APPS = ( ...@@ -52,14 +52,14 @@ PROJECT_APPS = (
'course_discovery.apps.course_metadata', 'course_discovery.apps.course_metadata',
'course_discovery.apps.edx_haystack_extensions', 'course_discovery.apps.edx_haystack_extensions',
'course_discovery.apps.publisher', 'course_discovery.apps.publisher',
) ]
INSTALLED_APPS += THIRD_PARTY_APPS INSTALLED_APPS += THIRD_PARTY_APPS
INSTALLED_APPS += PROJECT_APPS INSTALLED_APPS += PROJECT_APPS
# NOTE: Haystack must be installed after core so that we can override Haystack's management commands with our own. # NOTE: Haystack must be installed after core so that we can override Haystack's management commands with our own.
INSTALLED_APPS += ('haystack',) INSTALLED_APPS += ['haystack']
MIDDLEWARE_CLASSES = ( MIDDLEWARE_CLASSES = (
'django.contrib.sessions.middleware.SessionMiddleware', 'django.contrib.sessions.middleware.SessionMiddleware',
......
...@@ -10,9 +10,9 @@ LOGGING['handlers']['local'] = { ...@@ -10,9 +10,9 @@ LOGGING['handlers']['local'] = {
# TOOLBAR CONFIGURATION # TOOLBAR CONFIGURATION
# See: http://django-debug-toolbar.readthedocs.org/en/latest/installation.html # See: http://django-debug-toolbar.readthedocs.org/en/latest/installation.html
if os.environ.get('ENABLE_DJANGO_TOOLBAR', False): if os.environ.get('ENABLE_DJANGO_TOOLBAR', False):
INSTALLED_APPS += ( INSTALLED_APPS += [
'debug_toolbar', 'debug_toolbar',
) ]
MIDDLEWARE_CLASSES += ( MIDDLEWARE_CLASSES += (
'debug_toolbar.middleware.DebugToolbarMiddleware', 'debug_toolbar.middleware.DebugToolbarMiddleware',
......
...@@ -33,9 +33,9 @@ EMAIL_BACKEND = 'django.core.mail.backends.console.EmailBackend' ...@@ -33,9 +33,9 @@ EMAIL_BACKEND = 'django.core.mail.backends.console.EmailBackend'
# TOOLBAR CONFIGURATION # TOOLBAR CONFIGURATION
# See: http://django-debug-toolbar.readthedocs.org/en/latest/installation.html # See: http://django-debug-toolbar.readthedocs.org/en/latest/installation.html
if os.environ.get('ENABLE_DJANGO_TOOLBAR', False): if os.environ.get('ENABLE_DJANGO_TOOLBAR', False):
INSTALLED_APPS += ( INSTALLED_APPS += [
'debug_toolbar', 'debug_toolbar',
) ]
MIDDLEWARE_CLASSES += ( MIDDLEWARE_CLASSES += (
'debug_toolbar.middleware.DebugToolbarMiddleware', 'debug_toolbar.middleware.DebugToolbarMiddleware',
......
...@@ -33,6 +33,9 @@ with open(CONFIG_FILE) as f: ...@@ -33,6 +33,9 @@ with open(CONFIG_FILE) as f:
vars().update(config_from_yaml) vars().update(config_from_yaml)
if 'EXTRA_APPS' in locals():
INSTALLED_APPS += EXTRA_APPS
DB_OVERRIDES = dict( DB_OVERRIDES = dict(
PASSWORD=environ.get('DB_MIGRATION_PASS', DATABASES['default']['PASSWORD']), PASSWORD=environ.get('DB_MIGRATION_PASS', DATABASES['default']['PASSWORD']),
ENGINE=environ.get('DB_MIGRATION_ENGINE', DATABASES['default']['ENGINE']), ENGINE=environ.get('DB_MIGRATION_ENGINE', DATABASES['default']['ENGINE']),
......
from course_discovery.settings.base import * from course_discovery.settings.base import *
# TEST SETTINGS # TEST SETTINGS
INSTALLED_APPS += ( INSTALLED_APPS += [
'django_nose', 'django_nose',
'course_discovery.apps.edx_catalog_extensions', 'course_discovery.apps.edx_catalog_extensions',
) ]
TEST_RUNNER = 'django_nose.NoseTestSuiteRunner' TEST_RUNNER = 'django_nose.NoseTestSuiteRunner'
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment