v99

.gitignore

@@ -1,3 +1,2 @@
 *.pyc
 site
-.DS_Store

.travis.yml

@@ -2,8 +2,5 @@ language: bash
 sudo: required
 services:
   - docker
-# install: docker pull heroku/cedar:14
+install: docker pull heroku/cedar:14
-script: ./tests.sh
+script: make test
-env:
-  - STACK=heroku-16
-  - STACK=cedar-14

CHANGELOG.md

@@ -1,9 +1,5 @@
 # Python Buildpack Changelog
 
-## 100
-
-Preliminary pipenv support.
-
 ## 99
 
 Cleanup.

Makefile

@@ -8,11 +8,6 @@ test-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;'
-	@echo ""
-
 tools:
 	git clone https://github.com/kennethreitz/pip-pop.git
 	mv pip-pop/bin/* vendor/pip-pop/

bin/compile

@@ -27,7 +27,10 @@ BUILD_DIR=$1
 CACHE_DIR=$2
 ENV_DIR=$3
 
-# Python defaults
+# Static configurations for virtualenv caches.
+VIRTUALENV_LOC=".heroku/venv"
+LEGACY_TRIGGER="lib/python2.7"
+
 DEFAULT_PYTHON_VERSION="python-2.7.13"
 DEFAULT_PYTHON_STACK="cedar-14"
 PYTHON_EXE="/app/.heroku/python/bin/python"
@@ -39,7 +42,7 @@ export WARNINGS_LOG=$(mktemp)
 export RECOMMENDED_PYTHON_VERSION=$DEFAULT_PYTHON_VERSION
 
 # Setup bpwatch
-export PATH=$PATH:$ROOT_DIR/vendor/:$ROOT_DIR/vendor/bpwatch
+export PATH=$PATH:$ROOT_DIR/vendor/bpwatch
 LOGPLEX_KEY="t.b90d9d29-5388-4908-9737-b4576af1d4ce"
 export BPWATCH_STORE_PATH=$CACHE_DIR/bpwatch.json
 BUILDPACK_VERSION=v28
@@ -104,6 +107,12 @@ bpwatch start pre_compile
   source $BIN_DIR/steps/hooks/pre_compile
 bpwatch stop pre_compile
 
+# If no requirements.txt file given, assume `setup.py develop` is intended.
+if [ ! -f requirements.txt ]; then
+  echo "-e ." > requirements.txt
+fi
+
+
 # Sticky runtimes.
 if [ -f $CACHE_DIR/.heroku/python-version ]; then
   DEFAULT_PYTHON_VERSION=$(cat $CACHE_DIR/.heroku/python-version)
@@ -116,9 +125,6 @@ else
   CACHED_PYTHON_STACK=$STACK
 fi
 
-# Pipenv Python version support.
-source $BIN_DIR/steps/pipenv-python-version
-
 # If no runtime given, assume default version.
 if [ ! -f runtime.txt ]; then
   echo $DEFAULT_PYTHON_VERSION > runtime.txt
@@ -127,6 +133,12 @@ fi
 # Prepare the cache.
 mkdir -p $CACHE_DIR
 
+# Purge "old-style" virtualenvs.
+bpwatch start clear_old_venvs
+  [ -d $CACHE_DIR/$LEGACY_TRIGGER ] && rm -fr $CACHE_DIR/.heroku/bin $CACHE_DIR/.heroku/lib $CACHE_DIR/.heroku/include
+  [ -d $CACHE_DIR/$VIRTUALENV_LOC ] && rm -fr $CACHE_DIR/.heroku/venv $CACHE_DIR/.heroku/src
+bpwatch stop clear_old_venvs
+
 # Restore old artifacts from the cache.
 bpwatch start restore_cache
     mkdir -p .heroku
@@ -135,6 +147,7 @@ bpwatch start restore_cache
     cp -R $CACHE_DIR/.heroku/python-stack .heroku/ &> /dev/null || true
     cp -R $CACHE_DIR/.heroku/python-version .heroku/ &> /dev/null || true
     cp -R $CACHE_DIR/.heroku/vendor .heroku/ &> /dev/null || true
+    cp -R $CACHE_DIR/.heroku/venv .heroku/ &> /dev/null || true
     if [[ -d $CACHE_DIR/.heroku/src ]]; then
       cp -R $CACHE_DIR/.heroku/src .heroku/ &> /dev/null || true
     fi
@@ -149,6 +162,7 @@ if [[ $BUILD_DIR != '/app' ]]; then
     # we will not remove these later so subsequent buildpacks can still invoke it
     ln -nsf $BUILD_DIR/.heroku/python /app/.heroku/python
     ln -nsf $BUILD_DIR/.heroku/vendor /app/.heroku/vendor
+    ln -nsf $BUILD_DIR/.heroku/venv /app/.heroku/venv
     # Note: .heroku/src is copied in later.
 fi
 
@@ -158,16 +172,8 @@ source $BIN_DIR/steps/python
 # Sanity check for setuptools/distribute.
 source $BIN_DIR/steps/setuptools
 
-# Pipenv support.
+# Uninstall removed dependencies with Pip.
-source $BIN_DIR/steps/pipenv
+source $BIN_DIR/steps/pip-uninstall
-
-# If no requirements.txt file given, assume `setup.py develop` is intended.
-if [ ! -f requirements.txt ] && [ ! -f Pipfile ]; then
-  echo "-e ." > requirements.txt
-fi
-
-# Fix egg-links.
-source $BIN_DIR/steps/eggpath-fix
 
 # Mercurial support.
 source $BIN_DIR/steps/mercurial
@@ -187,9 +193,6 @@ source $BIN_DIR/steps/gdal
 # Install dependencies with Pip (where the magic happens).
 source $BIN_DIR/steps/pip-install
 
-# Uninstall removed dependencies with Pip.
-source $BIN_DIR/steps/pip-uninstall
-
 # Support for NLTK corpora.
 sub-env $BIN_DIR/steps/nltk
 
@@ -218,8 +221,15 @@ bpwatch start post_compile
   source $BIN_DIR/steps/hooks/post_compile
 bpwatch stop post_compile
 
-# Fix egg-links, again.
+set +e
-source $BIN_DIR/steps/eggpath-fix2
+# rewrite build dir in egg links to /app so things are found at runtime
+find .heroku/python/lib/python*/site-packages/ -name "*.pth" -print0 2> /dev/null | xargs -r -0 -n 1 sed -i -e "s#$(pwd)#/app#" &> /dev/null
+set -e
+
+set +e
+# Support for PyPy
+find .heroku/python/lib-python/*/site-packages/  -name "*.pth" -print0 2> /dev/null | xargs -r -0 -n 1 sed -i -e "s#$(pwd)#/app#" &> /dev/null
+set -e
 
 # Store new artifacts in cache.
 bpwatch start dump_cache
@@ -228,6 +238,7 @@ bpwatch start dump_cache
   rm -rf $CACHE_DIR/.heroku/python-version
   rm -rf $CACHE_DIR/.heroku/python-stack
   rm -rf $CACHE_DIR/.heroku/vendor
+  rm -rf $CACHE_DIR/.heroku/venv
   rm -rf $CACHE_DIR/.heroku/src
 
   mkdir -p $CACHE_DIR/.heroku
@@ -235,6 +246,7 @@ bpwatch start dump_cache
   cp -R .heroku/python-version $CACHE_DIR/.heroku/
   cp -R .heroku/python-stack $CACHE_DIR/.heroku/ &> /dev/null || true
   cp -R .heroku/vendor $CACHE_DIR/.heroku/ &> /dev/null || true
+  cp -R .heroku/venv $CACHE_DIR/.heroku/ &> /dev/null || true
   if [[ -d .heroku/src ]]; then
     cp -R .heroku/src $CACHE_DIR/.heroku/ &> /dev/null || true
   fi

bin/detect

@@ -15,7 +15,7 @@
 BUILD_DIR=$1
 
 # Exit early if app is clearly not Python.
-if [ ! -f $BUILD_DIR/requirements.txt ] && [ ! -f $BUILD_DIR/setup.py ] && [ ! -f $BUILD_DIR/Pipfile ]; then
+if [ ! -f $BUILD_DIR/requirements.txt ] && [ ! -f $BUILD_DIR/setup.py ]; then
   exit 1
 fi
 

bin/steps/eggpath-fix

@@ -1,11 +0,0 @@
-set +e
-# delete any existing egg links, to uninstall exisisting installations.
-find .heroku/python/lib/python*/site-packages/ -name "*.egg-link" -delete 2> /dev/null
-find .heroku/python/lib/python*/site-packages/ -name "*.pth" -print0 2> /dev/null | xargs -r -0 -n 1 sed -i -e "s#/app/#/$(pwd)/#" &> /dev/null
-set -e
-
-set +e
-# Support for the above, for PyPy.
-find .heroku/python/lib-python/*/site-packages/ -name "*.egg-link" -print0 2> /dev/null | xargs -r -0 -n 1 sed -i -e "s#/app/#$(pwd)/#" &> /dev/null
-find .heroku/python/lib-python/*/site-packages/ -name "*.pth" -print0 2> /dev/null | xargs -r -0 -n 1 sed -i -e "s#/app/#/$(pwd)/#" &> /dev/null
-set -e

