Merge branch 'main' into fix-implicit-str-concat-and-discovered-bug-due-to-it

Author: Pierre-Sassoulas

.github/FUNDING.yml

@@ -1,5 +1,7 @@
 # info:
 # * https://help.github.com/en/articles/displaying-a-sponsor-button-in-your-repository
 # * https://tidelift.com/subscription/how-to-connect-tidelift-with-github
+github: pytest-dev
 tidelift: pypi/pytest
 open_collective: pytest
+thanks_dev: u/gh/pytest-dev

.github/workflows/deploy.yml

@@ -31,7 +31,7 @@ jobs:
         persist-credentials: false
 
     - name: Build and Check Package
-      uses: hynek/build-and-inspect-python-package@v2.11.0
+      uses: hynek/build-and-inspect-python-package@v2.12.0
       with:
         attest-build-provenance-github: 'true'
 
@@ -56,7 +56,7 @@ jobs:
         path: dist
 
     - name: Publish package to PyPI
-      uses: pypa/gh-action-pypi-publish@v1.12.3
+      uses: pypa/gh-action-pypi-publish@v1.12.4
       with:
         attestations: true
 

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

@@ -30,7 +30,8 @@ jobs:
     - uses: actions/checkout@v4
       with:
         fetch-depth: 0
-        persist-credentials: false
+        # persist-credentials is needed in order for us to push the release branch.
+        persist-credentials: true
 
     - name: Set up Python
       uses: actions/setup-python@v5
@@ -47,13 +48,15 @@ jobs:
       env:
         BRANCH: ${{ github.event.inputs.branch }}
         PRERELEASE: ${{ github.event.inputs.prerelease }}
+        GH_TOKEN: ${{ github.token }}
       run: |
-        tox -e prepare-release-pr -- "$BRANCH" ${{ github.token }} --prerelease="$PRERELEASE"
+        tox -e prepare-release-pr -- "$BRANCH" --prerelease="$PRERELEASE"
 
     - name: Prepare release PR (major release)
       if: github.event.inputs.major == 'yes'
       env:
         BRANCH: ${{ github.event.inputs.branch }}
         PRERELEASE: ${{ github.event.inputs.prerelease }}
+        GH_TOKEN: ${{ github.token }}
       run: |
-        tox -e prepare-release-pr -- "$BRANCH" ${{ github.token }} --major --prerelease="$PRERELEASE"
+        tox -e prepare-release-pr -- "$BRANCH" --major --prerelease="$PRERELEASE"

.github/workflows/test.yml

@@ -40,7 +40,7 @@ jobs:
         fetch-depth: 0
         persist-credentials: false
     - name: Build and Check Package
-      uses: hynek/build-and-inspect-python-package@v2.11.0
+      uses: hynek/build-and-inspect-python-package@v2.12.0
 
   build:
     needs: [package]

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

@@ -48,7 +48,7 @@ jobs:
 
       - name: Create Pull Request
         id: pr
-        uses: peter-evans/create-pull-request@5e914681df9dc83aa4e4905692ca88beb2f9e91f
+        uses: peter-evans/create-pull-request@271a8d0340265f705b14b6d32b9829c1cb33d45e
         with:
           commit-message: '[automated] Update plugin list'
           author: 'pytest bot <pytestbot@users.noreply.github.com>'

.pre-commit-config.yaml

@@ -1,6 +1,6 @@
 repos:
 - repo: https://github.com/astral-sh/ruff-pre-commit
-  rev: "v0.9.0"
+  rev: "v0.11.4"
   hooks:
     - id: ruff
       args: ["--fix"]
@@ -12,7 +12,7 @@ repos:
     -   id: end-of-file-fixer
     -   id: check-yaml
 - repo: https://github.com/woodruffw/zizmor-pre-commit
-  rev: v1.0.1
+  rev: v1.5.2
   hooks:
     - id: zizmor
 -   repo: https://github.com/adamchainz/blacken-docs
@@ -21,7 +21,7 @@ repos:
     -   id: blacken-docs
         additional_dependencies: [black==24.1.1]
 -   repo: https://github.com/codespell-project/codespell
-    rev: v2.3.0
+    rev: v2.4.1
     hooks:
     -   id: codespell
         args: ["--toml=pyproject.toml"]
@@ -32,7 +32,7 @@ repos:
     hooks:
     -   id: python-use-type-annotations
 -   repo: https://github.com/pre-commit/mirrors-mypy
-    rev: v1.14.1
+    rev: v1.15.0
     hooks:
     -   id: mypy
         files: ^(src/|testing/|scripts/)
@@ -48,7 +48,7 @@ repos:
             # on <3.11
           - exceptiongroup>=1.0.0rc8
 - repo: https://github.com/tox-dev/pyproject-fmt
-  rev: "v2.5.0"
+  rev: "v2.5.1"
   hooks:
     - id: pyproject-fmt
       # https://pyproject-fmt.readthedocs.io/en/latest/#calculating-max-supported-python-version

AUTHORS

@@ -24,13 +24,15 @@ Alice Purcell
 Allan Feldman
 Aly Sivji
 Amir Elkess
+Ammar Askar
 Anatoly Bubenkoff
 Anders Hovmöller
 Andras Mitzki
 Andras Tim
 Andrea Cimatoribus
 Andreas Motl
 Andreas Zeidler
+Andrew Pikul
 Andrew Shapton
 Andrey Paramonov
 Andrzej Klajnert
@@ -42,6 +44,7 @@ Anthony Shaw
 Anthony Sottile
 Anton Grinevich
 Anton Lodder
+Anton Zhilin
 Antony Lee
 Arel Cordero
 Arias Emmanuel
@@ -55,6 +58,7 @@ Ashley Whetter
 Aviral Verma
 Aviv Palivoda
 Babak Keyvani
+Bahram Farahmand
 Barney Gale
 Ben Brown
 Ben Gartner
@@ -142,6 +146,7 @@ Eero Vaher
 Eli Boyarski
 Elizaveta Shashkova
 Éloi Rivard
+Emil Hjelm
 Endre Galaczi
 Eric Hunsberger
 Eric Liu
@@ -261,6 +266,7 @@ lovetheguitar
 Lukas Bednar
 Luke Murphy
 Maciek Fijalkowski
+Maggie Chung
 Maho
 Maik Figura
 Mandeep Bhutani
@@ -434,6 +440,7 @@ Tim Hoffmann
 Tim Strazny
 TJ Bruno
 Tobias Diez
+Tobias Petersen
 Tom Dalton
 Tom Viner
 Tomáš Gavenčiak