From facff154848fc25f98c5466e23cfc6a9adb7cad9 Mon Sep 17 00:00:00 2001 From: M Umar Khan Date: Thu, 19 May 2022 21:40:48 +0500 Subject: [PATCH 01/25] refactor: move xmodule folder to root --- temp.txt | 0 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 temp.txt diff --git a/temp.txt b/temp.txt new file mode 100644 index 000000000000..e69de29bb2d1 From 5bf13f0596ac4a93f48804bac4cee69236b54a4a Mon Sep 17 00:00:00 2001 From: M Umar Khan Date: Fri, 20 May 2022 02:42:19 +0500 Subject: [PATCH 02/25] refactor: move xmodule folder to root --- {common/lib/xmodule/xmodule => xmodule}/README.rst | 0 {common/lib/xmodule/xmodule => xmodule}/__init__.py | 0 .../xmodule => xmodule}/annotatable_module.py | 0 .../xmodule/xmodule => xmodule}/annotator_mixin.py | 0 .../public/js/library_content_edit.js | 0 .../LibrarySourcedBlockPicker.jsx | 0 .../public/js/library_source_block.js | 0 .../assets/library_source_block/style.css | 0 .../split_test/public/js/split_test_author_view.js | 0 .../assets/split_test/public/js/split_test_staff.js | 0 .../split_test/public/js/split_test_student.js | 0 .../vertical/public/js/vertical_student_view.js | 0 .../assets/word_cloud/.eslintrc.js | 0 .../assets/word_cloud/.gitignore | 0 .../assets/word_cloud/src/js/d3.layout.cloud.js | 0 .../assets/word_cloud/src/js/d3.min.js | 0 .../assets/word_cloud/src/js/word_cloud.js | 0 .../assets/word_cloud/src/js/word_cloud_main.js | 0 .../assets/word_cloud/webpack.config.js | 0 .../xmodule => xmodule}/assetstore/__init__.py | 0 .../xmodule => xmodule}/assetstore/assetmgr.py | 0 .../assetstore/tests/__init__.py | 0 .../xmodule => xmodule}/assetstore/tests/assets.xsd | 0 .../assetstore/tests/test_asset_xml.py | 0 .../xmodule => xmodule}/block_metadata_utils.py | 0 .../lib/xmodule/xmodule => xmodule}/capa_module.py | 0 .../xmodule => xmodule}/conditional_module.py | 0 .../xmodule => xmodule}/contentstore/__init__.py | 0 .../xmodule => xmodule}/contentstore/content.py | 0 .../xmodule => xmodule}/contentstore/django.py | 0 .../xmodule => xmodule}/contentstore/mongo.py | 0 .../xmodule => xmodule}/contentstore/utils.py | 0 .../xmodule => xmodule}/course_metadata_utils.py | 0 .../xmodule/xmodule => xmodule}/course_module.py | 0 .../css/annotatable/display.scss | 0 .../xmodule => xmodule}/css/capa/display.scss | 0 .../css/codemirror/codemirror.scss | 0 .../xmodule => xmodule}/css/editor/edit.scss | 0 .../xmodule => xmodule}/css/html/display.scss | 0 .../xmodule/xmodule => xmodule}/css/html/edit.scss | 0 .../xmodule/xmodule => xmodule}/css/lti/lti.scss | 0 .../xmodule => xmodule}/css/poll/display.scss | 0 .../xmodule => xmodule}/css/problem/edit.scss | 0 .../xmodule => xmodule}/css/sequence/display.scss | 0 .../xmodule => xmodule}/css/tabs/codemirror.scss | 0 .../xmodule/xmodule => xmodule}/css/tabs/tabs.scss | 0 .../css/video/accessible_menu.scss | 0 .../xmodule => xmodule}/css/video/display.scss | 0 .../xmodule => xmodule}/css/word_cloud/display.scss | 0 {common/lib/xmodule/xmodule => xmodule}/data.py | 0 .../docs/decisions/0001-move-due-dates-to-db.rst | 0 .../decisions/0002-remove-mongodb-dependency.rst | 0 .../xmodule/xmodule => xmodule}/editing_module.py | 0 .../xmodule/xmodule => xmodule}/edxnotes_utils.py | 0 .../lib/xmodule/xmodule => xmodule}/error_module.py | 0 .../lib/xmodule/xmodule => xmodule}/errortracker.py | 0 .../lib/xmodule/xmodule => xmodule}/exceptions.py | 0 {common/lib/xmodule/xmodule => xmodule}/fields.py | 0 {common/lib/xmodule/xmodule => xmodule}/graders.py | 0 .../xmodule/xmodule => xmodule}/hidden_module.py | 0 .../lib/xmodule/xmodule => xmodule}/html_checker.py | 0 .../lib/xmodule/xmodule => xmodule}/html_module.py | 0 .../js/RequireJS-namespace-undefine.js | 0 .../xmodule/xmodule => xmodule}/js/common_static | 0 .../js/fixtures/annotatable.html | 0 .../js/fixtures/checkbox_problem.html | 0 .../js/fixtures/codeinput_problem.html | 0 .../XXXXXXXXT114-V015600_0_.m3u8 | 0 .../XXXXXXXXT114-V015600_0_0.ts | Bin .../XXXXXXXXT114-V015600_0_1.ts | Bin .../XXXXXXXXT114-V015600_0_2.ts | Bin .../XXXXXXXXT114-V015600_1_.m3u8 | 0 .../XXXXXXXXT114-V015600_1_0.ts | Bin .../XXXXXXXXT114-V015600_1_1.ts | Bin .../XXXXXXXXT114-V015600_1_2.ts | Bin .../XXXXXXXXT114-V015600_2_.m3u8 | 0 .../XXXXXXXXT114-V015600_2_0.ts | Bin .../XXXXXXXXT114-V015600_2_1.ts | Bin .../XXXXXXXXT114-V015600_2_2.ts | Bin .../XXXXXXXXT114-V015600_3_.m3u8 | 0 .../XXXXXXXXT114-V015600_3_0.ts | Bin .../XXXXXXXXT114-V015600_3_1.ts | Bin .../XXXXXXXXT114-V015600_3_2.ts | Bin .../XXXXXXXXT114-V015600_4_.m3u8 | 0 .../XXXXXXXXT114-V015600_4_0.ts | Bin .../XXXXXXXXT114-V015600_4_1.ts | Bin .../XXXXXXXXT114-V015600_4_2.ts | Bin .../xmodule => xmodule}/js/fixtures/hls/hls.m3u8 | 0 .../js/fixtures/html-edit-visual.html | 0 .../js/fixtures/html-editor-raw.html | 0 .../xmodule => xmodule}/js/fixtures/imageinput.html | 0 .../js/fixtures/imageinput.underscore | 0 .../xmodule => xmodule}/js/fixtures/items.json | 0 .../js/fixtures/jsinput_problem.html | 0 .../xmodule => xmodule}/js/fixtures/lti.html | 0 .../js/fixtures/matlabinput_problem.html | 0 .../xmodule => xmodule}/js/fixtures/poster.jpg | Bin .../js/fixtures/problem-with-markdown.html | 0 .../js/fixtures/problem-without-markdown.html | 0 .../xmodule => xmodule}/js/fixtures/problem.html | 0 .../js/fixtures/problem_content.html | 0 .../js/fixtures/problem_content_1240.html | 0 .../js/fixtures/radiobutton_problem.html | 0 .../xmodule => xmodule}/js/fixtures/sequence.html | 0 .../js/fixtures/split_test_staff.html | 0 .../xmodule => xmodule}/js/fixtures/tabs-edit.html | 0 .../xmodule => xmodule}/js/fixtures/test.mp4 | Bin .../xmodule => xmodule}/js/fixtures/test.ogv | Bin .../xmodule => xmodule}/js/fixtures/test.webm | Bin .../xmodule => xmodule}/js/fixtures/video.html | 0 .../xmodule => xmodule}/js/fixtures/video_all.html | 0 .../js/fixtures/video_autoadvance.html | 0 .../js/fixtures/video_autoadvance_disabled.html | 0 .../xmodule => xmodule}/js/fixtures/video_hls.html | 0 .../js/fixtures/video_html5.html | 0 .../js/fixtures/video_no_captions.html | 0 .../js/fixtures/video_with_bumper.html | 0 .../js/fixtures/video_yt_multiple.html | 0 .../js/fixtures/youtube_iframe_api.js | 0 .../xmodule/xmodule => xmodule}/js/karma_runner.js | 0 .../xmodule => xmodule}/js/karma_runner_webpack.js | 0 .../xmodule => xmodule}/js/karma_xmodule.conf.js | 0 .../js/karma_xmodule_webpack.conf.js | 0 .../xmodule => xmodule}/js/libpeerconnection.log | 0 .../js/public/js/library_content_edit.js | 0 .../js/public/js/split_test_author_view.js | 0 .../js/public/js/split_test_staff.js | 0 .../js/public/js/split_test_student.js | 0 .../js/public/js/vertical_student_view.js | 0 .../js/spec/annotatable/display_spec.js | 0 .../js/spec/capa/display_spec.js | 0 .../js/spec/capa/imageinput_spec.js | 0 .../xmodule => xmodule}/js/spec/collapsible_spec.js | 0 .../xmodule/xmodule => xmodule}/js/spec/helper.js | 0 .../xmodule => xmodule}/js/spec/html/edit_spec.js | 0 .../xmodule => xmodule}/js/spec/main_requirejs.js | 0 .../js/spec/problem/edit_spec.js | 0 .../js/spec/problem/edit_spec_hint.js | 0 .../js/spec/sequence/display_spec.js | 0 .../js/spec/split_test/staff_view_spec.js | 0 .../xmodule => xmodule}/js/spec/tabs/edit.js | 0 .../xmodule => xmodule}/js/spec/time_spec.js | 0 .../js/spec/video/async_process_spec.js | 0 .../js/spec/video/completion_spec.js | 0 .../js/spec/video/events_spec.js | 0 .../js/spec/video/general_spec.js | 0 .../js/spec/video/html5_video_spec.js | 0 .../js/spec/video/initialize_spec.js | 0 .../js/spec/video/iterator_spec.js | 0 .../js/spec/video/resizer_spec.js | 0 .../xmodule => xmodule}/js/spec/video/sjson_spec.js | 0 .../js/spec/video/video_autoadvance_spec.js | 0 .../js/spec/video/video_bumper_spec.js | 0 .../js/spec/video/video_caption_spec.js | 0 .../js/spec/video/video_context_menu_spec.js | 0 .../js/spec/video/video_control_spec.js | 0 .../spec/video/video_events_bumper_plugin_spec.js | 0 .../js/spec/video/video_events_plugin_spec.js | 0 .../js/spec/video/video_focus_grabber_spec.js | 0 .../js/spec/video/video_full_screen_spec.js | 0 .../js/spec/video/video_play_pause_control_spec.js | 0 .../js/spec/video/video_play_placeholder_spec.js | 0 .../js/spec/video/video_play_skip_control_spec.js | 0 .../js/spec/video/video_player_spec.js | 0 .../js/spec/video/video_poster_spec.js | 0 .../js/spec/video/video_progress_slider_spec.js | 0 .../js/spec/video/video_quality_control_spec.js | 0 .../js/spec/video/video_save_state_plugin_spec.js | 0 .../js/spec/video/video_skip_control_spec.js | 0 .../js/spec/video/video_speed_control_spec.js | 0 .../js/spec/video/video_storage_spec.js | 0 .../js/spec/video/video_volume_control_spec.js | 0 .../xmodule => xmodule}/js/spec/video_helper.js | 0 .../xmodule => xmodule}/js/spec/xmodule_spec.js | 0 .../js/src/annotatable/display.js | 0 .../xmodule => xmodule}/js/src/capa/.gitignore | 0 .../xmodule => xmodule}/js/src/capa/display.js | 0 .../xmodule => xmodule}/js/src/capa/imageinput.js | 0 .../xmodule => xmodule}/js/src/capa/schematic.js | 0 .../xmodule => xmodule}/js/src/collapsible.js | 0 .../js/src/conditional/display.js | 0 .../js/src/discussion/display.js | 0 .../xmodule => xmodule}/js/src/html/display.js | 0 .../xmodule/xmodule => xmodule}/js/src/html/edit.js | 0 .../xmodule => xmodule}/js/src/html/imageModal.js | 0 .../xmodule => xmodule}/js/src/javascript_loader.js | 0 .../xmodule/xmodule => xmodule}/js/src/lti/lti.js | 0 .../xmodule => xmodule}/js/src/poll/.gitignore | 0 .../xmodule/xmodule => xmodule}/js/src/poll/poll.js | 0 .../xmodule => xmodule}/js/src/poll/poll_main.js | 0 .../xmodule => xmodule}/js/src/problem/.gitignore | 0 .../xmodule => xmodule}/js/src/problem/edit.js | 0 .../xmodule => xmodule}/js/src/raw/edit/json.js | 0 .../js/src/raw/edit/metadata-only.js | 0 .../xmodule => xmodule}/js/src/raw/edit/xml.js | 0 .../xmodule => xmodule}/js/src/sequence/display.js | 0 .../xmodule => xmodule}/js/src/sequence/edit.js | 0 .../js/src/tabs/tabs-aggregator.js | 0 .../lib/xmodule/xmodule => xmodule}/js/src/time.js | 0 .../xmodule => xmodule}/js/src/vertical/edit.js | 0 .../js/src/video/00_async_process.js | 0 .../js/src/video/00_component.js | 0 .../xmodule => xmodule}/js/src/video/00_i18n.js | 0 .../xmodule => xmodule}/js/src/video/00_iterator.js | 0 .../xmodule => xmodule}/js/src/video/00_resizer.js | 0 .../xmodule => xmodule}/js/src/video/00_sjson.js | 0 .../js/src/video/00_video_storage.js | 0 .../js/src/video/01_initialize.js | 0 .../js/src/video/025_focus_grabber.js | 0 .../js/src/video/02_html5_hls_video.js | 0 .../js/src/video/02_html5_video.js | 0 .../js/src/video/035_video_accessible_menu.js | 0 .../js/src/video/03_video_player.js | 0 .../js/src/video/04_video_control.js | 0 .../js/src/video/04_video_full_screen.js | 0 .../js/src/video/05_video_quality_control.js | 0 .../js/src/video/06_video_progress_slider.js | 0 .../js/src/video/07_video_volume_control.js | 0 .../js/src/video/08_video_auto_advance_control.js | 0 .../js/src/video/08_video_speed_control.js | 0 .../js/src/video/095_video_context_menu.js | 0 .../xmodule => xmodule}/js/src/video/09_bumper.js | 0 .../js/src/video/09_completion.js | 0 .../js/src/video/09_events_bumper_plugin.js | 0 .../js/src/video/09_events_plugin.js | 0 .../js/src/video/09_play_pause_control.js | 0 .../js/src/video/09_play_placeholder.js | 0 .../js/src/video/09_play_skip_control.js | 0 .../xmodule => xmodule}/js/src/video/09_poster.js | 0 .../js/src/video/09_save_state_plugin.js | 0 .../js/src/video/09_skip_control.js | 0 .../js/src/video/09_video_caption.js | 0 .../xmodule => xmodule}/js/src/video/10_commands.js | 0 .../xmodule => xmodule}/js/src/video/10_main.js | 0 .../xmodule/xmodule => xmodule}/js/src/xmodule.js | 0 .../xmodule => xmodule}/library_content_module.py | 0 .../xmodule => xmodule}/library_root_xblock.py | 0 .../xmodule => xmodule}/library_sourced_block.py | 0 .../xmodule/xmodule => xmodule}/library_tools.py | 0 .../lib/xmodule/xmodule => xmodule}/lti_2_util.py | 0 .../lib/xmodule/xmodule => xmodule}/lti_module.py | 0 .../lib/xmodule/xmodule => xmodule}/mako_module.py | 0 .../xmodule => xmodule}/modulestore/__init__.py | 0 .../xmodule => xmodule}/modulestore/django.py | 0 .../xmodule => xmodule}/modulestore/docs/index.rst | 0 .../modulestore/docs/mixedmodulestore.rst | 0 .../modulestore/docs/overview.rst | 0 .../modulestore/docs/split-mongo.rst | 0 .../xmodule => xmodule}/modulestore/draft.py | 0 .../modulestore/draft_and_published.py | 0 .../xmodule => xmodule}/modulestore/edit_info.py | 0 .../xmodule => xmodule}/modulestore/exceptions.py | 0 .../xmodule => xmodule}/modulestore/inheritance.py | 0 .../xmodule => xmodule}/modulestore/mixed.py | 0 .../modulestore/modulestore_settings.py | 0 .../modulestore/mongo/__init__.py | 0 .../xmodule => xmodule}/modulestore/mongo/base.py | 0 .../xmodule => xmodule}/modulestore/mongo/draft.py | 0 .../modulestore/mongoengine_fields.py | 0 .../modulestore/perf_tests/__init__.py | 0 .../modulestore/perf_tests/generate_asset_xml.py | 0 .../modulestore/perf_tests/generate_report.py | 0 .../perf_tests/test_asset_import_export.py | 0 .../xmodule => xmodule}/modulestore/search.py | 0 .../modulestore/split_migrator.py | 0 .../modulestore/split_mongo/__init__.py | 0 .../split_mongo/caching_descriptor_system.py | 0 .../split_mongo/definition_lazy_loader.py | 0 .../modulestore/split_mongo/id_manager.py | 0 .../modulestore/split_mongo/mongo_connection.py | 0 .../modulestore/split_mongo/split.py | 0 .../modulestore/split_mongo/split_draft.py | 0 .../modulestore/split_mongo/split_mongo_kvs.py | 0 .../modulestore/store_utilities.py | 0 .../modulestore/tests/__init__.py | 0 .../modulestore/tests/django_utils.py | 0 .../modulestore/tests/factories.py | 0 .../modulestore/tests/mongo_connection.py | 0 .../modulestore/tests/sample_courses.py | 0 .../modulestore/tests/test_abstraction.py | 0 .../modulestore/tests/test_asides.py | 0 .../modulestore/tests/test_assetstore.py | 0 .../modulestore/tests/test_contentstore.py | 0 .../tests/test_cross_modulestore_import_export.py | 0 .../modulestore/tests/test_inheritance.py | 0 .../modulestore/tests/test_libraries.py | 0 .../modulestore/tests/test_mixed_modulestore.py | 0 .../modulestore/tests/test_modulestore.py | 0 .../modulestore/tests/test_modulestore_settings.py | 0 .../modulestore/tests/test_mongo.py | 0 .../modulestore/tests/test_mongo_call_count.py | 0 .../modulestore/tests/test_publish.py | 0 .../modulestore/tests/test_semantics.py | 0 .../tests/test_split_copy_from_template.py | 0 .../modulestore/tests/test_split_migrator.py | 0 .../modulestore/tests/test_split_modulestore.py | 0 .../tests/test_split_modulestore_bulk_operations.py | 0 .../tests/test_split_mongo_mongo_connection.py | 0 .../modulestore/tests/test_split_w_old_mongo.py | 0 .../modulestore/tests/test_store_utilities.py | 0 .../modulestore/tests/test_xml.py | 0 .../modulestore/tests/test_xml_importer.py | 0 .../xmodule => xmodule}/modulestore/tests/utils.py | 0 .../xmodule/xmodule => xmodule}/modulestore/xml.py | 0 .../xmodule => xmodule}/modulestore/xml_exporter.py | 0 .../xmodule => xmodule}/modulestore/xml_importer.py | 0 .../lib/xmodule/xmodule => xmodule}/mongo_utils.py | 0 .../xmodule => xmodule}/partitions/__init__.py | 0 .../enrollment_track_partition_generator.py | 0 .../xmodule => xmodule}/partitions/partitions.py | 0 .../partitions/partitions_service.py | 0 .../partitions/tests/__init__.py | 0 .../partitions/tests/test_partitions.py | 0 .../lib/xmodule/xmodule => xmodule}/poll_module.py | 0 {common/lib/xmodule/xmodule => xmodule}/progress.py | 0 .../xmodule/xmodule => xmodule}/randomize_module.py | 0 .../lib/xmodule/xmodule => xmodule}/raw_module.py | 0 .../lib/xmodule/xmodule => xmodule}/seq_module.py | 0 {common/lib/xmodule/xmodule => xmodule}/services.py | 0 .../xmodule => xmodule}/split_test_module.py | 0 .../xmodule/xmodule => xmodule}/static_content.py | 0 .../lib/xmodule/xmodule => xmodule}/stringify.py | 0 .../xmodule/xmodule => xmodule}/studio_editable.py | 0 {common/lib/xmodule/xmodule => xmodule}/tabs.py | 0 .../xmodule/xmodule => xmodule}/template_module.py | 0 .../lib/xmodule/xmodule => xmodule}/templates.py | 0 .../templates/about/overview.yaml | 0 .../templates/html/announcement.yaml | 0 .../templates/html/anon_user_id.yaml | 0 .../xmodule => xmodule}/templates/html/iframe.yaml | 0 .../templates/html/latex_html.yaml | 0 .../xmodule => xmodule}/templates/html/raw.yaml | 0 .../templates/html/zooming_image.yaml | 0 .../library-sourced-block-studio-view.html | 0 .../templates/problem/blank_common.yaml | 0 .../templates/problem/checkboxes_response.yaml | 0 .../templates/problem/checkboxes_response_hint.yaml | 0 .../templates/problem/circuitschematic.yaml | 0 .../templates/problem/customgrader.yaml | 0 .../templates/problem/drag_and_drop.yaml | 0 .../templates/problem/formularesponse.yaml | 0 .../templates/problem/imageresponse.yaml | 0 .../templates/problem/jsinput_response.yaml | 0 .../templates/problem/latex_problem.yaml | 0 .../templates/problem/multiplechoice.yaml | 0 .../templates/problem/multiplechoice_hint.yaml | 0 .../templates/problem/numericalresponse.yaml | 0 .../templates/problem/numericalresponse_hint.yaml | 0 .../templates/problem/optionresponse.yaml | 0 .../templates/problem/optionresponse_hint.yaml | 0 .../templates/problem/problem_with_hint.yaml | 0 .../problem/problem_with_hint_in_latex.yaml | 0 .../templates/problem/string_response.yaml | 0 .../templates/problem/string_response_hint.yaml | 0 .../templates/test/announcement.yaml | 0 .../templates/test/anon_user_id.yaml | 0 .../templates/test/latex_html.yaml | 0 .../templates/test/somefile.notyaml | 0 .../templates/test/zooming_image.yaml | 0 .../xmodule/xmodule => xmodule}/tests/__init__.py | 0 .../xmodule => xmodule}/tests/data/xml-course-root | 0 .../xmodule/xmodule => xmodule}/tests/helpers.py | 0 .../xmodule => xmodule}/tests/rendering/__init__.py | 0 .../xmodule => xmodule}/tests/rendering/core.py | 0 .../tests/test_annotatable_module.py | 0 .../tests/test_annotator_mixin.py | 0 .../xmodule => xmodule}/tests/test_capa_module.py | 0 .../xmodule => xmodule}/tests/test_conditional.py | 0 .../xmodule => xmodule}/tests/test_content.py | 0 .../tests/test_course_metadata_utils.py | 0 .../xmodule => xmodule}/tests/test_course_module.py | 0 .../tests/test_delay_between_attempts.py | 0 .../tests/test_editing_module.py | 0 .../xmodule => xmodule}/tests/test_error_module.py | 0 .../xmodule => xmodule}/tests/test_export.py | 0 .../xmodule => xmodule}/tests/test_fields.py | 0 .../tests/test_files/test_tabseditingdescriptor.css | 0 .../test_files/test_tabseditingdescriptor.scss | 0 .../xmodule => xmodule}/tests/test_graders.py | 0 .../xmodule => xmodule}/tests/test_html_module.py | 0 .../xmodule => xmodule}/tests/test_import.py | 0 .../xmodule => xmodule}/tests/test_import_static.py | 0 .../tests/test_library_content.py | 0 .../xmodule => xmodule}/tests/test_library_root.py | 0 .../tests/test_library_sourced_block.py | 0 .../xmodule => xmodule}/tests/test_library_tools.py | 0 .../xmodule => xmodule}/tests/test_lti20_unit.py | 0 .../xmodule => xmodule}/tests/test_lti_unit.py | 0 .../xmodule => xmodule}/tests/test_mako_module.py | 0 .../xmodule => xmodule}/tests/test_mongo_utils.py | 0 .../xmodule/xmodule => xmodule}/tests/test_poll.py | 0 .../xmodule => xmodule}/tests/test_progress.py | 0 .../tests/test_randomize_module.py | 0 .../tests/test_resource_templates.py | 0 .../xmodule => xmodule}/tests/test_sequence.py | 0 .../xmodule => xmodule}/tests/test_services.py | 0 .../tests/test_split_test_module.py | 0 .../xmodule => xmodule}/tests/test_stringify.py | 0 .../tests/test_studio_editable.py | 0 .../xmodule => xmodule}/tests/test_unit_block.py | 0 .../xmodule => xmodule}/tests/test_util_duedate.py | 0 .../xmodule => xmodule}/tests/test_utils_django.py | 0 .../tests/test_utils_escape_html_characters.py | 0 .../xmodule => xmodule}/tests/test_validation.py | 0 .../xmodule => xmodule}/tests/test_vertical.py | 0 .../xmodule/xmodule => xmodule}/tests/test_video.py | 0 .../xmodule => xmodule}/tests/test_word_cloud.py | 0 .../xmodule => xmodule}/tests/test_xml_module.py | 0 .../xmodule => xmodule}/tests/xml/__init__.py | 0 .../xmodule => xmodule}/tests/xml/factories.py | 0 .../tests/xml/test_inheritance.py | 0 .../xmodule => xmodule}/tests/xml/test_policy.py | 0 {common/lib/xmodule/xmodule => xmodule}/timeinfo.py | 0 .../lib/xmodule/xmodule => xmodule}/unit_block.py | 0 .../xmodule/xmodule => xmodule}/util/__init__.py | 0 .../lib/xmodule/xmodule => xmodule}/util/duedate.py | 0 .../lib/xmodule/xmodule => xmodule}/util/misc.py | 0 .../xmodule/xmodule => xmodule}/util/sandboxing.py | 0 .../xmodule => xmodule}/util/xmodule_django.py | 0 .../lib/xmodule/xmodule => xmodule}/validation.py | 0 .../xmodule/xmodule => xmodule}/vertical_block.py | 0 .../xmodule => xmodule}/video_module/__init__.py | 0 .../video_module/bumper_utils.py | 0 .../video_module/transcripts_utils.py | 0 .../video_module/video_handlers.py | 0 .../video_module/video_module.py | 0 .../xmodule => xmodule}/video_module/video_utils.py | 0 .../video_module/video_xfields.py | 0 .../xmodule => xmodule}/word_cloud_module.py | 0 .../xmodule/xmodule => xmodule}/wrapper_module.py | 0 {common/lib/xmodule/xmodule => xmodule}/x_module.py | 0 .../lib/xmodule/xmodule => xmodule}/xml_module.py | 0 432 files changed, 0 insertions(+), 0 deletions(-) rename {common/lib/xmodule/xmodule => xmodule}/README.rst (100%) rename {common/lib/xmodule/xmodule => xmodule}/__init__.py (100%) rename {common/lib/xmodule/xmodule => xmodule}/annotatable_module.py (100%) rename {common/lib/xmodule/xmodule => xmodule}/annotator_mixin.py (100%) rename {common/lib/xmodule/xmodule => xmodule}/assets/library_content/public/js/library_content_edit.js (100%) rename {common/lib/xmodule/xmodule => xmodule}/assets/library_source_block/LibrarySourcedBlockPicker.jsx (100%) rename {common/lib/xmodule/xmodule => xmodule}/assets/library_source_block/public/js/library_source_block.js (100%) rename {common/lib/xmodule/xmodule => xmodule}/assets/library_source_block/style.css (100%) rename {common/lib/xmodule/xmodule => xmodule}/assets/split_test/public/js/split_test_author_view.js (100%) rename {common/lib/xmodule/xmodule => xmodule}/assets/split_test/public/js/split_test_staff.js (100%) rename {common/lib/xmodule/xmodule => xmodule}/assets/split_test/public/js/split_test_student.js (100%) rename {common/lib/xmodule/xmodule => xmodule}/assets/vertical/public/js/vertical_student_view.js (100%) rename {common/lib/xmodule/xmodule => xmodule}/assets/word_cloud/.eslintrc.js (100%) rename {common/lib/xmodule/xmodule => xmodule}/assets/word_cloud/.gitignore (100%) rename {common/lib/xmodule/xmodule => xmodule}/assets/word_cloud/src/js/d3.layout.cloud.js (100%) rename {common/lib/xmodule/xmodule => xmodule}/assets/word_cloud/src/js/d3.min.js (100%) rename {common/lib/xmodule/xmodule => xmodule}/assets/word_cloud/src/js/word_cloud.js (100%) rename {common/lib/xmodule/xmodule => xmodule}/assets/word_cloud/src/js/word_cloud_main.js (100%) rename {common/lib/xmodule/xmodule => xmodule}/assets/word_cloud/webpack.config.js (100%) rename {common/lib/xmodule/xmodule => xmodule}/assetstore/__init__.py (100%) rename {common/lib/xmodule/xmodule => xmodule}/assetstore/assetmgr.py (100%) rename {common/lib/xmodule/xmodule => xmodule}/assetstore/tests/__init__.py (100%) rename {common/lib/xmodule/xmodule => xmodule}/assetstore/tests/assets.xsd (100%) rename {common/lib/xmodule/xmodule => xmodule}/assetstore/tests/test_asset_xml.py (100%) rename {common/lib/xmodule/xmodule => xmodule}/block_metadata_utils.py (100%) rename {common/lib/xmodule/xmodule => xmodule}/capa_module.py (100%) rename {common/lib/xmodule/xmodule => xmodule}/conditional_module.py (100%) rename {common/lib/xmodule/xmodule => xmodule}/contentstore/__init__.py (100%) rename {common/lib/xmodule/xmodule => xmodule}/contentstore/content.py (100%) rename {common/lib/xmodule/xmodule => xmodule}/contentstore/django.py (100%) rename {common/lib/xmodule/xmodule => xmodule}/contentstore/mongo.py (100%) rename {common/lib/xmodule/xmodule => xmodule}/contentstore/utils.py (100%) rename {common/lib/xmodule/xmodule => xmodule}/course_metadata_utils.py (100%) rename {common/lib/xmodule/xmodule => xmodule}/course_module.py (100%) rename {common/lib/xmodule/xmodule => xmodule}/css/annotatable/display.scss (100%) rename {common/lib/xmodule/xmodule => xmodule}/css/capa/display.scss (100%) rename {common/lib/xmodule/xmodule => xmodule}/css/codemirror/codemirror.scss (100%) rename {common/lib/xmodule/xmodule => xmodule}/css/editor/edit.scss (100%) rename {common/lib/xmodule/xmodule => xmodule}/css/html/display.scss (100%) rename {common/lib/xmodule/xmodule => xmodule}/css/html/edit.scss (100%) rename {common/lib/xmodule/xmodule => xmodule}/css/lti/lti.scss (100%) rename {common/lib/xmodule/xmodule => xmodule}/css/poll/display.scss (100%) rename {common/lib/xmodule/xmodule => xmodule}/css/problem/edit.scss (100%) rename {common/lib/xmodule/xmodule => xmodule}/css/sequence/display.scss (100%) rename {common/lib/xmodule/xmodule => xmodule}/css/tabs/codemirror.scss (100%) rename {common/lib/xmodule/xmodule => xmodule}/css/tabs/tabs.scss (100%) rename {common/lib/xmodule/xmodule => xmodule}/css/video/accessible_menu.scss (100%) rename {common/lib/xmodule/xmodule => xmodule}/css/video/display.scss (100%) rename {common/lib/xmodule/xmodule => xmodule}/css/word_cloud/display.scss (100%) rename {common/lib/xmodule/xmodule => xmodule}/data.py (100%) rename {common/lib/xmodule/xmodule => xmodule}/docs/decisions/0001-move-due-dates-to-db.rst (100%) rename {common/lib/xmodule/xmodule => xmodule}/docs/decisions/0002-remove-mongodb-dependency.rst (100%) rename {common/lib/xmodule/xmodule => xmodule}/editing_module.py (100%) rename {common/lib/xmodule/xmodule => xmodule}/edxnotes_utils.py (100%) rename {common/lib/xmodule/xmodule => xmodule}/error_module.py (100%) rename {common/lib/xmodule/xmodule => xmodule}/errortracker.py (100%) rename {common/lib/xmodule/xmodule => xmodule}/exceptions.py (100%) rename {common/lib/xmodule/xmodule => xmodule}/fields.py (100%) rename {common/lib/xmodule/xmodule => xmodule}/graders.py (100%) rename {common/lib/xmodule/xmodule => xmodule}/hidden_module.py (100%) rename {common/lib/xmodule/xmodule => xmodule}/html_checker.py (100%) rename {common/lib/xmodule/xmodule => xmodule}/html_module.py (100%) rename {common/lib/xmodule/xmodule => xmodule}/js/RequireJS-namespace-undefine.js (100%) rename {common/lib/xmodule/xmodule => xmodule}/js/common_static (100%) rename {common/lib/xmodule/xmodule => xmodule}/js/fixtures/annotatable.html (100%) rename {common/lib/xmodule/xmodule => xmodule}/js/fixtures/checkbox_problem.html (100%) rename {common/lib/xmodule/xmodule => xmodule}/js/fixtures/codeinput_problem.html (100%) rename {common/lib/xmodule/xmodule => xmodule}/js/fixtures/hls/XXXXXXXXT114-V015600_0_/XXXXXXXXT114-V015600_0_.m3u8 (100%) rename {common/lib/xmodule/xmodule => xmodule}/js/fixtures/hls/XXXXXXXXT114-V015600_0_/XXXXXXXXT114-V015600_0_0.ts (100%) rename {common/lib/xmodule/xmodule => xmodule}/js/fixtures/hls/XXXXXXXXT114-V015600_0_/XXXXXXXXT114-V015600_0_1.ts (100%) rename {common/lib/xmodule/xmodule => xmodule}/js/fixtures/hls/XXXXXXXXT114-V015600_0_/XXXXXXXXT114-V015600_0_2.ts (100%) rename {common/lib/xmodule/xmodule => xmodule}/js/fixtures/hls/XXXXXXXXT114-V015600_1_/XXXXXXXXT114-V015600_1_.m3u8 (100%) rename {common/lib/xmodule/xmodule => xmodule}/js/fixtures/hls/XXXXXXXXT114-V015600_1_/XXXXXXXXT114-V015600_1_0.ts (100%) rename {common/lib/xmodule/xmodule => xmodule}/js/fixtures/hls/XXXXXXXXT114-V015600_1_/XXXXXXXXT114-V015600_1_1.ts (100%) rename {common/lib/xmodule/xmodule => xmodule}/js/fixtures/hls/XXXXXXXXT114-V015600_1_/XXXXXXXXT114-V015600_1_2.ts (100%) rename {common/lib/xmodule/xmodule => xmodule}/js/fixtures/hls/XXXXXXXXT114-V015600_2_/XXXXXXXXT114-V015600_2_.m3u8 (100%) rename {common/lib/xmodule/xmodule => xmodule}/js/fixtures/hls/XXXXXXXXT114-V015600_2_/XXXXXXXXT114-V015600_2_0.ts (100%) rename {common/lib/xmodule/xmodule => xmodule}/js/fixtures/hls/XXXXXXXXT114-V015600_2_/XXXXXXXXT114-V015600_2_1.ts (100%) rename {common/lib/xmodule/xmodule => xmodule}/js/fixtures/hls/XXXXXXXXT114-V015600_2_/XXXXXXXXT114-V015600_2_2.ts (100%) rename {common/lib/xmodule/xmodule => xmodule}/js/fixtures/hls/XXXXXXXXT114-V015600_3_/XXXXXXXXT114-V015600_3_.m3u8 (100%) rename {common/lib/xmodule/xmodule => xmodule}/js/fixtures/hls/XXXXXXXXT114-V015600_3_/XXXXXXXXT114-V015600_3_0.ts (100%) rename {common/lib/xmodule/xmodule => xmodule}/js/fixtures/hls/XXXXXXXXT114-V015600_3_/XXXXXXXXT114-V015600_3_1.ts (100%) rename {common/lib/xmodule/xmodule => xmodule}/js/fixtures/hls/XXXXXXXXT114-V015600_3_/XXXXXXXXT114-V015600_3_2.ts (100%) rename {common/lib/xmodule/xmodule => xmodule}/js/fixtures/hls/XXXXXXXXT114-V015600_4_/XXXXXXXXT114-V015600_4_.m3u8 (100%) rename {common/lib/xmodule/xmodule => xmodule}/js/fixtures/hls/XXXXXXXXT114-V015600_4_/XXXXXXXXT114-V015600_4_0.ts (100%) rename {common/lib/xmodule/xmodule => xmodule}/js/fixtures/hls/XXXXXXXXT114-V015600_4_/XXXXXXXXT114-V015600_4_1.ts (100%) rename {common/lib/xmodule/xmodule => xmodule}/js/fixtures/hls/XXXXXXXXT114-V015600_4_/XXXXXXXXT114-V015600_4_2.ts (100%) rename {common/lib/xmodule/xmodule => xmodule}/js/fixtures/hls/hls.m3u8 (100%) rename {common/lib/xmodule/xmodule => xmodule}/js/fixtures/html-edit-visual.html (100%) rename {common/lib/xmodule/xmodule => xmodule}/js/fixtures/html-editor-raw.html (100%) rename {common/lib/xmodule/xmodule => xmodule}/js/fixtures/imageinput.html (100%) rename {common/lib/xmodule/xmodule => xmodule}/js/fixtures/imageinput.underscore (100%) rename {common/lib/xmodule/xmodule => xmodule}/js/fixtures/items.json (100%) rename {common/lib/xmodule/xmodule => xmodule}/js/fixtures/jsinput_problem.html (100%) rename {common/lib/xmodule/xmodule => xmodule}/js/fixtures/lti.html (100%) rename {common/lib/xmodule/xmodule => xmodule}/js/fixtures/matlabinput_problem.html (100%) rename {common/lib/xmodule/xmodule => xmodule}/js/fixtures/poster.jpg (100%) rename {common/lib/xmodule/xmodule => xmodule}/js/fixtures/problem-with-markdown.html (100%) rename {common/lib/xmodule/xmodule => xmodule}/js/fixtures/problem-without-markdown.html (100%) rename {common/lib/xmodule/xmodule => xmodule}/js/fixtures/problem.html (100%) rename {common/lib/xmodule/xmodule => xmodule}/js/fixtures/problem_content.html (100%) rename {common/lib/xmodule/xmodule => xmodule}/js/fixtures/problem_content_1240.html (100%) rename {common/lib/xmodule/xmodule => xmodule}/js/fixtures/radiobutton_problem.html (100%) rename {common/lib/xmodule/xmodule => xmodule}/js/fixtures/sequence.html (100%) rename {common/lib/xmodule/xmodule => xmodule}/js/fixtures/split_test_staff.html (100%) rename {common/lib/xmodule/xmodule => xmodule}/js/fixtures/tabs-edit.html (100%) rename {common/lib/xmodule/xmodule => xmodule}/js/fixtures/test.mp4 (100%) rename {common/lib/xmodule/xmodule => xmodule}/js/fixtures/test.ogv (100%) rename {common/lib/xmodule/xmodule => xmodule}/js/fixtures/test.webm (100%) rename {common/lib/xmodule/xmodule => xmodule}/js/fixtures/video.html (100%) rename {common/lib/xmodule/xmodule => xmodule}/js/fixtures/video_all.html (100%) rename {common/lib/xmodule/xmodule => xmodule}/js/fixtures/video_autoadvance.html (100%) rename {common/lib/xmodule/xmodule => xmodule}/js/fixtures/video_autoadvance_disabled.html (100%) rename {common/lib/xmodule/xmodule => xmodule}/js/fixtures/video_hls.html (100%) rename {common/lib/xmodule/xmodule => xmodule}/js/fixtures/video_html5.html (100%) rename {common/lib/xmodule/xmodule => xmodule}/js/fixtures/video_no_captions.html (100%) rename {common/lib/xmodule/xmodule => xmodule}/js/fixtures/video_with_bumper.html (100%) rename {common/lib/xmodule/xmodule => xmodule}/js/fixtures/video_yt_multiple.html (100%) rename {common/lib/xmodule/xmodule => xmodule}/js/fixtures/youtube_iframe_api.js (100%) rename {common/lib/xmodule/xmodule => xmodule}/js/karma_runner.js (100%) rename {common/lib/xmodule/xmodule => xmodule}/js/karma_runner_webpack.js (100%) rename {common/lib/xmodule/xmodule => xmodule}/js/karma_xmodule.conf.js (100%) rename {common/lib/xmodule/xmodule => xmodule}/js/karma_xmodule_webpack.conf.js (100%) rename {common/lib/xmodule/xmodule => xmodule}/js/libpeerconnection.log (100%) rename {common/lib/xmodule/xmodule => xmodule}/js/public/js/library_content_edit.js (100%) rename {common/lib/xmodule/xmodule => xmodule}/js/public/js/split_test_author_view.js (100%) rename {common/lib/xmodule/xmodule => xmodule}/js/public/js/split_test_staff.js (100%) rename {common/lib/xmodule/xmodule => xmodule}/js/public/js/split_test_student.js (100%) rename {common/lib/xmodule/xmodule => xmodule}/js/public/js/vertical_student_view.js (100%) rename {common/lib/xmodule/xmodule => xmodule}/js/spec/annotatable/display_spec.js (100%) rename {common/lib/xmodule/xmodule => xmodule}/js/spec/capa/display_spec.js (100%) rename {common/lib/xmodule/xmodule => xmodule}/js/spec/capa/imageinput_spec.js (100%) rename {common/lib/xmodule/xmodule => xmodule}/js/spec/collapsible_spec.js (100%) rename {common/lib/xmodule/xmodule => xmodule}/js/spec/helper.js (100%) rename {common/lib/xmodule/xmodule => xmodule}/js/spec/html/edit_spec.js (100%) rename {common/lib/xmodule/xmodule => xmodule}/js/spec/main_requirejs.js (100%) rename {common/lib/xmodule/xmodule => xmodule}/js/spec/problem/edit_spec.js (100%) rename {common/lib/xmodule/xmodule => xmodule}/js/spec/problem/edit_spec_hint.js (100%) rename {common/lib/xmodule/xmodule => xmodule}/js/spec/sequence/display_spec.js (100%) rename {common/lib/xmodule/xmodule => xmodule}/js/spec/split_test/staff_view_spec.js (100%) rename {common/lib/xmodule/xmodule => xmodule}/js/spec/tabs/edit.js (100%) rename {common/lib/xmodule/xmodule => xmodule}/js/spec/time_spec.js (100%) rename {common/lib/xmodule/xmodule => xmodule}/js/spec/video/async_process_spec.js (100%) rename {common/lib/xmodule/xmodule => xmodule}/js/spec/video/completion_spec.js (100%) rename {common/lib/xmodule/xmodule => xmodule}/js/spec/video/events_spec.js (100%) rename {common/lib/xmodule/xmodule => xmodule}/js/spec/video/general_spec.js (100%) rename {common/lib/xmodule/xmodule => xmodule}/js/spec/video/html5_video_spec.js (100%) rename {common/lib/xmodule/xmodule => xmodule}/js/spec/video/initialize_spec.js (100%) rename {common/lib/xmodule/xmodule => xmodule}/js/spec/video/iterator_spec.js (100%) rename {common/lib/xmodule/xmodule => xmodule}/js/spec/video/resizer_spec.js (100%) rename {common/lib/xmodule/xmodule => xmodule}/js/spec/video/sjson_spec.js (100%) rename {common/lib/xmodule/xmodule => xmodule}/js/spec/video/video_autoadvance_spec.js (100%) rename {common/lib/xmodule/xmodule => xmodule}/js/spec/video/video_bumper_spec.js (100%) rename {common/lib/xmodule/xmodule => xmodule}/js/spec/video/video_caption_spec.js (100%) rename {common/lib/xmodule/xmodule => xmodule}/js/spec/video/video_context_menu_spec.js (100%) rename {common/lib/xmodule/xmodule => xmodule}/js/spec/video/video_control_spec.js (100%) rename {common/lib/xmodule/xmodule => xmodule}/js/spec/video/video_events_bumper_plugin_spec.js (100%) rename {common/lib/xmodule/xmodule => xmodule}/js/spec/video/video_events_plugin_spec.js (100%) rename {common/lib/xmodule/xmodule => xmodule}/js/spec/video/video_focus_grabber_spec.js (100%) rename {common/lib/xmodule/xmodule => xmodule}/js/spec/video/video_full_screen_spec.js (100%) rename {common/lib/xmodule/xmodule => xmodule}/js/spec/video/video_play_pause_control_spec.js (100%) rename {common/lib/xmodule/xmodule => xmodule}/js/spec/video/video_play_placeholder_spec.js (100%) rename {common/lib/xmodule/xmodule => xmodule}/js/spec/video/video_play_skip_control_spec.js (100%) rename {common/lib/xmodule/xmodule => xmodule}/js/spec/video/video_player_spec.js (100%) rename {common/lib/xmodule/xmodule => xmodule}/js/spec/video/video_poster_spec.js (100%) rename {common/lib/xmodule/xmodule => xmodule}/js/spec/video/video_progress_slider_spec.js (100%) rename {common/lib/xmodule/xmodule => xmodule}/js/spec/video/video_quality_control_spec.js (100%) rename {common/lib/xmodule/xmodule => xmodule}/js/spec/video/video_save_state_plugin_spec.js (100%) rename {common/lib/xmodule/xmodule => xmodule}/js/spec/video/video_skip_control_spec.js (100%) rename {common/lib/xmodule/xmodule => xmodule}/js/spec/video/video_speed_control_spec.js (100%) rename {common/lib/xmodule/xmodule => xmodule}/js/spec/video/video_storage_spec.js (100%) rename {common/lib/xmodule/xmodule => xmodule}/js/spec/video/video_volume_control_spec.js (100%) rename {common/lib/xmodule/xmodule => xmodule}/js/spec/video_helper.js (100%) rename {common/lib/xmodule/xmodule => xmodule}/js/spec/xmodule_spec.js (100%) rename {common/lib/xmodule/xmodule => xmodule}/js/src/annotatable/display.js (100%) rename {common/lib/xmodule/xmodule => xmodule}/js/src/capa/.gitignore (100%) rename {common/lib/xmodule/xmodule => xmodule}/js/src/capa/display.js (100%) rename {common/lib/xmodule/xmodule => xmodule}/js/src/capa/imageinput.js (100%) rename {common/lib/xmodule/xmodule => xmodule}/js/src/capa/schematic.js (100%) rename {common/lib/xmodule/xmodule => xmodule}/js/src/collapsible.js (100%) rename {common/lib/xmodule/xmodule => xmodule}/js/src/conditional/display.js (100%) rename {common/lib/xmodule/xmodule => xmodule}/js/src/discussion/display.js (100%) rename {common/lib/xmodule/xmodule => xmodule}/js/src/html/display.js (100%) rename {common/lib/xmodule/xmodule => xmodule}/js/src/html/edit.js (100%) rename {common/lib/xmodule/xmodule => xmodule}/js/src/html/imageModal.js (100%) rename {common/lib/xmodule/xmodule => xmodule}/js/src/javascript_loader.js (100%) rename {common/lib/xmodule/xmodule => xmodule}/js/src/lti/lti.js (100%) rename {common/lib/xmodule/xmodule => xmodule}/js/src/poll/.gitignore (100%) rename {common/lib/xmodule/xmodule => xmodule}/js/src/poll/poll.js (100%) rename {common/lib/xmodule/xmodule => xmodule}/js/src/poll/poll_main.js (100%) rename {common/lib/xmodule/xmodule => xmodule}/js/src/problem/.gitignore (100%) rename {common/lib/xmodule/xmodule => xmodule}/js/src/problem/edit.js (100%) rename {common/lib/xmodule/xmodule => xmodule}/js/src/raw/edit/json.js (100%) rename {common/lib/xmodule/xmodule => xmodule}/js/src/raw/edit/metadata-only.js (100%) rename {common/lib/xmodule/xmodule => xmodule}/js/src/raw/edit/xml.js (100%) rename {common/lib/xmodule/xmodule => xmodule}/js/src/sequence/display.js (100%) rename {common/lib/xmodule/xmodule => xmodule}/js/src/sequence/edit.js (100%) rename {common/lib/xmodule/xmodule => xmodule}/js/src/tabs/tabs-aggregator.js (100%) rename {common/lib/xmodule/xmodule => xmodule}/js/src/time.js (100%) rename {common/lib/xmodule/xmodule => xmodule}/js/src/vertical/edit.js (100%) rename {common/lib/xmodule/xmodule => xmodule}/js/src/video/00_async_process.js (100%) rename {common/lib/xmodule/xmodule => xmodule}/js/src/video/00_component.js (100%) rename {common/lib/xmodule/xmodule => xmodule}/js/src/video/00_i18n.js (100%) rename {common/lib/xmodule/xmodule => xmodule}/js/src/video/00_iterator.js (100%) rename {common/lib/xmodule/xmodule => xmodule}/js/src/video/00_resizer.js (100%) rename {common/lib/xmodule/xmodule => xmodule}/js/src/video/00_sjson.js (100%) rename {common/lib/xmodule/xmodule => xmodule}/js/src/video/00_video_storage.js (100%) rename {common/lib/xmodule/xmodule => xmodule}/js/src/video/01_initialize.js (100%) rename {common/lib/xmodule/xmodule => xmodule}/js/src/video/025_focus_grabber.js (100%) rename {common/lib/xmodule/xmodule => xmodule}/js/src/video/02_html5_hls_video.js (100%) rename {common/lib/xmodule/xmodule => xmodule}/js/src/video/02_html5_video.js (100%) rename {common/lib/xmodule/xmodule => xmodule}/js/src/video/035_video_accessible_menu.js (100%) rename {common/lib/xmodule/xmodule => xmodule}/js/src/video/03_video_player.js (100%) rename {common/lib/xmodule/xmodule => xmodule}/js/src/video/04_video_control.js (100%) rename {common/lib/xmodule/xmodule => xmodule}/js/src/video/04_video_full_screen.js (100%) rename {common/lib/xmodule/xmodule => xmodule}/js/src/video/05_video_quality_control.js (100%) rename {common/lib/xmodule/xmodule => xmodule}/js/src/video/06_video_progress_slider.js (100%) rename {common/lib/xmodule/xmodule => xmodule}/js/src/video/07_video_volume_control.js (100%) rename {common/lib/xmodule/xmodule => xmodule}/js/src/video/08_video_auto_advance_control.js (100%) rename {common/lib/xmodule/xmodule => xmodule}/js/src/video/08_video_speed_control.js (100%) rename {common/lib/xmodule/xmodule => xmodule}/js/src/video/095_video_context_menu.js (100%) rename {common/lib/xmodule/xmodule => xmodule}/js/src/video/09_bumper.js (100%) rename {common/lib/xmodule/xmodule => xmodule}/js/src/video/09_completion.js (100%) rename {common/lib/xmodule/xmodule => xmodule}/js/src/video/09_events_bumper_plugin.js (100%) rename {common/lib/xmodule/xmodule => xmodule}/js/src/video/09_events_plugin.js (100%) rename {common/lib/xmodule/xmodule => xmodule}/js/src/video/09_play_pause_control.js (100%) rename {common/lib/xmodule/xmodule => xmodule}/js/src/video/09_play_placeholder.js (100%) rename {common/lib/xmodule/xmodule => xmodule}/js/src/video/09_play_skip_control.js (100%) rename {common/lib/xmodule/xmodule => xmodule}/js/src/video/09_poster.js (100%) rename {common/lib/xmodule/xmodule => xmodule}/js/src/video/09_save_state_plugin.js (100%) rename {common/lib/xmodule/xmodule => xmodule}/js/src/video/09_skip_control.js (100%) rename {common/lib/xmodule/xmodule => xmodule}/js/src/video/09_video_caption.js (100%) rename {common/lib/xmodule/xmodule => xmodule}/js/src/video/10_commands.js (100%) rename {common/lib/xmodule/xmodule => xmodule}/js/src/video/10_main.js (100%) rename {common/lib/xmodule/xmodule => xmodule}/js/src/xmodule.js (100%) rename {common/lib/xmodule/xmodule => xmodule}/library_content_module.py (100%) rename {common/lib/xmodule/xmodule => xmodule}/library_root_xblock.py (100%) rename {common/lib/xmodule/xmodule => xmodule}/library_sourced_block.py (100%) rename {common/lib/xmodule/xmodule => xmodule}/library_tools.py (100%) rename {common/lib/xmodule/xmodule => xmodule}/lti_2_util.py (100%) rename {common/lib/xmodule/xmodule => xmodule}/lti_module.py (100%) rename {common/lib/xmodule/xmodule => xmodule}/mako_module.py (100%) rename {common/lib/xmodule/xmodule => xmodule}/modulestore/__init__.py (100%) rename {common/lib/xmodule/xmodule => xmodule}/modulestore/django.py (100%) rename {common/lib/xmodule/xmodule => xmodule}/modulestore/docs/index.rst (100%) rename {common/lib/xmodule/xmodule => xmodule}/modulestore/docs/mixedmodulestore.rst (100%) rename {common/lib/xmodule/xmodule => xmodule}/modulestore/docs/overview.rst (100%) rename {common/lib/xmodule/xmodule => xmodule}/modulestore/docs/split-mongo.rst (100%) rename {common/lib/xmodule/xmodule => xmodule}/modulestore/draft.py (100%) rename {common/lib/xmodule/xmodule => xmodule}/modulestore/draft_and_published.py (100%) rename {common/lib/xmodule/xmodule => xmodule}/modulestore/edit_info.py (100%) rename {common/lib/xmodule/xmodule => xmodule}/modulestore/exceptions.py (100%) rename {common/lib/xmodule/xmodule => xmodule}/modulestore/inheritance.py (100%) rename {common/lib/xmodule/xmodule => xmodule}/modulestore/mixed.py (100%) rename {common/lib/xmodule/xmodule => xmodule}/modulestore/modulestore_settings.py (100%) rename {common/lib/xmodule/xmodule => xmodule}/modulestore/mongo/__init__.py (100%) rename {common/lib/xmodule/xmodule => xmodule}/modulestore/mongo/base.py (100%) rename {common/lib/xmodule/xmodule => xmodule}/modulestore/mongo/draft.py (100%) rename {common/lib/xmodule/xmodule => xmodule}/modulestore/mongoengine_fields.py (100%) rename {common/lib/xmodule/xmodule => xmodule}/modulestore/perf_tests/__init__.py (100%) rename {common/lib/xmodule/xmodule => xmodule}/modulestore/perf_tests/generate_asset_xml.py (100%) rename {common/lib/xmodule/xmodule => xmodule}/modulestore/perf_tests/generate_report.py (100%) rename {common/lib/xmodule/xmodule => xmodule}/modulestore/perf_tests/test_asset_import_export.py (100%) rename {common/lib/xmodule/xmodule => xmodule}/modulestore/search.py (100%) rename {common/lib/xmodule/xmodule => xmodule}/modulestore/split_migrator.py (100%) rename {common/lib/xmodule/xmodule => xmodule}/modulestore/split_mongo/__init__.py (100%) rename {common/lib/xmodule/xmodule => xmodule}/modulestore/split_mongo/caching_descriptor_system.py (100%) rename {common/lib/xmodule/xmodule => xmodule}/modulestore/split_mongo/definition_lazy_loader.py (100%) rename {common/lib/xmodule/xmodule => xmodule}/modulestore/split_mongo/id_manager.py (100%) rename {common/lib/xmodule/xmodule => xmodule}/modulestore/split_mongo/mongo_connection.py (100%) rename {common/lib/xmodule/xmodule => xmodule}/modulestore/split_mongo/split.py (100%) rename {common/lib/xmodule/xmodule => xmodule}/modulestore/split_mongo/split_draft.py (100%) rename {common/lib/xmodule/xmodule => xmodule}/modulestore/split_mongo/split_mongo_kvs.py (100%) rename {common/lib/xmodule/xmodule => xmodule}/modulestore/store_utilities.py (100%) rename {common/lib/xmodule/xmodule => xmodule}/modulestore/tests/__init__.py (100%) rename {common/lib/xmodule/xmodule => xmodule}/modulestore/tests/django_utils.py (100%) rename {common/lib/xmodule/xmodule => xmodule}/modulestore/tests/factories.py (100%) rename {common/lib/xmodule/xmodule => xmodule}/modulestore/tests/mongo_connection.py (100%) rename {common/lib/xmodule/xmodule => xmodule}/modulestore/tests/sample_courses.py (100%) rename {common/lib/xmodule/xmodule => xmodule}/modulestore/tests/test_abstraction.py (100%) rename {common/lib/xmodule/xmodule => xmodule}/modulestore/tests/test_asides.py (100%) rename {common/lib/xmodule/xmodule => xmodule}/modulestore/tests/test_assetstore.py (100%) rename {common/lib/xmodule/xmodule => xmodule}/modulestore/tests/test_contentstore.py (100%) rename {common/lib/xmodule/xmodule => xmodule}/modulestore/tests/test_cross_modulestore_import_export.py (100%) rename {common/lib/xmodule/xmodule => xmodule}/modulestore/tests/test_inheritance.py (100%) rename {common/lib/xmodule/xmodule => xmodule}/modulestore/tests/test_libraries.py (100%) rename {common/lib/xmodule/xmodule => xmodule}/modulestore/tests/test_mixed_modulestore.py (100%) rename {common/lib/xmodule/xmodule => xmodule}/modulestore/tests/test_modulestore.py (100%) rename {common/lib/xmodule/xmodule => xmodule}/modulestore/tests/test_modulestore_settings.py (100%) rename {common/lib/xmodule/xmodule => xmodule}/modulestore/tests/test_mongo.py (100%) rename {common/lib/xmodule/xmodule => xmodule}/modulestore/tests/test_mongo_call_count.py (100%) rename {common/lib/xmodule/xmodule => xmodule}/modulestore/tests/test_publish.py (100%) rename {common/lib/xmodule/xmodule => xmodule}/modulestore/tests/test_semantics.py (100%) rename {common/lib/xmodule/xmodule => xmodule}/modulestore/tests/test_split_copy_from_template.py (100%) rename {common/lib/xmodule/xmodule => xmodule}/modulestore/tests/test_split_migrator.py (100%) rename {common/lib/xmodule/xmodule => xmodule}/modulestore/tests/test_split_modulestore.py (100%) rename {common/lib/xmodule/xmodule => xmodule}/modulestore/tests/test_split_modulestore_bulk_operations.py (100%) rename {common/lib/xmodule/xmodule => xmodule}/modulestore/tests/test_split_mongo_mongo_connection.py (100%) rename {common/lib/xmodule/xmodule => xmodule}/modulestore/tests/test_split_w_old_mongo.py (100%) rename {common/lib/xmodule/xmodule => xmodule}/modulestore/tests/test_store_utilities.py (100%) rename {common/lib/xmodule/xmodule => xmodule}/modulestore/tests/test_xml.py (100%) rename {common/lib/xmodule/xmodule => xmodule}/modulestore/tests/test_xml_importer.py (100%) rename {common/lib/xmodule/xmodule => xmodule}/modulestore/tests/utils.py (100%) rename {common/lib/xmodule/xmodule => xmodule}/modulestore/xml.py (100%) rename {common/lib/xmodule/xmodule => xmodule}/modulestore/xml_exporter.py (100%) rename {common/lib/xmodule/xmodule => xmodule}/modulestore/xml_importer.py (100%) rename {common/lib/xmodule/xmodule => xmodule}/mongo_utils.py (100%) rename {common/lib/xmodule/xmodule => xmodule}/partitions/__init__.py (100%) rename {common/lib/xmodule/xmodule => xmodule}/partitions/enrollment_track_partition_generator.py (100%) rename {common/lib/xmodule/xmodule => xmodule}/partitions/partitions.py (100%) rename {common/lib/xmodule/xmodule => xmodule}/partitions/partitions_service.py (100%) rename {common/lib/xmodule/xmodule => xmodule}/partitions/tests/__init__.py (100%) rename {common/lib/xmodule/xmodule => xmodule}/partitions/tests/test_partitions.py (100%) rename {common/lib/xmodule/xmodule => xmodule}/poll_module.py (100%) rename {common/lib/xmodule/xmodule => xmodule}/progress.py (100%) rename {common/lib/xmodule/xmodule => xmodule}/randomize_module.py (100%) rename {common/lib/xmodule/xmodule => xmodule}/raw_module.py (100%) rename {common/lib/xmodule/xmodule => xmodule}/seq_module.py (100%) rename {common/lib/xmodule/xmodule => xmodule}/services.py (100%) rename {common/lib/xmodule/xmodule => xmodule}/split_test_module.py (100%) rename {common/lib/xmodule/xmodule => xmodule}/static_content.py (100%) rename {common/lib/xmodule/xmodule => xmodule}/stringify.py (100%) rename {common/lib/xmodule/xmodule => xmodule}/studio_editable.py (100%) rename {common/lib/xmodule/xmodule => xmodule}/tabs.py (100%) rename {common/lib/xmodule/xmodule => xmodule}/template_module.py (100%) rename {common/lib/xmodule/xmodule => xmodule}/templates.py (100%) rename {common/lib/xmodule/xmodule => xmodule}/templates/about/overview.yaml (100%) rename {common/lib/xmodule/xmodule => xmodule}/templates/html/announcement.yaml (100%) rename {common/lib/xmodule/xmodule => xmodule}/templates/html/anon_user_id.yaml (100%) rename {common/lib/xmodule/xmodule => xmodule}/templates/html/iframe.yaml (100%) rename {common/lib/xmodule/xmodule => xmodule}/templates/html/latex_html.yaml (100%) rename {common/lib/xmodule/xmodule => xmodule}/templates/html/raw.yaml (100%) rename {common/lib/xmodule/xmodule => xmodule}/templates/html/zooming_image.yaml (100%) rename {common/lib/xmodule/xmodule => xmodule}/templates/library-sourced-block-studio-view.html (100%) rename {common/lib/xmodule/xmodule => xmodule}/templates/problem/blank_common.yaml (100%) rename {common/lib/xmodule/xmodule => xmodule}/templates/problem/checkboxes_response.yaml (100%) rename {common/lib/xmodule/xmodule => xmodule}/templates/problem/checkboxes_response_hint.yaml (100%) rename {common/lib/xmodule/xmodule => xmodule}/templates/problem/circuitschematic.yaml (100%) rename {common/lib/xmodule/xmodule => xmodule}/templates/problem/customgrader.yaml (100%) rename {common/lib/xmodule/xmodule => xmodule}/templates/problem/drag_and_drop.yaml (100%) rename {common/lib/xmodule/xmodule => xmodule}/templates/problem/formularesponse.yaml (100%) rename {common/lib/xmodule/xmodule => xmodule}/templates/problem/imageresponse.yaml (100%) rename {common/lib/xmodule/xmodule => xmodule}/templates/problem/jsinput_response.yaml (100%) rename {common/lib/xmodule/xmodule => xmodule}/templates/problem/latex_problem.yaml (100%) rename {common/lib/xmodule/xmodule => xmodule}/templates/problem/multiplechoice.yaml (100%) rename {common/lib/xmodule/xmodule => xmodule}/templates/problem/multiplechoice_hint.yaml (100%) rename {common/lib/xmodule/xmodule => xmodule}/templates/problem/numericalresponse.yaml (100%) rename {common/lib/xmodule/xmodule => xmodule}/templates/problem/numericalresponse_hint.yaml (100%) rename {common/lib/xmodule/xmodule => xmodule}/templates/problem/optionresponse.yaml (100%) rename {common/lib/xmodule/xmodule => xmodule}/templates/problem/optionresponse_hint.yaml (100%) rename {common/lib/xmodule/xmodule => xmodule}/templates/problem/problem_with_hint.yaml (100%) rename {common/lib/xmodule/xmodule => xmodule}/templates/problem/problem_with_hint_in_latex.yaml (100%) rename {common/lib/xmodule/xmodule => xmodule}/templates/problem/string_response.yaml (100%) rename {common/lib/xmodule/xmodule => xmodule}/templates/problem/string_response_hint.yaml (100%) rename {common/lib/xmodule/xmodule => xmodule}/templates/test/announcement.yaml (100%) rename {common/lib/xmodule/xmodule => xmodule}/templates/test/anon_user_id.yaml (100%) rename {common/lib/xmodule/xmodule => xmodule}/templates/test/latex_html.yaml (100%) rename {common/lib/xmodule/xmodule => xmodule}/templates/test/somefile.notyaml (100%) rename {common/lib/xmodule/xmodule => xmodule}/templates/test/zooming_image.yaml (100%) rename {common/lib/xmodule/xmodule => xmodule}/tests/__init__.py (100%) rename {common/lib/xmodule/xmodule => xmodule}/tests/data/xml-course-root (100%) rename {common/lib/xmodule/xmodule => xmodule}/tests/helpers.py (100%) rename {common/lib/xmodule/xmodule => xmodule}/tests/rendering/__init__.py (100%) rename {common/lib/xmodule/xmodule => xmodule}/tests/rendering/core.py (100%) rename {common/lib/xmodule/xmodule => xmodule}/tests/test_annotatable_module.py (100%) rename {common/lib/xmodule/xmodule => xmodule}/tests/test_annotator_mixin.py (100%) rename {common/lib/xmodule/xmodule => xmodule}/tests/test_capa_module.py (100%) rename {common/lib/xmodule/xmodule => xmodule}/tests/test_conditional.py (100%) rename {common/lib/xmodule/xmodule => xmodule}/tests/test_content.py (100%) rename {common/lib/xmodule/xmodule => xmodule}/tests/test_course_metadata_utils.py (100%) rename {common/lib/xmodule/xmodule => xmodule}/tests/test_course_module.py (100%) rename {common/lib/xmodule/xmodule => xmodule}/tests/test_delay_between_attempts.py (100%) rename {common/lib/xmodule/xmodule => xmodule}/tests/test_editing_module.py (100%) rename {common/lib/xmodule/xmodule => xmodule}/tests/test_error_module.py (100%) rename {common/lib/xmodule/xmodule => xmodule}/tests/test_export.py (100%) rename {common/lib/xmodule/xmodule => xmodule}/tests/test_fields.py (100%) rename {common/lib/xmodule/xmodule => xmodule}/tests/test_files/test_tabseditingdescriptor.css (100%) rename {common/lib/xmodule/xmodule => xmodule}/tests/test_files/test_tabseditingdescriptor.scss (100%) rename {common/lib/xmodule/xmodule => xmodule}/tests/test_graders.py (100%) rename {common/lib/xmodule/xmodule => xmodule}/tests/test_html_module.py (100%) rename {common/lib/xmodule/xmodule => xmodule}/tests/test_import.py (100%) rename {common/lib/xmodule/xmodule => xmodule}/tests/test_import_static.py (100%) rename {common/lib/xmodule/xmodule => xmodule}/tests/test_library_content.py (100%) rename {common/lib/xmodule/xmodule => xmodule}/tests/test_library_root.py (100%) rename {common/lib/xmodule/xmodule => xmodule}/tests/test_library_sourced_block.py (100%) rename {common/lib/xmodule/xmodule => xmodule}/tests/test_library_tools.py (100%) rename {common/lib/xmodule/xmodule => xmodule}/tests/test_lti20_unit.py (100%) rename {common/lib/xmodule/xmodule => xmodule}/tests/test_lti_unit.py (100%) rename {common/lib/xmodule/xmodule => xmodule}/tests/test_mako_module.py (100%) rename {common/lib/xmodule/xmodule => xmodule}/tests/test_mongo_utils.py (100%) rename {common/lib/xmodule/xmodule => xmodule}/tests/test_poll.py (100%) rename {common/lib/xmodule/xmodule => xmodule}/tests/test_progress.py (100%) rename {common/lib/xmodule/xmodule => xmodule}/tests/test_randomize_module.py (100%) rename {common/lib/xmodule/xmodule => xmodule}/tests/test_resource_templates.py (100%) rename {common/lib/xmodule/xmodule => xmodule}/tests/test_sequence.py (100%) rename {common/lib/xmodule/xmodule => xmodule}/tests/test_services.py (100%) rename {common/lib/xmodule/xmodule => xmodule}/tests/test_split_test_module.py (100%) rename {common/lib/xmodule/xmodule => xmodule}/tests/test_stringify.py (100%) rename {common/lib/xmodule/xmodule => xmodule}/tests/test_studio_editable.py (100%) rename {common/lib/xmodule/xmodule => xmodule}/tests/test_unit_block.py (100%) rename {common/lib/xmodule/xmodule => xmodule}/tests/test_util_duedate.py (100%) rename {common/lib/xmodule/xmodule => xmodule}/tests/test_utils_django.py (100%) rename {common/lib/xmodule/xmodule => xmodule}/tests/test_utils_escape_html_characters.py (100%) rename {common/lib/xmodule/xmodule => xmodule}/tests/test_validation.py (100%) rename {common/lib/xmodule/xmodule => xmodule}/tests/test_vertical.py (100%) rename {common/lib/xmodule/xmodule => xmodule}/tests/test_video.py (100%) rename {common/lib/xmodule/xmodule => xmodule}/tests/test_word_cloud.py (100%) rename {common/lib/xmodule/xmodule => xmodule}/tests/test_xml_module.py (100%) rename {common/lib/xmodule/xmodule => xmodule}/tests/xml/__init__.py (100%) rename {common/lib/xmodule/xmodule => xmodule}/tests/xml/factories.py (100%) rename {common/lib/xmodule/xmodule => xmodule}/tests/xml/test_inheritance.py (100%) rename {common/lib/xmodule/xmodule => xmodule}/tests/xml/test_policy.py (100%) rename {common/lib/xmodule/xmodule => xmodule}/timeinfo.py (100%) rename {common/lib/xmodule/xmodule => xmodule}/unit_block.py (100%) rename {common/lib/xmodule/xmodule => xmodule}/util/__init__.py (100%) rename {common/lib/xmodule/xmodule => xmodule}/util/duedate.py (100%) rename {common/lib/xmodule/xmodule => xmodule}/util/misc.py (100%) rename {common/lib/xmodule/xmodule => xmodule}/util/sandboxing.py (100%) rename {common/lib/xmodule/xmodule => xmodule}/util/xmodule_django.py (100%) rename {common/lib/xmodule/xmodule => xmodule}/validation.py (100%) rename {common/lib/xmodule/xmodule => xmodule}/vertical_block.py (100%) rename {common/lib/xmodule/xmodule => xmodule}/video_module/__init__.py (100%) rename {common/lib/xmodule/xmodule => xmodule}/video_module/bumper_utils.py (100%) rename {common/lib/xmodule/xmodule => xmodule}/video_module/transcripts_utils.py (100%) rename {common/lib/xmodule/xmodule => xmodule}/video_module/video_handlers.py (100%) rename {common/lib/xmodule/xmodule => xmodule}/video_module/video_module.py (100%) rename {common/lib/xmodule/xmodule => xmodule}/video_module/video_utils.py (100%) rename {common/lib/xmodule/xmodule => xmodule}/video_module/video_xfields.py (100%) rename {common/lib/xmodule/xmodule => xmodule}/word_cloud_module.py (100%) rename {common/lib/xmodule/xmodule => xmodule}/wrapper_module.py (100%) rename {common/lib/xmodule/xmodule => xmodule}/x_module.py (100%) rename {common/lib/xmodule/xmodule => xmodule}/xml_module.py (100%) diff --git a/common/lib/xmodule/xmodule/README.rst b/xmodule/README.rst similarity index 100% rename from common/lib/xmodule/xmodule/README.rst rename to xmodule/README.rst diff --git a/common/lib/xmodule/xmodule/__init__.py b/xmodule/__init__.py similarity index 100% rename from common/lib/xmodule/xmodule/__init__.py rename to xmodule/__init__.py diff --git a/common/lib/xmodule/xmodule/annotatable_module.py b/xmodule/annotatable_module.py similarity index 100% rename from common/lib/xmodule/xmodule/annotatable_module.py rename to xmodule/annotatable_module.py diff --git a/common/lib/xmodule/xmodule/annotator_mixin.py b/xmodule/annotator_mixin.py similarity index 100% rename from common/lib/xmodule/xmodule/annotator_mixin.py rename to xmodule/annotator_mixin.py diff --git a/common/lib/xmodule/xmodule/assets/library_content/public/js/library_content_edit.js b/xmodule/assets/library_content/public/js/library_content_edit.js similarity index 100% rename from common/lib/xmodule/xmodule/assets/library_content/public/js/library_content_edit.js rename to xmodule/assets/library_content/public/js/library_content_edit.js diff --git a/common/lib/xmodule/xmodule/assets/library_source_block/LibrarySourcedBlockPicker.jsx b/xmodule/assets/library_source_block/LibrarySourcedBlockPicker.jsx similarity index 100% rename from common/lib/xmodule/xmodule/assets/library_source_block/LibrarySourcedBlockPicker.jsx rename to xmodule/assets/library_source_block/LibrarySourcedBlockPicker.jsx diff --git a/common/lib/xmodule/xmodule/assets/library_source_block/public/js/library_source_block.js b/xmodule/assets/library_source_block/public/js/library_source_block.js similarity index 100% rename from common/lib/xmodule/xmodule/assets/library_source_block/public/js/library_source_block.js rename to xmodule/assets/library_source_block/public/js/library_source_block.js diff --git a/common/lib/xmodule/xmodule/assets/library_source_block/style.css b/xmodule/assets/library_source_block/style.css similarity index 100% rename from common/lib/xmodule/xmodule/assets/library_source_block/style.css rename to xmodule/assets/library_source_block/style.css diff --git a/common/lib/xmodule/xmodule/assets/split_test/public/js/split_test_author_view.js b/xmodule/assets/split_test/public/js/split_test_author_view.js similarity index 100% rename from common/lib/xmodule/xmodule/assets/split_test/public/js/split_test_author_view.js rename to xmodule/assets/split_test/public/js/split_test_author_view.js diff --git a/common/lib/xmodule/xmodule/assets/split_test/public/js/split_test_staff.js b/xmodule/assets/split_test/public/js/split_test_staff.js similarity index 100% rename from common/lib/xmodule/xmodule/assets/split_test/public/js/split_test_staff.js rename to xmodule/assets/split_test/public/js/split_test_staff.js diff --git a/common/lib/xmodule/xmodule/assets/split_test/public/js/split_test_student.js b/xmodule/assets/split_test/public/js/split_test_student.js similarity index 100% rename from common/lib/xmodule/xmodule/assets/split_test/public/js/split_test_student.js rename to xmodule/assets/split_test/public/js/split_test_student.js diff --git a/common/lib/xmodule/xmodule/assets/vertical/public/js/vertical_student_view.js b/xmodule/assets/vertical/public/js/vertical_student_view.js similarity index 100% rename from common/lib/xmodule/xmodule/assets/vertical/public/js/vertical_student_view.js rename to xmodule/assets/vertical/public/js/vertical_student_view.js diff --git a/common/lib/xmodule/xmodule/assets/word_cloud/.eslintrc.js b/xmodule/assets/word_cloud/.eslintrc.js similarity index 100% rename from common/lib/xmodule/xmodule/assets/word_cloud/.eslintrc.js rename to xmodule/assets/word_cloud/.eslintrc.js diff --git a/common/lib/xmodule/xmodule/assets/word_cloud/.gitignore b/xmodule/assets/word_cloud/.gitignore similarity index 100% rename from common/lib/xmodule/xmodule/assets/word_cloud/.gitignore rename to xmodule/assets/word_cloud/.gitignore diff --git a/common/lib/xmodule/xmodule/assets/word_cloud/src/js/d3.layout.cloud.js b/xmodule/assets/word_cloud/src/js/d3.layout.cloud.js similarity index 100% rename from common/lib/xmodule/xmodule/assets/word_cloud/src/js/d3.layout.cloud.js rename to xmodule/assets/word_cloud/src/js/d3.layout.cloud.js diff --git a/common/lib/xmodule/xmodule/assets/word_cloud/src/js/d3.min.js b/xmodule/assets/word_cloud/src/js/d3.min.js similarity index 100% rename from common/lib/xmodule/xmodule/assets/word_cloud/src/js/d3.min.js rename to xmodule/assets/word_cloud/src/js/d3.min.js diff --git a/common/lib/xmodule/xmodule/assets/word_cloud/src/js/word_cloud.js b/xmodule/assets/word_cloud/src/js/word_cloud.js similarity index 100% rename from common/lib/xmodule/xmodule/assets/word_cloud/src/js/word_cloud.js rename to xmodule/assets/word_cloud/src/js/word_cloud.js diff --git a/common/lib/xmodule/xmodule/assets/word_cloud/src/js/word_cloud_main.js b/xmodule/assets/word_cloud/src/js/word_cloud_main.js similarity index 100% rename from common/lib/xmodule/xmodule/assets/word_cloud/src/js/word_cloud_main.js rename to xmodule/assets/word_cloud/src/js/word_cloud_main.js diff --git a/common/lib/xmodule/xmodule/assets/word_cloud/webpack.config.js b/xmodule/assets/word_cloud/webpack.config.js similarity index 100% rename from common/lib/xmodule/xmodule/assets/word_cloud/webpack.config.js rename to xmodule/assets/word_cloud/webpack.config.js diff --git a/common/lib/xmodule/xmodule/assetstore/__init__.py b/xmodule/assetstore/__init__.py similarity index 100% rename from common/lib/xmodule/xmodule/assetstore/__init__.py rename to xmodule/assetstore/__init__.py diff --git a/common/lib/xmodule/xmodule/assetstore/assetmgr.py b/xmodule/assetstore/assetmgr.py similarity index 100% rename from common/lib/xmodule/xmodule/assetstore/assetmgr.py rename to xmodule/assetstore/assetmgr.py diff --git a/common/lib/xmodule/xmodule/assetstore/tests/__init__.py b/xmodule/assetstore/tests/__init__.py similarity index 100% rename from common/lib/xmodule/xmodule/assetstore/tests/__init__.py rename to xmodule/assetstore/tests/__init__.py diff --git a/common/lib/xmodule/xmodule/assetstore/tests/assets.xsd b/xmodule/assetstore/tests/assets.xsd similarity index 100% rename from common/lib/xmodule/xmodule/assetstore/tests/assets.xsd rename to xmodule/assetstore/tests/assets.xsd diff --git a/common/lib/xmodule/xmodule/assetstore/tests/test_asset_xml.py b/xmodule/assetstore/tests/test_asset_xml.py similarity index 100% rename from common/lib/xmodule/xmodule/assetstore/tests/test_asset_xml.py rename to xmodule/assetstore/tests/test_asset_xml.py diff --git a/common/lib/xmodule/xmodule/block_metadata_utils.py b/xmodule/block_metadata_utils.py similarity index 100% rename from common/lib/xmodule/xmodule/block_metadata_utils.py rename to xmodule/block_metadata_utils.py diff --git a/common/lib/xmodule/xmodule/capa_module.py b/xmodule/capa_module.py similarity index 100% rename from common/lib/xmodule/xmodule/capa_module.py rename to xmodule/capa_module.py diff --git a/common/lib/xmodule/xmodule/conditional_module.py b/xmodule/conditional_module.py similarity index 100% rename from common/lib/xmodule/xmodule/conditional_module.py rename to xmodule/conditional_module.py diff --git a/common/lib/xmodule/xmodule/contentstore/__init__.py b/xmodule/contentstore/__init__.py similarity index 100% rename from common/lib/xmodule/xmodule/contentstore/__init__.py rename to xmodule/contentstore/__init__.py diff --git a/common/lib/xmodule/xmodule/contentstore/content.py b/xmodule/contentstore/content.py similarity index 100% rename from common/lib/xmodule/xmodule/contentstore/content.py rename to xmodule/contentstore/content.py diff --git a/common/lib/xmodule/xmodule/contentstore/django.py b/xmodule/contentstore/django.py similarity index 100% rename from common/lib/xmodule/xmodule/contentstore/django.py rename to xmodule/contentstore/django.py diff --git a/common/lib/xmodule/xmodule/contentstore/mongo.py b/xmodule/contentstore/mongo.py similarity index 100% rename from common/lib/xmodule/xmodule/contentstore/mongo.py rename to xmodule/contentstore/mongo.py diff --git a/common/lib/xmodule/xmodule/contentstore/utils.py b/xmodule/contentstore/utils.py similarity index 100% rename from common/lib/xmodule/xmodule/contentstore/utils.py rename to xmodule/contentstore/utils.py diff --git a/common/lib/xmodule/xmodule/course_metadata_utils.py b/xmodule/course_metadata_utils.py similarity index 100% rename from common/lib/xmodule/xmodule/course_metadata_utils.py rename to xmodule/course_metadata_utils.py diff --git a/common/lib/xmodule/xmodule/course_module.py b/xmodule/course_module.py similarity index 100% rename from common/lib/xmodule/xmodule/course_module.py rename to xmodule/course_module.py diff --git a/common/lib/xmodule/xmodule/css/annotatable/display.scss b/xmodule/css/annotatable/display.scss similarity index 100% rename from common/lib/xmodule/xmodule/css/annotatable/display.scss rename to xmodule/css/annotatable/display.scss diff --git a/common/lib/xmodule/xmodule/css/capa/display.scss b/xmodule/css/capa/display.scss similarity index 100% rename from common/lib/xmodule/xmodule/css/capa/display.scss rename to xmodule/css/capa/display.scss diff --git a/common/lib/xmodule/xmodule/css/codemirror/codemirror.scss b/xmodule/css/codemirror/codemirror.scss similarity index 100% rename from common/lib/xmodule/xmodule/css/codemirror/codemirror.scss rename to xmodule/css/codemirror/codemirror.scss diff --git a/common/lib/xmodule/xmodule/css/editor/edit.scss b/xmodule/css/editor/edit.scss similarity index 100% rename from common/lib/xmodule/xmodule/css/editor/edit.scss rename to xmodule/css/editor/edit.scss diff --git a/common/lib/xmodule/xmodule/css/html/display.scss b/xmodule/css/html/display.scss similarity index 100% rename from common/lib/xmodule/xmodule/css/html/display.scss rename to xmodule/css/html/display.scss diff --git a/common/lib/xmodule/xmodule/css/html/edit.scss b/xmodule/css/html/edit.scss similarity index 100% rename from common/lib/xmodule/xmodule/css/html/edit.scss rename to xmodule/css/html/edit.scss diff --git a/common/lib/xmodule/xmodule/css/lti/lti.scss b/xmodule/css/lti/lti.scss similarity index 100% rename from common/lib/xmodule/xmodule/css/lti/lti.scss rename to xmodule/css/lti/lti.scss diff --git a/common/lib/xmodule/xmodule/css/poll/display.scss b/xmodule/css/poll/display.scss similarity index 100% rename from common/lib/xmodule/xmodule/css/poll/display.scss rename to xmodule/css/poll/display.scss diff --git a/common/lib/xmodule/xmodule/css/problem/edit.scss b/xmodule/css/problem/edit.scss similarity index 100% rename from common/lib/xmodule/xmodule/css/problem/edit.scss rename to xmodule/css/problem/edit.scss diff --git a/common/lib/xmodule/xmodule/css/sequence/display.scss b/xmodule/css/sequence/display.scss similarity index 100% rename from common/lib/xmodule/xmodule/css/sequence/display.scss rename to xmodule/css/sequence/display.scss diff --git a/common/lib/xmodule/xmodule/css/tabs/codemirror.scss b/xmodule/css/tabs/codemirror.scss similarity index 100% rename from common/lib/xmodule/xmodule/css/tabs/codemirror.scss rename to xmodule/css/tabs/codemirror.scss diff --git a/common/lib/xmodule/xmodule/css/tabs/tabs.scss b/xmodule/css/tabs/tabs.scss similarity index 100% rename from common/lib/xmodule/xmodule/css/tabs/tabs.scss rename to xmodule/css/tabs/tabs.scss diff --git a/common/lib/xmodule/xmodule/css/video/accessible_menu.scss b/xmodule/css/video/accessible_menu.scss similarity index 100% rename from common/lib/xmodule/xmodule/css/video/accessible_menu.scss rename to xmodule/css/video/accessible_menu.scss diff --git a/common/lib/xmodule/xmodule/css/video/display.scss b/xmodule/css/video/display.scss similarity index 100% rename from common/lib/xmodule/xmodule/css/video/display.scss rename to xmodule/css/video/display.scss diff --git a/common/lib/xmodule/xmodule/css/word_cloud/display.scss b/xmodule/css/word_cloud/display.scss similarity index 100% rename from common/lib/xmodule/xmodule/css/word_cloud/display.scss rename to xmodule/css/word_cloud/display.scss diff --git a/common/lib/xmodule/xmodule/data.py b/xmodule/data.py similarity index 100% rename from common/lib/xmodule/xmodule/data.py rename to xmodule/data.py diff --git a/common/lib/xmodule/xmodule/docs/decisions/0001-move-due-dates-to-db.rst b/xmodule/docs/decisions/0001-move-due-dates-to-db.rst similarity index 100% rename from common/lib/xmodule/xmodule/docs/decisions/0001-move-due-dates-to-db.rst rename to xmodule/docs/decisions/0001-move-due-dates-to-db.rst diff --git a/common/lib/xmodule/xmodule/docs/decisions/0002-remove-mongodb-dependency.rst b/xmodule/docs/decisions/0002-remove-mongodb-dependency.rst similarity index 100% rename from common/lib/xmodule/xmodule/docs/decisions/0002-remove-mongodb-dependency.rst rename to xmodule/docs/decisions/0002-remove-mongodb-dependency.rst diff --git a/common/lib/xmodule/xmodule/editing_module.py b/xmodule/editing_module.py similarity index 100% rename from common/lib/xmodule/xmodule/editing_module.py rename to xmodule/editing_module.py diff --git a/common/lib/xmodule/xmodule/edxnotes_utils.py b/xmodule/edxnotes_utils.py similarity index 100% rename from common/lib/xmodule/xmodule/edxnotes_utils.py rename to xmodule/edxnotes_utils.py diff --git a/common/lib/xmodule/xmodule/error_module.py b/xmodule/error_module.py similarity index 100% rename from common/lib/xmodule/xmodule/error_module.py rename to xmodule/error_module.py diff --git a/common/lib/xmodule/xmodule/errortracker.py b/xmodule/errortracker.py similarity index 100% rename from common/lib/xmodule/xmodule/errortracker.py rename to xmodule/errortracker.py diff --git a/common/lib/xmodule/xmodule/exceptions.py b/xmodule/exceptions.py similarity index 100% rename from common/lib/xmodule/xmodule/exceptions.py rename to xmodule/exceptions.py diff --git a/common/lib/xmodule/xmodule/fields.py b/xmodule/fields.py similarity index 100% rename from common/lib/xmodule/xmodule/fields.py rename to xmodule/fields.py diff --git a/common/lib/xmodule/xmodule/graders.py b/xmodule/graders.py similarity index 100% rename from common/lib/xmodule/xmodule/graders.py rename to xmodule/graders.py diff --git a/common/lib/xmodule/xmodule/hidden_module.py b/xmodule/hidden_module.py similarity index 100% rename from common/lib/xmodule/xmodule/hidden_module.py rename to xmodule/hidden_module.py diff --git a/common/lib/xmodule/xmodule/html_checker.py b/xmodule/html_checker.py similarity index 100% rename from common/lib/xmodule/xmodule/html_checker.py rename to xmodule/html_checker.py diff --git a/common/lib/xmodule/xmodule/html_module.py b/xmodule/html_module.py similarity index 100% rename from common/lib/xmodule/xmodule/html_module.py rename to xmodule/html_module.py diff --git a/common/lib/xmodule/xmodule/js/RequireJS-namespace-undefine.js b/xmodule/js/RequireJS-namespace-undefine.js similarity index 100% rename from common/lib/xmodule/xmodule/js/RequireJS-namespace-undefine.js rename to xmodule/js/RequireJS-namespace-undefine.js diff --git a/common/lib/xmodule/xmodule/js/common_static b/xmodule/js/common_static similarity index 100% rename from common/lib/xmodule/xmodule/js/common_static rename to xmodule/js/common_static diff --git a/common/lib/xmodule/xmodule/js/fixtures/annotatable.html b/xmodule/js/fixtures/annotatable.html similarity index 100% rename from common/lib/xmodule/xmodule/js/fixtures/annotatable.html rename to xmodule/js/fixtures/annotatable.html diff --git a/common/lib/xmodule/xmodule/js/fixtures/checkbox_problem.html b/xmodule/js/fixtures/checkbox_problem.html similarity index 100% rename from common/lib/xmodule/xmodule/js/fixtures/checkbox_problem.html rename to xmodule/js/fixtures/checkbox_problem.html diff --git a/common/lib/xmodule/xmodule/js/fixtures/codeinput_problem.html b/xmodule/js/fixtures/codeinput_problem.html similarity index 100% rename from common/lib/xmodule/xmodule/js/fixtures/codeinput_problem.html rename to xmodule/js/fixtures/codeinput_problem.html diff --git a/common/lib/xmodule/xmodule/js/fixtures/hls/XXXXXXXXT114-V015600_0_/XXXXXXXXT114-V015600_0_.m3u8 b/xmodule/js/fixtures/hls/XXXXXXXXT114-V015600_0_/XXXXXXXXT114-V015600_0_.m3u8 similarity index 100% rename from common/lib/xmodule/xmodule/js/fixtures/hls/XXXXXXXXT114-V015600_0_/XXXXXXXXT114-V015600_0_.m3u8 rename to xmodule/js/fixtures/hls/XXXXXXXXT114-V015600_0_/XXXXXXXXT114-V015600_0_.m3u8 diff --git a/common/lib/xmodule/xmodule/js/fixtures/hls/XXXXXXXXT114-V015600_0_/XXXXXXXXT114-V015600_0_0.ts b/xmodule/js/fixtures/hls/XXXXXXXXT114-V015600_0_/XXXXXXXXT114-V015600_0_0.ts similarity index 100% rename from common/lib/xmodule/xmodule/js/fixtures/hls/XXXXXXXXT114-V015600_0_/XXXXXXXXT114-V015600_0_0.ts rename to xmodule/js/fixtures/hls/XXXXXXXXT114-V015600_0_/XXXXXXXXT114-V015600_0_0.ts diff --git a/common/lib/xmodule/xmodule/js/fixtures/hls/XXXXXXXXT114-V015600_0_/XXXXXXXXT114-V015600_0_1.ts b/xmodule/js/fixtures/hls/XXXXXXXXT114-V015600_0_/XXXXXXXXT114-V015600_0_1.ts similarity index 100% rename from common/lib/xmodule/xmodule/js/fixtures/hls/XXXXXXXXT114-V015600_0_/XXXXXXXXT114-V015600_0_1.ts rename to xmodule/js/fixtures/hls/XXXXXXXXT114-V015600_0_/XXXXXXXXT114-V015600_0_1.ts diff --git a/common/lib/xmodule/xmodule/js/fixtures/hls/XXXXXXXXT114-V015600_0_/XXXXXXXXT114-V015600_0_2.ts b/xmodule/js/fixtures/hls/XXXXXXXXT114-V015600_0_/XXXXXXXXT114-V015600_0_2.ts similarity index 100% rename from common/lib/xmodule/xmodule/js/fixtures/hls/XXXXXXXXT114-V015600_0_/XXXXXXXXT114-V015600_0_2.ts rename to xmodule/js/fixtures/hls/XXXXXXXXT114-V015600_0_/XXXXXXXXT114-V015600_0_2.ts diff --git a/common/lib/xmodule/xmodule/js/fixtures/hls/XXXXXXXXT114-V015600_1_/XXXXXXXXT114-V015600_1_.m3u8 b/xmodule/js/fixtures/hls/XXXXXXXXT114-V015600_1_/XXXXXXXXT114-V015600_1_.m3u8 similarity index 100% rename from common/lib/xmodule/xmodule/js/fixtures/hls/XXXXXXXXT114-V015600_1_/XXXXXXXXT114-V015600_1_.m3u8 rename to xmodule/js/fixtures/hls/XXXXXXXXT114-V015600_1_/XXXXXXXXT114-V015600_1_.m3u8 diff --git a/common/lib/xmodule/xmodule/js/fixtures/hls/XXXXXXXXT114-V015600_1_/XXXXXXXXT114-V015600_1_0.ts b/xmodule/js/fixtures/hls/XXXXXXXXT114-V015600_1_/XXXXXXXXT114-V015600_1_0.ts similarity index 100% rename from common/lib/xmodule/xmodule/js/fixtures/hls/XXXXXXXXT114-V015600_1_/XXXXXXXXT114-V015600_1_0.ts rename to xmodule/js/fixtures/hls/XXXXXXXXT114-V015600_1_/XXXXXXXXT114-V015600_1_0.ts diff --git a/common/lib/xmodule/xmodule/js/fixtures/hls/XXXXXXXXT114-V015600_1_/XXXXXXXXT114-V015600_1_1.ts b/xmodule/js/fixtures/hls/XXXXXXXXT114-V015600_1_/XXXXXXXXT114-V015600_1_1.ts similarity index 100% rename from common/lib/xmodule/xmodule/js/fixtures/hls/XXXXXXXXT114-V015600_1_/XXXXXXXXT114-V015600_1_1.ts rename to xmodule/js/fixtures/hls/XXXXXXXXT114-V015600_1_/XXXXXXXXT114-V015600_1_1.ts diff --git a/common/lib/xmodule/xmodule/js/fixtures/hls/XXXXXXXXT114-V015600_1_/XXXXXXXXT114-V015600_1_2.ts b/xmodule/js/fixtures/hls/XXXXXXXXT114-V015600_1_/XXXXXXXXT114-V015600_1_2.ts similarity index 100% rename from common/lib/xmodule/xmodule/js/fixtures/hls/XXXXXXXXT114-V015600_1_/XXXXXXXXT114-V015600_1_2.ts rename to xmodule/js/fixtures/hls/XXXXXXXXT114-V015600_1_/XXXXXXXXT114-V015600_1_2.ts diff --git a/common/lib/xmodule/xmodule/js/fixtures/hls/XXXXXXXXT114-V015600_2_/XXXXXXXXT114-V015600_2_.m3u8 b/xmodule/js/fixtures/hls/XXXXXXXXT114-V015600_2_/XXXXXXXXT114-V015600_2_.m3u8 similarity index 100% rename from common/lib/xmodule/xmodule/js/fixtures/hls/XXXXXXXXT114-V015600_2_/XXXXXXXXT114-V015600_2_.m3u8 rename to xmodule/js/fixtures/hls/XXXXXXXXT114-V015600_2_/XXXXXXXXT114-V015600_2_.m3u8 diff --git a/common/lib/xmodule/xmodule/js/fixtures/hls/XXXXXXXXT114-V015600_2_/XXXXXXXXT114-V015600_2_0.ts b/xmodule/js/fixtures/hls/XXXXXXXXT114-V015600_2_/XXXXXXXXT114-V015600_2_0.ts similarity index 100% rename from common/lib/xmodule/xmodule/js/fixtures/hls/XXXXXXXXT114-V015600_2_/XXXXXXXXT114-V015600_2_0.ts rename to xmodule/js/fixtures/hls/XXXXXXXXT114-V015600_2_/XXXXXXXXT114-V015600_2_0.ts diff --git a/common/lib/xmodule/xmodule/js/fixtures/hls/XXXXXXXXT114-V015600_2_/XXXXXXXXT114-V015600_2_1.ts b/xmodule/js/fixtures/hls/XXXXXXXXT114-V015600_2_/XXXXXXXXT114-V015600_2_1.ts similarity index 100% rename from common/lib/xmodule/xmodule/js/fixtures/hls/XXXXXXXXT114-V015600_2_/XXXXXXXXT114-V015600_2_1.ts rename to xmodule/js/fixtures/hls/XXXXXXXXT114-V015600_2_/XXXXXXXXT114-V015600_2_1.ts diff --git a/common/lib/xmodule/xmodule/js/fixtures/hls/XXXXXXXXT114-V015600_2_/XXXXXXXXT114-V015600_2_2.ts b/xmodule/js/fixtures/hls/XXXXXXXXT114-V015600_2_/XXXXXXXXT114-V015600_2_2.ts similarity index 100% rename from common/lib/xmodule/xmodule/js/fixtures/hls/XXXXXXXXT114-V015600_2_/XXXXXXXXT114-V015600_2_2.ts rename to xmodule/js/fixtures/hls/XXXXXXXXT114-V015600_2_/XXXXXXXXT114-V015600_2_2.ts diff --git a/common/lib/xmodule/xmodule/js/fixtures/hls/XXXXXXXXT114-V015600_3_/XXXXXXXXT114-V015600_3_.m3u8 b/xmodule/js/fixtures/hls/XXXXXXXXT114-V015600_3_/XXXXXXXXT114-V015600_3_.m3u8 similarity index 100% rename from common/lib/xmodule/xmodule/js/fixtures/hls/XXXXXXXXT114-V015600_3_/XXXXXXXXT114-V015600_3_.m3u8 rename to xmodule/js/fixtures/hls/XXXXXXXXT114-V015600_3_/XXXXXXXXT114-V015600_3_.m3u8 diff --git a/common/lib/xmodule/xmodule/js/fixtures/hls/XXXXXXXXT114-V015600_3_/XXXXXXXXT114-V015600_3_0.ts b/xmodule/js/fixtures/hls/XXXXXXXXT114-V015600_3_/XXXXXXXXT114-V015600_3_0.ts similarity index 100% rename from common/lib/xmodule/xmodule/js/fixtures/hls/XXXXXXXXT114-V015600_3_/XXXXXXXXT114-V015600_3_0.ts rename to xmodule/js/fixtures/hls/XXXXXXXXT114-V015600_3_/XXXXXXXXT114-V015600_3_0.ts diff --git a/common/lib/xmodule/xmodule/js/fixtures/hls/XXXXXXXXT114-V015600_3_/XXXXXXXXT114-V015600_3_1.ts b/xmodule/js/fixtures/hls/XXXXXXXXT114-V015600_3_/XXXXXXXXT114-V015600_3_1.ts similarity index 100% rename from common/lib/xmodule/xmodule/js/fixtures/hls/XXXXXXXXT114-V015600_3_/XXXXXXXXT114-V015600_3_1.ts rename to xmodule/js/fixtures/hls/XXXXXXXXT114-V015600_3_/XXXXXXXXT114-V015600_3_1.ts diff --git a/common/lib/xmodule/xmodule/js/fixtures/hls/XXXXXXXXT114-V015600_3_/XXXXXXXXT114-V015600_3_2.ts b/xmodule/js/fixtures/hls/XXXXXXXXT114-V015600_3_/XXXXXXXXT114-V015600_3_2.ts similarity index 100% rename from common/lib/xmodule/xmodule/js/fixtures/hls/XXXXXXXXT114-V015600_3_/XXXXXXXXT114-V015600_3_2.ts rename to xmodule/js/fixtures/hls/XXXXXXXXT114-V015600_3_/XXXXXXXXT114-V015600_3_2.ts diff --git a/common/lib/xmodule/xmodule/js/fixtures/hls/XXXXXXXXT114-V015600_4_/XXXXXXXXT114-V015600_4_.m3u8 b/xmodule/js/fixtures/hls/XXXXXXXXT114-V015600_4_/XXXXXXXXT114-V015600_4_.m3u8 similarity index 100% rename from common/lib/xmodule/xmodule/js/fixtures/hls/XXXXXXXXT114-V015600_4_/XXXXXXXXT114-V015600_4_.m3u8 rename to xmodule/js/fixtures/hls/XXXXXXXXT114-V015600_4_/XXXXXXXXT114-V015600_4_.m3u8 diff --git a/common/lib/xmodule/xmodule/js/fixtures/hls/XXXXXXXXT114-V015600_4_/XXXXXXXXT114-V015600_4_0.ts b/xmodule/js/fixtures/hls/XXXXXXXXT114-V015600_4_/XXXXXXXXT114-V015600_4_0.ts similarity index 100% rename from common/lib/xmodule/xmodule/js/fixtures/hls/XXXXXXXXT114-V015600_4_/XXXXXXXXT114-V015600_4_0.ts rename to xmodule/js/fixtures/hls/XXXXXXXXT114-V015600_4_/XXXXXXXXT114-V015600_4_0.ts diff --git a/common/lib/xmodule/xmodule/js/fixtures/hls/XXXXXXXXT114-V015600_4_/XXXXXXXXT114-V015600_4_1.ts b/xmodule/js/fixtures/hls/XXXXXXXXT114-V015600_4_/XXXXXXXXT114-V015600_4_1.ts similarity index 100% rename from common/lib/xmodule/xmodule/js/fixtures/hls/XXXXXXXXT114-V015600_4_/XXXXXXXXT114-V015600_4_1.ts rename to xmodule/js/fixtures/hls/XXXXXXXXT114-V015600_4_/XXXXXXXXT114-V015600_4_1.ts diff --git a/common/lib/xmodule/xmodule/js/fixtures/hls/XXXXXXXXT114-V015600_4_/XXXXXXXXT114-V015600_4_2.ts b/xmodule/js/fixtures/hls/XXXXXXXXT114-V015600_4_/XXXXXXXXT114-V015600_4_2.ts similarity index 100% rename from common/lib/xmodule/xmodule/js/fixtures/hls/XXXXXXXXT114-V015600_4_/XXXXXXXXT114-V015600_4_2.ts rename to xmodule/js/fixtures/hls/XXXXXXXXT114-V015600_4_/XXXXXXXXT114-V015600_4_2.ts diff --git a/common/lib/xmodule/xmodule/js/fixtures/hls/hls.m3u8 b/xmodule/js/fixtures/hls/hls.m3u8 similarity index 100% rename from common/lib/xmodule/xmodule/js/fixtures/hls/hls.m3u8 rename to xmodule/js/fixtures/hls/hls.m3u8 diff --git a/common/lib/xmodule/xmodule/js/fixtures/html-edit-visual.html b/xmodule/js/fixtures/html-edit-visual.html similarity index 100% rename from common/lib/xmodule/xmodule/js/fixtures/html-edit-visual.html rename to xmodule/js/fixtures/html-edit-visual.html diff --git a/common/lib/xmodule/xmodule/js/fixtures/html-editor-raw.html b/xmodule/js/fixtures/html-editor-raw.html similarity index 100% rename from common/lib/xmodule/xmodule/js/fixtures/html-editor-raw.html rename to xmodule/js/fixtures/html-editor-raw.html diff --git a/common/lib/xmodule/xmodule/js/fixtures/imageinput.html b/xmodule/js/fixtures/imageinput.html similarity index 100% rename from common/lib/xmodule/xmodule/js/fixtures/imageinput.html rename to xmodule/js/fixtures/imageinput.html diff --git a/common/lib/xmodule/xmodule/js/fixtures/imageinput.underscore b/xmodule/js/fixtures/imageinput.underscore similarity index 100% rename from common/lib/xmodule/xmodule/js/fixtures/imageinput.underscore rename to xmodule/js/fixtures/imageinput.underscore diff --git a/common/lib/xmodule/xmodule/js/fixtures/items.json b/xmodule/js/fixtures/items.json similarity index 100% rename from common/lib/xmodule/xmodule/js/fixtures/items.json rename to xmodule/js/fixtures/items.json diff --git a/common/lib/xmodule/xmodule/js/fixtures/jsinput_problem.html b/xmodule/js/fixtures/jsinput_problem.html similarity index 100% rename from common/lib/xmodule/xmodule/js/fixtures/jsinput_problem.html rename to xmodule/js/fixtures/jsinput_problem.html diff --git a/common/lib/xmodule/xmodule/js/fixtures/lti.html b/xmodule/js/fixtures/lti.html similarity index 100% rename from common/lib/xmodule/xmodule/js/fixtures/lti.html rename to xmodule/js/fixtures/lti.html diff --git a/common/lib/xmodule/xmodule/js/fixtures/matlabinput_problem.html b/xmodule/js/fixtures/matlabinput_problem.html similarity index 100% rename from common/lib/xmodule/xmodule/js/fixtures/matlabinput_problem.html rename to xmodule/js/fixtures/matlabinput_problem.html diff --git a/common/lib/xmodule/xmodule/js/fixtures/poster.jpg b/xmodule/js/fixtures/poster.jpg similarity index 100% rename from common/lib/xmodule/xmodule/js/fixtures/poster.jpg rename to xmodule/js/fixtures/poster.jpg diff --git a/common/lib/xmodule/xmodule/js/fixtures/problem-with-markdown.html b/xmodule/js/fixtures/problem-with-markdown.html similarity index 100% rename from common/lib/xmodule/xmodule/js/fixtures/problem-with-markdown.html rename to xmodule/js/fixtures/problem-with-markdown.html diff --git a/common/lib/xmodule/xmodule/js/fixtures/problem-without-markdown.html b/xmodule/js/fixtures/problem-without-markdown.html similarity index 100% rename from common/lib/xmodule/xmodule/js/fixtures/problem-without-markdown.html rename to xmodule/js/fixtures/problem-without-markdown.html diff --git a/common/lib/xmodule/xmodule/js/fixtures/problem.html b/xmodule/js/fixtures/problem.html similarity index 100% rename from common/lib/xmodule/xmodule/js/fixtures/problem.html rename to xmodule/js/fixtures/problem.html diff --git a/common/lib/xmodule/xmodule/js/fixtures/problem_content.html b/xmodule/js/fixtures/problem_content.html similarity index 100% rename from common/lib/xmodule/xmodule/js/fixtures/problem_content.html rename to xmodule/js/fixtures/problem_content.html diff --git a/common/lib/xmodule/xmodule/js/fixtures/problem_content_1240.html b/xmodule/js/fixtures/problem_content_1240.html similarity index 100% rename from common/lib/xmodule/xmodule/js/fixtures/problem_content_1240.html rename to xmodule/js/fixtures/problem_content_1240.html diff --git a/common/lib/xmodule/xmodule/js/fixtures/radiobutton_problem.html b/xmodule/js/fixtures/radiobutton_problem.html similarity index 100% rename from common/lib/xmodule/xmodule/js/fixtures/radiobutton_problem.html rename to xmodule/js/fixtures/radiobutton_problem.html diff --git a/common/lib/xmodule/xmodule/js/fixtures/sequence.html b/xmodule/js/fixtures/sequence.html similarity index 100% rename from common/lib/xmodule/xmodule/js/fixtures/sequence.html rename to xmodule/js/fixtures/sequence.html diff --git a/common/lib/xmodule/xmodule/js/fixtures/split_test_staff.html b/xmodule/js/fixtures/split_test_staff.html similarity index 100% rename from common/lib/xmodule/xmodule/js/fixtures/split_test_staff.html rename to xmodule/js/fixtures/split_test_staff.html diff --git a/common/lib/xmodule/xmodule/js/fixtures/tabs-edit.html b/xmodule/js/fixtures/tabs-edit.html similarity index 100% rename from common/lib/xmodule/xmodule/js/fixtures/tabs-edit.html rename to xmodule/js/fixtures/tabs-edit.html diff --git a/common/lib/xmodule/xmodule/js/fixtures/test.mp4 b/xmodule/js/fixtures/test.mp4 similarity index 100% rename from common/lib/xmodule/xmodule/js/fixtures/test.mp4 rename to xmodule/js/fixtures/test.mp4 diff --git a/common/lib/xmodule/xmodule/js/fixtures/test.ogv b/xmodule/js/fixtures/test.ogv similarity index 100% rename from common/lib/xmodule/xmodule/js/fixtures/test.ogv rename to xmodule/js/fixtures/test.ogv diff --git a/common/lib/xmodule/xmodule/js/fixtures/test.webm b/xmodule/js/fixtures/test.webm similarity index 100% rename from common/lib/xmodule/xmodule/js/fixtures/test.webm rename to xmodule/js/fixtures/test.webm diff --git a/common/lib/xmodule/xmodule/js/fixtures/video.html b/xmodule/js/fixtures/video.html similarity index 100% rename from common/lib/xmodule/xmodule/js/fixtures/video.html rename to xmodule/js/fixtures/video.html diff --git a/common/lib/xmodule/xmodule/js/fixtures/video_all.html b/xmodule/js/fixtures/video_all.html similarity index 100% rename from common/lib/xmodule/xmodule/js/fixtures/video_all.html rename to xmodule/js/fixtures/video_all.html diff --git a/common/lib/xmodule/xmodule/js/fixtures/video_autoadvance.html b/xmodule/js/fixtures/video_autoadvance.html similarity index 100% rename from common/lib/xmodule/xmodule/js/fixtures/video_autoadvance.html rename to xmodule/js/fixtures/video_autoadvance.html diff --git a/common/lib/xmodule/xmodule/js/fixtures/video_autoadvance_disabled.html b/xmodule/js/fixtures/video_autoadvance_disabled.html similarity index 100% rename from common/lib/xmodule/xmodule/js/fixtures/video_autoadvance_disabled.html rename to xmodule/js/fixtures/video_autoadvance_disabled.html diff --git a/common/lib/xmodule/xmodule/js/fixtures/video_hls.html b/xmodule/js/fixtures/video_hls.html similarity index 100% rename from common/lib/xmodule/xmodule/js/fixtures/video_hls.html rename to xmodule/js/fixtures/video_hls.html diff --git a/common/lib/xmodule/xmodule/js/fixtures/video_html5.html b/xmodule/js/fixtures/video_html5.html similarity index 100% rename from common/lib/xmodule/xmodule/js/fixtures/video_html5.html rename to xmodule/js/fixtures/video_html5.html diff --git a/common/lib/xmodule/xmodule/js/fixtures/video_no_captions.html b/xmodule/js/fixtures/video_no_captions.html similarity index 100% rename from common/lib/xmodule/xmodule/js/fixtures/video_no_captions.html rename to xmodule/js/fixtures/video_no_captions.html diff --git a/common/lib/xmodule/xmodule/js/fixtures/video_with_bumper.html b/xmodule/js/fixtures/video_with_bumper.html similarity index 100% rename from common/lib/xmodule/xmodule/js/fixtures/video_with_bumper.html rename to xmodule/js/fixtures/video_with_bumper.html diff --git a/common/lib/xmodule/xmodule/js/fixtures/video_yt_multiple.html b/xmodule/js/fixtures/video_yt_multiple.html similarity index 100% rename from common/lib/xmodule/xmodule/js/fixtures/video_yt_multiple.html rename to xmodule/js/fixtures/video_yt_multiple.html diff --git a/common/lib/xmodule/xmodule/js/fixtures/youtube_iframe_api.js b/xmodule/js/fixtures/youtube_iframe_api.js similarity index 100% rename from common/lib/xmodule/xmodule/js/fixtures/youtube_iframe_api.js rename to xmodule/js/fixtures/youtube_iframe_api.js diff --git a/common/lib/xmodule/xmodule/js/karma_runner.js b/xmodule/js/karma_runner.js similarity index 100% rename from common/lib/xmodule/xmodule/js/karma_runner.js rename to xmodule/js/karma_runner.js diff --git a/common/lib/xmodule/xmodule/js/karma_runner_webpack.js b/xmodule/js/karma_runner_webpack.js similarity index 100% rename from common/lib/xmodule/xmodule/js/karma_runner_webpack.js rename to xmodule/js/karma_runner_webpack.js diff --git a/common/lib/xmodule/xmodule/js/karma_xmodule.conf.js b/xmodule/js/karma_xmodule.conf.js similarity index 100% rename from common/lib/xmodule/xmodule/js/karma_xmodule.conf.js rename to xmodule/js/karma_xmodule.conf.js diff --git a/common/lib/xmodule/xmodule/js/karma_xmodule_webpack.conf.js b/xmodule/js/karma_xmodule_webpack.conf.js similarity index 100% rename from common/lib/xmodule/xmodule/js/karma_xmodule_webpack.conf.js rename to xmodule/js/karma_xmodule_webpack.conf.js diff --git a/common/lib/xmodule/xmodule/js/libpeerconnection.log b/xmodule/js/libpeerconnection.log similarity index 100% rename from common/lib/xmodule/xmodule/js/libpeerconnection.log rename to xmodule/js/libpeerconnection.log diff --git a/common/lib/xmodule/xmodule/js/public/js/library_content_edit.js b/xmodule/js/public/js/library_content_edit.js similarity index 100% rename from common/lib/xmodule/xmodule/js/public/js/library_content_edit.js rename to xmodule/js/public/js/library_content_edit.js diff --git a/common/lib/xmodule/xmodule/js/public/js/split_test_author_view.js b/xmodule/js/public/js/split_test_author_view.js similarity index 100% rename from common/lib/xmodule/xmodule/js/public/js/split_test_author_view.js rename to xmodule/js/public/js/split_test_author_view.js diff --git a/common/lib/xmodule/xmodule/js/public/js/split_test_staff.js b/xmodule/js/public/js/split_test_staff.js similarity index 100% rename from common/lib/xmodule/xmodule/js/public/js/split_test_staff.js rename to xmodule/js/public/js/split_test_staff.js diff --git a/common/lib/xmodule/xmodule/js/public/js/split_test_student.js b/xmodule/js/public/js/split_test_student.js similarity index 100% rename from common/lib/xmodule/xmodule/js/public/js/split_test_student.js rename to xmodule/js/public/js/split_test_student.js diff --git a/common/lib/xmodule/xmodule/js/public/js/vertical_student_view.js b/xmodule/js/public/js/vertical_student_view.js similarity index 100% rename from common/lib/xmodule/xmodule/js/public/js/vertical_student_view.js rename to xmodule/js/public/js/vertical_student_view.js diff --git a/common/lib/xmodule/xmodule/js/spec/annotatable/display_spec.js b/xmodule/js/spec/annotatable/display_spec.js similarity index 100% rename from common/lib/xmodule/xmodule/js/spec/annotatable/display_spec.js rename to xmodule/js/spec/annotatable/display_spec.js diff --git a/common/lib/xmodule/xmodule/js/spec/capa/display_spec.js b/xmodule/js/spec/capa/display_spec.js similarity index 100% rename from common/lib/xmodule/xmodule/js/spec/capa/display_spec.js rename to xmodule/js/spec/capa/display_spec.js diff --git a/common/lib/xmodule/xmodule/js/spec/capa/imageinput_spec.js b/xmodule/js/spec/capa/imageinput_spec.js similarity index 100% rename from common/lib/xmodule/xmodule/js/spec/capa/imageinput_spec.js rename to xmodule/js/spec/capa/imageinput_spec.js diff --git a/common/lib/xmodule/xmodule/js/spec/collapsible_spec.js b/xmodule/js/spec/collapsible_spec.js similarity index 100% rename from common/lib/xmodule/xmodule/js/spec/collapsible_spec.js rename to xmodule/js/spec/collapsible_spec.js diff --git a/common/lib/xmodule/xmodule/js/spec/helper.js b/xmodule/js/spec/helper.js similarity index 100% rename from common/lib/xmodule/xmodule/js/spec/helper.js rename to xmodule/js/spec/helper.js diff --git a/common/lib/xmodule/xmodule/js/spec/html/edit_spec.js b/xmodule/js/spec/html/edit_spec.js similarity index 100% rename from common/lib/xmodule/xmodule/js/spec/html/edit_spec.js rename to xmodule/js/spec/html/edit_spec.js diff --git a/common/lib/xmodule/xmodule/js/spec/main_requirejs.js b/xmodule/js/spec/main_requirejs.js similarity index 100% rename from common/lib/xmodule/xmodule/js/spec/main_requirejs.js rename to xmodule/js/spec/main_requirejs.js diff --git a/common/lib/xmodule/xmodule/js/spec/problem/edit_spec.js b/xmodule/js/spec/problem/edit_spec.js similarity index 100% rename from common/lib/xmodule/xmodule/js/spec/problem/edit_spec.js rename to xmodule/js/spec/problem/edit_spec.js diff --git a/common/lib/xmodule/xmodule/js/spec/problem/edit_spec_hint.js b/xmodule/js/spec/problem/edit_spec_hint.js similarity index 100% rename from common/lib/xmodule/xmodule/js/spec/problem/edit_spec_hint.js rename to xmodule/js/spec/problem/edit_spec_hint.js diff --git a/common/lib/xmodule/xmodule/js/spec/sequence/display_spec.js b/xmodule/js/spec/sequence/display_spec.js similarity index 100% rename from common/lib/xmodule/xmodule/js/spec/sequence/display_spec.js rename to xmodule/js/spec/sequence/display_spec.js diff --git a/common/lib/xmodule/xmodule/js/spec/split_test/staff_view_spec.js b/xmodule/js/spec/split_test/staff_view_spec.js similarity index 100% rename from common/lib/xmodule/xmodule/js/spec/split_test/staff_view_spec.js rename to xmodule/js/spec/split_test/staff_view_spec.js diff --git a/common/lib/xmodule/xmodule/js/spec/tabs/edit.js b/xmodule/js/spec/tabs/edit.js similarity index 100% rename from common/lib/xmodule/xmodule/js/spec/tabs/edit.js rename to xmodule/js/spec/tabs/edit.js diff --git a/common/lib/xmodule/xmodule/js/spec/time_spec.js b/xmodule/js/spec/time_spec.js similarity index 100% rename from common/lib/xmodule/xmodule/js/spec/time_spec.js rename to xmodule/js/spec/time_spec.js diff --git a/common/lib/xmodule/xmodule/js/spec/video/async_process_spec.js b/xmodule/js/spec/video/async_process_spec.js similarity index 100% rename from common/lib/xmodule/xmodule/js/spec/video/async_process_spec.js rename to xmodule/js/spec/video/async_process_spec.js diff --git a/common/lib/xmodule/xmodule/js/spec/video/completion_spec.js b/xmodule/js/spec/video/completion_spec.js similarity index 100% rename from common/lib/xmodule/xmodule/js/spec/video/completion_spec.js rename to xmodule/js/spec/video/completion_spec.js diff --git a/common/lib/xmodule/xmodule/js/spec/video/events_spec.js b/xmodule/js/spec/video/events_spec.js similarity index 100% rename from common/lib/xmodule/xmodule/js/spec/video/events_spec.js rename to xmodule/js/spec/video/events_spec.js diff --git a/common/lib/xmodule/xmodule/js/spec/video/general_spec.js b/xmodule/js/spec/video/general_spec.js similarity index 100% rename from common/lib/xmodule/xmodule/js/spec/video/general_spec.js rename to xmodule/js/spec/video/general_spec.js diff --git a/common/lib/xmodule/xmodule/js/spec/video/html5_video_spec.js b/xmodule/js/spec/video/html5_video_spec.js similarity index 100% rename from common/lib/xmodule/xmodule/js/spec/video/html5_video_spec.js rename to xmodule/js/spec/video/html5_video_spec.js diff --git a/common/lib/xmodule/xmodule/js/spec/video/initialize_spec.js b/xmodule/js/spec/video/initialize_spec.js similarity index 100% rename from common/lib/xmodule/xmodule/js/spec/video/initialize_spec.js rename to xmodule/js/spec/video/initialize_spec.js diff --git a/common/lib/xmodule/xmodule/js/spec/video/iterator_spec.js b/xmodule/js/spec/video/iterator_spec.js similarity index 100% rename from common/lib/xmodule/xmodule/js/spec/video/iterator_spec.js rename to xmodule/js/spec/video/iterator_spec.js diff --git a/common/lib/xmodule/xmodule/js/spec/video/resizer_spec.js b/xmodule/js/spec/video/resizer_spec.js similarity index 100% rename from common/lib/xmodule/xmodule/js/spec/video/resizer_spec.js rename to xmodule/js/spec/video/resizer_spec.js diff --git a/common/lib/xmodule/xmodule/js/spec/video/sjson_spec.js b/xmodule/js/spec/video/sjson_spec.js similarity index 100% rename from common/lib/xmodule/xmodule/js/spec/video/sjson_spec.js rename to xmodule/js/spec/video/sjson_spec.js diff --git a/common/lib/xmodule/xmodule/js/spec/video/video_autoadvance_spec.js b/xmodule/js/spec/video/video_autoadvance_spec.js similarity index 100% rename from common/lib/xmodule/xmodule/js/spec/video/video_autoadvance_spec.js rename to xmodule/js/spec/video/video_autoadvance_spec.js diff --git a/common/lib/xmodule/xmodule/js/spec/video/video_bumper_spec.js b/xmodule/js/spec/video/video_bumper_spec.js similarity index 100% rename from common/lib/xmodule/xmodule/js/spec/video/video_bumper_spec.js rename to xmodule/js/spec/video/video_bumper_spec.js diff --git a/common/lib/xmodule/xmodule/js/spec/video/video_caption_spec.js b/xmodule/js/spec/video/video_caption_spec.js similarity index 100% rename from common/lib/xmodule/xmodule/js/spec/video/video_caption_spec.js rename to xmodule/js/spec/video/video_caption_spec.js diff --git a/common/lib/xmodule/xmodule/js/spec/video/video_context_menu_spec.js b/xmodule/js/spec/video/video_context_menu_spec.js similarity index 100% rename from common/lib/xmodule/xmodule/js/spec/video/video_context_menu_spec.js rename to xmodule/js/spec/video/video_context_menu_spec.js diff --git a/common/lib/xmodule/xmodule/js/spec/video/video_control_spec.js b/xmodule/js/spec/video/video_control_spec.js similarity index 100% rename from common/lib/xmodule/xmodule/js/spec/video/video_control_spec.js rename to xmodule/js/spec/video/video_control_spec.js diff --git a/common/lib/xmodule/xmodule/js/spec/video/video_events_bumper_plugin_spec.js b/xmodule/js/spec/video/video_events_bumper_plugin_spec.js similarity index 100% rename from common/lib/xmodule/xmodule/js/spec/video/video_events_bumper_plugin_spec.js rename to xmodule/js/spec/video/video_events_bumper_plugin_spec.js diff --git a/common/lib/xmodule/xmodule/js/spec/video/video_events_plugin_spec.js b/xmodule/js/spec/video/video_events_plugin_spec.js similarity index 100% rename from common/lib/xmodule/xmodule/js/spec/video/video_events_plugin_spec.js rename to xmodule/js/spec/video/video_events_plugin_spec.js diff --git a/common/lib/xmodule/xmodule/js/spec/video/video_focus_grabber_spec.js b/xmodule/js/spec/video/video_focus_grabber_spec.js similarity index 100% rename from common/lib/xmodule/xmodule/js/spec/video/video_focus_grabber_spec.js rename to xmodule/js/spec/video/video_focus_grabber_spec.js diff --git a/common/lib/xmodule/xmodule/js/spec/video/video_full_screen_spec.js b/xmodule/js/spec/video/video_full_screen_spec.js similarity index 100% rename from common/lib/xmodule/xmodule/js/spec/video/video_full_screen_spec.js rename to xmodule/js/spec/video/video_full_screen_spec.js diff --git a/common/lib/xmodule/xmodule/js/spec/video/video_play_pause_control_spec.js b/xmodule/js/spec/video/video_play_pause_control_spec.js similarity index 100% rename from common/lib/xmodule/xmodule/js/spec/video/video_play_pause_control_spec.js rename to xmodule/js/spec/video/video_play_pause_control_spec.js diff --git a/common/lib/xmodule/xmodule/js/spec/video/video_play_placeholder_spec.js b/xmodule/js/spec/video/video_play_placeholder_spec.js similarity index 100% rename from common/lib/xmodule/xmodule/js/spec/video/video_play_placeholder_spec.js rename to xmodule/js/spec/video/video_play_placeholder_spec.js diff --git a/common/lib/xmodule/xmodule/js/spec/video/video_play_skip_control_spec.js b/xmodule/js/spec/video/video_play_skip_control_spec.js similarity index 100% rename from common/lib/xmodule/xmodule/js/spec/video/video_play_skip_control_spec.js rename to xmodule/js/spec/video/video_play_skip_control_spec.js diff --git a/common/lib/xmodule/xmodule/js/spec/video/video_player_spec.js b/xmodule/js/spec/video/video_player_spec.js similarity index 100% rename from common/lib/xmodule/xmodule/js/spec/video/video_player_spec.js rename to xmodule/js/spec/video/video_player_spec.js diff --git a/common/lib/xmodule/xmodule/js/spec/video/video_poster_spec.js b/xmodule/js/spec/video/video_poster_spec.js similarity index 100% rename from common/lib/xmodule/xmodule/js/spec/video/video_poster_spec.js rename to xmodule/js/spec/video/video_poster_spec.js diff --git a/common/lib/xmodule/xmodule/js/spec/video/video_progress_slider_spec.js b/xmodule/js/spec/video/video_progress_slider_spec.js similarity index 100% rename from common/lib/xmodule/xmodule/js/spec/video/video_progress_slider_spec.js rename to xmodule/js/spec/video/video_progress_slider_spec.js diff --git a/common/lib/xmodule/xmodule/js/spec/video/video_quality_control_spec.js b/xmodule/js/spec/video/video_quality_control_spec.js similarity index 100% rename from common/lib/xmodule/xmodule/js/spec/video/video_quality_control_spec.js rename to xmodule/js/spec/video/video_quality_control_spec.js diff --git a/common/lib/xmodule/xmodule/js/spec/video/video_save_state_plugin_spec.js b/xmodule/js/spec/video/video_save_state_plugin_spec.js similarity index 100% rename from common/lib/xmodule/xmodule/js/spec/video/video_save_state_plugin_spec.js rename to xmodule/js/spec/video/video_save_state_plugin_spec.js diff --git a/common/lib/xmodule/xmodule/js/spec/video/video_skip_control_spec.js b/xmodule/js/spec/video/video_skip_control_spec.js similarity index 100% rename from common/lib/xmodule/xmodule/js/spec/video/video_skip_control_spec.js rename to xmodule/js/spec/video/video_skip_control_spec.js diff --git a/common/lib/xmodule/xmodule/js/spec/video/video_speed_control_spec.js b/xmodule/js/spec/video/video_speed_control_spec.js similarity index 100% rename from common/lib/xmodule/xmodule/js/spec/video/video_speed_control_spec.js rename to xmodule/js/spec/video/video_speed_control_spec.js diff --git a/common/lib/xmodule/xmodule/js/spec/video/video_storage_spec.js b/xmodule/js/spec/video/video_storage_spec.js similarity index 100% rename from common/lib/xmodule/xmodule/js/spec/video/video_storage_spec.js rename to xmodule/js/spec/video/video_storage_spec.js diff --git a/common/lib/xmodule/xmodule/js/spec/video/video_volume_control_spec.js b/xmodule/js/spec/video/video_volume_control_spec.js similarity index 100% rename from common/lib/xmodule/xmodule/js/spec/video/video_volume_control_spec.js rename to xmodule/js/spec/video/video_volume_control_spec.js diff --git a/common/lib/xmodule/xmodule/js/spec/video_helper.js b/xmodule/js/spec/video_helper.js similarity index 100% rename from common/lib/xmodule/xmodule/js/spec/video_helper.js rename to xmodule/js/spec/video_helper.js diff --git a/common/lib/xmodule/xmodule/js/spec/xmodule_spec.js b/xmodule/js/spec/xmodule_spec.js similarity index 100% rename from common/lib/xmodule/xmodule/js/spec/xmodule_spec.js rename to xmodule/js/spec/xmodule_spec.js diff --git a/common/lib/xmodule/xmodule/js/src/annotatable/display.js b/xmodule/js/src/annotatable/display.js similarity index 100% rename from common/lib/xmodule/xmodule/js/src/annotatable/display.js rename to xmodule/js/src/annotatable/display.js diff --git a/common/lib/xmodule/xmodule/js/src/capa/.gitignore b/xmodule/js/src/capa/.gitignore similarity index 100% rename from common/lib/xmodule/xmodule/js/src/capa/.gitignore rename to xmodule/js/src/capa/.gitignore diff --git a/common/lib/xmodule/xmodule/js/src/capa/display.js b/xmodule/js/src/capa/display.js similarity index 100% rename from common/lib/xmodule/xmodule/js/src/capa/display.js rename to xmodule/js/src/capa/display.js diff --git a/common/lib/xmodule/xmodule/js/src/capa/imageinput.js b/xmodule/js/src/capa/imageinput.js similarity index 100% rename from common/lib/xmodule/xmodule/js/src/capa/imageinput.js rename to xmodule/js/src/capa/imageinput.js diff --git a/common/lib/xmodule/xmodule/js/src/capa/schematic.js b/xmodule/js/src/capa/schematic.js similarity index 100% rename from common/lib/xmodule/xmodule/js/src/capa/schematic.js rename to xmodule/js/src/capa/schematic.js diff --git a/common/lib/xmodule/xmodule/js/src/collapsible.js b/xmodule/js/src/collapsible.js similarity index 100% rename from common/lib/xmodule/xmodule/js/src/collapsible.js rename to xmodule/js/src/collapsible.js diff --git a/common/lib/xmodule/xmodule/js/src/conditional/display.js b/xmodule/js/src/conditional/display.js similarity index 100% rename from common/lib/xmodule/xmodule/js/src/conditional/display.js rename to xmodule/js/src/conditional/display.js diff --git a/common/lib/xmodule/xmodule/js/src/discussion/display.js b/xmodule/js/src/discussion/display.js similarity index 100% rename from common/lib/xmodule/xmodule/js/src/discussion/display.js rename to xmodule/js/src/discussion/display.js diff --git a/common/lib/xmodule/xmodule/js/src/html/display.js b/xmodule/js/src/html/display.js similarity index 100% rename from common/lib/xmodule/xmodule/js/src/html/display.js rename to xmodule/js/src/html/display.js diff --git a/common/lib/xmodule/xmodule/js/src/html/edit.js b/xmodule/js/src/html/edit.js similarity index 100% rename from common/lib/xmodule/xmodule/js/src/html/edit.js rename to xmodule/js/src/html/edit.js diff --git a/common/lib/xmodule/xmodule/js/src/html/imageModal.js b/xmodule/js/src/html/imageModal.js similarity index 100% rename from common/lib/xmodule/xmodule/js/src/html/imageModal.js rename to xmodule/js/src/html/imageModal.js diff --git a/common/lib/xmodule/xmodule/js/src/javascript_loader.js b/xmodule/js/src/javascript_loader.js similarity index 100% rename from common/lib/xmodule/xmodule/js/src/javascript_loader.js rename to xmodule/js/src/javascript_loader.js diff --git a/common/lib/xmodule/xmodule/js/src/lti/lti.js b/xmodule/js/src/lti/lti.js similarity index 100% rename from common/lib/xmodule/xmodule/js/src/lti/lti.js rename to xmodule/js/src/lti/lti.js diff --git a/common/lib/xmodule/xmodule/js/src/poll/.gitignore b/xmodule/js/src/poll/.gitignore similarity index 100% rename from common/lib/xmodule/xmodule/js/src/poll/.gitignore rename to xmodule/js/src/poll/.gitignore diff --git a/common/lib/xmodule/xmodule/js/src/poll/poll.js b/xmodule/js/src/poll/poll.js similarity index 100% rename from common/lib/xmodule/xmodule/js/src/poll/poll.js rename to xmodule/js/src/poll/poll.js diff --git a/common/lib/xmodule/xmodule/js/src/poll/poll_main.js b/xmodule/js/src/poll/poll_main.js similarity index 100% rename from common/lib/xmodule/xmodule/js/src/poll/poll_main.js rename to xmodule/js/src/poll/poll_main.js diff --git a/common/lib/xmodule/xmodule/js/src/problem/.gitignore b/xmodule/js/src/problem/.gitignore similarity index 100% rename from common/lib/xmodule/xmodule/js/src/problem/.gitignore rename to xmodule/js/src/problem/.gitignore diff --git a/common/lib/xmodule/xmodule/js/src/problem/edit.js b/xmodule/js/src/problem/edit.js similarity index 100% rename from common/lib/xmodule/xmodule/js/src/problem/edit.js rename to xmodule/js/src/problem/edit.js diff --git a/common/lib/xmodule/xmodule/js/src/raw/edit/json.js b/xmodule/js/src/raw/edit/json.js similarity index 100% rename from common/lib/xmodule/xmodule/js/src/raw/edit/json.js rename to xmodule/js/src/raw/edit/json.js diff --git a/common/lib/xmodule/xmodule/js/src/raw/edit/metadata-only.js b/xmodule/js/src/raw/edit/metadata-only.js similarity index 100% rename from common/lib/xmodule/xmodule/js/src/raw/edit/metadata-only.js rename to xmodule/js/src/raw/edit/metadata-only.js diff --git a/common/lib/xmodule/xmodule/js/src/raw/edit/xml.js b/xmodule/js/src/raw/edit/xml.js similarity index 100% rename from common/lib/xmodule/xmodule/js/src/raw/edit/xml.js rename to xmodule/js/src/raw/edit/xml.js diff --git a/common/lib/xmodule/xmodule/js/src/sequence/display.js b/xmodule/js/src/sequence/display.js similarity index 100% rename from common/lib/xmodule/xmodule/js/src/sequence/display.js rename to xmodule/js/src/sequence/display.js diff --git a/common/lib/xmodule/xmodule/js/src/sequence/edit.js b/xmodule/js/src/sequence/edit.js similarity index 100% rename from common/lib/xmodule/xmodule/js/src/sequence/edit.js rename to xmodule/js/src/sequence/edit.js diff --git a/common/lib/xmodule/xmodule/js/src/tabs/tabs-aggregator.js b/xmodule/js/src/tabs/tabs-aggregator.js similarity index 100% rename from common/lib/xmodule/xmodule/js/src/tabs/tabs-aggregator.js rename to xmodule/js/src/tabs/tabs-aggregator.js diff --git a/common/lib/xmodule/xmodule/js/src/time.js b/xmodule/js/src/time.js similarity index 100% rename from common/lib/xmodule/xmodule/js/src/time.js rename to xmodule/js/src/time.js diff --git a/common/lib/xmodule/xmodule/js/src/vertical/edit.js b/xmodule/js/src/vertical/edit.js similarity index 100% rename from common/lib/xmodule/xmodule/js/src/vertical/edit.js rename to xmodule/js/src/vertical/edit.js diff --git a/common/lib/xmodule/xmodule/js/src/video/00_async_process.js b/xmodule/js/src/video/00_async_process.js similarity index 100% rename from common/lib/xmodule/xmodule/js/src/video/00_async_process.js rename to xmodule/js/src/video/00_async_process.js diff --git a/common/lib/xmodule/xmodule/js/src/video/00_component.js b/xmodule/js/src/video/00_component.js similarity index 100% rename from common/lib/xmodule/xmodule/js/src/video/00_component.js rename to xmodule/js/src/video/00_component.js diff --git a/common/lib/xmodule/xmodule/js/src/video/00_i18n.js b/xmodule/js/src/video/00_i18n.js similarity index 100% rename from common/lib/xmodule/xmodule/js/src/video/00_i18n.js rename to xmodule/js/src/video/00_i18n.js diff --git a/common/lib/xmodule/xmodule/js/src/video/00_iterator.js b/xmodule/js/src/video/00_iterator.js similarity index 100% rename from common/lib/xmodule/xmodule/js/src/video/00_iterator.js rename to xmodule/js/src/video/00_iterator.js diff --git a/common/lib/xmodule/xmodule/js/src/video/00_resizer.js b/xmodule/js/src/video/00_resizer.js similarity index 100% rename from common/lib/xmodule/xmodule/js/src/video/00_resizer.js rename to xmodule/js/src/video/00_resizer.js diff --git a/common/lib/xmodule/xmodule/js/src/video/00_sjson.js b/xmodule/js/src/video/00_sjson.js similarity index 100% rename from common/lib/xmodule/xmodule/js/src/video/00_sjson.js rename to xmodule/js/src/video/00_sjson.js diff --git a/common/lib/xmodule/xmodule/js/src/video/00_video_storage.js b/xmodule/js/src/video/00_video_storage.js similarity index 100% rename from common/lib/xmodule/xmodule/js/src/video/00_video_storage.js rename to xmodule/js/src/video/00_video_storage.js diff --git a/common/lib/xmodule/xmodule/js/src/video/01_initialize.js b/xmodule/js/src/video/01_initialize.js similarity index 100% rename from common/lib/xmodule/xmodule/js/src/video/01_initialize.js rename to xmodule/js/src/video/01_initialize.js diff --git a/common/lib/xmodule/xmodule/js/src/video/025_focus_grabber.js b/xmodule/js/src/video/025_focus_grabber.js similarity index 100% rename from common/lib/xmodule/xmodule/js/src/video/025_focus_grabber.js rename to xmodule/js/src/video/025_focus_grabber.js diff --git a/common/lib/xmodule/xmodule/js/src/video/02_html5_hls_video.js b/xmodule/js/src/video/02_html5_hls_video.js similarity index 100% rename from common/lib/xmodule/xmodule/js/src/video/02_html5_hls_video.js rename to xmodule/js/src/video/02_html5_hls_video.js diff --git a/common/lib/xmodule/xmodule/js/src/video/02_html5_video.js b/xmodule/js/src/video/02_html5_video.js similarity index 100% rename from common/lib/xmodule/xmodule/js/src/video/02_html5_video.js rename to xmodule/js/src/video/02_html5_video.js diff --git a/common/lib/xmodule/xmodule/js/src/video/035_video_accessible_menu.js b/xmodule/js/src/video/035_video_accessible_menu.js similarity index 100% rename from common/lib/xmodule/xmodule/js/src/video/035_video_accessible_menu.js rename to xmodule/js/src/video/035_video_accessible_menu.js diff --git a/common/lib/xmodule/xmodule/js/src/video/03_video_player.js b/xmodule/js/src/video/03_video_player.js similarity index 100% rename from common/lib/xmodule/xmodule/js/src/video/03_video_player.js rename to xmodule/js/src/video/03_video_player.js diff --git a/common/lib/xmodule/xmodule/js/src/video/04_video_control.js b/xmodule/js/src/video/04_video_control.js similarity index 100% rename from common/lib/xmodule/xmodule/js/src/video/04_video_control.js rename to xmodule/js/src/video/04_video_control.js diff --git a/common/lib/xmodule/xmodule/js/src/video/04_video_full_screen.js b/xmodule/js/src/video/04_video_full_screen.js similarity index 100% rename from common/lib/xmodule/xmodule/js/src/video/04_video_full_screen.js rename to xmodule/js/src/video/04_video_full_screen.js diff --git a/common/lib/xmodule/xmodule/js/src/video/05_video_quality_control.js b/xmodule/js/src/video/05_video_quality_control.js similarity index 100% rename from common/lib/xmodule/xmodule/js/src/video/05_video_quality_control.js rename to xmodule/js/src/video/05_video_quality_control.js diff --git a/common/lib/xmodule/xmodule/js/src/video/06_video_progress_slider.js b/xmodule/js/src/video/06_video_progress_slider.js similarity index 100% rename from common/lib/xmodule/xmodule/js/src/video/06_video_progress_slider.js rename to xmodule/js/src/video/06_video_progress_slider.js diff --git a/common/lib/xmodule/xmodule/js/src/video/07_video_volume_control.js b/xmodule/js/src/video/07_video_volume_control.js similarity index 100% rename from common/lib/xmodule/xmodule/js/src/video/07_video_volume_control.js rename to xmodule/js/src/video/07_video_volume_control.js diff --git a/common/lib/xmodule/xmodule/js/src/video/08_video_auto_advance_control.js b/xmodule/js/src/video/08_video_auto_advance_control.js similarity index 100% rename from common/lib/xmodule/xmodule/js/src/video/08_video_auto_advance_control.js rename to xmodule/js/src/video/08_video_auto_advance_control.js diff --git a/common/lib/xmodule/xmodule/js/src/video/08_video_speed_control.js b/xmodule/js/src/video/08_video_speed_control.js similarity index 100% rename from common/lib/xmodule/xmodule/js/src/video/08_video_speed_control.js rename to xmodule/js/src/video/08_video_speed_control.js diff --git a/common/lib/xmodule/xmodule/js/src/video/095_video_context_menu.js b/xmodule/js/src/video/095_video_context_menu.js similarity index 100% rename from common/lib/xmodule/xmodule/js/src/video/095_video_context_menu.js rename to xmodule/js/src/video/095_video_context_menu.js diff --git a/common/lib/xmodule/xmodule/js/src/video/09_bumper.js b/xmodule/js/src/video/09_bumper.js similarity index 100% rename from common/lib/xmodule/xmodule/js/src/video/09_bumper.js rename to xmodule/js/src/video/09_bumper.js diff --git a/common/lib/xmodule/xmodule/js/src/video/09_completion.js b/xmodule/js/src/video/09_completion.js similarity index 100% rename from common/lib/xmodule/xmodule/js/src/video/09_completion.js rename to xmodule/js/src/video/09_completion.js diff --git a/common/lib/xmodule/xmodule/js/src/video/09_events_bumper_plugin.js b/xmodule/js/src/video/09_events_bumper_plugin.js similarity index 100% rename from common/lib/xmodule/xmodule/js/src/video/09_events_bumper_plugin.js rename to xmodule/js/src/video/09_events_bumper_plugin.js diff --git a/common/lib/xmodule/xmodule/js/src/video/09_events_plugin.js b/xmodule/js/src/video/09_events_plugin.js similarity index 100% rename from common/lib/xmodule/xmodule/js/src/video/09_events_plugin.js rename to xmodule/js/src/video/09_events_plugin.js diff --git a/common/lib/xmodule/xmodule/js/src/video/09_play_pause_control.js b/xmodule/js/src/video/09_play_pause_control.js similarity index 100% rename from common/lib/xmodule/xmodule/js/src/video/09_play_pause_control.js rename to xmodule/js/src/video/09_play_pause_control.js diff --git a/common/lib/xmodule/xmodule/js/src/video/09_play_placeholder.js b/xmodule/js/src/video/09_play_placeholder.js similarity index 100% rename from common/lib/xmodule/xmodule/js/src/video/09_play_placeholder.js rename to xmodule/js/src/video/09_play_placeholder.js diff --git a/common/lib/xmodule/xmodule/js/src/video/09_play_skip_control.js b/xmodule/js/src/video/09_play_skip_control.js similarity index 100% rename from common/lib/xmodule/xmodule/js/src/video/09_play_skip_control.js rename to xmodule/js/src/video/09_play_skip_control.js diff --git a/common/lib/xmodule/xmodule/js/src/video/09_poster.js b/xmodule/js/src/video/09_poster.js similarity index 100% rename from common/lib/xmodule/xmodule/js/src/video/09_poster.js rename to xmodule/js/src/video/09_poster.js diff --git a/common/lib/xmodule/xmodule/js/src/video/09_save_state_plugin.js b/xmodule/js/src/video/09_save_state_plugin.js similarity index 100% rename from common/lib/xmodule/xmodule/js/src/video/09_save_state_plugin.js rename to xmodule/js/src/video/09_save_state_plugin.js diff --git a/common/lib/xmodule/xmodule/js/src/video/09_skip_control.js b/xmodule/js/src/video/09_skip_control.js similarity index 100% rename from common/lib/xmodule/xmodule/js/src/video/09_skip_control.js rename to xmodule/js/src/video/09_skip_control.js diff --git a/common/lib/xmodule/xmodule/js/src/video/09_video_caption.js b/xmodule/js/src/video/09_video_caption.js similarity index 100% rename from common/lib/xmodule/xmodule/js/src/video/09_video_caption.js rename to xmodule/js/src/video/09_video_caption.js diff --git a/common/lib/xmodule/xmodule/js/src/video/10_commands.js b/xmodule/js/src/video/10_commands.js similarity index 100% rename from common/lib/xmodule/xmodule/js/src/video/10_commands.js rename to xmodule/js/src/video/10_commands.js diff --git a/common/lib/xmodule/xmodule/js/src/video/10_main.js b/xmodule/js/src/video/10_main.js similarity index 100% rename from common/lib/xmodule/xmodule/js/src/video/10_main.js rename to xmodule/js/src/video/10_main.js diff --git a/common/lib/xmodule/xmodule/js/src/xmodule.js b/xmodule/js/src/xmodule.js similarity index 100% rename from common/lib/xmodule/xmodule/js/src/xmodule.js rename to xmodule/js/src/xmodule.js diff --git a/common/lib/xmodule/xmodule/library_content_module.py b/xmodule/library_content_module.py similarity index 100% rename from common/lib/xmodule/xmodule/library_content_module.py rename to xmodule/library_content_module.py diff --git a/common/lib/xmodule/xmodule/library_root_xblock.py b/xmodule/library_root_xblock.py similarity index 100% rename from common/lib/xmodule/xmodule/library_root_xblock.py rename to xmodule/library_root_xblock.py diff --git a/common/lib/xmodule/xmodule/library_sourced_block.py b/xmodule/library_sourced_block.py similarity index 100% rename from common/lib/xmodule/xmodule/library_sourced_block.py rename to xmodule/library_sourced_block.py diff --git a/common/lib/xmodule/xmodule/library_tools.py b/xmodule/library_tools.py similarity index 100% rename from common/lib/xmodule/xmodule/library_tools.py rename to xmodule/library_tools.py diff --git a/common/lib/xmodule/xmodule/lti_2_util.py b/xmodule/lti_2_util.py similarity index 100% rename from common/lib/xmodule/xmodule/lti_2_util.py rename to xmodule/lti_2_util.py diff --git a/common/lib/xmodule/xmodule/lti_module.py b/xmodule/lti_module.py similarity index 100% rename from common/lib/xmodule/xmodule/lti_module.py rename to xmodule/lti_module.py diff --git a/common/lib/xmodule/xmodule/mako_module.py b/xmodule/mako_module.py similarity index 100% rename from common/lib/xmodule/xmodule/mako_module.py rename to xmodule/mako_module.py diff --git a/common/lib/xmodule/xmodule/modulestore/__init__.py b/xmodule/modulestore/__init__.py similarity index 100% rename from common/lib/xmodule/xmodule/modulestore/__init__.py rename to xmodule/modulestore/__init__.py diff --git a/common/lib/xmodule/xmodule/modulestore/django.py b/xmodule/modulestore/django.py similarity index 100% rename from common/lib/xmodule/xmodule/modulestore/django.py rename to xmodule/modulestore/django.py diff --git a/common/lib/xmodule/xmodule/modulestore/docs/index.rst b/xmodule/modulestore/docs/index.rst similarity index 100% rename from common/lib/xmodule/xmodule/modulestore/docs/index.rst rename to xmodule/modulestore/docs/index.rst diff --git a/common/lib/xmodule/xmodule/modulestore/docs/mixedmodulestore.rst b/xmodule/modulestore/docs/mixedmodulestore.rst similarity index 100% rename from common/lib/xmodule/xmodule/modulestore/docs/mixedmodulestore.rst rename to xmodule/modulestore/docs/mixedmodulestore.rst diff --git a/common/lib/xmodule/xmodule/modulestore/docs/overview.rst b/xmodule/modulestore/docs/overview.rst similarity index 100% rename from common/lib/xmodule/xmodule/modulestore/docs/overview.rst rename to xmodule/modulestore/docs/overview.rst diff --git a/common/lib/xmodule/xmodule/modulestore/docs/split-mongo.rst b/xmodule/modulestore/docs/split-mongo.rst similarity index 100% rename from common/lib/xmodule/xmodule/modulestore/docs/split-mongo.rst rename to xmodule/modulestore/docs/split-mongo.rst diff --git a/common/lib/xmodule/xmodule/modulestore/draft.py b/xmodule/modulestore/draft.py similarity index 100% rename from common/lib/xmodule/xmodule/modulestore/draft.py rename to xmodule/modulestore/draft.py diff --git a/common/lib/xmodule/xmodule/modulestore/draft_and_published.py b/xmodule/modulestore/draft_and_published.py similarity index 100% rename from common/lib/xmodule/xmodule/modulestore/draft_and_published.py rename to xmodule/modulestore/draft_and_published.py diff --git a/common/lib/xmodule/xmodule/modulestore/edit_info.py b/xmodule/modulestore/edit_info.py similarity index 100% rename from common/lib/xmodule/xmodule/modulestore/edit_info.py rename to xmodule/modulestore/edit_info.py diff --git a/common/lib/xmodule/xmodule/modulestore/exceptions.py b/xmodule/modulestore/exceptions.py similarity index 100% rename from common/lib/xmodule/xmodule/modulestore/exceptions.py rename to xmodule/modulestore/exceptions.py diff --git a/common/lib/xmodule/xmodule/modulestore/inheritance.py b/xmodule/modulestore/inheritance.py similarity index 100% rename from common/lib/xmodule/xmodule/modulestore/inheritance.py rename to xmodule/modulestore/inheritance.py diff --git a/common/lib/xmodule/xmodule/modulestore/mixed.py b/xmodule/modulestore/mixed.py similarity index 100% rename from common/lib/xmodule/xmodule/modulestore/mixed.py rename to xmodule/modulestore/mixed.py diff --git a/common/lib/xmodule/xmodule/modulestore/modulestore_settings.py b/xmodule/modulestore/modulestore_settings.py similarity index 100% rename from common/lib/xmodule/xmodule/modulestore/modulestore_settings.py rename to xmodule/modulestore/modulestore_settings.py diff --git a/common/lib/xmodule/xmodule/modulestore/mongo/__init__.py b/xmodule/modulestore/mongo/__init__.py similarity index 100% rename from common/lib/xmodule/xmodule/modulestore/mongo/__init__.py rename to xmodule/modulestore/mongo/__init__.py diff --git a/common/lib/xmodule/xmodule/modulestore/mongo/base.py b/xmodule/modulestore/mongo/base.py similarity index 100% rename from common/lib/xmodule/xmodule/modulestore/mongo/base.py rename to xmodule/modulestore/mongo/base.py diff --git a/common/lib/xmodule/xmodule/modulestore/mongo/draft.py b/xmodule/modulestore/mongo/draft.py similarity index 100% rename from common/lib/xmodule/xmodule/modulestore/mongo/draft.py rename to xmodule/modulestore/mongo/draft.py diff --git a/common/lib/xmodule/xmodule/modulestore/mongoengine_fields.py b/xmodule/modulestore/mongoengine_fields.py similarity index 100% rename from common/lib/xmodule/xmodule/modulestore/mongoengine_fields.py rename to xmodule/modulestore/mongoengine_fields.py diff --git a/common/lib/xmodule/xmodule/modulestore/perf_tests/__init__.py b/xmodule/modulestore/perf_tests/__init__.py similarity index 100% rename from common/lib/xmodule/xmodule/modulestore/perf_tests/__init__.py rename to xmodule/modulestore/perf_tests/__init__.py diff --git a/common/lib/xmodule/xmodule/modulestore/perf_tests/generate_asset_xml.py b/xmodule/modulestore/perf_tests/generate_asset_xml.py similarity index 100% rename from common/lib/xmodule/xmodule/modulestore/perf_tests/generate_asset_xml.py rename to xmodule/modulestore/perf_tests/generate_asset_xml.py diff --git a/common/lib/xmodule/xmodule/modulestore/perf_tests/generate_report.py b/xmodule/modulestore/perf_tests/generate_report.py similarity index 100% rename from common/lib/xmodule/xmodule/modulestore/perf_tests/generate_report.py rename to xmodule/modulestore/perf_tests/generate_report.py diff --git a/common/lib/xmodule/xmodule/modulestore/perf_tests/test_asset_import_export.py b/xmodule/modulestore/perf_tests/test_asset_import_export.py similarity index 100% rename from common/lib/xmodule/xmodule/modulestore/perf_tests/test_asset_import_export.py rename to xmodule/modulestore/perf_tests/test_asset_import_export.py diff --git a/common/lib/xmodule/xmodule/modulestore/search.py b/xmodule/modulestore/search.py similarity index 100% rename from common/lib/xmodule/xmodule/modulestore/search.py rename to xmodule/modulestore/search.py diff --git a/common/lib/xmodule/xmodule/modulestore/split_migrator.py b/xmodule/modulestore/split_migrator.py similarity index 100% rename from common/lib/xmodule/xmodule/modulestore/split_migrator.py rename to xmodule/modulestore/split_migrator.py diff --git a/common/lib/xmodule/xmodule/modulestore/split_mongo/__init__.py b/xmodule/modulestore/split_mongo/__init__.py similarity index 100% rename from common/lib/xmodule/xmodule/modulestore/split_mongo/__init__.py rename to xmodule/modulestore/split_mongo/__init__.py diff --git a/common/lib/xmodule/xmodule/modulestore/split_mongo/caching_descriptor_system.py b/xmodule/modulestore/split_mongo/caching_descriptor_system.py similarity index 100% rename from common/lib/xmodule/xmodule/modulestore/split_mongo/caching_descriptor_system.py rename to xmodule/modulestore/split_mongo/caching_descriptor_system.py diff --git a/common/lib/xmodule/xmodule/modulestore/split_mongo/definition_lazy_loader.py b/xmodule/modulestore/split_mongo/definition_lazy_loader.py similarity index 100% rename from common/lib/xmodule/xmodule/modulestore/split_mongo/definition_lazy_loader.py rename to xmodule/modulestore/split_mongo/definition_lazy_loader.py diff --git a/common/lib/xmodule/xmodule/modulestore/split_mongo/id_manager.py b/xmodule/modulestore/split_mongo/id_manager.py similarity index 100% rename from common/lib/xmodule/xmodule/modulestore/split_mongo/id_manager.py rename to xmodule/modulestore/split_mongo/id_manager.py diff --git a/common/lib/xmodule/xmodule/modulestore/split_mongo/mongo_connection.py b/xmodule/modulestore/split_mongo/mongo_connection.py similarity index 100% rename from common/lib/xmodule/xmodule/modulestore/split_mongo/mongo_connection.py rename to xmodule/modulestore/split_mongo/mongo_connection.py diff --git a/common/lib/xmodule/xmodule/modulestore/split_mongo/split.py b/xmodule/modulestore/split_mongo/split.py similarity index 100% rename from common/lib/xmodule/xmodule/modulestore/split_mongo/split.py rename to xmodule/modulestore/split_mongo/split.py diff --git a/common/lib/xmodule/xmodule/modulestore/split_mongo/split_draft.py b/xmodule/modulestore/split_mongo/split_draft.py similarity index 100% rename from common/lib/xmodule/xmodule/modulestore/split_mongo/split_draft.py rename to xmodule/modulestore/split_mongo/split_draft.py diff --git a/common/lib/xmodule/xmodule/modulestore/split_mongo/split_mongo_kvs.py b/xmodule/modulestore/split_mongo/split_mongo_kvs.py similarity index 100% rename from common/lib/xmodule/xmodule/modulestore/split_mongo/split_mongo_kvs.py rename to xmodule/modulestore/split_mongo/split_mongo_kvs.py diff --git a/common/lib/xmodule/xmodule/modulestore/store_utilities.py b/xmodule/modulestore/store_utilities.py similarity index 100% rename from common/lib/xmodule/xmodule/modulestore/store_utilities.py rename to xmodule/modulestore/store_utilities.py diff --git a/common/lib/xmodule/xmodule/modulestore/tests/__init__.py b/xmodule/modulestore/tests/__init__.py similarity index 100% rename from common/lib/xmodule/xmodule/modulestore/tests/__init__.py rename to xmodule/modulestore/tests/__init__.py diff --git a/common/lib/xmodule/xmodule/modulestore/tests/django_utils.py b/xmodule/modulestore/tests/django_utils.py similarity index 100% rename from common/lib/xmodule/xmodule/modulestore/tests/django_utils.py rename to xmodule/modulestore/tests/django_utils.py diff --git a/common/lib/xmodule/xmodule/modulestore/tests/factories.py b/xmodule/modulestore/tests/factories.py similarity index 100% rename from common/lib/xmodule/xmodule/modulestore/tests/factories.py rename to xmodule/modulestore/tests/factories.py diff --git a/common/lib/xmodule/xmodule/modulestore/tests/mongo_connection.py b/xmodule/modulestore/tests/mongo_connection.py similarity index 100% rename from common/lib/xmodule/xmodule/modulestore/tests/mongo_connection.py rename to xmodule/modulestore/tests/mongo_connection.py diff --git a/common/lib/xmodule/xmodule/modulestore/tests/sample_courses.py b/xmodule/modulestore/tests/sample_courses.py similarity index 100% rename from common/lib/xmodule/xmodule/modulestore/tests/sample_courses.py rename to xmodule/modulestore/tests/sample_courses.py diff --git a/common/lib/xmodule/xmodule/modulestore/tests/test_abstraction.py b/xmodule/modulestore/tests/test_abstraction.py similarity index 100% rename from common/lib/xmodule/xmodule/modulestore/tests/test_abstraction.py rename to xmodule/modulestore/tests/test_abstraction.py diff --git a/common/lib/xmodule/xmodule/modulestore/tests/test_asides.py b/xmodule/modulestore/tests/test_asides.py similarity index 100% rename from common/lib/xmodule/xmodule/modulestore/tests/test_asides.py rename to xmodule/modulestore/tests/test_asides.py diff --git a/common/lib/xmodule/xmodule/modulestore/tests/test_assetstore.py b/xmodule/modulestore/tests/test_assetstore.py similarity index 100% rename from common/lib/xmodule/xmodule/modulestore/tests/test_assetstore.py rename to xmodule/modulestore/tests/test_assetstore.py diff --git a/common/lib/xmodule/xmodule/modulestore/tests/test_contentstore.py b/xmodule/modulestore/tests/test_contentstore.py similarity index 100% rename from common/lib/xmodule/xmodule/modulestore/tests/test_contentstore.py rename to xmodule/modulestore/tests/test_contentstore.py diff --git a/common/lib/xmodule/xmodule/modulestore/tests/test_cross_modulestore_import_export.py b/xmodule/modulestore/tests/test_cross_modulestore_import_export.py similarity index 100% rename from common/lib/xmodule/xmodule/modulestore/tests/test_cross_modulestore_import_export.py rename to xmodule/modulestore/tests/test_cross_modulestore_import_export.py diff --git a/common/lib/xmodule/xmodule/modulestore/tests/test_inheritance.py b/xmodule/modulestore/tests/test_inheritance.py similarity index 100% rename from common/lib/xmodule/xmodule/modulestore/tests/test_inheritance.py rename to xmodule/modulestore/tests/test_inheritance.py diff --git a/common/lib/xmodule/xmodule/modulestore/tests/test_libraries.py b/xmodule/modulestore/tests/test_libraries.py similarity index 100% rename from common/lib/xmodule/xmodule/modulestore/tests/test_libraries.py rename to xmodule/modulestore/tests/test_libraries.py diff --git a/common/lib/xmodule/xmodule/modulestore/tests/test_mixed_modulestore.py b/xmodule/modulestore/tests/test_mixed_modulestore.py similarity index 100% rename from common/lib/xmodule/xmodule/modulestore/tests/test_mixed_modulestore.py rename to xmodule/modulestore/tests/test_mixed_modulestore.py diff --git a/common/lib/xmodule/xmodule/modulestore/tests/test_modulestore.py b/xmodule/modulestore/tests/test_modulestore.py similarity index 100% rename from common/lib/xmodule/xmodule/modulestore/tests/test_modulestore.py rename to xmodule/modulestore/tests/test_modulestore.py diff --git a/common/lib/xmodule/xmodule/modulestore/tests/test_modulestore_settings.py b/xmodule/modulestore/tests/test_modulestore_settings.py similarity index 100% rename from common/lib/xmodule/xmodule/modulestore/tests/test_modulestore_settings.py rename to xmodule/modulestore/tests/test_modulestore_settings.py diff --git a/common/lib/xmodule/xmodule/modulestore/tests/test_mongo.py b/xmodule/modulestore/tests/test_mongo.py similarity index 100% rename from common/lib/xmodule/xmodule/modulestore/tests/test_mongo.py rename to xmodule/modulestore/tests/test_mongo.py diff --git a/common/lib/xmodule/xmodule/modulestore/tests/test_mongo_call_count.py b/xmodule/modulestore/tests/test_mongo_call_count.py similarity index 100% rename from common/lib/xmodule/xmodule/modulestore/tests/test_mongo_call_count.py rename to xmodule/modulestore/tests/test_mongo_call_count.py diff --git a/common/lib/xmodule/xmodule/modulestore/tests/test_publish.py b/xmodule/modulestore/tests/test_publish.py similarity index 100% rename from common/lib/xmodule/xmodule/modulestore/tests/test_publish.py rename to xmodule/modulestore/tests/test_publish.py diff --git a/common/lib/xmodule/xmodule/modulestore/tests/test_semantics.py b/xmodule/modulestore/tests/test_semantics.py similarity index 100% rename from common/lib/xmodule/xmodule/modulestore/tests/test_semantics.py rename to xmodule/modulestore/tests/test_semantics.py diff --git a/common/lib/xmodule/xmodule/modulestore/tests/test_split_copy_from_template.py b/xmodule/modulestore/tests/test_split_copy_from_template.py similarity index 100% rename from common/lib/xmodule/xmodule/modulestore/tests/test_split_copy_from_template.py rename to xmodule/modulestore/tests/test_split_copy_from_template.py diff --git a/common/lib/xmodule/xmodule/modulestore/tests/test_split_migrator.py b/xmodule/modulestore/tests/test_split_migrator.py similarity index 100% rename from common/lib/xmodule/xmodule/modulestore/tests/test_split_migrator.py rename to xmodule/modulestore/tests/test_split_migrator.py diff --git a/common/lib/xmodule/xmodule/modulestore/tests/test_split_modulestore.py b/xmodule/modulestore/tests/test_split_modulestore.py similarity index 100% rename from common/lib/xmodule/xmodule/modulestore/tests/test_split_modulestore.py rename to xmodule/modulestore/tests/test_split_modulestore.py diff --git a/common/lib/xmodule/xmodule/modulestore/tests/test_split_modulestore_bulk_operations.py b/xmodule/modulestore/tests/test_split_modulestore_bulk_operations.py similarity index 100% rename from common/lib/xmodule/xmodule/modulestore/tests/test_split_modulestore_bulk_operations.py rename to xmodule/modulestore/tests/test_split_modulestore_bulk_operations.py diff --git a/common/lib/xmodule/xmodule/modulestore/tests/test_split_mongo_mongo_connection.py b/xmodule/modulestore/tests/test_split_mongo_mongo_connection.py similarity index 100% rename from common/lib/xmodule/xmodule/modulestore/tests/test_split_mongo_mongo_connection.py rename to xmodule/modulestore/tests/test_split_mongo_mongo_connection.py diff --git a/common/lib/xmodule/xmodule/modulestore/tests/test_split_w_old_mongo.py b/xmodule/modulestore/tests/test_split_w_old_mongo.py similarity index 100% rename from common/lib/xmodule/xmodule/modulestore/tests/test_split_w_old_mongo.py rename to xmodule/modulestore/tests/test_split_w_old_mongo.py diff --git a/common/lib/xmodule/xmodule/modulestore/tests/test_store_utilities.py b/xmodule/modulestore/tests/test_store_utilities.py similarity index 100% rename from common/lib/xmodule/xmodule/modulestore/tests/test_store_utilities.py rename to xmodule/modulestore/tests/test_store_utilities.py diff --git a/common/lib/xmodule/xmodule/modulestore/tests/test_xml.py b/xmodule/modulestore/tests/test_xml.py similarity index 100% rename from common/lib/xmodule/xmodule/modulestore/tests/test_xml.py rename to xmodule/modulestore/tests/test_xml.py diff --git a/common/lib/xmodule/xmodule/modulestore/tests/test_xml_importer.py b/xmodule/modulestore/tests/test_xml_importer.py similarity index 100% rename from common/lib/xmodule/xmodule/modulestore/tests/test_xml_importer.py rename to xmodule/modulestore/tests/test_xml_importer.py diff --git a/common/lib/xmodule/xmodule/modulestore/tests/utils.py b/xmodule/modulestore/tests/utils.py similarity index 100% rename from common/lib/xmodule/xmodule/modulestore/tests/utils.py rename to xmodule/modulestore/tests/utils.py diff --git a/common/lib/xmodule/xmodule/modulestore/xml.py b/xmodule/modulestore/xml.py similarity index 100% rename from common/lib/xmodule/xmodule/modulestore/xml.py rename to xmodule/modulestore/xml.py diff --git a/common/lib/xmodule/xmodule/modulestore/xml_exporter.py b/xmodule/modulestore/xml_exporter.py similarity index 100% rename from common/lib/xmodule/xmodule/modulestore/xml_exporter.py rename to xmodule/modulestore/xml_exporter.py diff --git a/common/lib/xmodule/xmodule/modulestore/xml_importer.py b/xmodule/modulestore/xml_importer.py similarity index 100% rename from common/lib/xmodule/xmodule/modulestore/xml_importer.py rename to xmodule/modulestore/xml_importer.py diff --git a/common/lib/xmodule/xmodule/mongo_utils.py b/xmodule/mongo_utils.py similarity index 100% rename from common/lib/xmodule/xmodule/mongo_utils.py rename to xmodule/mongo_utils.py diff --git a/common/lib/xmodule/xmodule/partitions/__init__.py b/xmodule/partitions/__init__.py similarity index 100% rename from common/lib/xmodule/xmodule/partitions/__init__.py rename to xmodule/partitions/__init__.py diff --git a/common/lib/xmodule/xmodule/partitions/enrollment_track_partition_generator.py b/xmodule/partitions/enrollment_track_partition_generator.py similarity index 100% rename from common/lib/xmodule/xmodule/partitions/enrollment_track_partition_generator.py rename to xmodule/partitions/enrollment_track_partition_generator.py diff --git a/common/lib/xmodule/xmodule/partitions/partitions.py b/xmodule/partitions/partitions.py similarity index 100% rename from common/lib/xmodule/xmodule/partitions/partitions.py rename to xmodule/partitions/partitions.py diff --git a/common/lib/xmodule/xmodule/partitions/partitions_service.py b/xmodule/partitions/partitions_service.py similarity index 100% rename from common/lib/xmodule/xmodule/partitions/partitions_service.py rename to xmodule/partitions/partitions_service.py diff --git a/common/lib/xmodule/xmodule/partitions/tests/__init__.py b/xmodule/partitions/tests/__init__.py similarity index 100% rename from common/lib/xmodule/xmodule/partitions/tests/__init__.py rename to xmodule/partitions/tests/__init__.py diff --git a/common/lib/xmodule/xmodule/partitions/tests/test_partitions.py b/xmodule/partitions/tests/test_partitions.py similarity index 100% rename from common/lib/xmodule/xmodule/partitions/tests/test_partitions.py rename to xmodule/partitions/tests/test_partitions.py diff --git a/common/lib/xmodule/xmodule/poll_module.py b/xmodule/poll_module.py similarity index 100% rename from common/lib/xmodule/xmodule/poll_module.py rename to xmodule/poll_module.py diff --git a/common/lib/xmodule/xmodule/progress.py b/xmodule/progress.py similarity index 100% rename from common/lib/xmodule/xmodule/progress.py rename to xmodule/progress.py diff --git a/common/lib/xmodule/xmodule/randomize_module.py b/xmodule/randomize_module.py similarity index 100% rename from common/lib/xmodule/xmodule/randomize_module.py rename to xmodule/randomize_module.py diff --git a/common/lib/xmodule/xmodule/raw_module.py b/xmodule/raw_module.py similarity index 100% rename from common/lib/xmodule/xmodule/raw_module.py rename to xmodule/raw_module.py diff --git a/common/lib/xmodule/xmodule/seq_module.py b/xmodule/seq_module.py similarity index 100% rename from common/lib/xmodule/xmodule/seq_module.py rename to xmodule/seq_module.py diff --git a/common/lib/xmodule/xmodule/services.py b/xmodule/services.py similarity index 100% rename from common/lib/xmodule/xmodule/services.py rename to xmodule/services.py diff --git a/common/lib/xmodule/xmodule/split_test_module.py b/xmodule/split_test_module.py similarity index 100% rename from common/lib/xmodule/xmodule/split_test_module.py rename to xmodule/split_test_module.py diff --git a/common/lib/xmodule/xmodule/static_content.py b/xmodule/static_content.py similarity index 100% rename from common/lib/xmodule/xmodule/static_content.py rename to xmodule/static_content.py diff --git a/common/lib/xmodule/xmodule/stringify.py b/xmodule/stringify.py similarity index 100% rename from common/lib/xmodule/xmodule/stringify.py rename to xmodule/stringify.py diff --git a/common/lib/xmodule/xmodule/studio_editable.py b/xmodule/studio_editable.py similarity index 100% rename from common/lib/xmodule/xmodule/studio_editable.py rename to xmodule/studio_editable.py diff --git a/common/lib/xmodule/xmodule/tabs.py b/xmodule/tabs.py similarity index 100% rename from common/lib/xmodule/xmodule/tabs.py rename to xmodule/tabs.py diff --git a/common/lib/xmodule/xmodule/template_module.py b/xmodule/template_module.py similarity index 100% rename from common/lib/xmodule/xmodule/template_module.py rename to xmodule/template_module.py diff --git a/common/lib/xmodule/xmodule/templates.py b/xmodule/templates.py similarity index 100% rename from common/lib/xmodule/xmodule/templates.py rename to xmodule/templates.py diff --git a/common/lib/xmodule/xmodule/templates/about/overview.yaml b/xmodule/templates/about/overview.yaml similarity index 100% rename from common/lib/xmodule/xmodule/templates/about/overview.yaml rename to xmodule/templates/about/overview.yaml diff --git a/common/lib/xmodule/xmodule/templates/html/announcement.yaml b/xmodule/templates/html/announcement.yaml similarity index 100% rename from common/lib/xmodule/xmodule/templates/html/announcement.yaml rename to xmodule/templates/html/announcement.yaml diff --git a/common/lib/xmodule/xmodule/templates/html/anon_user_id.yaml b/xmodule/templates/html/anon_user_id.yaml similarity index 100% rename from common/lib/xmodule/xmodule/templates/html/anon_user_id.yaml rename to xmodule/templates/html/anon_user_id.yaml diff --git a/common/lib/xmodule/xmodule/templates/html/iframe.yaml b/xmodule/templates/html/iframe.yaml similarity index 100% rename from common/lib/xmodule/xmodule/templates/html/iframe.yaml rename to xmodule/templates/html/iframe.yaml diff --git a/common/lib/xmodule/xmodule/templates/html/latex_html.yaml b/xmodule/templates/html/latex_html.yaml similarity index 100% rename from common/lib/xmodule/xmodule/templates/html/latex_html.yaml rename to xmodule/templates/html/latex_html.yaml diff --git a/common/lib/xmodule/xmodule/templates/html/raw.yaml b/xmodule/templates/html/raw.yaml similarity index 100% rename from common/lib/xmodule/xmodule/templates/html/raw.yaml rename to xmodule/templates/html/raw.yaml diff --git a/common/lib/xmodule/xmodule/templates/html/zooming_image.yaml b/xmodule/templates/html/zooming_image.yaml similarity index 100% rename from common/lib/xmodule/xmodule/templates/html/zooming_image.yaml rename to xmodule/templates/html/zooming_image.yaml diff --git a/common/lib/xmodule/xmodule/templates/library-sourced-block-studio-view.html b/xmodule/templates/library-sourced-block-studio-view.html similarity index 100% rename from common/lib/xmodule/xmodule/templates/library-sourced-block-studio-view.html rename to xmodule/templates/library-sourced-block-studio-view.html diff --git a/common/lib/xmodule/xmodule/templates/problem/blank_common.yaml b/xmodule/templates/problem/blank_common.yaml similarity index 100% rename from common/lib/xmodule/xmodule/templates/problem/blank_common.yaml rename to xmodule/templates/problem/blank_common.yaml diff --git a/common/lib/xmodule/xmodule/templates/problem/checkboxes_response.yaml b/xmodule/templates/problem/checkboxes_response.yaml similarity index 100% rename from common/lib/xmodule/xmodule/templates/problem/checkboxes_response.yaml rename to xmodule/templates/problem/checkboxes_response.yaml diff --git a/common/lib/xmodule/xmodule/templates/problem/checkboxes_response_hint.yaml b/xmodule/templates/problem/checkboxes_response_hint.yaml similarity index 100% rename from common/lib/xmodule/xmodule/templates/problem/checkboxes_response_hint.yaml rename to xmodule/templates/problem/checkboxes_response_hint.yaml diff --git a/common/lib/xmodule/xmodule/templates/problem/circuitschematic.yaml b/xmodule/templates/problem/circuitschematic.yaml similarity index 100% rename from common/lib/xmodule/xmodule/templates/problem/circuitschematic.yaml rename to xmodule/templates/problem/circuitschematic.yaml diff --git a/common/lib/xmodule/xmodule/templates/problem/customgrader.yaml b/xmodule/templates/problem/customgrader.yaml similarity index 100% rename from common/lib/xmodule/xmodule/templates/problem/customgrader.yaml rename to xmodule/templates/problem/customgrader.yaml diff --git a/common/lib/xmodule/xmodule/templates/problem/drag_and_drop.yaml b/xmodule/templates/problem/drag_and_drop.yaml similarity index 100% rename from common/lib/xmodule/xmodule/templates/problem/drag_and_drop.yaml rename to xmodule/templates/problem/drag_and_drop.yaml diff --git a/common/lib/xmodule/xmodule/templates/problem/formularesponse.yaml b/xmodule/templates/problem/formularesponse.yaml similarity index 100% rename from common/lib/xmodule/xmodule/templates/problem/formularesponse.yaml rename to xmodule/templates/problem/formularesponse.yaml diff --git a/common/lib/xmodule/xmodule/templates/problem/imageresponse.yaml b/xmodule/templates/problem/imageresponse.yaml similarity index 100% rename from common/lib/xmodule/xmodule/templates/problem/imageresponse.yaml rename to xmodule/templates/problem/imageresponse.yaml diff --git a/common/lib/xmodule/xmodule/templates/problem/jsinput_response.yaml b/xmodule/templates/problem/jsinput_response.yaml similarity index 100% rename from common/lib/xmodule/xmodule/templates/problem/jsinput_response.yaml rename to xmodule/templates/problem/jsinput_response.yaml diff --git a/common/lib/xmodule/xmodule/templates/problem/latex_problem.yaml b/xmodule/templates/problem/latex_problem.yaml similarity index 100% rename from common/lib/xmodule/xmodule/templates/problem/latex_problem.yaml rename to xmodule/templates/problem/latex_problem.yaml diff --git a/common/lib/xmodule/xmodule/templates/problem/multiplechoice.yaml b/xmodule/templates/problem/multiplechoice.yaml similarity index 100% rename from common/lib/xmodule/xmodule/templates/problem/multiplechoice.yaml rename to xmodule/templates/problem/multiplechoice.yaml diff --git a/common/lib/xmodule/xmodule/templates/problem/multiplechoice_hint.yaml b/xmodule/templates/problem/multiplechoice_hint.yaml similarity index 100% rename from common/lib/xmodule/xmodule/templates/problem/multiplechoice_hint.yaml rename to xmodule/templates/problem/multiplechoice_hint.yaml diff --git a/common/lib/xmodule/xmodule/templates/problem/numericalresponse.yaml b/xmodule/templates/problem/numericalresponse.yaml similarity index 100% rename from common/lib/xmodule/xmodule/templates/problem/numericalresponse.yaml rename to xmodule/templates/problem/numericalresponse.yaml diff --git a/common/lib/xmodule/xmodule/templates/problem/numericalresponse_hint.yaml b/xmodule/templates/problem/numericalresponse_hint.yaml similarity index 100% rename from common/lib/xmodule/xmodule/templates/problem/numericalresponse_hint.yaml rename to xmodule/templates/problem/numericalresponse_hint.yaml diff --git a/common/lib/xmodule/xmodule/templates/problem/optionresponse.yaml b/xmodule/templates/problem/optionresponse.yaml similarity index 100% rename from common/lib/xmodule/xmodule/templates/problem/optionresponse.yaml rename to xmodule/templates/problem/optionresponse.yaml diff --git a/common/lib/xmodule/xmodule/templates/problem/optionresponse_hint.yaml b/xmodule/templates/problem/optionresponse_hint.yaml similarity index 100% rename from common/lib/xmodule/xmodule/templates/problem/optionresponse_hint.yaml rename to xmodule/templates/problem/optionresponse_hint.yaml diff --git a/common/lib/xmodule/xmodule/templates/problem/problem_with_hint.yaml b/xmodule/templates/problem/problem_with_hint.yaml similarity index 100% rename from common/lib/xmodule/xmodule/templates/problem/problem_with_hint.yaml rename to xmodule/templates/problem/problem_with_hint.yaml diff --git a/common/lib/xmodule/xmodule/templates/problem/problem_with_hint_in_latex.yaml b/xmodule/templates/problem/problem_with_hint_in_latex.yaml similarity index 100% rename from common/lib/xmodule/xmodule/templates/problem/problem_with_hint_in_latex.yaml rename to xmodule/templates/problem/problem_with_hint_in_latex.yaml diff --git a/common/lib/xmodule/xmodule/templates/problem/string_response.yaml b/xmodule/templates/problem/string_response.yaml similarity index 100% rename from common/lib/xmodule/xmodule/templates/problem/string_response.yaml rename to xmodule/templates/problem/string_response.yaml diff --git a/common/lib/xmodule/xmodule/templates/problem/string_response_hint.yaml b/xmodule/templates/problem/string_response_hint.yaml similarity index 100% rename from common/lib/xmodule/xmodule/templates/problem/string_response_hint.yaml rename to xmodule/templates/problem/string_response_hint.yaml diff --git a/common/lib/xmodule/xmodule/templates/test/announcement.yaml b/xmodule/templates/test/announcement.yaml similarity index 100% rename from common/lib/xmodule/xmodule/templates/test/announcement.yaml rename to xmodule/templates/test/announcement.yaml diff --git a/common/lib/xmodule/xmodule/templates/test/anon_user_id.yaml b/xmodule/templates/test/anon_user_id.yaml similarity index 100% rename from common/lib/xmodule/xmodule/templates/test/anon_user_id.yaml rename to xmodule/templates/test/anon_user_id.yaml diff --git a/common/lib/xmodule/xmodule/templates/test/latex_html.yaml b/xmodule/templates/test/latex_html.yaml similarity index 100% rename from common/lib/xmodule/xmodule/templates/test/latex_html.yaml rename to xmodule/templates/test/latex_html.yaml diff --git a/common/lib/xmodule/xmodule/templates/test/somefile.notyaml b/xmodule/templates/test/somefile.notyaml similarity index 100% rename from common/lib/xmodule/xmodule/templates/test/somefile.notyaml rename to xmodule/templates/test/somefile.notyaml diff --git a/common/lib/xmodule/xmodule/templates/test/zooming_image.yaml b/xmodule/templates/test/zooming_image.yaml similarity index 100% rename from common/lib/xmodule/xmodule/templates/test/zooming_image.yaml rename to xmodule/templates/test/zooming_image.yaml diff --git a/common/lib/xmodule/xmodule/tests/__init__.py b/xmodule/tests/__init__.py similarity index 100% rename from common/lib/xmodule/xmodule/tests/__init__.py rename to xmodule/tests/__init__.py diff --git a/common/lib/xmodule/xmodule/tests/data/xml-course-root b/xmodule/tests/data/xml-course-root similarity index 100% rename from common/lib/xmodule/xmodule/tests/data/xml-course-root rename to xmodule/tests/data/xml-course-root diff --git a/common/lib/xmodule/xmodule/tests/helpers.py b/xmodule/tests/helpers.py similarity index 100% rename from common/lib/xmodule/xmodule/tests/helpers.py rename to xmodule/tests/helpers.py diff --git a/common/lib/xmodule/xmodule/tests/rendering/__init__.py b/xmodule/tests/rendering/__init__.py similarity index 100% rename from common/lib/xmodule/xmodule/tests/rendering/__init__.py rename to xmodule/tests/rendering/__init__.py diff --git a/common/lib/xmodule/xmodule/tests/rendering/core.py b/xmodule/tests/rendering/core.py similarity index 100% rename from common/lib/xmodule/xmodule/tests/rendering/core.py rename to xmodule/tests/rendering/core.py diff --git a/common/lib/xmodule/xmodule/tests/test_annotatable_module.py b/xmodule/tests/test_annotatable_module.py similarity index 100% rename from common/lib/xmodule/xmodule/tests/test_annotatable_module.py rename to xmodule/tests/test_annotatable_module.py diff --git a/common/lib/xmodule/xmodule/tests/test_annotator_mixin.py b/xmodule/tests/test_annotator_mixin.py similarity index 100% rename from common/lib/xmodule/xmodule/tests/test_annotator_mixin.py rename to xmodule/tests/test_annotator_mixin.py diff --git a/common/lib/xmodule/xmodule/tests/test_capa_module.py b/xmodule/tests/test_capa_module.py similarity index 100% rename from common/lib/xmodule/xmodule/tests/test_capa_module.py rename to xmodule/tests/test_capa_module.py diff --git a/common/lib/xmodule/xmodule/tests/test_conditional.py b/xmodule/tests/test_conditional.py similarity index 100% rename from common/lib/xmodule/xmodule/tests/test_conditional.py rename to xmodule/tests/test_conditional.py diff --git a/common/lib/xmodule/xmodule/tests/test_content.py b/xmodule/tests/test_content.py similarity index 100% rename from common/lib/xmodule/xmodule/tests/test_content.py rename to xmodule/tests/test_content.py diff --git a/common/lib/xmodule/xmodule/tests/test_course_metadata_utils.py b/xmodule/tests/test_course_metadata_utils.py similarity index 100% rename from common/lib/xmodule/xmodule/tests/test_course_metadata_utils.py rename to xmodule/tests/test_course_metadata_utils.py diff --git a/common/lib/xmodule/xmodule/tests/test_course_module.py b/xmodule/tests/test_course_module.py similarity index 100% rename from common/lib/xmodule/xmodule/tests/test_course_module.py rename to xmodule/tests/test_course_module.py diff --git a/common/lib/xmodule/xmodule/tests/test_delay_between_attempts.py b/xmodule/tests/test_delay_between_attempts.py similarity index 100% rename from common/lib/xmodule/xmodule/tests/test_delay_between_attempts.py rename to xmodule/tests/test_delay_between_attempts.py diff --git a/common/lib/xmodule/xmodule/tests/test_editing_module.py b/xmodule/tests/test_editing_module.py similarity index 100% rename from common/lib/xmodule/xmodule/tests/test_editing_module.py rename to xmodule/tests/test_editing_module.py diff --git a/common/lib/xmodule/xmodule/tests/test_error_module.py b/xmodule/tests/test_error_module.py similarity index 100% rename from common/lib/xmodule/xmodule/tests/test_error_module.py rename to xmodule/tests/test_error_module.py diff --git a/common/lib/xmodule/xmodule/tests/test_export.py b/xmodule/tests/test_export.py similarity index 100% rename from common/lib/xmodule/xmodule/tests/test_export.py rename to xmodule/tests/test_export.py diff --git a/common/lib/xmodule/xmodule/tests/test_fields.py b/xmodule/tests/test_fields.py similarity index 100% rename from common/lib/xmodule/xmodule/tests/test_fields.py rename to xmodule/tests/test_fields.py diff --git a/common/lib/xmodule/xmodule/tests/test_files/test_tabseditingdescriptor.css b/xmodule/tests/test_files/test_tabseditingdescriptor.css similarity index 100% rename from common/lib/xmodule/xmodule/tests/test_files/test_tabseditingdescriptor.css rename to xmodule/tests/test_files/test_tabseditingdescriptor.css diff --git a/common/lib/xmodule/xmodule/tests/test_files/test_tabseditingdescriptor.scss b/xmodule/tests/test_files/test_tabseditingdescriptor.scss similarity index 100% rename from common/lib/xmodule/xmodule/tests/test_files/test_tabseditingdescriptor.scss rename to xmodule/tests/test_files/test_tabseditingdescriptor.scss diff --git a/common/lib/xmodule/xmodule/tests/test_graders.py b/xmodule/tests/test_graders.py similarity index 100% rename from common/lib/xmodule/xmodule/tests/test_graders.py rename to xmodule/tests/test_graders.py diff --git a/common/lib/xmodule/xmodule/tests/test_html_module.py b/xmodule/tests/test_html_module.py similarity index 100% rename from common/lib/xmodule/xmodule/tests/test_html_module.py rename to xmodule/tests/test_html_module.py diff --git a/common/lib/xmodule/xmodule/tests/test_import.py b/xmodule/tests/test_import.py similarity index 100% rename from common/lib/xmodule/xmodule/tests/test_import.py rename to xmodule/tests/test_import.py diff --git a/common/lib/xmodule/xmodule/tests/test_import_static.py b/xmodule/tests/test_import_static.py similarity index 100% rename from common/lib/xmodule/xmodule/tests/test_import_static.py rename to xmodule/tests/test_import_static.py diff --git a/common/lib/xmodule/xmodule/tests/test_library_content.py b/xmodule/tests/test_library_content.py similarity index 100% rename from common/lib/xmodule/xmodule/tests/test_library_content.py rename to xmodule/tests/test_library_content.py diff --git a/common/lib/xmodule/xmodule/tests/test_library_root.py b/xmodule/tests/test_library_root.py similarity index 100% rename from common/lib/xmodule/xmodule/tests/test_library_root.py rename to xmodule/tests/test_library_root.py diff --git a/common/lib/xmodule/xmodule/tests/test_library_sourced_block.py b/xmodule/tests/test_library_sourced_block.py similarity index 100% rename from common/lib/xmodule/xmodule/tests/test_library_sourced_block.py rename to xmodule/tests/test_library_sourced_block.py diff --git a/common/lib/xmodule/xmodule/tests/test_library_tools.py b/xmodule/tests/test_library_tools.py similarity index 100% rename from common/lib/xmodule/xmodule/tests/test_library_tools.py rename to xmodule/tests/test_library_tools.py diff --git a/common/lib/xmodule/xmodule/tests/test_lti20_unit.py b/xmodule/tests/test_lti20_unit.py similarity index 100% rename from common/lib/xmodule/xmodule/tests/test_lti20_unit.py rename to xmodule/tests/test_lti20_unit.py diff --git a/common/lib/xmodule/xmodule/tests/test_lti_unit.py b/xmodule/tests/test_lti_unit.py similarity index 100% rename from common/lib/xmodule/xmodule/tests/test_lti_unit.py rename to xmodule/tests/test_lti_unit.py diff --git a/common/lib/xmodule/xmodule/tests/test_mako_module.py b/xmodule/tests/test_mako_module.py similarity index 100% rename from common/lib/xmodule/xmodule/tests/test_mako_module.py rename to xmodule/tests/test_mako_module.py diff --git a/common/lib/xmodule/xmodule/tests/test_mongo_utils.py b/xmodule/tests/test_mongo_utils.py similarity index 100% rename from common/lib/xmodule/xmodule/tests/test_mongo_utils.py rename to xmodule/tests/test_mongo_utils.py diff --git a/common/lib/xmodule/xmodule/tests/test_poll.py b/xmodule/tests/test_poll.py similarity index 100% rename from common/lib/xmodule/xmodule/tests/test_poll.py rename to xmodule/tests/test_poll.py diff --git a/common/lib/xmodule/xmodule/tests/test_progress.py b/xmodule/tests/test_progress.py similarity index 100% rename from common/lib/xmodule/xmodule/tests/test_progress.py rename to xmodule/tests/test_progress.py diff --git a/common/lib/xmodule/xmodule/tests/test_randomize_module.py b/xmodule/tests/test_randomize_module.py similarity index 100% rename from common/lib/xmodule/xmodule/tests/test_randomize_module.py rename to xmodule/tests/test_randomize_module.py diff --git a/common/lib/xmodule/xmodule/tests/test_resource_templates.py b/xmodule/tests/test_resource_templates.py similarity index 100% rename from common/lib/xmodule/xmodule/tests/test_resource_templates.py rename to xmodule/tests/test_resource_templates.py diff --git a/common/lib/xmodule/xmodule/tests/test_sequence.py b/xmodule/tests/test_sequence.py similarity index 100% rename from common/lib/xmodule/xmodule/tests/test_sequence.py rename to xmodule/tests/test_sequence.py diff --git a/common/lib/xmodule/xmodule/tests/test_services.py b/xmodule/tests/test_services.py similarity index 100% rename from common/lib/xmodule/xmodule/tests/test_services.py rename to xmodule/tests/test_services.py diff --git a/common/lib/xmodule/xmodule/tests/test_split_test_module.py b/xmodule/tests/test_split_test_module.py similarity index 100% rename from common/lib/xmodule/xmodule/tests/test_split_test_module.py rename to xmodule/tests/test_split_test_module.py diff --git a/common/lib/xmodule/xmodule/tests/test_stringify.py b/xmodule/tests/test_stringify.py similarity index 100% rename from common/lib/xmodule/xmodule/tests/test_stringify.py rename to xmodule/tests/test_stringify.py diff --git a/common/lib/xmodule/xmodule/tests/test_studio_editable.py b/xmodule/tests/test_studio_editable.py similarity index 100% rename from common/lib/xmodule/xmodule/tests/test_studio_editable.py rename to xmodule/tests/test_studio_editable.py diff --git a/common/lib/xmodule/xmodule/tests/test_unit_block.py b/xmodule/tests/test_unit_block.py similarity index 100% rename from common/lib/xmodule/xmodule/tests/test_unit_block.py rename to xmodule/tests/test_unit_block.py diff --git a/common/lib/xmodule/xmodule/tests/test_util_duedate.py b/xmodule/tests/test_util_duedate.py similarity index 100% rename from common/lib/xmodule/xmodule/tests/test_util_duedate.py rename to xmodule/tests/test_util_duedate.py diff --git a/common/lib/xmodule/xmodule/tests/test_utils_django.py b/xmodule/tests/test_utils_django.py similarity index 100% rename from common/lib/xmodule/xmodule/tests/test_utils_django.py rename to xmodule/tests/test_utils_django.py diff --git a/common/lib/xmodule/xmodule/tests/test_utils_escape_html_characters.py b/xmodule/tests/test_utils_escape_html_characters.py similarity index 100% rename from common/lib/xmodule/xmodule/tests/test_utils_escape_html_characters.py rename to xmodule/tests/test_utils_escape_html_characters.py diff --git a/common/lib/xmodule/xmodule/tests/test_validation.py b/xmodule/tests/test_validation.py similarity index 100% rename from common/lib/xmodule/xmodule/tests/test_validation.py rename to xmodule/tests/test_validation.py diff --git a/common/lib/xmodule/xmodule/tests/test_vertical.py b/xmodule/tests/test_vertical.py similarity index 100% rename from common/lib/xmodule/xmodule/tests/test_vertical.py rename to xmodule/tests/test_vertical.py diff --git a/common/lib/xmodule/xmodule/tests/test_video.py b/xmodule/tests/test_video.py similarity index 100% rename from common/lib/xmodule/xmodule/tests/test_video.py rename to xmodule/tests/test_video.py diff --git a/common/lib/xmodule/xmodule/tests/test_word_cloud.py b/xmodule/tests/test_word_cloud.py similarity index 100% rename from common/lib/xmodule/xmodule/tests/test_word_cloud.py rename to xmodule/tests/test_word_cloud.py diff --git a/common/lib/xmodule/xmodule/tests/test_xml_module.py b/xmodule/tests/test_xml_module.py similarity index 100% rename from common/lib/xmodule/xmodule/tests/test_xml_module.py rename to xmodule/tests/test_xml_module.py diff --git a/common/lib/xmodule/xmodule/tests/xml/__init__.py b/xmodule/tests/xml/__init__.py similarity index 100% rename from common/lib/xmodule/xmodule/tests/xml/__init__.py rename to xmodule/tests/xml/__init__.py diff --git a/common/lib/xmodule/xmodule/tests/xml/factories.py b/xmodule/tests/xml/factories.py similarity index 100% rename from common/lib/xmodule/xmodule/tests/xml/factories.py rename to xmodule/tests/xml/factories.py diff --git a/common/lib/xmodule/xmodule/tests/xml/test_inheritance.py b/xmodule/tests/xml/test_inheritance.py similarity index 100% rename from common/lib/xmodule/xmodule/tests/xml/test_inheritance.py rename to xmodule/tests/xml/test_inheritance.py diff --git a/common/lib/xmodule/xmodule/tests/xml/test_policy.py b/xmodule/tests/xml/test_policy.py similarity index 100% rename from common/lib/xmodule/xmodule/tests/xml/test_policy.py rename to xmodule/tests/xml/test_policy.py diff --git a/common/lib/xmodule/xmodule/timeinfo.py b/xmodule/timeinfo.py similarity index 100% rename from common/lib/xmodule/xmodule/timeinfo.py rename to xmodule/timeinfo.py diff --git a/common/lib/xmodule/xmodule/unit_block.py b/xmodule/unit_block.py similarity index 100% rename from common/lib/xmodule/xmodule/unit_block.py rename to xmodule/unit_block.py diff --git a/common/lib/xmodule/xmodule/util/__init__.py b/xmodule/util/__init__.py similarity index 100% rename from common/lib/xmodule/xmodule/util/__init__.py rename to xmodule/util/__init__.py diff --git a/common/lib/xmodule/xmodule/util/duedate.py b/xmodule/util/duedate.py similarity index 100% rename from common/lib/xmodule/xmodule/util/duedate.py rename to xmodule/util/duedate.py diff --git a/common/lib/xmodule/xmodule/util/misc.py b/xmodule/util/misc.py similarity index 100% rename from common/lib/xmodule/xmodule/util/misc.py rename to xmodule/util/misc.py diff --git a/common/lib/xmodule/xmodule/util/sandboxing.py b/xmodule/util/sandboxing.py similarity index 100% rename from common/lib/xmodule/xmodule/util/sandboxing.py rename to xmodule/util/sandboxing.py diff --git a/common/lib/xmodule/xmodule/util/xmodule_django.py b/xmodule/util/xmodule_django.py similarity index 100% rename from common/lib/xmodule/xmodule/util/xmodule_django.py rename to xmodule/util/xmodule_django.py diff --git a/common/lib/xmodule/xmodule/validation.py b/xmodule/validation.py similarity index 100% rename from common/lib/xmodule/xmodule/validation.py rename to xmodule/validation.py diff --git a/common/lib/xmodule/xmodule/vertical_block.py b/xmodule/vertical_block.py similarity index 100% rename from common/lib/xmodule/xmodule/vertical_block.py rename to xmodule/vertical_block.py diff --git a/common/lib/xmodule/xmodule/video_module/__init__.py b/xmodule/video_module/__init__.py similarity index 100% rename from common/lib/xmodule/xmodule/video_module/__init__.py rename to xmodule/video_module/__init__.py diff --git a/common/lib/xmodule/xmodule/video_module/bumper_utils.py b/xmodule/video_module/bumper_utils.py similarity index 100% rename from common/lib/xmodule/xmodule/video_module/bumper_utils.py rename to xmodule/video_module/bumper_utils.py diff --git a/common/lib/xmodule/xmodule/video_module/transcripts_utils.py b/xmodule/video_module/transcripts_utils.py similarity index 100% rename from common/lib/xmodule/xmodule/video_module/transcripts_utils.py rename to xmodule/video_module/transcripts_utils.py diff --git a/common/lib/xmodule/xmodule/video_module/video_handlers.py b/xmodule/video_module/video_handlers.py similarity index 100% rename from common/lib/xmodule/xmodule/video_module/video_handlers.py rename to xmodule/video_module/video_handlers.py diff --git a/common/lib/xmodule/xmodule/video_module/video_module.py b/xmodule/video_module/video_module.py similarity index 100% rename from common/lib/xmodule/xmodule/video_module/video_module.py rename to xmodule/video_module/video_module.py diff --git a/common/lib/xmodule/xmodule/video_module/video_utils.py b/xmodule/video_module/video_utils.py similarity index 100% rename from common/lib/xmodule/xmodule/video_module/video_utils.py rename to xmodule/video_module/video_utils.py diff --git a/common/lib/xmodule/xmodule/video_module/video_xfields.py b/xmodule/video_module/video_xfields.py similarity index 100% rename from common/lib/xmodule/xmodule/video_module/video_xfields.py rename to xmodule/video_module/video_xfields.py diff --git a/common/lib/xmodule/xmodule/word_cloud_module.py b/xmodule/word_cloud_module.py similarity index 100% rename from common/lib/xmodule/xmodule/word_cloud_module.py rename to xmodule/word_cloud_module.py diff --git a/common/lib/xmodule/xmodule/wrapper_module.py b/xmodule/wrapper_module.py similarity index 100% rename from common/lib/xmodule/xmodule/wrapper_module.py rename to xmodule/wrapper_module.py diff --git a/common/lib/xmodule/xmodule/x_module.py b/xmodule/x_module.py similarity index 100% rename from common/lib/xmodule/xmodule/x_module.py rename to xmodule/x_module.py diff --git a/common/lib/xmodule/xmodule/xml_module.py b/xmodule/xml_module.py similarity index 100% rename from common/lib/xmodule/xmodule/xml_module.py rename to xmodule/xml_module.py From a53a0eda9ea8f5703c462c11a7b5dd70809c1a9d Mon Sep 17 00:00:00 2001 From: M Umar Khan Date: Fri, 20 May 2022 02:55:49 +0500 Subject: [PATCH 03/25] refactor: updated __init__ file chekcer script --- scripts/verify-dunder-init.sh | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/scripts/verify-dunder-init.sh b/scripts/verify-dunder-init.sh index 9c9fbb130ab9..7053b22ed69e 100755 --- a/scripts/verify-dunder-init.sh +++ b/scripts/verify-dunder-init.sh @@ -40,6 +40,10 @@ exclude+='|^common/test/data/?.*$' exclude+='|^common/lib$' exclude+='|^common/lib/(capa|xmodule)$' +# xmodule data folder +exclude+='|^xmodule/tests/data/xml-course-root/capa$' +exclude+='|^xmodule/tests/data/xml-course-root/uploads/python_lib_zip$' + # Docs, scripts. exclude+='|^docs/.*$' exclude+='|^lms/djangoapps/monitoring/scripts$' From 2a2947c9b06846351cc7b577b112490d34b98dcc Mon Sep 17 00:00:00 2001 From: M Umar Khan Date: Fri, 20 May 2022 03:08:46 +0500 Subject: [PATCH 04/25] refactor: update setup.py entrypoints --- setup.py | 47 ++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 46 insertions(+), 1 deletion(-) diff --git a/setup.py b/setup.py index ef1d2fc0337f..0aefbaa388a8 100644 --- a/setup.py +++ b/setup.py @@ -2,7 +2,47 @@ Setup script for the Open edX package. """ -from setuptools import setup +from setuptools import find_packages, setup + +XBLOCKS = [ + "about = xmodule.html_module:AboutBlock", + "book = xmodule.template_module:TranslateCustomTagBlock", + "annotatable = xmodule.annotatable_module:AnnotatableBlock", + "chapter = xmodule.seq_module:SectionBlock", + "conditional = xmodule.conditional_module:ConditionalBlock", + "course = xmodule.course_module:CourseBlock", + "course_info = xmodule.html_module:CourseInfoBlock", + "customtag = xmodule.template_module:CustomTagBlock", + "custom_tag_template = xmodule.template_module:CustomTagTemplateBlock", + "discuss = xmodule.template_module:TranslateCustomTagBlock", + "error = xmodule.error_module:ErrorBlock", + "hidden = xmodule.hidden_module:HiddenDescriptor", + "html = xmodule.html_module:HtmlBlock", + "image = xmodule.template_module:TranslateCustomTagBlock", + "library = xmodule.library_root_xblock:LibraryRoot", + "library_content = xmodule.library_content_module:LibraryContentBlock", + "library_sourced = xmodule.library_sourced_block:LibrarySourcedBlock", + "lti = xmodule.lti_module:LTIBlock", + "nonstaff_error = xmodule.error_module:NonStaffErrorBlock", + "poll_question = xmodule.poll_module:PollBlock", + "problem = xmodule.capa_module:ProblemBlock", + "randomize = xmodule.randomize_module:RandomizeBlock", + "sequential = xmodule.seq_module:SequenceBlock", + "slides = xmodule.template_module:TranslateCustomTagBlock", + "split_test = xmodule.split_test_module:SplitTestBlock", + "static_tab = xmodule.html_module:StaticTabBlock", + "unit = xmodule.unit_block:UnitBlock", + "vertical = xmodule.vertical_block:VerticalBlock", + "video = xmodule.video_module:VideoBlock", + "videoalpha = xmodule.video_module:VideoBlock", + "videodev = xmodule.template_module:TranslateCustomTagBlock", + "word_cloud = xmodule.word_cloud_module:WordCloudBlock", + "wrapper = xmodule.wrapper_module:WrapperBlock", +] +XBLOCKS_ASIDES = [ + 'tagging_aside = cms.lib.xblock.tagging:StructuredTagsAside', +] + setup( name="Open edX", @@ -138,5 +178,10 @@ 'enrollment_track = common.lib.xmodule.xmodule.partitions.enrollment_track_partition_generator:create_enrollment_track_partition', # lint-amnesty, pylint: disable=line-too-long 'content_type_gating = openedx.features.content_type_gating.partitions:create_content_gating_partition' ], + 'xblock.v1': XBLOCKS, + 'xblock_asides.v1': XBLOCKS_ASIDES, + 'console_scripts': [ + 'xmodule_assets = xmodule.static_content:main', + ], } ) From ca5fb71a30f315f2572880492f3d747a07ae2aa9 Mon Sep 17 00:00:00 2001 From: M Umar Khan Date: Fri, 20 May 2022 03:20:53 +0500 Subject: [PATCH 05/25] refactor: update setup.py entrypoints --- cms/lib/xblock/test/test_authoring_mixin.py | 2 +- lms/djangoapps/discussion/tasks.py | 2 +- openedx/core/djangoapps/course_live/tab.py | 4 ++-- setup.py | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/cms/lib/xblock/test/test_authoring_mixin.py b/cms/lib/xblock/test/test_authoring_mixin.py index 9d848b06ba83..5289399ec558 100644 --- a/cms/lib/xblock/test/test_authoring_mixin.py +++ b/cms/lib/xblock/test/test_authoring_mixin.py @@ -16,7 +16,7 @@ ) from common.djangoapps.course_modes.tests.factories import CourseModeFactory -from common.lib.xmodule.xmodule.tests.test_export import PureXBlock +from xmodule.tests.test_export import PureXBlock class AuthoringMixinTestCase(ModuleStoreTestCase): diff --git a/lms/djangoapps/discussion/tasks.py b/lms/djangoapps/discussion/tasks.py index e8aa87d653fa..2235b3935dfd 100644 --- a/lms/djangoapps/discussion/tasks.py +++ b/lms/djangoapps/discussion/tasks.py @@ -21,7 +21,7 @@ import openedx.core.djangoapps.django_comment_common.comment_client as cc from common.djangoapps.track import segment -from common.lib.xmodule.xmodule.modulestore.django import modulestore +from xmodule.modulestore.django import modulestore from lms.djangoapps.discussion.django_comment_client.utils import ( permalink, get_users_with_moderator_roles, diff --git a/openedx/core/djangoapps/course_live/tab.py b/openedx/core/djangoapps/course_live/tab.py index 14a1355277f7..27b8e5ff2932 100644 --- a/openedx/core/djangoapps/course_live/tab.py +++ b/openedx/core/djangoapps/course_live/tab.py @@ -4,8 +4,8 @@ from django.utils.translation import gettext_lazy from lti_consumer.models import LtiConfiguration -from common.lib.xmodule.xmodule.course_module import CourseBlock -from common.lib.xmodule.xmodule.tabs import TabFragmentViewMixin +from xmodule.course_module import CourseBlock +from xmodule.tabs import TabFragmentViewMixin from lms.djangoapps.courseware.tabs import EnrolledTab from openedx.core.djangoapps.course_live.config.waffle import ENABLE_COURSE_LIVE from openedx.core.djangoapps.course_live.models import CourseLiveConfiguration diff --git a/setup.py b/setup.py index 0aefbaa388a8..b64497bb5417 100644 --- a/setup.py +++ b/setup.py @@ -175,7 +175,7 @@ 'lib = openedx.core.djangoapps.content_libraries.library_context:LibraryContextImpl', ], 'openedx.dynamic_partition_generator': [ - 'enrollment_track = common.lib.xmodule.xmodule.partitions.enrollment_track_partition_generator:create_enrollment_track_partition', # lint-amnesty, pylint: disable=line-too-long + 'enrollment_track = xmodule.partitions.enrollment_track_partition_generator:create_enrollment_track_partition', # lint-amnesty, pylint: disable=line-too-long 'content_type_gating = openedx.features.content_type_gating.partitions:create_content_gating_partition' ], 'xblock.v1': XBLOCKS, From c88d4f86f1bdea260882c829c48b5ad4ef41fcfb Mon Sep 17 00:00:00 2001 From: M Umar Khan Date: Mon, 23 May 2022 10:48:45 +0500 Subject: [PATCH 06/25] refactor: update other files --- .coveragerc | 2 +- .coveragerc-local | 1 + .eslintignore | 14 ++-- .github/CODEOWNERS | 2 +- .github/workflows/pylint-checks.yml | 2 + .stylelintignore | 2 +- common/lib/xmodule/setup.py | 69 ------------------- .../test_files/formularesponse_with_hint.xml | 45 ------------ .../test_files/stringresponse_with_hint.xml | 25 ------- .../xmodule/test_files/symbolicresponse.xml | 26 ------- common/static/css/tinymce-studio-content.css | 2 +- docs/guides/conf.py | 3 +- docs/guides/docstrings/common_lib.rst | 1 - docs/guides/docstrings/docstrings.rst | 1 + docs/guides/testing/testing.rst | 8 +-- docs/swagger.yaml | 2 +- .../course_home_api/progress/views.py | 2 +- lms/djangoapps/courseware/tests/helpers.py | 2 +- .../courseware/tests/test_video_xml.py | 4 +- lms/djangoapps/grades/docs/background.rst | 18 ++--- .../core/djangoapps/xblock/runtime/shims.py | 2 +- pavelib/assets.py | 4 +- pavelib/quality.py | 2 +- pavelib/utils/envs.py | 4 +- requirements/edx/local.in | 2 +- 25 files changed, 42 insertions(+), 203 deletions(-) delete mode 100644 common/lib/xmodule/setup.py delete mode 100644 common/lib/xmodule/test_files/formularesponse_with_hint.xml delete mode 100644 common/lib/xmodule/test_files/stringresponse_with_hint.xml delete mode 100644 common/lib/xmodule/test_files/symbolicresponse.xml diff --git a/.coveragerc b/.coveragerc index f50f1a0b5b1b..397a19c100b0 100644 --- a/.coveragerc +++ b/.coveragerc @@ -5,11 +5,11 @@ source = cms common/djangoapps common/lib/capa - common/lib/xmodule lms openedx pavelib scripts + xmodule omit = cms/envs/* diff --git a/.coveragerc-local b/.coveragerc-local index e2342d8bdab3..a6513888351b 100644 --- a/.coveragerc-local +++ b/.coveragerc-local @@ -10,6 +10,7 @@ source = openedx pavelib scripts + xmodule omit = cms/envs/* diff --git a/.eslintignore b/.eslintignore index 60f59bde2a8e..87fc6073da61 100644 --- a/.eslintignore +++ b/.eslintignore @@ -20,7 +20,7 @@ test_root/staticfiles common/static/xmodule -# Symlinks into common/lib/xmodule/xmodule/js +# Symlinks into xmodule/js cms/static/xmodule_js lms/static/xmodule_js @@ -50,12 +50,6 @@ common/lib/capa/capa/tests/test_files/js/test_problem_display.js common/lib/capa/capa/tests/test_files/js/test_problem_generator.js common/lib/capa/capa/tests/test_files/js/test_problem_grader.js common/lib/capa/capa/tests/test_files/js/xproblem.js -common/lib/xmodule/xmodule/js/spec/annotatable/display_spec.js -common/lib/xmodule/xmodule/js/spec/capa/display_spec.js -common/lib/xmodule/xmodule/js/spec/html/edit_spec.js -common/lib/xmodule/xmodule/js/spec/problem/edit_spec_hint.js -common/lib/xmodule/xmodule/js/spec/problem/edit_spec.js -common/lib/xmodule/xmodule/js/spec/tabs/edit.js lms/static/js/spec/calculator_spec.js lms/static/js/spec/courseware_spec.js lms/static/js/spec/feedback_form_spec.js @@ -63,6 +57,12 @@ lms/static/js/spec/helper.js lms/static/js/spec/histogram_spec.js lms/static/js/spec/modules/tab_spec.js lms/static/js/spec/requirejs_spec.js +xmodule/js/spec/annotatable/display_spec.js +xmodule/js/spec/capa/display_spec.js +xmodule/js/spec/html/edit_spec.js +xmodule/js/spec/problem/edit_spec_hint.js +xmodule/js/spec/problem/edit_spec.js +xmodule/js/spec/tabs/edit.js !**/.eslintrc.js diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS index a8500e3b5683..05941dbaca4a 100644 --- a/.github/CODEOWNERS +++ b/.github/CODEOWNERS @@ -3,7 +3,6 @@ # Core common/djangoapps/student/ common/djangoapps/third_party_auth/ -common/lib/xmodule/xmodule/ lms/djangoapps/course_api/blocks lms/djangoapps/courseware/ lms/djangoapps/grades/ @@ -15,6 +14,7 @@ openedx/core/djangoapps/oauth_dispatch openedx/core/djangoapps/user_api/ openedx/core/djangoapps/user_authn/ openedx/features/course_experience/ +xmodule/ # Core Extensions common/lib/xmodule/xmodule/capa_module.py diff --git a/.github/workflows/pylint-checks.yml b/.github/workflows/pylint-checks.yml index 4f95444df552..4a8f7ea10d8e 100644 --- a/.github/workflows/pylint-checks.yml +++ b/.github/workflows/pylint-checks.yml @@ -26,6 +26,8 @@ jobs: path: "common" - module-name: cms path: "cms" + - module-name: xmodule + path: "xmodule" name: pylint ${{ matrix.module-name }} diff --git a/.stylelintignore b/.stylelintignore index d30a987fcd4a..cd53bacf3cf9 100644 --- a/.stylelintignore +++ b/.stylelintignore @@ -1,4 +1,4 @@ -common/lib/xmodule/xmodule/css +xmodule/css common/static/sass/bourbon common/static/xmodule/modules/css common/test/test-theme diff --git a/common/lib/xmodule/setup.py b/common/lib/xmodule/setup.py deleted file mode 100644 index 951a2064043e..000000000000 --- a/common/lib/xmodule/setup.py +++ /dev/null @@ -1,69 +0,0 @@ -# lint-amnesty, pylint: disable=missing-module-docstring - -from setuptools import find_packages, setup - -XBLOCKS = [ - "about = xmodule.html_module:AboutBlock", - "book = xmodule.template_module:TranslateCustomTagBlock", - "annotatable = xmodule.annotatable_module:AnnotatableBlock", - "chapter = xmodule.seq_module:SectionBlock", - "conditional = xmodule.conditional_module:ConditionalBlock", - "course = xmodule.course_module:CourseBlock", - "course_info = xmodule.html_module:CourseInfoBlock", - "customtag = xmodule.template_module:CustomTagBlock", - "custom_tag_template = xmodule.template_module:CustomTagTemplateBlock", - "discuss = xmodule.template_module:TranslateCustomTagBlock", - "error = xmodule.error_module:ErrorBlock", - "hidden = xmodule.hidden_module:HiddenDescriptor", - "html = xmodule.html_module:HtmlBlock", - "image = xmodule.template_module:TranslateCustomTagBlock", - "library = xmodule.library_root_xblock:LibraryRoot", - "library_content = xmodule.library_content_module:LibraryContentBlock", - "library_sourced = xmodule.library_sourced_block:LibrarySourcedBlock", - "lti = xmodule.lti_module:LTIBlock", - "nonstaff_error = xmodule.error_module:NonStaffErrorBlock", - "poll_question = xmodule.poll_module:PollBlock", - "problem = xmodule.capa_module:ProblemBlock", - "randomize = xmodule.randomize_module:RandomizeBlock", - "sequential = xmodule.seq_module:SequenceBlock", - "slides = xmodule.template_module:TranslateCustomTagBlock", - "split_test = xmodule.split_test_module:SplitTestBlock", - "static_tab = xmodule.html_module:StaticTabBlock", - "unit = xmodule.unit_block:UnitBlock", - "vertical = xmodule.vertical_block:VerticalBlock", - "video = xmodule.video_module:VideoBlock", - "videoalpha = xmodule.video_module:VideoBlock", - "videodev = xmodule.template_module:TranslateCustomTagBlock", - "word_cloud = xmodule.word_cloud_module:WordCloudBlock", - "wrapper = xmodule.wrapper_module:WrapperBlock", -] -XBLOCKS_ASIDES = [ - 'tagging_aside = cms.lib.xblock.tagging:StructuredTagsAside', -] - -setup( - name="XModule", - version="0.1.2", - packages=find_packages(exclude=["tests"]), - install_requires=[ - 'setuptools', - 'docopt', - 'capa', - 'path.py', - 'webob', - 'edx-opaque-keys>=0.4.0', - ], - package_data={ - 'xmodule': ['js/module/*'], - }, - - # See https://setuptools.readthedocs.io/en/latest/setuptools.html#dynamic-discovery-of-services-and-plugins - # for a description of entry_points - entry_points={ - 'xblock.v1': XBLOCKS, - 'xblock_asides.v1': XBLOCKS_ASIDES, - 'console_scripts': [ - 'xmodule_assets = xmodule.static_content:main', - ], - }, -) diff --git a/common/lib/xmodule/test_files/formularesponse_with_hint.xml b/common/lib/xmodule/test_files/formularesponse_with_hint.xml deleted file mode 100644 index 94d4ff9aa590..000000000000 --- a/common/lib/xmodule/test_files/formularesponse_with_hint.xml +++ /dev/null @@ -1,45 +0,0 @@ - - - - -

