Support Django version 2.2 and 3.0

.travis.yml

@@ -1,21 +1,29 @@
 sudo: required
-dist: trusty
+dist: xenial
 language: python
 matrix:
     include:
         - python: 3.6
-          env: TOXENV=py36
+          env: TOXENV=py36-django22
+        - python: 3.6
+          env: TOXENV=py36-django30
         - python: 3.6
           env: TOXENV=flake8
         - python: 3.6
           env: TOXENV=pylint
+        - python: 3.6
+          env: TOXENV=black
 services:
     - postgresql
 addons:
     postgresql: "9.6"
     apt:
         packages:
-            - postgresql-9.6-postgis-2.3
+            - postgresql-9.6-postgis-2.4
+            - gdal-bin
+            - libgdal-dev
+        sources:
+            - sourceline: 'ppa:ubuntugis/ubuntugis-unstable'
 before_script:
     - psql -c 'CREATE DATABASE ona_tasking;' -U postgres
     - psql -c 'CREATE EXTENSION postgis;' -U postgres -d ona_tasking

Pipfile

@@ -23,3 +23,4 @@ black = "==19.10b0"
 
 [packages]
 e1839a8 = {editable = true,path = "."}
+ona-tasking = {editable = true,path = "."}

setup.py

@@ -13,7 +13,7 @@
     url="https://github.com/onaio/tasking",
     packages=find_packages(exclude=["docs", "tests"]),
     install_requires=[
-        "Django >= 1.11.19, < 2.1",
+        "Django >= 2.2",
         "python-dateutil",
         "markdown",  # adds markdown support for browsable REST API
         "django-filter",  # for filtering in the API
@@ -25,6 +25,7 @@
         "Programming Language :: Python",
         "Programming Language :: Python :: 3.6",
         "Framework :: Django",
-        "Framework :: Django :: 1.11",
+        "Framework :: Django :: 2.2",
+        "Framework :: Django :: 3.0",
     ],
 )

tests/serializers/test_segment_rules.py

@@ -76,6 +76,7 @@ def test_validate_bad_data(self):
             name="Rule Zero",
             description="Some description",
             target_content_type=self.task_type.id,
+            active=False,
             target_field="invalid_field",
             target_field_value=6,
             target_app_label="tasking",
@@ -85,5 +86,5 @@ def test_validate_bad_data(self):
         self.assertFalse(instance.is_valid())
         self.assertEqual(
             "Task has no field named 'invalid_field'",
-            str(instance.errors["target_field"][0]),
+            instance.errors["target_field"][0],
         )

tests/viewsets/test_locations.py

@@ -4,7 +4,6 @@
 import os
 
 from django.test import override_settings
-from django.utils import six
 
 import pytz
 from model_mommy import mommy
@@ -117,9 +116,7 @@ def test_create_location_with_shapefile_nested_multipolygons(self):
                 response = view(request=request)
                 self.assertEqual(response.status_code, 400)
                 self.assertIn("shapefile", response.data.keys())
-                self.assertEqual(
-                    INVALID_SHAPEFILE, six.text_type(response.data["shapefile"][0])
-                )
+                self.assertEqual(INVALID_SHAPEFILE, response.data["shapefile"][0])
 
             # should work
             with self.settings(TASKING_SHAPEFILE_ALLOW_NESTED_MULTIPOLYGONS=True):
@@ -151,9 +148,7 @@ def test_create_location_with_shapefile_ignore_invalid(self):
                 response = view(request=request)
                 self.assertEqual(response.status_code, 400)
                 self.assertIn("shapefile", response.data.keys())
-                self.assertEqual(
-                    INVALID_SHAPEFILE, six.text_type(response.data["shapefile"][0])
-                )
+                self.assertEqual(INVALID_SHAPEFILE, response.data["shapefile"][0])
 
             # should work
             with self.settings(TASKING_SHAPEFILE_IGNORE_INVALID_TYPES=True):

tox.ini

@@ -1,6 +1,6 @@
 [tox]
 envlist =
-    py36
+    py36-django{22,30}
     flake8
     pylint
     black
@@ -22,7 +22,7 @@ commands =
     pipenv sync --dev
     pylint --rcfile={toxinidir}/.pylintrc {toxinidir}/tasking
 
-[testenv: black]
+[testenv:black]
 deps =
     black
     pipenv
@@ -38,6 +38,8 @@ deps =
 basepython = python3.6
 commands =
     pipenv sync --dev
+    django22: pip install Django>=2.2,<2.3
+    django30: pip install Django>=3.0,<3.1
     coverage erase
     coverage run --include="tasking/**.*" --omit="tests/**.*,tasking/migrations/**.*" manage.py test {toxinidir}/tests -v 2
     coverage report