Merge branch 'master' into master

Pipfile

@@ -4,33 +4,33 @@ verify_ssl = true
 name = "pypi"
 
 [packages]
-crispy-bootstrap5 = "~=0.6"
+crispy-bootstrap5 = "~=0.7"
-django = "~=3.2.13"
+django = "~=3.2.18"
 django-bootstrap-pagination = "~=1.7.1"
 django-crispy-forms = "~=1.14.0"
-django-extensions = "~=3.1.5"
+django-extensions = "~=3.2.1"
 gunicorn = "~=20.1.0"
-ipython = "~=8.2.0"
+ipython = "~=8.10.0"
-mistune = "~=2.0.2"
+mistune = "~=2.0.5"
-psycopg2 = "~=2.9.3"
+psycopg2 = "~=2.9.5"
-pygments = "~=2.11.2"
+pygments = "~=2.14.0"
 social-auth-app-django = "~=5.0.0"
-whitenoise = "~=6.0.0"
+whitenoise = "~=6.4.0"
 
 [dev-packages]
-autopep8 = "~=1.6.0"
+autopep8 = "~=2.0.1"
-black = "==22.3.0"
+black = "~=23.1.0"
-coverage = "~=6.3.2"
+coverage = "~=7.2.1"
-django-stubs = "~=1.9.0"
+django-stubs = "~=1.15.0"
-flake8 = "~=4.0.1"
+flake8 = "~=6.0.0"
-isort = "~=5.10.1"
+isort = "~=5.12.0"
-mypy = "~=0.942"
+mypy = "~=1.0.1"
-pylint = "~=2.13.7"
+pylint = "~=2.16.2"
 pylint-django = "~=2.5.3"
 pyyaml = "~=6.0"
-typed-ast = "~=1.5.3"  # Required by black, but Pipenv doesn't pull it in correctly on 3.8
+typed-ast = "~=1.5.4"  # Required by black, but Pipenv doesn't pull it in correctly on 3.8
-types-Markdown = "~=3.3.13"  # To avoid CI failures
+types-Markdown = "~=3.4.2.5"  # To avoid CI failures
-types-bleach = "~=5.0.2"  # To avoid CI failures
+types-bleach = "~=6.0.0.1"  # To avoid CI failures
 
 [requires]
 python_version = "3.9"

pylintrc

@@ -4,7 +4,7 @@ init-hook=import sys; sys.path.insert(0, 'tjdests/apps')
 load-plugins=pylint_django
 
 [MAIN]
-disable=missing-docstring,no-else-return,no-else-raise,bad-continuation,duplicate-code,too-many-branches,too-many-nested-blocks,too-many-locals,too-many-statements,too-many-public-methods
+disable=missing-docstring,no-else-return,no-else-raise,duplicate-code,too-many-branches,too-many-nested-blocks,too-many-locals,too-many-statements,too-many-public-methods
 max-line-length=100
 ignore=media,migrations
 ignore-patterns=secret*

tjdests/apps/authentication/forms.py

@@ -29,6 +29,7 @@ class TOSForm(forms.Form):
 
     def clean(self):
         cleaned_data = super().clean()
+        assert cleaned_data is not None
         password1 = cleaned_data.get("password")
         password2 = cleaned_data.get("password_confirm")
 

tjdests/apps/authentication/migrations/0001_initial.py

@@ -7,7 +7,6 @@ from django.db import migrations, models
 
 
 class Migration(migrations.Migration):
-
     initial = True
 
     dependencies = []

tjdests/apps/authentication/migrations/0002_initial.py

@@ -5,7 +5,6 @@ from django.db import migrations, models
 
 
 class Migration(migrations.Migration):
-
     initial = True
 
     dependencies = [

tjdests/apps/authentication/migrations/0003_alter_user_publish_data.py

@@ -4,7 +4,6 @@ from django.db import migrations, models
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
         ("authentication", "0002_initial"),
     ]

tjdests/apps/authentication/migrations/0004_auto_20210419_1713.py

@@ -5,7 +5,6 @@ from django.db import migrations, models
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
         ("destinations", "0005_alter_decision_admission_status"),
         ("authentication", "0003_alter_user_publish_data"),

tjdests/apps/authentication/migrations/0005_user_gpa.py

@@ -4,7 +4,6 @@ from django.db import migrations, models
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
         ("authentication", "0004_auto_20210419_1713"),
     ]

