fixes typing

Author: saxix

.github/workflows/test.yml

@@ -86,12 +86,13 @@ jobs:
         if: ${{ always() }}
 
       - name: Upload coverage to Codecov
-        uses: codecov/codecov-action@v4
+        uses: codecov/codecov-action@v5
         if: matrix.python == 3.12
         continue-on-error: true
         with:
           env_vars: OS,PYTHON
           fail_ci_if_error: true
+          slug: saxix/django-smart-admin
           flags: unittests
           files: ./coverage.xml
           verbose: false

.pre-commit-config.yaml

@@ -24,11 +24,6 @@ repos:
             -   id: ruff-format
             -   id: ruff
                 args: [ "--fix", "--unsafe-fixes", "--exit-non-zero-on-fix" ]
-#    -   repo: https://github.com/adamchainz/djade-pre-commit
-#        rev: "1.3.2"
-#        hooks:
-#            -   id: djade
-#                args: [ --check, --target-version, "5.1" ]
     -   repo: meta
         hooks:
             -   id: check-hooks-apply

MANIFEST.in

@@ -6,3 +6,6 @@ include MANIFEST.in
 recursive-include docs *
 recursive-include src/admin_extra_buttons *
 recursive-include tests *
+
+exclude ~*
+recursive-exclude . ~*

Makefile

@@ -1,46 +1,15 @@
-# Regular configuration file (can be used as base in other projects, runs in CI)
-
 [mypy]
-# Modified in `tests.yml`
-incremental = true
-mypy_path = tests/demoapp
-;
-;# Strictness:
-;allow_redefinition = true
-;check_untyped_defs = true
-;# TODO: add type args to all generics
-;disallow_any_generics = false
-;# TODO: fix `Any` subclassing in `typeshed/builtins.pyi`
-;disallow_subclassing_any = false
-;ignore_missing_imports = false
+files = src/admin_extra_buttons
+mypy_path = $MYPY_CONFIG_FILE_DIR/src/:$MYPY_CONFIG_FILE_DIR/tests/demoapp
+;enable_error_code =
+;    deprecated,
+;    ignore-without-code
+plugins =
+    mypy_django_plugin.main
+
 strict = true
-;local_partial_types = true
-;warn_unreachable = true
-;
-;# TODO: update our output assertions to match a new syntax
-;force_uppercase_builtins = true
-;force_union_syntax = true
-;
-;disable_error_code = empty-body
-enable_error_code =
-    deprecated,
-    ignore-without-code
 
 
-show_traceback = true
-;
-plugins =
-    mypy_django_plugin.main,
-    mypy.plugins.proper_plugin
-;
-;# Ignore incomplete hints in 3rd party stubs:
-;[mypy-yaml.*]
-;disallow_untyped_defs = false
-;disallow_incomplete_defs = false
-;
-;[mypy-cryptography.*]
-;ignore_errors = true
-;
-;# Our settings:
+
 [mypy.plugins.django-stubs]
 django_settings_module = demo.settings

mypy.ini

@@ -32,7 +32,7 @@ dynamic = [
   "version",
 ]
 dependencies = [
-  "django-stubs>=5.1.3",
+  "django-stubs",
 ]
 
 urls.Documentation = "https://saxix.github.io/django-admin-extra-buttons/"
