diff --git a/CHANGELOG.md b/CHANGELOG.md index 580d703..b6d1604 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,7 @@ ## Unreleased +- Rebuild the Python 3.4.10 archives with the correct version of Python (#1048). - Fix the security update version check message for apps using PyPy (#1040). - Remove `vendor/test-utils` (#1043). diff --git a/builds/runtimes/python-3.4.10 b/builds/runtimes/python-3.4.10 index 4d74b89..ad41723 100755 --- a/builds/runtimes/python-3.4.10 +++ b/builds/runtimes/python-3.4.10 @@ -1,32 +1,4 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/python/ -OUT_PREFIX=$1 -BIN_DIR="$(cd "$(dirname "$0")"/../.. || exit; pwd)/bin" -export BIN_DIR - -# shellcheck source=bin/utils -source "$BIN_DIR/steps/sqlite3" - -sqlite3_version -echo "Setting up SQLite3 Headers for $SQLITE3_VERSION" -sqlite3_install "$OUT_PREFIX" "$SQLITE3_VERSION" 1 - -echo "Building Python…" -SOURCE_TARBALL='https://python.org/ftp/python/3.7.2/Python-3.7.2.tgz' -curl -L $SOURCE_TARBALL | tar xz -mv Python-3.7.2 src -cd src - -./configure --prefix=$OUT_PREFIX --with-ensurepip=no -make -make install - -# Remove unneeded test directories, similar to the official Docker Python images: -# https://github.com/docker-library/python -find "${OUT_PREFIX}" \( -type d -a \( -name test -o -name tests \) \) -exec rm -rf '{}' + - -# Remove spare / -LOCATION=${OUT_PREFIX%?} - -ln $LOCATION/bin/python3 $LOCATION/bin/python +source $(dirname $0)/python3 diff --git a/test/run-versions b/test/run-versions index 32cfe52..f8bb2cc 100755 --- a/test/run-versions +++ b/test/run-versions @@ -54,29 +54,14 @@ testPython3_4() { assertCaptured $LATEST_34 assertNotCaptured "security update" assertCaptured "Installing pip 19.1.1, setuptools 43.0.0 and wheel 0.33.6" - # if cedar 14 and legacy binaries, fail. if cedar 14 and staging, succeed. - if [[ ! -n $USE_STAGING_BINARIES ]] && [[ $STACK == "cedar-14" ]]; then - assertCapturedError -# if heroku 18 and legacy binaries, succeed. if heroku 18 and staging, fail. - elif [[ -n $USE_STAGING_BINARIES ]] && [[ $STACK == "heroku-18" ]]; then - assertCapturedError - else -# all else succeed - assertCapturedSuccess - fi + assertCapturedSuccess } testPython3_4_warn() { compile "python3_4_warn" assertCaptured "python-3.4.9" assertCaptured "security update!" -# if heroku 18 and legacy binaries, succeed. if heroku 18 and staging, fail. - if [[ -n $USE_STAGING_BINARIES ]] && [[ $STACK == "heroku-18" ]]; then - assertCapturedError - else -# all else succeed - assertCapturedSuccess - fi + assertCapturedSuccess } testPython3_4_fail() {