Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
C
course-discovery
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
edx
course-discovery
Commits
dfb61898
Commit
dfb61898
authored
Aug 10, 2016
by
Clinton Blackburn
Committed by
GitHub
Aug 10, 2016
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Added support for specifying extra apps via external configuration (#230)
ECOM-5173
parent
1bde4a3c
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
16 additions
and
13 deletions
+16
-13
course_discovery/settings/base.py
+7
-7
course_discovery/settings/devstack.py
+2
-2
course_discovery/settings/local.py
+2
-2
course_discovery/settings/production.py
+3
-0
course_discovery/settings/test.py
+2
-2
No files found.
course_discovery/settings/base.py
View file @
dfb61898
...
...
@@ -21,16 +21,16 @@ ALLOWED_HOSTS = []
# Application definition
INSTALLED_APPS
=
(
INSTALLED_APPS
=
[
'django.contrib.admin'
,
'django.contrib.auth'
,
'django.contrib.contenttypes'
,
'django.contrib.sessions'
,
'django.contrib.messages'
,
'django.contrib.staticfiles'
)
]
THIRD_PARTY_APPS
=
(
THIRD_PARTY_APPS
=
[
'release_util'
,
'rest_framework'
,
'rest_framework_swagger'
,
...
...
@@ -42,9 +42,9 @@ THIRD_PARTY_APPS = (
'dry_rest_permissions'
,
'compressor'
,
'django_filters'
,
)
]
PROJECT_APPS
=
(
PROJECT_APPS
=
[
'course_discovery.apps.core'
,
'course_discovery.apps.ietf_language_tags'
,
'course_discovery.apps.api'
,
...
...
@@ -52,14 +52,14 @@ PROJECT_APPS = (
'course_discovery.apps.course_metadata'
,
'course_discovery.apps.edx_haystack_extensions'
,
'course_discovery.apps.publisher'
,
)
]
INSTALLED_APPS
+=
THIRD_PARTY_APPS
INSTALLED_APPS
+=
PROJECT_APPS
# 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
=
(
'django.contrib.sessions.middleware.SessionMiddleware'
,
...
...
course_discovery/settings/devstack.py
View file @
dfb61898
...
...
@@ -10,9 +10,9 @@ LOGGING['handlers']['local'] = {
# TOOLBAR CONFIGURATION
# See: http://django-debug-toolbar.readthedocs.org/en/latest/installation.html
if
os
.
environ
.
get
(
'ENABLE_DJANGO_TOOLBAR'
,
False
):
INSTALLED_APPS
+=
(
INSTALLED_APPS
+=
[
'debug_toolbar'
,
)
]
MIDDLEWARE_CLASSES
+=
(
'debug_toolbar.middleware.DebugToolbarMiddleware'
,
...
...
course_discovery/settings/local.py
View file @
dfb61898
...
...
@@ -33,9 +33,9 @@ EMAIL_BACKEND = 'django.core.mail.backends.console.EmailBackend'
# TOOLBAR CONFIGURATION
# See: http://django-debug-toolbar.readthedocs.org/en/latest/installation.html
if
os
.
environ
.
get
(
'ENABLE_DJANGO_TOOLBAR'
,
False
):
INSTALLED_APPS
+=
(
INSTALLED_APPS
+=
[
'debug_toolbar'
,
)
]
MIDDLEWARE_CLASSES
+=
(
'debug_toolbar.middleware.DebugToolbarMiddleware'
,
...
...
course_discovery/settings/production.py
View file @
dfb61898
...
...
@@ -33,6 +33,9 @@ with open(CONFIG_FILE) as f:
vars
()
.
update
(
config_from_yaml
)
if
'EXTRA_APPS'
in
locals
():
INSTALLED_APPS
+=
EXTRA_APPS
DB_OVERRIDES
=
dict
(
PASSWORD
=
environ
.
get
(
'DB_MIGRATION_PASS'
,
DATABASES
[
'default'
][
'PASSWORD'
]),
ENGINE
=
environ
.
get
(
'DB_MIGRATION_ENGINE'
,
DATABASES
[
'default'
][
'ENGINE'
]),
...
...
course_discovery/settings/test.py
View file @
dfb61898
from
course_discovery.settings.base
import
*
# TEST SETTINGS
INSTALLED_APPS
+=
(
INSTALLED_APPS
+=
[
'django_nose'
,
'course_discovery.apps.edx_catalog_extensions'
,
)
]
TEST_RUNNER
=
'django_nose.NoseTestSuiteRunner'
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment