Merge branch 'master' into typing-ext-overload

Author: AA-Turner

.github/workflows/builddoc.yml

@@ -31,7 +31,7 @@ jobs:
     - name: Install graphviz
       run: sudo apt-get install --no-install-recommends --yes graphviz
     - name: Install uv
-      uses: astral-sh/setup-uv@v5
+      uses: astral-sh/setup-uv@v6
       with:
         version: latest
         enable-cache: false

.github/workflows/create-release.yml

@@ -35,7 +35,7 @@ jobs:
         with:
           python-version: "3"
       - name: Install uv
-        uses: astral-sh/setup-uv@v5
+        uses: astral-sh/setup-uv@v6
         with:
           version: latest
           enable-cache: false
@@ -47,8 +47,7 @@ jobs:
         run: python -m build
 
       - name: Check distribution
-        run: |
-          twine check dist/*
+        run: twine check dist/*
 
       - name: Create Sigstore attestations for built distributions
         uses: actions/attest@v1
@@ -87,39 +86,10 @@ jobs:
           name: attestation-bundles
           path: /tmp/attestation-bundles/
 
-      - name: Mint PyPI API token
-        id: mint-token
-        uses: actions/github-script@v7
-        with:
-          # language=JavaScript
-          script: |
-            // retrieve the ambient OIDC token
-            const oidc_request_token = process.env.ACTIONS_ID_TOKEN_REQUEST_TOKEN;
-            const oidc_request_url = process.env.ACTIONS_ID_TOKEN_REQUEST_URL;
-            const oidc_resp = await fetch(`${oidc_request_url}&audience=pypi`, {
-              headers: {Authorization: `bearer ${oidc_request_token}`},
-            });
-            const oidc_token = (await oidc_resp.json()).value;
-
-            // exchange the OIDC token for an API token
-            const mint_resp = await fetch('https://pypi.org/_/oidc/github/mint-token', {
-              method: 'post',
-              body: `{"token": "${oidc_token}"}` ,
-              headers: {'Content-Type': 'application/json'},
-            });
-            const api_token = (await mint_resp.json()).token;
-
-            // mask the newly minted API token, so that we don't accidentally leak it
-            core.setSecret(api_token)
-            core.setOutput('api-token', api_token)
-
       - name: Upload to PyPI
         env:
           TWINE_NON_INTERACTIVE: "true"
-          TWINE_USERNAME: "__token__"
-          TWINE_PASSWORD: "${{ steps.mint-token.outputs.api-token }}"
-        run: |
-          twine upload dist/* --attestations
+        run: twine upload dist/* --attestations
 
   github-release:
     runs-on: ubuntu-latest

.github/workflows/lint.yml

@@ -50,7 +50,7 @@ jobs:
       with:
         python-version: "3"
     - name: Install uv
-      uses: astral-sh/setup-uv@v5
+      uses: astral-sh/setup-uv@v6
       with:
         version: latest
         enable-cache: false
@@ -71,7 +71,7 @@ jobs:
       with:
         python-version: "3"
     - name: Install uv
-      uses: astral-sh/setup-uv@v5
+      uses: astral-sh/setup-uv@v6
       with:
         version: latest
         enable-cache: false
@@ -92,7 +92,7 @@ jobs:
       with:
         python-version: "3"
     - name: Install uv
-      uses: astral-sh/setup-uv@v5
+      uses: astral-sh/setup-uv@v6
       with:
         version: latest
         enable-cache: false
@@ -113,7 +113,7 @@ jobs:
       with:
         python-version: "3"
     - name: Install uv
-      uses: astral-sh/setup-uv@v5
+      uses: astral-sh/setup-uv@v6
       with:
         version: latest
         enable-cache: false

.github/workflows/main.yml

@@ -37,6 +37,7 @@ jobs:
         - "3.11"
         - "3.12"
         - "3.13"
+        - "3.13t"
         docutils:
         - "0.20"
         - "0.21"
@@ -62,14 +63,18 @@ jobs:
     - name: Install graphviz
       run: sudo apt-get install --no-install-recommends --yes graphviz
     - name: Install uv
-      uses: astral-sh/setup-uv@v5
+      uses: astral-sh/setup-uv@v6
       with:
         version: latest
         enable-cache: false
     - name: Install dependencies
       run: uv pip install . --group test
+      env:
+        UV_PYTHON: "python${{ matrix.python }}"
     - name: Install Docutils ${{ matrix.docutils }}
       run: uv pip install --upgrade "docutils~=${{ matrix.docutils }}.0"
+      env:
+        UV_PYTHON: "python${{ matrix.python }}"
     - name: Test with pytest
       run: python -m pytest -n logical --dist=worksteal -vv --durations 25
       env:
@@ -103,46 +108,14 @@ jobs:
     - name: Install dependencies
       run: |
         python -m pip install --upgrade pip
-        python -m pip install .[test]
+        python -m pip install . --group test
     - name: Install Docutils ${{ matrix.docutils }}
       run: python -m pip install --upgrade "docutils~=${{ matrix.docutils }}.0"
     - name: Test with pytest
       run: python -m pytest -n logical --dist=worksteal -vv --durations 25
       env:
         PYTHONWARNINGS: "error"  # treat all warnings as errors
 
-  free-threaded:
-    runs-on: ubuntu-latest
-    name: Python ${{ matrix.python }} (free-threaded)
-    timeout-minutes: 15
-    strategy:
-      fail-fast: false
-      matrix:
-        python:
-        - "3.13"
-
-    steps:
-    - uses: actions/checkout@v4
-      with:
-        persist-credentials: false
-    - name: Set up Python ${{ matrix.python }} (deadsnakes)
-      uses: deadsnakes/[email protected]
-      with:
-        python-version: ${{ matrix.python }}
-        nogil: true
-    - name: Check Python version
-      run: python --version --version
-    - name: Install graphviz
-      run: sudo apt-get install --no-install-recommends --yes graphviz
-    - name: Install dependencies
-      run: |
-        python -m pip install --upgrade pip
-        python -m pip install .[test]
-    - name: Test with pytest
-      run: python -m pytest -n logical --dist=worksteal -vv --durations 25
-      env:
-        PYTHONWARNINGS: "error"  # treat all warnings as errors
-
   deadsnakes-free-threaded:
     runs-on: ubuntu-latest
     name: Python ${{ matrix.python }} (free-threaded)
@@ -169,7 +142,7 @@ jobs:
     - name: Install dependencies
       run: |
         python -m pip install --upgrade pip
-        python -m pip install .[test]
+        python -m pip install . --group test
     - name: Test with pytest
       run: python -m pytest -n logical --dist=worksteal -vv --durations 25
       env:
@@ -181,6 +154,14 @@ jobs:
     timeout-minutes: 15
 
     steps:
+    # https://github.com/actions/runner-images/issues/8755
+    # On standard runners, the D: drive is much faster.
+    - name: Set %TMP% and %TEMP% to D:\\Temp
+      run: |
+        mkdir "D:\\Tmp"
+        echo "TMP=D:\\Tmp" >> $env:GITHUB_ENV
+        echo "TEMP=D:\\Tmp" >> $env:GITHUB_ENV
+
     - uses: actions/checkout@v4
       with:
         persist-credentials: false
@@ -193,7 +174,7 @@ jobs:
     - name: Install graphviz
       run: choco install --no-progress graphviz
     - name: Install uv
-      uses: astral-sh/setup-uv@v5
+      uses: astral-sh/setup-uv@v6
       with:
         version: latest
         enable-cache: false
@@ -222,7 +203,7 @@ jobs:
     - name: Install graphviz
       run: brew install graphviz
     - name: Install uv
-      uses: astral-sh/setup-uv@v5
+      uses: astral-sh/setup-uv@v6
       with:
         version: latest
         enable-cache: false
@@ -257,7 +238,7 @@ jobs:
     - name: Install graphviz
       run: sudo apt-get install --no-install-recommends --yes graphviz
     - name: Install uv
-      uses: astral-sh/setup-uv@v5
+      uses: astral-sh/setup-uv@v6
       with:
         version: latest
         enable-cache: false
@@ -290,7 +271,7 @@ jobs:
     - name: Install graphviz
       run: sudo apt-get install --no-install-recommends --yes graphviz
     - name: Install uv
-      uses: astral-sh/setup-uv@v5
+      uses: astral-sh/setup-uv@v6
       with:
         version: latest
         enable-cache: false
@@ -321,7 +302,7 @@ jobs:
     - name: Check Python version
       run: python --version --version
     - name: Install uv
-      uses: astral-sh/setup-uv@v5
+      uses: astral-sh/setup-uv@v6
       with:
         version: latest
         enable-cache: false
@@ -352,7 +333,7 @@ jobs:
     - name: Install graphviz
       run: sudo apt-get install --no-install-recommends --yes graphviz
     - name: Install uv
-      uses: astral-sh/setup-uv@v5
+      uses: astral-sh/setup-uv@v6
       with:
         version: latest
         enable-cache: false

.github/workflows/transifex.yml

@@ -36,7 +36,7 @@ jobs:
         curl -o- https://raw.githubusercontent.com/transifex/cli/master/install.sh | bash
       shell: bash
     - name: Install uv
-      uses: astral-sh/setup-uv@v5
+      uses: astral-sh/setup-uv@v6
       with:
         version: latest
         enable-cache: false
@@ -72,7 +72,7 @@ jobs:
         curl -o- https://raw.githubusercontent.com/transifex/cli/master/install.sh | bash
       shell: bash
     - name: Install uv
-      uses: astral-sh/setup-uv@v5
+      uses: astral-sh/setup-uv@v6
       with:
         version: latest
         enable-cache: false

pyproject.toml

@@ -92,7 +92,7 @@ docs = [
     "sphinxcontrib-websupport",
 ]
 lint = [
-    "ruff==0.11.2",
+    "ruff==0.11.7",
     "mypy==1.15.0",
     "sphinx-lint>=0.9",
     "types-colorama==0.4.15.20240311",
@@ -102,9 +102,9 @@ lint = [
     "types-Pygments==2.19.0.20250305",
     "types-requests==2.32.0.20250328",  # align with requests
     "types-urllib3==1.26.25.14",
-    "pyright==1.1.397",
+    "pyright==1.1.400",
     "pytest>=8.0",
-    "pypi-attestations==0.0.22",
+    "pypi-attestations==0.0.25",
     "betterproto==2.0.0b6",
 ]
 test = [
@@ -135,14 +135,14 @@ docs = [
     "sphinxcontrib-websupport",
 ]
 lint = [
-    "ruff==0.11.2",
+    "ruff==0.11.7",
     "sphinx-lint>=0.9",
 ]
 package = [
     "betterproto==2.0.0b6",  # resolution fails without betterproto
     "build",
-    "pypi-attestations==0.0.22",
-    "twine>=5.1",
+    "pypi-attestations==0.0.25",
+    "twine>=6.1",
 ]
 test = [
     "pytest>=8.0",
@@ -158,7 +158,7 @@ translations = [
 ]
 types = [
     "mypy==1.15.0",
-    "pyright==1.1.397",
+    "pyright==1.1.400",
     { include-group = "type-stubs" },
 ]
 type-stubs = [

sphinx/ext/autosummary/generate.py

@@ -583,7 +583,7 @@ def generate_autosummary_docs(
 
     showed_sources = sorted(sources)
     if len(showed_sources) > 20:
-        showed_sources = showed_sources[:10] + ['...'] + showed_sources[-10:]
+        showed_sources = [*showed_sources[:10], '...', *showed_sources[-10:]]
     logger.info(
         __('[autosummary] generating autosummary for: %s'), ', '.join(showed_sources)
     )

sphinx/ext/napoleon/docstring.py

@@ -535,7 +535,7 @@ def _consume_returns_section(
 
             if colon:
                 if after:
-                    _desc = [after] + lines[1:]
+                    _desc = [after, *lines[1:]]
                 else:
                     _desc = lines[1:]
 
@@ -684,7 +684,7 @@ def _format_field(self, _name: str, _type: str, _desc: list[str]) -> list[str]:
         if has_desc:
             _desc = self._fix_field_desc(_desc)
             if _desc[0]:
-                return [field + _desc[0]] + _desc[1:]
+                return [field + _desc[0], *_desc[1:]]
             else:
                 return [field, *_desc]
         else:

sphinx/pycode/parser.py

@@ -257,7 +257,7 @@ def get_qualname_for(self, name: str) -> list[str] | None:
         if self.current_function:
             if self.current_classes and self.context[-1] == '__init__':
                 # store variable comments inside __init__ method of classes
-                return self.context[:-1] + [name]
+                return [*self.context[:-1], name]
             else:
                 return None
         else:
@@ -384,9 +384,10 @@ def visit_Assign(self, node: ast.Assign) -> None:
                 self.add_variable_annotation(varname, node.type_comment)  # type: ignore[arg-type]
 
         # check comments after assignment
-        parser = AfterCommentParser(
-            [current_line[node.col_offset :]] + self.buffers[node.lineno :]
-        )
+        parser = AfterCommentParser([
+            current_line[node.col_offset :],
+            *self.buffers[node.lineno :],
+        ])
         parser.parse()
         if parser.comment and comment_re.match(parser.comment):
             for varname in varnames:

sphinx/transforms/__init__.py

@@ -217,7 +217,7 @@ class SortIds(SphinxTransform):
     def apply(self, **kwargs: Any) -> None:
         for node in self.document.findall(nodes.section):
             if len(node['ids']) > 1 and node['ids'][0].startswith('id'):
-                node['ids'] = node['ids'][1:] + [node['ids'][0]]
+                node['ids'] = [*node['ids'][1:], node['ids'][0]]
 
 
 TRANSLATABLE_NODES = {

tests/roots/test-ext-autodoc/target/enums.py

@@ -1,4 +1,4 @@
-# ruff: NoQA: D403, PIE796
+# ruff: NoQA: PIE796
 import enum
 from typing import final
 

tests/test_builders/test_build_latex.py

@@ -143,7 +143,7 @@ def test_build_latex_doc(app, engine, docclass, python_maximum_signature_line_le
     }
     intersphinx_setup(app)
     app.config.latex_engine = engine
-    app.config.latex_documents = [app.config.latex_documents[0][:4] + (docclass,)]
+    app.config.latex_documents = [(*app.config.latex_documents[0][:4], docclass)]
     if engine == 'xelatex':
         app.config.latex_table_style = ['booktabs']
     elif engine == 'lualatex':