Merge branch 'main' into reprs-assert-callable

Author: Glyphack

.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.8.0
+      uses: hynek/build-and-inspect-python-package@v2.9.0
       with:
         attest-build-provenance-github: 'true'
 
@@ -54,7 +54,9 @@ jobs:
         path: dist
 
     - name: Publish package to PyPI
-      uses: pypa/[email protected]
+      uses: pypa/[email protected]
+      with:
+        attestations: true
 
     - name: Push tag
       run: |

.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.8.0
+      uses: hynek/build-and-inspect-python-package@v2.9.0
 
   build:
     needs: [package]
@@ -147,7 +147,7 @@ jobs:
           - name: "ubuntu-py313"
             python: "3.13-dev"
             os: ubuntu-latest
-            tox_env: "py313"
+            tox_env: "py313-pexpect"
             use_coverage: true
           - name: "ubuntu-pypy3"
             python: "pypy-3.9"

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

@@ -47,7 +47,7 @@ jobs:
 
       - name: Create Pull Request
         id: pr
-        uses: peter-evans/create-pull-request@c5a7806660adbe173f04e3e038b0ccdcd758773c
+        uses: peter-evans/create-pull-request@5e914681df9dc83aa4e4905692ca88beb2f9e91f
         with:
           commit-message: '[automated] Update plugin list'
           author: 'pytest bot <[email protected]>'

.pre-commit-config.yaml

@@ -1,50 +1,56 @@
 repos:
 - repo: https://github.com/astral-sh/ruff-pre-commit
-  rev: "v0.5.5"
+  rev: "v0.6.9"
   hooks:
     - id: ruff
       args: ["--fix"]
     - id: ruff-format
 -   repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: v4.6.0
+    rev: v5.0.0
     hooks:
     -   id: trailing-whitespace
     -   id: end-of-file-fixer
     -   id: check-yaml
 -   repo: https://github.com/adamchainz/blacken-docs
-    rev: 1.18.0
+    rev: 1.19.0
     hooks:
     -   id: blacken-docs
         additional_dependencies: [black==24.1.1]
+-   repo: https://github.com/codespell-project/codespell
+    rev: v2.3.0
+    hooks:
+    -   id: codespell
+        args: ["--toml=pyproject.toml"]
+        additional_dependencies:
+          - tomli
 -   repo: https://github.com/pre-commit/pygrep-hooks
     rev: v1.10.0
     hooks:
     -   id: python-use-type-annotations
 -   repo: https://github.com/pre-commit/mirrors-mypy
-    rev: v1.11.0
+    rev: v1.11.2
     hooks:
     -   id: mypy
         files: ^(src/|testing/|scripts/)
-        args: []
         additional_dependencies:
           - iniconfig>=1.1.0
           - attrs>=19.2.0
           - pluggy>=1.5.0
           - packaging
           - tomli
-          - types-pkg_resources
+          - types-setuptools
           - types-tabulate
             # for mypy running on python>=3.11 since exceptiongroup is only a dependency
             # on <3.11
           - exceptiongroup>=1.0.0rc8
 - repo: https://github.com/tox-dev/pyproject-fmt
-  rev: "2.1.4"
+  rev: "2.3.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.17.0
+    rev: v3.18.0
     hooks:
     -   id: pyupgrade
         stages: [manual]

AUTHORS

@@ -51,6 +51,7 @@ Aron Coyle
 Aron Curzon
 Arthur Richard
 Ashish Kurmi
+Ashley Whetter
 Aviral Verma
 Aviv Palivoda
 Babak Keyvani
@@ -85,6 +86,7 @@ Chris NeJame
 Chris Rose
 Chris Wheeler
 Christian Boelsen
+Christian Clauss
 Christian Fetzer
 Christian Neumüller
 Christian Theunert
@@ -93,6 +95,7 @@ Christine Mecklenborg
 Christoph Buelter
 Christopher Dignam
 Christopher Gilling
+Christopher Head
 Claire Cecil
 Claudio Madotto
 Clément M.T. Robert
@@ -115,6 +118,7 @@ Dave Hunt
 David Díaz-Barquero
 David Mohr
 David Paul Röthlisberger
+David Peled
 David Szotten
 David Vierra
 Daw-Ran Liou
@@ -158,6 +162,7 @@ Feng Ma
 Florian Bruhin
 Florian Dahlitz
 Floris Bruynooghe
+Frank Hoffmann
 Fraser Stark
 Gabriel Landau
 Gabriel Reis
@@ -299,6 +304,7 @@ mrbean-bremen
 Nathan Goldbaum
 Nathaniel Compton
 Nathaniel Waisbrot
+Nauman Ahmed
 Ned Batchelder
 Neil Martin
 Neven Mundar
@@ -325,6 +331,7 @@ Paul Müller
 Paul Reece
 Pauli Virtanen
 Pavel Karateev
+Pavel Zhukov
 Paweł Adamczak
 Pedro Algarvio
 Petter Strandmark
@@ -351,6 +358,7 @@ Rafal Semik
 Raquel Alegre
 Ravi Chandra
 Reagan Lee
+Rob Arrow
 Robert Holt
 Roberto Aldera
 Roberto Polli
@@ -402,6 +410,7 @@ Sviatoslav Sydorenko
 Sylvain Marié
 Tadek Teleżyński
 Takafumi Arakaki
+Takumi Otani
 Taneli Hukkinen
 Tanvi Mehta
 Tanya Agarwal
