new pyproject.toml

Author: saxix

.bumpversion.cfg

@@ -7,3 +7,5 @@ tag = False
 allow_dirty = True
 
 [bumpversion:file:src/admin_extra_buttons/__init__.py]
+
+[bumpversion:file:pyproject.toml]

.gitignore

@@ -15,4 +15,5 @@ pytest.xml
 *.sqlite
 dist/*
 docs/site
-stubs/
+stubs/
+uv.lock

CHANGES

@@ -1,5 +1,7 @@
 1.6.0
 -----
+* moves to pyproject.toml (removes `setup.py`)
+* starts using `uv`
 * removes constraint to use `button` as @link() argument
 * drop official support for Django < 3.x
 

pyproject.toml

@@ -0,0 +1,76 @@
+[project]
+name = "django-admin-extra-buttons"
+version = "1.6.0"
+description = "Django mixin to easily add buttons to any ModelAdmin"
+readme = "README.md"
+requires-python = ">=3.11"
+classifiers=[
+        'Environment :: Web Environment',
+        'Operating System :: OS Independent',
+        'Framework :: Django',
+        'Framework :: Django :: 4.2',
+        'Framework :: Django :: 5.0',
+        'Framework :: Django :: 5.1',
+        'License :: OSI Approved :: BSD License',
+        'Programming Language :: Python :: 3.11',
+        'Programming Language :: Python :: 3.12',
+        'Topic :: Software Development :: Libraries :: Application Frameworks',
+        'Topic :: Software Development :: Libraries :: Python Modules',
+        'Intended Audience :: Developers'
+    ]
+
+dependencies = [
+
+]
+[project.urls]
+Homepage = "https://github.com/saxix/django-admin-extra-buttonst"
+Documentation = "https://github.com/saxix/django-admin-extra-buttons"
+
+[project.optional-dependencies]
+docs = [
+    "mkdocs>=1.6.1",
+    "markdown-include",
+    "mkdocs-material>=9.5.36",
+    "mkdocs-awesome-pages-plugin>=2.9.3",
+    "mkdocstrings-python",
+    "mdx_gh_links",
+]
+
+[tool.uv]
+dev-dependencies = [
+    #    "black>=24.8.0",
+    #    "celery[pytest]>=5.4.0",
+    #    "django-webtest>=1.9.12",
+    #    "factory-boy>=3.3.1",
+    #    "flake8>=7.1.1",
+    #    "flower>=2.0.1",
+    #    "ipython>=8.18.1",
+    #    "isort>=5.13.2",
+    #    "mypy>=1.11.2",
+    #    "pdbpp>=0.10.3",
+    #    "psycopg-binary>=3.2.2",
+    #    "psycopg>=2.9.9",
+    #    "pyquery>=2.0.1",
+    #    "pytest-cov>=5.0.0",
+    #    "pytest-django>=4.9.0",
+    #    "pytest-echo>=1.7.3",
+    "django-webtest>=1.9.12",
+    #    "black>=24.8.0",
+    #    "celery[pytest]>=5.4.0",
+    #    "django-webtest>=1.9.12",
+    #    "factory-boy>=3.3.1",
+    #    "flake8>=7.1.1",
+    #    "flower>=2.0.1",
+    #    "ipython>=8.18.1",
+    #    "isort>=5.13.2",
+    #    "mypy>=1.11.2",
+    #    "pdbpp>=0.10.3",
+    #    "psycopg-binary>=3.2.2",
+    #    "psycopg>=2.9.9",
+    #    "pyquery>=2.0.1",
+    #    "pytest-cov>=5.0.0",
+    #    "pytest-django>=4.9.0",
+    #    "pytest-echo>=1.7.3",
+    "pytest>=8.3.3",
+    "tox>=4.20.0",
+]

pytest.ini

@@ -0,0 +1,27 @@
+[pytest]
+norecursedirs = data .tox _plugin_template .idea  node_modules ~*
+log_format = %(asctime)s %(levelname)s %(message)s
+log_level = CRITICAL
+django_find_project = false
+log_cli = False
+log_date_format = %Y-%m-%d %H:%M:%S
+junit_family=xunit1
+pythonpath=src
+testpaths=tests
+tmp_path_retention_policy=all
+tmp_path_retention_count=0
+addopts =
+        -rs
+        --tb=short
+        --capture=sys
+        --echo-version django
+        --cov-config=tests/.coveragerc
+        --cov-report html
+        --cov-report xml:coverage.xml
+
+
+markers =
+    admin
+    eager
+
+python_files=test_*.py

setup.py

@@ -1,12 +1,23 @@
 import os
+import sys
+from pathlib import Path
 
 import django_webtest
 import pytest
-from demo.models import DemoModel1, DemoModel2, DemoModel5
+
+here = Path(__file__).parent
+DEMOAPP_PATH = here / "demoapp"
+sys.path.insert(0, str(here / "../src"))
+sys.path.insert(0, str(DEMOAPP_PATH))
 
 
 def pytest_configure(config):
     os.environ['DEBUG'] = "False"
+    os.environ.update(DJANGO_SETTINGS_MODULE="demo.settings")
+
+    import django
+
+    django.setup()
 
 
 @pytest.fixture(autouse=True)
@@ -25,22 +36,24 @@ def app(request):
 
 @pytest.fixture
 def demomodel2():
+    from demo.models import DemoModel1, DemoModel2, DemoModel5
     return DemoModel2.objects.get_or_create(name='name1')[0]
 
 
 @pytest.fixture
 def demomodel1():
+    from demo.models import DemoModel1, DemoModel2, DemoModel5
     return DemoModel1.objects.get_or_create(name='name1')[0]
 
 
 @pytest.fixture
 def demomodel5():
+    from demo.models import DemoModel1, DemoModel2, DemoModel5
     return DemoModel5.objects.get_or_create(name='name1')[0]
 
 
 @pytest.fixture(scope='function')
 def staff_user(request, django_user_model, django_username_field):
-
     user, _ = django_user_model._default_manager.get_or_create(**{django_username_field: 'username',
                                                                   'is_staff': True})
     user.set_password('password')

tests/conftest.py

@@ -14,7 +14,6 @@ def v(btn):
 
 def test_link_visibility():
     def v(btn):
-        assert btn.original
         return isinstance(btn, LinkButton)
 
     h = LinkHandler(MagicMock(__name__="a"), visible=v)

tests/test_visibility.py

@@ -1,40 +1,42 @@
 [tox]
 envlist = d{42,51}-py{311,312}
-
-[pytest]
-pythonpath=./tests/demoapp/
-django_find_project = false
-DJANGO_SETTINGS_MODULE=demo.settings
-norecursedirs = .tox docs ./tests/demoapp/
-python_files=tests/test_*.py
-addopts =
-        -v
-        --cov=admin_extra_buttons
-        --cov-report=html
-        --cov-config=./tests/.coveragerc
-        --reuse-db
-        --tb=short
-        --capture=no
-        --echo-version django
-
-markers =
-  functional: mark a test as functional
+skip_missing_interpreters = true
+;skipsdist = true
 
 [testenv]
+;install_command=pip install {opts} {packages}
+passenv =
+    PYTHONDONTWRITEBYTECODE
+    PGHOST
+    PGPORT
+
+allowlist_externals =
+    sh
 
+changedir={toxinidir}
 setenv =
-    PYTHONDONTWRITEBYTECODE=true
-    DISPLAY=:0.0
+    d42: DJANGO = django>=4,<5
+    d51: DJANGO = django>=5,<6
+    d42: LOCK = "uv4.lock"
+    d51: LOCK = "uv5.lock"
 
-extras = test
-deps=
-    d32: django==3.2.*
-    d42: django==4.0.*
-    d50: django==5.0.*
-    dev: git+git://github.com/django/django.git#egg=django
+deps =
+    uv
+
+commands =
+    sh -c "echo '{env:DJANGO}' > {work_dir}/overrides.txt"
+    uv export -q --no-hashes  -o {work_dir}/requirements.txt
+    uv pip install -r {work_dir}/requirements.txt --override {work_dir}/overrides.txt
+    pytest tests
 
+
+[testenv:lint]
+envdir={toxworkdir}/d42-py312/
+skip_install = true
 commands =
-    py.test tests --create-db {posargs}
+    pip install flake8 isort
+    flake8 src tests
+    isort -c src tests
 
 
 [testenv:package]
@@ -50,11 +52,3 @@ commands =
     python -c "import shutil; shutil.rmtree('dist', ignore_errors=True)"
     python -m build
     python -m twine upload --repository-url https://test.pypi.org/legacy/ dist/*
-
-
-[testenv:docs]
-extras=
-    docs
-
-commands =
-    mkdocs build