diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 895237ff..4d9e22f9 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -3,7 +3,7 @@ default_language_version: repos: - repo: https://github.com/pre-commit/pre-commit-hooks - rev: v4.4.0 + rev: v5.0.0 hooks: - id: check-added-large-files - id: check-case-conflict @@ -14,48 +14,38 @@ repos: - id: end-of-file-fixer - id: trailing-whitespace - repo: https://github.com/rstcheck/rstcheck - rev: v6.2.0 + rev: v6.2.4 hooks: - id: rstcheck additional_dependencies: - - sphinx==6.1.3 - - tomli==2.0.1 + - sphinx==8.1.3 + - tomli==2.1.0 - repo: https://github.com/sphinx-contrib/sphinx-lint - rev: v0.6.8 + rev: v1.0.0 hooks: - id: sphinx-lint - repo: https://github.com/asottile/pyupgrade - rev: v3.13.0 + rev: v3.19.0 hooks: - id: pyupgrade - args: [--py310-plus] + args: [--py311-plus] - repo: https://github.com/adamchainz/django-upgrade - rev: 1.15.0 + rev: 1.22.1 hooks: - id: django-upgrade args: [--target-version, '4.2'] - repo: https://github.com/psf/black - rev: 23.9.1 + rev: 24.10.0 hooks: - id: black - repo: https://github.com/adamchainz/blacken-docs - rev: 1.16.0 + rev: 1.19.1 hooks: - id: blacken-docs additional_dependencies: - - black==23.1.0 -- repo: https://github.com/asottile/reorder-python-imports - rev: v3.11.0 - hooks: - - id: reorder-python-imports - args: - - --py38-plus - - --application-directories - - .:example:src - - --add-import - - 'from __future__ import annotations' + - black==24.10.0 - repo: https://github.com/PyCQA/flake8 - rev: 6.1.0 + rev: 7.1.1 hooks: - id: flake8 additional_dependencies: diff --git a/README.md b/README.md index c0e4a72a..47617d7a 100644 --- a/README.md +++ b/README.md @@ -248,10 +248,11 @@ If you have a suggestion that would make this better, please fork the repo and c Don't forget to give the project a star! Thanks again! 1. Fork the Project -2. Create your Feature Branch (`git checkout -b feature/AmazingFeature`) -3. Commit your Changes (`git commit -m 'Add some AmazingFeature'`) -4. Push to the Branch (`git push origin feature/AmazingFeature`) -5. Open a Pull Request +2. [Install pre-commit](https://pre-commit.com/#install) `pre-commit install` +3. Create your Feature Branch (`git checkout -b feature/AmazingFeature`) +4. Commit your Changes (`git commit -m 'Add some AmazingFeature'`) +5. Push to the Branch (`git push origin feature/AmazingFeature`) +6. Open a Pull Request ### Testing diff --git a/accounts/admin.py b/accounts/admin.py index 43805ead..bcfaee01 100644 --- a/accounts/admin.py +++ b/accounts/admin.py @@ -1,5 +1,3 @@ -from __future__ import annotations - import csv from django.contrib import admin diff --git a/accounts/apps.py b/accounts/apps.py index f94ab627..0cb51e63 100644 --- a/accounts/apps.py +++ b/accounts/apps.py @@ -1,5 +1,3 @@ -from __future__ import annotations - from django.apps import AppConfig diff --git a/accounts/factories.py b/accounts/factories.py index b22f8d4c..ee1db192 100644 --- a/accounts/factories.py +++ b/accounts/factories.py @@ -1,5 +1,3 @@ -from __future__ import annotations - import factory from django.db.models.signals import post_save diff --git a/accounts/fields.py b/accounts/fields.py index ac78f69d..bd301bee 100644 --- a/accounts/fields.py +++ b/accounts/fields.py @@ -1,5 +1,3 @@ -from __future__ import annotations - from django.db.models.fields import related diff --git a/accounts/forms.py b/accounts/forms.py index 24d28916..43826753 100644 --- a/accounts/forms.py +++ b/accounts/forms.py @@ -1,5 +1,3 @@ -from __future__ import annotations - from django import forms from django.contrib.auth.forms import UserCreationForm from django_recaptcha.fields import ReCaptchaField diff --git a/accounts/management/commands/create_playwright_user.py b/accounts/management/commands/create_playwright_user.py index 67648657..c669f062 100644 --- a/accounts/management/commands/create_playwright_user.py +++ b/accounts/management/commands/create_playwright_user.py @@ -1,7 +1,6 @@ """ Management utility to create playwright test user. """ -from __future__ import annotations import os diff --git a/accounts/management/commands/tests/test_create_playwright_user.py b/accounts/management/commands/tests/test_create_playwright_user.py index f97f5fa1..0f7402a5 100644 --- a/accounts/management/commands/tests/test_create_playwright_user.py +++ b/accounts/management/commands/tests/test_create_playwright_user.py @@ -1,5 +1,3 @@ -from __future__ import annotations - import os import pytest diff --git a/accounts/migrations/0001_initial.py b/accounts/migrations/0001_initial.py index 8ee97654..6037afbe 100644 --- a/accounts/migrations/0001_initial.py +++ b/accounts/migrations/0001_initial.py @@ -1,6 +1,4 @@ # Generated by Django 4.1.3 on 2022-12-27 20:41 -from __future__ import annotations - import django.contrib.auth.models import django.contrib.auth.validators import django.utils.timezone diff --git a/accounts/migrations/0002_customuser_bio_customuser_bio_image_and_more.py b/accounts/migrations/0002_customuser_bio_customuser_bio_image_and_more.py index 68005a8a..deb88cf9 100644 --- a/accounts/migrations/0002_customuser_bio_customuser_bio_image_and_more.py +++ b/accounts/migrations/0002_customuser_bio_customuser_bio_image_and_more.py @@ -1,6 +1,4 @@ # Generated by Django 4.1.3 on 2022-12-27 22:25 -from __future__ import annotations - import django.db.models.deletion from django.conf import settings from django.db import migrations diff --git a/accounts/migrations/0003_remove_customuser_bio_remove_customuser_bio_image_and_more.py b/accounts/migrations/0003_remove_customuser_bio_remove_customuser_bio_image_and_more.py index dc8d70de..d914f619 100644 --- a/accounts/migrations/0003_remove_customuser_bio_remove_customuser_bio_image_and_more.py +++ b/accounts/migrations/0003_remove_customuser_bio_remove_customuser_bio_image_and_more.py @@ -1,6 +1,4 @@ # Generated by Django 4.1.5 on 2023-01-03 23:57 -from __future__ import annotations - import django.db.models.deletion from django.conf import settings from django.db import migrations diff --git a/accounts/migrations/0004_alter_userprofile_member_role.py b/accounts/migrations/0004_alter_userprofile_member_role.py index 314045df..cb98f238 100644 --- a/accounts/migrations/0004_alter_userprofile_member_role.py +++ b/accounts/migrations/0004_alter_userprofile_member_role.py @@ -1,6 +1,4 @@ # Generated by Django 4.1.5 on 2023-01-06 17:26 -from __future__ import annotations - from django.db import migrations from django.db import models diff --git a/accounts/migrations/0005_userprofile_email_confirmed.py b/accounts/migrations/0005_userprofile_email_confirmed.py index a95f8465..b7ded3ca 100644 --- a/accounts/migrations/0005_userprofile_email_confirmed.py +++ b/accounts/migrations/0005_userprofile_email_confirmed.py @@ -1,6 +1,4 @@ # Generated by Django 4.1.5 on 2023-01-09 00:58 -from __future__ import annotations - from django.db import migrations from django.db import models diff --git a/accounts/migrations/0006_userprofile_receiving_event_updates.py b/accounts/migrations/0006_userprofile_receiving_event_updates.py index 93e11383..a42a526e 100644 --- a/accounts/migrations/0006_userprofile_receiving_event_updates.py +++ b/accounts/migrations/0006_userprofile_receiving_event_updates.py @@ -1,6 +1,4 @@ # Generated by Django 4.1.5 on 2023-01-20 18:14 -from __future__ import annotations - from django.db import migrations from django.db import models diff --git a/accounts/migrations/0007_alter_userprofile_user.py b/accounts/migrations/0007_alter_userprofile_user.py index c9f466e7..b39c83fc 100644 --- a/accounts/migrations/0007_alter_userprofile_user.py +++ b/accounts/migrations/0007_alter_userprofile_user.py @@ -1,6 +1,4 @@ # Generated by Django 4.1.12 on 2023-10-05 01:12 -from __future__ import annotations - import django.db.models.deletion from django.conf import settings from django.db import migrations diff --git a/accounts/migrations/0008_userprofile_receiving_program_updates.py b/accounts/migrations/0008_userprofile_receiving_program_updates.py index 82cd6d09..825e1953 100644 --- a/accounts/migrations/0008_userprofile_receiving_program_updates.py +++ b/accounts/migrations/0008_userprofile_receiving_program_updates.py @@ -1,6 +1,4 @@ # Generated by Django 4.1.13 on 2024-02-15 19:42 -from __future__ import annotations - from django.db import migrations from django.db import models diff --git a/accounts/models.py b/accounts/models.py index 93eece12..547b3653 100644 --- a/accounts/models.py +++ b/accounts/models.py @@ -1,5 +1,3 @@ -from __future__ import annotations - from django.contrib.auth.models import AbstractUser from django.core.signing import BadSignature from django.core.signing import SignatureExpired diff --git a/accounts/tests/test_activate_view.py b/accounts/tests/test_activate_view.py index bf44c1cb..f540f021 100644 --- a/accounts/tests/test_activate_view.py +++ b/accounts/tests/test_activate_view.py @@ -1,5 +1,3 @@ -from __future__ import annotations - from django.test import Client from django.test import TestCase from django.urls import reverse diff --git a/accounts/tests/test_auth_password_views.py b/accounts/tests/test_auth_password_views.py index 5221702d..125bc88c 100644 --- a/accounts/tests/test_auth_password_views.py +++ b/accounts/tests/test_auth_password_views.py @@ -1,5 +1,3 @@ -from __future__ import annotations - from django.core import mail from django.test import Client from django.test import TestCase diff --git a/accounts/tests/test_profile_view.py b/accounts/tests/test_profile_view.py index b1f369d4..6f6a9e60 100644 --- a/accounts/tests/test_profile_view.py +++ b/accounts/tests/test_profile_view.py @@ -1,5 +1,3 @@ -from __future__ import annotations - from django.test import Client from django.test import TestCase from django.urls import reverse diff --git a/accounts/tests/test_resend_confirmation_email.py b/accounts/tests/test_resend_confirmation_email.py index b8938599..4ccba28b 100644 --- a/accounts/tests/test_resend_confirmation_email.py +++ b/accounts/tests/test_resend_confirmation_email.py @@ -1,5 +1,3 @@ -from __future__ import annotations - from django.core import mail from django.test import Client from django.test import TestCase diff --git a/accounts/tests/test_signup_view.py b/accounts/tests/test_signup_view.py index 3df3d3b3..99ef9cab 100644 --- a/accounts/tests/test_signup_view.py +++ b/accounts/tests/test_signup_view.py @@ -1,5 +1,3 @@ -from __future__ import annotations - from unittest.mock import patch from django.core import mail diff --git a/accounts/tests/test_update_email_subscription_view.py b/accounts/tests/test_update_email_subscription_view.py index 69d42a9a..c3b25f46 100644 --- a/accounts/tests/test_update_email_subscription_view.py +++ b/accounts/tests/test_update_email_subscription_view.py @@ -1,5 +1,3 @@ -from __future__ import annotations - from django.test import Client from django.test import TestCase from django.urls import reverse diff --git a/accounts/tokens.py b/accounts/tokens.py index 90b34ae8..4e4ddcd9 100644 --- a/accounts/tokens.py +++ b/accounts/tokens.py @@ -1,5 +1,3 @@ -from __future__ import annotations - from django.contrib.auth.tokens import PasswordResetTokenGenerator diff --git a/accounts/urls.py b/accounts/urls.py index 92fbba16..2bc2b70a 100644 --- a/accounts/urls.py +++ b/accounts/urls.py @@ -1,5 +1,3 @@ -from __future__ import annotations - from django.contrib.auth import views as auth_views from django.urls import include from django.urls import path diff --git a/accounts/views.py b/accounts/views.py index fa6ec66a..19c89546 100644 --- a/accounts/views.py +++ b/accounts/views.py @@ -1,6 +1,4 @@ # Create your views here. -from __future__ import annotations - from django.conf import settings from django.contrib import messages from django.contrib.auth import get_user_model @@ -145,12 +143,12 @@ def get_initial(self): Returns the initial data to use for forms on this view. """ initial = super().get_initial() - initial[ - "receive_program_updates" - ] = self.request.user.profile.receiving_program_updates - initial[ - "receive_event_updates" - ] = self.request.user.profile.receiving_event_updates + initial["receive_program_updates"] = ( + self.request.user.profile.receiving_program_updates + ) + initial["receive_event_updates"] = ( + self.request.user.profile.receiving_event_updates + ) initial["receive_newsletter"] = self.request.user.profile.receiving_newsletter return initial diff --git a/home/admin.py b/home/admin.py index 867b6021..3379d2a4 100644 --- a/home/admin.py +++ b/home/admin.py @@ -1,5 +1,3 @@ -from __future__ import annotations - from django.contrib import admin from .models import Event diff --git a/home/apps.py b/home/apps.py index 30f8c45f..31119bb1 100644 --- a/home/apps.py +++ b/home/apps.py @@ -1,5 +1,3 @@ -from __future__ import annotations - from wagtail.images.apps import WagtailImagesAppConfig diff --git a/home/blocks.py b/home/blocks.py index 3e92aac2..6e8add23 100644 --- a/home/blocks.py +++ b/home/blocks.py @@ -1,5 +1,3 @@ -from __future__ import annotations - from wagtail import blocks from wagtail.contrib.table_block.blocks import TableBlock from wagtail.images.blocks import ImageChooserBlock diff --git a/home/constants.py b/home/constants.py index 3aed2060..728bdcad 100644 --- a/home/constants.py +++ b/home/constants.py @@ -1,5 +1,3 @@ -from __future__ import annotations - DATE_INPUT_FORMAT = ["%Y-%m-%d", "%m/%d/%Y", "%m/%d/%y", "%d/%m/%y", "%d/%m/%Y"] SURVEY_FIELD_VALIDATORS = { diff --git a/home/factories.py b/home/factories.py index 465a45ee..3ab037ec 100644 --- a/home/factories.py +++ b/home/factories.py @@ -1,5 +1,3 @@ -from __future__ import annotations - import factory from accounts.factories import UserFactory diff --git a/home/forms.py b/home/forms.py index 1492fa1a..9a76e1c5 100644 --- a/home/forms.py +++ b/home/forms.py @@ -1,5 +1,3 @@ -from __future__ import annotations - from typing import List from typing import Tuple diff --git a/home/management/commands/applications_open_email.py b/home/management/commands/applications_open_email.py index ca0fb846..e474a3bf 100644 --- a/home/management/commands/applications_open_email.py +++ b/home/management/commands/applications_open_email.py @@ -1,5 +1,3 @@ -from __future__ import annotations - from django.conf import settings from django.core.mail import send_mail from django.core.management.base import BaseCommand diff --git a/home/managers.py b/home/managers.py index e75eb29d..a3440015 100644 --- a/home/managers.py +++ b/home/managers.py @@ -1,5 +1,3 @@ -from __future__ import annotations - from django.db.models import OuterRef from django.db.models import Subquery from django.db.models import Value diff --git a/home/migrations/0001_initial.py b/home/migrations/0001_initial.py index b5a01c2a..b95183f4 100644 --- a/home/migrations/0001_initial.py +++ b/home/migrations/0001_initial.py @@ -1,5 +1,3 @@ -from __future__ import annotations - from django.db import migrations from django.db import models diff --git a/home/migrations/0002_create_homepage.py b/home/migrations/0002_create_homepage.py index f07812ac..a8586fb2 100644 --- a/home/migrations/0002_create_homepage.py +++ b/home/migrations/0002_create_homepage.py @@ -1,5 +1,3 @@ -from __future__ import annotations - from django.db import migrations diff --git a/home/migrations/0003_signuppage_signupfield.py b/home/migrations/0003_signuppage_signupfield.py index 31488c1f..03e911be 100644 --- a/home/migrations/0003_signuppage_signupfield.py +++ b/home/migrations/0003_signuppage_signupfield.py @@ -1,6 +1,4 @@ # Generated by Django 4.1.3 on 2022-12-27 22:23 -from __future__ import annotations - import django.db.models.deletion import modelcluster.fields import wagtail.contrib.forms.models diff --git a/home/migrations/0004_speaker_speakerlink.py b/home/migrations/0004_speaker_speakerlink.py index 26a12f28..7e8bc8f5 100644 --- a/home/migrations/0004_speaker_speakerlink.py +++ b/home/migrations/0004_speaker_speakerlink.py @@ -1,6 +1,4 @@ # Generated by Django 4.1.3 on 2022-12-27 23:41 -from __future__ import annotations - import django.db.models.deletion import modelcluster.fields from django.db import migrations diff --git a/home/migrations/0005_remove_speakerlink_speaker_delete_speaker_and_more.py b/home/migrations/0005_remove_speakerlink_speaker_delete_speaker_and_more.py index 0d7f81ac..b0476f88 100644 --- a/home/migrations/0005_remove_speakerlink_speaker_delete_speaker_and_more.py +++ b/home/migrations/0005_remove_speakerlink_speaker_delete_speaker_and_more.py @@ -1,6 +1,4 @@ # Generated by Django 4.1.5 on 2023-01-06 17:26 -from __future__ import annotations - from django.db import migrations diff --git a/home/migrations/0006_category_session_event.py b/home/migrations/0006_category_session_event.py index 30c4fd73..b747d9c1 100644 --- a/home/migrations/0006_category_session_event.py +++ b/home/migrations/0006_category_session_event.py @@ -1,6 +1,4 @@ # Generated by Django 4.1.5 on 2023-01-06 19:24 -from __future__ import annotations - import django.db.models.deletion from django.conf import settings from django.db import migrations diff --git a/home/migrations/0007_eventtag_remove_event_categories_delete_category_and_more.py b/home/migrations/0007_eventtag_remove_event_categories_delete_category_and_more.py index 582ee834..deb5f502 100644 --- a/home/migrations/0007_eventtag_remove_event_categories_delete_category_and_more.py +++ b/home/migrations/0007_eventtag_remove_event_categories_delete_category_and_more.py @@ -1,6 +1,4 @@ # Generated by Django 4.1.5 on 2023-01-23 22:56 -from __future__ import annotations - import django.db.models.deletion import modelcluster.fields import taggit.managers diff --git a/home/migrations/0008_event_slug.py b/home/migrations/0008_event_slug.py index 79392901..7822fb84 100644 --- a/home/migrations/0008_event_slug.py +++ b/home/migrations/0008_event_slug.py @@ -1,6 +1,4 @@ # Generated by Django 4.1.12 on 2023-10-06 12:29 -from __future__ import annotations - from django.db import migrations from django.db import models from django.utils.text import slugify diff --git a/home/migrations/0009_alter_event_start_time.py b/home/migrations/0009_alter_event_start_time.py index eb1d18a8..38ef7944 100644 --- a/home/migrations/0009_alter_event_start_time.py +++ b/home/migrations/0009_alter_event_start_time.py @@ -1,6 +1,4 @@ # Generated by Django 4.1.12 on 2023-10-06 12:38 -from __future__ import annotations - from django.db import migrations from django.db import models diff --git a/home/migrations/0010_rename_session_participants_session_old_participants.py b/home/migrations/0010_rename_session_participants_session_old_participants.py index 6c7192cf..968c483e 100644 --- a/home/migrations/0010_rename_session_participants_session_old_participants.py +++ b/home/migrations/0010_rename_session_participants_session_old_participants.py @@ -1,6 +1,4 @@ # Generated by Django 4.1.12 on 2023-10-07 12:05 -from __future__ import annotations - from django.conf import settings from django.db import migrations diff --git a/home/migrations/0011_alter_session_old_participants_sessionmembership_and_more.py b/home/migrations/0011_alter_session_old_participants_sessionmembership_and_more.py index c2b41d0e..03f7a95e 100644 --- a/home/migrations/0011_alter_session_old_participants_sessionmembership_and_more.py +++ b/home/migrations/0011_alter_session_old_participants_sessionmembership_and_more.py @@ -1,6 +1,4 @@ # Generated by Django 4.1.12 on 2023-10-07 12:07 -from __future__ import annotations - import django.db.models.deletion from django.conf import settings from django.db import migrations diff --git a/home/migrations/0012_remove_session_old_participants.py b/home/migrations/0012_remove_session_old_participants.py index cf4d6f84..aa67bae4 100644 --- a/home/migrations/0012_remove_session_old_participants.py +++ b/home/migrations/0012_remove_session_old_participants.py @@ -1,6 +1,4 @@ # Generated by Django 4.1.12 on 2023-10-07 12:09 -from __future__ import annotations - from django.db import migrations diff --git a/home/migrations/0013_sessionmembership_unique_session_membership.py b/home/migrations/0013_sessionmembership_unique_session_membership.py index cc63071a..aebd482d 100644 --- a/home/migrations/0013_sessionmembership_unique_session_membership.py +++ b/home/migrations/0013_sessionmembership_unique_session_membership.py @@ -1,6 +1,4 @@ # Generated by Django 4.1.12 on 2023-10-07 12:26 -from __future__ import annotations - from django.db import migrations from django.db import models diff --git a/home/migrations/0014_session_slug_alter_event_slug.py b/home/migrations/0014_session_slug_alter_event_slug.py index 7da6a729..b6457f8c 100644 --- a/home/migrations/0014_session_slug_alter_event_slug.py +++ b/home/migrations/0014_session_slug_alter_event_slug.py @@ -1,6 +1,4 @@ # Generated by Django 4.1.12 on 2023-10-07 12:32 -from __future__ import annotations - from django.db import migrations from django.db import models from django.utils.text import slugify diff --git a/home/migrations/0015_alter_event_slug_alter_session_slug.py b/home/migrations/0015_alter_event_slug_alter_session_slug.py index 7b9062c2..6f05b8ff 100644 --- a/home/migrations/0015_alter_event_slug_alter_session_slug.py +++ b/home/migrations/0015_alter_event_slug_alter_session_slug.py @@ -1,6 +1,4 @@ # Generated by Django 4.1.12 on 2023-10-07 12:34 -from __future__ import annotations - from django.db import migrations from django.db import models diff --git a/home/migrations/0016_session_application_end_date_and_more.py b/home/migrations/0016_session_application_end_date_and_more.py index 507024bb..b70bf060 100644 --- a/home/migrations/0016_session_application_end_date_and_more.py +++ b/home/migrations/0016_session_application_end_date_and_more.py @@ -1,6 +1,4 @@ # Generated by Django 4.1.12 on 2023-10-07 13:30 -from __future__ import annotations - import django.utils.timezone from django.db import migrations from django.db import models diff --git a/home/migrations/0017_generalpage_generaltag_generalpage_tags.py b/home/migrations/0017_generalpage_generaltag_generalpage_tags.py index 7481f39f..537a4039 100644 --- a/home/migrations/0017_generalpage_generaltag_generalpage_tags.py +++ b/home/migrations/0017_generalpage_generaltag_generalpage_tags.py @@ -1,6 +1,4 @@ # Generated by Django 4.1.5 on 2023-12-11 04:42 -from __future__ import annotations - import django.db.models.deletion import modelcluster.contrib.taggit import modelcluster.fields diff --git a/home/migrations/0018_alter_generalpage_content.py b/home/migrations/0018_alter_generalpage_content.py index 4f3f644d..6b6ba8a1 100644 --- a/home/migrations/0018_alter_generalpage_content.py +++ b/home/migrations/0018_alter_generalpage_content.py @@ -1,6 +1,4 @@ # Generated by Django 4.1.13 on 2023-12-29 06:35 -from __future__ import annotations - import wagtail.blocks import wagtail.contrib.table_block.blocks import wagtail.fields diff --git a/home/migrations/0019_alter_event_organizers_alter_event_rsvped_members_and_more.py b/home/migrations/0019_alter_event_organizers_alter_event_rsvped_members_and_more.py index 4b7e7563..b4146cdf 100644 --- a/home/migrations/0019_alter_event_organizers_alter_event_rsvped_members_and_more.py +++ b/home/migrations/0019_alter_event_organizers_alter_event_rsvped_members_and_more.py @@ -1,6 +1,4 @@ # Generated by Django 4.1.13 on 2024-01-11 02:41 -from __future__ import annotations - from django.conf import settings from django.db import migrations from django.db import models diff --git a/home/migrations/0020_alter_generalpage_content.py b/home/migrations/0020_alter_generalpage_content.py index 71f75080..26736337 100644 --- a/home/migrations/0020_alter_generalpage_content.py +++ b/home/migrations/0020_alter_generalpage_content.py @@ -1,6 +1,4 @@ # Generated by Django 4.1.13 on 2024-01-23 01:46 -from __future__ import annotations - import wagtail.blocks import wagtail.contrib.table_block.blocks import wagtail.fields diff --git a/home/migrations/0021_question_survey_usersurveyresponse_and_more.py b/home/migrations/0021_question_survey_usersurveyresponse_and_more.py index 3ffe71d1..fa45f900 100644 --- a/home/migrations/0021_question_survey_usersurveyresponse_and_more.py +++ b/home/migrations/0021_question_survey_usersurveyresponse_and_more.py @@ -1,6 +1,4 @@ # Generated by Django 4.1.13 on 2024-02-23 07:56 -from __future__ import annotations - import django.db.models.deletion from django.conf import settings from django.db import migrations diff --git a/home/migrations/0022_remove_signuppage_page_ptr_delete_signupfield_and_more.py b/home/migrations/0022_remove_signuppage_page_ptr_delete_signupfield_and_more.py index 7915865f..6dff1dfb 100644 --- a/home/migrations/0022_remove_signuppage_page_ptr_delete_signupfield_and_more.py +++ b/home/migrations/0022_remove_signuppage_page_ptr_delete_signupfield_and_more.py @@ -1,6 +1,4 @@ # Generated by Django 4.1.13 on 2024-02-25 17:12 -from __future__ import annotations - from django.db import migrations diff --git a/home/migrations/0023_alter_question_choices_alter_question_type_field_and_more.py b/home/migrations/0023_alter_question_choices_alter_question_type_field_and_more.py index 3573dbdd..62921ee2 100644 --- a/home/migrations/0023_alter_question_choices_alter_question_type_field_and_more.py +++ b/home/migrations/0023_alter_question_choices_alter_question_type_field_and_more.py @@ -1,6 +1,4 @@ # Generated by Django 4.1.13 on 2024-02-25 19:25 -from __future__ import annotations - import django.db.models.deletion from django.db import migrations from django.db import models diff --git a/home/migrations/0024_alter_question_help_text_alter_question_key.py b/home/migrations/0024_alter_question_help_text_alter_question_key.py index 77090aa1..904a781a 100644 --- a/home/migrations/0024_alter_question_help_text_alter_question_key.py +++ b/home/migrations/0024_alter_question_help_text_alter_question_key.py @@ -1,6 +1,4 @@ # Generated by Django 4.1.13 on 2024-03-26 14:57 -from __future__ import annotations - from django.db import migrations from django.db import models diff --git a/home/migrations/0025_alter_generalpage_content.py b/home/migrations/0025_alter_generalpage_content.py index 99443e68..74edb5d6 100644 --- a/home/migrations/0025_alter_generalpage_content.py +++ b/home/migrations/0025_alter_generalpage_content.py @@ -1,6 +1,4 @@ # Generated by Django 4.1.13 on 2024-03-26 21:21 -from __future__ import annotations - import wagtail.blocks import wagtail.fields import wagtail.images.blocks diff --git a/home/migrations/0026_session_application_survey_and_more.py b/home/migrations/0026_session_application_survey_and_more.py index 34139242..3dd0f3aa 100644 --- a/home/migrations/0026_session_application_survey_and_more.py +++ b/home/migrations/0026_session_application_survey_and_more.py @@ -1,6 +1,4 @@ # Generated by Django 4.1.13 on 2024-03-27 17:27 -from __future__ import annotations - import django.db.models.deletion from django.db import migrations from django.db import models diff --git a/home/migrations/0027_alter_generalpage_content_optional_fields.py b/home/migrations/0027_alter_generalpage_content_optional_fields.py index 792ac1de..37b30170 100644 --- a/home/migrations/0027_alter_generalpage_content_optional_fields.py +++ b/home/migrations/0027_alter_generalpage_content_optional_fields.py @@ -1,6 +1,4 @@ # Generated by Django 4.1.13 on 2024-04-03 17:07 -from __future__ import annotations - import wagtail.blocks import wagtail.fields import wagtail.images.blocks diff --git a/home/migrations/0028_alter_generalpage_content_vert_image_card.py b/home/migrations/0028_alter_generalpage_content_vert_image_card.py index b16e77b0..cf1aa769 100644 --- a/home/migrations/0028_alter_generalpage_content_vert_image_card.py +++ b/home/migrations/0028_alter_generalpage_content_vert_image_card.py @@ -1,6 +1,4 @@ # Generated by Django 4.1.13 on 2024-04-03 21:30 -from __future__ import annotations - import wagtail.blocks import wagtail.fields import wagtail.images.blocks diff --git a/home/migrations/0029_alter_generalpage_content_listblock.py b/home/migrations/0029_alter_generalpage_content_listblock.py index 60513fa9..250c4441 100644 --- a/home/migrations/0029_alter_generalpage_content_listblock.py +++ b/home/migrations/0029_alter_generalpage_content_listblock.py @@ -1,6 +1,4 @@ # Generated by Django 4.1.13 on 2024-04-03 21:35 -from __future__ import annotations - import wagtail.blocks import wagtail.fields import wagtail.images.blocks diff --git a/home/models/__init__.py b/home/models/__init__.py index e9fa390c..95d16efa 100644 --- a/home/models/__init__.py +++ b/home/models/__init__.py @@ -1,5 +1,3 @@ -from __future__ import annotations - from .blog import * from .event import * from .session import * diff --git a/home/models/blog.py b/home/models/blog.py index 8e9f2df1..059f6378 100644 --- a/home/models/blog.py +++ b/home/models/blog.py @@ -1,5 +1,3 @@ -from __future__ import annotations - from django.db import models from django.utils.translation import gettext_lazy as _ from modelcluster.contrib.taggit import ClusterTaggableManager diff --git a/home/models/event.py b/home/models/event.py index 9c4319f3..b8e73958 100644 --- a/home/models/event.py +++ b/home/models/event.py @@ -1,5 +1,3 @@ -from __future__ import annotations - from django.conf import settings from django.core.mail import send_mail from django.db import models diff --git a/home/models/session.py b/home/models/session.py index 550507e9..c55a6531 100644 --- a/home/models/session.py +++ b/home/models/session.py @@ -1,5 +1,3 @@ -from __future__ import annotations - import datetime from django.conf import settings diff --git a/home/models/survey.py b/home/models/survey.py index d8f03156..fcc4035f 100644 --- a/home/models/survey.py +++ b/home/models/survey.py @@ -1,5 +1,3 @@ -from __future__ import annotations - from django.db import models from django.urls import reverse from django.utils.safestring import mark_safe diff --git a/home/puput_migrations/0001_initial.py b/home/puput_migrations/0001_initial.py index 0cb1dec8..f7a6a675 100644 --- a/home/puput_migrations/0001_initial.py +++ b/home/puput_migrations/0001_initial.py @@ -1,6 +1,4 @@ # Generated by Django 4.1.5 on 2023-12-11 05:50 -from __future__ import annotations - import datetime import colorful.fields diff --git a/home/puput_migrations/0002_entrypage_markdown_body.py b/home/puput_migrations/0002_entrypage_markdown_body.py index a3958136..9197fb1b 100644 --- a/home/puput_migrations/0002_entrypage_markdown_body.py +++ b/home/puput_migrations/0002_entrypage_markdown_body.py @@ -1,6 +1,4 @@ # Generated by Django 4.1.13 on 2023-12-11 07:40 -from __future__ import annotations - import wagtailmarkdown.fields from django.db import migrations diff --git a/home/puput_migrations/0003_alter_entrypage_body.py b/home/puput_migrations/0003_alter_entrypage_body.py index 5e8ae926..5aeb1207 100644 --- a/home/puput_migrations/0003_alter_entrypage_body.py +++ b/home/puput_migrations/0003_alter_entrypage_body.py @@ -1,6 +1,4 @@ # Generated by Django 4.1.5 on 2023-12-27 17:52 -from __future__ import annotations - import wagtail.blocks import wagtail.contrib.table_block.blocks import wagtail.fields diff --git a/home/puput_migrations/0004_alter_entrypage_body.py b/home/puput_migrations/0004_alter_entrypage_body.py index 361a422d..ee57f969 100644 --- a/home/puput_migrations/0004_alter_entrypage_body.py +++ b/home/puput_migrations/0004_alter_entrypage_body.py @@ -1,6 +1,4 @@ # Generated by Django 4.1.13 on 2023-12-29 09:41 -from __future__ import annotations - import wagtail.blocks import wagtail.fields import wagtail.images.blocks diff --git a/home/puput_migrations/0005_alter_entrypage_body.py b/home/puput_migrations/0005_alter_entrypage_body.py index ff045fe3..2b9d7327 100644 --- a/home/puput_migrations/0005_alter_entrypage_body.py +++ b/home/puput_migrations/0005_alter_entrypage_body.py @@ -1,6 +1,4 @@ # Generated by Django 4.1.13 on 2024-01-01 18:06 -from __future__ import annotations - import wagtail.blocks import wagtail.fields import wagtail.images.blocks diff --git a/home/puput_migrations/0006_alter_entrypage_body_optional_fields.py b/home/puput_migrations/0006_alter_entrypage_body_optional_fields.py index a0e6cd20..93e92917 100644 --- a/home/puput_migrations/0006_alter_entrypage_body_optional_fields.py +++ b/home/puput_migrations/0006_alter_entrypage_body_optional_fields.py @@ -1,6 +1,4 @@ # Generated by Django 4.1.13 on 2024-04-03 17:07 -from __future__ import annotations - import wagtail.blocks import wagtail.fields import wagtail.images.blocks diff --git a/home/puput_migrations/0007_alter_entrypage_body_vert_image_card.py b/home/puput_migrations/0007_alter_entrypage_body_vert_image_card.py index 2347cdaa..47d828d6 100644 --- a/home/puput_migrations/0007_alter_entrypage_body_vert_image_card.py +++ b/home/puput_migrations/0007_alter_entrypage_body_vert_image_card.py @@ -1,6 +1,4 @@ # Generated by Django 4.1.13 on 2024-04-03 21:30 -from __future__ import annotations - import wagtail.blocks import wagtail.fields import wagtail.images.blocks diff --git a/home/puput_migrations/0008_alter_entrypage_body_listblock.py b/home/puput_migrations/0008_alter_entrypage_body_listblock.py index 50d317a7..ded77ffd 100644 --- a/home/puput_migrations/0008_alter_entrypage_body_listblock.py +++ b/home/puput_migrations/0008_alter_entrypage_body_listblock.py @@ -1,6 +1,4 @@ # Generated by Django 4.1.13 on 2024-04-03 21:35 -from __future__ import annotations - import wagtail.blocks import wagtail.fields import wagtail.images.blocks diff --git a/home/templates/home/home_page.html b/home/templates/home/home_page.html index 423f75e9..dfc1da82 100644 --- a/home/templates/home/home_page.html +++ b/home/templates/home/home_page.html @@ -16,6 +16,11 @@

