django-bananas 2.2__tar.gz → 2.3__tar.gz

{django-bananas-2.2 → django_bananas-2.3}/LICENSE

@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2014-2021 5 Monkeys
+Copyright (c) 2014-2025 5 Monkeys
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

{django-bananas-2.2 → django_bananas-2.3}/MANIFEST.in

@@ -1,5 +1,5 @@
 include setup.py README.rst MANIFEST.in LICENSE AUTHORS
-exclude runtests.py tox.ini *.yml *.yaml Makefile Dockerfile .editorconfig
+exclude tox.ini *.yml *.yaml Makefile Dockerfile .editorconfig
 
 recursive-include src/bananas/templates *
 recursive-include src/bananas/static *

{django-bananas-2.2/src/django_bananas.egg-info → django_bananas-2.3}/PKG-INFO

@@ -1,27 +1,49 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.2
 Name: django-bananas
-Version: 2.2
+Version: 2.3
 Summary: Django Bananas - Django extensions the monkey way
 Home-page: https://github.com/5monkeys/django-bananas
 License: MIT License
 Classifier: Development Status :: 5 - Production/Stable
 Classifier: Programming Language :: Python
 Classifier: Programming Language :: Python :: 3
-Classifier: Programming Language :: Python :: 3.6
-Classifier: Programming Language :: Python :: 3.7
 Classifier: Programming Language :: Python :: 3.8
 Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
+Classifier: Programming Language :: Python :: 3.11
+Classifier: Programming Language :: Python :: 3.12
+Classifier: Programming Language :: Python :: 3.13
+Classifier: Framework :: Django
+Classifier: Framework :: Django :: 3.2
+Classifier: Framework :: Django :: 4.0
+Classifier: Framework :: Django :: 4.1
+Classifier: Framework :: Django :: 4.2
+Classifier: Framework :: Django :: 5.0
+Classifier: Framework :: Django :: 5.1
 Classifier: Intended Audience :: Developers
 Classifier: License :: OSI Approved :: MIT License
 Classifier: Operating System :: OS Independent
 Classifier: Framework :: Django
 Requires-Python: >=3.6
 Description-Content-Type: text/x-rst; charset=UTF-8
+License-File: LICENSE
+Requires-Dist: Django>=2.2
+Requires-Dist: typing-extensions>=3.7.4.3
 Provides-Extra: drf
+Requires-Dist: djangorestframework>=3.10; extra == "drf"
+Requires-Dist: drf-yasg>=1.20.0; extra == "drf"
 Provides-Extra: test
+Requires-Dist: tox; extra == "test"
+Requires-Dist: coverage[toml]; extra == "test"
 Provides-Extra: dev
-License-File: LICENSE
+Requires-Dist: mypy; extra == "dev"
+Requires-Dist: types-setuptools; extra == "dev"
+Requires-Dist: django-stubs; extra == "dev"
+Requires-Dist: djangorestframework-stubs; extra == "dev"
+Requires-Dist: pytest; extra == "dev"
+Requires-Dist: pytest-cov; extra == "dev"
+Requires-Dist: pytest-django; extra == "dev"
+Requires-Dist: pre-commit; extra == "dev"
 
 ================================================================================
 :banana: Django Bananas - Django extensions the monkey way
@@ -57,10 +79,12 @@ with the ``drf`` extra to keep those in sync:
 
 Currently tested only for
 
--   Django 3.2 under Python 3.7-3.9
+-   Django 3.2 under Python 3.8-3.10
 -   Django 4.0 under Python 3.8-3.10
--   Django 4.1 under Python 3.8-3.10
--   Django 4.2 under Python 3.8-3.10
+-   Django 4.1 under Python 3.8-3.13
+-   Django 4.2 under Python 3.8-3.13
+-   Django 5.0 under Python 3.10-3.13
+-   Django 5.1 under Python 3.10-3.13
 
 Pull requests welcome!
 
@@ -263,7 +287,6 @@ feature requires installation with the ``drf`` extra.
 
 
     class CustomAdminAPI(BananasAdminAPI):
-
         name = lazy_title(_("custom"))
 
         @schema(query_serializer=SomeSerializer, responses={200: SomeSerializer})
@@ -272,7 +295,6 @@ feature requires installation with the ``drf`` extra.
 
 
     class SomeModelAdminAPI(BananasAPI, viewsets.ModelViewSet):
-
         serializer_class = SomeModelSerializer
 
         def list(self, request):
@@ -581,4 +603,4 @@ and select specific tests with the ``test`` argument to ``make test``:
 
 .. code-block:: bash
 
-    make test test='tests.test_admin.APITest.test_logout'
+    make test test='-k test_logout'

{django-bananas-2.2 → django_bananas-2.3}/README.rst

@@ -32,10 +32,12 @@ with the ``drf`` extra to keep those in sync:
 
 Currently tested only for
 
--   Django 3.2 under Python 3.7-3.9
+-   Django 3.2 under Python 3.8-3.10
 -   Django 4.0 under Python 3.8-3.10
