Merge remote-tracking branch 'origin/disable_assertion_rewriting_external_modules' into disable_assertion_rewriting_external_modules

# Conflicts:
#	testing/test_assertrewrite.py

Author: Tusenka

.git-blame-ignore-revs

@@ -5,7 +5,7 @@
 #
 # To "install" it:
 #
-#   git config --local blame.ignoreRevsFile .gitblameignore
+#   git config --local blame.ignoreRevsFile .git-blame-ignore-revs
 
 # run black
 703e4b11ba76171eccd3f13e723c47b810ded7ef

.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.10.0
+      uses: hynek/build-and-inspect-python-package@v2.12.0
       with:
         attest-build-provenance-github: 'true'
 
@@ -46,6 +46,8 @@ jobs:
       contents: write
     steps:
     - uses: actions/checkout@v4
+      with:
+        persist-credentials: true
 
     - name: Download Package
       uses: actions/download-artifact@v4
@@ -54,16 +56,18 @@ jobs:
         path: dist
 
     - name: Publish package to PyPI
-      uses: pypa/[email protected].2
+      uses: pypa/[email protected].4
       with:
         attestations: true
 
     - name: Push tag
+      env:
+          VERSION: ${{ github.event.inputs.version }}
       run: |
         git config user.name "pytest bot"
         git config user.email "[email protected]"
-        git tag --annotate --message=v${{ github.event.inputs.version }} ${{ github.event.inputs.version }} ${{ github.sha }}
-        git push origin ${{ github.event.inputs.version }}
+        git tag --annotate --message=v"$VERSION" "$VERSION" ${{ github.sha }}
+        git push origin "$VERSION"
 
   release-notes:
 
@@ -98,9 +102,11 @@ jobs:
         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 -- ${{ github.event.inputs.version }} scripts/latest-release-notes.md
+        tox -e generate-gh-release-notes -- "$VERSION" scripts/latest-release-notes.md
 
     - name: Publish GitHub Release
       uses: softprops/action-gh-release@v2

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

@@ -30,11 +30,13 @@ jobs:
     - uses: actions/checkout@v4
       with:
         fetch-depth: 0
+        # 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
       with:
-        python-version: "3.8"
+        python-version: "3.x"
 
     - name: Install dependencies
       run: |
@@ -43,10 +45,18 @@ jobs:
 
     - name: Prepare release PR (minor/patch release)
       if: github.event.inputs.major == 'no'
+      env:
+        BRANCH: ${{ github.event.inputs.branch }}
+        PRERELEASE: ${{ github.event.inputs.prerelease }}
+        GH_TOKEN: ${{ github.token }}
       run: |
