Merge remote-tracking branch 'origin/master'

.gitignore

@@ -1,3 +1,5 @@
 *.pyc
 site
 .DS_Store
+
+/.envrc

Makefile

@@ -1,7 +1,7 @@
 # These targets are not files
 .PHONY: tests
 
-test: test-cedar-14
+test: test-heroku-16
 
 test-cedar-14:
 	@echo "Running tests in docker (cedar-14)..."

test/fixtures/geos/requirements.txt

@@ -0,0 +1 @@
+django

test/run

@@ -1,6 +1,5 @@
 #!/usr/bin/env bash
 
-
 testPipenv() {
   compile "pipenv"
   assertCapturedSuccess
@@ -17,6 +16,11 @@ testNoRequirements() {
   assertCapturedError
 }
 
+testGEOS() {
+  BUILD_WITH_GEO_LIBRARIES=1 compile "geos"
+  assertCaptured "geos"
+  assertCapturedSuccess
+}
 
 testNLTK() {
   compile "nltk"
@@ -24,7 +28,6 @@ testNLTK() {
   assertCapturedSuccess
 }
 
-
 testSetupPy() {
   compile "setup-py"
   assertCaptured "maya"