From a6510f0f77a86c6dca9d90e2beaa2507d59f65da Mon Sep 17 00:00:00 2001
From: Kevin Brolly <kevin.brolly@gmail.com>
Date: Mon, 21 Oct 2019 15:32:19 +0100
Subject: [PATCH 1/4] Added a deprecation warning when using
 BUILD_WITH_GEO_LIBRARIES or installing pygdal

---
 bin/steps/gdal     | 4 ++++
 bin/steps/geo-libs | 3 +++
 test/run-deps      | 7 +++++++
 3 files changed, 14 insertions(+)

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 bd03fa7..704b5fe 100755
--- a/test/run-deps
+++ b/test/run-deps
@@ -23,6 +23,13 @@ testGEOS() {
   assertCapturedSuccess
 }
 
+testGEOSDeprecation() {
+  export BUILD_WITH_GEO_LIBRARIES=1
+  compile "geos"
+  assertCaptured "The GDAL, GEOS and PROJ binaries and BUILD_WITH_GEO_LIBRARIES functionality are now deprecated."
+  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 <module>`. This is due to

From b7d8aa4d7d2993dc6daebd229c3f5cbe12a25eaf Mon Sep 17 00:00:00 2001
From: Casey Faist <caseylfaist@gmail.com>
Date: Tue, 22 Oct 2019 12:59:18 -0700
Subject: [PATCH 2/4] update changelog

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 2293998..32be70c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,7 @@
 # Master
 
 - Python 2.7.17 now available on Heroku 18 and 16.
+- Deprecation warning: BUILD_WITH_GEO_LIBRARIES is now deprecated. See warning for details.
 
 --------------------------------------------------------------------------------
 # 158 (2019-10-21)

From 5828fbfe7dc0ba9735b3d5bd804d364c229e2bd6 Mon Sep 17 00:00:00 2001
From: Casey Faist <caseylfaist@gmail.com>
Date: Wed, 23 Oct 2019 11:42:01 -0700
Subject: [PATCH 3/4] check for whole deprecation message

---
 test/run-deps | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/test/run-deps b/test/run-deps
index 704b5fe..71c1625 100755
--- a/test/run-deps
+++ b/test/run-deps
@@ -26,7 +26,8 @@ testGEOS() {
 testGEOSDeprecation() {
   export BUILD_WITH_GEO_LIBRARIES=1
   compile "geos"
-  assertCaptured "The GDAL, GEOS and PROJ binaries and BUILD_WITH_GEO_LIBRARIES functionality are now deprecated."
+  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
 }
 

From 0d61f832695fdbcb81ee8faea3ed258186d8ae46 Mon Sep 17 00:00:00 2001
From: Casey Faist <caseylfaist@gmail.com>
Date: Thu, 2 Apr 2020 12:08:11 -0400
Subject: [PATCH 4/4] Update changelog

---
 CHANGELOG.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 5bc4cc0..3a6fe67 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,7 @@
 # Master
 
 - update Code Owners to include the Heroku Buildpack Maintainers team
+- Deprecation warning: BUILD_WITH_GEO_LIBRARIES is now deprecated. See warning for details.
 
 - Add failcase for cache busting
 - Bugfix: Clearing pip dependencies
@@ -41,7 +42,6 @@
 # 159 (2019-10-22)
 
 - Python 2.7.17 now available on Heroku 18 and 16.
-- Deprecation warning: BUILD_WITH_GEO_LIBRARIES is now deprecated. See warning for details.
 
 # 158 (2019-10-21)