Merge pull request #831 from heroku/remove-cedar-tests

Remove cedar tests

.travis.yml

@@ -19,10 +19,6 @@ jobs:
     services: docker
     env: STACK=heroku-16
     script: "./tests.sh"
-  - stage: Stack Unit Tests
-    services: docker
-    env: STACK=cedar-14
-    script: "./tests.sh"
   - stage: Hatchet Integration
     script: "bundle exec rspec"
 env:

CHANGELOG.md

@@ -1,6 +1,18 @@
 # Python Buildpack Changelog
 
-# 151 (2019-03-)
+# 154 (2019-07-17)
+
+Fix python 3.5.7 formula actually building 3.7.2
+
+# 153 (2019-06-21)
+
+Hotfix for broken heroku-16 deploys
+
+# 152 (2019-04-04)
+
+Python 3.7.3 now available.
+
+# 151 (2019-03-21)
 
 Python 3.5.7 and 3.4.10 now available on all Heroku stacks.
 

Dockerfile

@@ -3,7 +3,8 @@ FROM heroku/heroku:16-build
 WORKDIR /app
 ENV WORKSPACE_DIR="/app/builds" \
     S3_BUCKET="lang-python" \
-    S3_PREFIX="heroku-16/"
+    S3_PREFIX="heroku-16/" \
+    DEBIAN_FRONTEND=noninteractive
 
 RUN apt-get update && apt-get install -y python-pip && rm -rf /var/lib/apt/lists/*
 

Dockerfile.heroku-18

@@ -3,7 +3,8 @@ FROM heroku/heroku:18-build
 WORKDIR /app
 ENV WORKSPACE_DIR="/app/builds" \
     S3_BUCKET="lang-python" \
-    S3_PREFIX="heroku-18/"
+    S3_PREFIX="heroku-18/" \
+    DEBIAN_FRONTEND=noninteractive
 
 RUN apt-get update && apt-get install -y python-pip && rm -rf /var/lib/apt/lists/*
 

Makefile

@@ -8,11 +8,6 @@ check:
 	@shellcheck -x bin/steps/collectstatic bin/steps/eggpath-fix  bin/steps/eggpath-fix2 bin/steps/gdal bin/steps/geo-libs bin/steps/mercurial bin/steps/nltk bin/steps/pip-install bin/steps/pip-uninstall bin/steps/pipenv bin/steps/pipenv-python-version bin/steps/pylibmc bin/steps/python
 	@shellcheck -x bin/steps/hooks/*
 
-test-cedar-14:
-	@echo "Running tests in docker (cedar-14)..."
-	@docker run -v $(shell pwd):/buildpack:ro --rm -it -e "STACK=cedar-14" heroku/cedar:14 bash -c 'cp -r /buildpack /buildpack_test; cd /buildpack_test/; test/run;'
-	@echo ""
-
 test-heroku-16:
 	@echo "Running tests in docker (heroku-16)..."
 	@docker run -v $(shell pwd):/buildpack:ro --rm -it -e "STACK=heroku-16" heroku/heroku:16-build bash -c 'cp -r /buildpack /buildpack_test; cd /buildpack_test/; test/run;'
@@ -36,6 +31,19 @@ buildenv-heroku-16:
 	@echo
 	@docker run -it --rm python-buildenv-heroku-16
 
+buildenv-heroku-18:
+	@echo "Creating build environment (heroku-18)..."
+	@echo
+	@docker build --pull -f Dockerfile.heroku-18 -t python-buildenv-heroku-18 .
+	@echo
+	@echo "Usage..."
+	@echo
+	@echo "  $$ export AWS_ACCESS_KEY_ID=foo AWS_SECRET_ACCESS_KEY=bar  # Optional unless deploying"
+	@echo "  $$ bob build runtimes/python-2.7.13"
+	@echo "  $$ bob deploy runtimes/python-2.7.13"
+	@echo
+	@docker run -it --rm python-buildenv-heroku-18
+
 tools:
 	git clone https://github.com/kennethreitz/pip-pop.git
 	mv pip-pop/bin/* vendor/pip-pop/

bin/default_pythons

@@ -2,7 +2,7 @@
 
 DEFAULT_PYTHON_VERSION="python-3.6.8"
 LATEST_36="python-3.6.8"
-LATEST_37="python-3.7.2"
+LATEST_37="python-3.7.3"
 LATEST_35="python-3.5.7"
 LATEST_34="python-3.4.10"
 LATEST_27="python-2.7.16"

bin/steps/sqlite3

@@ -6,6 +6,8 @@ source "$BIN_DIR/utils"
 sqlite3_version() {
   if [ "$STACK" = "cedar-14" ]; then
     SQLITE3_VERSION="3.8.2-1ubuntu2.2"
+  elif [ "$STACK" = "heroku-16" ]; then
+    SQLITE3_VERSION="3.11.0-1ubuntu1.2"
   else
     SQLITE3_VERSION=${SQLITE3_VERSION:-$(dpkg -s libsqlite3-0 | grep Version | sed 's/Version: //')}
   fi

builds/README.md

@@ -37,5 +37,11 @@ For Heroku-16 stack
 2. From the root of the buildpack repository, run: `make buildenv-heroku-16`
 3. Follow the instructions displayed!
 
+For Heroku-18 stack
+-------------------
+
+1. Ensure GNU Make and Docker are installed.
+2. From the root of the buildpack repository, run: `make buildenv-heroku-18`
+3. Follow the instructions displayed!
 
 Enjoy :)

builds/runtimes/python-3.5.7

@@ -13,9 +13,9 @@ 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'
+SOURCE_TARBALL='https://python.org/ftp/python/3.5.7/Python-3.5.7.tgz'
 curl -L $SOURCE_TARBALL | tar xz
-mv Python-3.7.2 src
+mv Python-3.5.7 src
 cd src
 
 ./configure --prefix=$OUT_PREFIX --with-ensurepip=no

builds/runtimes/python-3.7.3

@@ -0,0 +1,32 @@
+#!/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

test/run

@@ -2,7 +2,7 @@
 
 # Default Python Versions
 # shellcheck source=bin/default_pythons
-source "$BIN_DIR/default_pythons"
+source "bin/default_pythons"
 
 testAirflow() {
   export SLUGIFY_USES_TEXT_UNIDECODE="yes"
@@ -98,14 +98,19 @@ testPylibmc() {
 }
 
 testPythonDefault() {
+  updateVersion "pythonDefault" $DEFAULT_PYTHON_VERSION
   compile "pythonDefault"
   assertCaptured $DEFAULT_PYTHON_VERSION
+  assertNotCaptured "security update"
   assertCapturedSuccess
 }
 
 testPython2() {
+    updateVersion "python2" $LATEST_27
+    echo $LATEST_27 > "runtime.txt"
     compile "python2"
     assertCaptured $LATEST_27
+    assertNotCaptured "security update"
     assertCapturedSuccess
 }
 
@@ -123,9 +128,13 @@ testPython2_fail() {
 }
 
 testPython3_4() {
-  compile "python3_4"
-  assertCaptured $LATEST_34
-  assertCapturedSuccess
+  if [[ $STACK != "cedar-14" ]]; then
+    updateVersion "python3_4" $LATEST_34
+    compile "python3_4"
+    assertCaptured $LATEST_34
+    assertNotCaptured "security update"
+    assertCapturedSuccess
+  fi
 }
 
 testPython3_4_warn() {
@@ -146,9 +155,13 @@ testPython3_4_fail() {
 }
 
 testPython3_5() {
-  compile "python3_5"
-  assertCaptured $LATEST_35
-  assertCapturedSuccess
+  if [[ $STACK != "cedar-14" ]]; then
+    updateVersion "python3_5" $LATEST_35
+    compile "python3_5"
+    assertCaptured $LATEST_35
+    assertNotCaptured "security update"
+    assertCapturedSuccess
+  fi
 }
 
 testPython3_5_warn() {
@@ -169,8 +182,10 @@ testPython3_5_fail() {
 }
 
 testPython3_6() {
+  updateVersion "python3_6" $LATEST_36
   compile "python3_6"
   assertCaptured $LATEST_36
+  assertNotCaptured "security update"
   assertCapturedSuccess
 }
 
@@ -188,10 +203,12 @@ testPython3_6_fail() {
 }
 
 testPython3_7() {
+  updateVersion "python3_7" $LATEST_37
   compile "python3_7"
   if [[ $STACK = "cedar-14" ]]; then
     assertCapturedError
   else
+    assertNotCaptured "security update"
     assertCaptured $LATEST_37
     assertCapturedSuccess
   fi

test/utils

@@ -71,6 +71,11 @@ release()
   capture ${BUILDPACK_HOME}/bin/release ${BUILD_DIR}
 }
 
+updateVersion()
+{
+  echo "$2" > "test/fixtures/${1}/runtime.txt"
+}
+
 assertCapturedEquals()
 {
   assertEquals "$@" "$(cat ${STD_OUT})"