From 091ca9c3f06766a0709bb02201c49b8035afe260 Mon Sep 17 00:00:00 2001
From: Ned Batchelder <ned@nedbatchelder.com>
Date: Tue, 30 Apr 2013 15:55:30 -0400
Subject: [PATCH] Add a private-requirements.txt for personal changes to how
 things are installed.  Good for installing libs as working dirs.

---
 .gitignore              | 1 +
 github-requirements.txt | 5 +++++
 local-requirements.txt  | 5 -----
 rakefile                | 3 +++
 4 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/.gitignore b/.gitignore
index 87a0778a6f..d01baf055a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -8,6 +8,7 @@
 :2e#
 .AppleDouble
 database.sqlite
+private-requirements.txt
 courseware/static/js/mathjax/*
 flushdb.sh
 build
diff --git a/github-requirements.txt b/github-requirements.txt
index 468d55ce65..0d7b75b89b 100644
--- a/github-requirements.txt
+++ b/github-requirements.txt
@@ -1,5 +1,10 @@
 # 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
diff --git a/local-requirements.txt b/local-requirements.txt
index 0ce7de0e73..201467d11e 100644
--- a/local-requirements.txt
+++ b/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
diff --git a/rakefile b/rakefile
index 2b9cb9fd57..27bb00bcbc 100644
--- a/rakefile
+++ b/rakefile
@@ -174,6 +174,9 @@ end
 desc "Install all python prerequisites for the lms and cms"
 task :install_python_prereqs do
     sh('pip install -r requirements.txt')
+    if File.file?("private-requirements.txt")
+        sh('pip install -r private-requirements.txt')
+    end
 end
 
 task :predjango do