tjdests/apps/authentication/migrations/0006_alter_user_biography.py

@@ -4,7 +4,6 @@ from django.db import migrations, models
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
         ("authentication", "0005_user_gpa"),
     ]

tjdests/apps/authentication/migrations/0007_alter_user_gpa.py

@@ -4,7 +4,6 @@ from django.db import migrations, models
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
         ("authentication", "0006_alter_user_biography"),
     ]

tjdests/apps/authentication/migrations/0008_alter_user_biography.py

@@ -4,7 +4,6 @@ from django.db import migrations, models
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
         ("authentication", "0007_alter_user_gpa"),
     ]

tjdests/apps/authentication/migrations/0009_user_last_modified.py

@@ -4,7 +4,6 @@ from django.db import migrations, models
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
         ("authentication", "0008_alter_user_biography"),
     ]

tjdests/apps/authentication/migrations/0010_user_nickname.py

@@ -4,7 +4,6 @@ from django.db import migrations, models
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
         ("authentication", "0009_user_last_modified"),
     ]

tjdests/apps/authentication/migrations/0011_user_use_nickname.py

@@ -4,7 +4,6 @@ from django.db import migrations, models
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
         ("authentication", "0010_user_nickname"),
     ]

tjdests/apps/authentication/migrations/0012_user_preferred_name.py

@@ -4,7 +4,6 @@ from django.db import migrations, models
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
         ("authentication", "0011_user_use_nickname"),
     ]

tjdests/apps/authentication/migrations/0013_alter_user_gpa.py

@@ -4,7 +4,6 @@ from django.db import migrations, models
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
         ("authentication", "0012_user_preferred_name"),
     ]

tjdests/apps/authentication/migrations/0014_user_is_banned.py

@@ -4,7 +4,6 @@ from django.db import migrations, models
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
         ("authentication", "0013_alter_user_gpa"),
     ]

tjdests/apps/authentication/views.py

@@ -45,7 +45,8 @@ def accept_tos_view(request: HttpRequest) -> HttpResponse:
         form = TOSForm(request.POST)
 
         if form.is_valid():
-            request.user.accepted_terms = form.cleaned_data.get("accept_tos")
+            accept_tos = form.cleaned_data.get("accept_tos")
+            request.user.accepted_terms = accept_tos
             request.user.set_password(form.cleaned_data.get("password"))
             request.user.save()
 

tjdests/apps/destinations/migrations/0001_initial.py

@@ -6,7 +6,6 @@ from django.db import migrations, models
 
 
 class Migration(migrations.Migration):
-
     initial = True
 
     dependencies = [

tjdests/apps/destinations/migrations/0002_decision_admitted.py

@@ -4,7 +4,6 @@ from django.db import migrations, models
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
         ("destinations", "0001_initial"),
     ]

tjdests/apps/destinations/migrations/0003_alter_decision_admitted.py

@@ -4,7 +4,6 @@ from django.db import migrations, models
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
         ("destinations", "0002_decision_admitted"),
     ]

tjdests/apps/destinations/migrations/0004_rename_admitted_decision_admission_status.py

@@ -4,7 +4,6 @@ from django.db import migrations
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
         ("destinations", "0003_alter_decision_admitted"),
     ]

tjdests/apps/destinations/migrations/0005_alter_decision_admission_status.py

@@ -4,7 +4,6 @@ from django.db import migrations, models
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
         ("destinations", "0004_rename_admitted_decision_admission_status"),
     ]

tjdests/apps/destinations/migrations/0006_alter_college_ceeb_code.py

@@ -4,7 +4,6 @@ from django.db import migrations, models
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
         ("destinations", "0005_alter_decision_admission_status"),
     ]

tjdests/apps/destinations/migrations/0007_alter_decision_admission_status.py

@@ -4,7 +4,6 @@ from django.db import migrations, models
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
         ("destinations", "0006_alter_college_ceeb_code"),
     ]

tjdests/apps/destinations/migrations/0008_alter_decision_admission_status.py

@@ -4,7 +4,6 @@ from django.db import migrations, models
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
         ("destinations", "0007_alter_decision_admission_status"),
     ]

tjdests/apps/destinations/migrations/0009_alter_decision_admission_status.py

@@ -4,7 +4,6 @@ from django.db import migrations, models
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
         ("destinations", "0008_alter_decision_admission_status"),
     ]

