diff --git a/CHANGELOG.md b/CHANGELOG.md index 0702658..1f9b818 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,7 @@ - Doc: Update Readme with version numbers - update Code Owners to include the Heroku Buildpack Maintainers team +- Deprecation warning: BUILD_WITH_GEO_LIBRARIES is now deprecated. See warning for details. - Clean up build log output - Update Python versions in README to match docs diff --git a/bin/steps/gdal b/bin/steps/gdal index 03cf81f..666c025 100755 --- a/bin/steps/gdal +++ b/bin/steps/gdal @@ -22,6 +22,10 @@ source "$BIN_DIR/utils" if (pip-grep -s requirements.txt GDAL gdal pygdal &> /dev/null) then if [ ! -f ".heroku/vendor/bin/gdalserver" ]; then + + puts-warn "The vendored GDAL package in the Heroku Python Buildpack now deprecated." + puts-warn "To enable GDAL use an alternative buildpack is available here - https://github.com/heroku/heroku-geo-buildpack" + echo "-----> Noticed GDAL. Bootstrapping gdal." mkdir -p .heroku/vendor # Download and extract cryptography into target vendor directory. diff --git a/bin/steps/geo-libs b/bin/steps/geo-libs index ae47dd2..f112628 100755 --- a/bin/steps/geo-libs +++ b/bin/steps/geo-libs @@ -24,6 +24,9 @@ source "$BIN_DIR/utils" if [[ "$BUILD_WITH_GEO_LIBRARIES" ]]; then mcount "buildvar.BUILD_WITH_GEO_LIBRARIES" + puts-warn "The GDAL, GEOS and PROJ binaries and BUILD_WITH_GEO_LIBRARIES functonality are now deprecated." + puts-warn "An alternative buildpack to enable GDAL, GEOS and PROJ use is available here - https://github.com/heroku/heroku-geo-buildpack" + if [ ! -f ".heroku/vendor/bin/proj" ]; then echo "-----> Bootstrapping gdal, geos, proj." mkdir -p .heroku/vendor diff --git a/test/run-deps b/test/run-deps index 29d7f8f..f40c304 100755 --- a/test/run-deps +++ b/test/run-deps @@ -23,6 +23,14 @@ testGEOS() { assertCapturedSuccess } +testGEOSDeprecation() { + export BUILD_WITH_GEO_LIBRARIES=1 + compile "geos" + assertCaptured " ! The GDAL, GEOS and PROJ binaries and BUILD_WITH_GEO_LIBRARIES functonality are now deprecated. + ! An alternative buildpack to enable GDAL, GEOS and PROJ use is available here - https://github.com/heroku/heroku-geo-buildpack" + assertCapturedSuccess +} + testNLTK() { # NOTE: This is a RuntimeWarning emitted by Python 3's runpy.py script # which is what is used when you call `python -m `. This is due to