diff --git a/cms/envs/common.py b/cms/envs/common.py index 713fb5c8a8..cfd0664618 100644 --- a/cms/envs/common.py +++ b/cms/envs/common.py @@ -633,7 +633,6 @@ MAX_FAILED_LOGIN_ATTEMPTS_LOCKOUT_PERIOD_SECS = 15 * 60 ### Apps only installed in some instances OPTIONAL_APPS = ( - 'edx_jsdraw', 'mentoring', # edx-ora2 diff --git a/common/test/data/manual-testing-complete/chapter/60989ac1589241ed9dbca0f2070276fd.xml b/common/test/data/manual-testing-complete/chapter/60989ac1589241ed9dbca0f2070276fd.xml index 28fc110a11..cb5232f29d 100644 --- a/common/test/data/manual-testing-complete/chapter/60989ac1589241ed9dbca0f2070276fd.xml +++ b/common/test/data/manual-testing-complete/chapter/60989ac1589241ed9dbca0f2070276fd.xml @@ -17,11 +17,9 @@ - - diff --git a/common/test/data/manual-testing-complete/problem/39bb74b14f674ea1ab25f52bac9eb83b.xml b/common/test/data/manual-testing-complete/problem/39bb74b14f674ea1ab25f52bac9eb83b.xml deleted file mode 100644 index 7cc0dc7dee..0000000000 --- a/common/test/data/manual-testing-complete/problem/39bb74b14f674ea1ab25f52bac9eb83b.xml +++ /dev/null @@ -1,92 +0,0 @@ - -

- A JSDraw problem lets the user use the JSDraw editor component to draw a - new molecule or update an existing drawing and then submit their work. - Answers are specified as SMILES strings. -

-

- I was trying to draw my favorite molecule, caffeine. Unfortunately, - I'm not a very good biochemist. Can you correct my molecule? -

- - - - JSDraw201081410342D - - 12 13 0 0 0 0 0 V2000 - 12.0000 -6.7600 0.0000 N 0 0 0 0 0 0 0 - 10.6490 -5.9800 0.0000 C 0 0 0 0 0 0 0 - 10.6490 -4.4200 0.0000 N 0 0 0 0 0 0 0 - 12.0000 -3.6400 0.0000 C 0 0 0 0 0 0 0 - 13.3510 -4.4200 0.0000 C 0 0 0 0 0 0 0 - 13.3510 -5.9800 0.0000 C 0 0 0 0 0 0 0 - 14.8347 -6.4620 0.0000 N 0 0 0 0 0 0 0 - 15.7515 -5.1998 0.0000 C 0 0 0 0 0 0 0 - 14.8346 -3.9379 0.0000 N 0 0 0 0 0 0 0 - 15.3166 -2.4542 0.0000 C 0 0 0 0 0 0 0 - 9.2980 -3.6400 0.0000 C 0 0 0 0 0 0 0 - 9.2980 -6.7600 0.0000 O 0 0 0 0 0 0 0 - 1 2 1 0 0 0 0 - 2 3 1 0 0 0 0 - 3 4 1 0 0 0 0 - 4 5 1 0 0 0 0 - 5 6 2 0 0 0 0 - 6 1 1 0 0 0 0 - 6 7 1 0 0 0 0 - 7 8 1 0 0 0 0 - 8 9 1 0 0 0 0 - 9 5 1 0 0 0 0 - 9 10 1 0 0 0 0 - 3 11 1 0 0 0 0 - 2 12 1 0 0 0 0 - M END - - - JSDraw203201413042D - - 14 15 0 0 0 0 0 V2000 - 12.9049 -6.2400 0.0000 N 0 0 0 0 0 0 0 - 11.5539 -5.4600 0.0000 C 0 0 0 0 0 0 0 - 11.5539 -3.9000 0.0000 N 0 0 0 0 0 0 0 - 12.9049 -3.1200 0.0000 C 0 0 0 0 0 0 0 - 14.2558 -3.9000 0.0000 C 0 0 0 0 0 0 0 - 14.2558 -5.4600 0.0000 C 0 0 0 0 0 0 0 - 15.7395 -5.9420 0.0000 N 0 0 0 0 0 0 0 - 16.6563 -4.6798 0.0000 C 0 0 0 0 0 0 0 - 15.7394 -3.4179 0.0000 N 0 0 0 0 0 0 0 - 16.2214 -1.9342 0.0000 C 0 0 0 0 0 0 0 - 10.2029 -3.1200 0.0000 C 0 0 0 0 0 0 0 - 10.2029 -6.2400 0.0000 O 0 0 0 0 0 0 0 - 12.9049 -7.8000 0.0000 C 0 0 0 0 0 0 0 - 12.9050 -1.5600 0.0000 O 0 0 0 0 0 0 0 - 1 2 1 0 0 0 0 - 2 3 1 0 0 0 0 - 3 4 1 0 0 0 0 - 4 5 1 0 0 0 0 - 5 6 2 0 0 0 0 - 6 1 1 0 0 0 0 - 6 7 1 0 0 0 0 - 7 8 2 0 0 0 0 - 8 9 1 0 0 0 0 - 9 5 1 0 0 0 0 - 9 10 1 0 0 0 0 - 3 11 1 0 0 0 0 - 2 12 2 0 0 0 0 - 1 13 1 0 0 0 0 - 4 14 2 0 0 0 0 - M END - - - C8H10N4O2 - - -
-

