Merge branch 'release/1.6'

* release/1.6:
  testt packahe wheel
  minor improvements to tox.ini
  minor improvements to tox.ini
  add tox task to test package
  just a bit of coverage
  updates tox and CI
  fixes deps
  updates docs CI
  fixes wrong deps
  updates tox
  updates CI and tox
  updated docs and CI
  new pyproject.toml
  bump version
  open 1.6rc
  bump version
  remove testcommand

.bumpversion.cfg

@@ -1,9 +1,11 @@
 [bumpversion]
-current_version = 1.5.8
+current_version = 1.6.0
 parse = (?P<major>\d+)\.(?P<minor>\d+)\.(?P<patch>\d+)
 serialize = {major}.{minor}.{patch}
 commit = False
 tag = False
 allow_dirty = True
 
 [bumpversion:file:src/admin_extra_buttons/__init__.py]
+
+[bumpversion:file:pyproject.toml]

.github/file-filters.yml

@@ -0,0 +1,30 @@
+# This is used by the action https://github.com/dorny/paths-filter
+dependencies: &dependencies
+  - 'pyproject.toml'
+
+python: &python
+  - added|modified: 'src/**'
+  - added|modified: 'tests/**'
+  - 'manage.py'
+
+changelog:
+  - added|modified: 'changes/**'
+  - 'CHANGELOG.md'
+
+mypy:
+  - *python
+  - 'mypy.ini'
+
+run_tests:
+  - *python
+  - *dependencies
+  - 'pytest.ini'
+  - '.github/workflows/test.yml'
+  - '.github/file-filters.yml'
+
+lint:
+  -  *python
+  - '.flake8'
+  - 'pyproject.toml'
+  - '.github/file-filters.yml'
+  - '.github/workflows/lint.yml'

.github/workflows/docs.yml

@@ -1,26 +1,67 @@
-name: Documentation
+name: "Documentation"
+
 on:
-    push:
-        paths:
-            - 'docs/**'
-            - 'README.md'
-            - '.github/workflows/docs.yml'
+  push:
+    branches:
+      - develop
+      - master
+  schedule:
+    - cron: '37 23 * * 2'
+
+permissions:
+  contents: read
+  pages: write
+  id-token: write
+
+concurrency:
+  group: "pages"
+  cancel-in-progress: false
 
 jobs:
-    build:
-        name: Deploy docs
-        runs-on: ubuntu-latest
-        steps:
-            - name: Checkout main
-              uses: actions/checkout@v2
-
-            - name: Deploy docs
-              uses: mhausenblas/mkdocs-deploy-gh-pages@master
-                # Or use mhausenblas/mkdocs-deploy-gh-pages@nomaterial to build without the mkdocs-material theme
-              env:
-                  GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-#                  CUSTOM_DOMAIN: optionaldomain.com
-                  CONFIG_FILE: ./mkdocs.yml
-                  EXTRA_PACKAGES: build-base
-                  # GITHUB_DOMAIN: github.myenterprise.com
-                  REQUIREMENTS: docs/requirements.txt
+  generate:
+    name: Generate
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+
+      - name: Restore cached venv
+        id: cache-venv-restore
+        uses: actions/cache/restore@v4
+        with:
+          path: |
+            .cache-uv/
+            .venv/
+          key: ${{ matrix.python-version }}-${{matrix.django-version}}-venv
+
+      - uses: yezz123/setup-uv@v4
+      - name: Build Doc
+        run: |
+          uv sync --extra docs
+          PYTHONPATH=./src uv run --cache-dir .cache-uv/ mkdocs build -d ./docs-output
+
+      - name: Cache venv
+        if: steps.cache-venv-restore.outputs.cache-hit != 'true'
+        id: cache-venv-save
+        uses: actions/cache/save@v4
+        with:
+          path: |
+            .cache-uv/
+            .venv/
+          key: ${{ matrix.python-version }}-${{matrix.django-version}}-venv
+
+      - name: Upload artifact
+        uses: actions/upload-pages-artifact@v3
+        with:
+          path: ./docs-output
+
+  # Deployment job
+  deploy:
+    environment:
+      name: github-pages
+      url: ${{ steps.deployment.outputs.page_url }}
+    runs-on: ubuntu-latest
+    needs: generate
+    steps:
+      - name: Deploy to GitHub Pages
+        id: deployment
+        uses: actions/deploy-pages@v4

.github/workflows/lint.yml

@@ -0,0 +1,62 @@
+name: Lint
+
+on:
+  push:
+    branches:
+      - '**'        # matches every branch
+
+concurrency:
+  group: "${{ github.workflow }}-${{ github.ref }}-lint"
+  cancel-in-progress: true
+
+defaults:
+  run:
+    shell: bash
+
+permissions:
+  id-token: write
+  attestations: write
+
+
+jobs:
+  changes:
+    runs-on: ubuntu-latest
+    timeout-minutes: 1
+    defaults:
+      run:
+        shell: bash
+    outputs:
+      lint: ${{steps.changes.outputs.lint }}
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4.1.7
+      - id: changes
+        name: Check for file changes
+        uses: dorny/paths-filter@0bc4621a3135347011ad047f9ecf449bf72ce2bd # v3.0.0
+        with:
+          base: ${{ github.ref }}
+          token: ${{ github.token }}
+          filters: .github/file-filters.yml
+
+  lint:
+    runs-on: ubuntu-latest
+    defaults:
+      run:
+        shell: bash
+    needs: [ changes ]
+    if: needs.changes.outputs.lint
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4.1.7
+
+      - name: Set up Python
+        uses: actions/setup-python@v5
+        with:
+          python-version: 3.12
+          architecture: 'x64'
+      - uses: yezz123/setup-uv@v4
+      - name: lint
+        if: needs.changes.outputs.lint
+        run: |
+          uv run isort src/ --check-only
+          uv run flake8 src/