W Program Blog +
+ Media + Sponsors + Store +
{% comment %}
@@ -37,6 +42,9 @@

W + + +
diff --git a/home/templatetags/survey.py b/home/templatetags/survey.py index cfe64ddf..50bb557a 100644 --- a/home/templatetags/survey.py +++ b/home/templatetags/survey.py @@ -1,5 +1,3 @@ -from __future__ import annotations - from django import template from home.utils import create_star as utils_create_star diff --git a/home/tests/test_applications_open_email.py b/home/tests/test_applications_open_email.py index ea081d94..0ec23df5 100644 --- a/home/tests/test_applications_open_email.py +++ b/home/tests/test_applications_open_email.py @@ -1,5 +1,3 @@ -from __future__ import annotations - from datetime import datetime from io import StringIO diff --git a/home/tests/test_event_views.py b/home/tests/test_event_views.py index 8b767727..d7d87904 100644 --- a/home/tests/test_event_views.py +++ b/home/tests/test_event_views.py @@ -1,5 +1,3 @@ -from __future__ import annotations - from datetime import datetime from datetime import timezone as dt_timezone diff --git a/home/tests/test_forms.py b/home/tests/test_forms.py index 6b8b801f..1ec9d3ad 100644 --- a/home/tests/test_forms.py +++ b/home/tests/test_forms.py @@ -1,5 +1,3 @@ -from __future__ import annotations - from django.test import TestCase from accounts.factories import UserFactory diff --git a/home/tests/test_models.py b/home/tests/test_models.py index d3c51231..057be77b 100644 --- a/home/tests/test_models.py +++ b/home/tests/test_models.py @@ -1,5 +1,3 @@ -from __future__ import annotations - from datetime import datetime from django.test import TestCase diff --git a/home/tests/test_session_views.py b/home/tests/test_session_views.py index 2c16fd5d..bd498e7e 100644 --- a/home/tests/test_session_views.py +++ b/home/tests/test_session_views.py @@ -1,5 +1,3 @@ -from __future__ import annotations - from datetime import datetime from django.test import Client diff --git a/home/tests/test_user_survey_response_form_views.py b/home/tests/test_user_survey_response_form_views.py index 0ffa5f85..480bdb75 100644 --- a/home/tests/test_user_survey_response_form_views.py +++ b/home/tests/test_user_survey_response_form_views.py @@ -1,5 +1,3 @@ -from __future__ import annotations - from django.test import TestCase from django.urls import reverse diff --git a/home/urls.py b/home/urls.py index 60ef0722..eb44871d 100644 --- a/home/urls.py +++ b/home/urls.py @@ -1,5 +1,3 @@ -from __future__ import annotations - from django.urls import path from .views import CreateUserSurveyResponseFormView diff --git a/home/utils.py b/home/utils.py index e63aed5b..2461c606 100644 --- a/home/utils.py +++ b/home/utils.py @@ -1,5 +1,3 @@ -from __future__ import annotations - from django.utils.safestring import mark_safe diff --git a/home/validators.py b/home/validators.py index d5e03086..86bd7619 100644 --- a/home/validators.py +++ b/home/validators.py @@ -1,5 +1,3 @@ -from __future__ import annotations - from django.core.exceptions import ValidationError from django.utils.translation import gettext_lazy as _ diff --git a/home/views.py b/home/views.py index 29ccb6e6..d0a3c42e 100644 --- a/home/views.py +++ b/home/views.py @@ -1,5 +1,3 @@ -from __future__ import annotations - from gettext import gettext from django.contrib import messages diff --git a/home/widgets.py b/home/widgets.py index f8fb1284..f363ca05 100644 --- a/home/widgets.py +++ b/home/widgets.py @@ -1,5 +1,3 @@ -from __future__ import annotations - from django import forms diff --git a/indymeet/settings/base.py b/indymeet/settings/base.py index b17d5e4a..530c1707 100644 --- a/indymeet/settings/base.py +++ b/indymeet/settings/base.py @@ -9,9 +9,8 @@ For the full list of settings and their values, see https://docs.djangoproject.com/en/4.1/ref/settings/ """ -# Build paths inside the project like this: os.path.join(BASE_DIR, ...) -from __future__ import annotations +# Build paths inside the project like this: os.path.join(BASE_DIR, ...) import os import dj_database_url diff --git a/indymeet/settings/dev.py b/indymeet/settings/dev.py index 778b9e53..06507774 100644 --- a/indymeet/settings/dev.py +++ b/indymeet/settings/dev.py @@ -1,8 +1,6 @@ # ---------------------------------------------- # For developing locally # ---------------------------------------------- -from __future__ import annotations - from .base import * # noqa F403 F401 print("----------------------------------") diff --git a/indymeet/settings/production.py b/indymeet/settings/production.py index a2bd5da9..0730c27b 100644 --- a/indymeet/settings/production.py +++ b/indymeet/settings/production.py @@ -1,5 +1,3 @@ -from __future__ import annotations - import sentry_sdk from sentry_sdk.integrations.django import DjangoIntegration diff --git a/indymeet/settings/storages.py b/indymeet/settings/storages.py index eab2552b..f15fc3d4 100644 --- a/indymeet/settings/storages.py +++ b/indymeet/settings/storages.py @@ -1,5 +1,3 @@ -from __future__ import annotations - from django.conf import settings from storages.backends.azure_storage import AzureStorage diff --git a/indymeet/settings/test.py b/indymeet/settings/test.py index de3daf40..bc0e7063 100644 --- a/indymeet/settings/test.py +++ b/indymeet/settings/test.py @@ -1,5 +1,3 @@ -from __future__ import annotations - from .production import * # Get rid of whitenoise "No directory at" warning, as it's not helpful when running tests. diff --git a/indymeet/templates/base.html b/indymeet/templates/base.html index a59c98aa..8687a7a7 100644 --- a/indymeet/templates/base.html +++ b/indymeet/templates/base.html @@ -82,7 +82,7 @@ - + {% include 'includes/nav.html' %} {% if 'Home' not in page.title %} {% include 'includes/breadcrumbs.html' %} @@ -91,7 +91,7 @@ {% wagtailuserbar %} {% include 'includes/messages.html' %} -
+
{% block content %} {# other page stuff goes here #} diff --git a/indymeet/templates/includes/footer.html b/indymeet/templates/includes/footer.html index 7781d014..868262a4 100644 --- a/indymeet/templates/includes/footer.html +++ b/indymeet/templates/includes/footer.html @@ -1,6 +1,6 @@ {% load i18n static wagtailcore_tags wagtailuserbar wagtailimages_tags %}