django-resonant-settings 0.29__tar.gz → 0.32.1__tar.gz

{django_resonant_settings-0.29 → django_resonant_settings-0.32.1}/PKG-INFO

@@ -1,11 +1,11 @@
 Metadata-Version: 2.4
 Name: django-resonant-settings
-Version: 0.29
+Version: 0.32.1
 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
 Maintainer-email: "Kitware, Inc." <kitware@kitware.com>
-License: Apache 2.0
+License-Expression: Apache-2.0
 License-File: LICENSE
 Keywords: django,resonant,setting,settings
 Classifier: Development Status :: 3 - Alpha
@@ -13,8 +13,8 @@ Classifier: Environment :: Web Environment
 Classifier: Framework :: Django
 Classifier: Framework :: Django :: 5
 Classifier: Framework :: Django :: 5.1
+Classifier: Framework :: Django :: 5.2
 Classifier: Intended Audience :: Developers
-Classifier: License :: OSI Approved :: Apache Software License
 Classifier: Operating System :: OS Independent
 Classifier: Programming Language :: Python
 Classifier: Programming Language :: Python :: 3
@@ -26,6 +26,8 @@ Requires-Python: >=3.10
 Requires-Dist: django-environ
 Provides-Extra: allauth
 Requires-Dist: django-allauth; extra == 'allauth'
+Provides-Extra: celery
+Requires-Dist: celery; extra == 'celery'
 Description-Content-Type: text/markdown
 
 # django-resonant-settings

{django_resonant_settings-0.29 → django_resonant_settings-0.32.1}/pyproject.toml

@@ -7,7 +7,8 @@ name = "django-resonant-settings"
 description = "Shared Django settings for Resonant applications."
 readme = "README.md"
 requires-python = ">=3.10"
