Merge pull request #19 from akx/renovate-2025-03

akx · web-flow · commit 3eb63e9c9970 · 2025-03-05T12:44:58.000+02:00
Renovations, spring 2025 🌸
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -12,26 +12,18 @@ jobs:
     strategy:
       matrix:
         include:
-          - python-version: '3.7'
           - python-version: '3.10'
           - python-version: '3.11'
           - python-version: '3.12'
     steps:
       - uses: actions/checkout@v4
-      - uses: actions/setup-python@v5
+      - uses: astral-sh/setup-uv@v5
         with:
           python-version: '${{ matrix.python-version }}'
-          cache: pip
-          cache-dependency-path: pyproject.toml
-      - run: pip install -U tox tox-gh
-      - run: tox
+          cache-dependency-glob: pyproject.toml
+      - run: uvx --with=tox-gh --with=tox-uv tox
   Lint:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-24.04
     steps:
       - uses: actions/checkout@v4
-      - uses: actions/setup-python@v5
-        with:
-          python-version: '3.11'
-          cache: pip
-          cache-dependency-path: pyproject.toml
-      - uses: pre-commit/action@v3.0.1
+      - uses: akx/pre-commit-uv-action@v0.1.0
diff --git a/.gitignore b/.gitignore
@@ -1,5 +1,6 @@
 *.egg*
 *.py[cod]
+*.sqlite3
 .*cache
 .coverage
 .tox
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -1,17 +1,17 @@
 repos:
   - repo: https://github.com/astral-sh/ruff-pre-commit
-    rev: v0.4.1
+    rev: v0.9.9
     hooks:
       - id: ruff
         args:
           - --fix
       - id: ruff-format
-  - repo: https://github.com/codespell-project/codespell
-    rev: v2.2.6
+  - repo: https://github.com/crate-ci/typos
+    rev: v1.30.1
     hooks:
-      - id: codespell
+      - id: typos
   - repo: https://github.com/pre-commit/mirrors-mypy
-    rev: v1.9.0
+    rev: v1.15.0
     hooks:
       - id: mypy
         args:
@@ -20,7 +20,7 @@ repos:
           - django-stubs
           - pytest
   - repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: v4.6.0
+    rev: v5.0.0
     hooks:
       - id: debug-statements
       - id: end-of-file-fixer
diff --git a/MANIFEST.in b/MANIFEST.in
diff --git a/README.md b/README.md
@@ -8,8 +8,8 @@ django-managerie
 Requirements
 ------------
 
-* Django 3.2+ (this project tracks Django's end-of-life policy)
-* Python 3.7+
+- Django 4.2+ (this project tracks Django's end-of-life policy)
+- Python 3.10+
 
 Installation
 ------------
diff --git a/django_managerie/managerie.py b/django_managerie/managerie.py
@@ -106,6 +106,8 @@ def _augment_app_list(
         request: HttpRequest,
         app_list: List[Dict],
     ):
+        # TODO: apps without models won't have their commands shown here since they
+        #       don't show up in the app_list. We should probably show them anyway.
         all_commands: Dict[str, CommandMap] = {
             app_config.label: commands for (app_config, commands) in self.get_commands(request).items()
         }
diff --git a/django_managerie/views.py b/django_managerie/views.py
@@ -16,7 +16,7 @@
 from django_managerie.managerie import Managerie
 
 
-class MenagerieBaseMixin:
+class ManagerieBaseMixin:
     managerie: Optional[Managerie] = None
     kwargs: Dict[str, Any]
     _app: Optional[AppConfig]
@@ -43,7 +43,7 @@ def dispatch(self, request, *args, **kwargs):
         return super().dispatch(request, *args, **kwargs)
 
 
-class ManagerieListView(MenagerieBaseMixin, StaffRequiredMixin, TemplateView):
+class ManagerieListView(ManagerieBaseMixin, StaffRequiredMixin, TemplateView):
     template_name = "django_managerie/admin/list.html"
 
     def get_context_data(self, **kwargs) -> Dict[str, Any]:
@@ -66,7 +66,7 @@ def get_context_data(self, **kwargs) -> Dict[str, Any]:
         return context
 
 
-class ManagerieCommandView(MenagerieBaseMixin, StaffRequiredMixin, FormView):
+class ManagerieCommandView(ManagerieBaseMixin, StaffRequiredMixin, FormView):
     template_name = "django_managerie/admin/command.html"
 
     @property
@@ -84,7 +84,7 @@ def get_command_object(self) -> ManagementCommand:
             )[self.command_name]
         except KeyError:
             raise Http404(
-                f"Command {self.command_name} not found in {app.label} " f"(or you don't have permission to run it)",
+                f"Command {self.command_name} not found in {app.label} (or you don't have permission to run it)",
             )
 
     def get_form(self, form_class=None) -> ArgumentParserForm:
diff --git a/manage.py b/manage.py
@@ -1,7 +1,7 @@
 import os
 import sys
 
-os.environ.setdefault("DJANGO_SETTINGS_MODULE", "managerie_tests.settings")
+os.environ.setdefault("DJANGO_SETTINGS_MODULE", "managerie_test_app.settings")
 
 
 def manage():
diff --git a/managerie_test_app/admin.py b/managerie_test_app/admin.py
@@ -0,0 +1,5 @@
+from django.contrib import admin
+
+from managerie_test_app.models import Example
+
+admin.site.register(Example)
diff --git a/managerie_test_app/migrations/0001_initial.py b/managerie_test_app/migrations/0001_initial.py
@@ -0,0 +1,18 @@
+# Generated by Django 5.1.6 on 2025-03-05 10:05
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+    initial = True
+
+    dependencies = []
+
+    operations = [
+        migrations.CreateModel(
+            name="Example",
+            fields=[
+                ("id", models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name="ID")),
+            ],
+        ),
+    ]
diff --git a/managerie_test_app/migrations/__init__.py b/managerie_test_app/migrations/__init__.py
diff --git a/managerie_test_app/models.py b/managerie_test_app/models.py
@@ -0,0 +1,5 @@
+from django.db import models
+
+
+class Example(models.Model):
+    pass
diff --git a/managerie_test_app/settings.py b/managerie_test_app/settings.py
@@ -55,7 +55,7 @@
 }
 
 AUTH_PASSWORD_VALIDATORS: List[str] = []
