diff --git a/.github/workflows/formatter.yaml b/.github/workflows/formatter.yaml deleted file mode 100644 index 1a8f62df..00000000 --- a/.github/workflows/formatter.yaml +++ /dev/null @@ -1,36 +0,0 @@ -name: Run code formatters - -on: - push: - branches: - - main - pull_request: - branches: - - main - -jobs: - test: - runs-on: ubuntu-latest - - steps: - - name: Checkout repository - uses: actions/checkout@v2 - - - name: Set up Python - uses: actions/setup-python@v6 - with: - python-version-file: '.python-version' - - - name: Install pip - run: | - python -m pip install --upgrade pip - - - name: Install dependencies - run: | - python -m pip install -e .[dev] - - - name: init pre-commit - run: pre-commit install - - - name: Run pre-commit hooks - run: pre-commit run diff --git a/chipy_org/apps/meetings/urls.py b/chipy_org/apps/meetings/urls.py index a9fee3fd..fe8ae81b 100644 --- a/chipy_org/apps/meetings/urls.py +++ b/chipy_org/apps/meetings/urls.py @@ -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 ( @@ -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"), diff --git a/chipy_org/settings.py b/chipy_org/settings.py index 80e23933..54a2b25e 100644 --- a/chipy_org/settings.py +++ b/chipy_org/settings.py @@ -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", ], @@ -219,11 +218,6 @@ def env_list(key, defaults=None, delimiter=","): SESSION_SERIALIZER = "django.contrib.sessions.serializers.JSONSerializer" INSTALLED_APPS = [ - # Admin Tools - "admin_tools", - "admin_tools.theming", - "admin_tools.menu", - "admin_tools.dashboard", # Django "django.contrib.admin", "django.contrib.auth", @@ -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 = { + "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" diff --git a/chipy_org/settings_test.py b/chipy_org/settings_test.py index 1bdf8a82..e24a268b 100644 --- a/chipy_org/settings_test.py +++ b/chipy_org/settings_test.py @@ -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", ] diff --git a/chipy_org/wsgi.py b/chipy_org/wsgi.py index 88a7974a..0b9f94cc 100644 --- a/chipy_org/wsgi.py +++ b/chipy_org/wsgi.py @@ -1,6 +1,3 @@ -# pylint: disable=pointless-string-statement -from __future__ import unicode_literals - import os from django.core.wsgi import get_wsgi_application diff --git a/dev-requirements.txt b/dev-requirements.txt index 3b08c61f..02d103a3 100644 --- a/dev-requirements.txt +++ b/dev-requirements.txt @@ -1,57 +1,59 @@ # -# This file is autogenerated by pip-compile with Python 3.13 +# This file is autogenerated by pip-compile with Python 3.15 # by the following command: # # pip-compile --constraint=requirements.txt --extra=dev --output-file=dev-requirements.txt pyproject.toml # -asgiref==3.8.1 +asgiref==3.13.0 # via # -c requirements.txt # django -boto3==1.35.96 + # social-auth-app-django +boto3==1.43.118 # via # -c requirements.txt # chipy_website (pyproject.toml) -botocore==1.35.96 +botocore==1.43.118 # via # -c requirements.txt # boto3 # s3transfer -certifi==2024.12.14 +certifi==2026.10.23 # via # -c requirements.txt # requests -cffi==1.17.1 +cffi==2.1.1 # via # -c requirements.txt # cryptography -cfgv==3.4.0 +cfgv==3.5.0 # via pre-commit -charset-normalizer==3.4.1 +charset-normalizer==3.5.2 # via # -c requirements.txt # requests -crispy-bootstrap5==2024.10 +crispy-bootstrap5==2026.9 # via # -c requirements.txt # chipy_website (pyproject.toml) -cryptography==44.0.0 +cryptography==50.0.2 # via # -c requirements.txt + # pyjwt # python-openid2 # social-auth-core -defusedxml==0.8.0rc2 +defusedxml==0.7.1 # via # -c requirements.txt # python3-openid # social-auth-core -distlib==0.3.9 +distlib==0.4.4 # via virtualenv -dj-database-url==2.3.0 +dj-database-url==3.1.2 # via # -c requirements.txt # chipy_website (pyproject.toml) -django==5.1.5 +django==6.1 # via # -c requirements.txt # chipy_website (pyproject.toml) @@ -67,16 +69,12 @@ django==5.1.5 # django-tinymce # djangorestframework # social-auth-app-django -django-admin-tools==0.9.3 - # via - # -c requirements.txt - # chipy_website (pyproject.toml) -django-crispy-forms==2.3 +django-crispy-forms==2.7 # via # -c requirements.txt # chipy_website (pyproject.toml) # crispy-bootstrap5 -django-extensions==3.2.3 +django-extensions==4.1 # via # -c requirements.txt # chipy_website (pyproject.toml) @@ -84,7 +82,7 @@ django-flatblocks==1.0.0 # via # -c requirements.txt # chipy_website (pyproject.toml) -django-grappelli==4.0.1 +django-grappelli==5.0.1 # via # -c requirements.txt # chipy_website (pyproject.toml) @@ -92,7 +90,7 @@ django-gravatar2==1.4.5 # via # -c requirements.txt # chipy_website (pyproject.toml) -django-honeypot==1.2.1 +django-honeypot==1.3.0 # via # -c requirements.txt # chipy_website (pyproject.toml) @@ -100,100 +98,106 @@ django-ical==1.9.2 # via # -c requirements.txt # chipy_website (pyproject.toml) -django-recaptcha==4.0.0 +django-recaptcha==4.1.0 # via # -c requirements.txt # chipy_website (pyproject.toml) -django-recurrence==1.11.1 +django-recurrence==1.14 # via # -c requirements.txt # django-ical -django-storages==1.14.4 +django-storages==1.14.6 # via # -c requirements.txt # chipy_website (pyproject.toml) -django-tinymce==4.1.0 +django-tinymce==5.0.0 # via # -c requirements.txt # chipy_website (pyproject.toml) -djangorestframework==3.15.2 +djangorestframework==3.18.3 # via # -c requirements.txt # chipy_website (pyproject.toml) -filelock==3.16.1 - # via virtualenv -freezegun==1.5.1 +filelock==4.2.4 + # via + # python-discovery + # virtualenv +freezegun==1.5.5 # via chipy_website (pyproject.toml) -gunicorn==23.0.0 +gunicorn==26.2.0 # via # -c requirements.txt # chipy_website (pyproject.toml) -icalendar==6.1.0 +icalendar==7.3.0 # via # -c requirements.txt # django-ical -identify==2.6.5 +identify==2.6.20 # via pre-commit -idna==3.10 +idna==3.20 # via # -c requirements.txt # requests -iniconfig==2.0.0 +iniconfig==2.3.1 # via pytest -isort==5.13.2 +isort==9.0.2 # via chipy_website (pyproject.toml) -jmespath==1.0.1 +jmespath==1.1.0 # via # -c requirements.txt # boto3 # botocore -lxml==5.3.0 +lxml==6.1.3 # via # -c requirements.txt # python-openid2 -nh3==0.2.20 +mypy-extensions==1.1.0 + # via isort +nh3==0.3.7 # via # -c requirements.txt # chipy_website (pyproject.toml) -nodeenv==1.9.1 +nodeenv==1.11.0 # via pre-commit -oauthlib==3.2.2 +oauthlib==4.0.0 # via # -c requirements.txt # requests-oauthlib # social-auth-core -packaging==24.2 +packaging==26.3 # via - # -c requirements.txt - # gunicorn # pytest -pillow==11.1.0 + # virtualenv +pillow==13.0.0 # via # -c requirements.txt # chipy_website (pyproject.toml) -platformdirs==4.3.6 +platformdirs==4.13.5 # via virtualenv -pluggy==1.5.0 +pluggy==1.7.0 # via pytest -pre-commit==4.0.1 +pre-commit==4.7.0 # via chipy_website (pyproject.toml) -psycopg2-binary==2.9.10 +psycopg2-binary==2.9.13 # via # -c requirements.txt # chipy_website (pyproject.toml) -pycparser==2.22 +pycparser==3.12 # via # -c requirements.txt # cffi -pyjwt==2.10.1 +pygments==2.21.0 + # via pytest +pyjwt[crypto]==2.15.1 # via # -c requirements.txt + # pyjwt # social-auth-core -pytest==8.3.4 +pytest==9.1.1 # via # chipy_website (pyproject.toml) # pytest-django -pytest-django==4.9.0 +pytest-django==4.14.0 # via chipy_website (pyproject.toml) python-dateutil==2.9.0.post0 # via @@ -202,6 +206,8 @@ python-dateutil==2.9.0.post0 # django-recurrence # freezegun # icalendar +python-discovery==1.6.4 + # via virtualenv python-openid2==3.2 # via # -c requirements.txt @@ -210,9 +216,9 @@ python3-openid==3.2.0 # via # -c requirements.txt # social-auth-core -pyyaml==6.0.2 +pyyaml==6.0.3 # via pre-commit -requests==2.32.3 +requests==2.34.2 # via # -c requirements.txt # chipy_website (pyproject.toml) @@ -222,9 +228,9 @@ requests-oauthlib==2.0.0 # via # -c requirements.txt # social-auth-core -ruff==0.9.1 +ruff==0.17.2 # via chipy_website (pyproject.toml) -s3transfer==0.10.4 +s3transfer==0.19.3 # via # -c requirements.txt # boto3 @@ -234,40 +240,36 @@ six==1.17.0 # chipy_website (pyproject.toml) # python-dateutil # python-openid2 -social-auth-app-django==5.4.2 +social-auth-app-django==7.2.0 # via # -c requirements.txt # chipy_website (pyproject.toml) -social-auth-core==4.5.4 +social-auth-core==6.2.0 # via # -c requirements.txt # social-auth-app-django -sorl-thumbnail==12.11.0 +sorl-thumbnail==13.4.0 # via # -c requirements.txt # chipy_website (pyproject.toml) -sqlparse==0.5.3 +sqlparse==0.6.0 # via # -c requirements.txt # django -typing-extensions==4.12.2 - # via - # -c requirements.txt - # dj-database-url -tzdata==2024.2 +tzdata==2026.5 # via # -c requirements.txt # icalendar -urllib3==2.3.0 +urllib3==2.8.0 # via # -c requirements.txt # botocore # requests -uwsgi==2.0.28 +uwsgi==2.0.31 # via chipy_website (pyproject.toml) -virtualenv==20.28.1 +virtualenv==21.14.13 # via pre-commit -whitenoise==6.8.2 +whitenoise==6.12.0 # via # -c requirements.txt # chipy_website (pyproject.toml) diff --git a/docker-compose.yml b/docker-compose.yml index bd25cd46..1877e982 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,7 +1,7 @@ services: db: - image: postgres:14-alpine + image: postgres:18-alpine env_file: - docker/docker.env volumes: diff --git a/docker/Dockerfile b/docker/Dockerfile index 09f24358..ccb90fb0 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -1,4 +1,4 @@ -FROM python:3.13.1-slim +FROM python:3.15-slim # install os dependencies; clean apt cache RUN apt-get update && apt-get install -y \ diff --git a/pyproject.toml b/pyproject.toml index ccaca9b9..6067474b 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -4,7 +4,7 @@ build-backend = "hatchling.build" [project] name = "chipy_website" -version="2.5.0" +version="2.6.1" description = "The ChiPy Website" objects.license = { text = "MIT License" } requires-python = ">=3.13.1" @@ -14,20 +14,16 @@ authors = [ classifiers = [ "Programming Language :: Python :: 3", "Programming Language :: Python :: 3 :: Only", - "Programming Language :: Python :: 3.8", - "Programming Language :: Python :: 3.9", - "Programming Language :: Python :: 3.10", - "Programming Language :: Python :: 3.11", - "Programming Language :: Python :: 3.12", "Programming Language :: Python :: 3.13", + "Programming Language :: Python :: 3.14", + "Programming Language :: Python :: 3.15", ] dependencies = [ "boto3", "crispy-bootstrap5", "dj-database-url", - "django==5.1.5", - "django-admin-tools", + "django==6.1", "django-crispy-forms", "django-extensions", "django-flatblocks", diff --git a/requirements.txt b/requirements.txt index d80d48a0..6a3bcd04 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,36 +1,39 @@ # -# This file is autogenerated by pip-compile with Python 3.13 +# This file is autogenerated by pip-compile with Python 3.15 # by the following command: # # pip-compile --output-file=requirements.txt pyproject.toml # -asgiref==3.8.1 - # via django -boto3==1.35.96 +asgiref==3.13.0 + # via + # django + # social-auth-app-django +boto3==1.43.118 # via chipy_website (pyproject.toml) -botocore==1.35.96 +botocore==1.43.118 # via # boto3 # s3transfer -certifi==2024.12.14 +certifi==2026.10.23 # via requests -cffi==1.17.1 +cffi==2.1.1 # via cryptography -charset-normalizer==3.4.1 +charset-normalizer==3.5.2 # via requests -crispy-bootstrap5==2024.10 +crispy-bootstrap5==2026.9 # via chipy_website (pyproject.toml) -cryptography==44.0.0 +cryptography==50.0.2 # via + # pyjwt # python-openid2 # social-auth-core -defusedxml==0.8.0rc2 +defusedxml==0.7.1 # via # python3-openid # social-auth-core -dj-database-url==2.3.0 +dj-database-url==3.1.2 # via chipy_website (pyproject.toml) -django==5.1.5 +django==6.1 # via # chipy_website (pyproject.toml) # crispy-bootstrap5 @@ -45,62 +48,60 @@ django==5.1.5 # django-tinymce # djangorestframework # social-auth-app-django -django-admin-tools==0.9.3 - # via chipy_website (pyproject.toml) -django-crispy-forms==2.3 +django-crispy-forms==2.7 # via # chipy_website (pyproject.toml) # crispy-bootstrap5 -django-extensions==3.2.3 +django-extensions==4.1 # via chipy_website (pyproject.toml) django-flatblocks==1.0.0 # via chipy_website (pyproject.toml) -django-grappelli==4.0.1 +django-grappelli==5.0.1 # via chipy_website (pyproject.toml) django-gravatar2==1.4.5 # via chipy_website (pyproject.toml) -django-honeypot==1.2.1 +django-honeypot==1.3.0 # via chipy_website (pyproject.toml) django-ical==1.9.2 # via chipy_website (pyproject.toml) -django-recaptcha==4.0.0 +django-recaptcha==4.1.0 # via chipy_website (pyproject.toml) -django-recurrence==1.11.1 +django-recurrence==1.14 # via django-ical -django-storages==1.14.4 +django-storages==1.14.6 # via chipy_website (pyproject.toml) -django-tinymce==4.1.0 +django-tinymce==5.0.0 # via chipy_website (pyproject.toml) -djangorestframework==3.15.2 +djangorestframework==3.18.3 # via chipy_website (pyproject.toml) -gunicorn==23.0.0 +gunicorn==26.2.0 # via chipy_website (pyproject.toml) -icalendar==6.1.0 +icalendar==7.3.0 # via django-ical -idna==3.10 +idna==3.20 # via requests -jmespath==1.0.1 +jmespath==1.1.0 # via # boto3 # botocore -lxml==5.3.0 +lxml==6.1.3 # via python-openid2 -nh3==0.2.20 +nh3==0.3.7 # via chipy_website (pyproject.toml) -oauthlib==3.2.2 +oauthlib==4.0.0 # via # requests-oauthlib # social-auth-core -packaging==24.2 - # via gunicorn -pillow==11.1.0 +pillow==13.0.0 # via chipy_website (pyproject.toml) -psycopg2-binary==2.9.10 +psycopg2-binary==2.9.13 # via chipy_website (pyproject.toml) -pycparser==2.22 +pycparser==3.12 # via cffi -pyjwt==2.10.1 - # via social-auth-core +pyjwt[crypto]==2.15.1 + # via + # pyjwt + # social-auth-core python-dateutil==2.9.0.post0 # via # botocore @@ -110,35 +111,33 @@ python-openid2==3.2 # via chipy_website (pyproject.toml) python3-openid==3.2.0 # via social-auth-core -requests==2.32.3 +requests==2.34.2 # via # chipy_website (pyproject.toml) # requests-oauthlib # social-auth-core requests-oauthlib==2.0.0 # via social-auth-core -s3transfer==0.10.4 +s3transfer==0.19.3 # via boto3 six==1.17.0 # via # chipy_website (pyproject.toml) # python-dateutil # python-openid2 -social-auth-app-django==5.4.2 +social-auth-app-django==7.2.0 # via chipy_website (pyproject.toml) -social-auth-core==4.5.4 +social-auth-core==6.2.0 # via social-auth-app-django -sorl-thumbnail==12.11.0 +sorl-thumbnail==13.4.0 # via chipy_website (pyproject.toml) -sqlparse==0.5.3 +sqlparse==0.6.0 # via django -typing-extensions==4.12.2 - # via dj-database-url -tzdata==2024.2 +tzdata==2026.5 # via icalendar -urllib3==2.3.0 +urllib3==2.8.0 # via # botocore # requests -whitenoise==6.8.2 +whitenoise==6.12.0 # via chipy_website (pyproject.toml)