Merge remote-tracking branch 'upstream/master' into spdx-id-collision

Author: hugovk

.github/workflows/source-and-docs-release.yml

@@ -40,8 +40,8 @@ name: "Build Python source and docs artifacts"
 # Set from inputs for workflow_dispatch, or set defaults to test push/PR events
 env:
   GIT_REMOTE: ${{ github.event.inputs.git_remote || 'python' }}
-  GIT_COMMIT: ${{ github.event.inputs.git_commit || 'f6650f9ad73359051f3e558c2431a109bc016664' }}
-  CPYTHON_RELEASE: ${{ github.event.inputs.cpython_release || '3.12.3' }}
+  GIT_COMMIT: ${{ github.event.inputs.git_commit || '4f8bb3947cfbc20f970ff9d9531e1132a9e95396' }}
+  CPYTHON_RELEASE: ${{ github.event.inputs.cpython_release || '3.13.2' }}
 
 jobs:
   verify-input:
@@ -92,7 +92,7 @@ jobs:
       - name: "Setup Python"
         uses: actions/setup-python@0b93645e9fea7318ecaed2b359559ac225c90a2b # v5.3.0
         with:
-          python-version: 3.11
+          python-version: 3.12
 
       - name: "Install source dependencies"
         run: |
@@ -105,7 +105,7 @@ jobs:
           python ../release.py --export "$CPYTHON_RELEASE" --skip-docs
 
       - name: "Upload the source artifacts"
-        uses: actions/upload-artifact@b4b15b8c7c6ac21ea08fcf65892d2ee8f75cf882 # v4.4.3
+        uses: actions/upload-artifact@65c4c4a1ddee5b72f698fdd19549f0f0fb45cf08 # v4.6.0
         with:
           name: source
           path: |
@@ -129,7 +129,7 @@ jobs:
       - name: "Setup Python"
         uses: actions/setup-python@0b93645e9fea7318ecaed2b359559ac225c90a2b # v5.3.0
         with:
-          python-version: 3.11
+          python-version: 3.12
 
       - name: "Install docs dependencies"
         run: |
@@ -148,7 +148,7 @@ jobs:
           SPHINXOPTS="-j10" make dist
 
       - name: "Upload the docs artifacts"
-        uses: actions/upload-artifact@b4b15b8c7c6ac21ea08fcf65892d2ee8f75cf882 # v4.4.3
+        uses: actions/upload-artifact@65c4c4a1ddee5b72f698fdd19549f0f0fb45cf08 # v4.6.0
         with:
           name: docs
           path: |

.github/workflows/test.yml

@@ -12,14 +12,15 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
+        python-version: ["3.12", "3.13"]
         os: [macos-latest, ubuntu-latest]
     steps:
       - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
         with:
           persist-credentials: false
       - uses: actions/setup-python@0b93645e9fea7318ecaed2b359559ac225c90a2b # v5.3.0
         with:
-          python-version: 3.12
+          python-version: ${{ matrix.python-version }}
           cache: pip
           cache-dependency-path: dev-requirements.txt
       - run: |

.pre-commit-config.yaml

@@ -1,6 +1,6 @@
 repos:
   - repo: https://github.com/astral-sh/ruff-pre-commit
-    rev: v0.7.1
+    rev: v0.8.2
     hooks:
       - id: ruff
         args: [--exit-non-zero-on-fix]
@@ -25,23 +25,28 @@ repos:
       - id: trailing-whitespace
 
   - repo: https://github.com/python-jsonschema/check-jsonschema
-    rev: 0.29.4
+    rev: 0.30.0
     hooks:
       - id: check-dependabot
       - id: check-github-workflows
 
   - repo: https://github.com/rhysd/actionlint
-    rev: v1.7.3
+    rev: v1.7.4
     hooks:
       - id: actionlint
 
+  - repo: https://github.com/woodruffw/zizmor-pre-commit
+    rev: v0.8.0
+    hooks:
+      - id: zizmor
+
   - repo: https://github.com/tox-dev/pyproject-fmt
-    rev: v2.4.3
+    rev: v2.5.0
     hooks:
       - id: pyproject-fmt
 
   - repo: https://github.com/abravalheri/validate-pyproject
-    rev: v0.22
+    rev: v0.23
     hooks:
       - id: validate-pyproject
 

add_to_pydotorg.py

@@ -29,8 +29,9 @@
 import re
 import subprocess
 import sys
+from collections.abc import Generator
 from os import path
-from typing import Any, Generator, NoReturn
+from typing import Any, NoReturn
 
 import requests
 

buildbotapi.py

@@ -1,4 +1,3 @@
-import asyncio
 import json
 from dataclasses import dataclass
 from typing import Any, cast
@@ -12,7 +11,6 @@
 class Builder:
     builderid: int
     description: str | None
-    masterids: list[int]
     name: str
     tags: list[str]
 
@@ -23,26 +21,6 @@ def __hash__(self) -> int:
         return hash(self.builderid)
 
 
-@dataclass
-class Build:
-    id: int
-    is_currently_failing: bool
-    builderid: int
-    builder: Builder | None
-
-    def __init__(self, **kwargs: Any) -> None:
-        self.__dict__.update(**kwargs)
-        self.id = int(kwargs.get("number", -1))
-        self.is_currently_failing = kwargs.get("currently_failing", False)
-        self.builder = None
-
-    def __eq__(self, other: object) -> bool:
-        return isinstance(other, Build) and self.id == other.id
-
-    def __hash__(self) -> int:
-        return hash(self.id)
-
-
 class BuildBotAPI:
     def __init__(self, session: ClientSession) -> None:
         self._session = session
@@ -91,44 +69,3 @@ async def is_builder_failing_currently(self, builder: Builder) -> bool:
         if build["results"] == 2:
             return True
         return False
-
-    async def get_build(self, builder_id: int, build_id: int) -> Build:
-        data = await self._fetch_json(
-            f"https://buildbot.python.org/all/api/v2/builders/{builder_id}"
-            f"/builds/{build_id}"
-        )
-        (build_data,) = data["builds"]
-        build: Build = Build(**build_data)
-        build.builder = (await self.all_builders())[build.builderid]
-        build.is_currently_failing = await self.is_builder_failing_currently(
-            build.builder
-        )
-        return build
-
-    async def get_recent_failures(self, limit: int = 100) -> set[Build]:
-        data = await self._fetch_json(
-            f"https://buildbot.python.org/all/api/v2/builds?"
-            f"complete__eq=true&&results__eq=2&&"
-            f"order=-complete_at&&limit={limit}"
-        )
-
-        stable_builders = await self.stable_builders()
-
-        all_failures = {
-            Build(**build)
-            for build in data["builds"]
-            if build["builderid"] in stable_builders
-        }
-
-        for failure in all_failures:
-            failure.builder = stable_builders[failure.builderid]
-
-        async def _get_missing_info(failure: Build) -> None:
-            assert failure.builder is not None
-            failure.is_currently_failing = await self.is_builder_failing_currently(
-                failure.builder
-            )
-
-        await asyncio.gather(*[_get_missing_info(failure) for failure in all_failures])
-
-        return all_failures

dev-requirements.in

@@ -1,3 +1,4 @@
 pytest
+pytest-aiohttp
 pytest-cov
 pytest-mock