--   Django 4.1 under Python 3.8-3.10
--   Django 4.2 under Python 3.8-3.10
+-   Django 4.1 under Python 3.8-3.13
+-   Django 4.2 under Python 3.8-3.13
+-   Django 5.0 under Python 3.10-3.13
+-   Django 5.1 under Python 3.10-3.13
 
 Pull requests welcome!
 
@@ -238,7 +240,6 @@ feature requires installation with the ``drf`` extra.
 
 
     class CustomAdminAPI(BananasAdminAPI):
-
         name = lazy_title(_("custom"))
 
         @schema(query_serializer=SomeSerializer, responses={200: SomeSerializer})
@@ -247,7 +248,6 @@ feature requires installation with the ``drf`` extra.
 
 
     class SomeModelAdminAPI(BananasAPI, viewsets.ModelViewSet):
-
         serializer_class = SomeModelSerializer
 
         def list(self, request):
@@ -556,4 +556,4 @@ and select specific tests with the ``test`` argument to ``make test``:
 
 .. code-block:: bash
 
-    make test test='tests.test_admin.APITest.test_logout'
+    make test test='-k test_logout'

django_bananas-2.3/pyproject.toml

@@ -0,0 +1,97 @@
+[build-system]
+requires = ["setuptools>=57.0.0", "wheel"]
+build-backend = "setuptools.build_meta"
+
+[tool.black]
+target-version = ["py38", "py39", "py310", "py311", "py312"]
+
+[tool.ruff]
+src = ["src"]
+fix = true
+target-version = "py38"
+select = [
+  "B",
+  "C4",
+  "I",
+  "RUF",
+  "T20",
+  "TID",
+  "UP",
+]
+
+[tool.ruff.per-file-ignores]
+"tests/**" = ["RUF012"]
+
+[tool.ruff.isort]
+known-first-party = ["src/"]
+combine-as-imports = true
+
+[tool.pytest.ini_options]
+python_files = "tests.py test_*.py *_tests.py"
+testpaths = ["tests"]
+norecursedirs = "migrations"
+
+[tool.coverage.paths]
+source = [
+  "src/bananas",
+  "*/.tox/*/lib/*/site-packages/bananas"
+]
+
+[tool.coverage.run]
+branch = true
+source = ["src/", "tests/"]
+
+[tool.coverage.report]
+skip_covered = true
+show_missing = true
+fail_under= 94
+exclude_lines = [
+    "pragma: no cover",
+    "if __name__ == .__main__.:",
+    # Ignore non-implementations
+    '^\s*\.\.\.',
+    "if TYPE_CHECKING:",
+    "raise NotImplementedError",
+]
+
+[tool.mypy]
+python_version = "3.8"
+show_error_codes = true
+pretty = true
+files = ["src", "tests", "setup.py"]
+
+no_implicit_reexport = true
+no_implicit_optional = true
+strict_equality = true
+strict_optional = true
+check_untyped_defs = true
+disallow_incomplete_defs = true
+disallow_untyped_defs = true
+ignore_missing_imports = false
+
+warn_unused_configs = true
+warn_redundant_casts = true
+warn_unused_ignores = true
+warn_return_any = true
+warn_unreachable = true
+
+plugins = [
+    "mypy_django_plugin.main",
+    "mypy_drf_plugin.main",
+]
+
+[tool.django-stubs]
+django_settings_module = "tests.conftest"
+
+[[tool.mypy.overrides]]
+module = [
+  "tests.*",
+]
+disallow_untyped_defs = false
+
+[[tool.mypy.overrides]]
+module = [
+  "test.support.*",
+  "drf_yasg.*",
+]
+ignore_missing_imports = true

django_bananas-2.3/setup.cfg

@@ -0,0 +1,73 @@
+[metadata]
+name = django-bananas
+description = Django Bananas - Django extensions the monkey way
+long_description = file: README.rst
+long_description_content_type = text/x-rst; charset=UTF-8
+url = https://github.com/5monkeys/django-bananas
+version = attr: bananas.__version__
+classifiers = 
+	Development Status :: 5 - Production/Stable
+	Programming Language :: Python
+	Programming Language :: Python :: 3
+	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
+	Framework :: Django
+	Framework :: Django :: 3.2
+	Framework :: Django :: 4.0
+	Framework :: Django :: 4.1
+	Framework :: Django :: 4.2
+	Framework :: Django :: 5.0
+	Framework :: Django :: 5.1
+	Intended Audience :: Developers
+	License :: OSI Approved :: MIT License
+	Operating System :: OS Independent
+	Framework :: Django
+license = MIT License
+license_file = LICENSE
+
+[options]
+packages = find:
+package_dir = 
+	=src
+python_requires = >=3.6
+include_package_data = True
+exclude = 
+	tests
+	_*
+	example
+zip_safe = False
+install_requires = 
+	Django>=2.2
+	typing-extensions>=3.7.4.3
+
+[options.packages.find]
+where = src
+
+[options.extras_require]
+drf = 
+	djangorestframework>=3.10
+	drf-yasg>=1.20.0
+test = 
+	tox
+	coverage[toml]
+dev = 
+	mypy
+	types-setuptools
+	django-stubs
+	djangorestframework-stubs
+	pytest
+	pytest-cov
+	pytest-django
+	pre-commit
+
+[options.package_data]
+bananas = py.typed
+
+[egg_info]
+tag_build = 
+tag_date = 0
+

