fix tests

bin/compile

@@ -158,9 +158,6 @@ source $BIN_DIR/steps/python
 # Sanity check for setuptools/distribute.
 source $BIN_DIR/steps/setuptools
 
-# Fix egg-links.
-source $BIN_DIR/steps/eggpath-fix
-
 # Pipenv support.
 source $BIN_DIR/steps/pipenv
 
@@ -169,6 +166,9 @@ if [ ! -f requirements.txt ] && [ ! -f Pipfile ]; then
   echo "-e ." > requirements.txt
 fi
 
+# Fix egg-links.
+source $BIN_DIR/steps/eggpath-fix
+
 # Mercurial support.
 source $BIN_DIR/steps/mercurial
 

bin/steps/pipenv

@@ -4,6 +4,7 @@ if [[ -f Pipfile ]]; then
         puts-step "Generating 'requirements.txt' with pipenv"
 
         /app/.heroku/python/bin/pip install pipenv --upgrade &> /dev/null
+
         /app/.heroku/python/bin/pipenv lock --requirements --no-hashes > $BUILD_DIR/requirements.txt 2> /dev/null
     fi
 fi

bin/steps/python

@@ -56,29 +56,13 @@ if [ "$FRESH_PYTHON" ] || [[ ! $(pip --version) == *$PIP_VERSION* ]]; then
   trap "rm -rf $TMPTARDIR" RETURN
 
   puts-step "Installing pip"
+
+  # Remove old installations.
+  rm -fr /app/.heroku/python/lib/python2.7/site-packages/pip-*
+  rm -fr /app/.heroku/python/lib/python2.7/site-packages/setuptools-*
+
   /app/.heroku/python/bin/python $ROOT_DIR/vendor/get-pip.py &> /dev/null
 
-  # bpwatch start install_setuptools
-  #   # Prepare it for the real world
-  #   puts-step "Installing Setuptools ($SETUPTOOLS_VERSION)"
-  #   tar zxf $ROOT_DIR/vendor/setuptools-$SETUPTOOLS_VERSION.tar.gz -C $TMPTARDIR
-  #   cd $TMPTARDIR/setuptools-$SETUPTOOLS_VERSION/
-  #   /app/.heroku/python/bin/python setup.py install  &> /dev/null
-  #   cd $WORKING_DIR
-  # bpwatch stop install_setuptoools
-
-  # bpwatch start install_pip
-  #   puts-step "Installing Pip ($PIP_VERSION)"
-  #   tar zxf $ROOT_DIR/vendor/pip-$PIP_VERSION.tar.gz -C $TMPTARDIR
-  #   cd $TMPTARDIR/pip-$PIP_VERSION/
-  #   /app/.heroku/python/bin/python setup.py install &> /dev/null
-  #   cd $WORKING_DIR
-
-  # bpwatch stop install_pip
-
-
-
-
   bpwatch stop prepare_environment
 fi
 

test/run

@@ -3,7 +3,6 @@
 
 testPipenv() {
   compile "pipenv"
-  debug
   assertCapturedSuccess
 }