Add POSTGIS_VERSION again

.travis.yml

@@ -14,10 +14,10 @@ before_script:
 
 script: tox
 env:
-    - TOXENV=py26 DATABASE_URL="postgis://postgres@/bpzaroundme"
-    - TOXENV=py27 DATABASE_URL="postgis://postgres@/bpzaroundme"
-    - TOXENV=py33 DATABASE_URL="postgis://postgres@/bpzaroundme"
-    - TOXENV=py34 DATABASE_URL="postgis://postgres@/bpzaroundme"
+    - TOXENV=py26 DATABASE_URL="postgis://postgres@/bpzaroundme" POSTGIS_VERSION=2.1.3
+    - TOXENV=py27 DATABASE_URL="postgis://postgres@/bpzaroundme" POSTGIS_VERSION=2.1.3
+    - TOXENV=py33 DATABASE_URL="postgis://postgres@/bpzaroundme" POSTGIS_VERSION=2.1.3
+    - TOXENV=py34 DATABASE_URL="postgis://postgres@/bpzaroundme" POSTGIS_VERSION=2.1.3
     - TOXENV=style
     - TOXENV=docs
 

bpzaroundme/settings/base.py

@@ -1,3 +1,4 @@
+from os import environ
 from os.path import abspath, basename, dirname, join, normpath
 from sys import path
 import dj_database_url
@@ -163,3 +164,8 @@
 
 # Use django-nose to run tests
 TEST_RUNNER = 'django_nose.NoseTestSuiteRunner'
+
+# Set POSTGIS_VERSION from environment
+if environ.get('POSTGIS_VERSION'):
+    raw_postgis_version = environ['POSTGIS_VERSION']
+    POSTGIS_VERSION = tuple(int(x) for x in raw_postgis_version.split('.'))

run_tests.py

@@ -2,14 +2,15 @@
 from __future__ import print_function
 
 import sys
+from os import environ
 
 from django.conf import settings
 import dj_database_url
 
 
 def base_config():
     '''Create a minimal Django configuration'''
-    return {
+    config = {
         'INSTALLED_APPS': ['south', 'django_nose', 'bpz'],
         'TEST_RUNNER': 'django_nose.NoseTestSuiteRunner',
         'DATABASES': {
@@ -20,6 +21,13 @@ def base_config():
         'TEMPLATE_DEBUG': True
     }
 
+    if environ.get('POSTGIS_VERSION'):
+        raw_postgis_version = environ['POSTGIS_VERSION']
+        config['POSTGIS_VERSION'] = tuple(
+            int(x) for x in raw_postgis_version.split('.'))
+
+    return config
+
 
 def test_config():
     '''Create a Django configuration for running tests'''