Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
36 changes: 0 additions & 36 deletions .github/workflows/formatter.yaml

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Removing the GHA pre-commit workflow, we can run it locally.

This file was deleted.

3 changes: 1 addition & 2 deletions chipy_org/apps/meetings/urls.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
from django.urls import include, path, re_path
from django.urls import path, re_path

from .feeds import MeetingFeed
from .views import (
Expand All @@ -15,7 +15,6 @@

urlpatterns = [
path("", FutureMeetings.as_view(), name="future_meetings"),
path("admin_tools/", include("admin_tools.urls")),
path("status/", MeetingStatus.as_view(), name="meeting_status"),
path("ical/", MeetingFeed(), name="ical_feed"),
path("past/", PastMeetings.as_view(), name="past_meetings"),
Expand Down
24 changes: 12 additions & 12 deletions chipy_org/settings.py
Original file line number Diff line number Diff line change
Expand Up @@ -151,7 +151,6 @@ def env_list(key, defaults=None, delimiter=","):
"social_django.context_processors.login_redirect",
],
"loaders": [
"admin_tools.template_loaders.Loader",
"django.template.loaders.filesystem.Loader",
"django.template.loaders.app_directories.Loader",
],
Expand Down Expand Up @@ -219,11 +218,6 @@ def env_list(key, defaults=None, delimiter=","):
SESSION_SERIALIZER = "django.contrib.sessions.serializers.JSONSerializer"

INSTALLED_APPS = [
# Admin Tools
"admin_tools",

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This package hasn't been updated since 2023 and isn't compatible w/ newer Django releases.

"admin_tools.theming",
"admin_tools.menu",
"admin_tools.dashboard",
# Django
"django.contrib.admin",
"django.contrib.auth",
Expand Down Expand Up @@ -283,12 +277,18 @@ def env_list(key, defaults=None, delimiter=","):

ENVELOPE_EMAIL_RECIPIENTS = env_var("ENVELOPE_EMAIL_RECIPIENTS", "").split(",")

EMAIL_BACKEND = env_var("EMAIL_BACKEND", "django.core.mail.backends.smtp.EmailBackend")
EMAIL_HOST = env_var("EMAIL_HOST", "smtp.sendgrid.net")
EMAIL_HOST_USER = env_var("EMAIL_HOST_USER", env_var("SENDGRID_USERNAME", None))
EMAIL_HOST_PASSWORD = env_var("EMAIL_HOST_PASSWORD", env_var("SENDGRID_PASSWORD", None))
EMAIL_PORT = int(env_var("EMAIL_PORT", 587))
EMAIL_USE_TLS = env_var("EMAIL_USE_TLS", True)
MAILERS = {

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Changed due to deprecation warning.

"default": {
"BACKEND": env_var("EMAIL_BACKEND", "django.core.mail.backends.smtp.EmailBackend"),
"OPTIONS": {
"host": env_var("EMAIL_HOST", "smtp.sendgrid.net"),
"user": env_var("EMAIL_HOST_USER", env_var("SENDGRID_USERNAME", None)),
"password": env_var("EMAIL_HOST_PASSWORD", env_var("SENDGRID_PASSWORD", None)),
# True will set port
"use_tls": env_var("EMAIL_USE_TLS", True),
},
}
}

DEFAULT_FROM_EMAIL = env_var("DEFAULT_FROM_EMAIL", "DoNotReply@chipy.org")
HONEYPOT_FIELD_NAME = "email2"
Expand Down
2 changes: 1 addition & 1 deletion chipy_org/settings_test.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
DATABASES = {"default": {"ENGINE": "django.db.backends.sqlite3", "NAME": ":memory:", "TEST": {}}}
DEBUG = True
ADMINS = ["admin@chipy.org"]
EMAIL_BACKEND = "django.core.mail.backends.console.EmailBackend"
MAILERS = {"default": "django.core.mail.backends.console.EmailBackend"}
ENVELOPE_EMAIL_RECIPIENTS = [
"admin@example.com",
]
Expand Down
3 changes: 0 additions & 3 deletions chipy_org/wsgi.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,3 @@
# pylint: disable=pointless-string-statement
from __future__ import unicode_literals

import os

from django.core.wsgi import get_wsgi_application
Expand Down
Loading
Loading