Upgrade to Django 2.2

.travis.yml

@@ -1,5 +1,5 @@
 sudo: required
-dist: trusty
+dist: xenial
 language: python
 addons:
   postgresql: 9.6
@@ -35,8 +35,8 @@ before_install:
   - export DEBIAN_FRONTEND=noninteractive;
   - sudo rm -f /etc/apt/sources.list.d/mongodb-3.4.list
   - sudo -E apt-get -y update
-  - sudo -E apt-get -yq --no-install-suggests --no-install-recommends --force-yes install postgresql-9.6-postgis-2.3
-  - sudo -E apt-get -yq --no-install-suggests --no-install-recommends --force-yes install openjdk-8-jre-headless
+  - sudo -E apt-get -yq --no-install-suggests --no-install-recommends install postgresql-9.6-postgis-2.4
+  - sudo -E apt-get -yq --no-install-suggests --no-install-recommends install openjdk-8-jre-headless
   - ./script/database/install_postgis onadata_test postgres 127.0.0.1
 
 install:

onadata/apps/api/tests/views/test_user_permissions.py

@@ -83,6 +83,11 @@ def test_manager_can_update_xform(self):
 
         self.assertFalse(self.xform.shared)
 
+        # Remove key:value pairs where the value is None.
+        # More info: https://code.djangoproject.com/ticket/30024
+        data.pop('enketo_preview_url')
+        data.pop('last_submission_time')
+
         request = self.factory.put('/', data=data, **self.extra)
         response = view(request, pk=self.xform.id)
         self.assertEqual(response.status_code, 404)
@@ -306,6 +311,12 @@ def test_owner_role(self):
                               context={'request': request})
         data = json.loads(JSONRenderer().render(xfs.data))
         data.update({'public': True, 'description': "Some description"})
+
+        # Remove key:value pairs where the value is None.
+        # More info: https://code.djangoproject.com/ticket/30024
+        data.pop('enketo_preview_url')
+        data.pop('last_submission_time')
+
         request = self.factory.put('/', data=data, **self.extra)
         response = view(request, pk=formid)
         self.assertEqual(response.status_code, 200)

onadata/apps/api/tests/viewsets/test_connect_viewset.py

@@ -295,7 +295,7 @@ def test_reset_user_password(self):
         self.assertEqual(response.status_code, 400)
 
         data['uid'] = urlsafe_base64_encode(
-            force_bytes(self.user.pk)).decode('utf-8')
+            force_bytes(self.user.pk))
         # with uid, should be successful
         request = self.factory.post('/', data=data)
         response = self.view(request)
@@ -314,7 +314,7 @@ def test_reset_user_password_with_updated_user_email(self):
         self.user.save()
         new_password = "bobbob1"
         uid = urlsafe_base64_encode(
-            force_bytes(self.user.pk)).decode('utf-8')
+            force_bytes(self.user.pk))
         mhv = default_token_generator
         token = mhv.make_token(self.user)
         data = {'token': token, 'new_password': new_password,

onadata/apps/api/tests/viewsets/test_open_data_viewset.py

@@ -73,7 +73,7 @@ def test_create_open_data_object_with_invalid_fields(self):
             'name': self.xform.id_string
         }
 
-        data.update({'object_id': None})
+        data.update({'object_id': 'sup'})
         request = self.factory.post('/', data=data, **self.extra)
         response = self.view(request)
         self.assertEqual(response.status_code, 400)

onadata/libs/serializers/password_reset_serializer.py

@@ -35,14 +35,13 @@ def get_password_reset_email(user, reset_url,
     """Creates the subject and email body for password reset email."""
     result = urlparse(reset_url)
     site_name = domain = result.hostname
-    encoded_username = urlsafe_base64_encode(
-        b(user.username.encode('utf-8'))).decode('utf-8')
+    encoded_username = urlsafe_base64_encode(b(user.username.encode('utf-8')))
     c = {
         'email': user.email,
         'domain': domain,
         'path': result.path,
         'site_name': site_name,
-        'uid': urlsafe_base64_encode(force_bytes(user.pk)).decode('utf-8'),
+        'uid': urlsafe_base64_encode(force_bytes(user.pk)),
         'username': user.username,
         'encoded_username': encoded_username,
         'token': token_generator.make_token(user),

onadata/libs/tests/serializers/test_password_reset_serializer.py

@@ -13,11 +13,11 @@ def test_get_password_reset_email(self):
 
         self.assertIn(
             urlsafe_base64_encode(
-                bytes(self.user.username.encode('utf-8'))).decode('utf-8'),
+                self.user.username.encode('utf-8')),
             email,
             "Username is included in reset email.")
         self.assertIn(
             'uid={}'.format(urlsafe_base64_encode(
-                force_bytes(self.user.pk)).decode('utf-8')),
+                force_bytes(self.user.pk))),
             email,
             "Uid is included in email.")

requirements/base.pip

@@ -13,7 +13,6 @@
 alabaster==0.7.12         # via sphinx
 amqp==2.4.2               # via kombu
 argparse==1.4.0           # via unittest2
-asn1crypto==1.0.1         # via cryptography
 attrs==19.1.0             # via jsonschema
 babel==2.6.0              # via sphinx
 billiard==3.5.0.5         # via celery
@@ -42,7 +41,7 @@ django-render-block==0.6  # via django-templated-email
 django-reversion==3.0.3
 django-taggit==1.1.0
 django-templated-email==2.3.0
-django==2.1.7             # via django-cors-headers, django-debug-toolbar, django-filter, django-oauth-toolkit, django-query-builder, django-render-block, django-reversion, django-taggit, djangorestframework-jsonapi, jsonfield
+django==2.2.9             # via django-cors-headers, django-debug-toolbar, django-filter, django-oauth-toolkit, django-query-builder, django-render-block, django-reversion, django-taggit, djangorestframework-jsonapi, jsonfield
 djangorestframework-csv==2.1.0
 djangorestframework-gis==0.14
 djangorestframework-jsonapi==2.7.0
@@ -123,7 +122,7 @@ sphinxcontrib-jsmath==1.0.1  # via sphinx
 sphinxcontrib-qthelp==1.0.2  # via sphinx
 sphinxcontrib-serializinghtml==1.1.3  # via sphinx
 sqlalchemy==1.3.3         # via tabulator
-sqlparse==0.3.0           # via django-debug-toolbar
+sqlparse==0.3.0           # via django, django-debug-toolbar
 tableschema==1.4.1        # via datapackage
 tabulator==1.20.0         # via datapackage, tableschema
 traceback2==1.4.0         # via unittest2

setup.py

@@ -31,7 +31,7 @@
     },
     packages=find_packages(exclude=['docs', 'tests']),
     install_requires=[
-        "Django>=2",
+        "Django>=2.2,<2.3",
         "django-guardian",
         "django-registration-redux",
         "django-templated-email",