bin/steps/eggpath-fix2

@@ -1,9 +0,0 @@
-set +e
-# rewrite build dir in egg links to /app so things are found at runtime
-find .heroku/python/lib/python*/site-packages/ -name "*.pth" -print0 2> /dev/null | xargs -r -0 -n 1 sed -i -e "s#$(pwd)#/app#" &> /dev/null
-set -e
-
-set +e
-# Support for PyPy
-find .heroku/python/lib-python/*/site-packages/  -name "*.pth" -print0 2> /dev/null | xargs -r -0 -n 1 sed -i -e "s#$(pwd)#/app#" &> /dev/null
-set -e

bin/steps/pip-install

@@ -1,5 +1,17 @@
 # Install dependencies with Pip.
-puts-step "Installing requirements with pip"
+puts-cmd "pip install -r requirements.txt"
+
+set +e
+# delete any existing egg links, to uninstall exisisting installations.
+find .heroku/python/lib/python*/site-packages/ -name "*.egg-link" -delete 2> /dev/null
+find .heroku/python/lib/python*/site-packages/ -name "*.pth" -print0 2> /dev/null | xargs -r -0 -n 1 sed -i -e "s#/app/#/$(pwd)/#" &> /dev/null
+set -e
+
+set +e
+# Support for the above, for PyPy.
+find .heroku/python/lib-python/*/site-packages/ -name "*.egg-link" -print0 2> /dev/null | xargs -r -0 -n 1 sed -i -e "s#/app/#$(pwd)/#" &> /dev/null
+find .heroku/python/lib-python/*/site-packages/ -name "*.pth" -print0 2> /dev/null | xargs -r -0 -n 1 sed -i -e "s#/app/#/$(pwd)/#" &> /dev/null
+set -e
 
 [ ! "$FRESH_PYTHON" ] && bpwatch start pip_install
 [ "$FRESH_PYTHON" ] && bpwatch start pip_install_first

