Backport changes from django3 upgrade, downgrade python versions

Package versions will be in line with the current production
environment, for now.

Pipfile

@@ -15,8 +15,8 @@ django-silk = "*"
 [packages]
 factory-boy = "==2.11.0"
 wagtail_factories = "==2.0.0"
-django = "==3.2"
+django = "<3"
-whitenoise = "~=5.3"
+whitenoise = "==4.0b4"
 psycopg2 = "==2.8.6"
 gunicorn = "==19.7.1"
 python-dotenv = "==0.13.0"
@@ -24,11 +24,11 @@ dj-database-url = "==0.4.1"
 raven = "==6.9.0"
 django-extensions = "==1.9.8"
 graphene-django = "==2.15.0"
-django-filter = "~=21.1"
+django-filter = "==2.0.0"
-djangorestframework = "~=3.8"
+djangorestframework = "==3.8.2"
 pillow = "==5.0.0"
-wagtail = "~=2.15"
+wagtail = "==2.5"
-django-cors-headers = "~=3.0"
+django-cors-headers = "==2.2.0"
 django-storages = "*"
 boto3 = "*"
 django-compressor = "*"
@@ -42,6 +42,8 @@ ipython = "*"
 requests = "*"
 unittest-xml-reporting = "*"
 django-silk = "*"
-wagtail-autocomplete = "*"
+# todo: @django3-update
+# wagtail-autocomplete = "*"
+wagtail-autocomplete = "==0.6.3"
 jedi = "==0.17.2"
 Authlib = "*"

Pipfile.django3.bk

@@ -0,0 +1,47 @@
+[[source]]
+url = "https://pypi.python.org/simple"
+verify_ssl = true
+name = "pypi"
+
+[requires]
+python_version = "3.8"
+
+[dev-packages]
+awscli = "*"
+ipdb = "*"
+coverage = "*"
+django-silk = "*"
+
+[packages]
+factory-boy = "==2.11.0"
+wagtail_factories = "==2.0.0"
+django = "==3.2"
+whitenoise = "~=5.3"
+psycopg2 = "==2.8.6"
+gunicorn = "==19.7.1"
+python-dotenv = "==0.13.0"
+dj-database-url = "==0.4.1"
+raven = "==6.9.0"
+django-extensions = "==1.9.8"
+graphene-django = "==2.15.0"
+django-filter = "~=21.1"
+djangorestframework = "~=3.8"
+pillow = "==5.0.0"
+wagtail = "~=2.15"
+django-cors-headers = "~=3.0"
+django-storages = "*"
+boto3 = "*"
+django-compressor = "*"
+django-libsass = "*"
+bleach = "*"
+newrelic = "*"
+sentry-sdk = "==0.7.2"
+django-sendgrid-v5 = "==0.8.0"
+python-http-client = "==3.2.1"
+ipython = "*"
+requests = "*"
+unittest-xml-reporting = "*"
+django-silk = "*"
+wagtail-autocomplete = "*"
+jedi = "==0.17.2"
+Authlib = "*"

server/surveys/admin.py

@@ -2,7 +2,9 @@ import json
 import logging
 
 from django.contrib import admin
-from django.db.models import JSONField
+# todo: @django3-update
+#from django.db.models import JSONField
+from django.contrib.postgres.fields import JSONField
 from django.forms import widgets
 from django.utils.html import format_html
 from graphql_relay import to_global_id

server/surveys/migrations/0005_auto_20211213_1446.py

@@ -1,23 +0,0 @@
-# Generated by Django 3.2 on 2021-12-13 14:46
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('surveys', '0004_survey_module'),
-    ]
-
-    operations = [
-        migrations.AlterField(
-            model_name='answer',
-            name='data',
-            field=models.JSONField(),
-        ),
-        migrations.AlterField(
-            model_name='survey',
-            name='data',
-            field=models.JSONField(),
-        ),
-    ]

server/surveys/models.py

@@ -1,6 +1,8 @@
 from django.contrib.auth import get_user_model
 from django.db import models
-from django.db.models import JSONField
+# todo: @django3-update
+# from django.db.models import JSONField
+from django.contrib.postgres.fields import JSONField
 from wagtail.snippets.models import register_snippet