From fade163df88ff0c05da1914529935813eb4dce3b Mon Sep 17 00:00:00 2001 From: Casey Faist Date: Sat, 12 Oct 2019 17:04:46 -0700 Subject: [PATCH 1/2] update Changelog --- builds/runtimes/python-3.7.0 | 27 +-------------------------- builds/runtimes/python-3.7.1 | 30 +----------------------------- builds/runtimes/python-3.7.2 | 30 +----------------------------- builds/runtimes/python-3.7.3 | 30 +----------------------------- 4 files changed, 4 insertions(+), 113 deletions(-) diff --git a/builds/runtimes/python-3.7.0 b/builds/runtimes/python-3.7.0 index 74dccc5..ad41723 100755 --- a/builds/runtimes/python-3.7.0 +++ b/builds/runtimes/python-3.7.0 @@ -1,29 +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.0/Python-3.7.0.tgz' -curl -L $SOURCE_TARBALL | tar xz -mv Python-3.7.0 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 '{}' + - -ln $OUT_PREFIX/bin/python3 $OUT_PREFIX/bin/python +source $(dirname $0)/python3 diff --git a/builds/runtimes/python-3.7.1 b/builds/runtimes/python-3.7.1 index b805139..ad41723 100755 --- a/builds/runtimes/python-3.7.1 +++ b/builds/runtimes/python-3.7.1 @@ -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.1/Python-3.7.1.tgz' -curl -L $SOURCE_TARBALL | tar xz -mv Python-3.7.1 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/builds/runtimes/python-3.7.2 b/builds/runtimes/python-3.7.2 index 4d74b89..ad41723 100755 --- a/builds/runtimes/python-3.7.2 +++ b/builds/runtimes/python-3.7.2 @@ -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/builds/runtimes/python-3.7.3 b/builds/runtimes/python-3.7.3 index 4254362..ad41723 100755 --- a/builds/runtimes/python-3.7.3 +++ b/builds/runtimes/python-3.7.3 @@ -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.3/Python-3.7.3.tgz' -curl -L $SOURCE_TARBALL | tar xz -mv Python-3.7.3 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 From f28465bec7f5cf1bb46a2fdf14a44816451e304e Mon Sep 17 00:00:00 2001 From: Casey Faist Date: Tue, 29 Oct 2019 14:46:29 -0700 Subject: [PATCH 2/2] update changelog --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index c55b720..c488ac8 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,7 +4,7 @@ - Sqlite fix: - Update Python3 base formula - - Update Python formulas 3.6.x, 3.7.4 + - Update Python formulas 3.6.x, 3.7.x - Test staged binaries on Travis --------------------------------------------------------------------------------