Merge pull request #894 from heroku/undo-revert

Reapply pipenv-ci bugfix

.github/workflows/check_changelog.yml

@@ -0,0 +1,12 @@
+name: Check Changelog
+
+on: [pull_request]
+
+jobs:
+ build:
+   runs-on: ubuntu-latest
+   steps:
+   - uses: actions/checkout@v1
+   - name: Check that CHANGELOG is touched
+     run: |
+       cat $GITHUB_EVENT_PATH | jq .pull_request.title |  grep -i '\[\(\(changelog skip\)\|\(ci skip\)\)\]' ||  git diff remotes/origin/${{ github.base_ref }} --name-only | grep CHANGELOG.md

CHANGELOG.md

@@ -2,8 +2,26 @@
 
 # Master
 
+- Bugfix: Pipenv no longer installs twice in CI
+
 --------------------------------------------------------------------------------
 
+# 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.
+- Add support for Python 3.8 branch
+- Sqlite3 Update:
+  - Test Improvements
+- Add support for staging binary testing
+
+# 157 (2019-09-18)
+
+- Typo fixes
+
 # 156 (2019-09-12)
 
 - Python 3.6.9 and 3.7.4 now available.

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
 

bin/compile

@@ -42,6 +42,8 @@ export BUILD_DIR CACHE_DIR ENV_DIR
 VENDOR_URL="https://lang-python.s3.amazonaws.com/$STACK"
 if [[ -n ${BUILDPACK_VENDOR_URL:-} ]]; then
     VENDOR_URL="$BUILDPACK_VENDOR_URL"
+elif [[ -n ${USE_STAGING_BINARIES} ]]; then
+    VENDOR_URL="$USE_STAGING_BINARIES/$STACK"
 fi
 export VENDOR_URL
 
@@ -50,6 +52,7 @@ export VENDOR_URL
 source "$BIN_DIR/default_pythons"
 
 # Supported Python Branches
+PY38="python-3.8"
 PY37="python-3.7"
 PY36="python-3.6"
 PY35="python-3.5"

bin/default_pythons

@@ -1,10 +1,11 @@
 #!/usr/bin/env bash
 
 DEFAULT_PYTHON_VERSION="python-3.6.9"
+LATEST_38="python-3.8.0"
+LATEST_37="python-3.7.5"
 LATEST_36="python-3.6.9"
-LATEST_37="python-3.7.4"
 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_37 LATEST_36 LATEST_35 LATEST_34 LATEST_27
+export DEFAULT_PYTHON_VERSION LATEST_38 LATEST_37 LATEST_36 LATEST_35 LATEST_34 LATEST_27

bin/steps/pip-uninstall

@@ -13,7 +13,7 @@ if [ ! "$SKIP_PIP_INSTALL" ]; then
 
 
     if ! pip-diff --stale requirements-declared.txt requirements.txt --exclude setuptools pip wheel > .heroku/python/requirements-stale.txt; then
-      mount "failure.bad-requirements"
+      mcount "failure.bad-requirements"
     fi
 
     rm -fr requirements-declared.txt

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

bin/steps/python

@@ -11,6 +11,13 @@ SECURITY_UPDATE="Python has released a security update! Please consider upgradin
 
 # check if runtime exists
 if curl --output /dev/null --silent --head --fail "$VENDORED_PYTHON"; then
+  if [[ "$PYTHON_VERSION" == $PY38* ]]; then
+    # do things to alert the user of security release available
+    if [ "$PYTHON_VERSION" != "$LATEST_38" ]; then
+      puts-warn "$SECURITY_UPDATE" "$LATEST_38"
+      echo "       Learn More: https://devcenter.heroku.com/articles/python-runtimes"
+    fi
+  fi
   if [[ "$PYTHON_VERSION" == $PY37* ]]; then
     # do things to alert the user of security release available
     if [ "$PYTHON_VERSION" != "$LATEST_37" ]; then

builds/heroku-18.Dockerfile

@@ -1,4 +1,4 @@
-FROM heroku/heroku:18-build
+FROM heroku/heroku:18-build.v16
 
 WORKDIR /app
 ENV WORKSPACE_DIR="/app/builds" \

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 '{}' +

builds/runtimes/python-3.7.5

@@ -0,0 +1,4 @@
+#!/usr/bin/env bash
+# Build Path: /app/.heroku/python/
+
+source $(dirname $0)/python3

builds/runtimes/python-3.8.0

@@ -0,0 +1,4 @@
+#!/usr/bin/env bash
+# Build Path: /app/.heroku/python/
+
+source $(dirname $0)/python3

