Compare commits

...

59 Commits

Author SHA1 Message Date
kennethreitz 65648fb7a8 fix tests 2017-03-16 12:44:36 -04:00
kennethreitz 45b0d18532 fix tests further 2017-03-16 12:29:07 -04:00
kennethreitz 8f258ae0b8 remove pipstrip 2017-03-16 12:16:59 -04:00
kennethreitz b80f7a953f fix tests 2017-03-16 12:13:00 -04:00
kennethreitz f27a84e015 change the step order 2017-03-16 00:02:33 -04:00
kennethreitz 5794bacbbf cleanup 2017-03-16 00:00:55 -04:00
kennethreitz e29b60dcfd cleanups 2017-03-15 23:59:52 -04:00
kennethreitz 7c95b156ce fix syntax error 2017-03-15 23:59:21 -04:00
kennethreitz e05346e8c1 fixes to buildpack 2017-03-15 23:58:47 -04:00
kennethreitz 9deea01360 fix 2017-03-15 23:57:24 -04:00
kennethreitz c19f0f83ee fix build 2017-03-15 23:54:59 -04:00
kennethreitz 8b88d655c4 remove venv support 2017-03-15 16:48:05 -04:00
kennethreitz 0e8c0077ff remove legacy behavior 2017-03-15 16:47:24 -04:00
kennethreitz cfda557b31 updated makefile 2017-03-14 13:40:01 -04:00
kennethreitz 44c2b75b8d fix runtime-fixer 2017-03-14 13:36:29 -04:00
kennethreitz c3849fb6d3 improvements 2017-03-14 13:36:14 -04:00
kennethreitz 5608ed9f3c fix build 2017-03-14 13:21:40 -04:00
kennethreitz e9108858fc v100 2017-03-14 11:59:39 -04:00
kennethreitz c85f5d015c no debug 2017-03-14 11:43:40 -04:00
kennethreitz 321543d4ae debug 2017-03-14 11:42:02 -04:00
kennethreitz 8bd209de13 further fix test 2017-03-14 11:28:50 -04:00
kennethreitz 58e9c84347 fix tests 2017-03-14 11:27:18 -04:00
kennethreitz dcfff15151 cleanups 2017-03-14 11:23:28 -04:00
kennethreitz 9426dc8668 fix test 2017-03-14 10:54:38 -04:00
kennethreitz cdbeb6419e 2.7.11 2017-03-14 10:50:55 -04:00
kennethreitz 858113cf76 tests for newlines 2017-03-14 10:49:49 -04:00
kennethreitz a547da0b52 oops 2017-03-14 10:47:26 -04:00
kennethreitz df52fd46e5 whitespace stripper for runtime.txt 2017-03-14 10:45:59 -04:00
kennethreitz 2e37a96984 more cleanups 2017-03-14 10:00:59 -04:00
kennethreitz 12c3b8cb1d remove legacy code 2017-03-14 09:59:53 -04:00
kennethreitz 0fadebf7d8 more tests 2017-03-10 12:37:11 -05:00
kennethreitz 33ccaa9e45 bash not sh 2017-03-10 12:00:44 -05:00
kennethreitz 6b5ec50ab9 new travis matrix 2017-03-10 11:58:38 -05:00
kennethreitz 63810f29d3 passing tests 2017-03-10 11:43:11 -05:00
kennethreitz 0de749a6a2 updated tests 2017-03-10 11:22:07 -05:00
kennethreitz 2df1131d3c remove bpwatch 2017-03-10 11:21:57 -05:00
kennethreitz af0795264b heroku-16 2017-03-10 11:21:47 -05:00
kennethreitz 327daa5f32 no need for SETUPTOOLS_VERSION anymore 2017-03-08 16:58:39 -05:00
kennethreitz 09b7e44841 fix tests 2017-03-08 16:57:33 -05:00
kennethreitz e26a0f04d9 improvements 2017-03-08 09:01:24 -05:00
kennethreitz c92f379f78 improve 2017-03-08 08:58:07 -05:00
kennethreitz 893bdec066 updated setuptools 2017-03-08 08:44:32 -05:00
kennethreitz 607dcfda07 no pipenv test (for now) 2017-03-08 08:31:09 -05:00
kennethreitz 26a0b9678f no version checking yet 2017-03-07 12:09:09 -05:00
Kenneth Reitz e58e5d2b74 more tests 2017-03-07 11:58:53 -05:00
Kenneth Reitz 6faa5a4efc Merge remote-tracking branch 'origin/master' 2017-03-07 11:39:35 -05:00
kennethreitz 2881d65e4e Update pipenv 2017-03-03 09:27:42 -08:00
kennethreitz 1696e7cee6 v100! 2017-03-02 22:13:35 -08:00
kennethreitz 35b89386ed Squashed commit of the following:
commit 1b6199c182a8cf453247ae2a19b7f1db71664dda
Author: Kenneth Reitz <me@kennethreitz.org>
Date:   Thu Mar 2 22:10:46 2017 -0800

    remove toml.py