{django-bananas-2.2 → django_bananas-2.3}/src/bananas/__init__.py

@@ -1,4 +1,4 @@
-VERSION = (2, 2, 0, "final", 0)
+VERSION = (2, 3, 0, "final", 0)
 
 
 def get_version() -> str:

{django-bananas-2.2 → django_bananas-2.3}/src/bananas/admin/api/mixins.py

@@ -63,9 +63,9 @@ class BananasAPI:
             if admin is not None:
                 meta.update(
                     {
-                        key: getattr(admin, key)  # type: ignore[misc, call-overload]
+                        key: getattr(admin, key)
                         for key in filter(
-                            lambda key: key in meta,  # type: ignore[arg-type]
+                            lambda key: key in meta,
                             admin.__dict__.keys(),
                         )
                     }

{django-bananas-2.2 → django_bananas-2.3}/src/bananas/admin/api/schemas/base.py

@@ -3,7 +3,7 @@ from typing import TYPE_CHECKING, Any, Type, cast
 from rest_framework.viewsets import ViewSetMixin
 
 if TYPE_CHECKING:
-    from ..mixins import BananasAPI
+    from bananas.admin.api.mixins import BananasAPI
 
 
 class BananasBaseRouter:

{django-bananas-2.2 → django_bananas-2.3}/src/bananas/admin/api/schemas/yasg.py

@@ -13,7 +13,8 @@ from rest_framework.request import Request
 from rest_framework.routers import SimpleRouter
 from rest_framework.schemas.coreapi import is_custom_action
 
-from ..versioning import BananasVersioning
+from bananas.admin.api.versioning import BananasVersioning
+
 from .base import BananasBaseRouter
 
 

{django-bananas-2.2 → django_bananas-2.3}/src/bananas/admin/api/v1_0/urls.py

@@ -1,7 +1,7 @@
 from django.urls import include, re_path
 
-from .. import views
-from ..router import register, router
+from bananas.admin.api import views
+from bananas.admin.api.router import register, router
 
 register(views.LoginAPI)
 register(views.LogoutAPI)

{django-bananas-2.2 → django_bananas-2.3}/src/bananas/admin/api/versioning.py

@@ -1,5 +1,5 @@
 from types import ModuleType
-from typing import Dict, Sequence
+from typing import ClassVar, Dict, Sequence
 
 from rest_framework.request import Request
 from rest_framework.versioning import NamespaceVersioning
@@ -10,12 +10,11 @@ __versions__ = [v1_0]
 
 
 class BananasVersioning(NamespaceVersioning):
-
     default_version: str = v1_0.__version__
     allowed_versions: Sequence[str] = tuple(
         version.__version__ for version in __versions__
     )
-    version_map: Dict[str, ModuleType] = {
+    version_map: ClassVar[Dict[str, ModuleType]] = {
         version.__version__: version for version in __versions__
     }
 

{django-bananas-2.2 → django_bananas-2.3}/src/bananas/admin/api/views.py

@@ -1,3 +1,5 @@
+from typing import ClassVar, List
+
 from django.contrib.auth import (
     login as auth_login,
     logout as auth_logout,
@@ -11,7 +13,8 @@ from rest_framework.permissions import AllowAny
 from rest_framework.request import Request
 from rest_framework.response import Response
 
-from .i18n import RawTranslationCatalog
+from bananas.admin.i18n import RawTranslationCatalog
+
 from .mixins import BananasAPI
 from .permissions import IsAnonymous
 from .schemas import schema
@@ -29,7 +32,6 @@ class BananasAdminAPI(BananasAPI, viewsets.GenericViewSet):
 
 
 class LoginAPI(BananasAdminAPI):
-
     name = _("Log in")  # type: ignore[assignment]
     basename = "login"
     permission_classes = (IsAnonymous,)
@@ -51,7 +53,7 @@ class LoginAPI(BananasAdminAPI):
         login_form = AuthenticationForm(request, data=request.data)
 
         if not login_form.is_valid():
-            raise serializers.ValidationError(login_form.errors)
+            raise serializers.ValidationError(login_form.errors)  # type: ignore[arg-type]
 
         auth_login(request, login_form.get_user())
 
@@ -60,7 +62,6 @@ class LoginAPI(BananasAdminAPI):
 
 
 class LogoutAPI(BananasAPI, viewsets.ViewSet):
-
     name = _("Log out")  # type: ignore[assignment]
     basename = "logout"
 
@@ -77,11 +78,10 @@ class LogoutAPI(BananasAPI, viewsets.ViewSet):
 
 
 class MeAPI(BananasAdminAPI):
-
     serializer_class = UserSerializer
 
     class Admin:
-        exclude_tags = ["navigation"]
+        exclude_tags: ClassVar[List[str]] = ["navigation"]
 
     @schema(responses={200: UserSerializer})
     def list(self, request: Request) -> Response:
@@ -93,7 +93,6 @@ class MeAPI(BananasAdminAPI):
 
 
 class ChangePasswordAPI(BananasAdminAPI):
-
     name = _("Change password")  # type: ignore[assignment]
     basename = "change_password"
     serializer_class = PasswordChangeSerializer  # Placeholder for schema
@@ -112,22 +111,21 @@ class ChangePasswordAPI(BananasAdminAPI):
         password_form = PasswordChangeForm(request.user, data=request.data)
 
         if not password_form.is_valid():
-            raise serializers.ValidationError(password_form.errors)
+            raise serializers.ValidationError(password_form.errors)  # type: ignore[arg-type]
 
         password_form.save()
-        update_session_auth_hash(request, password_form.user)
+        update_session_auth_hash(request, password_form.user)  # type: ignore[arg-type]
 
         return Response(status=status.HTTP_204_NO_CONTENT)
 
 
 class TranslationAPI(BananasAdminAPI):
-
     name = _("Translation catalog")  # type: ignore[assignment]
     basename = "i18n"
     permission_classes = (AllowAny,)
 
     class Admin:
-        exclude_tags = ["navigation"]
+        exclude_tags: ClassVar[List[str]] = ["navigation"]
 
     @schema(responses={200: ""})
     def list(self, request: Request) -> Response:

{django-bananas-2.2 → django_bananas-2.3}/src/bananas/admin/extension.py

@@ -2,6 +2,7 @@ import re
 from typing import (
     Any,
     Callable,
+    ClassVar,
     Dict,
     List,
     Optional,
@@ -31,7 +32,7 @@ from django.utils.safestring import SafeText, mark_safe
 from django.utils.translation import gettext_lazy as _
 from django.views.generic import View
 
-from ..environment import env
+from bananas.environment import env
 
 __all__ = ["ModelAdminView", "ViewTool", "AdminView", "register", "site"]
 
@@ -41,7 +42,7 @@ MT = TypeVar("MT", bound=Model)
 
 class ExtendedAdminSite(AdminSite):
     enable_nav_sidebar = False
-    default_settings = {
+    default_settings: ClassVar[Dict[str, Any]] = {
         "INHERIT_REGISTERED_MODELS": env.get_bool(
             "DJANGO_ADMIN_INHERIT_REGISTERED_MODELS", True
         ),
@@ -84,10 +85,8 @@ class ModelAdminView(ModelAdmin):
     @cached_property
     def access_permission(self) -> str:
         meta = self.model._meta
-        return "{app_label}.{codename}".format(
-            app_label=meta.app_label,
-            codename=meta.permissions[0][0],  # First perm codename
-        )
+        codename = meta.permissions[0][0]  # First perm codename
+        return f"{meta.app_label}.{codename}"
 
     def get_urls(self) -> List[URLPattern]:
         app_label = self.model._meta.app_label
@@ -122,7 +121,8 @@ class ModelAdminView(ModelAdmin):
 
         admin_login_url = reverse_lazy("admin:login")
         view = user_passes_test(
-            lambda u: u.is_active and hasattr(u, "is_staff") and u.is_staff, login_url=admin_login_url  # type: ignore[arg-type, return-value]
+            lambda u: u.is_active and hasattr(u, "is_staff") and u.is_staff,
+            login_url=admin_login_url,
         )(view)
         view = permission_required(perm, login_url=admin_login_url)(view)
         return view
@@ -241,9 +241,9 @@ def register(
         )
         # The first permission here is expected to be
         # the general access permission.
-        permissions = tuple(
-            [(access_perm_codename, access_perm_name)]
-            + list(getattr(inner_view, "permissions", []))
+        permissions = (
+            (access_perm_codename, access_perm_name),
+            *list(getattr(inner_view, "permissions", [])),
         )
 
         model = type(
@@ -303,9 +303,11 @@ class ViewTool:
 
 
 class AdminView(View):
-    tools: Optional[List[Union[Tuple[str, str], Tuple[str, str, str], ViewTool]]] = None
-    action: Optional[str] = None
-    admin: Optional[ModelAdminView] = None
+    tools: ClassVar[
+        Optional[List[Union[Tuple[str, str], Tuple[str, str, str], ViewTool]]]
+    ] = None
+    action: ClassVar[Optional[str]] = None
+    admin: ClassVar[Optional[ModelAdminView]] = None
 
     label: str
     verbose_name: str
@@ -354,8 +356,8 @@ class AdminView(View):
                     # Mypy doesn't change type on a len(...) call
                     # See: https://github.com/python/mypy/issues/1178
                     if len(tool) == 3:
-                        tool, perm = cast(Tuple[str, str, str], tool)[:-1], tool[-1]
-                    text, link = cast(Tuple[str, str], tool)
+                        tool, perm = tool[:-1], tool[-1]
+                    text, link = tool
                     tool = ViewTool(text, link, perm=perm)
                 else:
                     # Assume ViewTool

{django-bananas-2.2/src/bananas/admin/api → django_bananas-2.3/src/bananas/admin}/i18n.py

@@ -4,7 +4,6 @@ from django.views.i18n import JavaScriptCatalog
 
 
 class RawTranslationCatalog(JavaScriptCatalog):
-
     domain = "django"
 
     def render_to_response(self, context: Dict[str, Any], **response_kwargs: Any) -> Dict[str, Any]:  # type: ignore[override]

{django-bananas-2.2 → django_bananas-2.3}/src/bananas/drf/fencing.py

@@ -5,6 +5,7 @@ from functools import wraps
 from typing import (
     Any,
     Callable,
+    Final,
     FrozenSet,
     Generic,
     List,
@@ -24,7 +25,7 @@ from rest_framework.request import Request
 from rest_framework.response import Response
 from rest_framework.serializers import BaseSerializer, ModelSerializer
 from rest_framework.viewsets import GenericViewSet
-from typing_extensions import Final, Protocol, final
+from typing_extensions import Protocol, final
 
 from bananas.admin.api.schemas.yasg import BananasSwaggerSchema
 from bananas.models import TimeStampedModel
@@ -55,14 +56,18 @@ class Fence(abc.ABC, Generic[InstanceType, TokenType]):
         compare: Callable[[TokenType, TokenType], bool],
         get_version: Callable[[InstanceType], Optional[TokenType]],
         openapi_parameter: openapi.Parameter,
-        rejection: Exception = errors.PreconditionFailed(
-            "The resource does not fulfill the given preconditions"
-        ),
+        rejection: Optional[Exception] = None,
     ) -> None:
         self._get_token: Final = get_token
         self._compare: Final = compare
         self._get_version: Final = get_version
-        self._rejection: Final = rejection
+        self._rejection: Final = (
+            rejection
+            if rejection is not None
+            else errors.PreconditionFailed(
+                "The resource does not fulfill the given preconditions"
+            )
+        )
         self.openapi_parameter: Final = openapi_parameter
 
     def check(self, request: Request, instance: InstanceType) -> bool:
@@ -93,7 +98,7 @@ class FenceAwareSwaggerAutoSchema(BananasSwaggerSchema):
             isinstance(self.view, FencedUpdateModelMixin)
             and self.method in self.update_methods
         ):
-            return parameters + [self.view.fence.openapi_parameter]
+            return [*parameters, self.view.fence.openapi_parameter]
         return parameters
 
 
@@ -141,7 +146,7 @@ def header_date_parser(header: str) -> Callable[[Request], datetime.datetime]:
         try:
             return parse_header_datetime(request, header)
         except HeaderError as e:
-            raise e.as_api_error()
+            raise e.as_api_error() from e
 
     return parse
 
@@ -183,7 +188,7 @@ def header_etag_parser(header: str) -> Callable[[Request], FrozenSet[str]]:
         try:
             return parse_header_etags(request, header)
         except HeaderError as e:
-            raise e.as_api_error()
+            raise e.as_api_error() from e
 
     return parse
 

{django-bananas-2.2 → django_bananas-2.3}/src/bananas/drf/utils.py

@@ -39,8 +39,8 @@ class InvalidHeader(HeaderError):
 def parse_header_datetime(request: Request, header: str) -> datetime.datetime:
     try:
         value = request.headers[header]
-    except KeyError:
-        raise MissingHeader(header)
+    except KeyError as exc:
+        raise MissingHeader(header) from exc
     try:
         return datetime.datetime.fromtimestamp(
             parse_http_date(value), tz=datetime.timezone.utc
@@ -60,8 +60,8 @@ def clean_tags(tags: Iterable[str]) -> Iterable[str]:
 def parse_header_etags(request: Request, header: str) -> FrozenSet[str]:
     try:
         parts = request.headers[header].split(",")
-    except KeyError:
-        raise MissingHeader(header)
+    except KeyError as exc:
+        raise MissingHeader(header) from exc
     tags = frozenset(clean_tags(parts))
     if not tags:
         raise InvalidHeader(header)

{django-bananas-2.2 → django_bananas-2.3}/src/bananas/environment.py

@@ -5,6 +5,7 @@ from typing import (
     Any,
     Callable,
     Dict,
+    Final,
     Generic,
     Iterable,
     List,
@@ -18,7 +19,7 @@ from typing import (
 )
 
 from django.conf import global_settings
-from typing_extensions import Final, Protocol, overload
+from typing_extensions import Protocol, overload
 
 __all__ = ["env", "parse_bool", "parse_int", "parse_tuple", "parse_list", "parse_set"]
 
@@ -165,8 +166,8 @@ def get_parser(typ: Type[P]) -> Callable[[str], P]:
                 set: parse_set,
             }[typ],
         )
-    except KeyError:
-        raise NotImplementedError("Unsupported setting type: %r", typ)
+    except KeyError as exc:
+        raise NotImplementedError("Unsupported setting type: %r", typ) from exc
 
 
 def get_settings() -> Dict[str, Any]:
@@ -189,8 +190,8 @@ def get_settings() -> Dict[str, Any]:
         if key:
             if key in UNSUPPORTED_ENV_SETTINGS:
                 raise ValueError(
-                    'Django setting "{}" can not be '
-                    "configured through environment.".format(key)
+                    f'Django setting "{key}" can not be '
+                    "configured through environment."
                 )
 
             default_value = getattr(global_settings, key, UNDEFINED)
@@ -201,9 +202,9 @@ def get_settings() -> Dict[str, Any]:
                     parse = get_parser(SETTINGS_TYPES[key])
                 else:
                     # Determine parser by django setting type
-                    parse = get_parser(type(default_value))
+                    parse = get_parser(type(default_value))  # type: ignore[type-var]
 
-                value = parse(value)
+                value = parse(value)  # type: ignore[assignment]
 
             settings[key] = value
 
@@ -253,11 +254,7 @@ class EnvironWrapper:
         try:
             return parser(value)
         except ValueError:
-            log.warning(
-                "Unable to parse environment variable {key}={value}".format(
-                    key=key, value=value
-                )
-            )
+            log.warning(f"Unable to parse environment variable {key}={value}")
             return default
 
     @overload

{django-bananas-2.2 → django_bananas-2.3}/src/bananas/management/commands/show_urls.py

@@ -19,7 +19,7 @@ def collect_urls(
         pattern = urls.pattern.regex.pattern
         for x in urls.url_patterns:
             res += collect_urls(
-                x, namespace=urls.namespace or namespace, prefix=prefix + [pattern]
+                x, namespace=urls.namespace or namespace, prefix=[*prefix, pattern]
             )
         return res
     elif isinstance(urls, URLPattern):
@@ -30,7 +30,7 @@ def collect_urls(
                 [
                     ("namespace", namespace),
                     ("name", urls.name),
-                    ("pattern", prefix + [pattern]),
+                    ("pattern", [*prefix, pattern]),
                     ("lookup_str", lookup_str),
                     ("default_args", dict(urls.default_args or {})),
                 ]

{django-bananas-2.2 → django_bananas-2.3}/src/bananas/management/commands/syncpermissions.py

@@ -3,7 +3,6 @@ from django.core.management.base import BaseCommand, CommandError
 
 
 class Command(BaseCommand):
-
     help = "Create admin permissions"
 
     def handle(self, *args: object, **options: object) -> None:

{django-bananas-2.2 → django_bananas-2.3}/src/bananas/models.py

@@ -4,12 +4,11 @@ import math
 import os
 import uuid
 from itertools import chain
-from typing import Any, Dict, Mapping, Optional, Sized
+from typing import Any, ClassVar, Dict, Final, Mapping, Optional, Sized
 
 from django.core.exceptions import ValidationError
 from django.db import models
 from django.utils.translation import gettext_lazy as _
-from typing_extensions import Final
 
 
 class Missing:
@@ -20,7 +19,6 @@ MISSING: Final = Missing()
 
 
 class ModelDict(Dict[str, Any]):
-
     _nested: Optional[Dict[str, "ModelDict"]] = None
 
     def __getattr__(self, item: str) -> Any:
@@ -120,9 +118,7 @@ class ModelDict(Dict[str, Any]):
                         )
                     else:
                         raise AttributeError(
-                            "{!r} does not have {!r} attribute".format(
-                                previous_value, _field
-                            )
+                            f"{previous_value!r} does not have {_field!r} attribute"
                         )
 
                 elif value is None:
@@ -180,9 +176,9 @@ class UUIDModel(models.Model):
 class SecretField(models.CharField):
     description = _("Generates and stores a random key.")
 
-    default_error_messages = {
-        "random-is-none": _("%(cls)s.get_random_bytes returned None"),  # type: ignore[dict-item]
-        "random-too-short": _(  # type: ignore[dict-item]
+    default_error_messages = {  # noqa: RUF012
+        "random-is-none": _("%(cls)s.get_random_bytes returned None"),
+        "random-too-short": _(
             "Too few random bytes received from "
             "get_random_bytes. Number of"
             " bytes=%(num_bytes)s,"

{django-bananas-2.2 → django_bananas-2.3}/src/bananas/secrets.py

@@ -1,7 +1,7 @@
 import os
-from typing import Optional
+from typing import Final, Optional
 
-from typing_extensions import Final, overload
+from typing_extensions import overload
 
 from .environment import env
 

{django-bananas-2.2 → django_bananas-2.3}/src/bananas/url.py

@@ -27,11 +27,9 @@ Currently supported engines are:
 You can add your own by running ``register(scheme, module_name)`` before
 parsing.
 """
-from typing import Any, Dict, List, Mapping, NamedTuple, Optional, Tuple, Union
+from typing import Any, Dict, Final, List, Mapping, NamedTuple, Optional, Tuple, Union
 from urllib.parse import parse_qs, unquote_plus, urlsplit
 
-from typing_extensions import Final
-
 
 class Alias:
     """
@@ -97,8 +95,8 @@ def resolve(
         ), "Multiple levels of aliases are not supported"
 
         return result
-    except KeyError:
-        raise KeyError("No matches for engine %s" % key)
+    except KeyError as exc:
+        raise KeyError("No matches for engine %s" % key) from exc
 
 
 def get_engine(scheme: str) -> str:
@@ -128,12 +126,12 @@ def get_engine(scheme: str) -> str:
 
     try:
         engine, extra = engine
-    except ValueError:
+    except ValueError as exc:
         # engine was not a list of length 2
         raise ValueError(
             "django-bananas.url' engine "
             "configuration is invalid: %r" % ENGINE_MAPPING
-        )
+        ) from exc
 
     assert isinstance(
         extra, Mapping

{django-bananas-2.2 → django_bananas-2.3/src/django_bananas.egg-info}/PKG-INFO

@@ -1,27 +1,49 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.2
 Name: django-bananas
-Version: 2.2
+Version: 2.3
 Summary: Django Bananas - Django extensions the monkey way
 Home-page: https://github.com/5monkeys/django-bananas
 License: MIT License
 Classifier: Development Status :: 5 - Production/Stable
 Classifier: Programming Language :: Python
 Classifier: Programming Language :: Python :: 3
-Classifier: Programming Language :: Python :: 3.6
-Classifier: Programming Language :: Python :: 3.7
 Classifier: Programming Language :: Python :: 3.8
 Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
+Classifier: Programming Language :: Python :: 3.11
+Classifier: Programming Language :: Python :: 3.12
+Classifier: Programming Language :: Python :: 3.13
+Classifier: Framework :: Django
+Classifier: Framework :: Django :: 3.2
+Classifier: Framework :: Django :: 4.0
+Classifier: Framework :: Django :: 4.1
+Classifier: Framework :: Django :: 4.2
+Classifier: Framework :: Django :: 5.0
+Classifier: Framework :: Django :: 5.1
 Classifier: Intended Audience :: Developers
 Classifier: License :: OSI Approved :: MIT License
 Classifier: Operating System :: OS Independent
 Classifier: Framework :: Django
 Requires-Python: >=3.6
 Description-Content-Type: text/x-rst; charset=UTF-8
+License-File: LICENSE
+Requires-Dist: Django>=2.2
+Requires-Dist: typing-extensions>=3.7.4.3
 Provides-Extra: drf
+Requires-Dist: djangorestframework>=3.10; extra == "drf"
+Requires-Dist: drf-yasg>=1.20.0; extra == "drf"
 Provides-Extra: test
+Requires-Dist: tox; extra == "test"
+Requires-Dist: coverage[toml]; extra == "test"
 Provides-Extra: dev
-License-File: LICENSE
+Requires-Dist: mypy; extra == "dev"
+Requires-Dist: types-setuptools; extra == "dev"
+Requires-Dist: django-stubs; extra == "dev"
+Requires-Dist: djangorestframework-stubs; extra == "dev"
+Requires-Dist: pytest; extra == "dev"
+Requires-Dist: pytest-cov; extra == "dev"
+Requires-Dist: pytest-django; extra == "dev"
+Requires-Dist: pre-commit; extra == "dev"
 
 ================================================================================
 :banana: Django Bananas - Django extensions the monkey way
@@ -57,10 +79,12 @@ with the ``drf`` extra to keep those in sync:
 
 Currently tested only for
 
--   Django 3.2 under Python 3.7-3.9
+-   Django 3.2 under Python 3.8-3.10
 -   Django 4.0 under Python 3.8-3.10
--   Django 4.1 under Python 3.8-3.10
--   Django 4.2 under Python 3.8-3.10
+-   Django 4.1 under Python 3.8-3.13
+-   Django 4.2 under Python 3.8-3.13
+-   Django 5.0 under Python 3.10-3.13
+-   Django 5.1 under Python 3.10-3.13
 
 Pull requests welcome!
 
@@ -263,7 +287,6 @@ feature requires installation with the ``drf`` extra.
 
 
     class CustomAdminAPI(BananasAdminAPI):
-
         name = lazy_title(_("custom"))
 
         @schema(query_serializer=SomeSerializer, responses={200: SomeSerializer})
@@ -272,7 +295,6 @@ feature requires installation with the ``drf`` extra.
 
 
     class SomeModelAdminAPI(BananasAPI, viewsets.ModelViewSet):
-
         serializer_class = SomeModelSerializer
 
         def list(self, request):
@@ -581,4 +603,4 @@ and select specific tests with the ``test`` argument to ``make test``:
 
 .. code-block:: bash
 
-    make test test='tests.test_admin.APITest.test_logout'
+    make test test='-k test_logout'

{django-bananas-2.2 → django_bananas-2.3}/src/django_bananas.egg-info/SOURCES.txt

@@ -16,8 +16,8 @@ src/bananas/settings.py
 src/bananas/url.py
 src/bananas/admin/__init__.py
 src/bananas/admin/extension.py
+src/bananas/admin/i18n.py
 src/bananas/admin/api/__init__.py
-src/bananas/admin/api/i18n.py
 src/bananas/admin/api/mixins.py
 src/bananas/admin/api/permissions.py
 src/bananas/admin/api/router.py

{django-bananas-2.2 → django_bananas-2.3}/src/django_bananas.egg-info/requires.txt

@@ -1,12 +1,14 @@
 Django>=2.2
 typing-extensions>=3.7.4.3
-drf-yasg>=1.20.0
 
 [dev]
 mypy
+types-setuptools
 django-stubs
 djangorestframework-stubs
-pytest-mypy-plugins
+pytest
+pytest-cov
+pytest-django
 pre-commit
 
 [drf]
@@ -15,4 +17,4 @@ drf-yasg>=1.20.0
 
 [test]
 tox
-coverage
+coverage[toml]

django-bananas-2.2/pyproject.toml

@@ -1,3 +0,0 @@
-[build-system]
-requires = ["setuptools>=57.0.0", "wheel"]
-build-backend = "setuptools.build_meta"

django-bananas-2.2/setup.cfg

@@ -1,132 +0,0 @@
-[metadata]
-name = django-bananas
-description = Django Bananas - Django extensions the monkey way
-long_description = file: README.rst
-long_description_content_type = text/x-rst; charset=UTF-8
-url = https://github.com/5monkeys/django-bananas
-version = attr: bananas.__version__
-classifiers = 
-	Development Status :: 5 - Production/Stable
-	Programming Language :: Python
-	Programming Language :: Python :: 3
-	Programming Language :: Python :: 3.6
-	Programming Language :: Python :: 3.7
-	Programming Language :: Python :: 3.8
-	Programming Language :: Python :: 3.9
-	Programming Language :: Python :: 3.10
-	Intended Audience :: Developers
-	License :: OSI Approved :: MIT License
-	Operating System :: OS Independent
-	Framework :: Django
-license = MIT License
-license_file = LICENSE
-
-[options]
-packages = find:
-package_dir = 
-	=src
-python_requires = >=3.6
-include_package_data = True
-exclude = 
-	tests
-	_*
-	example
-zip_safe = False
-install_requires = 
-	Django>=2.2
-	typing-extensions>=3.7.4.3
-	drf-yasg>=1.20.0
-
-[options.packages.find]
-where = src
-
-[options.extras_require]
-drf = 
-	djangorestframework>=3.10
-	drf-yasg>=1.20.0
-test = 
-	tox
-	coverage
-dev = 
-	mypy
-	django-stubs
-	djangorestframework-stubs
-	pytest-mypy-plugins
-	pre-commit
-
-[options.package_data]
-bananas = py.typed
-
-[flake8]
-max-line-length = 88
-ignore = E501,E266,E731,W503,E203,B008,B024
-exclude = .eggs,.tox,.git,docs,migrations,node_modules,manage.py
-show-source = true
-max-complexity = 10
-
-[coverage:run]
-source = src
-branch = True
-parallel = True
-
-[coverage:report]
-fail_under = 90
-skip_covered = True
-show_missing = True
-exclude_lines = 
-	pragma: no cover
-	if __name__ == .__main__.:
-	^\s*\.\.\.
-	if TYPE_CHECKING:
-	raise NotImplementedError
-
-[isort]
-line_length = 88
-known_first_party = bananas
-multi_line_output = 3
-combine_as_imports = true
-include_trailing_comma = true
-force_grid_wrap = 0
-skip = migrations
-src_paths = src, tests
-
-[mypy]
-python_version = 3.7
-show_error_codes = True
-pretty = True
-files = src,tests,runtests.py,setup.py
-no_implicit_reexport = True
-no_implicit_optional = True
-strict_equality = True
-strict_optional = True
-check_untyped_defs = True
-disallow_incomplete_defs = True
-disallow_untyped_defs = True
-ignore_missing_imports = False
-warn_unused_configs = True
-warn_redundant_casts = True
-warn_unused_ignores = True
-warn_return_any = True
-warn_unreachable = True
-plugins = 
-	mypy_django_plugin.main
-
-[mypy.plugins.django-stubs]
-django_settings_module = tests.project.settings
-
-[mypy-tests.tests.*]
-disallow_untyped_defs = False
-
-[mypy-test.support]
-ignore_missing_imports = True
-
-[mypy-drf_yasg.*]
-ignore_missing_imports = True
-
-[mypy-setuptools.*]
-ignore_missing_imports = True
-
-[egg_info]
-tag_build = 
-tag_date = 0
-