From 8d4088499c8d8a70dfb0cf98aba020dddaccac73 Mon Sep 17 00:00:00 2001 From: Matthew Fedder Date: Thu, 30 Apr 2020 17:01:16 -0700 Subject: [PATCH] Add support for vimeo videos with course-searchable captions Modify edx requirements to include our fork of video_xblock and pycaption (whose requirements have been modified to work with our installation, and tested in devstack). (Including config change for docker-devstack that is needed to test indexing/searching.) --- cms/envs/devstack_docker.py | 4 ++-- lms/envs/devstack_docker.py | 6 +++--- requirements/edx/base.txt | 2 ++ requirements/edx/development.txt | 2 ++ requirements/edx/github.in | 3 +++ requirements/edx/testing.txt | 2 ++ 6 files changed, 14 insertions(+), 5 deletions(-) diff --git a/cms/envs/devstack_docker.py b/cms/envs/devstack_docker.py index 407d44bd2046..f84df234ed5d 100644 --- a/cms/envs/devstack_docker.py +++ b/cms/envs/devstack_docker.py @@ -14,8 +14,8 @@ LMS_ROOT_URL = 'http://{}'.format(LMS_BASE) FEATURES.update({ - 'ENABLE_COURSEWARE_INDEX': False, - 'ENABLE_LIBRARY_INDEX': False, + 'ENABLE_COURSEWARE_INDEX': True, + 'ENABLE_LIBRARY_INDEX': True, 'ENABLE_DISCUSSION_SERVICE': True, }) diff --git a/lms/envs/devstack_docker.py b/lms/envs/devstack_docker.py index 28b97fe049c0..efe7a09f26df 100644 --- a/lms/envs/devstack_docker.py +++ b/lms/envs/devstack_docker.py @@ -34,9 +34,9 @@ FEATURES.update({ 'AUTOMATIC_AUTH_FOR_TESTING': True, - 'ENABLE_COURSEWARE_SEARCH': False, - 'ENABLE_COURSE_DISCOVERY': False, - 'ENABLE_DASHBOARD_SEARCH': False, + 'ENABLE_COURSEWARE_SEARCH': True, + 'ENABLE_COURSE_DISCOVERY': True, + 'ENABLE_DASHBOARD_SEARCH': True, 'ENABLE_DISCUSSION_SERVICE': True, 'SHOW_HEADER_LANGUAGE_SELECTOR': True, 'ENABLE_ENTERPRISE_INTEGRATION': False, diff --git a/requirements/edx/base.txt b/requirements/edx/base.txt index 97100db7e535..40dd767e9d71 100644 --- a/requirements/edx/base.txt +++ b/requirements/edx/base.txt @@ -23,6 +23,8 @@ git+https://github.com/edx/django-rest-framework.git@1ceda7c086fddffd1c440cc8685 git+https://github.com/mitodl/edx-sga.git@3828ba9e413080a81b907a3381e5ffa05e063f81#egg=edx-sga==0.8.3 git+https://github.com/edx/xblock-lti-consumer.git@v1.2.5#egg=lti_consumer-xblock==1.2.5 git+https://github.com/appsembler/tahoe-lti.git@release-0.2.0#egg=tahoe-lti==release-0.2.0 +-e git+https://github.com/ucsd-ets/pycaption.git@3c6b85e5ccfd180a945a4a9725d355401810352b#egg=pycaption +-e git+https://github.com/ucsd-ets/xblock-video.git@1fda7cbff7a95c4f5ffe220010e9a642a7f2e6af#egg=video_xblock git+https://github.com/edx/MongoDBProxy.git@25b99097615bda06bd7cdfe5669ed80dc2a7fed0#egg=MongoDBProxy==0.1.0 -e . git+https://github.com/edx/edx-ora2.git@2.2.0#egg=ora2==2.2.0 diff --git a/requirements/edx/development.txt b/requirements/edx/development.txt index 84db82a6aad1..b199d3bea703 100644 --- a/requirements/edx/development.txt +++ b/requirements/edx/development.txt @@ -26,6 +26,8 @@ git+https://github.com/mitodl/edx-sga.git@3828ba9e413080a81b907a3381e5ffa05e063f git+https://github.com/edx/lettuce.git@7a04591c78ac56dac3eb3e91ca94b15cce844133#egg=lettuce==0.2.23+edx.1 git+https://github.com/edx/xblock-lti-consumer.git@v1.2.5#egg=lti_consumer-xblock==1.2.5 git+https://github.com/appsembler/tahoe-lti.git@release-0.2.0#egg=tahoe-lti==release-0.2.0 +-e git+https://github.com/ucsd-ets/pycaption.git@3c6b85e5ccfd180a945a4a9725d355401810352b#egg=pycaption +-e git+https://github.com/ucsd-ets/xblock-video.git@1fda7cbff7a95c4f5ffe220010e9a642a7f2e6af#egg=video_xblock git+https://github.com/edx/MongoDBProxy.git@25b99097615bda06bd7cdfe5669ed80dc2a7fed0#egg=MongoDBProxy==0.1.0 -e . git+https://github.com/edx/edx-ora2.git@2.2.0#egg=ora2==2.2.0 diff --git a/requirements/edx/github.in b/requirements/edx/github.in index 8204937c8981..fb1e3310946e 100644 --- a/requirements/edx/github.in +++ b/requirements/edx/github.in @@ -103,3 +103,6 @@ -e git+https://github.com/mitodl/edx-sga.git@3828ba9e413080a81b907a3381e5ffa05e063f81#egg=edx-sga==0.8.3 -e git+https://github.com/open-craft/xblock-poll@add89e14558c30f3c8dc7431e5cd6536fff6d941#egg=xblock-poll==1.5.1 -e git+https://github.com/edx-solutions/xblock-drag-and-drop-v2@v2.1.6#egg=xblock-drag-and-drop-v2==2.1.6 +# Forks of pycaption and xblock-video with updated dependencies +-e git+https://github.com/ucsd-ets/pycaption.git@3c6b85e5ccfd180a945a4a9725d355401810352b#egg=pycaption +-e git+https://github.com/ucsd-ets/xblock-video.git@1fda7cbff7a95c4f5ffe220010e9a642a7f2e6af#egg=video_xblock diff --git a/requirements/edx/testing.txt b/requirements/edx/testing.txt index 9e96879777a5..84951fa93b40 100644 --- a/requirements/edx/testing.txt +++ b/requirements/edx/testing.txt @@ -24,6 +24,8 @@ git+https://github.com/mitodl/edx-sga.git@3828ba9e413080a81b907a3381e5ffa05e063f git+https://github.com/edx/lettuce.git@7a04591c78ac56dac3eb3e91ca94b15cce844133#egg=lettuce==0.2.23+edx.1 git+https://github.com/edx/xblock-lti-consumer.git@v1.2.5#egg=lti_consumer-xblock==1.2.5 git+https://github.com/appsembler/tahoe-lti.git@release-0.2.0#egg=tahoe-lti==release-0.2.0 +-e git+https://github.com/ucsd-ets/pycaption.git@3c6b85e5ccfd180a945a4a9725d355401810352b#egg=pycaption +-e git+https://github.com/ucsd-ets/xblock-video.git@1fda7cbff7a95c4f5ffe220010e9a642a7f2e6af#egg=video_xblock git+https://github.com/edx/MongoDBProxy.git@25b99097615bda06bd7cdfe5669ed80dc2a7fed0#egg=MongoDBProxy==0.1.0 -e . git+https://github.com/edx/edx-ora2.git@2.2.0#egg=ora2==2.2.0