Skip to content

Commit

Permalink
Merge pull request #431 from djangonaut-space/develop
Browse files Browse the repository at this point in the history
Production Release

- Feat: sticky footer #419
- Add step to install pre-commit in readme #378
- Add basic load test utilities to the application. #349
- Update pre-commit versions #422
- Added header links for other Wagtail pages. #429
- Added YouTube icon to the footer of landing page. #428
  • Loading branch information
tim-schilling authored Dec 4, 2024
2 parents bf111dd + a06089b commit 3f10452
Show file tree
Hide file tree
Showing 111 changed files with 118 additions and 234 deletions.
34 changes: 12 additions & 22 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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:
Expand Down
9 changes: 5 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 0 additions & 2 deletions accounts/admin.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
from __future__ import annotations

import csv

from django.contrib import admin
Expand Down
2 changes: 0 additions & 2 deletions accounts/apps.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
from __future__ import annotations

from django.apps import AppConfig


Expand Down
2 changes: 0 additions & 2 deletions accounts/factories.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
from __future__ import annotations

import factory
from django.db.models.signals import post_save

Expand Down
2 changes: 0 additions & 2 deletions accounts/fields.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
from __future__ import annotations

from django.db.models.fields import related


Expand Down
2 changes: 0 additions & 2 deletions accounts/forms.py
Original file line number Diff line number Diff line change
@@ -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
Expand Down
1 change: 0 additions & 1 deletion accounts/management/commands/create_playwright_user.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
"""
Management utility to create playwright test user.
"""
from __future__ import annotations

import os

Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
from __future__ import annotations

import os

import pytest
Expand Down
2 changes: 0 additions & 2 deletions accounts/migrations/0001_initial.py
Original file line number Diff line number Diff line change
@@ -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
Expand Down
Original file line number Diff line number Diff line change
@@ -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
Expand Down
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 0 additions & 2 deletions accounts/migrations/0004_alter_userprofile_member_role.py
Original file line number Diff line number Diff line change
@@ -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

Expand Down
2 changes: 0 additions & 2 deletions accounts/migrations/0005_userprofile_email_confirmed.py
Original file line number Diff line number Diff line change
@@ -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

Expand Down
Original file line number Diff line number Diff line change
@@ -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

Expand Down
2 changes: 0 additions & 2 deletions accounts/migrations/0007_alter_userprofile_user.py
Original file line number Diff line number Diff line change
@@ -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
Expand Down
Original file line number Diff line number Diff line change
@@ -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

Expand Down
2 changes: 0 additions & 2 deletions accounts/models.py
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 0 additions & 2 deletions accounts/tests/test_activate_view.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
from __future__ import annotations

from django.test import Client
from django.test import TestCase
from django.urls import reverse
Expand Down
2 changes: 0 additions & 2 deletions accounts/tests/test_auth_password_views.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
from __future__ import annotations

from django.core import mail
from django.test import Client
from django.test import TestCase
Expand Down
2 changes: 0 additions & 2 deletions accounts/tests/test_profile_view.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
from __future__ import annotations

from django.test import Client
from django.test import TestCase
from django.urls import reverse
Expand Down
2 changes: 0 additions & 2 deletions accounts/tests/test_resend_confirmation_email.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
from __future__ import annotations

from django.core import mail
from django.test import Client
from django.test import TestCase
Expand Down
2 changes: 0 additions & 2 deletions accounts/tests/test_signup_view.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
from __future__ import annotations

from unittest.mock import patch

from django.core import mail
Expand Down
2 changes: 0 additions & 2 deletions accounts/tests/test_update_email_subscription_view.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
from __future__ import annotations

from django.test import Client
from django.test import TestCase
from django.urls import reverse
Expand Down
2 changes: 0 additions & 2 deletions accounts/tokens.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
from __future__ import annotations

from django.contrib.auth.tokens import PasswordResetTokenGenerator


Expand Down
2 changes: 0 additions & 2 deletions accounts/urls.py
Original file line number Diff line number Diff line change
@@ -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
Expand Down
14 changes: 6 additions & 8 deletions accounts/views.py
Original file line number Diff line number Diff line change
@@ -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
Expand Down Expand Up @@ -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

Expand Down
2 changes: 0 additions & 2 deletions home/admin.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
from __future__ import annotations

from django.contrib import admin

from .models import Event
Expand Down
2 changes: 0 additions & 2 deletions home/apps.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
from __future__ import annotations

from wagtail.images.apps import WagtailImagesAppConfig


Expand Down
2 changes: 0 additions & 2 deletions home/blocks.py
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 0 additions & 2 deletions home/constants.py
Original file line number Diff line number Diff line change
@@ -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 = {
Expand Down
2 changes: 0 additions & 2 deletions home/factories.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
from __future__ import annotations

import factory

from accounts.factories import UserFactory
Expand Down
2 changes: 0 additions & 2 deletions home/forms.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
from __future__ import annotations

from typing import List
from typing import Tuple

Expand Down
2 changes: 0 additions & 2 deletions home/management/commands/applications_open_email.py
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 0 additions & 2 deletions home/managers.py
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 0 additions & 2 deletions home/migrations/0001_initial.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
from __future__ import annotations

from django.db import migrations
from django.db import models

Expand Down
2 changes: 0 additions & 2 deletions home/migrations/0002_create_homepage.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
from __future__ import annotations

from django.db import migrations


Expand Down
2 changes: 0 additions & 2 deletions home/migrations/0003_signuppage_signupfield.py
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 0 additions & 2 deletions home/migrations/0004_speaker_speakerlink.py
Original file line number Diff line number Diff line change
@@ -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
Expand Down
Original file line number Diff line number Diff line change
@@ -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


Expand Down
2 changes: 0 additions & 2 deletions home/migrations/0006_category_session_event.py
Original file line number Diff line number Diff line change
@@ -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
Expand Down
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 0 additions & 2 deletions home/migrations/0008_event_slug.py
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 0 additions & 2 deletions home/migrations/0009_alter_event_start_time.py
Original file line number Diff line number Diff line change
@@ -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

Expand Down
Original file line number Diff line number Diff line change
@@ -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

Expand Down
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 0 additions & 2 deletions home/migrations/0012_remove_session_old_participants.py
Original file line number Diff line number Diff line change
@@ -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


Expand Down
Loading

0 comments on commit 3f10452

Please sign in to comment.