From 065fdaa3fbee0d857fe17af4ea67466e464b3c0f Mon Sep 17 00:00:00 2001 From: Hugo van Kemenade <1324225+hugovk@users.noreply.github.com> Date: Wed, 11 Dec 2024 15:05:04 +0200 Subject: [PATCH 1/2] Add zizmor to pre-commit --- .pre-commit-config.yaml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index b602e222..52c3e136 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -35,6 +35,11 @@ repos: 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 hooks: From 3db44852cb696346b52ddca6e99126ebac429b33 Mon Sep 17 00:00:00 2001 From: Hugo van Kemenade <1324225+hugovk@users.noreply.github.com> Date: Wed, 11 Dec 2024 15:26:05 +0200 Subject: [PATCH 2/2] Fix new pre-commit warnings --- .pre-commit-config.yaml | 10 +++++----- add_to_pydotorg.py | 3 ++- release.py | 6 +++--- run_release.py | 3 ++- 4 files changed, 12 insertions(+), 10 deletions(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 52c3e136..0aed1878 100644 --- a/.pre-commit-config.yaml +++ b/.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,13 +25,13 @@ 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 @@ -41,12 +41,12 @@ repos: - 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 diff --git a/add_to_pydotorg.py b/add_to_pydotorg.py index 7a2e548a..3e14c103 100755 --- a/add_to_pydotorg.py +++ b/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 diff --git a/release.py b/release.py index d2a49c70..3fd4f7f3 100755 --- a/release.py +++ b/release.py @@ -19,13 +19,13 @@ import subprocess import sys import tempfile +from collections.abc import Generator from contextlib import contextmanager from dataclasses import dataclass from pathlib import Path from typing import ( Any, Callable, - Generator, Literal, Protocol, Self, @@ -524,8 +524,8 @@ def tarball(source: str, clamp_mtime: str) -> None: checksum_xz = hashlib.md5() with open(xz, "rb") as data: checksum_xz.update(data.read()) - print(" %s %8s %s" % (checksum_tgz.hexdigest(), int(os.path.getsize(tgz)), tgz)) - print(" %s %8s %s" % (checksum_xz.hexdigest(), int(os.path.getsize(xz)), xz)) + print(f" {checksum_tgz.hexdigest()} {os.path.getsize(tgz):8} {tgz}") + print(f" {checksum_xz.hexdigest()} {os.path.getsize(xz):8} {xz}") def export(tag: Tag, silent: bool = False, skip_docs: bool = False) -> None: diff --git a/run_release.py b/run_release.py index a9787560..161927e3 100755 --- a/run_release.py +++ b/run_release.py @@ -21,8 +21,9 @@ import tempfile import time import urllib.request +from collections.abc import Iterator from pathlib import Path -from typing import Any, Iterator, cast +from typing import Any, cast import aiohttp import gnupg # type: ignore[import-untyped]