Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Split out requirements that come from the local mitx repo and those that come from github, and upgrade the local requirements before running tests

Browse Source
This commit is contained in:
Calen Pennington
2012-11-07 10:08:01 -05:00
parent 79a08266ad
commit c3f0d31cc9
6 changed files with 12 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
github-requirements.txt Normal file
View File

@@ -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

3
jenkins/test_edge.sh
View File

@@ -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

3
jenkins/test_lms.sh
View File

@@ -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

3
local-requirements.txt Normal file
View File

@@ -0,0 +1,3 @@
# Python libraries to install that are local to the mitx repo
-e common/lib/capa
-e common/lib/xmodule

4
rakefile
View File

@@ -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

8
repo-requirements.txt
View File

@@ -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