Merge branch 'main' into style-use-typename-in-raises-errors

Author: dariomesic

.coveragerc

@@ -9,9 +9,13 @@ updates:
   allow:
   - dependency-type: direct
   - dependency-type: indirect
+  cooldown:
+    default-days: 7
 - package-ecosystem: github-actions
   directory: /
   schedule:
     interval: weekly
     time: "03:00"
   open-pull-requests-limit: 10
+  cooldown:
+    default-days: 7

.github/dependabot.yml

@@ -16,7 +16,7 @@ jobs:
   package:
     runs-on: ubuntu-latest
     env:
-      SETUPTOOLS_SCM_PRETEND_VERSION: ${{ github.event.inputs.version }}
+      SETUPTOOLS_SCM_PRETEND_VERSION_FOR_PYTEST: ${{ github.event.inputs.version }}
     timeout-minutes: 10
 
     # Required by attest-build-provenance-github.
@@ -35,20 +35,52 @@ jobs:
       with:
         attest-build-provenance-github: 'true'
 
-  deploy:
-    if: github.repository == 'pytest-dev/pytest'
+  generate-gh-release-notes:
     needs: [package]
     runs-on: ubuntu-latest
-    environment: deploy
     timeout-minutes: 30
     permissions:
-      id-token: write
-      contents: write
+      contents: read
     steps:
     - uses: actions/checkout@v5
       with:
-        persist-credentials: true
+        fetch-depth: 0
+        persist-credentials: false
+
+    - name: Set up Python
+      uses: actions/setup-python@v6
+      with:
+        python-version: "3.13"
+
+    - name: Install tox
+      run: |
+        python -m pip install --upgrade pip
+        pip install tox
 
+    - name: Generate release notes
+      env:
+        VERSION: ${{ github.event.inputs.version }}
+      run: |
+        tox -e generate-gh-release-notes -- "$VERSION" gh-release-notes.md
+
+    - name: Upload release notes
+      uses: actions/upload-artifact@v5
+      with:
+        name: release-notes
+        path: gh-release-notes.md
+        retention-days: 1
+
+  publish-to-pypi:
+    if: github.repository == 'pytest-dev/pytest'
+    # Need generate-gh-release-notes only for ordering.
+    # Don't want to release to PyPI if generating GitHub release notes fails.
+    needs: [package, generate-gh-release-notes]
+    runs-on: ubuntu-latest
+    environment: deploy
+    timeout-minutes: 30
+    permissions:
+      id-token: write
+    steps:
     - name: Download Package
       uses: actions/download-artifact@v6
       with:
@@ -60,6 +92,18 @@ jobs:
       with:
         attestations: true
 
+  push-tag:
+    needs: [publish-to-pypi]
+    runs-on: ubuntu-latest
+    timeout-minutes: 10
+    permissions:
+      contents: write
+    steps:
+    - uses: actions/checkout@v5
+      with:
+        fetch-depth: 0
+        persist-credentials: true
+
     - name: Push tag
       env:
           VERSION: ${{ github.event.inputs.version }}
@@ -69,48 +113,29 @@ jobs:
         git tag --annotate --message=v"$VERSION" "$VERSION" ${{ github.sha }}
         git push origin "$VERSION"
 
-  release-notes:
-
-    # todo: generate the content in the build  job
-    #       the goal being of using a github action script to push the release data
-    #       after success instead of creating a complete python/tox env
-    needs: [deploy]
+  create-github-release:
+    needs: [push-tag, generate-gh-release-notes]
     runs-on: ubuntu-latest
-    timeout-minutes: 30
+    timeout-minutes: 10
     permissions:
       contents: write
     steps:
-    - uses: actions/checkout@v5
-      with:
-        fetch-depth: 0
-        persist-credentials: false
-
     - name: Download Package
       uses: actions/download-artifact@v6
       with:
         name: Packages
         path: dist
 
-    - name: Set up Python
-      uses: actions/setup-python@v6
+    - name: Download release notes
+      uses: actions/download-artifact@v6
       with:
-        python-version: "3.11"
-
-    - name: Install tox
-      run: |
-        python -m pip install --upgrade pip
-        pip install --upgrade tox
-
-    - name: Generate release notes
-      env:
-        VERSION: ${{ github.event.inputs.version }}
-      run: |
-        sudo apt-get install pandoc
-        tox -e generate-gh-release-notes -- "$VERSION" scripts/latest-release-notes.md
+        name: release-notes
+        path: .
 
     - name: Publish GitHub Release
       env:
         VERSION: ${{ github.event.inputs.version }}
+        GH_REPO: ${{ github.repository }}
         GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       run: |