tjdests/apps/destinations/migrations/0010_alter_college_options.py

@@ -4,7 +4,6 @@ from django.db import migrations
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
         ("destinations", "0009_alter_decision_admission_status"),
     ]

tjdests/apps/destinations/migrations/0011_auto_20210423_2357.py

@@ -4,7 +4,6 @@ from django.db import migrations, models
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
         ("destinations", "0010_alter_college_options"),
     ]

tjdests/apps/destinations/migrations/0012_alter_decision_options.py

@@ -4,7 +4,6 @@ from django.db import migrations
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
         ("destinations", "0011_auto_20210423_2357"),
     ]

tjdests/apps/destinations/migrations/0013_alter_decision_admission_status.py

@@ -4,7 +4,6 @@ from django.db import migrations, models
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
         ("destinations", "0012_alter_decision_options"),
     ]

tjdests/apps/destinations/tests.py

@@ -1,6 +1,7 @@
 from unittest.mock import mock_open, patch
 
 from django.core.management import CommandError, call_command
+from django.http import HttpResponseRedirect
 from django.urls import reverse
 
 from ...test import TJDestsTestCase
@@ -15,6 +16,7 @@ class DestinationsTest(TJDestsTestCase):
         # Test as an unauthenticated user.
         response = self.client.get(reverse("destinations:students"))
         self.assertEqual(302, response.status_code)
+        assert isinstance(response, HttpResponseRedirect)
         self.assertEqual(
             reverse("authentication:login")
             + f"?next={reverse('destinations:students')}",
@@ -191,6 +193,7 @@ class DestinationsTest(TJDestsTestCase):
 
         response = self.client.get(reverse("destinations:colleges"))
         self.assertEqual(302, response.status_code)
+        assert isinstance(response, HttpResponseRedirect)
         self.assertEqual(
             reverse("authentication:login")
             + f"?next={reverse('destinations:colleges')}",

tjdests/apps/profile/forms.py

@@ -30,6 +30,7 @@ class ProfilePublishForm(forms.ModelForm):
         if data.get("biography"):
             data["biography"] = data["biography"].replace("\r", "")
             self.instance.biography = data["biography"]
+            assert self.fields["biography"].max_length is not None
             if len(data["biography"]) <= self.fields["biography"].max_length:
                 if self.errors.get("biography"):
                     del self.errors["biography"]
@@ -37,6 +38,8 @@ class ProfilePublishForm(forms.ModelForm):
         self.data = data
         cleaned_data = super().clean()
 
+        assert cleaned_data is not None
+
         # Check the GPA: 0.0 <= GPA <= 5.0
         if cleaned_data.get("GPA"):
             gpa = cleaned_data.get("GPA")
@@ -74,6 +77,7 @@ class DecisionForm(forms.ModelForm):
 
     def clean(self) -> Dict[str, Any]:
         cleaned_data = super().clean()
+        assert cleaned_data is not None
 
         # Ensure that the college is not a duplicate for this user
         # Yes, this is weird. Basically: if we are not editing
@@ -143,6 +147,7 @@ class TestScoreForm(forms.ModelForm):
 
     def clean(self) -> Dict[str, Any]:
         cleaned_data = super().clean()
+        assert cleaned_data is not None
 
         exam_type = str(cleaned_data.get("exam_type"))
 

tjdests/apps/profile/tests.py

@@ -1,5 +1,6 @@
 from decimal import Decimal
 
+from django.http import HttpResponseRedirect
 from django.urls import reverse
 
 from tjdests.apps.authentication.models import User
@@ -16,6 +17,7 @@ class ProfileTest(TJDestsTestCase):
         # Test as an unauthenticated user.
         response = self.client.get(reverse("profile:index"))
         self.assertEqual(302, response.status_code)
+        assert isinstance(response, HttpResponseRedirect)
         self.assertEqual(
             reverse("authentication:login") + f"?next={reverse('profile:index')}",
             response.url,
@@ -25,6 +27,7 @@ class ProfileTest(TJDestsTestCase):
         self.login(accept_tos=False, make_student=True)
         response = self.client.get(reverse("profile:index"))
         self.assertEqual(302, response.status_code)
+        assert isinstance(response, HttpResponseRedirect)
         self.assertEqual(reverse("authentication:tos"), response.url)
 
         # Test as a user that has accepted TOS