Merge branch 'main' into faulthandler-exit-on-timeout

Author: ogrisel

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

@@ -0,0 +1,37 @@
+name: Doc Check Links
+
+on:
+  schedule:
+    # At 00:00 on Sunday.
+    # https://crontab.guru
+    - cron: '0 0 * * 0'
+  workflow_dispatch:
+
+# Set permissions at the job level.
+permissions: {}
+
+jobs:
+  doc-check-links:
+    if: github.repository_owner == 'pytest-dev'
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v5
+        with:
+          fetch-depth: 0
+          persist-credentials: false
+
+      - name: Setup Python
+        uses: actions/setup-python@v5
+        with:
+          python-version: "3.11"
+          cache: pip
+
+      - name: Install dependencies
+        run: |
+          python -m pip install --upgrade pip
+          pip install tox
+
+      - name: Run sphinx linkcheck via tox
+        run: tox -e docs-checklinks

.pre-commit-config.yaml

@@ -1,6 +1,6 @@
 repos:
 - repo: https://github.com/astral-sh/ruff-pre-commit
-  rev: "v0.12.10"
+  rev: "v0.12.11"
   hooks:
     - id: ruff
       args: ["--fix"]

AUTHORS

@@ -282,6 +282,7 @@ Marcin Augustynów
 Marcin Bachry
 Marc Bresson
 Marco Gorelli
+Marcos Boger
 Mark Abramowitz
 Mark Dickinson
 Mark Vong

changelog/12474.contrib.rst

@@ -0,0 +1 @@
+Added scheduled GitHub Action Workflow to run Sphinx linkchecks in repo documentation.

changelog/13577.doc.rst

@@ -0,0 +1 @@
+Clarify that ``pytest_generate_tests`` is discovered in test modules/classes; other hooks must be in ``conftest.py`` or plugins.

changelog/13684.contrib.rst

@@ -0,0 +1 @@
+Make pytest's own testsuite insensitive to the presence of the ``CI`` environment variable -- by :user:`ogrisel`.

doc/en/how-to/parametrize.rst

@@ -240,6 +240,13 @@ command line option and the parametrization of our test function:
         if "stringinput" in metafunc.fixturenames:
             metafunc.parametrize("stringinput", metafunc.config.getoption("stringinput"))
 
+.. note::
+
+    The :hook:`pytest_generate_tests` hook can also be implemented directly in a test
+    module or inside a test class; unlike other hooks, pytest will discover it there
+    as well. Other hooks must live in a :ref:`conftest.py <localplugin>` or a plugin.
+    See :ref:`writinghooks`.
+
 If we now pass two stringinput values, our test will run twice:
 
 .. code-block:: pytest

doc/en/how-to/writing_hook_functions.rst

@@ -235,6 +235,12 @@ Example:
         """
         print(config.hook)
 
+.. note::
+
+    Unlike other hooks, the :hook:`pytest_generate_tests` hook is also discovered when
+    defined inside a test module or test class. Other hooks must live in
+    :ref:`conftest.py plugins <localplugin>` or external plugins.
+    See :ref:`parametrize-basics` and the :ref:`hook-reference`.
 
 .. _`addoptionhooks`:
 

doc/en/reference/plugin_list.rst

@@ -428,6 +428,9 @@ markers = [
     "slow",
     # experimental mark for all tests using pexpect
     "uses_pexpect",
+    # Disables the `remove_ci_env_var` autouse fixture on a given test that
+    # actually inspects whether the CI environment variable is set.
+    "keep_ci_var",
 ]
 
 [tool.towncrier]