bin/steps/pipenv

@@ -1,10 +0,0 @@
-# Pipenv support (Generate requriements.txt with pipenv).
-if [[ -f Pipfile ]]; then
-    if [[ ! -f requirements.txt ]]; then
-        puts-step "Generating 'requirements.txt' with pipenv"
-
-        /app/.heroku/python/bin/pip install pipenv --upgrade &> /dev/null
-
-        /app/.heroku/python/bin/pipenv lock --requirements --no-hashes > $BUILD_DIR/requirements.txt 2> /dev/null
-    fi
-fi

bin/steps/pipenv-python-version

@@ -1,23 +0,0 @@
-# Detect Python-version with Pipenv.
-
-if [[ -f $BUILD_DIR/Pipfile.lock ]]; then
-
-    if [[ ! -f $BUILD_DIR/runtime.txt ]]; then
-        if [[ ! -f $BUILD_DIR/Pipfile.lock ]]; then
-            puts-warn "No 'pipfile.lock' found! We recommend you commit this into your repository."
-        fi
-        if [[ -f $BUILD_DIR/Pipfile.lock ]]; then
-            set +e
-            PYTHON=$(cat $BUILD_DIR/Pipfile.lock | jq '._meta.requires.python_version' -r)
-            set -e
-
-            if [ "$PYTHON" = 2.7 ]; then
-                echo "python-2.7.13" > $BUILD_DIR/runtime.txt
-            fi
-            if [ "$PYTHON" = 3.6 ]; then
-                echo "python-3.6.0" > $BUILD_DIR/runtime.txt
-            fi
-        fi
-    fi
-fi
-

bin/steps/python

@@ -1,5 +1,4 @@
 set +e
-runtime-fixer runtime.txt
 PYTHON_VERSION=$(cat runtime.txt)
 
 # Install Python.
@@ -55,14 +54,23 @@ if [ "$FRESH_PYTHON" ] || [[ ! $(pip --version) == *$PIP_VERSION* ]]; then
   TMPTARDIR=$(mktemp -d)
   trap "rm -rf $TMPTARDIR" RETURN
 
-  puts-step "Installing pip"
+  bpwatch start install_setuptools
+    # Prepare it for the real world
+    # puts-step "Installing Setuptools ($SETUPTOOLS_VERSION)"
+    tar zxf $ROOT_DIR/vendor/setuptools-$SETUPTOOLS_VERSION.tar.gz -C $TMPTARDIR
+    cd $TMPTARDIR/setuptools-$SETUPTOOLS_VERSION/
+    python setup.py install &> /dev/null
+    cd $WORKING_DIR
+  bpwatch stop install_setuptoools
 
-  # Remove old installations.
+  bpwatch start install_pip
-  rm -fr /app/.heroku/python/lib/python2.7/site-packages/pip-*
+    # puts-step "Installing Pip ($PIP_VERSION)"
-  rm -fr /app/.heroku/python/lib/python2.7/site-packages/setuptools-*
+    tar zxf $ROOT_DIR/vendor/pip-$PIP_VERSION.tar.gz -C $TMPTARDIR
-
+    cd $TMPTARDIR/pip-$PIP_VERSION/
-  /app/.heroku/python/bin/python $ROOT_DIR/vendor/get-pip.py &> /dev/null
+    python setup.py install &> /dev/null
+    cd $WORKING_DIR
 
