django-resonant-settings 0.28__tar.gz → 0.30__tar.gz

{django_resonant_settings-0.28 → django_resonant_settings-0.30}/PKG-INFO

@@ -1,11 +1,11 @@
 Metadata-Version: 2.4
 Name: django-resonant-settings
-Version: 0.28
+Version: 0.30
 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

{django_resonant_settings-0.28 → django_resonant_settings-0.30}/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",
@@ -70,7 +71,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.28 → django_resonant_settings-0.30}/resonant_settings/allauth.py

@@ -28,8 +28,8 @@ ACCOUNT_EMAIL_VERIFICATION = "mandatory"
 
 # Use email as the identifier for login
 ACCOUNT_LOGIN_METHODS = {"email"}
-ACCOUNT_EMAIL_REQUIRED = True
-ACCOUNT_USERNAME_REQUIRED = False
+# Don't require a username, but make email required
+ACCOUNT_SIGNUP_FIELDS = ["email*", "password1*", "password2*"]
 
 # Set the username as the email
 ACCOUNT_ADAPTER = "resonant_settings.allauth_support.adapter.EmailAsUsernameAccountAdapter"

{django_resonant_settings-0.28 → django_resonant_settings-0.30}/resonant_settings/allauth_support/createsuperuser.py

@@ -14,7 +14,9 @@ class Command(createsuperuser.Command):
         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):

{django_resonant_settings-0.28 → django_resonant_settings-0.30}/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.28 → django_resonant_settings-0.30}/resonant_settings/celery.py

@@ -45,9 +45,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

{django_resonant_settings-0.28 → django_resonant_settings-0.30}/resonant_settings/rest_framework.py

@@ -70,6 +70,8 @@ SWAGGER_SETTINGS: dict[str, Any] = {
     # security definition for.
     "SECURITY_DEFINITIONS": None,
     "USE_SESSION_AUTH": True,
+    # Needed because https://github.com/axnsan12/drf-yasg/pull/911
+    "USE_COMPAT_RENDERERS": False,
 }
 
 REDOC_SETTINGS: dict[str, Any] = {}