Explanation

-

- Some scholars have hypothesized that the renaissance was made possible - by the introduction of coffee to Italy. Likewise scholars have linked - the Enlightenment with the rise of coffee houses in England. -

-
- - diff --git a/common/test/data/manual-testing-complete/problem/7eff0366d53045c1b423ee988d344a13.xml b/common/test/data/manual-testing-complete/problem/7eff0366d53045c1b423ee988d344a13.xml deleted file mode 100644 index c79eeacdc4..0000000000 --- a/common/test/data/manual-testing-complete/problem/7eff0366d53045c1b423ee988d344a13.xml +++ /dev/null @@ -1,92 +0,0 @@ - -

- A JSDraw problem lets the user use the JSDraw editor component to draw a - new molecule or update an existing drawing and then submit their work. - Answers are specified as SMILES strings. -

-

- I was trying to draw my favorite molecule, caffeine. Unfortunately, - I'm not a very good biochemist. Can you correct my molecule? -

- - - - JSDraw201081410342D - - 12 13 0 0 0 0 0 V2000 - 12.0000 -6.7600 0.0000 N 0 0 0 0 0 0 0 - 10.6490 -5.9800 0.0000 C 0 0 0 0 0 0 0 - 10.6490 -4.4200 0.0000 N 0 0 0 0 0 0 0 - 12.0000 -3.6400 0.0000 C 0 0 0 0 0 0 0 - 13.3510 -4.4200 0.0000 C 0 0 0 0 0 0 0 - 13.3510 -5.9800 0.0000 C 0 0 0 0 0 0 0 - 14.8347 -6.4620 0.0000 N 0 0 0 0 0 0 0 - 15.7515 -5.1998 0.0000 C 0 0 0 0 0 0 0 - 14.8346 -3.9379 0.0000 N 0 0 0 0 0 0 0 - 15.3166 -2.4542 0.0000 C 0 0 0 0 0 0 0 - 9.2980 -3.6400 0.0000 C 0 0 0 0 0 0 0 - 9.2980 -6.7600 0.0000 O 0 0 0 0 0 0 0 - 1 2 1 0 0 0 0 - 2 3 1 0 0 0 0 - 3 4 1 0 0 0 0 - 4 5 1 0 0 0 0 - 5 6 2 0 0 0 0 - 6 1 1 0 0 0 0 - 6 7 1 0 0 0 0 - 7 8 1 0 0 0 0 - 8 9 1 0 0 0 0 - 9 5 1 0 0 0 0 - 9 10 1 0 0 0 0 - 3 11 1 0 0 0 0 - 2 12 1 0 0 0 0 - M END - - - JSDraw203201413042D - - 14 15 0 0 0 0 0 V2000 - 12.9049 -6.2400 0.0000 N 0 0 0 0 0 0 0 - 11.5539 -5.4600 0.0000 C 0 0 0 0 0 0 0 - 11.5539 -3.9000 0.0000 N 0 0 0 0 0 0 0 - 12.9049 -3.1200 0.0000 C 0 0 0 0 0 0 0 - 14.2558 -3.9000 0.0000 C 0 0 0 0 0 0 0 - 14.2558 -5.4600 0.0000 C 0 0 0 0 0 0 0 - 15.7395 -5.9420 0.0000 N 0 0 0 0 0 0 0 - 16.6563 -4.6798 0.0000 C 0 0 0 0 0 0 0 - 15.7394 -3.4179 0.0000 N 0 0 0 0 0 0 0 - 16.2214 -1.9342 0.0000 C 0 0 0 0 0 0 0 - 10.2029 -3.1200 0.0000 C 0 0 0 0 0 0 0 - 10.2029 -6.2400 0.0000 O 0 0 0 0 0 0 0 - 12.9049 -7.8000 0.0000 C 0 0 0 0 0 0 0 - 12.9050 -1.5600 0.0000 O 0 0 0 0 0 0 0 - 1 2 1 0 0 0 0 - 2 3 1 0 0 0 0 - 3 4 1 0 0 0 0 - 4 5 1 0 0 0 0 - 5 6 2 0 0 0 0 - 6 1 1 0 0 0 0 - 6 7 1 0 0 0 0 - 7 8 2 0 0 0 0 - 8 9 1 0 0 0 0 - 9 5 1 0 0 0 0 - 9 10 1 0 0 0 0 - 3 11 1 0 0 0 0 - 2 12 2 0 0 0 0 - 1 13 1 0 0 0 0 - 4 14 2 0 0 0 0 - M END - - - C8H10N4O2 - - -
-

