build: django 3 compat changes

Fix various issues preventing an upgrade to django 3.2

Author: pefoley2

Ion.egg-info/SOURCES.txt

@@ -734,6 +734,7 @@ intranet/apps/users/migrations/0032_userdarkmodeproperties.py
 intranet/apps/users/migrations/0033_user_last_global_logout_time.py
 intranet/apps/users/migrations/0034_remove_userdarkmodeproperties__dark_mode_unlocked.py
 intranet/apps/users/migrations/0035_auto_20200810_1547.py
+intranet/apps/users/migrations/0036_auto_20210530_0010.py
 intranet/apps/users/migrations/__init__.py
 intranet/apps/users/templatetags/__init__.py
 intranet/apps/users/templatetags/grades.py

Ion.egg-info/requires.txt

@@ -35,15 +35,15 @@ Fabric3==1.14.post1
 flower==0.9.7
 gunicorn==20.1.0
 hiredis==2.0.0
-ipython==7.24.0
+ipython==7.24.1
 objgraph==3.5.0
 pexpect==4.8.0
 prometheus-client==0.8.0
 psycopg2==2.8.6
 pycryptodome==3.10.1
 pysftp==0.2.9
 python-dateutil==2.8.1
-python-magic==0.4.22
+python-magic==0.4.24
 reportlab==3.5.67
 requests==2.25.1
 requests-oauthlib==1.3.0

ci/regen-workflow.py

@@ -1,7 +1,7 @@
 #!/usr/bin/env python3
+import json
 import os
 import sys
-import json
 
 try:
     import yaml

docs/conf.py

@@ -17,9 +17,10 @@
 from datetime import datetime
 from unittest import mock
 
-import django
 import sphinx_bootstrap_theme
 
+import django
+
 # If extensions (or modules to document with autodoc) are in another directory,
 # add these directories to sys.path here. If the directory is relative to the
 # documentation root, use os.path.abspath to make it absolute, like shown here.

docs/rtd-requirements.txt

@@ -35,15 +35,15 @@ Fabric3==1.14.post1
 flower==0.9.7
 gunicorn==20.1.0
 hiredis==2.0.0
-ipython==7.24.0
+ipython==7.24.1
 objgraph==3.5.0
 pexpect==4.8.0
 prometheus-client==0.8.0  # pinned for flower
 psycopg2==2.8.6
 pycryptodome==3.10.1
 pysftp==0.2.9
 python-dateutil==2.8.1
-python-magic==0.4.22
+python-magic==0.4.24
 reportlab==3.5.67
 requests==2.25.1
 requests-oauthlib==1.3.0

fabfile.py

@@ -1,11 +1,10 @@
 import os
 import traceback
 
+import pkg_resources
 from fabric.api import abort, env, hide, lcd, local, prefix, prompt, puts, shell_env
 from fabric.contrib.console import confirm
 
-import pkg_resources
-
 PRODUCTION_DOCUMENT_ROOT = "/usr/local/www/intranet3"
 REDIS_SESSION_DB = 0
 REDIS_PRODUCTION_CACHE_DB = 1

intranet/apps/auth/apps.py

@@ -3,4 +3,4 @@
 
 class AuthConfig(AppConfig):
     name = "intranet.apps.auth"
-    label = "intranet.apps.auth"
+    label = "intranet_auth"

intranet/apps/dataimport/apps.py

@@ -2,4 +2,4 @@
 
 
 class DataimportConfig(AppConfig):
-    name = "dataimport"
+    name = "intranet.apps.dataimport"

intranet/apps/emailfwd/apps.py

@@ -2,4 +2,4 @@
 
 
 class EmailfwdConfig(AppConfig):
-    name = "emailfwd"
+    name = "intranet.apps.emailfwd"

intranet/apps/itemreg/apps.py

@@ -2,4 +2,4 @@
 
 
 class ItemregConfig(AppConfig):
-    name = "itemreg"
+    name = "intranet.apps.itemreg"

intranet/apps/lostfound/apps.py

@@ -2,4 +2,4 @@
 
 
 class LostfoundConfig(AppConfig):
-    name = "lostfound"
+    name = "intranet.apps.lostfound"

intranet/apps/nomination/apps.py

@@ -2,4 +2,4 @@
 
 
 class NominationConfig(AppConfig):
-    name = "nomination"
+    name = "intranet.apps.nomination"

intranet/apps/parking/apps.py

@@ -2,4 +2,4 @@
 
 
 class ParkingConfig(AppConfig):
-    name = "parking"
+    name = "intranet.apps.parking"

intranet/apps/templatetags/form_field.py

@@ -1,5 +1,5 @@
 from django import template
-from django.forms.forms import BoundField
+from django.forms.boundfield import BoundField
 
 register = template.Library()
 

intranet/apps/users/migrations/0036_auto_20210530_0010.py

@@ -0,0 +1,18 @@
+# Generated by Django 3.1.11 on 2021-05-30 04:10
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('users', '0035_auto_20200810_1547'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='user',
+            name='gender',
+            field=models.BooleanField(null=True),
+        ),
+    ]

intranet/apps/users/models.py

@@ -225,7 +225,7 @@ class User(AbstractBaseUser, PermissionsMixin):
     middle_name = models.CharField(max_length=70, null=True)
     last_name = models.CharField(max_length=70, null=True)
     nickname = models.CharField(max_length=35, null=True)
-    gender = models.NullBooleanField()
+    gender = models.BooleanField(null=True)
     preferred_photo = models.OneToOneField("Photo", related_name="+", null=True, blank=True, on_delete=models.SET_NULL)
     primary_email = models.OneToOneField("Email", related_name="+", null=True, blank=True, on_delete=models.SET_NULL)
     bus_route = models.ForeignKey(Route, on_delete=models.SET_NULL, null=True)

intranet/settings/__init__.py

@@ -358,7 +358,7 @@
             ),
             "debug": True,  # Only enabled if DEBUG is true as well
             "loaders": ("django.template.loaders.filesystem.Loader", "django.template.loaders.app_directories.Loader"),
-            "libraries": {"staticfiles": "django.contrib.staticfiles.templatetags.staticfiles"},
+            "libraries": {"staticfiles": "django.templatetags.static"},
         },
     }
 ]  # type: List[Dict[str,Any]]
@@ -833,6 +833,8 @@ def get_log(name):  # pylint: disable=redefined-outer-name; 'name' is used as th
 # Shows a warning message with yellow background on the login and all interior pages
 # GLOBAL_WARNING = "This is a message to display throughout the application."
 
+DEFAULT_AUTO_FIELD = "django.db.models.AutoField"
+
 try:
     from .secret import *  # noqa
 except ImportError:

requirements.txt

@@ -35,15 +35,15 @@ Fabric3==1.14.post1
 flower==0.9.7
 gunicorn==20.1.0
 hiredis==2.0.0
-ipython==7.24.0
+ipython==7.24.1
 objgraph==3.5.0
 pexpect==4.8.0
 prometheus-client==0.8.0  # pinned for flower
 psycopg2==2.8.6
 pycryptodome==3.10.1
 pysftp==0.2.9
 python-dateutil==2.8.1
-python-magic==0.4.22
+python-magic==0.4.24
 reportlab==3.5.67
 requests==2.25.1
 requests-oauthlib==1.3.0

scripts/get_ldif.py

@@ -1,6 +1,8 @@
+import sys
+
 from django.forms.models import model_to_dict
+
 from intranet.apps.users.models import User
-import sys
 
 
 def run(*args):