diff --git a/common/lib/capa/__init__.py b/common/lib/capa/capa/__init__.py similarity index 100% rename from common/lib/capa/__init__.py rename to common/lib/capa/capa/__init__.py diff --git a/common/lib/capa/calc.py b/common/lib/capa/capa/calc.py similarity index 100% rename from common/lib/capa/calc.py rename to common/lib/capa/capa/calc.py diff --git a/common/lib/capa/capa_problem.py b/common/lib/capa/capa/capa_problem.py similarity index 100% rename from common/lib/capa/capa_problem.py rename to common/lib/capa/capa/capa_problem.py diff --git a/common/lib/capa/checker.py b/common/lib/capa/capa/checker.py similarity index 100% rename from common/lib/capa/checker.py rename to common/lib/capa/capa/checker.py diff --git a/common/lib/capa/correctmap.py b/common/lib/capa/capa/correctmap.py similarity index 100% rename from common/lib/capa/correctmap.py rename to common/lib/capa/capa/correctmap.py diff --git a/common/lib/capa/eia.py b/common/lib/capa/capa/eia.py similarity index 100% rename from common/lib/capa/eia.py rename to common/lib/capa/capa/eia.py diff --git a/common/lib/capa/inputtypes.py b/common/lib/capa/capa/inputtypes.py similarity index 100% rename from common/lib/capa/inputtypes.py rename to common/lib/capa/capa/inputtypes.py diff --git a/common/lib/capa/responsetypes.py b/common/lib/capa/capa/responsetypes.py similarity index 100% rename from common/lib/capa/responsetypes.py rename to common/lib/capa/capa/responsetypes.py diff --git a/common/lib/capa/templates/choicegroup.html b/common/lib/capa/capa/templates/choicegroup.html similarity index 100% rename from common/lib/capa/templates/choicegroup.html rename to common/lib/capa/capa/templates/choicegroup.html diff --git a/common/lib/capa/templates/imageinput.html b/common/lib/capa/capa/templates/imageinput.html similarity index 100% rename from common/lib/capa/templates/imageinput.html rename to common/lib/capa/capa/templates/imageinput.html diff --git a/common/lib/capa/templates/jstextline.html b/common/lib/capa/capa/templates/jstextline.html similarity index 100% rename from common/lib/capa/templates/jstextline.html rename to common/lib/capa/capa/templates/jstextline.html diff --git a/common/lib/capa/templates/mathstring.html b/common/lib/capa/capa/templates/mathstring.html similarity index 100% rename from common/lib/capa/templates/mathstring.html rename to common/lib/capa/capa/templates/mathstring.html diff --git a/common/lib/capa/templates/schematicinput.html b/common/lib/capa/capa/templates/schematicinput.html similarity index 100% rename from common/lib/capa/templates/schematicinput.html rename to common/lib/capa/capa/templates/schematicinput.html diff --git a/common/lib/capa/templates/solutionspan.html b/common/lib/capa/capa/templates/solutionspan.html similarity index 100% rename from common/lib/capa/templates/solutionspan.html rename to common/lib/capa/capa/templates/solutionspan.html diff --git a/common/lib/capa/templates/textbox.html b/common/lib/capa/capa/templates/textbox.html similarity index 100% rename from common/lib/capa/templates/textbox.html rename to common/lib/capa/capa/templates/textbox.html diff --git a/common/lib/capa/templates/textinput.html b/common/lib/capa/capa/templates/textinput.html similarity index 100% rename from common/lib/capa/templates/textinput.html rename to common/lib/capa/capa/templates/textinput.html diff --git a/common/lib/capa/templates/textinput_dynamath.html b/common/lib/capa/capa/templates/textinput_dynamath.html similarity index 100% rename from common/lib/capa/templates/textinput_dynamath.html rename to common/lib/capa/capa/templates/textinput_dynamath.html diff --git a/common/lib/capa/util.py b/common/lib/capa/capa/util.py similarity index 100% rename from common/lib/capa/util.py rename to common/lib/capa/capa/util.py diff --git a/common/lib/capa/setup.py b/common/lib/capa/setup.py new file mode 100644 index 0000000000..cf66229b88 --- /dev/null +++ b/common/lib/capa/setup.py @@ -0,0 +1,8 @@ +from setuptools import setup, find_packages + +setup( + name="capa", + version="0.1", + packages=find_packages(exclude=["tests"]), + install_requires=['distribute'], +) diff --git a/common/lib/mitxmako/__init__.py b/common/lib/mitxmako/mitxmako/__init__.py similarity index 100% rename from common/lib/mitxmako/__init__.py rename to common/lib/mitxmako/mitxmako/__init__.py diff --git a/common/lib/mitxmako/middleware.py b/common/lib/mitxmako/mitxmako/middleware.py similarity index 100% rename from common/lib/mitxmako/middleware.py rename to common/lib/mitxmako/mitxmako/middleware.py diff --git a/common/lib/mitxmako/shortcuts.py b/common/lib/mitxmako/mitxmako/shortcuts.py similarity index 100% rename from common/lib/mitxmako/shortcuts.py rename to common/lib/mitxmako/mitxmako/shortcuts.py diff --git a/common/lib/mitxmako/template.py b/common/lib/mitxmako/mitxmako/template.py similarity index 100% rename from common/lib/mitxmako/template.py rename to common/lib/mitxmako/mitxmako/template.py diff --git a/common/lib/mitxmako/setup.py b/common/lib/mitxmako/setup.py new file mode 100644 index 0000000000..535d86f90e --- /dev/null +++ b/common/lib/mitxmako/setup.py @@ -0,0 +1,8 @@ +from setuptools import setup, find_packages + +setup( + name="mitxmako", + version="0.1", + packages=find_packages(exclude=["tests"]), + install_requires=['distribute'], +) diff --git a/common/lib/xmodule/setup.py b/common/lib/xmodule/setup.py index 77b0838ff2..1ce23bca90 100644 --- a/common/lib/xmodule/setup.py +++ b/common/lib/xmodule/setup.py @@ -8,6 +8,10 @@ setup( package_data={ 'xmodule': ['js/module/*'] }, + requires=[ + 'capa', + 'mitxmako' + ], # See http://guide.python-distribute.org/creation.html#entry-points # for a description of entry_points diff --git a/requirements.txt b/requirements.txt index d342c46859..6f63769ee3 100644 --- a/requirements.txt +++ b/requirements.txt @@ -24,6 +24,8 @@ sympy newrelic glob2 pymongo +-e common/lib/capa +-e common/lib/mitxmako -e common/lib/xmodule django_nose nosexcover