+  bpwatch stop install_pip
   bpwatch stop prepare_environment
 fi
 

builds/libraries/vendor/gdal

@@ -15,7 +15,7 @@ SOURCE_TARBALL='http://download.osgeo.org/gdal/1.11.1/gdal-1.11.1.tar.gz'
 curl -L $SOURCE_TARBALL | tar zx
 
 cd gdal-1.11.1
-./configure --prefix=$OUT_PREFIX --enable-static=no  &&
+./configure --prefix=$OUT_PREFIX  &&
 make
 make install
 

builds/libraries/vendor/geos

@@ -10,12 +10,12 @@ hash -r
 
 echo "Building geos..."
 
-SOURCE_TARBALL='http://download.osgeo.org/geos/geos-3.4.3.tar.bz2'
+SOURCE_TARBALL='http://download.osgeo.org/geos/geos-3.4.2.tar.bz2'
 
 curl -L $SOURCE_TARBALL | tar xj
 
-cd geos-3.4.3
+cd geos-3.4.2
-./configure --prefix=$OUT_PREFIX --enable-static=no &&
+./configure --prefix=$OUT_PREFIX  &&
 make
 make install
 

builds/libraries/vendor/proj

@@ -15,7 +15,7 @@ SOURCE_TARBALL='http://download.osgeo.org/proj/proj-4.8.0.tar.gz'
 curl -L $SOURCE_TARBALL | tar zx
 
 cd proj-4.8.0
-./configure --prefix=$OUT_PREFIX --enable-static=no &&
+./configure --prefix=$OUT_PREFIX  &&
 make
 make install
 

test/fixtures/nltk/nltk.txt

@@ -1 +0,0 @@
-wordnet

test/fixtures/nltk/requirements.txt

@@ -1 +0,0 @@
-nltk

test/fixtures/pipenv-version/Pipfile

@@ -1,9 +0,0 @@
-[[source]]
-url = "https://pypi.python.org/simple"
-verify_ssl = true
-
-[packages]
-requests = "*"
-
-[requires]
-python_version = "3.6"

test/fixtures/pipenv-version/Pipfile.lock

@@ -1,23 +0,0 @@
-{
-    "default": {
-        "requests": {
-            "version": "==2.13.0",
-            "hash": "sha256:1a720e8862a41aa22e339373b526f508ef0c8988baf48b84d3fc891a8e237efb"
-        }
-    },
-    "develop": {},
-    "_meta": {
-        "sources": [
-            {
-                "url": "https://pypi.python.org/simple",
-                "verify_ssl": true
-            }
-        ],
-        "requires": {
-            "python_version": "3.6"
-        },
-        "hash": {
-            "sha256": "5866990104fc8f27d13cdf01abc2a32c553129e03f666316cacc5b42d3e0884e"
-        }
-    }
-}

test/fixtures/pipenv/Pipfile

@@ -1,2 +0,0 @@
-[packages]
-"delegator.py" = "*"

test/run

@@ -1,30 +1,11 @@
 #!/usr/bin/env bash
 
-
-testPipenv() {
-  compile "pipenv"
-  assertCapturedSuccess
-}
-
-testPipenvVersion() {
-  compile "pipenv-version"
-  assertCaptured "3.6.0"
-  assertCapturedSuccess
-}
-
 testNoRequirements() {
   compile "no-requirements"
   assertCapturedError
 }
 
 
-testNLTK() {
-  compile "nltk"
-  assertCaptured "wordnet"
-  assertCapturedSuccess
-}
-
-
 testSetupPy() {
   compile "setup-py"
   assertCaptured "maya"

test/utils

@@ -150,8 +150,6 @@ _assertContains()
 debug()
 {
   cat $STD_OUT
-  echo '^^^^^^'
-  cat $STD_ERR
 }
 
 assertContains()

tests.sh

@@ -1,16 +0,0 @@
-#!/usr/bin/env bash
-
-if [[ ! "$STACK" ]]; then
-    echo '$STACK must be set! (heroku-16 | cedar-14)'
-    exit 1
-fi
-
-if [[ "$STACK" == "cedar-14" ]]; then
-    make test-cedar-14
-    exit $?
-fi
-
-if [[ "$STACK" == "heroku-16" ]]; then
-    make test-heroku-16
-    exit $?
-fi

vendor/runtime-fixer

@@ -1,11 +0,0 @@
-#!/usr/bin/env python
-
-import sys
-
-runtime_file = sys.argv[1]
-
-with open(runtime_file, 'r') as f:
-    r = f.read().strip()
-
-with open(runtime_file, 'w') as f:
-    f.write(r)