From e6c24bdd0d178b05a583875615591d171db2f4e9 Mon Sep 17 00:00:00 2001 From: "Kyle D. McCormick" Date: Thu, 20 Mar 2025 14:51:20 -0400 Subject: [PATCH] refactor: Remove now-unused static asset Django settings Closes: https://github.com/openedx/edx-platform/issues/36407 --- .../contentstore/views/tests/test_block.py | 3 --- cms/envs/common.py | 18 ------------------ cms/envs/devstack.py | 3 --- cms/envs/mock.yml | 1 - lms/envs/common.py | 8 -------- lms/envs/devstack.py | 3 --- 6 files changed, 36 deletions(-) diff --git a/cms/djangoapps/contentstore/views/tests/test_block.py b/cms/djangoapps/contentstore/views/tests/test_block.py index 93e382fb7f..ef85c446c8 100644 --- a/cms/djangoapps/contentstore/views/tests/test_block.py +++ b/cms/djangoapps/contentstore/views/tests/test_block.py @@ -560,9 +560,6 @@ class GetItemTest(ItemTest): else: self.assertNotIn("ancestors", response) xblock_info = get_block_info(xblock) - # TODO: remove after beta testing for the new problem editor parser - if xblock_info["category"] == "problem": - xblock_info["metadata"]["default_to_advanced"] = False self.assertEqual(xblock_info, response) diff --git a/cms/envs/common.py b/cms/envs/common.py index 6cc1938271..9be3eb9e09 100644 --- a/cms/envs/common.py +++ b/cms/envs/common.py @@ -1317,16 +1317,6 @@ EMBARGO_SITE_REDIRECT_URL = None ##### custom vendor plugin variables ##### -# .. setting_name: JS_ENV_EXTRA_CONFIG -# .. setting_default: {} -# .. setting_description: JavaScript code can access this dictionary using `process.env.JS_ENV_EXTRA_CONFIG` -# One of the current use cases for this is enabling custom TinyMCE plugins -# (TINYMCE_ADDITIONAL_PLUGINS) and overriding the TinyMCE configuration (TINYMCE_CONFIG_OVERRIDES). -# .. setting_warning: This Django setting is DEPRECATED! Starting in Sumac, Webpack will no longer -# use Django settings. Please set the JS_ENV_EXTRA_CONFIG environment variable to an equivalent JSON -# string instead. For details, see: https://github.com/openedx/edx-platform/issues/31895 -JS_ENV_EXTRA_CONFIG = json.loads(os.environ.get('JS_ENV_EXTRA_CONFIG', '{}')) - ############################### PIPELINE ####################################### PIPELINE = { @@ -1508,14 +1498,6 @@ WEBPACK_LOADER = { } } -# .. setting_name: WEBPACK_CONFIG_PATH -# .. setting_default: "webpack.prod.config.js" -# .. setting_description: Path to the Webpack configuration file. Used by Paver scripts. -# .. setting_warning: This Django setting is DEPRECATED! Starting in Sumac, Webpack will no longer -# use Django settings. Please set the WEBPACK_CONFIG_PATH environment variable instead. For details, -# see: https://github.com/openedx/edx-platform/issues/31895 -WEBPACK_CONFIG_PATH = os.environ.get('WEBPACK_CONFIG_PATH', 'webpack.prod.config.js') - ############################ SERVICE_VARIANT ################################## diff --git a/cms/envs/devstack.py b/cms/envs/devstack.py index ac21c2ee01..63dff1fbb9 100644 --- a/cms/envs/devstack.py +++ b/cms/envs/devstack.py @@ -66,9 +66,6 @@ STATICFILES_FINDERS = [ 'django.contrib.staticfiles.finders.AppDirectoriesFinder', ] -# Load development webpack donfiguration -WEBPACK_CONFIG_PATH = 'webpack.dev.config.js' - ############################ PYFS XBLOCKS SERVICE ############################# # Set configuration for Django pyfilesystem diff --git a/cms/envs/mock.yml b/cms/envs/mock.yml index 6e37b18180..fb2233501e 100644 --- a/cms/envs/mock.yml +++ b/cms/envs/mock.yml @@ -501,7 +501,6 @@ IDA_LOGOUT_URI_LIST: - https://discovery.localhost/logout/ - https://commerce-coordinator.localhost/logout/ ID_VERIFICATION_SUPPORT_LINK: https://support.localhost/hc/en-us/articles/206503858-How-do-I-complete-photo-verification- -JS_ENV_EXTRA_CONFIG: {} JWT_AUTH: JWT_AUDIENCE: test_jwt_audience JWT_AUTH_COOKIE_HEADER_PAYLOAD: jwt-cookie-header-payload diff --git a/lms/envs/common.py b/lms/envs/common.py index 316dad98da..719e12fb8b 100644 --- a/lms/envs/common.py +++ b/lms/envs/common.py @@ -2806,14 +2806,6 @@ WEBPACK_LOADER = { } } -# .. setting_name: WEBPACK_CONFIG_PATH -# .. setting_default: "webpack.prod.config.js" -# .. setting_description: Path to the Webpack configuration file. Used by Paver scripts. -# .. setting_warning: This Django setting is DEPRECATED! Starting in Sumac, Webpack will no longer -# use Django settings. Please set the WEBPACK_CONFIG_PATH environment variable instead. For details, -# see: https://github.com/openedx/edx-platform/issues/31895 -WEBPACK_CONFIG_PATH = os.environ.get('WEBPACK_CONFIG_PATH', 'webpack.prod.config.js') - ########################## DJANGO DEBUG TOOLBAR ############################### # We don't enable Django Debug Toolbar universally, but whenever we do, we want diff --git a/lms/envs/devstack.py b/lms/envs/devstack.py index d607073b9a..e024e81edf 100644 --- a/lms/envs/devstack.py +++ b/lms/envs/devstack.py @@ -136,9 +136,6 @@ REQUIRE_DEBUG = DEBUG PIPELINE['SASS_ARGUMENTS'] = '--debug-info' -# Load development webpack configuration -WEBPACK_CONFIG_PATH = 'webpack.dev.config.js' - ########################### VERIFIED CERTIFICATES ################################# FEATURES['AUTOMATIC_VERIFY_STUDENT_IDENTITY_FOR_TESTING'] = True