diff --git a/github-requirements.txt b/github-requirements.txt new file mode 100644 index 0000000000..468d55ce65 --- /dev/null +++ b/github-requirements.txt @@ -0,0 +1,5 @@ +# Python libraries to install directly from github +-e git://github.com/MITx/django-staticfiles.git@6d2504e5c8#egg=django-staticfiles +-e git://github.com/MITx/django-pipeline.git#egg=django-pipeline +-e git://github.com/MITx/django-wiki.git@e2e84558#egg=django-wiki +-e git://github.com/dementrock/pystache_custom.git@776973740bdaad83a3b029f96e415a7d1e8bec2f#egg=pystache_custom-dev diff --git a/jenkins/test_edge.sh b/jenkins/test_edge.sh index 66a1185989..f66178914b 100755 --- a/jenkins/test_edge.sh +++ b/jenkins/test_edge.sh @@ -15,9 +15,6 @@ pip install -q -r pre-requirements.txt yes w | pip install -q -r requirements.txt [ ! -d askbot ] || pip install -q -r askbot/askbot_requirements.txt -# Install the latest entry points from xmodule -pip install -q --upgrade -e common/lib/xmodule - rake clobber TESTS_FAILED=0 rake test_cms[false] || TESTS_FAILED=1 diff --git a/jenkins/test_lms.sh b/jenkins/test_lms.sh index d95ee689cb..90cc1dde13 100755 --- a/jenkins/test_lms.sh +++ b/jenkins/test_lms.sh @@ -15,9 +15,6 @@ pip install -q -r pre-requirements.txt yes w | pip install -q -r requirements.txt [ ! -d askbot ] || pip install -q -r askbot/askbot_requirements.txt -# Install the latest entry points from xmodule -pip install -q --upgrade -e common/lib/xmodule - rake clobber TESTS_FAILED=0 rake test_lms[false] || TESTS_FAILED=1 diff --git a/local-requirements.txt b/local-requirements.txt new file mode 100644 index 0000000000..a4d153dd36 --- /dev/null +++ b/local-requirements.txt @@ -0,0 +1,3 @@ +# Python libraries to install that are local to the mitx repo +-e common/lib/capa +-e common/lib/xmodule diff --git a/rakefile b/rakefile index 97ed5435bd..3bf4f342f2 100644 --- a/rakefile +++ b/rakefile @@ -49,8 +49,8 @@ default_options = { task :predjango do sh("find . -type f -name *.pyc -delete") - sh("pip install -q -e common/lib/xmodule -e common/lib/capa") - sh("git submodule update --init") + sh('pip install -q --upgrade -r local-requirements.txt') + sh('git submodule update --init') end task :clean_test_files do diff --git a/repo-requirements.txt b/repo-requirements.txt index f98d05ffc9..aa503e9779 100644 --- a/repo-requirements.txt +++ b/repo-requirements.txt @@ -1,6 +1,2 @@ --e git://github.com/MITx/django-staticfiles.git@6d2504e5c8#egg=django-staticfiles --e git://github.com/MITx/django-pipeline.git#egg=django-pipeline --e git://github.com/MITx/django-wiki.git@e2e84558#egg=django-wiki --e git://github.com/dementrock/pystache_custom.git@776973740bdaad83a3b029f96e415a7d1e8bec2f#egg=pystache_custom-dev --e common/lib/capa --e common/lib/xmodule +-r github-requirements.txt +-r local-requirements.txt \ No newline at end of file