Merge pull request #173 from imomaliev/master

Support django 2.1, DRF 3.9 and use django-filters > 2.0

Author: auvipy

.travis.yml

@@ -12,8 +12,6 @@ services:
 
 matrix:
   include:
-    - env: TOXENV=py27-django111
-      python: 2.7
     - env: TOXENV=py34-django111
       python: 3.4
     - env: TOXENV=py35-django111
@@ -26,6 +24,34 @@ matrix:
       python: 3.5
     - env: TOXENV=py36-django20
       python: 3.6
+    # https://github.com/travis-ci/travis-ci/issues/9815
+    - env: TOXENV=py37-django20
+      python: 3.7
+      dist: xenial
+      sudo: true
+      addons:
+        postgresql: "9.4"
+        apt:
+            packages:
+            - postgresql-9.4-postgis-2.4
+      services:
+        - postgresql
+    - env: TOXENV=py35-django21
+      python: 3.5
+    - env: TOXENV=py36-django21
+      python: 3.6
+    # https://github.com/travis-ci/travis-ci/issues/9815
+    - env: TOXENV=py37-django21
+      python: 3.7
+      dist: xenial
+      sudo: true
+      addons:
+        postgresql: "9.4"
+        apt:
+            packages:
+            - postgresql-9.4-postgis-2.4
+      services:
+        - postgresql
 
 branches:
   only:

Dockerfile

@@ -0,0 +1,26 @@
+FROM python:3.7-alpine3.8
+
+# postgresql-client is required by psql
+# postgresql-dev musl-dev gcc are required by psycopg
+# NOTE: there is py3-psycopg2
+# gdal-dev geos-dev proj4-dev are required by geodjango
+# NOTE: we actually need gdal-dev not gdal
+
+# TODO: optimize installation by using --virtual
+RUN apk update && apk upgrade \
+    && apk add postgresql-client postgresql-dev musl-dev gcc \
+    && apk add --repository http://dl-cdn.alpinelinux.org/alpine/edge/testing \
+        gdal-dev \
+        geos-dev \
+        proj4-dev
+
+ENV PYTHONUNBUFFERED=1 \
+    PYTHONIOENCODING=UTF-8
+
+WORKDIR /project
+
+RUN pip install django
+
+COPY requirements-test.txt /project/
+
+RUN pip install -r requirements-test.txt

docker-compose.yml

@@ -0,0 +1,27 @@
+version: "3.7"
+
+
+services:
+
+    backend:
+        build:
+            context: .
+            dockerfile: Dockerfile
+        depends_on:
+            - postgres
+        volumes:
+            - root_dir:/root
+            - ./rest_framework_gis:/project/rest_framework_gis
+            - ./tests:/project/tests
+            - ./runtests.py:/project/runtests.py
+        command: ["./runtests.py"]
+
+    postgres:
+        image: mdillon/postgis:10-alpine
+        volumes:
+            - postgres_data:/var/lib/postgresql/data
+
+
+volumes:
+    postgres_data:
+    root_dir:

requirements-test.txt

@@ -1,5 +1,5 @@
 psycopg2
 coverage==3.7.1  # rq.filter: >=3,<4
 coveralls
-django-filter>=0.15,<1.2
+django-filter>=2.0
 contexttimer

requirements.txt

@@ -1 +1 @@
-djangorestframework>=3.3,<3.9
+djangorestframework>=3.3,<3.10

tests/django_restframework_gis_tests/tests.py

@@ -8,6 +8,8 @@
 import json
 import pickle
 
+from unittest import skipIf
+
 from django.test import TestCase
 from django.contrib.gis.geos import GEOSGeometry, Polygon, Point
 try:
@@ -16,12 +18,16 @@
     from django.core.urlresolvers import reverse
 from django.core.exceptions import ImproperlyConfigured
 
+import rest_framework
+
 from rest_framework_gis import serializers as gis_serializers
 from rest_framework_gis.fields import GeoJsonDict
 
 from .models import Location, LocatedFile
 from .serializers import LocationGeoSerializer
 
+is_pre_drf_39 = not rest_framework.VERSION.startswith('3.9')
+
 
 class TestRestFrameworkGis(TestCase):
     def setUp(self):
@@ -472,7 +478,16 @@ def test_post_geojson_location_list_HTML_web_form_WKT(self):
         location = Location.objects.all()[0]
         self.assertEqual(location.name, "HTML test WKT")
 
+    @skipIf(is_pre_drf_39, 'Skip this test if DRF < 3.9')
     def test_geojson_HTML_widget_value(self):
+        self._create_locations()
+        response = self.client.get(self.geojson_location_list_url, HTTP_ACCEPT='text/html')
+        self.assertContains(response, '<textarea name="geometry"')
+        self.assertContains(response, '"type": "Point"')
+        self.assertContains(response, '"coordinates": [')
+
+    @skipIf(not is_pre_drf_39, 'Skip this test if DRF >= 3.9')
+    def test_geojson_HTML_widget_value_pre_drf_39(self):
         self._create_locations()
         response = self.client.get(self.geojson_location_list_url, HTTP_ACCEPT='text/html')
         self.assertContains(response, '<textarea name="geometry"')

tests/django_restframework_gis_tests/views.py

@@ -132,7 +132,7 @@ class GeojsonLocationNoIdDetails(generics.RetrieveUpdateDestroyAPIView):
 
 
 class LocationFilter(GeoFilterSet):
-    contains_properly = GeometryFilter(name='geometry',
+    contains_properly = GeometryFilter(field_name='geometry',
                                        lookup_expr='contains_properly')
 
     class Meta:

tox.ini

@@ -1,7 +1,8 @@
 [tox]
 envlist =
-    py{27,34,35,36,py,py3}-django111{,-pytest}
-    py{34,35,36,py3}-django20{,-pytest}
+    py{34,35,36,py3}-django111{,-pytest}
+    py{34,35,36,37,py3}-django20{,-pytest}
+    py{35,36,37,py3}-django21{,-pytest}
 
 [testenv]
 usedevelop = true
@@ -17,6 +18,7 @@ commands =
 deps =
     django111: Django>=1.11,<2.0
     django20: Django>=2.0,<2.1
+    django21: Django>=2.1,<2.2
     -rrequirements-test.txt
     pytest: pytest
     pytest: pytest-django