From c79e6f02ade06a1c013ef8005665d3bb0ee45799 Mon Sep 17 00:00:00 2001 From: Casey Faist Date: Mon, 21 Oct 2019 17:03:56 -0700 Subject: [PATCH 1/8] update changelog --- CHANGELOG.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 83ff428..2293998 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,8 @@ # Master +- Python 2.7.17 now available on Heroku 18 and 16. + -------------------------------------------------------------------------------- # 158 (2019-10-21) From 4328847f1e9c2accdf2bf08a1f8470e7e46871d5 Mon Sep 17 00:00:00 2001 From: Casey Faist Date: Mon, 21 Oct 2019 17:04:23 -0700 Subject: [PATCH 2/8] update tests and default 2.7 --- bin/default_pythons | 2 +- test/fixtures/python2/runtime.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/bin/default_pythons b/bin/default_pythons index ecc569c..16f044b 100755 --- a/bin/default_pythons +++ b/bin/default_pythons @@ -6,6 +6,6 @@ LATEST_37="python-3.7.5" LATEST_36="python-3.6.9" LATEST_35="python-3.5.7" LATEST_34="python-3.4.10" -LATEST_27="python-2.7.16" +LATEST_27="python-2.7.17" export DEFAULT_PYTHON_VERSION LATEST_38 LATEST_37 LATEST_36 LATEST_35 LATEST_34 LATEST_27 diff --git a/test/fixtures/python2/runtime.txt b/test/fixtures/python2/runtime.txt index d42956d..b334cca 100644 --- a/test/fixtures/python2/runtime.txt +++ b/test/fixtures/python2/runtime.txt @@ -1 +1 @@ -python-2.7.16 +python-2.7.17 From 7f639739e30e901b0890c7de837f421f14ba3ee4 Mon Sep 17 00:00:00 2001 From: Casey Faist Date: Mon, 21 Oct 2019 17:06:32 -0700 Subject: [PATCH 3/8] add new 2.7.17 formula --- builds/runtimes/python-2.7.17 | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) create mode 100755 builds/runtimes/python-2.7.17 diff --git a/builds/runtimes/python-2.7.17 b/builds/runtimes/python-2.7.17 new file mode 100755 index 0000000..6dada70 --- /dev/null +++ b/builds/runtimes/python-2.7.17 @@ -0,0 +1,27 @@ +#!/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.17/Python-2.7.17.tgz' +curl -L $SOURCE_TARBALL | tar xz +mv Python-2.7.17 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 '{}' + From 3698cb57155619a5e5f7135b2dcb23670963c9d7 Mon Sep 17 00:00:00 2001 From: Casey Faist Date: Tue, 22 Oct 2019 09:56:01 -0700 Subject: [PATCH 4/8] update changelog with latest python 2.7 release --- CHANGELOG.md | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 2293998..494a581 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,9 +2,12 @@ # Master +-------------------------------------------------------------------------------- + +# 159 (2019-10-22) + - Python 2.7.17 now available on Heroku 18 and 16. --------------------------------------------------------------------------------- # 158 (2019-10-21) - Python 3.7.5 and 3.8.0 now available on Heroku 18 and 16. From 5293169aa8955d6cdea90e60efacf3f8fd7fa701 Mon Sep 17 00:00:00 2001 From: Casey Faist Date: Tue, 22 Oct 2019 09:59:02 -0700 Subject: [PATCH 5/8] update Readme to reflect 2.7 --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index ad7a654..e3ea62a 100644 --- a/README.md +++ b/README.md @@ -63,7 +63,7 @@ Supported runtime options include: - `python-3.7.4` - `python-3.6.9` -- `python-2.7.16` +- `python-2.7.17` ## Tests From ab89e49235a98cd9750b8bd5967fa91fc0dd923b Mon Sep 17 00:00:00 2001 From: Alexandre Paroissien <34052139+alexandre-paroissien@users.noreply.github.com> Date: Tue, 24 Sep 2019 15:03:40 +0700 Subject: [PATCH 6/8] Fix pipenv install twice in CI --- bin/steps/pipenv | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/bin/steps/pipenv b/bin/steps/pipenv index a84d549..c799c7d 100755 --- a/bin/steps/pipenv +++ b/bin/steps/pipenv @@ -60,10 +60,16 @@ if [ ! "$SKIP_PIPENV_INSTALL" ]; then # avoid this eager behavior. /app/.heroku/python/bin/pip install pipenv==$PIPENV_VERSION --upgrade --upgrade-strategy only-if-needed &> /dev/null + # Install the test dependencies, for CI. + if [ "$INSTALL_TEST" ]; then + puts-step "Installing test dependencies…" + /app/.heroku/python/bin/pipenv install --dev --system --deploy 2>&1 | cleanup | indent + # Install the dependencies. - if [[ ! -f Pipfile.lock ]]; then + elif [[ ! -f Pipfile.lock ]]; then puts-step "Installing dependencies with Pipenv $PIPENV_VERSION…" /app/.heroku/python/bin/pipenv install --system --skip-lock 2>&1 | indent + else pipenv-to-pip Pipfile.lock > requirements.txt "$BIN_DIR/steps/pip-uninstall" @@ -73,12 +79,6 @@ if [ ! "$SKIP_PIPENV_INSTALL" ]; then puts-step "Installing dependencies with Pipenv $PIPENV_VERSION…" /app/.heroku/python/bin/pipenv install --system --deploy 2>&1 | indent fi - - # Install the test dependencies, for CI. - if [ "$INSTALL_TEST" ]; then - puts-step "Installing test dependencies…" - /app/.heroku/python/bin/pipenv install --dev --system --deploy 2>&1 | cleanup | indent - fi fi else export SKIP_PIP_INSTALL=1 From 9ab6a56cba9148de5fcc4c81585b7e92efb3aab9 Mon Sep 17 00:00:00 2001 From: Casey Faist Date: Tue, 22 Oct 2019 11:29:58 -0700 Subject: [PATCH 7/8] reapply bugfix in preparation for tomorrow's release --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 2293998..912d64a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,7 @@ # Master +- Bugfix: Pipenv no longer installs twice in CI - Python 2.7.17 now available on Heroku 18 and 16. -------------------------------------------------------------------------------- From 48f6e20fc5238780f58771425091ffb5fc2a5cc4 Mon Sep 17 00:00:00 2001 From: Casey Faist Date: Wed, 23 Oct 2019 14:30:05 -0700 Subject: [PATCH 8/8] 160 release changelog note --- CHANGELOG.md | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 983146a..b30648f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,10 +2,12 @@ # Master -- Bugfix: Pipenv no longer installs twice in CI - -------------------------------------------------------------------------------- +# 160 (2019-10-23) + +- Bugfix: Pipenv no longer installs twice in CI + # 159 (2019-10-22) - Python 2.7.17 now available on Heroku 18 and 16.