-
+DEFAULT_AUTO_FIELD = "django.db.models.BigAutoField"
 LANGUAGE_CODE = "en-us"
 TIME_ZONE = "UTC"
 USE_I18N = True
diff --git a/managerie_test_app/wsgi.py b/managerie_test_app/wsgi.py
@@ -2,5 +2,5 @@
 
 from django.core.wsgi import get_wsgi_application
 
-os.environ.setdefault("DJANGO_SETTINGS_MODULE", "managerie_tests.settings")
+os.environ.setdefault("DJANGO_SETTINGS_MODULE", "managerie_test_app.settings")
 application = get_wsgi_application()
diff --git a/mypy.ini b/mypy.ini
diff --git a/pyproject.toml b/pyproject.toml
@@ -8,22 +8,28 @@ dynamic = ["version"]
 description = "Expose Django management commands in the admin"
 readme = "README.md"
 license = "MIT"
-requires-python = ">=3.7"
+requires-python = ">=3.10"
 authors = [
     { name = "Aarni Koskela", email = "akx@iki.fi" },
 ]
 classifiers = [
     "Intended Audience :: Developers",
     "License :: OSI Approved :: MIT License",
     "Programming Language :: Python :: 3",
-    "Programming Language :: Python :: 3.7",
-    "Programming Language :: Python :: 3.8",
-    "Programming Language :: Python :: 3.9",
+    "Programming Language :: Python :: 3 :: Only",
     "Programming Language :: Python :: 3.10",
     "Programming Language :: Python :: 3.11",
+    "Programming Language :: Python :: 3.12",
+    "Programming Language :: Python :: 3.13",
 ]
 dependencies = [
-    "Django>=3.2",
+    "Django>=4.2",
+]
+
+[project.optional-dependencies]
+dev = [
+    "pytest-django~=4.10",
+    "pytest>=7.2",
 ]
 
 [project.urls]
@@ -55,3 +61,27 @@ extend-select = [
 
 [tool.ruff.lint.mccabe]
 max-complexity = 10
+
+[tool.tox]
+legacy_tox_ini = """
+[tox]
+isolated_build = true
+envlist =
+    py31{0,1}-django{42}
+    py31{2,3}-django{50,51}
+
+[testenv]
+commands = py.test {posargs}
+extras = dev
+deps =
+    django42: Django~=4.2.0
+    django50: Django~=5.0.0
+    django51: Django~=5.1.0
+
+[gh]
+python =
+    3.10 = py310
+    3.11 = py311
+    3.12 = py312
+    3.13 = py313
+"""
diff --git a/requirements-dev.in b/requirements-dev.in
diff --git a/requirements-dev.txt b/requirements-dev.txt
diff --git a/tox.ini b/tox.ini

Original file line number	Diff line number	Diff line change
`@@ -106,6 +106,8 @@ def _augment_app_list(`
`106`	`106`	`request: HttpRequest,`
`107`	`107`	`app_list: List[Dict],`
`108`	`108`	`):`
	`109`	`+ # TODO: apps without models won't have their commands shown here since they`
	`110`	`+ # don't show up in the app_list. We should probably show them anyway.`
`109`	`111`	`all_commands: Dict[str, CommandMap] = {`
`110`	`112`	`app_config.label: commands for (app_config, commands) in self.get_commands(request).items()`
`111`	`113`	`}`