Hints can be provided to students, based on the last response given, as well as the history of responses given. Here is an example of a hint produced by a Formula Response problem.

- -

-What is the equation of the line which passess through ($x1,$y1) and -($x2,$y2)?

- -

The correct answer is $answer. A common error is to invert the equation for the slope. Enter -$wrongans to see a hint.

- - - - - - y = - - - - - You have inverted the slope in the question. - - - - - diff --git a/common/lib/xmodule/test_files/stringresponse_with_hint.xml b/common/lib/xmodule/test_files/stringresponse_with_hint.xml deleted file mode 100644 index 86efdf0f18e1..000000000000 --- a/common/lib/xmodule/test_files/stringresponse_with_hint.xml +++ /dev/null @@ -1,25 +0,0 @@ - -

Example: String Response Problem

-
- - - Which US state has Lansing as its capital? - - - - - - - - - The state capital of Wisconsin is Madison. - - - The state capital of Minnesota is St. Paul. - - - The state you are looking for is also known as the 'Great Lakes State' - - - - diff --git a/common/lib/xmodule/test_files/symbolicresponse.xml b/common/lib/xmodule/test_files/symbolicresponse.xml deleted file mode 100644 index 8443366ffe3d..000000000000 --- a/common/lib/xmodule/test_files/symbolicresponse.xml +++ /dev/null @@ -1,26 +0,0 @@ - - -

