Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
559 changes: 46 additions & 513 deletions cms/envs/common.py

Large diffs are not rendered by default.

4 changes: 1 addition & 3 deletions cms/envs/production.py
Original file line number Diff line number Diff line change
Expand Up @@ -134,8 +134,6 @@ def get_env_setting(setting):

if STATIC_ROOT_BASE:
STATIC_ROOT = path(STATIC_ROOT_BASE) / 'studio'
WEBPACK_LOADER['DEFAULT']['STATS_FILE'] = STATIC_ROOT / "webpack-stats.json"
WEBPACK_LOADER['WORKERS']['STATS_FILE'] = STATIC_ROOT / "webpack-worker-stats.json"

DATA_DIR = path(DATA_DIR)

Expand Down Expand Up @@ -263,7 +261,7 @@ def get_env_setting(setting):
# Then add alternate environment queues
_YAML_ALTERNATE_WORKER_QUEUES = _YAML_TOKENS.get('ALTERNATE_WORKER_QUEUES', '').split()
ALTERNATE_QUEUES = [
DEFAULT_PRIORITY_QUEUE.replace(QUEUE_VARIANT, alternate + '.')
DEFAULT_PRIORITY_QUEUE.replace(SERVICE_VARIANT, alternate)
for alternate in _YAML_ALTERNATE_WORKER_QUEUES
]

Expand Down
4 changes: 3 additions & 1 deletion cms/envs/test.py
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@


import os
import tempfile
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Implicitly available from openedx/envs/test.py, but explicitly declaring now.


from django.utils.translation import gettext_lazy
from edx_django_utils.plugins import add_plugins
Expand All @@ -38,7 +39,8 @@

COMMON_TEST_DATA_ROOT = COMMON_ROOT / "test" / "data"

WEBPACK_LOADER["DEFAULT"]["STATS_FILE"] = STATIC_ROOT / "webpack-stats.json"
COMPREHENSIVE_THEME_DIRS = [REPO_ROOT / "themes", REPO_ROOT / "common/test"]

WEBPACK_LOADER['DEFAULT']['LOADER_CLASS'] = 'webpack_loader.loader.FakeWebpackLoader'

GITHUB_REPO_ROOT = TEST_ROOT / "data"
Expand Down
Loading
Loading