Merge pull request #1918 from MITx/ned/personal-requirements

Ned/personal requirements

.gitignore

@@ -8,6 +8,7 @@
 :2e#
 .AppleDouble
 database.sqlite
+private-requirements.txt
 courseware/static/js/mathjax/*
 flushdb.sh
 build

github-requirements.txt

 # Python libraries to install directly from github
+
+# Third-party:
 -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
+
+# Our libraries:
+-e git+https://github.com/edx/XBlock.git@5ce6f70a#egg=XBlock

local-requirements.txt

@@ -2,8 +2,3 @@
 -e common/lib/capa
 -e common/lib/xmodule
 -e .
-
-# XBlock:
-# Might change frequently, so put it in local-requirements.txt,
-# but conceptually is an external package, so it is in a separate repo.
--e git+https://github.com/edx/XBlock.git@5ce6f70a#egg=XBlock

rakefile

@@ -174,6 +174,11 @@ end
 desc "Install all python prerequisites for the lms and cms"
 task :install_python_prereqs do
     sh('pip install -r requirements.txt')
+    # Check for private-requirements.txt: used to install our libs as working dirs,
+    # or personal-use tools.
+    if File.file?("private-requirements.txt")
+        sh('pip install -r private-requirements.txt')
+    end
 end
 
 task :predjango do