jvllmr · jvllmr · Nov 27, 2024 · Nov 26, 2024 · Nov 26, 2024 · Nov 26, 2024
diff --git a/.github/dependabot.yaml b/.github/dependabot.yaml
diff --git a/.github/renovate.json b/.github/renovate.json
@@ -0,0 +1,12 @@
+{
+  "$schema": "https://docs.renovatebot.com/renovate-schema.json",
+  "extends": [
+    "config:recommended",
+    "group:allNonMajor",
+    ":maintainLockFilesMonthly",
+    "schedule:weekly",
+    ":automergeMinor"
+  ],
+  "labels": ["dependencies"],
+  "rangeStrategy": "bump"
+}
diff --git a/.github/workflows/benchmark.yaml b/.github/workflows/benchmark.yaml
@@ -27,10 +27,11 @@ jobs:
           python-version: "3.10"
           cache: true
       - name: Install dependencies
-        run: pdm install --no-lock
+        run: pdm install --frozen-lock
       - name: Run tests
         run: pdm benchmark
       - name: Store benchmark result
+        if: github.event_name != 'pull_request'
         uses: benchmark-action/github-action-benchmark@v1
         with:
           tool: "pytest"

diff --git a/.github/workflows/publish.yaml b/.github/workflows/publish.yaml
@@ -3,20 +3,27 @@ name: Upload Python Package
 on:
   release:
     types: [published]
+  workflow_dispatch:
 
 jobs:
   deploy:
-    name: Upload release
+    name: Upload to PyPI
     runs-on: ubuntu-latest
+    environment:
+      name: publish
+      url: https://pypi.org/p/sqlalchemy-sessionload
     permissions:
-      # IMPORTANT: this permission is mandatory for trusted publishing
       id-token: write
-
     steps:
       - uses: actions/checkout@v4
       - name: Setup PDM
         uses: pdm-project/setup-pdm@v4
         with:
           python-version: "3.10"
+          cache: true
+      - name: Install dependencies
+        run: pdm install --frozen-lock
+      - name: Build
+        run: pdm build
       - name: Publish
-        run: pdm publish
+        run: pdm publish --no-build
diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml
@@ -14,7 +14,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        python-version: ["3.8", "3.9", "3.10", "3.11", "3.12"]
+        python-version: ["3.9", "3.10", "3.11", "3.12", "3.13"]
     steps:
       - uses: actions/checkout@v4
       - name: Setup PDM
@@ -23,35 +23,10 @@ jobs:
           python-version: ${{ matrix.python-version }}
           cache: true
       - name: Install dependencies
-        run: pdm install --no-lock
+        run: pdm install --frozen-lock
       - name: Run tests
-        run: pdm test_14
+        run: pdm cov
       - name: Upload coverage to Codecov
-        uses: codecov/codecov-action@v3
+        uses: codecov/codecov-action@v5
         with:
-          directory: coverage
-          files: ./coverage/coverage.xml
-
-  Test20:
-    name: Test SA 2.0
-    runs-on: ubuntu-latest
-    strategy:
-      matrix:
-        python-version: ["3.8", "3.9", "3.10", "3.11", "3.12"]
-
-    steps:
-      - uses: actions/checkout@v4
-      - name: Setup PDM
-        uses: pdm-project/setup-pdm@v4
-        with:
-          python-version: ${{ matrix.python-version }}
-          cache: true
-      - name: Install nox
-        run: pip install nox
-      - name: Run tests
-        run: pdm test_20
-      - name: Upload coverage to Codecov
-        uses: codecov/codecov-action@v3
-        with:
-          directory: coverage
-          files: ./coverage/coverage_20.xml
+          token: ${{ secrets.CODECOV_TOKEN }}
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -1,57 +1,47 @@
 repos:
   - repo: https://github.com/asottile/pyupgrade
-    rev: v3.15.0
+    rev: v3.19.0
     hooks:
       - id: pyupgrade
         args:
-          - --py38-plus
+          - --py39-plus
   - repo: https://github.com/hadialqattan/pycln
     rev: v2.4.0
     hooks:
       - id: pycln
         args:
           - "--config=pyproject.toml"
-  - repo: https://github.com/PyCQA/isort
-    rev: 5.13.2
-    hooks:
-      - id: isort
   - repo: https://github.com/jvllmr/pyaphid
     rev: v0.3.1
     hooks:
       - id: pyaphid
-  - repo: https://github.com/psf/black
-    rev: 23.12.1
-    hooks:
-      - id: black
   - repo: https://github.com/adamchainz/blacken-docs
-    rev: v1.12.1 # replace with latest tag on GitHub
+    rev: 1.19.1 # replace with latest tag on GitHub
     hooks:
       - id: blacken-docs
         additional_dependencies:
           - black
-  - repo: https://github.com/asottile/yesqa
-    rev: v1.5.0
-    hooks:
-      - id: yesqa
   - repo: https://github.com/astral-sh/ruff-pre-commit
-    rev: "v0.1.9"
+    rev: "v0.8.0"
     hooks:
       - id: ruff
+        args:
+          - --fix
+      - id: ruff-format
   - repo: https://github.com/pre-commit/mirrors-prettier
     rev: v3.1.0
     hooks:
       - id: prettier
         additional_dependencies: [prettier@latest, prettier-plugin-toml@latest]
   - repo: https://github.com/pre-commit/mirrors-mypy
-    rev: "v1.8.0"
+    rev: "v1.13.0"
     hooks:
       - id: mypy
         exclude: ^tests/.*
         additional_dependencies:
-          - "sqlalchemy<2.0"
-          - "sqlalchemy2-stubs"
+          - sqlalchemy>=2.0.0
   - repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: v4.5.0
+    rev: v5.0.0
     hooks:
       - id: check-yaml
       - id: end-of-file-fixer

diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -4,7 +4,7 @@
   "python.testing.autoTestDiscoverOnSaveEnabled": true,
   "python.terminal.activateEnvInCurrentTerminal": true,
   "[python]": {
-    "editor.defaultFormatter": "ms-python.black-formatter"
+    "editor.defaultFormatter": "charliermarsh.ruff"
   },
   "ruff.enable": true,
   "mypy-type-checker.preferDaemon": true,

diff --git a/noxfile.py b/noxfile.py
@@ -4,24 +4,8 @@
 
 os.environ.update({"PDM_IGNORE_SAVED_PYTHON": "1"})
 
-lib_path = "src/sqlalchemy_sessionload"
-coverage_path = "coverage"
-
 
 @nox.session
 def tests(session: nox.Session):
-    session.run_always("pdm", "install", "--no-lock", external=True)
-    session.run(
-        "pytest", f"--cov={lib_path}", f"--cov-report=xml:{coverage_path}/coverage.xml"
-    )
-
-
-@nox.session
-def tests_20(session: nox.Session):
-    session.run_always("pdm", "install", "--no-lock", external=True)
-    session.install("sqlalchemy>2.0")
-    session.run(
-        "pytest",
-        f"--cov={lib_path}",
-        f"--cov-report=xml:{coverage_path}/coverage_20.xml",
-    )
+    session.run_always("pdm", "install", "--frozen-lock", external=True)
+    session.run("pytest", "--cov", "--cov-report=xml")