commit e9215a30f111008b97ac50584a077b77585fda4a
Author: Kenneth Reitz <me@kennethreitz.org>
Date:   Thu Mar 2 21:58:59 2017 -0800

    fuck

commit d1f40a51aa01a7f2771cbac32543e9df021939a1
Author: Kenneth Reitz <me@kennethreitz.org>
Date:   Thu Mar 2 21:58:06 2017 -0800

    frost mirror

commit 0f1ec08f8fd88d9b7ebe5b17ad3cf75a7e2859dd
Author: Kenneth Reitz <me@kennethreitz.org>
Date:   Thu Mar 2 21:45:40 2017 -0800

    hmmmm

commit 9e2e857371029f3e9569a6cbfb71e5162a991339
Author: Kenneth Reitz <me@kennethreitz.org>
Date:   Thu Mar 2 21:44:30 2017 -0800

    hmmm

commit 892ba8bfcda54db993a10546970ccfe17c3fe51d
Author: Kenneth Reitz <me@kennethreitz.org>
Date:   Thu Mar 2 21:37:46 2017 -0800

    that

commit 61f80e7f5e380e8d6237adc1589a075f2974139b
Author: Kenneth Reitz <me@kennethreitz.org>
Date:   Thu Mar 2 21:36:41 2017 -0800

    this

commit 18a6f91ef5ff4410de43c562fffee99a0fb45da0
Author: Kenneth Reitz <me@kennethreitz.org>
Date:   Thu Mar 2 21:35:32 2017 -0800

    this

commit 163acc77e59cd34ec09a0d9836bbc20448e857ad
Author: Kenneth Reitz <me@kennethreitz.org>
Date:   Thu Mar 2 21:31:53 2017 -0800

    this

commit 4af63049cd1f6ced6daf1da43b15ef98ade84497
Author: Kenneth Reitz <me@kennethreitz.org>
Date:   Thu Mar 2 21:30:52 2017 -0800

    this

commit 43bde00a088a3a5b0db3d6361b24a679e5690e8e
Author: Kenneth Reitz <me@kennethreitz.org>
Date:   Thu Mar 2 14:59:04 2017 -0800

    olive garden

commit 24305ba1b2938f3d373d0c8d158c2137eb709c82
Author: Kenneth Reitz <me@kennethreitz.org>
Date:   Thu Mar 2 14:57:52 2017 -0800

    change

commit dff928b2299679ebdee08f4e82b8815b7cbbf419
Author: Kenneth Reitz <me@kennethreitz.org>
Date:   Wed Mar 1 19:55:22 2017 -0800

    hmmm

commit e3bc14ff9085c2a0e5939693bc71930c4e299f27
Author: Kenneth Reitz <me@kennethreitz.org>
Date:   Wed Mar 1 19:45:29 2017 -0800

    pipstrip

commit 8dd06e437bb8b519d434805aa923adfd20fb0086
Author: Kenneth Reitz <me@kennethreitz.org>
Date:   Wed Mar 1 19:37:43 2017 -0800

    changes

commit 3abaaa9b9fb9b3fdd3cbd9dc2ade25f282555a65
Author: Kenneth Reitz <me@kennethreitz.org>
Date:   Wed Mar 1 19:33:59 2017 -0800

    changes

commit 61aeea92418f934ac79e189cde69bcb9e74413fe
Author: Kenneth Reitz <me@kennethreitz.org>
Date:   Wed Mar 1 19:28:15 2017 -0800

    changes

commit 9219f38ac9f56c55e0030f55dbfdd5f55ae050de
Author: Kenneth Reitz <me@kennethreitz.org>
Date:   Wed Mar 1 19:27:37 2017 -0800

    changes

commit 390f40102b946a17f58697db42edc3d6d06f6581
Author: Kenneth Reitz <me@kennethreitz.org>
Date:   Wed Mar 1 19:26:31 2017 -0800

    changes