-        gh release create --notes-file scripts/latest-release-notes.md --verify-tag "$VERSION" dist/*
+        gh release create --notes-file gh-release-notes.md --verify-tag "$VERSION" dist/*

.github/workflows/deploy.yml

@@ -25,10 +25,10 @@ jobs:
       - name: Setup Python
         uses: actions/setup-python@v6
         with:
-          python-version: "3.11"
+          python-version: "3.13"
           cache: pip
 
-      - name: Install dependencies
+      - name: Install tox
         run: |
           python -m pip install --upgrade pip
           pip install tox

.github/workflows/doc-check-links.yml

@@ -36,12 +36,12 @@ jobs:
     - name: Set up Python
       uses: actions/setup-python@v6
       with:
-        python-version: "3.x"
+        python-version: "3.13"
 
-    - name: Install dependencies
+    - name: Install tox
       run: |
         python -m pip install --upgrade pip
-        pip install --upgrade setuptools tox
+        pip install tox
 
     - name: Prepare release PR (minor/patch release)
       if: github.event.inputs.major == 'no'

.github/workflows/prepare-release-pr.yml

@@ -268,10 +268,10 @@ jobs:
         check-latest: true
         allow-prereleases: true
 
-    - name: Install dependencies
+    - name: Install tox
       run: |
         python -m pip install --upgrade pip
-        pip install tox coverage
+        pip install tox
 
     - name: Test without coverage
       if: "! matrix.use_coverage"
@@ -283,10 +283,6 @@ jobs:
       shell: bash
       run: tox run -e ${{ matrix.tox_env }}-coverage --installpkg `find dist/*.tar.gz`
 
-    - name: Generate coverage report
-      if: "matrix.use_coverage"
-      run: python -m coverage xml
-
     - name: Upload coverage to Codecov
       if: "matrix.use_coverage"
       uses: codecov/codecov-action@5a1091511ad55cbe89839c7260b706298ca349f7

.github/workflows/test.yml

@@ -28,8 +28,7 @@ jobs:
       - name: Setup Python
         uses: actions/setup-python@v6
         with:
-          python-version: "3.11"
-          cache: pip
+          python-version: "3.13"
 
       - name: requests-cache
         uses: actions/cache@v4
@@ -38,13 +37,13 @@ jobs:
           key: plugins-http-cache-${{ github.run_id }} # Can use time based key as well
           restore-keys: plugins-http-cache-
 
-      - name: Install dependencies
+      - name: Install tox
         run: |
           python -m pip install --upgrade pip
-          pip install packaging requests tabulate[widechars] tqdm requests-cache platformdirs
+          pip install tox
 
       - name: Update Plugin List
-        run: python scripts/update-plugin-list.py
+        run: tox -e update-plugin-list
 
       - name: Create Pull Request
         id: pr

.github/workflows/update-plugin-list.yml

@@ -1,6 +1,7 @@
+minimum_pre_commit_version: "4.4.0"
 repos:
 - repo: https://github.com/astral-sh/ruff-pre-commit
-  rev: "v0.14.2"
+  rev: "v0.14.5"
   hooks:
     - id: ruff-check
       args: ["--fix"]
@@ -12,9 +13,10 @@ repos:
     -   id: end-of-file-fixer
     -   id: check-yaml
 - repo: https://github.com/woodruffw/zizmor-pre-commit
-  rev: v1.16.0
+  rev: v1.16.3
   hooks:
     - id: zizmor
+      args: ["--fix"]
 -   repo: https://github.com/adamchainz/blacken-docs
     rev: 1.20.0
     hooks:
@@ -66,13 +68,13 @@ repos:
         # Manual because passing pyright is a work in progress.
         stages: [manual]
 - repo: https://github.com/tox-dev/pyproject-fmt
-  rev: "v2.11.0"
+  rev: "v2.11.1"
   hooks:
     - id: pyproject-fmt
       # https://pyproject-fmt.readthedocs.io/en/latest/#calculating-max-supported-python-version
       additional_dependencies: ["tox>=4.9"]
 -   repo: https://github.com/asottile/pyupgrade
-    rev: v3.21.0
+    rev: v3.21.1
     hooks:
     -   id: pyupgrade
         args:
@@ -85,7 +87,7 @@ repos:
     -   id: pylint
         name: pylint
         entry: pylint
-        language: system
+        language: unsupported
         types: [python]
         args: ["-rn", "-sn", "--fail-on=I", "--enable-all-extentions"]
         require_serial: true

.pre-commit-config.yaml

@@ -17,7 +17,7 @@ build:
   os: ubuntu-24.04
   tools:
     python: >-
-      3.12
+      3.13
   apt_packages:
     - inkscape
   jobs:

.readthedocs.yaml

@@ -501,6 +501,7 @@ Yusuke Kadowaki
 Yutian Li
 Yuval Shimon
 Zac Hatfield-Dodds
+Zac Palmer Laporte
 Zach Snicker
 Zachary Kneupper
 Zachary OBrien