test/fixtures/pysqlite/requirements.txt

@@ -0,0 +1 @@
+pysqlite

test/fixtures/pysqlite/runtime.txt

@@ -0,0 +1 @@
+python-2.7.16

test/fixtures/python2/runtime.txt

@@ -1 +1 @@
-python-2.7.16
+python-2.7.17

test/fixtures/python3_4_warn/runtime.txt

@@ -1 +1 @@
-python-3.4.0
+python-3.4.9

test/fixtures/python3_8/requirements.txt

@@ -0,0 +1 @@
+requests

test/fixtures/python3_8/runtime.txt

@@ -0,0 +1 @@
+python-3.8.0

test/fixtures/python3_8_fail/requirements.txt

@@ -0,0 +1 @@
+flask

test/fixtures/python3_8_fail/runtime.txt

@@ -0,0 +1 @@
+python-3.8.99

test/run-deps

@@ -40,6 +40,12 @@ testPsycopg2() {
   assertCapturedSuccess
 }
 
+testPysqlite() {
+  compile "pysqlite"
+  assertCaptured "pysqlite"
+  assertCapturedSuccess
+}
+
 testCffi() {
   compile "cffi"
   assertCaptured "cffi"

test/run-versions

@@ -9,6 +9,7 @@ testPythonDefault() {
   compile "pythonDefault"
   assertCaptured $DEFAULT_PYTHON_VERSION
   assertNotCaptured "security update"
+  assertCaptured "Installing SQLite3"
   assertCapturedSuccess
 }
 
@@ -18,6 +19,7 @@ testPython2() {
     compile "python2"
     assertCaptured $LATEST_27
     assertNotCaptured "security update"
+    assertCaptured "Installing SQLite3"
     assertCapturedSuccess
 }
 
@@ -25,6 +27,7 @@ testPython2_warn() {
     compile "python2_warn"
     assertCaptured "python-2.7.15"
     assertCaptured "security update!"
+    assertCaptured "Installing SQLite3"
     assertCapturedSuccess
 }
 
@@ -46,13 +49,9 @@ testPython3_4() {
 
 testPython3_4_warn() {
   compile "python3_4_warn"
-  if [[ $STACK = "cedar-14" ]]; then
-    assertCaptured "python-3.4.0"
-    assertCaptured "security update!"
-    assertCapturedSuccess
-  else
-    assertCapturedError
-  fi
+  assertCaptured "python-3.4.9"
+  assertCaptured "security update!"
+  assertCapturedSuccess
 }
 
 testPython3_4_fail() {
@@ -67,6 +66,7 @@ testPython3_5() {
     compile "python3_5"
     assertCaptured $LATEST_35
     assertNotCaptured "security update"
+    assertCaptured "Installing SQLite3"
     assertCapturedSuccess
   fi
 }
@@ -93,6 +93,7 @@ testPython3_6() {
   compile "python3_6"
   assertCaptured $LATEST_36
   assertNotCaptured "security update"
+  assertCaptured "Installing SQLite3"
   assertCapturedSuccess
 }
 
@@ -100,6 +101,7 @@ testPython3_6_warn() {
   compile "python3_6_warn"
   assertCaptured "python-3.6.7"
   assertCaptured "security update!"
+  assertCaptured "Installing SQLite3"
   assertCapturedSuccess
 }
 
@@ -117,6 +119,7 @@ testPython3_7() {
   else
     assertNotCaptured "security update"
     assertCaptured $LATEST_37
+    assertCaptured "Installing SQLite3"
     assertCapturedSuccess
   fi
 }
@@ -128,6 +131,7 @@ testPython3_7_warn() {
   else
     assertCaptured "python-3.7.1"
     assertCaptured "security update!"
+    assertCaptured "Installing SQLite3"
     assertCapturedSuccess
   fi
 }
@@ -138,6 +142,25 @@ testPython3_7_fail() {
   assertCapturedError
 }
 
+testPython3_8() {
+  updateVersion "python3_8" $LATEST_38
+  compile "python3_8"
+  if [[ $STACK = "cedar-14" ]]; then
+    assertCapturedError
+  else
+    assertNotCaptured "security update"
+    assertCaptured $LATEST_38
+    assertCaptured "Installing SQLite3"
+    assertCapturedSuccess
+  fi
+}
+
+testPython3_8_fail() {
+  compile "python3_8_fail"
+  assertCaptured "Aborting"
+  assertCapturedError
+}
+
 pushd $(dirname 0) >/dev/null
 popd >/dev/null