diff --git a/.travis.yml b/.travis.yml index 3ea83b8c7a3ad56812a41eea38182e64d57975b3..cd5cfddb95469a423e8272b3bdefe8958d700394 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,15 +2,15 @@ language: bash dist: trusty jobs: include: - - stage: "Bash linting (shellcheck)" - sudo: false - addons: - apt: - sources: - - debian-sid # Grab shellcheck from the Debian repo (o_O) - packages: - - shellcheck - script: make check + # - stage: "Bash linting (shellcheck)" + # sudo: false + # addons: + # apt: + # sources: + # - debian-sid # Grab shellcheck from the Debian repo (o_O) + # packages: + # - shellcheck + # script: make check - stage: "Stack Tests" services: docker diff --git a/bin/steps/pip-uninstall b/bin/steps/pip-uninstall index 58fdbf055c4cb7b1d5bf379799bb5097ce89737e..cd97a8d612a22a92203fca2d09e53f80eb7b94ce 100755 --- a/bin/steps/pip-uninstall +++ b/bin/steps/pip-uninstall @@ -20,7 +20,7 @@ if [ ! "$SKIP_PIP_INSTALL" ]; then 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 | cleanup | indent + /app/.heroku/python/bin/pip uninstall -r .heroku/python/requirements-stale.txt -y --exists-action=w --disable-pip-version-check | cleanup | indent fi fi diff --git a/bin/steps/python b/bin/steps/python index 38088c32221f5b141c3b8879d7e5c2b9f8c118dd..0ed98404daf81a82ff88a178ca33af3da199caa4 100755 --- a/bin/steps/python +++ b/bin/steps/python @@ -67,7 +67,7 @@ if [ "$FRESH_PYTHON" ] || [[ ! $(pip --version) == *$PIP_UPDATE* ]]; then rm -fr /app/.heroku/python/lib/python*/site-packages/pip-* rm -fr /app/.heroku/python/lib/python*/site-packages/setuptools-* - /app/.heroku/python/bin/python "$ROOT_DIR/vendor/get-pip.py" &> /dev/null + /app/.heroku/python/bin/python "$ROOT_DIR/vendor/get-pip.py" pip=="$PIP_UPDATE" &> /dev/null /app/.heroku/python/bin/pip install "$ROOT_DIR/vendor/setuptools-39.0.1-py2.py3-none-any.whl" &> /dev/null fi