Merge pull request #930 from heroku/kgrinberg/master

Fix old Django version detection

CHANGELOG.md

@@ -7,6 +7,7 @@
 - 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
+- Django version detection fixed, link updated
 
 --------------------------------------------------------------------------------
 

bin/steps/pip-install

@@ -38,10 +38,10 @@ if [ ! "$SKIP_PIP_INSTALL" ]; then
         mcount "failure.none-version"
     fi
 
-    if grep -q 'django==1.*' requirements.txt; then
+    if grep -qi '^django==1.*' requirements.txt; then
         puts-warn "Your Django version is nearing the end of its community support."
         puts-warn "Upgrade to continue to receive security updates and for the best experience with Django."
-        puts-warn "For more information, check out https://www.djangoproject.com/weblog/2015/jun/25/roadmap/"
+        puts-warn "For more information, check out https://www.djangoproject.com/download/#supported-versions"
     fi
 
     if [ ! -f "$BUILD_DIR/.heroku/python/bin/pip" ]; then

test/fixtures/not-old-django/requirements.txt

@@ -0,0 +1,2 @@
+pwned-passwords-django==1.4
+Django==2.1

test/fixtures/old-django/requirements.txt

@@ -0,0 +1 @@
+Django==1.11

test/run-features

@@ -74,6 +74,18 @@ testNoRequirements() {
   assertCapturedError
 }
 
+testWarnOldDjango() {
+  compile "old-django"
+  assertCaptured "Your Django version is nearing the end of its community support."
+  assertCapturedSuccess
+}
+
+testDontWarnOldDjango() {
+  compile "not-old-django"
+  assertNotCaptured "Your Django version is nearing the end of its community support."
+  assertCapturedSuccess
+}
+
 pushd $(dirname 0) >/dev/null
 popd >/dev/null