-        tox -e prepare-release-pr -- ${{ github.event.inputs.branch }} ${{ github.token }} --prerelease='${{ github.event.inputs.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 -- ${{ github.event.inputs.branch }} ${{ github.token }} --major --prerelease='${{ github.event.inputs.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.10.0
+      uses: hynek/build-and-inspect-python-package@v2.12.0
 
   build:
     needs: [package]
@@ -54,25 +54,24 @@ jobs:
       fail-fast: false
       matrix:
         name: [
-          "windows-py38",
-          "windows-py38-pluggy",
-          "windows-py39",
+          "windows-py39-unittestextras",
+          "windows-py39-pluggy",
+          "windows-py39-xdist",
           "windows-py310",
           "windows-py311",
           "windows-py312",
           "windows-py313",
 
-          "ubuntu-py38",
-          "ubuntu-py38-pluggy",
-          "ubuntu-py38-freeze",
-          "ubuntu-py39",
-          "ubuntu-py310",
+          "ubuntu-py39-lsof-numpy-pexpect",
+          "ubuntu-py39-pluggy",
+          "ubuntu-py39-freeze",
+          "ubuntu-py39-xdist",
+          "ubuntu-py310-xdist",
           "ubuntu-py311",
           "ubuntu-py312",
-          "ubuntu-py313",
-          "ubuntu-pypy3",
+          "ubuntu-py313-pexpect",
+          "ubuntu-pypy3-xdist",
 
-          "macos-py38",
           "macos-py39",
           "macos-py310",
           "macos-py312",
@@ -83,106 +82,123 @@ jobs:
         ]
 
         include:
-          - name: "windows-py38"
-            python: "3.8"
+          - name: "windows-py39-unittestextras"
+            python: "3.9"
             os: windows-latest
-            tox_env: "py38-unittestextras"
+            tox_env: "py39-unittestextras"
             use_coverage: true
-          - name: "windows-py38-pluggy"
-            python: "3.8"
+
+          - name: "windows-py39-pluggy"
+            python: "3.9"
             os: windows-latest
-            tox_env: "py38-pluggymain-pylib-xdist"
-          - name: "windows-py39"
+            tox_env: "py39-pluggymain-pylib-xdist"
+
+          - name: "windows-py39-xdist"
             python: "3.9"
             os: windows-latest
             tox_env: "py39-xdist"
+
           - name: "windows-py310"
             python: "3.10"
             os: windows-latest
             tox_env: "py310-xdist"
+
           - name: "windows-py311"
             python: "3.11"
             os: windows-latest
             tox_env: "py311"
+
           - name: "windows-py312"
             python: "3.12"
             os: windows-latest
             tox_env: "py312"
+
           - name: "windows-py313"
-            python: "3.13-dev"
+            python: "3.13"
             os: windows-latest
             tox_env: "py313"
 
-          - name: "ubuntu-py38"
-            python: "3.8"
+
+          - name: "ubuntu-py39-lsof-numpy-pexpect"
+            python: "3.9"
             os: ubuntu-latest
-            tox_env: "py38-lsof-numpy-pexpect"
+            tox_env: "py39-lsof-numpy-pexpect"
             use_coverage: true
-          - name: "ubuntu-py38-pluggy"
-            python: "3.8"
+
+          - name: "ubuntu-py39-pluggy"
+            python: "3.9"
             os: ubuntu-latest
-            tox_env: "py38-pluggymain-pylib-xdist"
-          - name: "ubuntu-py38-freeze"
-            python: "3.8"
+            tox_env: "py39-pluggymain-pylib-xdist"
+
+          - name: "ubuntu-py39-freeze"
+            python: "3.9"
             os: ubuntu-latest
-            tox_env: "py38-freeze"
-          - name: "ubuntu-py39"
+            tox_env: "py39-freeze"
+
+          - name: "ubuntu-py39-xdist"
             python: "3.9"
             os: ubuntu-latest
             tox_env: "py39-xdist"
-          - name: "ubuntu-py310"
+
+          - name: "ubuntu-py310-xdist"
             python: "3.10"
             os: ubuntu-latest
             tox_env: "py310-xdist"
+
           - name: "ubuntu-py311"
             python: "3.11"
             os: ubuntu-latest
             tox_env: "py311"
             use_coverage: true
+
           - name: "ubuntu-py312"
             python: "3.12"
             os: ubuntu-latest
             tox_env: "py312"
             use_coverage: true
-          - name: "ubuntu-py313"
-            python: "3.13-dev"
+
+          - name: "ubuntu-py313-pexpect"
+            python: "3.13"
             os: ubuntu-latest
             tox_env: "py313-pexpect"
             use_coverage: true
-          - name: "ubuntu-pypy3"
+
+          - name: "ubuntu-pypy3-xdist"
             python: "pypy-3.9"
             os: ubuntu-latest
             tox_env: "pypy3-xdist"
 
-          - name: "macos-py38"
-            python: "3.8"
-            os: macos-latest
-            tox_env: "py38-xdist"
+
           - name: "macos-py39"
             python: "3.9"
             os: macos-latest
             tox_env: "py39-xdist"
             use_coverage: true
+
           - name: "macos-py310"
             python: "3.10"
             os: macos-latest
             tox_env: "py310-xdist"
+
           - name: "macos-py312"
             python: "3.12"
             os: macos-latest
             tox_env: "py312-xdist"
+
           - name: "macos-py313"
-            python: "3.13-dev"
+            python: "3.13"
             os: macos-latest
             tox_env: "py313-xdist"
 
+
           - name: "plugins"
             python: "3.12"
             os: ubuntu-latest
             tox_env: "plugins"
 
+
           - name: "doctesting"
-            python: "3.8"
+            python: "3.9"
             os: ubuntu-latest
             tox_env: "doctesting"
             use_coverage: true
@@ -192,12 +208,12 @@ jobs:
         contains(
           fromJSON(
             '[
-              "windows-py38-pluggy",
+              "windows-py39-pluggy",
               "windows-py313",
-              "ubuntu-py38-pluggy",
-              "ubuntu-py38-freeze",
+              "ubuntu-py39-pluggy",
+              "ubuntu-py39-freeze",
               "ubuntu-py313",
-              "macos-py38",
+              "macos-py39",
               "macos-py313"
             ]'
           ),

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

@@ -23,12 +23,14 @@ jobs:
         uses: actions/checkout@v4
         with:
           fetch-depth: 0
+          persist-credentials: false
 
       - name: Setup Python
         uses: actions/setup-python@v5
         with:
           python-version: "3.11"
           cache: pip
+
       - name: requests-cache
         uses: actions/cache@v4
         with:
@@ -41,13 +43,12 @@ jobs:
           python -m pip install --upgrade pip
           pip install packaging requests tabulate[widechars] tqdm requests-cache platformdirs
 
-
       - name: Update Plugin List
         run: python scripts/update-plugin-list.py
 
       - 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 <[email protected]>'
@@ -61,8 +62,9 @@ jobs:
       - name: Instruct the maintainers to trigger CI by undrafting the PR
         env:
           GITHUB_TOKEN: ${{ github.token }}
+          PULL_REQUEST_NUMBER: ${{ steps.pr.outputs.pull-request-number }}
         run: >-
           gh pr comment
           --body 'Please mark the PR as ready for review to trigger PR checks.'
           --repo '${{ github.repository }}'
-          '${{ steps.pr.outputs.pull-request-number }}'
+          "$PULL_REQUEST_NUMBER"