From 87ba8b499a85c0ad91db15dc3c0f3ca1de11bfbd Mon Sep 17 00:00:00 2001 From: Casey Faist Date: Sun, 13 Oct 2019 20:46:08 -0700 Subject: [PATCH 1/2] Update python 2 formulas --- builds/runtimes/python-2.7.10 | 13 +------------ builds/runtimes/python-2.7.11 | 13 +------------ builds/runtimes/python-2.7.12 | 13 +------------ builds/runtimes/python-2.7.13 | 17 +---------------- builds/runtimes/python-2.7.14 | 17 +---------------- builds/runtimes/python-2.7.15 | 25 +------------------------ builds/runtimes/python-2.7.16 | 25 +------------------------ builds/runtimes/python-2.7.9 | 13 +------------ 8 files changed, 8 insertions(+), 128 deletions(-) diff --git a/builds/runtimes/python-2.7.10 b/builds/runtimes/python-2.7.10 index 4ab82dc..ef21c72 100755 --- a/builds/runtimes/python-2.7.10 +++ b/builds/runtimes/python-2.7.10 @@ -1,15 +1,4 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/python/ -# Build Deps: libraries/sqlite -OUT_PREFIX=$1 - -echo "Building Python…" -SOURCE_TARBALL='https://python.org/ftp/python/2.7.10/Python-2.7.10.tgz' -curl -L $SOURCE_TARBALL | tar xz -mv Python-2.7.10 src -cd src - -./configure --prefix=$OUT_PREFIX --with-ensurepip=no -make -make install +source $(dirname $0)/python2 diff --git a/builds/runtimes/python-2.7.11 b/builds/runtimes/python-2.7.11 index 903a4a2..ef21c72 100755 --- a/builds/runtimes/python-2.7.11 +++ b/builds/runtimes/python-2.7.11 @@ -1,15 +1,4 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/python/ -# Build Deps: libraries/sqlite -OUT_PREFIX=$1 - -echo "Building Python…" -SOURCE_TARBALL='https://python.org/ftp/python/2.7.11/Python-2.7.11.tgz' -curl -L $SOURCE_TARBALL | tar xz -mv Python-2.7.11 src -cd src - -./configure --prefix=$OUT_PREFIX --with-ensurepip=no -make -make install +source $(dirname $0)/python2 diff --git a/builds/runtimes/python-2.7.12 b/builds/runtimes/python-2.7.12 index 3a721c3..ef21c72 100755 --- a/builds/runtimes/python-2.7.12 +++ b/builds/runtimes/python-2.7.12 @@ -1,15 +1,4 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/python/ -# Build Deps: libraries/sqlite -OUT_PREFIX=$1 - -echo "Building Python…" -SOURCE_TARBALL='https://python.org/ftp/python/2.7.12/Python-2.7.12.tgz' -curl -L $SOURCE_TARBALL | tar xz -mv Python-2.7.12 src -cd src - -./configure --prefix=$OUT_PREFIX --with-ensurepip=no -make -make install +source $(dirname $0)/python2 diff --git a/builds/runtimes/python-2.7.13 b/builds/runtimes/python-2.7.13 index 4379d2e..ef21c72 100755 --- a/builds/runtimes/python-2.7.13 +++ b/builds/runtimes/python-2.7.13 @@ -1,19 +1,4 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/python/ -# Build Deps: libraries/sqlite -OUT_PREFIX=$1 - -echo "Building Python…" -SOURCE_TARBALL='https://python.org/ftp/python/2.7.13/Python-2.7.13.tgz' -curl -L $SOURCE_TARBALL | tar xz -mv Python-2.7.13 src -cd src - -./configure --prefix=$OUT_PREFIX --enable-unicode=ucs4 --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 '{}' + +source $(dirname $0)/python2 diff --git a/builds/runtimes/python-2.7.14 b/builds/runtimes/python-2.7.14 index fa16fd5..ef21c72 100755 --- a/builds/runtimes/python-2.7.14 +++ b/builds/runtimes/python-2.7.14 @@ -1,19 +1,4 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/python/ -# Build Deps: libraries/sqlite -OUT_PREFIX=$1 - -echo "Building Python…" -SOURCE_TARBALL='https://python.org/ftp/python/2.7.14/Python-2.7.14.tgz' -curl -L $SOURCE_TARBALL | tar xz -mv Python-2.7.14 src -cd src - -./configure --prefix=$OUT_PREFIX --enable-unicode=ucs4 --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 '{}' + +source $(dirname $0)/python2 diff --git a/builds/runtimes/python-2.7.15 b/builds/runtimes/python-2.7.15 index a2363fb..ef21c72 100755 --- a/builds/runtimes/python-2.7.15 +++ b/builds/runtimes/python-2.7.15 @@ -1,27 +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/2.7.15/Python-2.7.15.tgz' -curl -L $SOURCE_TARBALL | tar xz -mv Python-2.7.15 src -cd src - -./configure --prefix=$OUT_PREFIX --enable-unicode=ucs4 --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 '{}' + +source $(dirname $0)/python2 diff --git a/builds/runtimes/python-2.7.16 b/builds/runtimes/python-2.7.16 index c2ac296..ef21c72 100755 --- a/builds/runtimes/python-2.7.16 +++ b/builds/runtimes/python-2.7.16 @@ -1,27 +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/2.7.16/Python-2.7.16.tgz' -curl -L $SOURCE_TARBALL | tar xz -mv Python-2.7.16 src -cd src - -./configure --prefix=$OUT_PREFIX --enable-unicode=ucs4 --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 '{}' + +source $(dirname $0)/python2 diff --git a/builds/runtimes/python-2.7.9 b/builds/runtimes/python-2.7.9 index 1ab0085..ef21c72 100755 --- a/builds/runtimes/python-2.7.9 +++ b/builds/runtimes/python-2.7.9 @@ -1,15 +1,4 @@ #!/usr/bin/env bash # Build Path: /app/.heroku/python/ -# Build Deps: libraries/sqlite -OUT_PREFIX=$1 - -echo "Building Python…" -SOURCE_TARBALL='https://python.org/ftp/python/2.7.9/Python-2.7.9.tgz' -curl -L $SOURCE_TARBALL | tar xz -mv Python-2.7.9 src -cd src - -./configure --prefix=$OUT_PREFIX --with-ensurepip=no -make -make install +source $(dirname $0)/python2 From 2a4f0a66c3f3ff8670a166e43223069374462ddf Mon Sep 17 00:00:00 2001 From: Casey Faist Date: Tue, 29 Oct 2019 15:15:46 -0700 Subject: [PATCH 2/2] changelog --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index c7f7b31..2132849 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,7 +4,7 @@ - Sqlite fix: - Update Python3 and Python2 base formula - - Update Python formulas 3.6.x, 3.7.x, 3.5.x + - Update Python formulas 3.6.x, 3.7.x, 3.5.x, and 2.7.17-2.7.9 - Test staged binaries on Travis --------------------------------------------------------------------------------