Merge branch 'master' of github.com:MITx/mitx

create-dev-env.sh

@@ -82,19 +82,22 @@ clone_repos() {
         fi
         git clone git@github.com:MITx/askbot-devel >>$LOG 
     fi
-    
+
+    # By default, dev environments start with a copy of 6.002x
     cd "$BASE"
-    if [[ -d "$BASE/data/.hg" ]]; then
-        output "Pulling data"
-        cd "$BASE/data"
-        hg pull >>$LOG
-        hg update >>$LOG
+    mkdir -p "$BASE/data"
+    REPO="content-mit-6002x"
+    if [[ -d "$BASE/data/$REPO/.git" ]]; then
+        output "Pulling $REPO"
+        cd "$BASE/data/$REPO"
+        git pull >>$LOG
     else
-        output "Cloning data"
-        if [[ -d "$BASE/data" ]]; then
-            mv "$BASE/data" "${BASE}/data.bak.$$"
+        output "Cloning $REPO"
+        if [[ -d "$BASE/data/$REPO" ]]; then
+            mv "$BASE/data/$REPO" "${BASE}/data/$REPO.bak.$$"
         fi
-        hg clone ssh://hg-content@gp.mitx.mit.edu/data >>$LOG 
+	cd "$BASE/data"
+        git clone git@github.com:MITx/$REPO >>$LOG
     fi
 }
 
@@ -284,10 +287,14 @@ fi
 
 output "Installing askbot requirements"
 pip install -r askbot-devel/askbot_requirements.txt >>$LOG 
+output "Installing askbot-dev requirements"
 pip install -r askbot-devel/askbot_requirements_dev.txt >>$LOG 
-output "Installing MITx requirements"
+output "Installing MITx pre-requirements"
 pip install -r mitx/pre-requirements.txt >> $LOG
-pip install -r mitx/requirements.txt >>$LOG 
+# Need to be in the mitx dir to get the paths to local modules right
+output "Installing MITx requirements"
+cd mitx
+pip install -r requirements.txt >>$LOG 
 
 mkdir "$BASE/log" || true
 mkdir "$BASE/db" || true

requirements.txt

@@ -11,7 +11,7 @@ mako
 python-memcached
 path.py
 django_debug_toolbar
--e git+git://github.com/MITx/django-pipeline.git#egg=django-pipeline
+-e git://github.com/MITx/django-pipeline.git#egg=django-pipeline
 django-staticfiles>=1.2.1
 fs
 beautifulsoup