Skip to content

gh-139590: Stricter ruff rules for Tools/wasm #139752

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Oct 8, 2025
+14 −17
Merged

gh-139590: Stricter ruff rules for Tools/wasm #139752

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
20b8dfa
gh-139590: Stricter `ruff` rules for `Tools/wasm`
sobolevn Oct 8, 2025
f85cd31
Also enable `ruff check`
sobolevn Oct 8, 2025
458a45b
Update .pre-commit-config.yaml
sobolevn Oct 8, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions .pre-commit-config.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,10 @@ repos:
name: Run Ruff (lint) on Tools/peg_generator/
args: [--exit-non-zero-on-fix, --config=Tools/peg_generator/.ruff.toml]
files: ^Tools/peg_generator/
- id: ruff-check
name: Run Ruff (lint) on Tools/wasm/
args: [--exit-non-zero-on-fix, --config=Tools/wasm/.ruff.toml]
files: ^Tools/wasm/
- id: ruff-format
name: Run Ruff (format) on Doc/
args: [--check]
Expand Down
3 changes: 0 additions & 3 deletions Tools/wasm/.ruff.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,4 @@ select = [
]
ignore = [
"E501", # Line too long
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Keeping this one makes likely sense given we're auto-formatting.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I decided to keep it, so we can reduce the diff :)

"F541", # f-string without any placeholders
"PYI024", # Use `typing.NamedTuple` instead of `collections.namedtuple`
"PYI025", # Use `from collections.abc import Set as AbstractSet`
]
9 changes: 4 additions & 5 deletions Tools/wasm/emscripten/__main__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,16 +3,16 @@
import argparse
import contextlib
import functools
import hashlib
import os
import shutil
import subprocess
import sys
import sysconfig
import hashlib
import tempfile
from urllib.request import urlopen
from pathlib import Path
from textwrap import dedent
from urllib.request import urlopen

try:
from os import process_cpu_count as cpu_count
Expand All @@ -33,9 +33,7 @@
PREFIX_DIR = CROSS_BUILD_DIR / HOST_TRIPLE / "prefix"

LOCAL_SETUP = CHECKOUT / "Modules" / "Setup.local"
LOCAL_SETUP_MARKER = "# Generated by Tools/wasm/emscripten.py\n".encode(
"utf-8"
)
LOCAL_SETUP_MARKER = b"# Generated by Tools/wasm/emscripten.py\n"


def updated_env(updates={}):
Expand Down Expand Up @@ -432,6 +430,7 @@ def main():
make_build,
configure_host,
make_host,
clean,
):
subcommand.add_argument(
"--quiet",
Expand Down
5 changes: 2 additions & 3 deletions Tools/wasm/emscripten/wasm_assets.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@
import sys
import sysconfig
import zipfile
from typing import Dict

# source directory
SRCDIR = pathlib.Path(__file__).parents[3].absolute()
Expand Down Expand Up @@ -134,7 +133,7 @@ def filterfunc(filename: str) -> bool:
pzf.writepy(entry, filterfunc=filterfunc)


def detect_extension_modules(args: argparse.Namespace) -> Dict[str, bool]:
def detect_extension_modules(args: argparse.Namespace) -> dict[str, bool]:
modules = {}

# disabled by Modules/Setup.local ?
Expand All @@ -149,7 +148,7 @@ def detect_extension_modules(args: argparse.Namespace) -> Dict[str, bool]:
# disabled by configure?
with open(args.sysconfig_data) as f:
data = f.read()
loc: Dict[str, Dict[str, str]] = {}
loc: dict[str, dict[str, str]] = {}
exec(data, globals(), loc)

for key, value in loc["build_time_vars"].items():
Expand Down
10 changes: 4 additions & 6 deletions Tools/wasm/wasi/__main__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@
import sysconfig
import tempfile


CHECKOUT = pathlib.Path(__file__).parent.parent.parent.parent
assert (CHECKOUT / "configure").is_file(), (
"Please update the location of the file"
Expand All @@ -28,9 +27,9 @@

LOCAL_SETUP = CHECKOUT / "Modules" / "Setup.local"
LOCAL_SETUP_MARKER = (
"# Generated by Tools/wasm/wasi .\n"
"# Required to statically build extension modules."
).encode("utf-8")
b"# Generated by Tools/wasm/wasi .\n"
b"# Required to statically build extension modules."
)

WASI_SDK_VERSION = 24

Expand Down Expand Up @@ -154,8 +153,7 @@ def build_python_is_pydebug():
test = "import sys, test.support; sys.exit(test.support.Py_DEBUG)"
result = subprocess.run(
[build_python_path(), "-c", test],
stdout=subprocess.PIPE,
stderr=subprocess.PIPE,
capture_output=True,
)
return bool(result.returncode)

Expand Down
Loading