Skip to content

Commit 7111e8b

Browse files
refactor: bring common settings into common module (#37746)
1 parent 7f1f876 commit 7111e8b

13 files changed

Lines changed: 789 additions & 1222 deletions

File tree

cms/envs/common.py

Lines changed: 46 additions & 513 deletions
Large diffs are not rendered by default.

cms/envs/production.py

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -134,8 +134,6 @@ def get_env_setting(setting):
134134

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

140138
DATA_DIR = path(DATA_DIR)
141139

@@ -263,7 +261,7 @@ def get_env_setting(setting):
263261
# Then add alternate environment queues
264262
_YAML_ALTERNATE_WORKER_QUEUES = _YAML_TOKENS.get('ALTERNATE_WORKER_QUEUES', '').split()
265263
ALTERNATE_QUEUES = [
266-
DEFAULT_PRIORITY_QUEUE.replace(QUEUE_VARIANT, alternate + '.')
264+
DEFAULT_PRIORITY_QUEUE.replace(SERVICE_VARIANT, alternate)
267265
for alternate in _YAML_ALTERNATE_WORKER_QUEUES
268266
]
269267

cms/envs/test.py

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414

1515

1616
import os
17+
import tempfile
1718

1819
from django.utils.translation import gettext_lazy
1920
from edx_django_utils.plugins import add_plugins
@@ -38,7 +39,8 @@
3839

3940
COMMON_TEST_DATA_ROOT = COMMON_ROOT / "test" / "data"
4041

41-
WEBPACK_LOADER["DEFAULT"]["STATS_FILE"] = STATIC_ROOT / "webpack-stats.json"
42+
COMPREHENSIVE_THEME_DIRS = [REPO_ROOT / "themes", REPO_ROOT / "common/test"]
43+
4244
WEBPACK_LOADER['DEFAULT']['LOADER_CLASS'] = 'webpack_loader.loader.FakeWebpackLoader'
4345

4446
GITHUB_REPO_ROOT = TEST_ROOT / "data"

0 commit comments

Comments
 (0)