diff --git a/cms/envs/common.py b/cms/envs/common.py index 85cbf47d0b..8c79bebfe8 100644 --- a/cms/envs/common.py +++ b/cms/envs/common.py @@ -1097,9 +1097,6 @@ INSTALLED_APPS = [ 'xblock_django', - # edX Proctoring - 'edx_proctoring', - # Catalog integration 'openedx.core.djangoapps.catalog', @@ -1449,13 +1446,6 @@ MICROSITE_TEMPLATE_BACKEND = 'microsite_configuration.backends.filebased.Filebas # TTL for microsite database template cache MICROSITE_DATABASE_TEMPLATE_CACHE_TTL = 5 * 60 -############################### PROCTORING CONFIGURATION DEFAULTS ############## -PROCTORING_SETTINGS = {} -PROCTORING_BACKENDS = { - 'DEFAULT': 'null', - 'null': {}, -} - ############################ Global Database Configuration ##################### diff --git a/cms/envs/production.py b/cms/envs/production.py index db2bea1b8a..c528fc3cf9 100644 --- a/cms/envs/production.py +++ b/cms/envs/production.py @@ -494,11 +494,6 @@ XBLOCK_SETTINGS = ENV_TOKENS.get('XBLOCK_SETTINGS', {}) XBLOCK_SETTINGS.setdefault("VideoDescriptor", {})["licensing_enabled"] = FEATURES.get("LICENSING", False) XBLOCK_SETTINGS.setdefault("VideoModule", {})['YOUTUBE_API_KEY'] = AUTH_TOKENS.get('YOUTUBE_API_KEY', YOUTUBE_API_KEY) -################# PROCTORING CONFIGURATION ################## - -PROCTORING_SETTINGS = ENV_TOKENS.get("PROCTORING_SETTINGS", PROCTORING_SETTINGS) -PROCTORING_BACKENDS = ENV_TOKENS.get("PROCTORING_BACKENDS", PROCTORING_BACKENDS) - ################# MICROSITE #################### # microsite specific configurations. MICROSITE_CONFIGURATION = ENV_TOKENS.get('MICROSITE_CONFIGURATION', {}) diff --git a/cms/envs/test.py b/cms/envs/test.py index 6d90b65d56..849130059c 100644 --- a/cms/envs/test.py +++ b/cms/envs/test.py @@ -36,7 +36,6 @@ from lms.envs.test import ( JWT_AUTH, REGISTRATION_EXTRA_FIELDS, ECOMMERCE_API_URL, - PROCTORING_BACKENDS, ) diff --git a/lms/envs/common.py b/lms/envs/common.py index f85480968e..a64cfd2a41 100644 --- a/lms/envs/common.py +++ b/lms/envs/common.py @@ -1345,30 +1345,6 @@ courseware_js = [ 'js/modules/tab.js', ] -proctoring_js = ( - [ - 'proctoring/js/models/proctored_exam_allowance_model.js', - 'proctoring/js/models/proctored_exam_attempt_model.js', - 'proctoring/js/models/proctored_exam_model.js' - ] + - [ - 'proctoring/js/collections/proctored_exam_allowance_collection.js', - 'proctoring/js/collections/proctored_exam_attempt_collection.js', - 'proctoring/js/collections/proctored_exam_collection.js' - ] + - [ - 'proctoring/js/views/Backbone.ModalDialog.js', - 'proctoring/js/views/proctored_exam_add_allowance_view.js', - 'proctoring/js/views/proctored_exam_allowance_view.js', - 'proctoring/js/views/proctored_exam_attempt_view.js', - 'proctoring/js/views/proctored_exam_view.js', - 'proctoring/js/views/proctored_exam_instructor_launch.js', - ] + - [ - 'proctoring/js/proctored_app.js', - 'proctoring/js/exam_action_handler.js' - ] -) # Before a student accesses courseware, we do not # need many of the JS dependencies. This includes @@ -1695,10 +1671,6 @@ PIPELINE_JS = { ), 'output_filename': 'js/lms-application.js', }, - 'proctoring': { - 'source_filenames': proctoring_js, - 'output_filename': 'js/lms-proctoring.js', - }, 'courseware': { 'source_filenames': courseware_js, 'output_filename': 'js/lms-courseware.js', @@ -2887,9 +2859,6 @@ OPTIONAL_APPS = [ # edxval ('edxval', 'openedx.core.djangoapps.content.course_overviews.apps.CourseOverviewsConfig'), - # edX Proctoring - ('edx_proctoring', None), - # Organizations App (http://github.com/edx/edx-organizations) ('organizations', None), @@ -3221,14 +3190,6 @@ MICROSITE_DATABASE_TEMPLATE_CACHE_TTL = 5 * 60 RSS_PROXY_CACHE_TIMEOUT = 3600 # The length of time we cache RSS retrieved from remote URLs in seconds -#### PROCTORING CONFIGURATION DEFAULTS - -PROCTORING_SETTINGS = {} -PROCTORING_BACKENDS = { - 'DEFAULT': 'null', - 'null': {}, -} - #### Custom Courses for EDX (CCX) configuration # This is an arbitrary hard limit. diff --git a/lms/envs/production.py b/lms/envs/production.py index 9e2d43514c..3cd0ec018e 100644 --- a/lms/envs/production.py +++ b/lms/envs/production.py @@ -889,11 +889,6 @@ CREDIT_HELP_LINK_URL = ENV_TOKENS.get('CREDIT_HELP_LINK_URL', CREDIT_HELP_LINK_U JWT_AUTH.update(ENV_TOKENS.get('JWT_AUTH', {})) JWT_AUTH.update(AUTH_TOKENS.get('JWT_AUTH', {})) -################# PROCTORING CONFIGURATION ################## - -PROCTORING_SETTINGS = ENV_TOKENS.get("PROCTORING_SETTINGS", PROCTORING_SETTINGS) -PROCTORING_BACKENDS = ENV_TOKENS.get("PROCTORING_BACKENDS", PROCTORING_BACKENDS) - ################# MICROSITE #################### MICROSITE_CONFIGURATION = ENV_TOKENS.get('MICROSITE_CONFIGURATION', {}) MICROSITE_ROOT_DIR = path(ENV_TOKENS.get('MICROSITE_ROOT_DIR', '')) diff --git a/lms/envs/test.py b/lms/envs/test.py index 4a420dc923..d5f094f6eb 100644 --- a/lms/envs/test.py +++ b/lms/envs/test.py @@ -124,12 +124,6 @@ XQUEUE_WAITTIME_BETWEEN_REQUESTS = 5 # seconds MOCK_STAFF_GRADING = True MOCK_PEER_GRADING = True -PROCTORING_BACKENDS = { - 'DEFAULT': 'mock', - 'mock': {}, - 'mock_proctoring_without_rules': {}, -} - ############################ STATIC FILES ############################# # TODO (cpennington): We need to figure out how envs/test.py can inject things diff --git a/lms/urls.py b/lms/urls.py index 762cf863c5..ba2be98a95 100644 --- a/lms/urls.py +++ b/lms/urls.py @@ -1012,11 +1012,6 @@ if 'debug_toolbar' in settings.INSTALLED_APPS: url(r'^__debug__/', include(debug_toolbar.urls)), ] -# include into our URL patterns the HTTP REST API that comes with edx-proctoring. -urlpatterns += [ - url(r'^api/', include('edx_proctoring.urls')), -] - if settings.FEATURES.get('ENABLE_FINANCIAL_ASSISTANCE_FORM'): urlpatterns += [ url( diff --git a/requirements/edx/base.in b/requirements/edx/base.in index 1e62d7caf5..924e467ed1 100644 --- a/requirements/edx/base.in +++ b/requirements/edx/base.in @@ -80,7 +80,7 @@ edx-enterprise edx-milestones edx-oauth2-provider edx-organizations -edx-proctoring==1.5.0rc2 +edx-proctoring==1.5.0rc3 edx-rest-api-client edx-search edx-submissions diff --git a/requirements/edx/base.txt b/requirements/edx/base.txt index 0e7b7ec35e..1a246101af 100644 --- a/requirements/edx/base.txt +++ b/requirements/edx/base.txt @@ -145,7 +145,7 @@ edx-milestones==0.1.13 edx-oauth2-provider==1.2.2 edx-opaque-keys[django]==0.4.4 edx-organizations==1.0.0 -edx-proctoring==1.5.0rc2 +edx-proctoring==1.5.0rc3 edx-rest-api-client==1.9.2 edx-search==1.2.1 edx-submissions==2.0.12 diff --git a/requirements/edx/development.txt b/requirements/edx/development.txt index 2aac4f3ca6..8715fb05d5 100644 --- a/requirements/edx/development.txt +++ b/requirements/edx/development.txt @@ -165,7 +165,7 @@ edx-milestones==0.1.13 edx-oauth2-provider==1.2.2 edx-opaque-keys[django]==0.4.4 edx-organizations==1.0.0 -edx-proctoring==1.5.0rc2 +edx-proctoring==1.5.0rc3 edx-rest-api-client==1.9.2 edx-search==1.2.1 edx-sphinx-theme==1.4.0 diff --git a/requirements/edx/testing.txt b/requirements/edx/testing.txt index 175d13428f..118523046f 100644 --- a/requirements/edx/testing.txt +++ b/requirements/edx/testing.txt @@ -160,7 +160,7 @@ edx-milestones==0.1.13 edx-oauth2-provider==1.2.2 edx-opaque-keys[django]==0.4.4 edx-organizations==1.0.0 -edx-proctoring==1.5.0rc2 +edx-proctoring==1.5.0rc3 edx-rest-api-client==1.9.2 edx-search==1.2.1 edx-submissions==2.0.12