Explanation

-

- Some scholars have hypothesized that the renaissance was made possible - by the introduction of coffee to Italy. Likewise scholars have linked - the Enlightenment with the rise of coffee houses in England. -

-
- - diff --git a/common/test/data/manual-testing-complete/sequential/0aa765632f4d4b84ad8d96f41cec5825.xml b/common/test/data/manual-testing-complete/sequential/0aa765632f4d4b84ad8d96f41cec5825.xml deleted file mode 100644 index 8bbc9fa929..0000000000 --- a/common/test/data/manual-testing-complete/sequential/0aa765632f4d4b84ad8d96f41cec5825.xml +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/common/test/data/manual-testing-complete/sequential/7942fe1a06aa439092aabe3615d91b15.xml b/common/test/data/manual-testing-complete/sequential/7942fe1a06aa439092aabe3615d91b15.xml deleted file mode 100644 index 05910b7dfb..0000000000 --- a/common/test/data/manual-testing-complete/sequential/7942fe1a06aa439092aabe3615d91b15.xml +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/common/test/data/manual-testing-complete/vertical/3a7305c59c254ce9814093f98b913e8a.xml b/common/test/data/manual-testing-complete/vertical/3a7305c59c254ce9814093f98b913e8a.xml deleted file mode 100644 index d260d6cbdc..0000000000 --- a/common/test/data/manual-testing-complete/vertical/3a7305c59c254ce9814093f98b913e8a.xml +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/common/test/data/manual-testing-complete/vertical/bcb995ca53934a7b8aee27f81d96d189.xml b/common/test/data/manual-testing-complete/vertical/bcb995ca53934a7b8aee27f81d96d189.xml deleted file mode 100644 index 97463568b8..0000000000 --- a/common/test/data/manual-testing-complete/vertical/bcb995ca53934a7b8aee27f81d96d189.xml +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/lms/envs/common.py b/lms/envs/common.py index d4f79c3521..33dce4c86b 100644 --- a/lms/envs/common.py +++ b/lms/envs/common.py @@ -1760,7 +1760,6 @@ ALL_LANGUAGES = ( ### Apps only installed in some instances OPTIONAL_APPS = ( - 'edx_jsdraw', 'mentoring', # edx-ora2 diff --git a/requirements/edx/edx-private.txt b/requirements/edx/edx-private.txt index f7a4a39c12..febba8c4f0 100644 --- a/requirements/edx/edx-private.txt +++ b/requirements/edx/edx-private.txt @@ -1,6 +1,5 @@ # Requirements for edx.org that aren't necessarily needed for Open edX. --e git+ssh://git@github.com/jazkarta/edX-jsdraw.git@9fcd333aaa2ac3df65dd247b601ce0b56bb10cad#egg=edx-jsdraw -e git+https://github.com/gsehub/xblock-mentoring.git@4d1cce78dc232d5da6ffd73817b5c490e87a6eee#egg=xblock-mentoring # Prototype XBlocks from edX learning sciences limited roll-outs and user testing.