changelog

Signed-off-by: Kenneth Reitz <me@kennethreitz.org>
Pipenv improvements (#474 )
2026-06-05 23:10:16 +00:00 · 2017-09-24 23:20:01 -04:00 · 2017-09-24 23:18:22 -04:00 · 2017-09-08 12:36:53 -04:00 · 2017-09-08 12:28:05 -04:00 · 2017-09-08 12:20:14 -04:00
6 changed files with 32 additions and 11 deletions
@@ -1,5 +1,13 @@
 # Python Buildpack Changelog

+# 118
+
+Improvements to Pipenv support.
+
+# 117
+
+Bug fix.
+
 # 116

 Vendoring improvements.
@@ -30,7 +30,12 @@ if [[ "$BUILD_WITH_GEO_LIBRARIES" ]]; then
    curl "$VENDORED_GDAL" -s | tar zxv -C .heroku/vendor &> /dev/null
    curl "$VENDORED_GEOS" -s | tar zxv -C .heroku/vendor &> /dev/null
    curl "$VENDORED_PROJ" -s | tar zxv -C .heroku/vendor &> /dev/null
-    cp /usr/lib/x86_64-linux-gnu/libjasper.so* ".heroku/vendor/lib/."
+
+    # Copy libjasper from build image to slug.
+    if [[ "$STACK" == "heroku-16" ]]; then
+      cp /usr/lib/x86_64-linux-gnu/libjasper.so* ".heroku/vendor/lib/."
+    fi
+
  fi

  GDAL=$(pwd)/vendor
@@ -3,13 +3,18 @@
 # Pipenv support (Generate requriements.txt with pipenv).
 if [[ -f Pipfile ]]; then
    if [[ ! -f requirements.txt ]]; then
-        puts-step "Installing requirements with latest pipenv..."
+        puts-step "Installing requirements with latest Pipenv..."

        # Install pipenv.
        /app/.heroku/python/bin/pip install pipenv --upgrade &> /dev/null

+        if [[ ! -f Pipfile.lock ]]; then
+            /app/.heroku/python/bin/pipenv install --system --skip-lock 2>&1 | indent
+        else
+            /app/.heroku/python/bin/pipenv install --system 2>&1 | indent
+        fi
        # Install the dependencies.
-        /app/.heroku/python/bin/pipenv install --system --skip-lock 2>&1 | indent
+

        # Skip pip install, later.
        export SKIP_PIP_INSTALL=1
@@ -10,7 +10,7 @@ hash -r

 echo "Building gdal..."

-VERSION="1.11.5"
+VERSION="2.2.1"
 SOURCE_TARBALL="http://download.osgeo.org/gdal/${VERSION}/gdal-${VERSION}.tar.gz"

 curl -L $SOURCE_TARBALL | tar zx
@@ -10,14 +10,16 @@ hash -r

 echo "Building geos..."

-SOURCE_TARBALL='http://download.osgeo.org/geos/geos-3.4.3.tar.bz2'
+VERSION=3.6.2
+
+SOURCE_TARBALL="http://download.osgeo.org/geos/geos-${VERSION}.tar.bz2"

 curl -L $SOURCE_TARBALL | tar xj

-cd geos-3.4.3
+pushd "geos-${VERSION}"
 ./configure --prefix=$OUT_PREFIX --enable-static=no &&
 make
 make install

 # Cleanup
-cd ..
+popd
@@ -10,14 +10,15 @@ hash -r

 echo "Building gdal..."

-SOURCE_TARBALL='http://download.osgeo.org/proj/proj-4.8.0.tar.gz'
+VERSION=4.9.3
+SOURCE_TARBALL="http://download.osgeo.org/proj/proj-${VERSION}.tar.gz"

 curl -L $SOURCE_TARBALL | tar zx

-cd proj-4.8.0
-./configure --prefix=$OUT_PREFIX --enable-static=no &&
+pushd "proj-${VERSION}"
+./configure --prefix=$OUT_PREFIX --enable-static=no
 make
 make install

 # Cleanup
-cd ..
+popd
Author	SHA1	Message	Date
kennethreitz	29775c020a	changelog Signed-off-by: Kenneth Reitz <me@kennethreitz.org>	2017-09-24 23:20:01 -04:00
kennethreitz	50950c59df	Pipenv improvements (#474 ) * improvements to pipenv Signed-off-by: Kenneth Reitz <me@kennethreitz.org> * capitalize Signed-off-by: Kenneth Reitz <me@kennethreitz.org>	2017-09-24 23:18:22 -04:00
Johannes Hoppe	9817eb149e	Update gdal to version 2.2.1 (#452 )	2017-09-08 12:36:53 -04:00
Johannes Hoppe	a703d2febe	Update proj.4 to version 4.9.3 (#451 )	2017-09-08 12:28:05 -04:00
Johannes Hoppe	e304405410	Update geos to version 3.6.2 (#450 )	2017-09-08 12:20:14 -04:00
kennethreitz	17f992a106	Improvements (#471 ) * only do this on heroku-16 * history Signed-off-by: Kenneth Reitz <me@kennethreitz.org> * code comment Signed-off-by: Kenneth Reitz <me@kennethreitz.org>	2017-09-08 12:02:03 -04:00