commit bdb0710e4554764f66a753c28f260af564ef6d6a
Author: Kenneth Reitz <me@kennethreitz.org>
Date:   Wed Mar 1 19:25:24 2017 -0800

    changes

commit 3af273e7ed56a5fdec6f5986f27b4ca5312861e1
Author: Kenneth Reitz <me@kennethreitz.org>
Date:   Wed Mar 1 19:24:15 2017 -0800

    changes

commit 250632c245bcba9bb331e6ad7b6d1afd5ddc34c5
Author: Kenneth Reitz <me@kennethreitz.org>
Date:   Wed Mar 1 19:23:06 2017 -0800

    changes

commit 5c9a637a75aaf20087e80114607cc15f00b39ff3
Author: Kenneth Reitz <me@kennethreitz.org>
Date:   Wed Mar 1 19:16:47 2017 -0800

    toml.py

commit f672922a7bc09e9d7a2c559bb6be1e718703c459
Author: Kenneth Reitz <me@kennethreitz.org>
Date:   Wed Mar 1 19:15:26 2017 -0800

    vendor dir

commit 67d44200454510c3a625257909f7e708778359ec
Author: Kenneth Reitz <me@kennethreitz.org>
Date:   Wed Mar 1 19:14:45 2017 -0800

    change

commit 12dc70d7d91ce57944e221591cf3bf3bef0e0a0c
Author: Kenneth Reitz <me@kennethreitz.org>
Date:   Wed Mar 1 19:12:57 2017 -0800

    changes

commit 25673345579e8f1d7394b9ba60682f97be63273b
Author: Kenneth Reitz <me@kennethreitz.org>
Date:   Wed Mar 1 19:12:28 2017 -0800

    this

commit a4a5a6d006197158a511677d3aae25183531ff3e
Author: Kenneth Reitz <me@kennethreitz.org>
Date:   Wed Mar 1 19:07:19 2017 -0800

    changes

commit 49c2c9ab901aaa4cd9c8c168f5b388b032708e51
Author: Kenneth Reitz <me@kennethreitz.org>
Date:   Wed Mar 1 19:05:03 2017 -0800

    changes

commit 2d3223d95968408889d79f722df7628b9e4533c8
Author: Kenneth Reitz <me@kennethreitz.org>
Date:   Wed Mar 1 19:04:24 2017 -0800

    changes

commit 6334b0f62afcbb3bc91bb706d30e6dd9aadfe447
Author: Kenneth Reitz <me@kennethreitz.org>
Date:   Wed Mar 1 19:02:35 2017 -0800

    detect python version

commit df606fa0aeed0754e659cce41fa28a88c471c756
Author: Kenneth Reitz <me@kennethreitz.org>
Date:   Wed Mar 1 18:56:08 2017 -0800

    hide stderr

commit 7ac261f62ee6c38e709a1560baadc181494b97db
Author: Kenneth Reitz <me@kennethreitz.org>
Date:   Wed Mar 1 18:53:37 2017 -0800

    update

commit f8530d252c2b386fb9f65a991d94380d3eccfdfd
Author: Kenneth Reitz <me@kennethreitz.org>
Date:   Wed Mar 1 18:51:46 2017 -0800

    lock

commit 7a1e10034a591890aa16c6e34ba5cb3d6b90a7b7
Author: Kenneth Reitz <me@kennethreitz.org>
Date:   Wed Mar 1 18:50:53 2017 -0800

    just generate requriements file

commit d78630ff858394cbae8397e1d060a3cc2437943f
Merge: 766b0c6 66f5a66
Author: Kenneth Reitz <me@kennethreitz.org>
Date:   Wed Mar 1 18:49:04 2017 -0800

    Merge branch 'master' into pipenv

commit 766b0c66e742790dc45df73e021302cf18601947
Author: Kenneth Reitz <me@kennethreitz.org>
Date:   Wed Mar 1 18:47:42 2017 -0800

    semicolon wrong

commit a9017bce79a4075ed1682041ca19c54092be71bb
Author: Kenneth Reitz <me@kennethreitz.org>
Date:   Wed Mar 1 18:41:54 2017 -0800

    run pipenv

commit 651c3aa90e45aa9f7509b127e4a21110907974cf
Author: Kenneth Reitz <me@kennethreitz.org>
Date:   Wed Mar 1 18:41:45 2017 -0800

    detect on pipfile

commit 6d9f553e24b82e756dd4c02063da035025144c9b
Author: Kenneth Reitz <me@kennethreitz.org>
Date:   Wed Mar 1 18:41:37 2017 -0800

    pipenv step

