diff --git a/cms/envs/devstack.py b/cms/envs/devstack.py index a87e584a95..9d610b31f0 100644 --- a/cms/envs/devstack.py +++ b/cms/envs/devstack.py @@ -247,7 +247,3 @@ FEATURES['ENABLE_PREREQUISITE_COURSES'] = True # Used in edx-proctoring for ID generation in lieu of SECRET_KEY - dummy value # (ref MST-637) PROCTORING_USER_OBFUSCATION_KEY = '85920908f28904ed733fe576320db18cabd7b6cd' - - -# Don't tolerate deprecated edx-platform import usage in devstack. -ERROR_ON_DEPRECATED_EDX_PLATFORM_IMPORTS = True diff --git a/cms/envs/test.py b/cms/envs/test.py index 16655bf768..e95c7e8fa6 100644 --- a/cms/envs/test.py +++ b/cms/envs/test.py @@ -332,8 +332,6 @@ LOGISTRATION_API_RATELIMIT = '5/m' REGISTRATION_VALIDATION_RATELIMIT = '5/minute' RESET_PASSWORD_TOKEN_VALIDATE_API_RATELIMIT = '2/m' RESET_PASSWORD_API_RATELIMIT = '2/m' -# Don't tolerate deprecated edx-platform import usage in tests. -ERROR_ON_DEPRECATED_EDX_PLATFORM_IMPORTS = True ############### Settings for proctoring ############### PROCTORING_USER_OBFUSCATION_KEY = 'test_key' diff --git a/lms/envs/devstack.py b/lms/envs/devstack.py index 6ae9d0605e..6a6ea3fffb 100644 --- a/lms/envs/devstack.py +++ b/lms/envs/devstack.py @@ -432,7 +432,3 @@ FEATURES['ENABLE_PREREQUISITE_COURSES'] = True # Used in edx-proctoring for ID generation in lieu of SECRET_KEY - dummy value # (ref MST-637) PROCTORING_USER_OBFUSCATION_KEY = '85920908f28904ed733fe576320db18cabd7b6cd' - - -# Don't tolerate deprecated edx-platform import usage in devstack. -ERROR_ON_DEPRECATED_EDX_PLATFORM_IMPORTS = True diff --git a/lms/envs/test.py b/lms/envs/test.py index 47583c8d0f..3d1d05c760 100644 --- a/lms/envs/test.py +++ b/lms/envs/test.py @@ -601,6 +601,3 @@ LOGISTRATION_API_RATELIMIT = '5/m' REGISTRATION_VALIDATION_RATELIMIT = '5/minute' RESET_PASSWORD_TOKEN_VALIDATE_API_RATELIMIT = '2/m' RESET_PASSWORD_API_RATELIMIT = '2/m' - -# Don't tolerate deprecated edx-platform import usage in tests. -ERROR_ON_DEPRECATED_EDX_PLATFORM_IMPORTS = True diff --git a/openedx/tests/settings.py b/openedx/tests/settings.py index ecafde0ae5..624e37015f 100644 --- a/openedx/tests/settings.py +++ b/openedx/tests/settings.py @@ -133,6 +133,3 @@ RUN_BLOCKSTORE_TESTS = False SOFTWARE_SECURE_REQUEST_RETRY_DELAY = 60 * 60 # Maximum of 6 retries before giving up. SOFTWARE_SECURE_RETRY_MAX_ATTEMPTS = 6 - -# Don't tolerate deprecated edx-platform import usage in tests. -ERROR_ON_DEPRECATED_EDX_PLATFORM_IMPORTS = True