@@ -45,6 +45,7 @@ dev = [
   "django-webtest>=1.9.13",
   "factory-boy>=3.3.1",
   "pdbpp>=0.10.3",
+  "pre-commit>=4.2",
   "pyquery>=2.0.1",
   "pytest>=8.3.3",
   "pytest-cov>=5",
@@ -78,7 +79,7 @@ dj = [
 ]
 
 type-check = [
-  "mypy<1.15",
+  "mypy",
 ]
 
 [tool.hatch]
@@ -95,126 +96,8 @@ include = [
 [tool.hatch.build.targets.wheel]
 packages = [ "src/admin_extra_buttons" ]
 
-[tool.ruff]
-target-version = "py39"
-line-length = 120
-exclude = [
-  "docs",
-  "manage.py",
-  "tests",
-]
-format.preview = true
-format.docstring-code-line-length = 120
-format.docstring-code-format = true
-lint.select = [
-  "ALL",
-]
-lint.ignore = [
-  "ANN401", #  Dynamically typed expressions
-  "COM812",
-  "CPY",    # Missing copyright notice
-  "D",      # docstring
-  "DOC",    # docstring
-  "E731",   #  Do not assign a `lambda` expression,
-  "EM101",  #  Exception must not use a string literal, assign to variable first
-  "EM102",  #  Exception must not use a f-string literal, assign to variable first
-  "FBT001", #  Boolean-typed positional argument in function definition
-  "FBT002", #  Boolean default positional argument in function definition
-  "N806",   # Variable `...` in function should be lowercase
-  "S308",   # Use of `mark_safe` may expose cross-site scripting vulnerabilities
-  "SLF001", #  Private member accessed: `...`
-  "TRY003", # Avoid specifying long messages outside the exception class
-  "TRY301", # Abstract `raise` to an inner function
-  "TRY401", #  Redundant exception object included in `logging.exception` call
-  "UP037",  #
-]
-lint.per-file-ignores."docs/conf.py" = [
-  "A001",   #
-  "D100",   #
-  "ERA001", #
-  "INP001", #
-]
-lint.per-file-ignores."src/**/version.py" = [
-  "ALL",
-]
-lint.per-file-ignores."tests/**/*.py" = [
-  "A",
-  "ANN",
-  "ARG",
-  "B",
-  "BLE",
-  "D",
-  "DJ",
-  "DTZ",
-  "ERA",
-  "F",
-  "FBT",
-  "FURB",
-  "INP",
-  "N",
-  "PGH",
-  "PLC",
-  "PLR",
-  "PLW",
-  "PT",
-  "PTH",
-  "PYI",
-  "RUF",
-  "S",
-  "SIM",
-  "TC",
-  "UP",
-]
-lint.isort = { known-first-party = [ "admin_extra_buttons" ] }
-lint.pylint.max-args = 7
-lint.pylint.max-branches = 14
-lint.pylint.max-nested-blocks = 8
-lint.preview = true
-
 [tool.pyproject-fmt]
 max_supported_python = "3.13"
 
-[tool.pytest.ini_options]
-django_find_project = false
-norecursedirs = [ "demoapp", ".tox" ]
-addopts = "--doctest-modules --echo-attr=django.conf.settings.DATABASES.default.ENGINE --tb=short --reuse-db --capture=no --doctest-glob=admin_extra_buttons/*.py"
-python_files = "tests/test_*.py tests/**/test_*.py src/*.py"
-markers = [
-  "functional: mark a test as functional",
-  "selenium: selenium test",
-  "skip: skip test",
-]
-testpaths = [
-  "src",
-  "tests",
-]
-
-[tool.coverage]
-run.source = [
-  "admin_extra_buttons",
-]
-run.dynamic_context = "test_function"
-run.branch = true
-run.parallel = true
-
-run.plugins = [
-  "covdefaults",
-]
-report.fail_under = 80
-report.show_missing = true
-report.exclude_lines = [
-  "pragma: no cover",
-]
-html.show_contexts = true
-html.skip_covered = false
-paths.source = [
-  "src",
-  ".tox*/*/lib/python*/site-packages",
-  ".tox*/pypy*/site-packages",
-  ".tox*\\*\\Lib\\site-packages",
-  "*/src",
-  "*\\src",
-]
-
 [tool.uv]
 package = true

pyproject.toml

@@ -0,0 +1,50 @@
+[pytest]
+django_find_project = false
+pythonpath = ./tests/demoapp/ ./src
+DJANGO_SETTINGS_MODULE = demo.settings
+norecursedirs = "demo", ".tox"
+addopts =
+    --tb=short
+    --capture=no
+    --echo-version=django
+    --echo-attr=django.conf.settings.DATABASES.default.ENGINE
+    --cov=admin_sync
+    --cov-report=html
+    --cov-report=xml
+    --cov-config=tests/.coveragerc
+
+;python_files = "tests/test_*.py tests/**/test_*.py src/*.py"
+markers =
+    functional: mark a test as functional
+    selenium: selenium test
+    skip: skip test
+
+;
+;[tool.coverage]
+;run.source = [
+;  "admin_sync",
+;]
+;run.dynamic_context = "test_function"
+;run.branch = true
+;run.parallel = true
+;run.omit = [
+;  "**/create_extra_permissions.py",
+;]
+;run.plugins = [
+;  "covdefaults",
+;]
+;report.fail_under = 80
+;report.show_missing = true
+;report.exclude_lines = [
+;  "pragma: no cover",
+;]
+;html.show_contexts = true
+;html.skip_covered = false
+;paths.source = [
+;  "src",
+;  ".tox*/*/lib/python*/site-packages",
+;  ".tox*/pypy*/site-packages",
+;  ".tox*\\*\\Lib\\site-packages",
+;  "*/src",
+;  "*\\src",
+;]