Merge branch 'develop' into decouple

bin/compile

@@ -89,6 +89,12 @@ source $BIN_DIR/steps/pylibmc
 echo "-----> Activating virtualenv"
 source bin/activate
 
+
+# If no requirements, assume 'setup.py install'
+if [ ! -f requirements.txt ]; then
+  echo "." > requirements.txt
+fi
+
 # Install mercurial, if needed.
 if (grep -Fiq "hg+" requirements.txt) then
   pip install --use-mirrors mercurial | indent

bin/detect

@@ -2,7 +2,10 @@
 # bin/detect <build-dir>
 
 BUILD_DIR=$1
-[ -f $BUILD_DIR/requirements.txt ] || exit 1 # fail fast if no requirements.txt
+
+if [ -f $BUILD_DIR/requirements.txt ] || [ -f $BUILD_DIR/setup.py ]; then
+  exit 1
+fi
 
 # 'Python/Django' if there is a [mysite]/settings.py file present; otherwise 'Python'
-ls $BUILD_DIR/**/settings.py &> /dev/null && echo Python/Django || echo Python
+ls $BUILD_DIR/**/settings.py &> /dev/null && echo Python/Django || echo Python
\ No newline at end of file