From 520c240eddb68f7efccd167af22e72171951acd0 Mon Sep 17 00:00:00 2001 From: Joe Kutner Date: Sun, 16 Feb 2020 09:27:07 -0600 Subject: [PATCH 1/3] Download get-pip.py to tmpdir instead of root dir --- CHANGELOG.md | 1 + bin/steps/python | 7 ++++--- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 1b1d08b..502a9ec 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,7 @@ # Master +- Download get-pip.py to tmpdir instead of root dir - New pythons released: Python 3.8.1, 3.7.6, 3.6.10 (CPython) Beta Release: Pypy 2.7 and 3.6, version 7.2.0 diff --git a/bin/steps/python b/bin/steps/python index 8790f61..c06db37 100755 --- a/bin/steps/python +++ b/bin/steps/python @@ -128,9 +128,10 @@ fi # Heroku uses the get-pip utility maintained by the Python community to vendor Pip. # https://github.com/pypa/get-pip -GETPIP="https://lang-python.s3.amazonaws.com/etc/get-pip.py" +GETPIP_URL="https://lang-python.s3.amazonaws.com/etc/get-pip.py" +GETPIP_PY="${TMPDIR:-/tmp}/get-pip.py" -if ! curl -s "${GETPIP}" -o "$ROOT_DIR/get-pip.py" &> /dev/null; then +if ! curl -s "${GETPIP_URL}" -o "$GETPIP_PY" &> /dev/null; then mcount "failure.python.get-pip" echo "Failed to pull down get-pip" exit 1 @@ -145,7 +146,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/get-pip.py" pip=="$PIP_UPDATE" &> /dev/null + /app/.heroku/python/bin/python "$GETPIP_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 From 59105816655b67461f56ccad6185e25058279da4 Mon Sep 17 00:00:00 2001 From: Casey Faist Date: Wed, 19 Feb 2020 09:26:29 -0500 Subject: [PATCH 2/3] Bump to match the default version --- spec/hatchet/python_spec.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spec/hatchet/python_spec.rb b/spec/hatchet/python_spec.rb index 9651d60..98f0018 100644 --- a/spec/hatchet/python_spec.rb +++ b/spec/hatchet/python_spec.rb @@ -4,7 +4,7 @@ describe "Python!!!!!!!!!!!" do it "🐍" do Hatchet::Runner.new('python-getting-started', stack: DEFAULT_STACK).deploy do |app| expect(app.output).to match(/Installing pip/) - expect(app.run('python -V')).to match(/3.6.9/) + expect(app.run('python -V')).to match(/3.6.10/) end end end From ca9b6de50f6133213d9dec89783a797c95b1c2bc Mon Sep 17 00:00:00 2001 From: Casey Faist Date: Wed, 19 Feb 2020 09:37:41 -0500 Subject: [PATCH 3/3] Update changelog to pass check --- CHANGELOG.md | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 502a9ec..bd536e8 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,12 +3,15 @@ # Master - Download get-pip.py to tmpdir instead of root dir + +-------------------------------------------------------------------------------- + +# 163 (2019-12-23) + - New pythons released: Python 3.8.1, 3.7.6, 3.6.10 (CPython) Beta Release: Pypy 2.7 and 3.6, version 7.2.0 --------------------------------------------------------------------------------- - # 162 (2019-12-06) - Bug fix: fragile sqlite3 install