Revert "Revert "refactor: move xmodule folder to root""

.coveragerc

@@ -5,11 +5,11 @@ source =
     cms
     common/djangoapps
     common/lib/capa
-    common/lib/xmodule
     lms
     openedx
     pavelib
     scripts
+    xmodule
 
 omit =
     cms/envs/*

.coveragerc-local

@@ -10,6 +10,7 @@ source =
     openedx
     pavelib
     scripts
+    xmodule
 
 omit =
     cms/envs/*

.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,19 +50,19 @@ 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
 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

.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

.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

.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 }}

.github/workflows/unit-test-shards.json

@@ -270,5 +270,11 @@
     "paths": [
       "common/djangoapps/"
     ]
+  },
+  "xmodule-1": {
+    "settings": "lms.envs.test",
+    "paths": [
+      "xmodule/"
+    ]
   }
 }

.github/workflows/unit-tests.yml

@@ -32,6 +32,7 @@ jobs:
             "common-1",
             "common-2",
             "common-3",
+            "xmodule-1"
         ]
 
 

.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

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',

cms/static/xmodule_js

@@ -1 +1 @@
-../../common/lib/xmodule/xmodule/js/
+../../xmodule/js

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;

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
@@ -222,9 +222,9 @@
 modules = {
     'cms': 'cms',
     'common/lib/capa/capa': 'common/lib/capa',
-    'common/lib/xmodule/xmodule': 'common/lib/xmodule',
     'lms': 'lms',
     'openedx': 'openedx',
+    'xmodule': 'xmodule',
 }
 
 

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

docs/guides/docstrings/docstrings.rst

@@ -8,3 +8,4 @@ Python Docstrings
     common_index
     lms_index
     openedx/modules
+    xmodule/modules

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::
@@ -133,15 +133,15 @@ Various tools like ddt create tests with very complex names, rather than figurin
 
 1. Select tests to run based on their name, provide an expression to the `pytest -k option`_ which performs a substring match on test names::
 
-    pytest common/lib/xmodule/xmodule/tests/test_stringify.py -k test_stringify
+    pytest xmodule/tests/test_stringify.py -k test_stringify
 
 .. _pytest -k option: https://docs.pytest.org/en/latest/example/markers.html#using-k-expr-to-select-tests-based-on-their-name
 .. _node ID: https://docs.pytest.org/en/latest/example/markers.html#node-id
 
 
 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::