Merge branch 'master' into autosummary-class

# Conflicts:
#	CHANGES.rst

Author: AA-Turner

.flake8

@@ -5,5 +5,5 @@ contact_links:
   url: https://stackoverflow.com/questions/tagged/python-sphinx
   about: For Q&A purpose, please use Stackoverflow with the tag python-sphinx
 - name: Discussion
-  url: https://groups.google.com/forum/#!forum/sphinx-users
-  about: For general discussion, please use sphinx-users mailing list.
+  url: https://github.com/sphinx-doc/sphinx/discussions
+  about: For general discussion, please use GitHub Discussions.

.github/ISSUE_TEMPLATE/config.yml

@@ -1,19 +1,33 @@
-Subject: <short purpose of this pull request>
+<!--
+Thank you for creating this pull request and for spending time to help Sphinx!
+Our contributors' guide can be found online: https://www.sphinx-doc.org/en/master/internals/contributing.html
+Ask any questions at https://github.com/sphinx-doc/sphinx/discussions
+-->
 
-### Feature or Bugfix
-<!-- please choose -->
-- Feature
-- Bugfix
-- Refactoring
 
-### Purpose
-- <long purpose of this pull request>
-- <Environment if this PR depends on>
+## Purpose
 
-### Detail
-- <feature1 or bug1>
-- <feature2 or bug2>
+<!--
+A description of the purpose of this pull request.
+Ensure that all relevant information is included for reviewers,
+including any environment-specific details.
 
-### Relates
-- <URL or Ticket>
+* If you plan to add tests or documentation after opening this PR,
+  please note it here.
+* For user-visible changes, remember to add an entry to CHANGES.rst.
+* Please add your name to AUTHORS.rst if you haven't already!
+-->
 
+
+## References
+
+<!--
+Please add any relevant links here, especially including any 
+GitHub issues or Pull Requests that this PR would resolve.
+This helps to ensure that reviewers have context from
+previous discussions or decisions.
+-->
+
+- <...>
+- <...>
+- <...>

.github/PULL_REQUEST_TEMPLATE.md

@@ -31,11 +31,10 @@ jobs:
     - name: Install graphviz
       run: sudo apt-get install --no-install-recommends --yes graphviz
     - name: Install uv
-      run: >
-        curl --no-progress-meter --location --fail
-        --proto '=https' --tlsv1.2
-        "https://astral.sh/uv/install.sh"
-        | sh
+      uses: astral-sh/setup-uv@v5
+      with:
+        version: latest
+        enable-cache: false
     - name: Install dependencies
       run: uv pip install .[docs]
     - name: Render the documentation

.github/workflows/builddoc.yml

@@ -35,11 +35,10 @@ jobs:
         with:
           python-version: "3"
       - name: Install uv
-        run: >
-          curl --no-progress-meter --location --fail
-          --proto '=https' --tlsv1.2
-          "https://astral.sh/uv/install.sh"
-          | sh
+        uses: astral-sh/setup-uv@v5
+        with:
+          version: latest
+          enable-cache: false
 
       - name: Install build dependencies (pypa/build, twine)
         run: |

.github/workflows/create-release.yml

@@ -31,41 +31,17 @@ jobs:
         RUFF_VERSION=$(awk -F'[="]' '/\[project\.optional-dependencies\]/ {p=1} /ruff/ {if (p) print $4}' pyproject.toml)
         echo "RUFF_VERSION=$RUFF_VERSION" >> $GITHUB_ENV
 
-    - name: Install Ruff
-      run: >
-        curl --no-progress-meter --location --fail
-        --proto '=https' --tlsv1.2
-        --write-out "%{stderr}Downloaded: %{url}\n"
-        "https://astral.sh/ruff/$RUFF_VERSION/install.sh"
-        | sh
+    - name: Install Ruff ${{ env.RUFF_VERSION }}
+      uses: astral-sh/ruff-action@v3
+      with:
+        args: --version
+        version: ${{ env.RUFF_VERSION }}
 
     - name: Lint with Ruff
-      run: ruff check . --output-format github
+      run: ruff check --output-format=github
 
     - name: Format with Ruff
-      run: ruff format . --diff
-
-  flake8:
-    runs-on: ubuntu-latest
-
-    steps:
-    - uses: actions/checkout@v4
-      with:
-        persist-credentials: false
-    - name: Set up Python
-      uses: actions/setup-python@v5
-      with:
-        python-version: "3"
-    - name: Install uv
-      run: >
-        curl --no-progress-meter --location --fail
-        --proto '=https' --tlsv1.2
-        "https://astral.sh/uv/install.sh"
-        | sh
-    - name: Install dependencies
-      run: uv pip install --upgrade "flake8>=6.0"
-    - name: Lint with flake8
-      run: flake8 .
+      run: ruff format --diff
 
   mypy:
     runs-on: ubuntu-latest
@@ -79,11 +55,10 @@ jobs:
       with:
         python-version: "3"
     - name: Install uv
-      run: >
-        curl --no-progress-meter --location --fail
-        --proto '=https' --tlsv1.2
-        "https://astral.sh/uv/install.sh"
-        | sh
+      uses: astral-sh/setup-uv@v5
+      with:
+        version: latest
+        enable-cache: false
     - name: Install dependencies
       run: uv pip install ".[lint,test]"
     - name: Type check with mypy
@@ -101,11 +76,10 @@ jobs:
       with:
         python-version: "3"
     - name: Install uv