-license = { text = "Apache 2.0" }
+license = "Apache-2.0"
+license-files = ["LICENSE"]
 maintainers = [{ name = "Kitware, Inc.", email = "kitware@kitware.com" }]
 keywords = [
   "django",
@@ -20,9 +21,9 @@ classifiers = [
   "Environment :: Web Environment",
   "Framework :: Django :: 5",
   "Framework :: Django :: 5.1",
+  "Framework :: Django :: 5.2",
   "Framework :: Django",
   "Intended Audience :: Developers",
-  "License :: OSI Approved :: Apache Software License",
   "Operating System :: OS Independent",
   "Programming Language :: Python :: 3",
   "Programming Language :: Python :: 3.10",
@@ -36,14 +37,40 @@ dependencies = [
 ]
 dynamic = ["version"]
 
+[project.urls]
+Repository = "https://github.com/kitware-resonant/cookiecutter-resonant"
+"Bug Reports" = "https://github.com/kitware-resonant/cookiecutter-resonant/issues"
+
 [project.optional-dependencies]
 allauth = [
   "django-allauth",
 ]
+celery = [
+  "celery",
+]
 
-[project.urls]
-Repository = "https://github.com/kitware-resonant/cookiecutter-resonant"
-"Bug Reports" = "https://github.com/kitware-resonant/cookiecutter-resonant/issues"
+[dependency-groups]
+dev = [
+  "tox",
+  "tox-uv",
+]
+lint = [
+  "flake8",
+  "flake8-black",
+  "flake8-bugbear",
+  "flake8-docstrings",
+  "flake8-isort",
+  "pep8-naming",
+]
+format = [
+  "black",
+  "isort",
+]
+type = [
+  "mypy",
+  "celery-types",
+  "django-stubs[compatible-mypy]",
+]
 
 [tool.hatch.build]
 packages = [
@@ -70,7 +97,11 @@ combine_as_imports = true
 files = [
   "resonant_settings",
 ]
+check_untyped_defs = true
 show_error_codes = true
+warn_redundant_casts = true
+warn_unused_configs = true
+warn_unused_ignores = true
 
 [[tool.mypy.overrides]]
 module = [

{django_resonant_settings-0.29 → django_resonant_settings-0.32.1}/resonant_settings/allauth_support/createsuperuser.py

@@ -1,6 +1,6 @@
 from __future__ import annotations
 
-from typing import ClassVar
+from typing import Any, ClassVar
 
 from django.contrib.auth.management.commands import createsuperuser
 from django.contrib.auth.models import User, UserManager
@@ -9,12 +9,14 @@ from resonant_settings.allauth_support.utils import temporarily_change_attribute
 
 
 class Command(createsuperuser.Command):
-    def __init__(self, *args, **kwargs):
+    def __init__(self, *args: Any, **kwargs: Any):
         super().__init__(*args, **kwargs)
         self.UserModel = EmailAsUsernameProxyUser
         self.username_field = self.UserModel._meta.get_field(self.UserModel.USERNAME_FIELD)
 
-    def _validate_username(self, username, verbose_field_name, database):
+    def _validate_username(
+        self, username: str, verbose_field_name: str, database: str
+    ) -> str | None:
         # Since "username" is actually unique, "email" (i.e. "self.username_field") is logically
         # unique too. Explicitly setting the "_unique" attribute ensures that app-level duplicate
         # checking is done by "_validate_username", which produces better, earlier error messages.
@@ -23,7 +25,9 @@ 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(username, verbose_field_name, database)
+            return super()._validate_username(  # type: ignore[misc]
+                username, verbose_field_name, database
+            )
 
 
 class EmailAsUsernameProxyUserManager(UserManager):
@@ -33,7 +37,7 @@ class EmailAsUsernameProxyUserManager(UserManager):
         username: str | None = None,
         email: str | None = None,
         password: str | None = None,
-        **extra_fields,
+        **extra_fields: Any,
     ) -> EmailAsUsernameProxyUser:
         # Practically, email will always be provided
         assert email

{django_resonant_settings-0.29 → django_resonant_settings-0.32.1}/resonant_settings/allauth_support/management/commands/createsuperuser.py

@@ -15,8 +15,12 @@ When Allauth is configured to use a User's `email` as the `username`, override t
 management command to only prompt for an email address.
 """
 
+username_required: bool | None = allauth_settings.SIGNUP_FIELDS.get("username", {}).get(
+    "required", None
+)
+
 # If using email as username
-if not allauth_settings.USERNAME_REQUIRED:
+if not username_required:
     # Expose the modified command
     Command: type[BaseCommand] = allauth_support_createsuperuser.Command
     user_model: type[AbstractUser] = allauth_support_createsuperuser.EmailAsUsernameProxyUser

{django_resonant_settings-0.29 → django_resonant_settings-0.32.1}/resonant_settings/allauth_support/receiver.py

@@ -1,4 +1,5 @@
 import logging
+from typing import Any
 
 from allauth.account.models import EmailAddress
 from django.contrib.auth.models import AbstractUser
@@ -10,8 +11,8 @@ def verify_email_address_on_user_post_save(
     sender: type[AbstractUser],
     instance: AbstractUser,
     created: bool,
-    **kwargs,
-):
+    **kwargs: Any,
+) -> None:
     """Automatically verify email addresses of newly created superusers."""
     # These should always be true, but it's a final sanity check
     if created and instance.is_superuser:

{django_resonant_settings-0.29 → django_resonant_settings-0.32.1}/resonant_settings/allauth_support/utils.py

@@ -1,9 +1,11 @@
+from collections.abc import Generator
 from contextlib import contextmanager
+from typing import Any
 
 
 # From https://stackoverflow.com/a/38532086
 @contextmanager
-def temporarily_change_attributes(something, **kwargs):
+def temporarily_change_attributes(something: object, **kwargs: Any) -> Generator[None]:
     previous_values = {k: getattr(something, k) for k in kwargs}
     for k, v in kwargs.items():
         setattr(something, k, v)

{django_resonant_settings-0.29 → django_resonant_settings-0.32.1}/resonant_settings/celery.py

@@ -7,6 +7,8 @@ Configure Celery with the following features:
 This requires the `celery` package to be installed.
 """
 
+import celery.app.trace  # type: ignore[import-not-found]
+
 from resonant_settings._env import env
 
 # Assume AMQP.
@@ -45,9 +47,6 @@ CELERY_TASK_ACKS_ON_FAILURE_OR_TIMEOUT = True
 # and this will be Celery's default in 6.0.
 CELERY_WORKER_CANCEL_LONG_RUNNING_TASKS_ON_CONNECTION_LOSS = True
 
-# This is the default, but is necessary to suppress warnings in Celery
-CELERY_BROKER_CONNECTION_RETRY_ON_STARTUP = True
-
 # CloudAMQP-suggested settings
 # https://www.cloudamqp.com/docs/celery.html
 CELERY_BROKER_POOL_LIMIT = 1
@@ -65,3 +64,8 @@ CELERY_WORKER_PREFETCH_MULTIPLIER = 1
 # Accept the default of the number of CPU cores.
 # Workers running memory-intensive tasks may need to decrease this.
 CELERY_WORKER_CONCURRENCY: int | None = None
+
+# Make the task received log message include the task's arguments.
+celery.app.trace.LOG_RECEIVED = """\
+Task %(name)s[%(id)s] received: (%(args)s, %(kwargs)s)\
+"""

{django_resonant_settings-0.29 → django_resonant_settings-0.32.1}/resonant_settings/development/celery.py

@@ -1,7 +1,12 @@
+from resonant_settings._env import env
+
 # Acknowledge early in development, which will help prevent failing or
 # long-running tasks from being started automatically every time the worker
 # process restarts; this more aggressively flushes the task queue.
 CELERY_TASK_ACKS_LATE = False
 
+CELERY_TASK_ALWAYS_EAGER: bool = env.bool("DJANGO_CELERY_TASK_ALWAYS_EAGER", default=False)
+CELERY_TASK_EAGER_PROPAGATES = CELERY_TASK_ALWAYS_EAGER
+
 # In development, run without concurrency.
 CELERY_WORKER_CONCURRENCY: int | None = 1

{django_resonant_settings-0.29 → django_resonant_settings-0.32.1}/resonant_settings/testing/minio_storage.py

@@ -22,5 +22,7 @@ MINIO_STORAGE_MEDIA_BUCKET_NAME = minio_url.path.lstrip("/")
 MINIO_STORAGE_MEDIA_URL: str | None = env.str("DJANGO_MINIO_STORAGE_MEDIA_URL", default=None)
 
 MINIO_STORAGE_AUTO_CREATE_MEDIA_BUCKET = True
-MINIO_STORAGE_AUTO_CREATE_MEDIA_POLICY = "READ_WRITE"
+# Make the bucket private to the public
+MINIO_STORAGE_AUTO_CREATE_MEDIA_POLICY = "NONE"
+# Issue signed URLs to provide any read access
 MINIO_STORAGE_MEDIA_USE_PRESIGNED = True