From 3b15207bc625a75bb82a42482569daf79daaca8b Mon Sep 17 00:00:00 2001 From: cahrens Date: Tue, 21 May 2013 09:58:34 -0400 Subject: [PATCH 1/5] Use draft module store so we can test editing components (problems, html, etc.). --- cms/envs/acceptance.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cms/envs/acceptance.py b/cms/envs/acceptance.py index f4b867d3c6..0fe3d950cd 100644 --- a/cms/envs/acceptance.py +++ b/cms/envs/acceptance.py @@ -23,7 +23,7 @@ MODULESTORE_OPTIONS = { MODULESTORE = { 'default': { - 'ENGINE': 'xmodule.modulestore.mongo.MongoModuleStore', + 'ENGINE': 'xmodule.modulestore.mongo.DraftMongoModuleStore', 'OPTIONS': MODULESTORE_OPTIONS }, 'direct': { From 5bcae4e79f24b446b2840a141dcefb3b9e05cb3a Mon Sep 17 00:00:00 2001 From: Greg Price Date: Tue, 21 May 2013 14:47:35 -0400 Subject: [PATCH 2/5] Add Review Board config to repo --- .reviewboardrc | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 .reviewboardrc diff --git a/.reviewboardrc b/.reviewboardrc new file mode 100644 index 0000000000..b79235a4a4 --- /dev/null +++ b/.reviewboardrc @@ -0,0 +1,2 @@ +REVIEWBOARD_URL = "https://rbcommons.com/s/edx/" +GUESS_FIELDS = True From cf502e2349d96ef278ec316781be1342c64a3afe Mon Sep 17 00:00:00 2001 From: Arthur Barrett Date: Tue, 21 May 2013 17:49:20 -0400 Subject: [PATCH 3/5] Fix advanced modules list. --- cms/djangoapps/contentstore/views/component.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cms/djangoapps/contentstore/views/component.py b/cms/djangoapps/contentstore/views/component.py index 34a659ab29..89b5e8bdc7 100644 --- a/cms/djangoapps/contentstore/views/component.py +++ b/cms/djangoapps/contentstore/views/component.py @@ -42,7 +42,7 @@ COMPONENT_TYPES = ['customtag', 'discussion', 'html', 'problem', 'video'] OPEN_ENDED_COMPONENT_TYPES = ["combinedopenended", "peergrading"] NOTE_COMPONENT_TYPES = ['notes'] -ADVANCED_COMPONENT_TYPES = ['annotatable' + 'word_cloud'] + OPEN_ENDED_COMPONENT_TYPES + NOTE_COMPONENT_TYPES +ADVANCED_COMPONENT_TYPES = ['annotatable', 'word_cloud'] + OPEN_ENDED_COMPONENT_TYPES + NOTE_COMPONENT_TYPES ADVANCED_COMPONENT_CATEGORY = 'advanced' ADVANCED_COMPONENT_POLICY_KEY = 'advanced_modules' From ce005072b092ae8a8206666fddbc63c14cbe39c1 Mon Sep 17 00:00:00 2001 From: Ned Batchelder Date: Tue, 21 May 2013 17:25:37 -0400 Subject: [PATCH 4/5] Sandbox-installed packages will be really installed instead of -e installed. --- common/lib/calc/setup.py | 2 +- common/lib/chem/setup.py | 2 +- common/lib/sandbox-packages/setup.py | 2 +- requirements/edx-sandbox/post.txt | 10 +++++++--- 4 files changed, 10 insertions(+), 6 deletions(-) diff --git a/common/lib/calc/setup.py b/common/lib/calc/setup.py index f7bb1708af..cb638914f9 100644 --- a/common/lib/calc/setup.py +++ b/common/lib/calc/setup.py @@ -2,7 +2,7 @@ from setuptools import setup setup( name="calc", - version="0.1", + version="0.1.1", py_modules=["calc"], install_requires=[ "pyparsing==1.5.6", diff --git a/common/lib/chem/setup.py b/common/lib/chem/setup.py index 4f2b24ddee..642c9a4fe5 100644 --- a/common/lib/chem/setup.py +++ b/common/lib/chem/setup.py @@ -2,7 +2,7 @@ from setuptools import setup setup( name="chem", - version="0.1", + version="0.1.1", packages=["chem"], install_requires=[ "pyparsing==1.5.6", diff --git a/common/lib/sandbox-packages/setup.py b/common/lib/sandbox-packages/setup.py index 1b99118aca..96c1190e38 100644 --- a/common/lib/sandbox-packages/setup.py +++ b/common/lib/sandbox-packages/setup.py @@ -2,7 +2,7 @@ from setuptools import setup setup( name="sandbox-packages", - version="0.1", + version="0.1.1", packages=[ "verifiers", ], diff --git a/requirements/edx-sandbox/post.txt b/requirements/edx-sandbox/post.txt index f99e8a8c4b..d122795d18 100644 --- a/requirements/edx-sandbox/post.txt +++ b/requirements/edx-sandbox/post.txt @@ -1,6 +1,10 @@ # Packages to install in the Python sandbox for secured execution. scipy==0.11.0 lxml==3.0.1 --e common/lib/calc --e common/lib/chem --e common/lib/sandbox-packages + +# Install these packages from the edx-platform working tree +# NOTE: if you change code in these packages, you MUST change the version +# number in its setup.py or the code WILL NOT be installed during deploy. +common/lib/calc +common/lib/chem +common/lib/sandbox-packages From bf20760922a1aebb33243365c0861a6b155a9277 Mon Sep 17 00:00:00 2001 From: e0d Date: Wed, 22 May 2013 10:19:30 -0400 Subject: [PATCH 5/5] changes to refactor local requirements. --- requirements/edx-sandbox/local.txt | 6 ++++++ requirements/edx-sandbox/post.txt | 7 ------- 2 files changed, 6 insertions(+), 7 deletions(-) create mode 100644 requirements/edx-sandbox/local.txt diff --git a/requirements/edx-sandbox/local.txt b/requirements/edx-sandbox/local.txt new file mode 100644 index 0000000000..ba24805057 --- /dev/null +++ b/requirements/edx-sandbox/local.txt @@ -0,0 +1,6 @@ +# Install these packages from the edx-platform working tree +# NOTE: if you change code in these packages, you MUST change the version +# number in its setup.py or the code WILL NOT be installed during deploy. +common/lib/calc +common/lib/chem +common/lib/sandbox-packages diff --git a/requirements/edx-sandbox/post.txt b/requirements/edx-sandbox/post.txt index d122795d18..218fdf307e 100644 --- a/requirements/edx-sandbox/post.txt +++ b/requirements/edx-sandbox/post.txt @@ -1,10 +1,3 @@ # Packages to install in the Python sandbox for secured execution. scipy==0.11.0 lxml==3.0.1 - -# Install these packages from the edx-platform working tree -# NOTE: if you change code in these packages, you MUST change the version -# number in its setup.py or the code WILL NOT be installed during deploy. -common/lib/calc -common/lib/chem -common/lib/sandbox-packages