django-resonant-settings 0.44.0__tar.gz → 0.45.0__tar.gz

{django_resonant_settings-0.44.0 → django_resonant_settings-0.45.0}/.gitignore

@@ -1,9 +1,22 @@
-# Created by https://www.toptal.com/developers/gitignore/api/python
-# Edit at https://www.toptal.com/developers/gitignore?templates=python
+# Created by https://www.toptal.com/developers/gitignore/api/django
+# Edit at https://www.toptal.com/developers/gitignore?templates=django
 
-### Python ###
-# Byte-compiled / optimized / DLL files
+### Django ###
+*.log
+*.pot
+*.pyc
 __pycache__/
+local_settings.py
+db.sqlite3
+db.sqlite3-journal
+media
+
+# If your build process includes running collectstatic, then you probably don't need or want to include staticfiles/
+# in your Git repository. Update and uncomment the following line accordingly.
+# <django-project-name>/staticfiles/
+
+### Django.Python Stack ###
+# Byte-compiled / optimized / DLL files
 *.py[cod]
 *$py.class
 
@@ -57,13 +70,8 @@ cover/
 
 # Translations
 *.mo
-*.pot
 
 # Django stuff:
-*.log
-local_settings.py
-db.sqlite3
-db.sqlite3-journal
 
 # Flask stuff:
 instance/
@@ -163,14 +171,4 @@ cython_debug/
 #  option (not recommended) you can uncomment the following to ignore the entire idea folder.
 #.idea/
 
-### Python Patch ###
-# Poetry local configuration file - https://python-poetry.org/docs/configuration/#local-configuration
-poetry.toml
-
-# ruff
-.ruff_cache/
-
-# LSP config files
-pyrightconfig.json
-
-# End of https://www.toptal.com/developers/gitignore/api/python
+# End of https://www.toptal.com/developers/gitignore/api/django

