Update for Python 3.14 and Django 6.0 readiness (#7)

* Update for Python 3.14 and Django 6.0 readiness

- Update pyproject.toml classifiers for Python 3.12/3.13/3.14 and Django 5.2/6.0
- Update requires-python to >=3.12
- Modernize ruff configuration with proper lint and format sections
- Update black target-version to py312
- Update pre-commit hooks to v5.0.0 and ruff to v0.8.3
- Update GitHub CI test matrix for Python 3.12/3.13/3.14 and Django 5.2/6.0
- Add continue-on-error for Django 6.0 and Python 3.14 in CI

🤖 Generated with [Claude Code](https://claude.com/claude-code)

Co-Authored-By: Claude <noreply@anthropic.com>

* Update CI workflow: remove Black/pre-commit, add merge queue support

- Add merge_group trigger for merge queue support
- Remove redundant Black and pre-commit jobs
- Update Ruff job to include both format and lint checks
- Rename job to "Ruff Format" for clarity
- Add always() pattern to release job to prevent skip propagation

🤖 Generated with [Claude Code](https://claude.com/claude-code)

Co-Authored-By: Claude <noreply@anthropic.com>

* Update ruff to v0.14.8 and fix formatting

🤖 Generated with [Claude Code](https://claude.com/claude-code)

Co-Authored-By: Claude <noreply@anthropic.com>

---------

Co-authored-by: Claude <noreply@anthropic.com>

Author: rh0dium

.github/workflows/main.yml

@@ -2,6 +2,7 @@ name: Django States Tests
 
 on:
   push:
+  merge_group:
   schedule:
     - cron: '0 1 * * 5'
 
@@ -29,27 +30,8 @@ jobs:
       - name: outdated
         run: pip list --outdated --not-required --user | grep . && echo "There are outdated packages" && exit 1 || echo "All packages up to date"
 
-  black:
-    name: Black
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v4
-      - uses: actions/setup-python@v5
-        with:
-          python-version: "3.13"
-          cache: 'pip'
-
-      - name: Install dependencies
-        run: |
-          python -m pip install --upgrade pip
-          pip install .
-          pip install .[test]
-
-      - name: Black
-        run: black --check .
-
   ruff:
-    name: Ruff
+    name: Ruff Format
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
@@ -64,28 +46,11 @@ jobs:
           pip install .
           pip install .[test]
 
-      - name: Ruff
-        run: ruff check
+      - name: Ruff Format Check
+        run: ruff format --check .
 
-  pre-commit:
-    name: Pre-Commit
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v4
-      - uses: actions/setup-python@v5
-        with:
-          python-version: "3.13"
-          cache: 'pip'
-
-      - name: Install dependencies
-        run: |
-          python -m pip install --upgrade pip
-          pip install .
-          pip install .[test]
-          pre-commit install
-
-      - name: Pre-Commit
-        run: pre-commit run --all-files --show-diff-on-failure
+      - name: Ruff Lint Check
+        run: ruff check
 
   security:
     name: Bandit Security
@@ -119,13 +84,16 @@ jobs:
   tests:
     name: Python ${{ matrix.python-version }} / ${{ matrix.db }} / Django ${{ matrix.django-version}}
     runs-on: ubuntu-latest
-#    continue-on-error: ${{ matrix.django-version == '~=5.0' }}
+    continue-on-error: ${{ matrix.django-version == '~=6.0' || matrix.python-version == '3.14' }}
     strategy:
-      max-parallel: 4
+      max-parallel: 6
       matrix:
         db: [ sqlite, mariadb ]
-        django-version: [ "~=5.0" ]
-        python-version: ["3.12", "3.13" ]
+        django-version: [ "~=5.2", "~=6.0" ]
+        python-version: ["3.12", "3.13", "3.14" ]
+        exclude:
+          - python-version: "3.12"
+            django-version: "~=6.0"
 
     services:
       mariadb:
@@ -216,8 +184,8 @@ jobs:
   release:
     name: Release
     runs-on: ubuntu-latest
-    needs: ['outdated', 'black', 'pre-commit', 'security', 'tests', 'coverage']
-    if: github.ref == 'refs/heads/master'  # Only run on master
+    needs: ['outdated', 'ruff', 'security', 'tests', 'coverage']
+    if: always() && github.ref == 'refs/heads/master' && !contains(needs.*.result, 'failure') && !contains(needs.*.result, 'cancelled')
     permissions: write-all
     outputs:
       bumped: ${{ steps.release.outputs.bumped }}

.pre-commit-config.yaml

@@ -2,7 +2,7 @@ default_language_version:
   python: python3.13
 repos:
   - repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: v4.0.1
+    rev: v5.0.0
     hooks:
       - id: check-added-large-files
         args: [ '--maxkb=500' ]
@@ -20,11 +20,8 @@ repos:
         exclude: .idea/.*
       - id: check-json
   - repo: https://github.com/astral-sh/ruff-pre-commit
-    # Ruff version.
-    rev: v0.7.3
+    rev: v0.14.8
     hooks:
-      # Run the linter.
       - id: ruff
         args: [ --fix ]
-      # Run the formatter.
       - id: ruff-format

pyproject.toml

@@ -7,7 +7,7 @@ name = "pivotal-django-states"
 dynamic = ["version"]
 description = "State machine for django models"
 readme = "README.md"
-requires-python = ">=3.11"
+requires-python = ">=3.12"
 authors = [
     { name = "Pivotal Energy Solutions", email = "steve@pivotal.energy" },
 ]
@@ -19,18 +19,19 @@ classifiers = [
     "Development Status :: 5 - Production/Stable",
     "Environment :: Web Environment",
     "Framework :: Django",
-    "Framework :: Django :: 5.0",
+    "Framework :: Django :: 5.2",
+    "Framework :: Django :: 6.0",
     "Intended Audience :: Developers",
     "License :: Other/Proprietary License",
     "Operating System :: OS Independent",
     "Programming Language :: Python",
-    "Programming Language :: Python :: 3.11",
     "Programming Language :: Python :: 3.12",
     "Programming Language :: Python :: 3.13",
+    "Programming Language :: Python :: 3.14",
     "Topic :: Utilities",
 ]
 dependencies = [
-    "Django>=5.0",
+    "django>=5.2",
     "six"
 ]
 
@@ -72,13 +73,27 @@ include = [
 
 [tool.black]
 line-length = 100
-target-version = ['py311']
+target-version = ['py312']
 include = '\.pyi?$'
 exclude = '(\.git|.venv|_build|build|dist|.*\/__pycache__\/)'
 
 [tool.ruff]
+exclude = [".bzr", ".direnv", ".eggs", ".git", ".mypy_cache", ".nox", ".pytype", ".ruff_cache", ".svn", ".tox", ".venv", "__pypackages__", "_build", "build", "dist", "node_modules"]
 line-length = 100
-lint.ignore = ["F401"]
+indent-width = 4
+target-version = "py312"
+
+[tool.ruff.lint]
+ignore = ["F401", "E402"]
+fixable = ["ALL"]
+unfixable = []
+dummy-variable-rgx = "^(_+|(_+[a-zA-Z0-9_]*[a-zA-Z0-9]+?))$"
+
+[tool.ruff.format]
+quote-style = "double"
+indent-style = "space"
+skip-magic-trailing-comma = false
+line-ending = "auto"
 
 [tool.bandit]
 targets = ['django_states']