Example: Symbolic Math Response Problem

- -

-A symbolic math response problem presents one or more symbolic math -input fields for input. Correctness of input is evaluated based on -the symbolic properties of the expression entered. The student enters -text, but sees a proper symbolic rendition of the entered formula, in -real time, next to the input box. -

- -

This is a correct answer which may be entered below:

-

cos(theta)*[[1,0],[0,1]] + i*sin(theta)*[[0,1],[1,0]]

- - Compute [mathjax] U = \exp\left( i \theta \left[ \begin{matrix} 0 & 1 \\ 1 & 0 \end{matrix} \right] \right) [/mathjax] - and give the resulting \(2 \times 2\) matrix.
- Your input should be typed in as a list of lists, eg [[1,2],[3,4]].
- [mathjax]U=[/mathjax] - - -
- - - - diff --git a/common/static/css/tinymce-studio-content.css b/common/static/css/tinymce-studio-content.css index c01f772e05b6..0411fd3ba9da 100644 --- a/common/static/css/tinymce-studio-content.css +++ b/common/static/css/tinymce-studio-content.css @@ -3,7 +3,7 @@ padding: 10px; background-color: #fff; /* keep font-family in sync with CUSTOM_FONTS constant in Html editor XModule - * (edx-platform/common/lib/xmodule/xmodule/js/src/html/edit.js) + * (edx-platform/xmodule/js/src/html/edit.js) * and with acceptance tests in cms/djangoapps/contentstore/features/html-editor.feature */ font-family: 'Open Sans', Verdana, Arial, Helvetica, sans-serif; diff --git a/docs/guides/conf.py b/docs/guides/conf.py index e61fcd5f17b7..310119fde488 100644 --- a/docs/guides/conf.py +++ b/docs/guides/conf.py @@ -21,7 +21,7 @@ sys.path.insert(0, root) sys.path.append(root / "docs/guides") sys.path.append(root / "common/lib/capa") -sys.path.append(root / "common/lib/xmodule") + # Use a settings module that allows all LMS and Studio code to be imported # without errors. If running sphinx-apidoc, we already set a different @@ -225,6 +225,7 @@ 'common/lib/xmodule/xmodule': 'common/lib/xmodule', 'lms': 'lms', 'openedx': 'openedx', + 'xmodule': 'xmodule', } diff --git a/docs/guides/docstrings/common_lib.rst b/docs/guides/docstrings/common_lib.rst index b87467016612..dcf884e56fd3 100644 --- a/docs/guides/docstrings/common_lib.rst +++ b/docs/guides/docstrings/common_lib.rst @@ -9,4 +9,3 @@ out from edx-platform into separate packages at some point. :maxdepth: 2 common/lib/capa/modules - common/lib/xmodule/modules diff --git a/docs/guides/docstrings/docstrings.rst b/docs/guides/docstrings/docstrings.rst index bbd0418112f2..4862966fc484 100644 --- a/docs/guides/docstrings/docstrings.rst +++ b/docs/guides/docstrings/docstrings.rst @@ -8,3 +8,4 @@ Python Docstrings common_index lms_index openedx/modules + xmodule/modules diff --git a/docs/guides/testing/testing.rst b/docs/guides/testing/testing.rst index 9baf24aee7d8..3ff6a9c39853 100644 --- a/docs/guides/testing/testing.rst +++ b/docs/guides/testing/testing.rst @@ -74,7 +74,7 @@ Test Locations located in ``common/lib/capa/capa/tests``. - Javascript unit tests: Located in ``spec`` folders. For example, - ``common/lib/xmodule/xmodule/js/spec`` and + ``xmodule/js/spec`` and ``{cms,lms}/static/js/spec`` For consistency, you should use the same directory structure for implementation and test. For example, the test for ``src/views/module.js`` should be written in @@ -122,7 +122,7 @@ Various ways to run tests using pytest:: For example, this command runs a single python unit test file:: - pytest common/lib/xmodule/xmodule/tests/test_stringify.py + pytest xmodule/tests/test_stringify.py Note - edx-platorm has multiple services (lms, cms) in it. The environment for each service is different enough that we run some tests in both environments in jenkins. To make sure tests will pass in each of these environments (especially for tests in "common" directory), you will need to test in each seperately. Add --rootdir flag at end of your pytest call and specify the env you are testing in:: @@ -141,7 +141,7 @@ Various tools like ddt create tests with very complex names, rather than figurin 2. Alternatively, you can the get the name of all test methods in a class, file, or project, including all ddt.data variations, by running pytest with `--collectonly`:: - pytest common/lib/xmodule/xmodule/tests/test_stringify.py --collectonly + pytest xmodule/tests/test_stringify.py --collectonly Testing with migrations *********************** @@ -215,7 +215,7 @@ Use this command to generate an HTML report:: coverage html -The report is then saved in reports/common/lib/xmodule/cover/index.html +The report is then saved in reports/xmodule/cover/index.html To run tests for stub servers, for example for `YouTube stub server`_, you can run one of these commands:: diff --git a/docs/swagger.yaml b/docs/swagger.yaml index 8f4a796af671..84929daead3b 100644 --- a/docs/swagger.yaml +++ b/docs/swagger.yaml @@ -1345,7 +1345,7 @@ paths: percent_graded: (float) the percentage of total points the user has received a grade for in a given subsection show_correctness: (str) a str representing whether to show the problem/practice scores based on due date ('always', 'never', 'past_due', values defined in - common/lib/xmodule/xmodule/modulestore/inheritance.py) + xmodule/modulestore/inheritance.py) show_grades: (bool) a bool for whether to show grades based on the access the user has url: (str) the absolute path url to the Subsection enrollment_mode: (str) a str representing the enrollment the user has ('audit', 'verified', ...) diff --git a/lms/djangoapps/course_home_api/progress/views.py b/lms/djangoapps/course_home_api/progress/views.py index 4f9731b9b6e4..dc0ea63525f7 100644 --- a/lms/djangoapps/course_home_api/progress/views.py +++ b/lms/djangoapps/course_home_api/progress/views.py @@ -112,7 +112,7 @@ class ProgressTabView(RetrieveAPIView): possible: (float) number of possible points show_correctness: (str) a str representing whether to show the problem/practice scores based on due date ('always', 'never', 'past_due', values defined in - common/lib/xmodule/xmodule/modulestore/inheritance.py) + xmodule/modulestore/inheritance.py) show_grades: (bool) a bool for whether to show grades based on the access the user has url: (str or None) the absolute path url to the Subsection or None if the Subsection is no longer accessible to the learner due to a hide_after_due course team setting diff --git a/lms/djangoapps/courseware/tests/helpers.py b/lms/djangoapps/courseware/tests/helpers.py index f5818f7734e7..b362ece11f1b 100644 --- a/lms/djangoapps/courseware/tests/helpers.py +++ b/lms/djangoapps/courseware/tests/helpers.py @@ -57,7 +57,7 @@ class BaseTestXmodule(ModuleStoreTestCase): USER_COUNT = 2 COURSE_DATA = {} - # Data from YAML common/lib/xmodule/xmodule/templates/NAME/default.yaml + # Data from YAML xmodule/templates/NAME/default.yaml CATEGORY = "vertical" DATA = '' # METADATA must be overwritten for every instance that uses it. Otherwise, diff --git a/lms/djangoapps/courseware/tests/test_video_xml.py b/lms/djangoapps/courseware/tests/test_video_xml.py index a677b0673dd8..046c564b416e 100644 --- a/lms/djangoapps/courseware/tests/test_video_xml.py +++ b/lms/djangoapps/courseware/tests/test_video_xml.py @@ -4,13 +4,13 @@ These test data read from xml, not from mongo. We have a ModuleStoreTestCase class defined in -common/lib/xmodule/xmodule/modulestore/tests/django_utils.py. +xmodule/modulestore/tests/django_utils.py. You can search for usages of this in the cms and lms tests for examples. You use this so that it will do things like point the modulestore setting to mongo, flush the contentstore before and after, load the templates, etc. You can then use the CourseFactory and XModuleItemFactory as defined in -common/lib/xmodule/xmodule/modulestore/tests/factories.py to create the +xmodule/modulestore/tests/factories.py to create the course, section, subsection, unit, etc. """ diff --git a/lms/djangoapps/grades/docs/background.rst b/lms/djangoapps/grades/docs/background.rst index d3a292fe42a6..a35509464059 100644 --- a/lms/djangoapps/grades/docs/background.rst +++ b/lms/djangoapps/grades/docs/background.rst @@ -25,7 +25,7 @@ Terminology +-------------------------------------------------------------+------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+ | Assignment-Type Grade | Aggregated grade for an assignment category, like Homework or Final. Grading can be configured to drop the lowest n assignments when calculating an assignment-type grade - otherwise all assignments count equally (i.e. there is no weighting of assignments within an assignment category). The course grading policy specifies the minimum number of assignments expected for each category in advance. | +-------------------------------------------------------------+------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+ -| Overall Percentage | Float value between 0 and 1 that marks the student's percentage for the course. This is calculated by weighing each assignment-type according to the rules specified in CourseDescriptor.grader. The grader is an `extensible interface `_, but the only rules currently used in practice are simple weight by assignment-type (e.g. 30% Final, 40% HW, etc.). The grader will return the actual percentage as a value between 0 and 1. The overall grade calculation process will then take this number and do a small bit of rounding up: round(actual_percent * 100 + 0.05) / 100. This is so that someone who has been scoring an 89.5% and has been seeing their average rounded to 90% on the progress page is not suddenly surprised at the end of the course. The denominator for this is based on the total possible at the end of the course, and does not adjust for unreleased assignments – getting a perfect score on your first homework may only give you a 4% overall percentage. | +| Overall Percentage | Float value between 0 and 1 that marks the student's percentage for the course. This is calculated by weighing each assignment-type according to the rules specified in CourseDescriptor.grader. The grader is an `extensible interface `_, but the only rules currently used in practice are simple weight by assignment-type (e.g. 30% Final, 40% HW, etc.). The grader will return the actual percentage as a value between 0 and 1. The overall grade calculation process will then take this number and do a small bit of rounding up: round(actual_percent * 100 + 0.05) / 100. This is so that someone who has been scoring an 89.5% and has been seeing their average rounded to 90% on the progress page is not suddenly surprised at the end of the course. The denominator for this is based on the total possible at the end of the course, and does not adjust for unreleased assignments – getting a perfect score on your first homework may only give you a 4% overall percentage. | +-------------------------------------------------------------+------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+ | Overall Grade | Letter grade based on CourseDescriptor.grade_cutoffs and the Overall Percentage (so after rounding up). | +-------------------------------------------------------------+------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+ @@ -55,7 +55,7 @@ The edX course is built as a hierarchical structure of `xBlocks `_ and specify the Pass / Fail threshold (for example, a minimum of 50/100 is required to Pass). - + - The Passing grade range can be further divided into letter grades, such as A, B, etc. - + Assignment Weights * Course teams set the `assignment types `_ used in the course, along with their weights and the number of allowed drops (number of assignments with the lowest grades that can be discarded in the final grade computation). Computation -* Although the platform provides support for custom `course graders `_, in practice, only the computation described here is used, as implemented by the `WeightedSubsectionsGrader `_. +* Although the platform provides support for custom `course graders `_, in practice, only the computation described here is used, as implemented by the `WeightedSubsectionsGrader `_. * The overall grade is the weighted sum of all assignment types in the course, allowing for droppable assignments. - Which subsections to drop are determined only after calculating each subsection's grade, as only the ones with the lowest grades are dropped. - + .. image:: images/background_overall_grade.png Assignment Grades @@ -173,7 +173,7 @@ Today, we support the following features to `adjust grades `_: +* In `Gradebook `_: - override a subsection grade for a learner - override subsection grades in bulk (master's track only) @@ -191,4 +191,4 @@ It is relevant to note that ORA2 has its own immutable data model and thus, an i * All scores and submissions are also immutable. -* So given a user's record, one can reliably determine the exact rubric it was evaluated against and its accurate score. \ No newline at end of file +* So given a user's record, one can reliably determine the exact rubric it was evaluated against and its accurate score. diff --git a/openedx/core/djangoapps/xblock/runtime/shims.py b/openedx/core/djangoapps/xblock/runtime/shims.py index 41b028de4294..5f5ae4bbfdc7 100644 --- a/openedx/core/djangoapps/xblock/runtime/shims.py +++ b/openedx/core/djangoapps/xblock/runtime/shims.py @@ -90,7 +90,7 @@ def cache(self): def can_execute_unsafe_code(self): """ Determine if capa problems in this context/course are allowed to run - unsafe code. See common/lib/xmodule/xmodule/util/sandboxing.py + unsafe code. See xmodule/util/sandboxing.py Seems only to be used by capa. """ diff --git a/pavelib/assets.py b/pavelib/assets.py index 0f96b697790b..ad933de19596 100644 --- a/pavelib/assets.py +++ b/pavelib/assets.py @@ -376,7 +376,7 @@ def register(self, observer): """ Register files with observer """ - observer.schedule(self, 'common/lib/xmodule/', recursive=True) + observer.schedule(self, 'xmodule/', recursive=True) @debounce() def on_any_event(self, event): @@ -889,7 +889,7 @@ def watch_assets(options): observer = Observer(timeout=wait) SassWatcher().register(observer, sass_directories) - XModuleSassWatcher().register(observer, ['common/lib/xmodule/']) + XModuleSassWatcher().register(observer, ['xmodule/']) XModuleAssetsWatcher().register(observer) print("Starting asset watcher...") diff --git a/pavelib/quality.py b/pavelib/quality.py index 9f233c8a70b8..2a5c686b62a3 100644 --- a/pavelib/quality.py +++ b/pavelib/quality.py @@ -203,7 +203,7 @@ def _count_pylint_violations(report_file): """ num_violations_report = 0 # An example string: - # common/lib/xmodule/xmodule/tests/test_conditional.py:21: [C0111(missing-docstring), DummySystem] Missing docstring + # xmodule/xmodule/tests/test_conditional.py:21: [C0111(missing-docstring), DummySystem] Missing docstring # More examples can be found in the unit tests for this method pylint_pattern = re.compile(r".(\d+):\ \[(\D\d+.+\]).") diff --git a/pavelib/utils/envs.py b/pavelib/utils/envs.py index 98f5abec4044..0d68dadb7dbe 100644 --- a/pavelib/utils/envs.py +++ b/pavelib/utils/envs.py @@ -189,8 +189,8 @@ class Env: REPO_ROOT / 'cms/static/karma_cms_squire.conf.js', REPO_ROOT / 'cms/static/karma_cms_webpack.conf.js', REPO_ROOT / 'lms/static/karma_lms.conf.js', - REPO_ROOT / 'common/lib/xmodule/xmodule/js/karma_xmodule.conf.js', - REPO_ROOT / 'common/lib/xmodule/xmodule/js/karma_xmodule_webpack.conf.js', + REPO_ROOT / 'xmodule/xmodule/js/karma_xmodule.conf.js', + REPO_ROOT / 'xmodule/xmodule/js/karma_xmodule_webpack.conf.js', REPO_ROOT / 'common/static/karma_common.conf.js', REPO_ROOT / 'common/static/karma_common_requirejs.conf.js', ] diff --git a/requirements/edx/local.in b/requirements/edx/local.in index eb0165c473bb..792a18c3b094 100644 --- a/requirements/edx/local.in +++ b/requirements/edx/local.in @@ -1,6 +1,6 @@ # Python libraries to install that are local to the edx-platform repo -e . -e common/lib/capa --e common/lib/xmodule +-e common/lib/sandbox-packages -e openedx/core/lib/xblock_builtin/xblock_discussion From b5a699d2bf5784043f547f7b15017c92a786bc4f Mon Sep 17 00:00:00 2001 From: edX requirements bot Date: Mon, 23 May 2022 02:10:36 -0400 Subject: [PATCH 07/25] chore: Updating Python Requirements --- requirements/edx/base.txt | 16 ++++------------ requirements/edx/development.txt | 15 +++------------ requirements/edx/testing.txt | 15 +++------------ 3 files changed, 10 insertions(+), 36 deletions(-) diff --git a/requirements/edx/base.txt b/requirements/edx/base.txt index 6f2cc53d7de7..611f1f1de92c 100644 --- a/requirements/edx/base.txt +++ b/requirements/edx/base.txt @@ -7,9 +7,7 @@ -e git+https://github.com/openedx/blockstore.git@1.2.1#egg=blockstore==1.2.1 # via -r requirements/edx/github.in -e common/lib/capa - # via - # -r requirements/edx/local.in - # xmodule + # via -r requirements/edx/local.in -e git+https://github.com/edx/codejail.git@3.1.3#egg=codejail==3.1.3 # via -r requirements/edx/github.in -e git+https://github.com/edx/django-wiki.git@1.1.0#egg=django-wiki @@ -26,8 +24,6 @@ # via -r requirements/edx/local.in -e git+https://github.com/edx-solutions/xblock-google-drive.git@2d176468e33c0713c911b563f8f65f7cf232f5b6#egg=xblock-google-drive # via -r requirements/edx/github.in --e common/lib/xmodule - # via -r requirements/edx/local.in acid-xblock==0.2.1 # via -r requirements/edx/base.in aiohttp==3.8.1 @@ -396,8 +392,6 @@ djangorestframework==3.12.4 # super-csv djangorestframework-xml==2.0.0 # via edx-enterprise -docopt==0.6.2 - # via xmodule docutils==0.17.1 # via # -c requirements/edx/../constraints.txt @@ -493,7 +487,6 @@ edx-opaque-keys[django]==2.3.0 # lti-consumer-xblock # openedx-events # ora2 - # xmodule edx-organizations==6.11.1 # via -r requirements/edx/base.in edx-proctoring==4.10.2 @@ -644,6 +637,7 @@ lti-consumer-xblock==4.1.0 lxml==4.8.0 # via # -r requirements/edx/base.in + # capa # edxval # lti-consumer-xblock # olxcleaner @@ -751,7 +745,6 @@ path-py==12.5.0 # edx-enterprise # ora2 # staff-graded-xblock - # xmodule paver==1.3.4 # via -r requirements/edx/paver.txt pbr==5.9.0 @@ -869,6 +862,7 @@ pytz==2022.1 # -r requirements/edx/base.in # babel # blockstore + # capa # celery # django # django-ses @@ -1082,9 +1076,7 @@ webencodings==0.5.1 # html5lib # tinycss2 webob==1.8.7 - # via - # xblock - # xmodule + # via xblock wrapt==1.14.1 # via # -r requirements/edx/paver.txt diff --git a/requirements/edx/development.txt b/requirements/edx/development.txt index 410e6c8e4b88..dac55104f033 100644 --- a/requirements/edx/development.txt +++ b/requirements/edx/development.txt @@ -7,9 +7,7 @@ -e git+https://github.com/openedx/blockstore.git@1.2.1#egg=blockstore==1.2.1 # via -r requirements/edx/testing.txt -e common/lib/capa - # via - # -r requirements/edx/testing.txt - # xmodule + # via -r requirements/edx/testing.txt -e git+https://github.com/edx/codejail.git@3.1.3#egg=codejail==3.1.3 # via -r requirements/edx/testing.txt -e git+https://github.com/edx/django-wiki.git@1.1.0#egg=django-wiki @@ -26,8 +24,6 @@ # via -r requirements/edx/testing.txt -e git+https://github.com/edx-solutions/xblock-google-drive.git@2d176468e33c0713c911b563f8f65f7cf232f5b6#egg=xblock-google-drive # via -r requirements/edx/testing.txt --e common/lib/xmodule - # via -r requirements/edx/testing.txt acid-xblock==0.2.1 # via -r requirements/edx/testing.txt aiohttp==3.8.1 @@ -498,10 +494,6 @@ djangorestframework-xml==2.0.0 # via # -r requirements/edx/testing.txt # edx-enterprise -docopt==0.6.2 - # via - # -r requirements/edx/testing.txt - # xmodule docutils==0.17.1 # via # -c requirements/edx/../constraints.txt @@ -610,7 +602,6 @@ edx-opaque-keys[django]==2.3.0 # lti-consumer-xblock # openedx-events # ora2 - # xmodule edx-organizations==6.11.1 # via -r requirements/edx/testing.txt edx-proctoring==4.10.2 @@ -849,6 +840,7 @@ lti-consumer-xblock==4.1.0 lxml==4.8.0 # via # -r requirements/edx/testing.txt + # capa # edxval # lti-consumer-xblock # olxcleaner @@ -989,7 +981,6 @@ path-py==12.5.0 # edx-enterprise # ora2 # staff-graded-xblock - # xmodule paver==1.3.4 # via -r requirements/edx/testing.txt pbr==5.9.0 @@ -1217,6 +1208,7 @@ pytz==2022.1 # -r requirements/edx/testing.txt # babel # blockstore + # capa # celery # django # django-ses @@ -1558,7 +1550,6 @@ webob==1.8.7 # via # -r requirements/edx/testing.txt # xblock - # xmodule wheel==0.37.1 # via # -r requirements/edx/pip-tools.txt diff --git a/requirements/edx/testing.txt b/requirements/edx/testing.txt index e59ac534ce91..0b1f5a0801e8 100644 --- a/requirements/edx/testing.txt +++ b/requirements/edx/testing.txt @@ -7,9 +7,7 @@ -e git+https://github.com/openedx/blockstore.git@1.2.1#egg=blockstore==1.2.1 # via -r requirements/edx/base.txt -e common/lib/capa - # via - # -r requirements/edx/base.txt - # xmodule + # via -r requirements/edx/base.txt -e git+https://github.com/edx/codejail.git@3.1.3#egg=codejail==3.1.3 # via -r requirements/edx/base.txt -e git+https://github.com/edx/django-wiki.git@1.1.0#egg=django-wiki @@ -26,8 +24,6 @@ # via -r requirements/edx/base.txt -e git+https://github.com/edx-solutions/xblock-google-drive.git@2d176468e33c0713c911b563f8f65f7cf232f5b6#egg=xblock-google-drive # via -r requirements/edx/base.txt --e common/lib/xmodule - # via -r requirements/edx/base.txt acid-xblock==0.2.1 # via -r requirements/edx/base.txt aiohttp==3.8.1 @@ -483,10 +479,6 @@ djangorestframework-xml==2.0.0 # via # -r requirements/edx/base.txt # edx-enterprise -docopt==0.6.2 - # via - # -r requirements/edx/base.txt - # xmodule docutils==0.17.1 # via # -c requirements/edx/../constraints.txt @@ -594,7 +586,6 @@ edx-opaque-keys[django]==2.3.0 # lti-consumer-xblock # openedx-events # ora2 - # xmodule edx-organizations==6.11.1 # via -r requirements/edx/base.txt edx-proctoring==4.10.2 @@ -811,6 +802,7 @@ lti-consumer-xblock==4.1.0 lxml==4.8.0 # via # -r requirements/edx/base.txt + # capa # edxval # lti-consumer-xblock # olxcleaner @@ -939,7 +931,6 @@ path-py==12.5.0 # edx-enterprise # ora2 # staff-graded-xblock - # xmodule paver==1.3.4 # via -r requirements/edx/base.txt pbr==5.9.0 @@ -1148,6 +1139,7 @@ pytz==2022.1 # -r requirements/edx/base.txt # babel # blockstore + # capa # celery # django # django-ses @@ -1443,7 +1435,6 @@ webob==1.8.7 # via # -r requirements/edx/base.txt # xblock - # xmodule wrapt==1.14.1 # via # -r requirements/edx/base.txt From 5eddca5fe2a1221c7719c202ef283358e02da626 Mon Sep 17 00:00:00 2001 From: M Umar Khan Date: Mon, 23 May 2022 11:19:53 +0500 Subject: [PATCH 08/25] refactor: update shards file --- .github/workflows/unit-test-shards.json | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/.github/workflows/unit-test-shards.json b/.github/workflows/unit-test-shards.json index 838d0fe261f2..f992fc8c2915 100644 --- a/.github/workflows/unit-test-shards.json +++ b/.github/workflows/unit-test-shards.json @@ -272,5 +272,11 @@ "paths": [ "common/djangoapps/" ] + }, + "xmodule-1": { + "settings": "lms.envs.test", + "paths": [ + "xmodule/" + ] } } From 8ae7413c276131533aaef1144478f1f60089d58a Mon Sep 17 00:00:00 2001 From: M Umar Khan Date: Mon, 23 May 2022 11:29:59 +0500 Subject: [PATCH 09/25] refactor: update unit tests action file --- .github/actions/verify-tests-count/action.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/actions/verify-tests-count/action.yml b/.github/actions/verify-tests-count/action.yml index 6357a4158c84..d7229af5050d 100644 --- a/.github/actions/verify-tests-count/action.yml +++ b/.github/actions/verify-tests-count/action.yml @@ -7,7 +7,7 @@ runs: shell: bash run: | echo "root_cms_unit_tests_count=$(pytest --collect-only --ds=cms.envs.test cms/ -q | head -n -2 | wc -l)" >> $GITHUB_ENV - echo "root_lms_unit_tests_count=$(pytest --collect-only --ds=lms.envs.test lms/ openedx/ common/djangoapps/ common/lib/ -q | head -n -2 | wc -l)" >> $GITHUB_ENV + echo "root_lms_unit_tests_count=$(pytest --collect-only --ds=lms.envs.test lms/ openedx/ common/djangoapps/ common/lib/ xmodule/ -q | head -n -2 | wc -l)" >> $GITHUB_ENV - name: get GHA unit test paths shell: bash From aa48cffd58a49fe00b520f2ec3dd8cadffe6be3e Mon Sep 17 00:00:00 2001 From: M Umar Khan Date: Mon, 23 May 2022 11:57:06 +0500 Subject: [PATCH 10/25] refactor: update karma runner webpack --- xmodule/js/karma_runner_webpack.js | 52 +++++++++++++++--------------- 1 file changed, 26 insertions(+), 26 deletions(-) diff --git a/xmodule/js/karma_runner_webpack.js b/xmodule/js/karma_runner_webpack.js index b3adb3687872..5bca3b6868f1 100644 --- a/xmodule/js/karma_runner_webpack.js +++ b/xmodule/js/karma_runner_webpack.js @@ -1,33 +1,33 @@ -import '../../../../static/js/src/ajax_prefix.js'; -import '../../../../static/common/js/vendor/underscore.js'; -import '../../../../static/common/js/vendor/backbone.js'; -import '../../../../static/js/vendor/CodeMirror/codemirror.js'; -import '../../../../static/js/vendor/draggabilly.js'; -import '../../../../static/common/js/vendor/jquery.js'; -import '../../../../static/common/js/vendor/jquery-migrate.js'; -import '../../../../static/js/vendor/jquery.cookie.js'; -import '../../../../static/js/vendor/jquery.leanModal.js'; -import '../../../../static/js/vendor/jquery.timeago.js'; -import '../../../../static/js/vendor/jquery-ui.min.js'; -import '../../../../static/js/vendor/jquery.ui.draggable.js'; -import '../../../../static/js/vendor/json2.js'; -// import '../../../../static/common/js/vendor/moment-with-locales.js'; -import '../../../../static/js/vendor/tinymce/js/tinymce/jquery.tinymce.min.js'; -import '../../../../static/js/vendor/tinymce/js/tinymce/tinymce.full.min.js'; -import '../../../../static/js/src/accessibility_tools.js'; -import '../../../../static/js/src/logger.js'; -import '../../../../static/js/src/utility.js'; -import '../../../../static/js/test/add_ajax_prefix.js'; -import '../../../../static/js/test/i18n.js'; -import '../../../../static/common/js/vendor/hls.js'; +import '../../common/static/js/src/ajax_prefix.js'; +import '../../common/static/common/js/vendor/underscore.js'; +import '../../common/static/common/js/vendor/backbone.js'; +import '../../common/static/js/vendor/CodeMirror/codemirror.js'; +import '../../common/static/js/vendor/draggabilly.js'; +import '../../common/static/common/js/vendor/jquery.js'; +import '../../common/static/common/js/vendor/jquery-migrate.js'; +import '../../common/static/js/vendor/jquery.cookie.js'; +import '../../common/static/js/vendor/jquery.leanModal.js'; +import '../../common/static/js/vendor/jquery.timeago.js'; +import '../../common/static/js/vendor/jquery-ui.min.js'; +import '../../common/static/js/vendor/jquery.ui.draggable.js'; +import '../../common/static/js/vendor/json2.js'; +// import '../../common/static/common/js/vendor/moment-with-locales.js'; +import '../../common/static/js/vendor/tinymce/js/tinymce/jquery.tinymce.min.js'; +import '../../common/static/js/vendor/tinymce/js/tinymce/tinymce.full.min.js'; +import '../../common/static/js/src/accessibility_tools.js'; +import '../../common/static/js/src/logger.js'; +import '../../common/static/js/src/utility.js'; +import '../../common/static/js/test/add_ajax_prefix.js'; +import '../../common/static/js/test/i18n.js'; +import '../../common/static/common/js/vendor/hls.js'; import '../assets/vertical/public/js/vertical_student_view.js'; -import '../../../../static/js/vendor/jasmine-imagediff.js'; -import '../../../../static/common/js/spec_helpers/jasmine-waituntil.js'; -import '../../../../static/common/js/spec_helpers/jasmine-extensions.js'; -import '../../../../static/common/js/vendor/sinon.js'; +import '../../common/static/js/vendor/jasmine-imagediff.js'; +import '../../common/static/common/js/spec_helpers/jasmine-waituntil.js'; +import '../../common/static/common/js/spec_helpers/jasmine-extensions.js'; +import '../../common/static/common/js/vendor/sinon.js'; // These libraries are used by the tests (and the code under test) // but not explicitly imported From b518acfbe0014598f172a8b4a7545d8a0bc0e736 Mon Sep 17 00:00:00 2001 From: M Umar Khan Date: Mon, 23 May 2022 12:44:02 +0500 Subject: [PATCH 11/25] refactor: fix imports --- .../grades/rest_api/v1/tests/test_grading_policy_view.py | 4 ++-- lms/djangoapps/grades/tests/base.py | 4 ++-- lms/djangoapps/grades/tests/integration/test_problems.py | 4 ++-- lms/djangoapps/instructor/tests/test_enrollment.py | 4 ++-- lms/djangoapps/instructor_task/tests/test_base.py | 4 ++-- lms/djangoapps/learner_dashboard/tests/test_programs.py | 4 ++-- 6 files changed, 12 insertions(+), 12 deletions(-) diff --git a/lms/djangoapps/grades/rest_api/v1/tests/test_grading_policy_view.py b/lms/djangoapps/grades/rest_api/v1/tests/test_grading_policy_view.py index 440136c757a3..c4ba94d94694 100644 --- a/lms/djangoapps/grades/rest_api/v1/tests/test_grading_policy_view.py +++ b/lms/djangoapps/grades/rest_api/v1/tests/test_grading_policy_view.py @@ -8,11 +8,11 @@ import ddt from django.urls import reverse from pytz import UTC +from capa.tests.response_xml_factory import MultipleChoiceResponseXMLFactory + from xmodule.modulestore import ModuleStoreEnum from xmodule.modulestore.tests.django_utils import TEST_DATA_MONGO_AMNESTY_MODULESTORE, SharedModuleStoreTestCase from xmodule.modulestore.tests.factories import CourseFactory, ItemFactory - -from capa.tests.response_xml_factory import MultipleChoiceResponseXMLFactory from common.djangoapps.student.tests.factories import GlobalStaffFactory from common.djangoapps.student.tests.factories import StaffFactory from common.djangoapps.student.tests.factories import UserFactory diff --git a/lms/djangoapps/grades/tests/base.py b/lms/djangoapps/grades/tests/base.py index d50d77b6437a..747474a351a0 100644 --- a/lms/djangoapps/grades/tests/base.py +++ b/lms/djangoapps/grades/tests/base.py @@ -4,10 +4,10 @@ from crum import set_current_request +from capa.tests.response_xml_factory import MultipleChoiceResponseXMLFactory + from xmodule.modulestore.tests.django_utils import SharedModuleStoreTestCase from xmodule.modulestore.tests.factories import CourseFactory, ItemFactory - -from capa.tests.response_xml_factory import MultipleChoiceResponseXMLFactory from common.djangoapps.student.models import CourseEnrollment from common.djangoapps.student.tests.factories import UserFactory from lms.djangoapps.course_blocks.api import get_course_blocks diff --git a/lms/djangoapps/grades/tests/integration/test_problems.py b/lms/djangoapps/grades/tests/integration/test_problems.py index 8fdf2fbf1e48..92b6478c8386 100644 --- a/lms/djangoapps/grades/tests/integration/test_problems.py +++ b/lms/djangoapps/grades/tests/integration/test_problems.py @@ -5,6 +5,8 @@ import ddt import pytz from crum import set_current_request +from capa.tests.response_xml_factory import MultipleChoiceResponseXMLFactory + from xmodule.graders import ProblemScore from xmodule.modulestore import ModuleStoreEnum from xmodule.modulestore.tests.django_utils import ( @@ -13,8 +15,6 @@ from xmodule.modulestore.tests.factories import CourseFactory, ItemFactory from xmodule.modulestore.tests.utils import TEST_DATA_DIR from xmodule.modulestore.xml_importer import import_course_from_xml - -from capa.tests.response_xml_factory import MultipleChoiceResponseXMLFactory from common.djangoapps.student.models import CourseEnrollment from common.djangoapps.student.tests.factories import UserFactory from lms.djangoapps.course_blocks.api import get_course_blocks diff --git a/lms/djangoapps/instructor/tests/test_enrollment.py b/lms/djangoapps/instructor/tests/test_enrollment.py index 1a56471dbd7e..c5cc4989bbf8 100644 --- a/lms/djangoapps/instructor/tests/test_enrollment.py +++ b/lms/djangoapps/instructor/tests/test_enrollment.py @@ -9,6 +9,7 @@ import ddt import pytest +from capa.tests.response_xml_factory import MultipleChoiceResponseXMLFactory from ccx_keys.locator import CCXLocator from crum import set_current_request from django.conf import settings @@ -16,10 +17,9 @@ from django.utils.translation import override as override_language from opaque_keys.edx.locator import CourseLocator from submissions import api as sub_api + from xmodule.modulestore.tests.django_utils import TEST_DATA_MONGO_AMNESTY_MODULESTORE, SharedModuleStoreTestCase from xmodule.modulestore.tests.factories import CourseFactory, ItemFactory - -from capa.tests.response_xml_factory import MultipleChoiceResponseXMLFactory from common.djangoapps.student.models import CourseEnrollment, CourseEnrollmentAllowed, anonymous_id_for_user from common.djangoapps.student.roles import CourseCcxCoachRole from common.djangoapps.student.tests.factories import AdminFactory, UserFactory diff --git a/lms/djangoapps/instructor_task/tests/test_base.py b/lms/djangoapps/instructor_task/tests/test_base.py index 61e0984cd263..14d4b0d04030 100644 --- a/lms/djangoapps/instructor_task/tests/test_base.py +++ b/lms/djangoapps/instructor_task/tests/test_base.py @@ -13,17 +13,17 @@ from uuid import uuid4 import unicodecsv +from capa.tests.response_xml_factory import OptionResponseXMLFactory from celery.states import FAILURE, SUCCESS from django.contrib.auth.models import User # lint-amnesty, pylint: disable=imported-auth-user from django.urls import reverse from opaque_keys.edx.keys import CourseKey from opaque_keys.edx.locations import Location + from xmodule.modulestore import ModuleStoreEnum from xmodule.modulestore.django import modulestore from xmodule.modulestore.tests.django_utils import TEST_DATA_MONGO_AMNESTY_MODULESTORE, ModuleStoreTestCase from xmodule.modulestore.tests.factories import CourseFactory, ItemFactory - -from capa.tests.response_xml_factory import OptionResponseXMLFactory from common.djangoapps.student.tests.factories import CourseEnrollmentFactory, UserFactory from lms.djangoapps.courseware.model_data import StudentModule from lms.djangoapps.courseware.tests.tests import LoginEnrollmentTestCase diff --git a/lms/djangoapps/learner_dashboard/tests/test_programs.py b/lms/djangoapps/learner_dashboard/tests/test_programs.py index 376276475d71..6b2b1604515d 100644 --- a/lms/djangoapps/learner_dashboard/tests/test_programs.py +++ b/lms/djangoapps/learner_dashboard/tests/test_programs.py @@ -14,10 +14,10 @@ from django.test import override_settings from django.urls import reverse, reverse_lazy from edx_toggles.toggles.testutils import override_waffle_flag -from xmodule.modulestore.tests.django_utils import SharedModuleStoreTestCase -from xmodule.modulestore.tests.factories import CourseFactory as ModuleStoreCourseFactory from lti_consumer.models import LtiConfiguration +from xmodule.modulestore.tests.django_utils import SharedModuleStoreTestCase +from xmodule.modulestore.tests.factories import CourseFactory as ModuleStoreCourseFactory from common.djangoapps.student.tests.factories import CourseEnrollmentFactory, UserFactory from lms.djangoapps.learner_dashboard.config.waffle import ENABLE_PROGRAM_TAB_VIEW from lms.djangoapps.program_enrollments.rest_api.v1.tests.test_views import ProgramCacheMixin From dabe676931a3859ac1c13d6bb5eea7ce5400b615 Mon Sep 17 00:00:00 2001 From: M Umar Khan Date: Mon, 23 May 2022 18:43:15 +0500 Subject: [PATCH 12/25] refactor: fix requirements --- requirements/edx/base.in | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/requirements/edx/base.in b/requirements/edx/base.in index 703fc0ee97ec..3aeeb2aeec5e 100644 --- a/requirements/edx/base.in +++ b/requirements/edx/base.in @@ -69,6 +69,7 @@ django-user-tasks django-waffle django-webpack-loader # Used to wire webpack bundles into the django asset pipeline djangorestframework +docopt done-xblock edx-ace edx-api-doc-tools @@ -85,6 +86,7 @@ edx-drf-extensions edx-enterprise edx-milestones edx-name-affirmation +edx-opaque-keys edx-organizations edx-proctoring>=2.0.1 edx-proctoring-proctortrack==1.0.5 # Intentionally and permanently pinned to ensure code changes are reviewed @@ -123,6 +125,7 @@ openedx-calc # Library supporting mathematical calculatio openedx-events # Open edX Events from Hooks Extension Framework (OEP-50) openedx-filters # Open edX Filters from Hooks Extension Framework (OEP-50) ora2>=4.4.0 +path piexif # Exif image metadata manipulation, used in the profile_images app Pillow # Image manipulation library; used for course assets, profile images, invoice PDFs, etc. py2neo # Driver for converting Python modulestore structures to Neo4j's schema (for Coursegraph). @@ -162,6 +165,7 @@ staff-graded-xblock # An XBlock that allows for off-site bulk sc super-csv # Generic CSV processor unicodecsv # Easier support for CSV files with unicode text user-util # Functionality for retiring users (GDPR compliance) +webob web-fragments # Provides the ability to render fragments of web pages XBlock # Courseware component architecture xblock-utils # Provides utilities used by the Discussion XBlock From 19ebba75b748acef22a4f905872020902c077c45 Mon Sep 17 00:00:00 2001 From: edX requirements bot Date: Mon, 23 May 2022 09:54:52 -0400 Subject: [PATCH 13/25] chore: Updating Python Requirements --- requirements/edx/base.txt | 8 +++++++- requirements/edx/development.txt | 2 ++ requirements/edx/testing.txt | 2 ++ 3 files changed, 11 insertions(+), 1 deletion(-) diff --git a/requirements/edx/base.txt b/requirements/edx/base.txt index 611f1f1de92c..83f8eb373d4f 100644 --- a/requirements/edx/base.txt +++ b/requirements/edx/base.txt @@ -392,6 +392,8 @@ djangorestframework==3.12.4 # super-csv djangorestframework-xml==2.0.0 # via edx-enterprise +docopt==0.6.2 + # via -r requirements/edx/base.in docutils==0.17.1 # via # -c requirements/edx/../constraints.txt @@ -473,6 +475,7 @@ edx-name-affirmation==2.3.4 # via -r requirements/edx/base.in edx-opaque-keys[django]==2.3.0 # via + # -r requirements/edx/base.in # -r requirements/edx/paver.txt # edx-bulk-grades # edx-ccx-keys @@ -737,6 +740,7 @@ pansi==2020.7.3 # via py2neo path==16.4.0 # via + # -r requirements/edx/base.in # -r requirements/edx/paver.txt # edx-i18n-tools # path-py @@ -1076,7 +1080,9 @@ webencodings==0.5.1 # html5lib # tinycss2 webob==1.8.7 - # via xblock + # via + # -r requirements/edx/base.in + # xblock wrapt==1.14.1 # via # -r requirements/edx/paver.txt diff --git a/requirements/edx/development.txt b/requirements/edx/development.txt index dac55104f033..0a2a829d91b8 100644 --- a/requirements/edx/development.txt +++ b/requirements/edx/development.txt @@ -494,6 +494,8 @@ djangorestframework-xml==2.0.0 # via # -r requirements/edx/testing.txt # edx-enterprise +docopt==0.6.2 + # via -r requirements/edx/testing.txt docutils==0.17.1 # via # -c requirements/edx/../constraints.txt diff --git a/requirements/edx/testing.txt b/requirements/edx/testing.txt index 0b1f5a0801e8..9a57e433aecb 100644 --- a/requirements/edx/testing.txt +++ b/requirements/edx/testing.txt @@ -479,6 +479,8 @@ djangorestframework-xml==2.0.0 # via # -r requirements/edx/base.txt # edx-enterprise +docopt==0.6.2 + # via -r requirements/edx/base.txt docutils==0.17.1 # via # -c requirements/edx/../constraints.txt From ec13c1d979e03843da232dbb39978d6bae208e75 Mon Sep 17 00:00:00 2001 From: M Umar Khan Date: Tue, 24 May 2022 11:53:04 +0500 Subject: [PATCH 14/25] refactor: fix draggabilly.js path in html_module.py --- xmodule/html_module.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xmodule/html_module.py b/xmodule/html_module.py index 0dcdffbc41d7..f72e9b33800c 100644 --- a/xmodule/html_module.py +++ b/xmodule/html_module.py @@ -143,7 +143,7 @@ def studio_view(self, _context): resource_string(__name__, 'js/src/javascript_loader.js'), resource_string(__name__, 'js/src/collapsible.js'), resource_string(__name__, 'js/src/html/imageModal.js'), - resource_string(__name__, 'js/common_static/js/vendor/draggabilly.js'), + resource_string(__name__, '../js/common_static/js/vendor/draggabilly.js'), ], 'xmodule_js': resource_string(__name__, 'js/src/xmodule.js'), } From 7dd48ba638891cb3f6365b4169be72aeae7108b8 Mon Sep 17 00:00:00 2001 From: M Umar Khan Date: Wed, 25 May 2022 08:06:05 +0500 Subject: [PATCH 15/25] refactor: fix broken symlinks --- xmodule/html_module.py | 2 +- xmodule/js/RequireJS-namespace-undefine.js | 2 +- xmodule/js/common_static | 2 +- xmodule/tests/data/xml-course-root | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/xmodule/html_module.py b/xmodule/html_module.py index f72e9b33800c..0dcdffbc41d7 100644 --- a/xmodule/html_module.py +++ b/xmodule/html_module.py @@ -143,7 +143,7 @@ def studio_view(self, _context): resource_string(__name__, 'js/src/javascript_loader.js'), resource_string(__name__, 'js/src/collapsible.js'), resource_string(__name__, 'js/src/html/imageModal.js'), - resource_string(__name__, '../js/common_static/js/vendor/draggabilly.js'), + resource_string(__name__, 'js/common_static/js/vendor/draggabilly.js'), ], 'xmodule_js': resource_string(__name__, 'js/src/xmodule.js'), } diff --git a/xmodule/js/RequireJS-namespace-undefine.js b/xmodule/js/RequireJS-namespace-undefine.js index fa5392caaf45..03198654363a 120000 --- a/xmodule/js/RequireJS-namespace-undefine.js +++ b/xmodule/js/RequireJS-namespace-undefine.js @@ -1 +1 @@ -../../../../../common/static/js/RequireJS-namespace-undefine.js \ No newline at end of file +../../common/static/js/RequireJS-namespace-undefine.js \ No newline at end of file diff --git a/xmodule/js/common_static b/xmodule/js/common_static index e5b87d710ecd..3dfdc86f31f8 120000 --- a/xmodule/js/common_static +++ b/xmodule/js/common_static @@ -1 +1 @@ -../../../../static/ \ No newline at end of file +../../common/static \ No newline at end of file diff --git a/xmodule/tests/data/xml-course-root b/xmodule/tests/data/xml-course-root index 83890f4542bc..c48574555e1d 120000 --- a/xmodule/tests/data/xml-course-root +++ b/xmodule/tests/data/xml-course-root @@ -1 +1 @@ -../../../../../test/data/ \ No newline at end of file +../../../common/test/data \ No newline at end of file From 7a287ca038487d4fcdf0a1060897bdf500f8475c Mon Sep 17 00:00:00 2001 From: M Umar Khan Date: Wed, 25 May 2022 14:33:53 +0500 Subject: [PATCH 16/25] refactor: fix broken symlinks for lms and cms --- cms/static/xmodule_js | 2 +- lms/static/xmodule_js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/cms/static/xmodule_js b/cms/static/xmodule_js index 6e6ff3566fd5..8e376468e64b 120000 --- a/cms/static/xmodule_js +++ b/cms/static/xmodule_js @@ -1 +1 @@ -../../common/lib/xmodule/xmodule/js/ \ No newline at end of file +../../xmodule/js \ No newline at end of file diff --git a/lms/static/xmodule_js b/lms/static/xmodule_js index 6e6ff3566fd5..8e376468e64b 120000 --- a/lms/static/xmodule_js +++ b/lms/static/xmodule_js @@ -1 +1 @@ -../../common/lib/xmodule/xmodule/js/ \ No newline at end of file +../../xmodule/js \ No newline at end of file From 684ddfda5d8ce7f4a7f80a94a99097bf9d754405 Mon Sep 17 00:00:00 2001 From: M Umar Khan Date: Fri, 27 May 2022 14:30:57 +0500 Subject: [PATCH 17/25] refactor: ignore check for enrollment_track_partition_groups.py dict --- lms/djangoapps/ccx/tests/test_views.py | 4 ++-- lms/djangoapps/courseware/tests/test_entrance_exam.py | 6 +++--- .../api/processors/enrollment_track_partition_groups.py | 2 +- openedx/core/djangoapps/discussions/tests/test_tasks.py | 5 +++-- 4 files changed, 9 insertions(+), 8 deletions(-) diff --git a/lms/djangoapps/ccx/tests/test_views.py b/lms/djangoapps/ccx/tests/test_views.py index 723fba2406c9..c3c3f68a005e 100644 --- a/lms/djangoapps/ccx/tests/test_views.py +++ b/lms/djangoapps/ccx/tests/test_views.py @@ -19,13 +19,13 @@ from edx_django_utils.cache import RequestCache from opaque_keys.edx.keys import CourseKey from pytz import UTC +from capa.tests.response_xml_factory import StringResponseXMLFactory + from xmodule.modulestore import ModuleStoreEnum from xmodule.modulestore.django import modulestore from xmodule.modulestore.tests.django_utils import ModuleStoreTestCase, SharedModuleStoreTestCase from xmodule.modulestore.tests.factories import CourseFactory, ItemFactory, SampleCourseFactory from xmodule.x_module import XModuleMixin - -from capa.tests.response_xml_factory import StringResponseXMLFactory from common.djangoapps.edxmako.shortcuts import render_to_response from common.djangoapps.student.models import CourseEnrollment, CourseEnrollmentAllowed from common.djangoapps.student.roles import CourseCcxCoachRole, CourseInstructorRole, CourseStaffRole diff --git a/lms/djangoapps/courseware/tests/test_entrance_exam.py b/lms/djangoapps/courseware/tests/test_entrance_exam.py index ee07b3aa5f1b..3075bb577c10 100644 --- a/lms/djangoapps/courseware/tests/test_entrance_exam.py +++ b/lms/djangoapps/courseware/tests/test_entrance_exam.py @@ -7,9 +7,6 @@ from crum import set_current_request from django.urls import reverse from milestones.tests.utils import MilestonesTestCaseMixin -from xmodule.modulestore.tests.django_utils import ModuleStoreTestCase -from xmodule.modulestore.tests.factories import CourseFactory, ItemFactory - from capa.tests.response_xml_factory import MultipleChoiceResponseXMLFactory from lms.djangoapps.courseware.entrance_exams import ( course_has_entrance_exam, @@ -17,6 +14,9 @@ user_can_skip_entrance_exam, user_has_passed_entrance_exam ) + +from xmodule.modulestore.tests.django_utils import ModuleStoreTestCase +from xmodule.modulestore.tests.factories import CourseFactory, ItemFactory from lms.djangoapps.courseware.model_data import FieldDataCache from lms.djangoapps.courseware.module_render import get_module, handle_xblock_callback, toc_for_course from lms.djangoapps.courseware.tests.helpers import LoginEnrollmentTestCase diff --git a/openedx/core/djangoapps/content/learning_sequences/api/processors/enrollment_track_partition_groups.py b/openedx/core/djangoapps/content/learning_sequences/api/processors/enrollment_track_partition_groups.py index ec7c29f95321..69cfdd69729c 100644 --- a/openedx/core/djangoapps/content/learning_sequences/api/processors/enrollment_track_partition_groups.py +++ b/openedx/core/djangoapps/content/learning_sequences/api/processors/enrollment_track_partition_groups.py @@ -44,7 +44,7 @@ def load_data(self, full_course_outline) -> None: self.user, partition_dict_key='id' ) - self.user_group = self.enrollment_track_groups.get(ENROLLMENT_TRACK_PARTITION_ID) + self.user_group = self.enrollment_track_groups.get(ENROLLMENT_TRACK_PARTITION_ID) # type: ignore def _is_user_excluded_by_partition_group(self, user_partition_groups): """ diff --git a/openedx/core/djangoapps/discussions/tests/test_tasks.py b/openedx/core/djangoapps/discussions/tests/test_tasks.py index b5aa7ff60c46..7d8e8541815e 100644 --- a/openedx/core/djangoapps/discussions/tests/test_tasks.py +++ b/openedx/core/djangoapps/discussions/tests/test_tasks.py @@ -4,12 +4,13 @@ import ddt import mock -from xmodule.modulestore.tests.django_utils import TEST_DATA_MONGO_AMNESTY_MODULESTORE, ModuleStoreTestCase -from xmodule.modulestore.tests.factories import CourseFactory, ItemFactory from openedx_events.learning.data import DiscussionTopicContext from openedx.core.djangoapps.discussions.tasks import update_discussions_settings_from_course +from xmodule.modulestore.tests.django_utils import TEST_DATA_MONGO_AMNESTY_MODULESTORE, ModuleStoreTestCase +from xmodule.modulestore.tests.factories import CourseFactory, ItemFactory + @ddt.ddt @mock.patch('openedx.core.djangoapps.discussions.tasks.DiscussionsConfiguration', mock.Mock()) From 4a80535bd87066521b2421712a93b1582d70dedc Mon Sep 17 00:00:00 2001 From: M Umar Khan Date: Fri, 27 May 2022 16:47:18 +0500 Subject: [PATCH 18/25] refactor: fix xmodule linting issues --- xmodule/course_module.py | 2 +- xmodule/modulestore/split_mongo/mongo_connection.py | 2 +- xmodule/modulestore/split_mongo/split.py | 4 +++- xmodule/modulestore/tests/test_contentstore.py | 2 +- xmodule/modulestore/tests/test_mongo.py | 2 +- xmodule/poll_module.py | 3 ++- xmodule/seq_module.py | 5 +++-- xmodule/tests/__init__.py | 2 +- xmodule/tests/test_capa_module.py | 2 +- xmodule/tests/test_error_module.py | 2 -- xmodule/util/misc.py | 2 +- xmodule/video_module/video_module.py | 2 +- xmodule/x_module.py | 9 ++------- 13 files changed, 18 insertions(+), 21 deletions(-) diff --git a/xmodule/course_module.py b/xmodule/course_module.py index 8136ad3c50c5..b3e49d25c33a 100644 --- a/xmodule/course_module.py +++ b/xmodule/course_module.py @@ -1080,7 +1080,7 @@ def __init__(self, *args, **kwargs): self._grading_policy = {} self.set_grading_policy(self.grading_policy) - if self.discussion_topics == {}: + if not self.discussion_topics: self.discussion_topics = {_('General'): {'id': self.location.html_id()}} try: diff --git a/xmodule/modulestore/split_mongo/mongo_connection.py b/xmodule/modulestore/split_mongo/mongo_connection.py index 8314fdaede91..91b5e17b8a5c 100644 --- a/xmodule/modulestore/split_mongo/mongo_connection.py +++ b/xmodule/modulestore/split_mongo/mongo_connection.py @@ -20,6 +20,7 @@ from mongodb_proxy import autoretry_read # Import this just to export it from pymongo.errors import DuplicateKeyError # pylint: disable=unused-import +from edx_django_utils.cache import RequestCache from common.djangoapps.split_modulestore_django.models import SplitModulestoreCourseIndex from xmodule.exceptions import HeartbeatFailure @@ -27,7 +28,6 @@ from xmodule.modulestore.split_mongo import BlockKey from xmodule.mongo_utils import connect_to_mongodb, create_collection_index from openedx.core.lib.cache_utils import request_cached -from edx_django_utils.cache import RequestCache log = logging.getLogger(__name__) diff --git a/xmodule/modulestore/split_mongo/split.py b/xmodule/modulestore/split_mongo/split.py index 3ff9ebc38fb3..2cd460581566 100644 --- a/xmodule/modulestore/split_mongo/split.py +++ b/xmodule/modulestore/split_mongo/split.py @@ -2924,7 +2924,9 @@ def _get_index_if_valid(self, course_key, force=False): :param force: if false, raises VersionConflictError if the current head of the course != the one identified by course_key """ - if course_key.org is None or get_library_or_course_attribute(course_key) is None or course_key.run is None or course_key.branch is None: + if (course_key.org is None or + get_library_or_course_attribute(course_key) is None or + course_key.run is None or course_key.branch is None): return None else: index_entry = self.get_course_index(course_key) diff --git a/xmodule/modulestore/tests/test_contentstore.py b/xmodule/modulestore/tests/test_contentstore.py index b167bc221df5..b5d755a8bea1 100644 --- a/xmodule/modulestore/tests/test_contentstore.py +++ b/xmodule/modulestore/tests/test_contentstore.py @@ -165,7 +165,7 @@ def test_get_all_content(self, deprecated): fake_course = CourseLocator('test', 'fake', 'non') course_assets, count = self.contentstore.get_all_content_for_course(fake_course) assert count == 0 - assert course_assets == [] + assert not course_assets @ddt.data(True, False) def test_attrs(self, deprecated): diff --git a/xmodule/modulestore/tests/test_mongo.py b/xmodule/modulestore/tests/test_mongo.py index cc2cca9c1b8f..c4f61f1b05fe 100644 --- a/xmodule/modulestore/tests/test_mongo.py +++ b/xmodule/modulestore/tests/test_mongo.py @@ -743,7 +743,7 @@ def test_no_asset_collection(self): courses = self.draft_store.get_courses() course = courses[0] # Confirm that no specified asset collection name means empty asset metadata. - assert self.draft_store.get_all_asset_metadata(course.id, 'asset') == [] + assert not self.draft_store.get_all_asset_metadata(course.id, 'asset') def test_no_asset_invalid_key(self): course_key = CourseLocator(org="edx3", course="test_course", run=None, deprecated=True) diff --git a/xmodule/poll_module.py b/xmodule/poll_module.py index c48637d45141..e8aebaf7d99f 100644 --- a/xmodule/poll_module.py +++ b/xmodule/poll_module.py @@ -17,9 +17,9 @@ from web_fragments.fragment import Fragment from lxml import etree -from openedx.core.djangolib.markup import Text, HTML from xblock.core import XBlock from xblock.fields import Boolean, Dict, List, Scope, String # lint-amnesty, pylint: disable=wrong-import-order +from openedx.core.djangolib.markup import Text, HTML from xmodule.mako_module import MakoTemplateBlockBase from xmodule.stringify import stringify_children from xmodule.util.xmodule_django import add_webpack_to_fragment @@ -32,6 +32,7 @@ ) from xmodule.xml_module import XmlMixin + log = logging.getLogger(__name__) _ = lambda text: text diff --git a/xmodule/seq_module.py b/xmodule/seq_module.py index 32edb0ae5b8a..f8c4ce95b898 100644 --- a/xmodule/seq_module.py +++ b/xmodule/seq_module.py @@ -9,8 +9,8 @@ import json import logging from datetime import datetime -from django.conf import settings from functools import reduce +from django.conf import settings from lxml import etree from opaque_keys.edx.keys import UsageKey @@ -613,7 +613,8 @@ def _student_or_public_view(self, context, prereq_met, prereq_meta_info, banner_ params = self._get_render_metadata(context, display_items, prereq_met, prereq_meta_info, banner_text, view, fragment) # lint-amnesty, pylint: disable=line-too-long if SHOW_PROGRESS_BAR.is_enabled() and getattr(settings, 'COMPLETION_AGGREGATOR_URL', ''): parent_block_id = self.get_parent().scope_ids.usage_id.block_id - params['chapter_completion_aggregator_url'] = '/'.join([settings.COMPLETION_AGGREGATOR_URL, str(self.course_id), parent_block_id]) + '/' + params['chapter_completion_aggregator_url'] = '/'.join( + [settings.COMPLETION_AGGREGATOR_URL, str(self.course_id), parent_block_id]) + '/' fragment.add_content(self.runtime.service(self, 'mako').render_template("seq_module.html", params)) self._capture_full_seq_item_metrics(display_items) diff --git a/xmodule/tests/__init__.py b/xmodule/tests/__init__.py index fd38c6f64d45..c164a8206806 100644 --- a/xmodule/tests/__init__.py +++ b/xmodule/tests/__init__.py @@ -84,7 +84,7 @@ def get_asides(self, block): @property def resources_fs(self): - return Mock(name='TestModuleSystem.resources_fs', root_path='.'), + return Mock(name='TestModuleSystem.resources_fs', root_path='.') def __repr__(self): """ diff --git a/xmodule/tests/test_capa_module.py b/xmodule/tests/test_capa_module.py index 26ff575f81de..55eeb14e5a40 100644 --- a/xmodule/tests/test_capa_module.py +++ b/xmodule/tests/test_capa_module.py @@ -27,11 +27,11 @@ from xblock.fields import ScopeIds from xblock.scorable import Score -import xmodule from capa import responsetypes from capa.correctmap import CorrectMap from capa.responsetypes import LoncapaProblemError, ResponseError, StudentInputError from capa.xqueue_interface import XQueueInterface +import xmodule from xmodule.capa_module import ComplexEncoder, ProblemBlock from xmodule.tests import DATA_DIR diff --git a/xmodule/tests/test_error_module.py b/xmodule/tests/test_error_module.py index 066f48aed7e9..162f82a26d76 100644 --- a/xmodule/tests/test_error_module.py +++ b/xmodule/tests/test_error_module.py @@ -5,9 +5,7 @@ import unittest -import pytest from opaque_keys.edx.locator import CourseLocator -from xblock.test.tools import unabc from xmodule.error_module import ErrorBlock, NonStaffErrorBlock from xmodule.modulestore.xml import CourseLocationManager diff --git a/xmodule/util/misc.py b/xmodule/util/misc.py index d6dda5aa51b5..e7a308f85f1b 100644 --- a/xmodule/util/misc.py +++ b/xmodule/util/misc.py @@ -5,11 +5,11 @@ import re -from xmodule.annotator_mixin import html_to_text from opaque_keys.edx.locator import ( CourseLocator, LibraryLocator, ) +from xmodule.annotator_mixin import html_to_text def escape_invalid_characters(name, invalid_char_list, replace_with='_'): diff --git a/xmodule/video_module/video_module.py b/xmodule/video_module/video_module.py index 833c4af8fd44..82549ff40e70 100644 --- a/xmodule/video_module/video_module.py +++ b/xmodule/video_module/video_module.py @@ -955,7 +955,7 @@ def parse_video_xml(cls, xml, id_generator=None): course_id = getattr(id_generator, 'target_course_id', None) # Update the handout location with current course_id - if 'handout' in list(field_data.keys()) and course_id: + if 'handout' in field_data and course_id: handout_location = StaticContent.get_location_from_path(field_data['handout']) if isinstance(handout_location, AssetLocator): handout_new_location = StaticContent.compute_location(course_id, handout_location.path) diff --git a/xmodule/x_module.py b/xmodule/x_module.py index 307d7c815557..2321969a29fe 100644 --- a/xmodule/x_module.py +++ b/xmodule/x_module.py @@ -2,7 +2,6 @@ import logging import os -import sys import time import warnings from collections import namedtuple @@ -35,8 +34,6 @@ from xblock.runtime import IdGenerator, IdReader, Runtime from xmodule import block_metadata_utils -from xmodule.errortracker import exc_info_to_str -from xmodule.exceptions import UndefinedContext from xmodule.fields import RelativeTime from xmodule.modulestore.exceptions import ItemNotFoundError from xmodule.util.xmodule_django import add_webpack_to_fragment @@ -1015,10 +1012,9 @@ class MetricsMixin: def render(self, block, view_name, context=None): # lint-amnesty, pylint: disable=missing-function-docstring start_time = time.time() + status = "success" try: - status = "success" return super().render(block, view_name, context=context) - except: status = "failure" raise @@ -1045,10 +1041,9 @@ def render(self, block, view_name, context=None): # lint-amnesty, pylint: disab def handle(self, block, handler_name, request, suffix=''): # lint-amnesty, pylint: disable=missing-function-docstring start_time = time.time() + status = "success" try: - status = "success" return super().handle(block, handler_name, request, suffix=suffix) - except: status = "failure" raise From 214852224b41318ce45aea8aaf871c98cd2f2816 Mon Sep 17 00:00:00 2001 From: Jawayria Date: Thu, 2 Jun 2022 16:12:52 +0500 Subject: [PATCH 19/25] fix: try relative path --- cms/static/js/spec/views/container_spec.js | 2 +- cms/static/js/spec/views/module_edit_spec.js | 2 +- cms/static/js/spec_helpers/edit_helpers.js | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/cms/static/js/spec/views/container_spec.js b/cms/static/js/spec/views/container_spec.js index 194d405d0cfd..e74862e1201c 100644 --- a/cms/static/js/spec/views/container_spec.js +++ b/cms/static/js/spec/views/container_spec.js @@ -4,7 +4,7 @@ import EditHelpers from 'js/spec_helpers/edit_helpers'; import ContainerView from 'js/views/container'; import XBlockInfo from 'js/models/xblock_info'; import 'jquery.simulate'; -import 'xmodule/js/src/xmodule'; +import '../../xmodule/js/src/xmodule'; import 'cms/js/main'; import 'xblock/cms.runtime.v1'; diff --git a/cms/static/js/spec/views/module_edit_spec.js b/cms/static/js/spec/views/module_edit_spec.js index 11a1b3c48739..dbbcac7bf0e1 100644 --- a/cms/static/js/spec/views/module_edit_spec.js +++ b/cms/static/js/spec/views/module_edit_spec.js @@ -4,7 +4,7 @@ import ViewUtils from 'common/js/components/utils/view_utils'; import edit_helpers from 'js/spec_helpers/edit_helpers'; import ModuleEdit from 'js/views/module_edit'; import ModuleModel from 'js/models/module_info'; -import 'xmodule/js/src/xmodule'; +import '../../xmodule/js/src/xmodule'; describe('ModuleEdit', function() { beforeEach(function() { diff --git a/cms/static/js/spec_helpers/edit_helpers.js b/cms/static/js/spec_helpers/edit_helpers.js index a9cc33445af4..487675799aba 100644 --- a/cms/static/js/spec_helpers/edit_helpers.js +++ b/cms/static/js/spec_helpers/edit_helpers.js @@ -8,7 +8,7 @@ import TemplateHelpers from 'common/js/spec_helpers/template_helpers'; import modal_helpers from 'js/spec_helpers/modal_helpers'; import EditXBlockModal from 'js/views/modals/edit_xblock'; import ComponentTemplates from 'js/collections/component_template'; -import XModule from 'xmodule/js/src/xmodule'; +import XModule from '../../xmodule/js/src/xmodule'; import 'cms/js/main'; import 'xblock/cms.runtime.v1'; From 965343563cc653137bb930ed7651951da3af18bd Mon Sep 17 00:00:00 2001 From: Jawayria Date: Thu, 2 Jun 2022 18:15:53 +0500 Subject: [PATCH 20/25] fix: try symlink name --- cms/static/js/spec/views/container_spec.js | 2 +- cms/static/js/spec/views/module_edit_spec.js | 2 +- cms/static/js/spec_helpers/edit_helpers.js | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/cms/static/js/spec/views/container_spec.js b/cms/static/js/spec/views/container_spec.js index e74862e1201c..ecc75edd14d8 100644 --- a/cms/static/js/spec/views/container_spec.js +++ b/cms/static/js/spec/views/container_spec.js @@ -4,7 +4,7 @@ import EditHelpers from 'js/spec_helpers/edit_helpers'; import ContainerView from 'js/views/container'; import XBlockInfo from 'js/models/xblock_info'; import 'jquery.simulate'; -import '../../xmodule/js/src/xmodule'; +import 'xmodule_js/src/xmodule'; import 'cms/js/main'; import 'xblock/cms.runtime.v1'; diff --git a/cms/static/js/spec/views/module_edit_spec.js b/cms/static/js/spec/views/module_edit_spec.js index dbbcac7bf0e1..d3b31878b668 100644 --- a/cms/static/js/spec/views/module_edit_spec.js +++ b/cms/static/js/spec/views/module_edit_spec.js @@ -4,7 +4,7 @@ import ViewUtils from 'common/js/components/utils/view_utils'; import edit_helpers from 'js/spec_helpers/edit_helpers'; import ModuleEdit from 'js/views/module_edit'; import ModuleModel from 'js/models/module_info'; -import '../../xmodule/js/src/xmodule'; +import 'xmodule_js/src/xmodule'; describe('ModuleEdit', function() { beforeEach(function() { diff --git a/cms/static/js/spec_helpers/edit_helpers.js b/cms/static/js/spec_helpers/edit_helpers.js index 487675799aba..477f5efc3f17 100644 --- a/cms/static/js/spec_helpers/edit_helpers.js +++ b/cms/static/js/spec_helpers/edit_helpers.js @@ -8,7 +8,7 @@ import TemplateHelpers from 'common/js/spec_helpers/template_helpers'; import modal_helpers from 'js/spec_helpers/modal_helpers'; import EditXBlockModal from 'js/views/modals/edit_xblock'; import ComponentTemplates from 'js/collections/component_template'; -import XModule from '../../xmodule/js/src/xmodule'; +import XModule from 'xmodule_js/src/xmodule'; import 'cms/js/main'; import 'xblock/cms.runtime.v1'; From 123e137987982766f589ed85a9a7eb9ed5fea100 Mon Sep 17 00:00:00 2001 From: Jawayria Date: Thu, 2 Jun 2022 18:58:39 +0500 Subject: [PATCH 21/25] fix: update path for karma config --- pavelib/utils/envs.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pavelib/utils/envs.py b/pavelib/utils/envs.py index 0d68dadb7dbe..6881b0ea1340 100644 --- a/pavelib/utils/envs.py +++ b/pavelib/utils/envs.py @@ -189,8 +189,8 @@ class Env: REPO_ROOT / 'cms/static/karma_cms_squire.conf.js', REPO_ROOT / 'cms/static/karma_cms_webpack.conf.js', REPO_ROOT / 'lms/static/karma_lms.conf.js', - REPO_ROOT / 'xmodule/xmodule/js/karma_xmodule.conf.js', - REPO_ROOT / 'xmodule/xmodule/js/karma_xmodule_webpack.conf.js', + REPO_ROOT / 'xmodule/js/karma_xmodule.conf.js', + REPO_ROOT / 'xmodule/js/karma_xmodule_webpack.conf.js', REPO_ROOT / 'common/static/karma_common.conf.js', REPO_ROOT / 'common/static/karma_common_requirejs.conf.js', ] From e5ae3287e1018733b4e168d8084b0242ad7b0e8f Mon Sep 17 00:00:00 2001 From: Jawayria Date: Thu, 2 Jun 2022 20:19:14 +0500 Subject: [PATCH 22/25] fix: updated some paths --- xmodule/js/spec/time_spec.js | 2 +- xmodule/js/spec/video/async_process_spec.js | 2 +- xmodule/js/spec/video/video_save_state_plugin_spec.js | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/xmodule/js/spec/time_spec.js b/xmodule/js/spec/time_spec.js index e791aac62281..f98fa890b006 100644 --- a/xmodule/js/spec/time_spec.js +++ b/xmodule/js/spec/time_spec.js @@ -1,7 +1,7 @@ 'use strict'; -import * as Time from 'time.js'; +import * as Time from '../../src/time.js'; describe('Time', function() { describe('format', function() { diff --git a/xmodule/js/spec/video/async_process_spec.js b/xmodule/js/spec/video/async_process_spec.js index f2d4b4e34987..8c2c53cee4aa 100644 --- a/xmodule/js/spec/video/async_process_spec.js +++ b/xmodule/js/spec/video/async_process_spec.js @@ -1,6 +1,6 @@ (function(require) { require( -['video/00_async_process.js'], +['../../../src/video/00_async_process.js'], function(AsyncProcess) { var getArrayNthLength = function(n, multiplier) { var result = [], diff --git a/xmodule/js/spec/video/video_save_state_plugin_spec.js b/xmodule/js/spec/video/video_save_state_plugin_spec.js index 4679d4c0c6b0..c90393ca5aa4 100644 --- a/xmodule/js/spec/video/video_save_state_plugin_spec.js +++ b/xmodule/js/spec/video/video_save_state_plugin_spec.js @@ -1,4 +1,4 @@ -import * as Time from 'time.js'; +import * as Time from '../../src/time.js'; (function(undefined) { 'use strict'; From bec6e6378c5095a45ff7c6c7bbe2dc661c26f49e Mon Sep 17 00:00:00 2001 From: Jawayria Date: Thu, 2 Jun 2022 20:31:48 +0500 Subject: [PATCH 23/25] fix: updated paths --- xmodule/js/spec/time_spec.js | 2 +- xmodule/js/spec/video/async_process_spec.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/xmodule/js/spec/time_spec.js b/xmodule/js/spec/time_spec.js index f98fa890b006..c35a0a608d88 100644 --- a/xmodule/js/spec/time_spec.js +++ b/xmodule/js/spec/time_spec.js @@ -1,7 +1,7 @@ 'use strict'; -import * as Time from '../../src/time.js'; +import * as Time from '../src/time.js'; describe('Time', function() { describe('format', function() { diff --git a/xmodule/js/spec/video/async_process_spec.js b/xmodule/js/spec/video/async_process_spec.js index 8c2c53cee4aa..06b32d8e5fcc 100644 --- a/xmodule/js/spec/video/async_process_spec.js +++ b/xmodule/js/spec/video/async_process_spec.js @@ -1,6 +1,6 @@ (function(require) { require( -['../../../src/video/00_async_process.js'], +['../../src/video/00_async_process.js'], function(AsyncProcess) { var getArrayNthLength = function(n, multiplier) { var result = [], From 0251fca0427775a376247c9acaaf711d42ac521c Mon Sep 17 00:00:00 2001 From: Jawayria Date: Thu, 2 Jun 2022 20:35:49 +0500 Subject: [PATCH 24/25] fix: updated paths --- xmodule/assets/vertical/public/js/vertical_student_view.js | 2 +- xmodule/js/spec/video/initialize_spec.js | 2 +- xmodule/js/spec/video/iterator_spec.js | 2 +- xmodule/js/spec/video/resizer_spec.js | 2 +- xmodule/js/spec/video/sjson_spec.js | 2 +- xmodule/js/spec/video/video_player_spec.js | 2 +- xmodule/js/spec/video/video_storage_spec.js | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/xmodule/assets/vertical/public/js/vertical_student_view.js b/xmodule/assets/vertical/public/js/vertical_student_view.js index fa642df91546..8e18826b4245 100644 --- a/xmodule/assets/vertical/public/js/vertical_student_view.js +++ b/xmodule/assets/vertical/public/js/vertical_student_view.js @@ -9,7 +9,7 @@ // to the server. import BookmarkButton from 'course_bookmarks/js/views/bookmark_button'; -import {markBlocksCompletedOnViewIfNeeded} from '../../../../../../../../lms/static/completion/js/CompletionOnViewService.js'; +import {markBlocksCompletedOnViewIfNeeded} from '../../../../../lms/static/completion/js/CompletionOnViewService.js'; var SEEN_COMPLETABLES = new Set(); diff --git a/xmodule/js/spec/video/initialize_spec.js b/xmodule/js/spec/video/initialize_spec.js index c60256eb56fd..97db83dc2505 100644 --- a/xmodule/js/spec/video/initialize_spec.js +++ b/xmodule/js/spec/video/initialize_spec.js @@ -2,7 +2,7 @@ 'use strict'; require( -['video/01_initialize.js'], +['../../src/video/01_initialize.js'], function(Initialize) { describe('Initialize', function() { var state = {}; diff --git a/xmodule/js/spec/video/iterator_spec.js b/xmodule/js/spec/video/iterator_spec.js index 85dcd573250d..cc59e16ecae2 100644 --- a/xmodule/js/spec/video/iterator_spec.js +++ b/xmodule/js/spec/video/iterator_spec.js @@ -2,7 +2,7 @@ 'use strict'; require( -['video/00_iterator.js'], +['../../src/video/00_iterator.js'], function(Iterator) { describe('Iterator', function() { var list = ['a', 'b', 'c', 'd', 'e'], diff --git a/xmodule/js/spec/video/resizer_spec.js b/xmodule/js/spec/video/resizer_spec.js index 5b3cdf0b42d0..8e1ca4a576ba 100644 --- a/xmodule/js/spec/video/resizer_spec.js +++ b/xmodule/js/spec/video/resizer_spec.js @@ -1,7 +1,7 @@ (function(require) { 'use strict'; require( -['video/00_resizer.js', 'underscore'], +['../../src/video/00_resizer.js', 'underscore'], function(Resizer, _) { describe('Resizer', function() { var html = [ diff --git a/xmodule/js/spec/video/sjson_spec.js b/xmodule/js/spec/video/sjson_spec.js index f7992a76ca38..2ccbcde5b0d0 100644 --- a/xmodule/js/spec/video/sjson_spec.js +++ b/xmodule/js/spec/video/sjson_spec.js @@ -1,6 +1,6 @@ (function(require) { require( -['video/00_sjson.js'], +['../../src/video/00_sjson.js'], function(Sjson) { describe('Sjson', function() { var data = jasmine.stubbedCaption, diff --git a/xmodule/js/spec/video/video_player_spec.js b/xmodule/js/spec/video/video_player_spec.js index 498e82de046d..1696f103a67c 100644 --- a/xmodule/js/spec/video/video_player_spec.js +++ b/xmodule/js/spec/video/video_player_spec.js @@ -4,7 +4,7 @@ 'use strict'; require( -['video/03_video_player.js', 'hls', 'underscore'], +['../../src/video/03_video_player.js', 'hls', 'underscore'], function(VideoPlayer, HLS, _) { describe('VideoPlayer', function() { var STATUS = window.STATUS, diff --git a/xmodule/js/spec/video/video_storage_spec.js b/xmodule/js/spec/video/video_storage_spec.js index ee2d8965f32f..078fb3bcfe69 100644 --- a/xmodule/js/spec/video/video_storage_spec.js +++ b/xmodule/js/spec/video/video_storage_spec.js @@ -1,6 +1,6 @@ (function(require, define, undefined) { require( -['video/00_video_storage.js'], +['../../src/video/00_video_storage.js'], function(VideoStorage) { describe('VideoStorage', function() { var namespace = 'test_storage', From 9639777b798326f559092e9a222eeaf9cebc83fe Mon Sep 17 00:00:00 2001 From: Kyle McCormick Date: Sun, 5 Jun 2022 01:21:40 -0400 Subject: [PATCH 25/25] fix: kyle's fixes to xmodule paths and import configuration --- cms/static/cms/js/require-config.js | 2 +- scripts/unit-tests.sh | 2 +- setup.py | 6 +++++- webpack.common.config.js | 14 +++++++------- xmodule/js/spec/time_spec.js | 2 +- xmodule/js/spec/video/async_process_spec.js | 2 +- xmodule/js/spec/video/initialize_spec.js | 2 +- xmodule/js/spec/video/iterator_spec.js | 2 +- xmodule/js/spec/video/resizer_spec.js | 2 +- xmodule/js/spec/video/sjson_spec.js | 2 +- xmodule/js/spec/video/video_player_spec.js | 2 +- .../js/spec/video/video_save_state_plugin_spec.js | 2 +- xmodule/js/spec/video/video_storage_spec.js | 2 +- .../perf_tests/test_asset_import_export.py | 2 +- xmodule/tests/__init__.py | 6 +++--- 15 files changed, 27 insertions(+), 23 deletions(-) diff --git a/cms/static/cms/js/require-config.js b/cms/static/cms/js/require-config.js index 2b71ba3a4ce8..e6fbc304dbe1 100644 --- a/cms/static/cms/js/require-config.js +++ b/cms/static/cms/js/require-config.js @@ -123,7 +123,7 @@ 'backbone.paginator': 'common/js/vendor/backbone.paginator', 'tinymce': 'js/vendor/tinymce/js/tinymce/tinymce.full.min', 'jquery.tinymce': 'js/vendor/tinymce/js/tinymce/jquery.tinymce.min', - 'xmodule': '/xmodule/xmodule', + 'xmodule': '/xmodule', 'xblock/cms.runtime.v1': 'cms/js/xblock/cms.runtime.v1', 'xblock': 'common/js/xblock', 'utility': 'js/src/utility', diff --git a/scripts/unit-tests.sh b/scripts/unit-tests.sh index c060d39a0a82..d97ad929bd80 100755 --- a/scripts/unit-tests.sh +++ b/scripts/unit-tests.sh @@ -116,7 +116,7 @@ case "${TEST_SUITE}" in mv reports/${TEST_SUITE}.coverage reports/.coverage.commonlib ;; [1-2]) - paver test_lib -l common/lib/xmodule --disable_capture --eval-attr="shard==$SHARD" ${PAVER_ARGS} 2> common-tests.${SHARD}.log + paver test_lib -l ./xmodule --disable_capture --eval-attr="shard==$SHARD" ${PAVER_ARGS} 2> common-tests.${SHARD}.log mv reports/${TEST_SUITE}.coverage reports/.coverage.commonlib.${SHARD} ;; 3|"noshard") diff --git a/setup.py b/setup.py index b64497bb5417..ff90786bf8f8 100644 --- a/setup.py +++ b/setup.py @@ -2,7 +2,7 @@ Setup script for the Open edX package. """ -from setuptools import find_packages, setup +from setuptools import setup XBLOCKS = [ "about = xmodule.html_module:AboutBlock", @@ -55,7 +55,11 @@ "cms", "lms", "openedx", + "xmodule", ], + package_data={ + 'xmodule': ['js/module/*'], + }, entry_points={ "openedx.course_tab": [ "ccx = lms.djangoapps.ccx.plugins:CcxCourseTab", diff --git a/webpack.common.config.js b/webpack.common.config.js index 427528cff1be..9db02b7e5c54 100644 --- a/webpack.common.config.js +++ b/webpack.common.config.js @@ -15,7 +15,7 @@ var filesWithRequireJSBlocks = [ path.resolve(__dirname, 'common/static/common/js/components/utils/view_utils.js'), /descriptors\/js/, /modules\/js/, - /common\/lib\/xmodule\/xmodule\/js\/src\// + /xmodule\/js\/src\// ]; var defineHeader = /\(function ?\(((define|require|requirejs|\$)(, )?)+\) ?\{/; @@ -72,7 +72,7 @@ module.exports = Merge.smart({ // Studio Import: './cms/static/js/features/import/factories/import.js', CourseOrLibraryListing: './cms/static/js/features_jsx/studio/CourseOrLibraryListing.jsx', - LibrarySourcedBlockPicker: './common/lib/xmodule/xmodule/assets/library_source_block/LibrarySourcedBlockPicker.jsx', // eslint-disable-line max-len + LibrarySourcedBlockPicker: './xmodule/assets/library_source_block/LibrarySourcedBlockPicker.jsx', // eslint-disable-line max-len 'js/factories/textbooks': './cms/static/js/factories/textbooks.js', 'js/factories/container': './cms/static/js/factories/container.js', 'js/factories/context_course': './cms/static/js/factories/context_course.js', @@ -115,8 +115,8 @@ module.exports = Merge.smart({ // Common ReactRenderer: './common/static/js/src/ReactRenderer.jsx', - XModuleShim: 'xmodule/js/src/xmodule.js', - VerticalStudentView: './common/lib/xmodule/xmodule/assets/vertical/public/js/vertical_student_view.js', + XModuleShim: './xmodule/js/src/xmodule.js', + VerticalStudentView: './xmodule/assets/vertical/public/js/vertical_student_view.js', commons: 'babel-polyfill' }, @@ -391,9 +391,9 @@ module.exports = Merge.smart({ 'cms/static/cms/js', 'cms/templates/js', 'lms/static', - 'common/lib/xmodule', - 'common/lib/xmodule/xmodule/js/src', - 'common/lib/xmodule/xmodule/assets/word_cloud/src/js', + path.resolve(__dirname), + 'xmodule/js/src', + 'xmodule/assets/word_cloud/src/js', 'common/static', 'common/static/coffee/src', 'common/static/common/js', diff --git a/xmodule/js/spec/time_spec.js b/xmodule/js/spec/time_spec.js index c35a0a608d88..e791aac62281 100644 --- a/xmodule/js/spec/time_spec.js +++ b/xmodule/js/spec/time_spec.js @@ -1,7 +1,7 @@ 'use strict'; -import * as Time from '../src/time.js'; +import * as Time from 'time.js'; describe('Time', function() { describe('format', function() { diff --git a/xmodule/js/spec/video/async_process_spec.js b/xmodule/js/spec/video/async_process_spec.js index 06b32d8e5fcc..f2d4b4e34987 100644 --- a/xmodule/js/spec/video/async_process_spec.js +++ b/xmodule/js/spec/video/async_process_spec.js @@ -1,6 +1,6 @@ (function(require) { require( -['../../src/video/00_async_process.js'], +['video/00_async_process.js'], function(AsyncProcess) { var getArrayNthLength = function(n, multiplier) { var result = [], diff --git a/xmodule/js/spec/video/initialize_spec.js b/xmodule/js/spec/video/initialize_spec.js index 97db83dc2505..c60256eb56fd 100644 --- a/xmodule/js/spec/video/initialize_spec.js +++ b/xmodule/js/spec/video/initialize_spec.js @@ -2,7 +2,7 @@ 'use strict'; require( -['../../src/video/01_initialize.js'], +['video/01_initialize.js'], function(Initialize) { describe('Initialize', function() { var state = {}; diff --git a/xmodule/js/spec/video/iterator_spec.js b/xmodule/js/spec/video/iterator_spec.js index cc59e16ecae2..85dcd573250d 100644 --- a/xmodule/js/spec/video/iterator_spec.js +++ b/xmodule/js/spec/video/iterator_spec.js @@ -2,7 +2,7 @@ 'use strict'; require( -['../../src/video/00_iterator.js'], +['video/00_iterator.js'], function(Iterator) { describe('Iterator', function() { var list = ['a', 'b', 'c', 'd', 'e'], diff --git a/xmodule/js/spec/video/resizer_spec.js b/xmodule/js/spec/video/resizer_spec.js index 8e1ca4a576ba..5b3cdf0b42d0 100644 --- a/xmodule/js/spec/video/resizer_spec.js +++ b/xmodule/js/spec/video/resizer_spec.js @@ -1,7 +1,7 @@ (function(require) { 'use strict'; require( -['../../src/video/00_resizer.js', 'underscore'], +['video/00_resizer.js', 'underscore'], function(Resizer, _) { describe('Resizer', function() { var html = [ diff --git a/xmodule/js/spec/video/sjson_spec.js b/xmodule/js/spec/video/sjson_spec.js index 2ccbcde5b0d0..f7992a76ca38 100644 --- a/xmodule/js/spec/video/sjson_spec.js +++ b/xmodule/js/spec/video/sjson_spec.js @@ -1,6 +1,6 @@ (function(require) { require( -['../../src/video/00_sjson.js'], +['video/00_sjson.js'], function(Sjson) { describe('Sjson', function() { var data = jasmine.stubbedCaption, diff --git a/xmodule/js/spec/video/video_player_spec.js b/xmodule/js/spec/video/video_player_spec.js index 1696f103a67c..498e82de046d 100644 --- a/xmodule/js/spec/video/video_player_spec.js +++ b/xmodule/js/spec/video/video_player_spec.js @@ -4,7 +4,7 @@ 'use strict'; require( -['../../src/video/03_video_player.js', 'hls', 'underscore'], +['video/03_video_player.js', 'hls', 'underscore'], function(VideoPlayer, HLS, _) { describe('VideoPlayer', function() { var STATUS = window.STATUS, diff --git a/xmodule/js/spec/video/video_save_state_plugin_spec.js b/xmodule/js/spec/video/video_save_state_plugin_spec.js index c90393ca5aa4..4679d4c0c6b0 100644 --- a/xmodule/js/spec/video/video_save_state_plugin_spec.js +++ b/xmodule/js/spec/video/video_save_state_plugin_spec.js @@ -1,4 +1,4 @@ -import * as Time from '../../src/time.js'; +import * as Time from 'time.js'; (function(undefined) { 'use strict'; diff --git a/xmodule/js/spec/video/video_storage_spec.js b/xmodule/js/spec/video/video_storage_spec.js index 078fb3bcfe69..ee2d8965f32f 100644 --- a/xmodule/js/spec/video/video_storage_spec.js +++ b/xmodule/js/spec/video/video_storage_spec.js @@ -1,6 +1,6 @@ (function(require, define, undefined) { require( -['../../src/video/00_video_storage.js'], +['video/00_video_storage.js'], function(VideoStorage) { describe('VideoStorage', function() { var namespace = 'test_storage', diff --git a/xmodule/modulestore/perf_tests/test_asset_import_export.py b/xmodule/modulestore/perf_tests/test_asset_import_export.py index dad838bc2783..46ba1cb7aac9 100644 --- a/xmodule/modulestore/perf_tests/test_asset_import_export.py +++ b/xmodule/modulestore/perf_tests/test_asset_import_export.py @@ -46,7 +46,7 @@ ASSET_XML_PATH = COURSE_DATA_DIR / AssetMetadata.EXPORTED_ASSET_DIR / AssetMetadata.EXPORTED_ASSET_FILENAME # Path where asset XML schema definition file is located. -ASSET_XSD_PATH = PLATFORM_ROOT / "common" / "lib" / "xmodule" / "xmodule" / "assetstore" / "tests" / ASSET_XSD_FILE +ASSET_XSD_PATH = PLATFORM_ROOT / "xmodule" / "assetstore" / "tests" / ASSET_XSD_FILE @ddt.ddt diff --git a/xmodule/tests/__init__.py b/xmodule/tests/__init__.py index c164a8206806..2d990a503924 100644 --- a/xmodule/tests/__init__.py +++ b/xmodule/tests/__init__.py @@ -3,7 +3,7 @@ Run like this: - paver test_lib -l common/lib/xmodule + paver test_lib -l ./xmodule """ @@ -43,8 +43,8 @@ MODULE_DIR = path(__file__).dirname() # Location of common test DATA directory -# '../../../../edx-platform/common/test/data/' -DATA_DIR = MODULE_DIR.parent.parent.parent.parent / "test" / "data" +# '../../common/test/data/' +DATA_DIR = MODULE_DIR.parent.parent / "common" / "test" / "data" class TestModuleSystem(ModuleSystem): # pylint: disable=abstract-method