-      run: >
-        curl --no-progress-meter --location --fail
-        --proto '=https' --tlsv1.2
-        "https://astral.sh/uv/install.sh"
-        | sh
+      uses: astral-sh/setup-uv@v5
+      with:
+        version: latest
+        enable-cache: false
     - name: Install dependencies
       run: uv pip install ".[lint,test]"
     - name: Type check with pyright
@@ -123,11 +97,10 @@ jobs:
       with:
         python-version: "3"
     - name: Install uv
-      run: >
-        curl --no-progress-meter --location --fail
-        --proto '=https' --tlsv1.2
-        "https://astral.sh/uv/install.sh"
-        | sh
+      uses: astral-sh/setup-uv@v5
+      with:
+        version: latest
+        enable-cache: false
     - name: Install dependencies
       run: uv pip install --upgrade sphinx-lint
     - name: Lint documentation with sphinx-lint
@@ -145,11 +118,10 @@ jobs:
       with:
         python-version: "3"
     - name: Install uv
-      run: >
-        curl --no-progress-meter --location --fail
-        --proto '=https' --tlsv1.2
-        "https://astral.sh/uv/install.sh"
-        | sh
+      uses: astral-sh/setup-uv@v5
+      with:
+        version: latest
+        enable-cache: false
     - name: Install dependencies
       run: uv pip install --upgrade twine build
     - name: Lint with twine

.github/workflows/lint.yml

@@ -58,11 +58,10 @@ jobs:
     - name: Install graphviz
       run: sudo apt-get install --no-install-recommends --yes graphviz
     - name: Install uv
-      run: >
-        curl --no-progress-meter --location --fail
-        --proto '=https' --tlsv1.2
-        "https://astral.sh/uv/install.sh"
-        | sh
+      uses: astral-sh/setup-uv@v5
+      with:
+        version: latest
+        enable-cache: false
     - name: Install dependencies
       run: uv pip install .[test]
     - name: Install Docutils ${{ matrix.docutils }}
@@ -198,9 +197,10 @@ jobs:
     - name: Install graphviz
       run: choco install --no-progress graphviz
     - name: Install uv
-      run: >
-        Invoke-WebRequest -Uri "https://astral.sh/uv/install.ps1"
-        | Invoke-Expression
+      uses: astral-sh/setup-uv@v5
+      with:
+        version: latest
+        enable-cache: false
     - name: Install dependencies
       run: uv pip install .[test]
     - name: Test with pytest
@@ -232,11 +232,10 @@ jobs:
     - name: Install graphviz
       run: sudo apt-get install --no-install-recommends --yes graphviz
     - name: Install uv
-      run: >
-        curl --no-progress-meter --location --fail
-        --proto '=https' --tlsv1.2
-        "https://astral.sh/uv/install.sh"
-        | sh
+      uses: astral-sh/setup-uv@v5
+      with:
+        version: latest
+        enable-cache: false
     - name: Install dependencies
       run: uv pip install .[test]
     - name: Install Docutils' HEAD
@@ -266,11 +265,10 @@ jobs:
     - name: Install graphviz
       run: sudo apt-get install --no-install-recommends --yes graphviz
     - name: Install uv
-      run: >
-        curl --no-progress-meter --location --fail
-        --proto '=https' --tlsv1.2
-        "https://astral.sh/uv/install.sh"
-        | sh
+      uses: astral-sh/setup-uv@v5
+      with:
+        version: latest
+        enable-cache: false
     - name: Install dependencies
       run: |
         uv pip install .[test] --resolution lowest-direct
@@ -298,11 +296,10 @@ jobs:
     - name: Check Python version
       run: python --version --version
     - name: Install uv
-      run: >
-        curl --no-progress-meter --location --fail
-        --proto '=https' --tlsv1.2
-        "https://astral.sh/uv/install.sh"
-        | sh
+      uses: astral-sh/setup-uv@v5
+      with:
+        version: latest
+        enable-cache: false
     - name: Install dependencies
       run: uv pip install .[test]
     - name: Test with pytest
@@ -330,11 +327,10 @@ jobs:
     - name: Install graphviz
       run: sudo apt-get install --no-install-recommends --yes graphviz
     - name: Install uv
-      run: >
-        curl --no-progress-meter --location --fail
-        --proto '=https' --tlsv1.2
-        "https://astral.sh/uv/install.sh"
-        | sh
+      uses: astral-sh/setup-uv@v5
+      with:
+        version: latest
+        enable-cache: false
     - name: Install dependencies
       run: uv pip install .[test] pytest-cov
     - name: Test with pytest

.github/workflows/main.yml

@@ -27,8 +27,13 @@ jobs:
         mkdir -p /tmp/tx_cli && cd $_
         curl -o- https://raw.githubusercontent.com/transifex/cli/master/install.sh | bash
       shell: bash
+    - name: Install uv
+      uses: astral-sh/setup-uv@v5
+      with:
+        version: latest
+        enable-cache: false
     - name: Install dependencies
-      run: pip install --upgrade babel jinja2
+      run: uv pip install --upgrade babel jinja2
     - name: Extract translations from source code
       run: python utils/babel_runner.py extract
     - name: Push translations to transifex.com
@@ -58,8 +63,13 @@ jobs:
         mkdir -p /tmp/tx_cli && cd $_
         curl -o- https://raw.githubusercontent.com/transifex/cli/master/install.sh | bash
       shell: bash
+    - name: Install uv
+      uses: astral-sh/setup-uv@v5
+      with:
+        version: latest
+        enable-cache: false
     - name: Install dependencies
-      run: pip install --upgrade babel jinja2
+      run: uv pip install --upgrade babel jinja2
     - name: Extract translations from source code
       run: python utils/babel_runner.py extract
     - name: Pull translations from transifex.com