Merge remote-tracking branch 'origin/main' into raises_paramspec

jakkdl · jakkdl · commit eafd2e900c7b · 2025-03-31T12:04:41.000+02:00
diff --git a/.github/workflows/prepare-release-pr.yml b/.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"
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -1,6 +1,6 @@
 repos:
 - repo: https://github.com/astral-sh/ruff-pre-commit
-  rev: "v0.9.10"
+  rev: "v0.11.2"
   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.4.1
+  rev: v1.5.2
   hooks:
     - id: zizmor
 -   repo: https://github.com/adamchainz/blacken-docs
diff --git a/RELEASING.rst b/RELEASING.rst
@@ -137,6 +137,10 @@ Both automatic and manual processes described above follow the same steps from t
    in https://github.com/pytest-dev/pytest/actions/workflows/deploy.yml, using the ``release-MAJOR.MINOR.PATCH`` branch
    as source.
 
+   Using the command-line::
+
+     $ gh workflow run deploy.yml -R pytest-dev/pytest --ref=release-{VERSION} -f version={VERSION}
+
    This job will require approval from ``pytest-dev/core``, after which it will publish to PyPI
    and tag the repository.
 
diff --git a/changelog/13291.bugfix.rst b/changelog/13291.bugfix.rst
@@ -0,0 +1 @@
+Fixed ``repr`` of ``attrs`` objects in assertion failure messages when using ``attrs>=25.2``.
diff --git a/changelog/13317.packaging.rst b/changelog/13317.packaging.rst
@@ -0,0 +1,4 @@
+Specified minimum allowed versions of ``colorama``, ``iniconfig``,
+and ``packaging``; and bumped the minimum allowed version
+of ``exceptiongroup`` for ``python_version<'3.11'`` from a release
+candidate to a full release.
diff --git a/doc/en/reference/plugin_list.rst b/doc/en/reference/plugin_list.rst
diff --git a/pyproject.toml b/pyproject.toml
@@ -46,10 +46,10 @@ dynamic = [
     "version",
 ]
 dependencies = [
-    "colorama; sys_platform=='win32'",
-    "exceptiongroup>=1.0.0rc8; python_version<'3.11'",
-    "iniconfig",
-    "packaging",
+    "colorama>=0.4; sys_platform=='win32'",
+    "exceptiongroup>=1; python_version<'3.11'",
+    "iniconfig>=1",
+    "packaging>=20",
     "pluggy>=1.5,<2",
     "pygments>=2.7.2",
     "tomli>=1; python_version<'3.11'",
@@ -167,6 +167,10 @@ lint.per-file-ignores."src/_pytest/_py/**/*.py" = [
 lint.per-file-ignores."src/_pytest/_version.py" = [
     "I001",
 ]
+# can't be disabled on a line-by-line basis in file
+lint.per-file-ignores."testing/code/test_source.py" = [
+    "F841",
+]
 lint.per-file-ignores."testing/python/approx.py" = [
     "B015",
 ]
diff --git a/scripts/prepare-release-pr.py b/scripts/prepare-release-pr.py
@@ -10,8 +10,7 @@
 
 After that, it will create a release using the `release` tox environment, and push a new PR.
 
-**Token**: currently the token from the GitHub Actions is used, pushed with
-`pytest bot <pytestbot@gmail.com>` commit author.
+Note: the script uses the `gh` command-line tool, so `GH_TOKEN` must be set in the environment.
 """
 
 from __future__ import annotations
@@ -25,7 +24,6 @@
 
 from colorama import Fore
 from colorama import init
-from github3.repos import Repository
 
 
 class InvalidFeatureRelease(Exception):
@@ -54,17 +52,7 @@ class InvalidFeatureRelease(Exception):
 """
 
 
-def login(token: str) -> Repository:
-    import github3
-
-    github = github3.login(token=token)
-    owner, repo = SLUG.split("/")
-    return github.repository(owner, repo)
-
-
-def prepare_release_pr(
-    base_branch: str, is_major: bool, token: str, prerelease: str
-) -> None:
+def prepare_release_pr(base_branch: str, is_major: bool, prerelease: str) -> None:
     print()
     print(f"Processing release for branch {Fore.CYAN}{base_branch}")
 
@@ -131,22 +119,25 @@ def prepare_release_pr(
         check=True,
     )
 
-    oauth_url = f"https://{token}:x-oauth-basic@github.com/{SLUG}.git"
     run(
-        ["git", "push", oauth_url, f"HEAD:{release_branch}", "--force"],
+        ["git", "push", "origin", f"HEAD:{release_branch}", "--force"],
         check=True,
     )
     print(f"Branch {Fore.CYAN}{release_branch}{Fore.RESET} pushed.")
 
     body = PR_BODY.format(version=version)
-    repo = login(token)
-    pr = repo.create_pull(
-        f"Prepare release {version}",
-        base=base_branch,
-        head=release_branch,
-        body=body,
+    run(
+        [
+            "gh",
+            "pr",
+            "new",
+            f"--base={base_branch}",
+            f"--head={release_branch}",
+            f"--title=Release {version}",
+            f"--body={body}",
+        ],
+        check=True,
     )
-    print(f"Pull request {Fore.CYAN}{pr.url}{Fore.RESET} created.")
 
 
 def find_next_version(
@@ -174,14 +165,12 @@ def main() -> None:
     init(autoreset=True)
     parser = argparse.ArgumentParser()
     parser.add_argument("base_branch")
-    parser.add_argument("token")
     parser.add_argument("--major", action="store_true", default=False)
     parser.add_argument("--prerelease", default="")
     options = parser.parse_args()
     prepare_release_pr(
         base_branch=options.base_branch,
         is_major=options.major,
-        token=options.token,
         prerelease=options.prerelease,
     )
 
diff --git a/scripts/update-plugin-list.py b/scripts/update-plugin-list.py
@@ -67,6 +67,7 @@
     "nuts",
     "flask_fixture",
     "databricks-labs-pytester",
+    "tursu",
 }
 
 
diff --git a/src/_pytest/assertion/util.py b/src/_pytest/assertion/util.py
@@ -169,7 +169,7 @@ def has_default_eq(
         code_filename = obj.__eq__.__code__.co_filename
 
         if isattrs(obj):
-            return "attrs generated eq" in code_filename
+            return "attrs generated " in code_filename
 
         return code_filename == "<string>"  # data class
     return True
diff --git a/src/_pytest/raises_group.py b/src/_pytest/raises_group.py
@@ -119,12 +119,9 @@ def _check_raw_type(
 def is_fully_escaped(s: str) -> bool:
     # we know we won't compile with re.VERBOSE, so whitespace doesn't need to be escaped
     metacharacters = "{}()+.*?^$[]"
-
-    for i, c in enumerate(s):
-        if c in metacharacters and (i == 0 or s[i - 1] != "\\"):
-            return False
-
-    return True
+    return not any(
+        c in metacharacters and (i == 0 or s[i - 1] != "\\") for (i, c) in enumerate(s)
+    )
 
 
 def unescape(s: str) -> str:
@@ -1198,8 +1195,7 @@ def possible_match(results: ResultHolder, used: set[int] | None = None) -> bool:
     curr_row = len(used)
     if curr_row == len(results.results):
         return True
-
-    for i, val in enumerate(results.results[curr_row]):
-        if val is None and i not in used and possible_match(results, used | {i}):
-            return True
-    return False
+    return any(
+        val is None and i not in used and possible_match(results, used | {i})
+        for (i, val) in enumerate(results.results[curr_row])
+    )
diff --git a/testing/_py/test_local.py b/testing/_py/test_local.py
@@ -215,7 +215,7 @@ def test_visit_filterfunc_is_string(self, path1, fil):
         lst = []
         for i in path1.visit(fil):
             lst.append(i.relto(path1))
-        assert len(lst), 2
+        assert len(lst), 2  # noqa: PLC1802,RUF040
         assert "sampledir" in lst
         assert "otherdir" in lst
 
diff --git a/testing/code/test_source.py b/testing/code/test_source.py
@@ -1,21 +1,19 @@
 # mypy: allow-untyped-defs
-# flake8: noqa
-# disable flake check on this file because some constructs are strange
-# or redundant on purpose and can't be disable on a line-by-line basis
+from __future__ import annotations
+
 import inspect
 import linecache
+from pathlib import Path
 import sys
 import textwrap
-from pathlib import Path
 from typing import Any
-from typing import Dict
 
-import pytest
 from _pytest._code import Code
 from _pytest._code import Frame
 from _pytest._code import getfslineno
 from _pytest._code import Source
 from _pytest.pathlib import import_path
+import pytest
 
 
 def test_source_str_function() -> None:
@@ -467,7 +465,6 @@ def test_comment_in_statement() -> None:
 
 def test_source_with_decorator() -> None:
     """Test behavior with Source / Code().source with regard to decorators."""
-    from _pytest.compat import get_real_func
 
     @pytest.mark.foo
     def deco_mark():
diff --git a/testing/plugins_integration/requirements.txt b/testing/plugins_integration/requirements.txt
@@ -1,4 +1,4 @@
-anyio[trio]==4.8.0
+anyio[trio]==4.9.0
 django==5.1.7
 pytest-asyncio==0.25.3
 pytest-bdd==8.1.0
@@ -12,4 +12,4 @@ pytest-sugar==1.0.0
 pytest-trio==0.8.0
 pytest-twisted==1.14.3
 twisted==24.11.0
-pytest-xvfb==3.0.0
+pytest-xvfb==3.1.1
diff --git a/tox.ini b/tox.ini
@@ -188,11 +188,8 @@ usedevelop = True
 passenv = *
 deps =
     colorama
-    github3.py
     pre-commit>=2.9.3
-    wheel
-    # https://github.com/twisted/towncrier/issues/340
-    towncrier<21.3.0
+    towncrier
 commands = python scripts/release.py {posargs}
 
 [testenv:prepare-release-pr]

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	+Fixed ``repr`` of ``attrs`` objects in assertion failure messages when using ``attrs>=25.2``.
Original file line number	Diff line number	Diff line change
`@@ -67,6 +67,7 @@`
`67`	`67`	`"nuts",`
`68`	`68`	`"flask_fixture",`
`69`	`69`	`"databricks-labs-pytester",`
	`70`	`+ "tursu",`
`70`	`71`	`}`
`71`	`72`
`72`	`73`