.github/workflows/test.yml

@@ -1,57 +1,114 @@
 name: Test
 
 on:
-    push:
-        branches:
-            - master
-            - develop
-    pull_request:
+  push:
+    branches:
+      - '**'        # matches every branch
+
+concurrency:
+  group: "${{ github.workflow }}-${{ github.ref }}-test"
+  cancel-in-progress: true
+
+defaults:
+  run:
+    shell: bash
+
+permissions:
+  id-token: write
+  attestations: write
+
 
 jobs:
-    lint:
-        runs-on: ubuntu-latest
-        steps:
-            -   uses: actions/checkout@v2
-            -   uses: actions/setup-python@v2
-
-            -   name: Install dependencies
-                run: |
-                    python -m pip install --upgrade pip flake8 isort
-            -   name: Lint with flake8
-                run: |
-                    flake8 src
-                    isort -c src
-
-    test:
-        #        if: ${{github.event}} && ${{ !contains(github.event.head_commit.message, 'ci skip') }}
-        runs-on: ubuntu-latest
-        strategy:
-            fail-fast: false
-            matrix:
-                python-version: [ "3.11", "3.12"]
-                django-version: [ "3.2", "4.2", "5.0"]
-        env:
-            PY_VER: ${{ matrix.python-version}}
-            DJ_VER: ${{ matrix.django-version}}
-
-        steps:
-            -   uses: actions/checkout@v2
-
-            -   name: Set up Python ${{ matrix.python-version }}
-                uses: actions/setup-python@v2
-                with:
-                    python-version: ${{ matrix.python-version }}
-
-            -   name: Install dependencies
-                run: python -m pip install tox
-
-            -   name: Test with Tox
-                run: tox -e d${DJ_VER//.}-py${PY_VER//.} -- --create-db --cov-report=xml --cov-report=term --junitxml=pytest.xml
-
-            -   uses: codecov/codecov-action@v1
-                with:
-#                    files: ./coverage1.xml,./coverage2.xml # optional
-#                    flags: unittests # optional
-#                    name: codecov-umbrella # optional
-#                    fail_ci_if_error: true # optional (default = false)
-                    verbose: true # optional (default = false)
+  changes:
+    runs-on: ubuntu-latest
+    timeout-minutes: 1
+    defaults:
+      run:
+        shell: bash
+    outputs:
+      run_tests: ${{steps.changes.outputs.run_tests }}
+      lint: ${{steps.changes.outputs.lint }}
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4.1.7
+      - id: changes
+        name: Check for file changes
+        uses: dorny/paths-filter@0bc4621a3135347011ad047f9ecf449bf72ce2bd # v3.0.0
+        with:
+          base: ${{ github.ref }}
+          token: ${{ github.token }}
+          filters: .github/file-filters.yml
+
+  ci:
+    runs-on: ubuntu-latest
+    name: Test py${{ matrix.python-version }}/dj${{matrix.django-version}}
+    defaults:
+      run:
+        shell: bash
+    strategy:
+      max-parallel: 1
+      matrix:
+        python-version: [ "3.11", "3.12" ]
+        django-version: [ "4.2", "5.1" ]
+      fail-fast: true
+    needs: [ changes ]
+#    if: needs.changes.outputs.run_tests || needs.changes.outputs.lint
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4.1.7
+      - name: Set up Python ${{ matrix.python-version }}
+        uses: actions/setup-python@v5
+        with:
+          python-version: ${{ matrix.python-version }}
+          architecture: 'x64'
+      - name: Restore cached venv
+        id: cache-venv-restore
+        uses: actions/cache/restore@v4
+        with:
+          path: |
+            .cache-uv/
+            .venv/
+          key: ${{ matrix.python-version }}-${{matrix.django-version}}-${{ hashFiles('pyproject.toml') }}-venv
+
+      - uses: yezz123/setup-uv@v4
+        with:
+          python:  ${{ matrix.python-version }}
+
+      - name: Test
+#        if: needs.changes.outputs.run_tests
+        run: |
+              uv export -q --no-hashes  -o requirements.txt
+              pip install -r requirements.txt
+              pip install "django==${{ matrix.django-version }}.*"
+              python -m pytest tests/ \
+                --junit-xml junit-${{ matrix.python-version }}-${{matrix.django-version}}.xml \
+                --cov --cov-report xml
+      - name: Cache venv
+        if: steps.cache-venv-restore.outputs.cache-hit != 'true'
+        id: cache-venv-save
+        uses: actions/cache/save@v4
+        with:
+          path: |
+            .cache-uv/
+            .venv/
+          key: ${{ matrix.python-version }}-${{matrix.django-version}}-${{ hashFiles('pyproject.toml') }}-venv
+
+      - name: Upload pytest test results
+        uses: actions/upload-artifact@v4
+        with:
+          name: pytest-results-${{ matrix.python-version }}-${{matrix.django-version}}
+          path: junit-${{ matrix.python-version }}-${{matrix.django-version}}.xml
+        if: ${{ always() }}
+
+      - name: Upload coverage to Codecov
+        uses: codecov/codecov-action@v4
+        if: matrix.python-version == 3.12
+        continue-on-error: true
+        with:
+          env_vars: OS,PYTHON
+          fail_ci_if_error: true
+          flags: unittests
+          files: ./coverage.xml
+          verbose: false
+          token: ${{ secrets.CODECOV_TOKEN }}
+          name: codecov-${{env.GITHUB_REF_NAME}}

.gitignore

@@ -13,6 +13,7 @@ pytest.xml
 *.py[co]
 *.egg-info
 *.sqlite
-dist/*
+dist
 docs/site
-stubs/
+stubs/
+uv.lock