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

{django-bananas-2.2 → django_bananas-2.4}/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.4}/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.4}/PKG-INFO

@@ -1,27 +1,51 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.4
 Name: django-bananas
-Version: 2.2
+Version: 2.4
 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: Framework :: Django :: 5.2
 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"
+Dynamic: license-file
 
 ================================================================================
 :banana: Django Bananas - Django extensions the monkey way
@@ -57,10 +81,13 @@ 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
+-   Django 5.2 under Python 3.10-3.13
 
 Pull requests welcome!
 
@@ -263,7 +290,6 @@ feature requires installation with the ``drf`` extra.
 
 
     class CustomAdminAPI(BananasAdminAPI):
-
         name = lazy_title(_("custom"))
 
         @schema(query_serializer=SomeSerializer, responses={200: SomeSerializer})
@@ -272,7 +298,6 @@ feature requires installation with the ``drf`` extra.
 
 
     class SomeModelAdminAPI(BananasAPI, viewsets.ModelViewSet):
-
         serializer_class = SomeModelSerializer
 
         def list(self, request):
@@ -581,4 +606,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.4}/README.rst

@@ -32,10 +32,13 @@ 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
+-   Django 5.2 under Python 3.10-3.13
 
 Pull requests welcome!
 
@@ -238,7 +241,6 @@ feature requires installation with the ``drf`` extra.
 
 
     class CustomAdminAPI(BananasAdminAPI):
-
         name = lazy_title(_("custom"))
 
         @schema(query_serializer=SomeSerializer, responses={200: SomeSerializer})
@@ -247,7 +249,6 @@ feature requires installation with the ``drf`` extra.
 
 
     class SomeModelAdminAPI(BananasAPI, viewsets.ModelViewSet):
-
         serializer_class = SomeModelSerializer
 
         def list(self, request):
@@ -556,4 +557,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.4/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", "py313"]
+
+[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.4/setup.cfg

@@ -0,0 +1,74 @@
+[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
+	Framework :: Django :: 5.2
+	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.4}/src/bananas/__init__.py

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

{django-bananas-2.2 → django_bananas-2.4}/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.4}/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.4}/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.4}/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.4}/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.4}/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,)
@@ -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
@@ -121,13 +120,12 @@ class ChangePasswordAPI(BananasAdminAPI):
 
 
 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.4}/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
@@ -133,12 +133,12 @@ class ModelAdminView(ModelAdmin):
         return perm
 
     def has_module_permission(self, request: HttpRequest) -> bool:
-        return request.user.has_perm(self.access_permission)
+        return bool(request.user.has_perm(self.access_permission))
 
     def has_change_permission(
         self, request: HttpRequest, obj: Optional[MT] = None
     ) -> bool:
-        return request.user.has_perm(self.access_permission)
+        return bool(request.user.has_perm(self.access_permission))
 
     # TODO: Remove obj?
     def has_add_permission(
@@ -175,8 +175,7 @@ def register(
     *,
     admin_site: Optional[AdminSite] = None,
     admin_class: Type[ModelAdmin] = ModelAdminView,
-) -> Type["AdminView"]:
-    ...
+) -> Type["AdminView"]: ...
 
 
 # Call with parenthesis: @register()
@@ -186,8 +185,7 @@ def register(
     *,
     admin_site: Optional[AdminSite] = None,
     admin_class: Type[ModelAdmin] = ModelAdminView,
-) -> Callable[[Type["AdminView"]], Type["AdminView"]]:
-    ...
+) -> Callable[[Type["AdminView"]], Type["AdminView"]]: ...
 
 
 def register(
@@ -236,14 +234,14 @@ def register(
         inner_view.verbose_name = verbose_name
 
         access_perm_codename = "can_access_" + model_name.lower()
-        access_perm_name = _("Can access {verbose_name}").format(
+        access_perm_name = str(_("Can access {verbose_name}")).format(
             verbose_name=verbose_name
         )
         # 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 +301,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 +354,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
@@ -385,7 +385,7 @@ class AdminView(View):
 
     def has_permission(self, perm: str) -> bool:
         perm = self.get_permission(perm)
-        return self.request.user.has_perm(perm)
+        return bool(self.request.user.has_perm(perm))
 
     def has_access(self) -> bool:
         assert self.admin is not None

{django-bananas-2.2/src/bananas/admin/api → django_bananas-2.4/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]