@@ -412,6 +421,7 @@ Ted Xiao
 Terje Runde
 Thomas Grainger
 Thomas Hisch
+Tianyu Dongfang
 Tim Hoffmann
 Tim Strazny
 TJ Bruno

CONTRIBUTING.rst

@@ -380,6 +380,57 @@ pull requests from other contributors yourself after having reviewed
 them.
 
 
+Merge/squash guidelines
+-----------------------
+
+When a PR is approved and ready to be integrated to the ``main`` branch, one has the option to *merge* the commits unchanged, or *squash* all the commits into a single commit.
+
+Here are some guidelines on how to proceed, based on examples of a single PR commit history:
+
+1. Miscellaneous commits:
+
+   * ``Implement X``
+   * ``Fix test_a``
+   * ``Add myself to AUTHORS``
+   * ``fixup! Fix test_a``
+   * ``Update tests/test_integration.py``
+   * ``Merge origin/main into PR branch``
+   * ``Update tests/test_integration.py``
+
+   In this case, prefer to use the **Squash** merge strategy: the commit history is a bit messy (not in a derogatory way, often one just commits changes because they know the changes will eventually be squashed together), so squashing everything into a single commit is best. You must clean up the commit message, making sure it contains useful details.
+
+2. Separate commits related to the same topic:
+
+   * ``Implement X``
+   * ``Add myself to AUTHORS``
+   * ``Update CHANGELOG for X``
+
+   In this case, prefer to use the **Squash** merge strategy: while the commit history is not "messy" as in the example above, the individual commits do not bring much value overall, specially when looking at the changes a few months/years down the line.
+
+3. Separate commits, each with their own topic (refactorings, renames, etc), but still have a larger topic/purpose.
+
+   * ``Refactor class X in preparation for feature Y``
+   * ``Remove unused method``
+   * ``Implement feature Y``
+
+   In this case, prefer to use the **Merge** strategy: each commit is valuable on its own, even if they serve a common topic overall. Looking at the history later, it is useful to have the removal of the unused method separately on its own commit, along with more information (such as how it became unused in the first place).
+
+4. Separate commits, each with their own topic, but without a larger topic/purpose other than improve the code base (using more modern techniques, improve typing, removing clutter, etc).
+
+   * ``Improve internal names in X``
+   * ``Add type annotations to Y``
+   * ``Remove unnecessary dict access``
+   * ``Remove unreachable code due to EOL Python``
+
+   In this case, prefer to use the **Merge** strategy: each commit is valuable on its own, and the information on each is valuable in the long term.
+
+
+As mentioned, those are overall guidelines, not rules cast in stone. This topic was discussed in `#12633 <https://github.com/pytest-dev/pytest/discussions/12633>`_.
+
+
+*Backport PRs* (as those created automatically from a ``backport`` label) should always be **squashed**, as they preserve the original PR author.
+
+
 Backporting bug fixes for the next patch release
 ------------------------------------------------
 
@@ -438,6 +489,8 @@ above?
 All the above are not rules, but merely some guidelines/suggestions on what we should expect
 about backports.
 
+Backports should be **squashed** (rather than **merged**), as doing so preserves the original PR author correctly.
+
 Handling stale issues/PRs
 -------------------------
 
@@ -485,9 +538,9 @@ When closing a Pull Request, it needs to be acknowledging the time, effort, and
 
     <bye>
 
-Closing Issues
+Closing issues
 --------------
 
 When a pull request is submitted to fix an issue, add text like ``closes #XYZW`` to the PR description and/or commits (where ``XYZW`` is the issue number). See the `GitHub docs <https://help.github.com/en/github/managing-your-work-on-github/linking-a-pull-request-to-an-issue#linking-a-pull-request-to-an-issue-using-a-keyword>`_ for more information.
 
-When an issue is due to user error (e.g. misunderstanding of a functionality), please politely explain to the user why the issue raised is really a non-issue and ask them to close the issue if they have no further questions. If the original requestor is unresponsive, the issue will be handled as described in the section `Handling stale issues/PRs`_ above.
+When an issue is due to user error (e.g. misunderstanding of a functionality), please politely explain to the user why the issue raised is really a non-issue and ask them to close the issue if they have no further questions. If the original requester is unresponsive, the issue will be handled as described in the section `Handling stale issues/PRs`_ above.

RELEASING.rst

@@ -158,8 +158,6 @@ Both automatic and manual processes described above follow the same steps from t
        git tag MAJOR.{MINOR+1}.0.dev0
        git push upstream MAJOR.{MINOR+1}.0.dev0
 
-#. For major and minor releases, change the default version in the `Read the Docs Settings <https://readthedocs.org/dashboard/pytest/advanced/>`_ to the new branch.
-
 #. Send an email announcement with the contents from::
 
      doc/en/announce/release-<VERSION>.rst

changelog/10558.doc.rst

@@ -0,0 +1 @@
+Fix ambiguous docstring of :func:`pytest.Config.getoption`.

changelog/11118.improvement.rst

@@ -0,0 +1,3 @@
+Now :confval:`pythonpath` configures `$PYTHONPATH` earlier than before during the initialization process, which now also affects plugins loaded via the `-p` command-line option.
+
+-- by :user:`millerdev`

changelog/12008.bugfix.rst

@@ -0,0 +1 @@
+In :pr:`11220`, an unintended change in reordering was introduced by changing the way indices were assigned to direct params. More specifically, before that change, the indices of direct params to metafunc's callspecs were assigned after all parametrizations took place. Now, that change is reverted.