Skip to content
Snippets Groups Projects
Commit 65648fb7 authored by Kenneth Reitz's avatar Kenneth Reitz
Browse files

fix tests

parent 45b0d185
No related branches found
No related tags found
No related merge requests found
...@@ -158,9 +158,6 @@ source $BIN_DIR/steps/python ...@@ -158,9 +158,6 @@ source $BIN_DIR/steps/python
# Sanity check for setuptools/distribute. # Sanity check for setuptools/distribute.
source $BIN_DIR/steps/setuptools source $BIN_DIR/steps/setuptools
# Fix egg-links.
source $BIN_DIR/steps/eggpath-fix
# Pipenv support. # Pipenv support.
source $BIN_DIR/steps/pipenv source $BIN_DIR/steps/pipenv
...@@ -169,6 +166,9 @@ if [ ! -f requirements.txt ] && [ ! -f Pipfile ]; then ...@@ -169,6 +166,9 @@ if [ ! -f requirements.txt ] && [ ! -f Pipfile ]; then
echo "-e ." > requirements.txt echo "-e ." > requirements.txt
fi fi
# Fix egg-links.
source $BIN_DIR/steps/eggpath-fix
# Mercurial support. # Mercurial support.
source $BIN_DIR/steps/mercurial source $BIN_DIR/steps/mercurial
......
...@@ -4,6 +4,7 @@ if [[ -f Pipfile ]]; then ...@@ -4,6 +4,7 @@ if [[ -f Pipfile ]]; then
puts-step "Generating 'requirements.txt' with pipenv" puts-step "Generating 'requirements.txt' with pipenv"
/app/.heroku/python/bin/pip install pipenv --upgrade &> /dev/null /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 /app/.heroku/python/bin/pipenv lock --requirements --no-hashes > $BUILD_DIR/requirements.txt 2> /dev/null
fi fi
fi fi
\ No newline at end of file
...@@ -56,28 +56,12 @@ if [ "$FRESH_PYTHON" ] || [[ ! $(pip --version) == *$PIP_VERSION* ]]; then ...@@ -56,28 +56,12 @@ if [ "$FRESH_PYTHON" ] || [[ ! $(pip --version) == *$PIP_VERSION* ]]; then
trap "rm -rf $TMPTARDIR" RETURN trap "rm -rf $TMPTARDIR" RETURN
puts-step "Installing pip" puts-step "Installing pip"
/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
# 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 stop prepare_environment bpwatch stop prepare_environment
fi fi
......
...@@ -3,7 +3,6 @@ ...@@ -3,7 +3,6 @@
testPipenv() { testPipenv() {
compile "pipenv" compile "pipenv"
debug
assertCapturedSuccess assertCapturedSuccess
} }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment