diff --git a/Makefile b/Makefile index 185fc2f..8ad8c13 100644 --- a/Makefile +++ b/Makefile @@ -12,7 +12,7 @@ STACK_IMAGE_TAG := heroku/$(subst -,:,$(STACK))-build check: @shellcheck -x bin/compile bin/detect bin/release bin/test-compile bin/utils bin/warnings bin/default_pythons - @shellcheck -x bin/steps/collectstatic bin/steps/eggpath-fix bin/steps/eggpath-fix2 bin/steps/nltk bin/steps/pip-install bin/steps/pip-uninstall bin/steps/pipenv bin/steps/pipenv-python-version bin/steps/python + @shellcheck -x bin/steps/collectstatic bin/steps/eggpath-fix bin/steps/eggpath-fix2 bin/steps/nltk bin/steps/pip-install bin/steps/pipenv bin/steps/pipenv-python-version bin/steps/python @shellcheck -x bin/steps/hooks/* test: diff --git a/bin/steps/pip-uninstall b/bin/steps/pip-uninstall deleted file mode 100755 index 4e0ad91..0000000 --- a/bin/steps/pip-uninstall +++ /dev/null @@ -1,28 +0,0 @@ -#!/usr/bin/env bash - -set +e -# Install dependencies with Pip. -# shellcheck source=bin/utils -source "$BIN_DIR/utils" - -if [ ! "$SKIP_PIP_INSTALL" ]; then - - if [[ -f .heroku/python/requirements-declared.txt ]]; then - - cp .heroku/python/requirements-declared.txt requirements-declared.txt - - - if ! pip-diff --stale requirements-declared.txt requirements.txt --exclude setuptools pip wheel > .heroku/python/requirements-stale.txt; then - mcount "failure.bad-requirements" - fi - - rm -rf requirements-declared.txt - - if [[ -s .heroku/python/requirements-stale.txt ]]; then - puts-step "Uninstalling stale dependencies" - /app/.heroku/python/bin/pip uninstall -r .heroku/python/requirements-stale.txt -y --exists-action=w --disable-pip-version-check | cleanup | indent - fi - fi - -fi -set -e diff --git a/bin/steps/pipenv b/bin/steps/pipenv index 4f2600a..bbbbb15 100755 --- a/bin/steps/pipenv +++ b/bin/steps/pipenv @@ -69,7 +69,6 @@ if [ ! "$SKIP_PIPENV_INSTALL" ]; then else pipenv-to-pip Pipfile.lock > requirements.txt - "$BIN_DIR/steps/pip-uninstall" cp requirements.txt .heroku/python/requirements-declared.txt openssl dgst -sha256 Pipfile.lock > .heroku/python/Pipfile.lock.sha256