commit 51c6ef3060ac707bcb0361ccbbcfca50035a4360
Author: Kenneth Reitz <me@kennethreitz.org>
Date:   Wed Mar 1 18:41:26 2017 -0800

    new vendors
2017-03-02 22:11:03 -08:00
kennethreitz 3634eb1dbf Merge branch 'master' of https://git.heroku.com/python-builder-cedar-14 2017-02-23 11:18:14 -05:00
kennethreitz 66f5a66740 update geos to geos 3.4.3 2017-02-23 11:15:39 -05:00
kennethreitz 6e2a504fc1 v99 2017-02-23 11:14:47 -05:00
kennethreitz 124aff5ea6 cleanup 2017-02-23 11:14:47 -05:00
Denis Cornehl c44ab4cd03 Don't compile static versions of geo-libraries (#339)
python uses dynamic linking, and the static libraries use 200 MB of disk
space in the dynos.
2017-02-23 11:14:31 -05:00
kennethreitz 677dfeec11 cleanup 2017-02-15 13:49:59 -05:00
kennethreitz d1ab87748b ln -s 2016-12-23 23:05:46 -05:00
kennethreitz 6844d1252d further debug 2016-12-23 22:55:41 -05:00
kennethreitz 1346c29089 debug 2016-12-23 22:54:42 -05:00
kennethreitz 3bc1b5e697 say when installing pip or setuptools 2016-12-23 22:53:23 -05:00
30 changed files with 20251 additions and 73 deletions
+1
View File
@@ -1,2 +1,3 @@
*.pyc
site
.DS_Store
+5 -2
View File
@@ -2,5 +2,8 @@ language: bash
sudo: required
services:
- docker
install: docker pull heroku/cedar:14
script: make test
# install: docker pull heroku/cedar:14
script: ./tests.sh
env:
- STACK=heroku-16
- STACK=cedar-14
+8
View File
@@ -1,5 +1,13 @@
# Python Buildpack Changelog
## 100
Preliminary pipenv support.
## 99
Cleanup.
## 98
Official NLTK support and other improvements.
+5
View File
@@ -8,6 +8,11 @@ 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/
+20 -32
View File
@@ -27,10 +27,7 @@ BUILD_DIR=$1
CACHE_DIR=$2
ENV_DIR=$3
# Static configurations for virtualenv caches.
VIRTUALENV_LOC=".heroku/venv"
LEGACY_TRIGGER="lib/python2.7"
# Python defaults
DEFAULT_PYTHON_VERSION="python-2.7.13"
DEFAULT_PYTHON_STACK="cedar-14"
PYTHON_EXE="/app/.heroku/python/bin/python"
@@ -42,7 +39,7 @@ export WARNINGS_LOG=$(mktemp)
export RECOMMENDED_PYTHON_VERSION=$DEFAULT_PYTHON_VERSION
# Setup bpwatch
export PATH=$PATH:$ROOT_DIR/vendor/bpwatch
export PATH=$PATH:$ROOT_DIR/vendor/:$ROOT_DIR/vendor/bpwatch
LOGPLEX_KEY="t.b90d9d29-5388-4908-9737-b4576af1d4ce"
export BPWATCH_STORE_PATH=$CACHE_DIR/bpwatch.json
BUILDPACK_VERSION=v28
@@ -107,12 +104,6 @@ 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)
@@ -125,6 +116,9 @@ 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
@@ -133,12 +127,6 @@ 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
@@ -147,7 +135,6 @@ 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
@@ -162,7 +149,6 @@ 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
@@ -172,8 +158,16 @@ source $BIN_DIR/steps/python
# Sanity check for setuptools/distribute.
source $BIN_DIR/steps/setuptools
# Uninstall removed dependencies with Pip.
source $BIN_DIR/steps/pip-uninstall
# Pipenv support.
source $BIN_DIR/steps/pipenv
# 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
@@ -193,6 +187,9 @@ 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
@@ -221,15 +218,8 @@ bpwatch start post_compile
source $BIN_DIR/steps/hooks/post_compile
bpwatch stop post_compile
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
# Fix egg-links, again.
source $BIN_DIR/steps/eggpath-fix2
# Store new artifacts in cache.
bpwatch start dump_cache
@@ -238,7 +228,6 @@ 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
@@ -246,7 +235,6 @@ 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
+1 -1
View File
@@ -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 ]; then
if [ ! -f $BUILD_DIR/requirements.txt ] && [ ! -f $BUILD_DIR/setup.py ] && [ ! -f $BUILD_DIR/Pipfile ]; then
exit 1
fi
+11
View File
@@ -0,0 +1,11 @@
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
+9
View File
@@ -0,0 +1,9 @@
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
-5
View File
@@ -14,9 +14,6 @@ source $BIN_DIR/utils
bpwatch start nltk_download
export NLTK_DATA_DIR="$BUILD_DIR/nltk_data"
export NLTK_DATA="$BUILD_DIR/nltk_data"
# Check that nltk was installed by pip, otherwise obviously not needed
python -m nltk.downloader -h >/dev/null 2>&1
if [ $? -eq 0 ]; then
@@ -30,8 +27,6 @@ if [ $? -eq 0 ]; then
else
puts-warn "nltk.txt not found, not downloading any corpora"
fi
else
puts-warn "nltk not apparently installed, not downloading packages"
fi
+1 -13
View File
@@ -1,17 +1,5 @@
# Install dependencies 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
puts-step "Installing requirements with pip"
[ ! "$FRESH_PYTHON" ] && bpwatch start pip_install
[ "$FRESH_PYTHON" ] && bpwatch start pip_install_first
+10
View File
@@ -0,0 +1,10 @@
# 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
+23
View File
@@ -0,0 +1,23 @@
# 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
+7 -15
View File
@@ -1,4 +1,5 @@
set +e
runtime-fixer runtime.txt
PYTHON_VERSION=$(cat runtime.txt)
# Install Python.
@@ -54,23 +55,14 @@ if [ "$FRESH_PYTHON" ] || [[ ! $(pip --version) == *$PIP_VERSION* ]]; then
TMPTARDIR=$(mktemp -d)
trap "rm -rf $TMPTARDIR" RETURN
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
puts-step "Installing pip"
bpwatch start install_pip
# puts-step "Installing Pip ($PIP_VERSION)"
tar zxf $ROOT_DIR/vendor/pip-$PIP_VERSION.tar.gz -C $TMPTARDIR
cd $TMPTARDIR/pip-$PIP_VERSION/
python setup.py install &> /dev/null
cd $WORKING_DIR
# Remove old installations.
rm -fr /app/.heroku/python/lib/python2.7/site-packages/pip-*
rm -fr /app/.heroku/python/lib/python2.7/site-packages/setuptools-*
/app/.heroku/python/bin/python $ROOT_DIR/vendor/get-pip.py &> /dev/null
bpwatch stop install_pip
bpwatch stop prepare_environment
fi
+1 -1
View File
@@ -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 &&
./configure --prefix=$OUT_PREFIX --enable-static=no &&
make
make install
+3 -3
View File
@@ -10,12 +10,12 @@ hash -r
echo "Building geos..."
SOURCE_TARBALL='http://download.osgeo.org/geos/geos-3.4.2.tar.bz2'
SOURCE_TARBALL='http://download.osgeo.org/geos/geos-3.4.3.tar.bz2'
curl -L $SOURCE_TARBALL | tar xj
cd geos-3.4.2
./configure --prefix=$OUT_PREFIX &&
cd geos-3.4.3
./configure --prefix=$OUT_PREFIX --enable-static=no &&
make
make install
+1 -1
View File
@@ -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 &&
./configure --prefix=$OUT_PREFIX --enable-static=no &&
make
make install
+1
View File
@@ -0,0 +1 @@
wordnet
+1
View File
@@ -0,0 +1 @@
nltk
View File
View File
+9
View File
@@ -0,0 +1,9 @@
[[source]]
url = "https://pypi.python.org/simple"
verify_ssl = true
[packages]
requests = "*"
[requires]
python_version = "3.6"
+23
View File
@@ -0,0 +1,23 @@
{
"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"
}
}
}
+2
View File
@@ -0,0 +1,2 @@
[packages]
"delegator.py" = "*"
+19
View File
@@ -1,11 +1,30 @@
#!/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"
+2
View File
@@ -150,6 +150,8 @@ _assertContains()
debug()
{
cat $STD_OUT
echo '^^^^^^'
cat $STD_ERR
}
assertContains()
Executable
+16
View File
@@ -0,0 +1,16 @@
#!/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
+20061
View File
File diff suppressed because it is too large Load Diff
Vendored Executable
BIN
View File
Binary file not shown.
BIN
View File
Binary file not shown.
Vendored Executable
+11
View File
@@ -0,0 +1,11 @@
#!/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)