{django_resonant_settings-0.44.0 → django_resonant_settings-0.45.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: django-resonant-settings
-Version: 0.44.0
+Version: 0.45.0
 Summary: Shared Django settings for Resonant applications.
 Project-URL: Repository, https://github.com/kitware-resonant/cookiecutter-resonant
 Project-URL: Bug Reports, https://github.com/kitware-resonant/cookiecutter-resonant/issues
@@ -8,7 +8,7 @@ Maintainer-email: "Kitware, Inc." <kitware@kitware.com>
 License-Expression: Apache-2.0
 License-File: LICENSE
 License-File: NOTICE
-Keywords: django,resonant,setting,settings
+Keywords: django,kitware-resonant,resonant,setting,settings
 Classifier: Development Status :: 3 - Alpha
 Classifier: Environment :: Web Environment
 Classifier: Framework :: Django
@@ -26,6 +26,7 @@ Classifier: Programming Language :: Python :: 3.13
 Classifier: Programming Language :: Python :: 3.14
 Requires-Python: >=3.10
 Requires-Dist: django-environ
+Requires-Dist: django>=5.1
 Provides-Extra: allauth
 Requires-Dist: django-allauth; extra == 'allauth'
 Provides-Extra: celery

{django_resonant_settings-0.44.0 → django_resonant_settings-0.45.0}/pyproject.toml

@@ -13,27 +13,29 @@ maintainers = [{ name = "Kitware, Inc.", email = "kitware@kitware.com" }]
 keywords = [
   "django",
   "resonant",
+  "kitware-resonant",
   "setting",
   "settings",
 ]
 classifiers = [
   "Development Status :: 3 - Alpha",
   "Environment :: Web Environment",
+  "Framework :: Django",
   "Framework :: Django :: 5",
   "Framework :: Django :: 5.1",
   "Framework :: Django :: 5.2",
-  "Framework :: Django",
   "Intended Audience :: Developers",
   "Operating System :: OS Independent",
+  "Programming Language :: Python",
   "Programming Language :: Python :: 3",
   "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",
 ]
 dependencies = [
+  "django>=5.1",
   "django-environ",
 ]
 dynamic = ["version"]
@@ -56,16 +58,7 @@ dev = [
   "tox-uv",
 ]
 lint = [
-  "flake8",
-  "flake8-black",
-  "flake8-bugbear",
-  "flake8-docstrings",
-  "flake8-isort",
-  "pep8-naming",
-]
-format = [
-  "black",
-  "isort",
+  "ruff",
 ]
 type = [
   "mypy",
@@ -74,7 +67,7 @@ type = [
 ]
 
 [tool.hatch.build]
-packages = [
+only-include = [
   "resonant_settings",
 ]
 
@@ -82,17 +75,57 @@ packages = [
 source = "vcs"
 raw-options = { root = ".." }
 
-[tool.black]
+[tool.ruff]
 line-length = 100
-target-version = ["py310"]
 
-[tool.isort]
-profile = "black"
-line_length = 100
+[tool.ruff.lint]
+select = ["ALL"]
+ignore = [
+  # Incompatible with formatter
+  # https://docs.astral.sh/ruff/formatter/#conflicting-lint-rules
+  "COM812", # missing-trailing-comma
+  "COM819", # prohibited-trailing-comma
+  "D206", # docstring-tab-indentation
+  "D300", # triple-single-quotes
+  "E111", # indentation-with-invalid-multiple
+  "E114", # indentation-with-invalid-multiple-comment
+  "E117", # over-indented
+  "ISC001", # single-line-implicit-string-concatenation
+  "ISC002", # multi-line-implicit-string-concatenation
+  "Q", # flake8-quotes
+  "W191", # tab-indentation
+
+  # Incompatible with Django
+  "A003", # builtin-attribute-shadowing
+  "ARG001", # unused-function-argument
+  "ARG002", # unused-method-argument
+  "RUF012", # mutable-class-default
+
+  # Overly burdensome
+  "ANN", # flake8-annotations
+  "D1", # undocumented-*
+  "EM101", # raw-string-in-exception
+  "ERA001", # commented-out-code
+  "FIX", # flake8-fixme
+  "RET506", # superfluous-else-raise
+  "TD002", # missing-todo-author
+  "TD003", # missing-todo-link
+  "TRY003", # raise-vanilla-args
+
+  # Project-specific
+]
+
+[tool.ruff.lint.flake8-self]
+extend-ignore-names = ["_base_manager", "_default_manager",  "_meta"]
+
+[tool.ruff.lint.isort]
 # Sort by name, don't cluster "from" vs "import"
-force_sort_within_sections = true
-# Combines "as" imports on the same line
-combine_as_imports = true
+force-sort-within-sections = true
+# Deferred annotations allows TC* rules to move more imports into TYPE_CHECKING blocks
+required-imports = ["from __future__ import annotations"]
+
+[tool.ruff.lint.pydocstyle]
+convention = "pep257"
 
 [tool.mypy]
 files = [
@@ -100,6 +133,7 @@ files = [
 ]
 check_untyped_defs = true
 show_error_codes = true
+strict = true
 warn_redundant_casts = true
 warn_unused_configs = true
 warn_unused_ignores = true

{django_resonant_settings-0.44.0 → django_resonant_settings-0.45.0}/resonant_settings/_env.py

@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 import environ
 
 env = environ.Env()

{django_resonant_settings-0.44.0 → django_resonant_settings-0.45.0}/resonant_settings/allauth.py

@@ -1,5 +1,7 @@
 """
-Configure django-allauth with the following features:
+Configure django-allauth.
+
+This provides the following features:
 * Disable usernames for end users, using exclusively email addresses for login
 * Require email verification
 * Quality of life improvements for users
@@ -8,7 +10,12 @@ This requires the `django-allauth` package to be installed and requires
 `resonant_settings.allauth_support` to be added to INSTALLED_APPS.
 """
 
-from collections.abc import Sequence
+from __future__ import annotations
+
+from typing import TYPE_CHECKING
+
+if TYPE_CHECKING:
+    from collections.abc import Sequence
 
 # The sites framework requires this to be set.
 # In the unlikely case where a database's pk sequence for the django_site table is not reset,
@@ -49,16 +56,16 @@ ACCOUNT_CONFIRM_EMAIL_ON_GET = True
 ACCOUNT_PRESERVE_USERNAME_CASING = False
 
 __all__ = [
-    "SITE_ID",
-    "AUTHENTICATION_BACKENDS",
+    "ACCOUNT_ADAPTER",
+    "ACCOUNT_CONFIRM_EMAIL_ON_GET",
     "ACCOUNT_EMAIL_VERIFICATION",
     "ACCOUNT_LOGIN_METHODS",
-    "ACCOUNT_SIGNUP_FIELDS",
-    "ACCOUNT_ADAPTER",
-    "ACCOUNT_USER_MODEL_USERNAME_FIELD",
-    "ACCOUNT_SESSION_REMEMBER",
     "ACCOUNT_LOGIN_ON_EMAIL_CONFIRMATION",
     "ACCOUNT_LOGIN_ON_PASSWORD_RESET",
-    "ACCOUNT_CONFIRM_EMAIL_ON_GET",
     "ACCOUNT_PRESERVE_USERNAME_CASING",
+    "ACCOUNT_SESSION_REMEMBER",
+    "ACCOUNT_SIGNUP_FIELDS",
+    "ACCOUNT_USER_MODEL_USERNAME_FIELD",
+    "AUTHENTICATION_BACKENDS",
+    "SITE_ID",
 ]

django_resonant_settings-0.45.0/resonant_settings/allauth_support/adapter.py

@@ -0,0 +1,16 @@
+from __future__ import annotations
+
+from typing import TYPE_CHECKING
+
+from allauth.account.adapter import DefaultAccountAdapter
+
+if TYPE_CHECKING:
+    from django.contrib.auth.models import AbstractUser
+    from django.http import HttpRequest
+
+
+class EmailAsUsernameAccountAdapter(DefaultAccountAdapter):  # type: ignore[misc]
+    """Automatically populate the username as the email address."""
+
+    def populate_username(self, request: HttpRequest, user: AbstractUser) -> None:
+        user.username = user.email

{django_resonant_settings-0.44.0 → django_resonant_settings-0.45.0}/resonant_settings/allauth_support/apps.py

@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 from django.apps import AppConfig
 
 

{django_resonant_settings-0.44.0 → django_resonant_settings-0.45.0}/resonant_settings/allauth_support/createsuperuser.py

@@ -31,12 +31,12 @@ class Command(createsuperuser.Command):
         with temporarily_change_attributes(self.username_field, _unique=True):
             # Normalize (as it would be done before saving) for better duplicate detection
             username = self.UserModel.normalize_username(username)
-            return super()._validate_username(  # type: ignore[misc]
+            return super()._validate_username(  # type: ignore[misc,no-any-return]
                 username, verbose_field_name, database
             )
 
 
-class EmailAsUsernameProxyUserManager(UserManager):
+class EmailAsUsernameProxyUserManager(UserManager["EmailAsUsernameProxyUser"]):
     # This version of "create_superuser" makes the "username" argument optional
     def create_superuser(
         self,
@@ -46,16 +46,16 @@ class EmailAsUsernameProxyUserManager(UserManager):
         **extra_fields: Any,
     ) -> EmailAsUsernameProxyUser:
         # Practically, email will always be provided
-        assert email
-        user = super().create_superuser(
+        if email is None:
+            raise ValueError("Email address must be provided.")
+        return super().create_superuser(
             username=email, email=email, password=password, **extra_fields
         )
-        return user
 
 
 class EmailAsUsernameProxyUser(User):
     # https://github.com/typeddjango/django-stubs/issues/2112
-    class Meta(User.Meta):  # type: ignore[name-defined]
+    class Meta(User.Meta):  # type: ignore[misc,name-defined]
         proxy = True
 
     objects = EmailAsUsernameProxyUserManager()

{django_resonant_settings-0.44.0 → django_resonant_settings-0.45.0}/resonant_settings/allauth_support/management/commands/createsuperuser.py

@@ -1,15 +1,19 @@
-from typing import cast
+from __future__ import annotations
+
+from typing import TYPE_CHECKING, cast
 
 from allauth.account import app_settings as allauth_settings
 from django.contrib.auth import get_user_model
 from django.contrib.auth.management.commands import createsuperuser as django_createsuperuser
-from django.contrib.auth.models import AbstractUser
-from django.core.management import BaseCommand
 from django.db.models.signals import post_save
 
 from resonant_settings.allauth_support import createsuperuser as allauth_support_createsuperuser
 from resonant_settings.allauth_support.receiver import verify_email_address_on_user_post_save
 
+if TYPE_CHECKING:
+    from django.contrib.auth.models import AbstractUser
+    from django.core.management import BaseCommand
+
 """
 When Allauth is configured to use a User's `email` as the `username`, override the `createsuperuser`
 management command to only prompt for an email address.
@@ -28,7 +32,7 @@ if not username_required:
 else:
     # Expose the pristine upstream version of the command
     Command = django_createsuperuser.Command
-    user_model = cast(type[AbstractUser], get_user_model())
+    user_model = cast("type[AbstractUser]", get_user_model())
 
 # Always automatically verify email addresses of newly created superusers
 post_save.connect(verify_email_address_on_user_post_save, sender=user_model)

{django_resonant_settings-0.44.0 → django_resonant_settings-0.45.0}/resonant_settings/allauth_support/receiver.py

@@ -1,13 +1,18 @@
+from __future__ import annotations
+
 import logging
-from typing import Any
+from typing import TYPE_CHECKING, Any
 
 from allauth.account.models import EmailAddress
-from django.contrib.auth.models import AbstractUser
 
-logger = logging.getLogger(__file__)
+if TYPE_CHECKING:
+    from django.contrib.auth.models import AbstractUser
+
+logger = logging.getLogger(__name__)
 
 
 def verify_email_address_on_user_post_save(
+    *,
     sender: type[AbstractUser],
     instance: AbstractUser,
     created: bool,
@@ -25,7 +30,7 @@ def verify_email_address_on_user_post_save(
         # uniqueness.
         # So, make a conservative effort at setting the email address as verified, since failure is
         # not critical and can be resolved by the user.
-        email_address, created = EmailAddress.objects.get_or_create(
+        _email_address, created = EmailAddress.objects.get_or_create(
             email__iexact=instance.email,
             defaults={
                 "user": instance,
@@ -35,4 +40,4 @@ def verify_email_address_on_user_post_save(
             },
         )
         if not created:
-            logger.warning(f'Could not automatically verify email address "{instance.email}".')
+            logger.warning('Could not automatically verify email address "%s".', instance.email)

{django_resonant_settings-0.44.0 → django_resonant_settings-0.45.0}/resonant_settings/allauth_support/utils.py

@@ -1,6 +1,10 @@
-from collections.abc import Generator
+from __future__ import annotations
+
 from contextlib import contextmanager
-from typing import Any
+from typing import TYPE_CHECKING, Any
+
+if TYPE_CHECKING:
+    from collections.abc import Generator
 
 
 # From https://stackoverflow.com/a/38532086

{django_resonant_settings-0.44.0 → django_resonant_settings-0.45.0}/resonant_settings/celery.py

@@ -1,5 +1,7 @@
 """
-Configure Celery with the following features:
+Configure Celery.
+
+This provides the following features:
 * Disable the results backend
 * Ensure that tasks will never be lost, but tasks themselves must be idempotent
 * Optimize the network connection to CloudAMQP
@@ -7,7 +9,9 @@ Configure Celery with the following features:
 This requires the `celery` package to be installed.
 """
 
-import celery.app.trace  # type: ignore[import-not-found]
+from __future__ import annotations
+
+import celery.app.trace
 
 from resonant_settings._env import env
 
@@ -71,16 +75,16 @@ Task %(name)s[%(id)s] received: (%(args)s, %(kwargs)s)\
 """
 
 __all__ = [
+    "CELERY_BROKER_CONNECTION_TIMEOUT",
+    "CELERY_BROKER_HEARTBEAT",
+    "CELERY_BROKER_POOL_LIMIT",
     "CELERY_BROKER_URL",
+    "CELERY_EVENT_QUEUE_EXPIRES",
     "CELERY_RESULT_BACKEND",
     "CELERY_TASK_ACKS_LATE",
-    "CELERY_TASK_REJECT_ON_WORKER_LOST",
     "CELERY_TASK_ACKS_ON_FAILURE_OR_TIMEOUT",
+    "CELERY_TASK_REJECT_ON_WORKER_LOST",
     "CELERY_WORKER_CANCEL_LONG_RUNNING_TASKS_ON_CONNECTION_LOSS",
-    "CELERY_BROKER_POOL_LIMIT",
-    "CELERY_BROKER_HEARTBEAT",
-    "CELERY_BROKER_CONNECTION_TIMEOUT",
-    "CELERY_EVENT_QUEUE_EXPIRES",
-    "CELERY_WORKER_PREFETCH_MULTIPLIER",
     "CELERY_WORKER_CONCURRENCY",
+    "CELERY_WORKER_PREFETCH_MULTIPLIER",
 ]

{django_resonant_settings-0.44.0 → django_resonant_settings-0.45.0}/resonant_settings/development/celery.py

@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 from resonant_settings._env import env
 
 # Acknowledge early in development, which will help prevent failing or

{django_resonant_settings-0.44.0 → django_resonant_settings-0.45.0}/resonant_settings/development/debug_toolbar.py

@@ -1,10 +1,14 @@
 """
-Configure Django Debug Toolbar with the following features:
+Configure Django Debug Toolbar.
+
+This provides the following features:
 * Improve performance with large queries
 
 This requires the `django-debug-toolbar` package to be installed.
 """
 
+from __future__ import annotations
+
 from typing import Any
 
 DEBUG_TOOLBAR_CONFIG: dict[str, Any] = {

{django_resonant_settings-0.44.0 → django_resonant_settings-0.45.0}/resonant_settings/development/minio_storage.py

@@ -4,10 +4,15 @@ Configure MinioMediaStorage.
 This requires the `django-minio-storage` package to be installed.
 """
 
-from urllib.parse import ParseResult
+from __future__ import annotations
+
+from typing import TYPE_CHECKING
 
 from resonant_settings._env import env
 
+if TYPE_CHECKING:
+    from urllib.parse import ParseResult
+
 minio_url: ParseResult = env.url("DJANGO_MINIO_STORAGE_URL")
 MINIO_STORAGE_USE_HTTPS = minio_url.scheme == "https"
 MINIO_STORAGE_ENDPOINT = (
@@ -28,13 +33,13 @@ MINIO_STORAGE_AUTO_CREATE_MEDIA_POLICY = "NONE"
 MINIO_STORAGE_MEDIA_USE_PRESIGNED = True
 
 __all__ = [
-    "MINIO_STORAGE_USE_HTTPS",
-    "MINIO_STORAGE_ENDPOINT",
     "MINIO_STORAGE_ACCESS_KEY",
-    "MINIO_STORAGE_SECRET_KEY",
-    "MINIO_STORAGE_MEDIA_BUCKET_NAME",
-    "MINIO_STORAGE_MEDIA_URL",
     "MINIO_STORAGE_AUTO_CREATE_MEDIA_BUCKET",
     "MINIO_STORAGE_AUTO_CREATE_MEDIA_POLICY",
+    "MINIO_STORAGE_ENDPOINT",
+    "MINIO_STORAGE_MEDIA_BUCKET_NAME",
+    "MINIO_STORAGE_MEDIA_URL",
     "MINIO_STORAGE_MEDIA_USE_PRESIGNED",
+    "MINIO_STORAGE_SECRET_KEY",
+    "MINIO_STORAGE_USE_HTTPS",
 ]

{django_resonant_settings-0.44.0 → django_resonant_settings-0.45.0}/resonant_settings/django.py

@@ -1,5 +1,7 @@
 """Configure a basic Django project."""
 
+from __future__ import annotations
+
 from typing import Any
 
 TEMPLATES: list[dict[str, Any]] = [
@@ -37,7 +39,7 @@ AUTH_PASSWORD_VALIDATORS: list[dict[str, str]] = [
 ]
 
 __all__ = [
-    "TEMPLATES",
-    "PASSWORD_HASHERS",
     "AUTH_PASSWORD_VALIDATORS",
+    "PASSWORD_HASHERS",
+    "TEMPLATES",
 ]

{django_resonant_settings-0.44.0 → django_resonant_settings-0.45.0}/resonant_settings/django_extensions.py

@@ -4,12 +4,14 @@ Configure Django Extensions.
 This requires the `django-extensions` package to be installed.
 """
 
+from __future__ import annotations
+
 SHELL_PLUS_PRINT_SQL = True
 SHELL_PLUS_PRINT_SQL_TRUNCATE = None
 RUNSERVER_PLUS_PRINT_SQL_TRUNCATE = None
 
 __all__ = [
+    "RUNSERVER_PLUS_PRINT_SQL_TRUNCATE",
     "SHELL_PLUS_PRINT_SQL",
     "SHELL_PLUS_PRINT_SQL_TRUNCATE",
-    "RUNSERVER_PLUS_PRINT_SQL_TRUNCATE",
 ]

{django_resonant_settings-0.44.0 → django_resonant_settings-0.45.0}/resonant_settings/logging.py

@@ -1,5 +1,7 @@
 """
-Configure Django logging with the following features:
+Configure Django logging.
+
+This provides the following features:
 * Emit all logs to stdout
 * Exclude favicons and static files from request and server logs
 * Improve log formatting and add colorization
@@ -7,9 +9,14 @@ Configure Django logging with the following features:
 This requires the `rich` package to be installed.
 """
 
-import logging
+from __future__ import annotations
+
+from typing import TYPE_CHECKING
+
+if TYPE_CHECKING:
+    import logging
 
-from django.http import HttpRequest
+    from django.http import HttpRequest
 
 
 def _filter_favicon_requests(record: logging.LogRecord) -> bool:
@@ -18,7 +25,7 @@ def _filter_favicon_requests(record: logging.LogRecord) -> bool:
         if request and request.path == "/favicon.ico":
             return False
 
-    if (
+    if (  # noqa: SIM103
         record.name == "django.server"
         and isinstance(record.args, tuple)
         and len(record.args) >= 1
@@ -30,7 +37,7 @@ def _filter_favicon_requests(record: logging.LogRecord) -> bool:
 
 
 def _filter_static_requests(record: logging.LogRecord) -> bool:
-    if (
+    if (  # noqa: SIM103
         record.name == "django.server"
         and isinstance(record.args, tuple)
         and len(record.args) >= 1

{django_resonant_settings-0.44.0 → django_resonant_settings-0.45.0}/resonant_settings/oauth_toolkit.py

@@ -1,5 +1,7 @@
 """
-Configure Django OAuth Toolkit with the following features:
+Configure Django OAuth Toolkit.
+
+This provides the following features:
 * Harden security
 * Improve usability of token scopes
 * Improve quality of live for out of band flows and non-refreshing clients
@@ -7,11 +9,16 @@ Configure Django OAuth Toolkit with the following features:
 This requires the `django-oauth-toolkit` package to be installed.
 """
 
+from __future__ import annotations
+
 from datetime import timedelta
 from typing import Any
 
 OAUTH2_PROVIDER: dict[str, Any] = {
     "ALLOWED_REDIRECT_URI_SCHEMES": ["https"],
+    # This doesn't immediately change behavior, it just authorizes the use of wildcards in
+    # Application redirect URIs, which is necessary to support SPA branch previews
+    "ALLOW_URI_WILDCARDS": True,
     # Don't require users to re-approve scopes each time
     "REQUEST_APPROVAL_PROMPT": "auto",
     # ERROR_RESPONSE_WITH_SCOPES is only used with the "permission_classes" helpers for scopes.

{django_resonant_settings-0.44.0 → django_resonant_settings-0.45.0}/resonant_settings/production/email.py

@@ -8,6 +8,8 @@ The following environment variables must be externally set:
 * `DJANGO_DEFAULT_FROM_EMAIL`, as the default From address for outgoing email.
 """
 
+from __future__ import annotations
+
 from typing import Any
 
 from resonant_settings._env import env
@@ -19,7 +21,7 @@ DEFAULT_FROM_EMAIL: str = env.str("DJANGO_DEFAULT_FROM_EMAIL")
 SERVER_EMAIL = DEFAULT_FROM_EMAIL
 
 
-__all__ = [
+__all__ = [  # noqa: PLE0604
     *email_config.keys(),
     "DEFAULT_FROM_EMAIL",
     "SERVER_EMAIL",

{django_resonant_settings-0.44.0 → django_resonant_settings-0.45.0}/resonant_settings/production/https.py

@@ -1,5 +1,7 @@
 """Configure Django's security middleware to use and require HTTPS."""
 
+from __future__ import annotations
+
 from datetime import timedelta
 
 SECURE_SSL_REDIRECT = True
@@ -18,10 +20,10 @@ SECURE_HSTS_INCLUDE_SUBDOMAINS = False
 SECURE_HSTS_PRELOAD = False
 
 __all__ = [
-    "SECURE_SSL_REDIRECT",
-    "SESSION_COOKIE_SECURE",
     "CSRF_COOKIE_SECURE",
-    "SECURE_HSTS_SECONDS",
     "SECURE_HSTS_INCLUDE_SUBDOMAINS",
     "SECURE_HSTS_PRELOAD",
+    "SECURE_HSTS_SECONDS",
+    "SECURE_SSL_REDIRECT",
+    "SESSION_COOKIE_SECURE",
 ]

{django_resonant_settings-0.44.0 → django_resonant_settings-0.45.0}/resonant_settings/production/s3_storage.py

@@ -10,6 +10,8 @@ The following environment variables must be externally set:
 This requires the `django-storages[s3]` package to be installed.
 """
 
+from __future__ import annotations
+
 from datetime import timedelta
 
 from resonant_settings._env import env
@@ -35,12 +37,12 @@ AWS_S3_FILE_OVERWRITE = True
 AWS_QUERYSTRING_EXPIRE = int(timedelta(hours=6).total_seconds())
 
 __all__ = [
-    "AWS_S3_REGION_NAME",
+    "AWS_QUERYSTRING_EXPIRE",
     "AWS_S3_ACCESS_KEY_ID",
+    "AWS_S3_FILE_OVERWRITE",
+    "AWS_S3_MAX_MEMORY_SIZE",
+    "AWS_S3_REGION_NAME",
     "AWS_S3_SECRET_ACCESS_KEY",
-    "AWS_STORAGE_BUCKET_NAME",
     "AWS_S3_SIGNATURE_VERSION",
-    "AWS_S3_MAX_MEMORY_SIZE",
-    "AWS_S3_FILE_OVERWRITE",
-    "AWS_QUERYSTRING_EXPIRE",
+    "AWS_STORAGE_BUCKET_NAME",
 ]

{django_resonant_settings-0.44.0 → django_resonant_settings-0.45.0}/resonant_settings/rest_framework.py

@@ -4,6 +4,8 @@ Configure Django REST framework and drf-yasg.
 This requires the `django-oauth-toolkit` and `drf-yasg` packages to be installed.
 """
 
+from __future__ import annotations
+
 from typing import Any
 
 # When SessionAuthentication is allowed, it's critical that the following settings
@@ -77,9 +79,9 @@ SWAGGER_SETTINGS: dict[str, Any] = {
 REDOC_SETTINGS: dict[str, Any] = {}
 
 __all__ = [
-    "SESSION_COOKIE_SAMESITE",
     "CORS_ALLOW_CREDENTIALS",
+    "REDOC_SETTINGS",
     "REST_FRAMEWORK",
+    "SESSION_COOKIE_SAMESITE",
     "SWAGGER_SETTINGS",
-    "REDOC_SETTINGS",
 ]

django_resonant_settings-0.44.0/resonant_settings/allauth_support/adapter.py

@@ -1,10 +0,0 @@
-from allauth.account.adapter import DefaultAccountAdapter
-from django.contrib.auth.models import AbstractUser
-from django.http import HttpRequest
-
-
-class EmailAsUsernameAccountAdapter(DefaultAccountAdapter):
-    """Automatically populate the username as the email address."""
-
-    def populate_username(self, request: HttpRequest, user: AbstractUser) -> None:
-        user.username = user.email