Skip to content

[3.14] gh-139590: Stricter ruff rules for Tools/wasm (GH-139752) #139811

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
hugovk merged 4 commits into from
Oct 14, 2025
Merged

[3.14] gh-139590: Stricter ruff rules for Tools/wasm (GH-139752) #139811

Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
b6a2be3
gh-139590: Stricter `ruff` rules for `Tools/wasm` (GH-139752)
sobolevn Oct 8, 2025
c378442
Lint fixes
hugovk Oct 9, 2025
881e994
Format fix
hugovk Oct 9, 2025
5212b38
Delete Tools/wasm/mypy.ini
hugovk Oct 9, 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
Prev Previous commit
Next Next commit
Lint fixes
  • Loading branch information
@hugovk
hugovk committed Oct 9, 2025
commit c3784427fc7a129e3c52683010b38308ce635f4e
84 changes: 39 additions & 45 deletions Tools/wasm/wasm_build.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,8 @@
"""

import argparse
import enum
import dataclasses
import enum
import logging
import os
import pathlib
Expand All @@ -39,18 +39,12 @@
import time
import warnings
import webbrowser
from collections.abc import Callable, Iterable

# for Python 3.8
from typing import (
cast,
Any,
Callable,
Dict,
Iterable,
List,
Optional,
Tuple,
Union,
cast,
)

logger = logging.getLogger("wasm_build")
Expand Down Expand Up @@ -122,7 +116,7 @@

def parse_emconfig(
emconfig: pathlib.Path = EM_CONFIG,
) -> Tuple[pathlib.Path, pathlib.Path]:
) -> tuple[pathlib.Path, pathlib.Path]:
"""Parse EM_CONFIG file and lookup EMSCRIPTEN_ROOT and NODE_JS.

The ".emscripten" config file is a Python snippet that uses "EM_CONFIG"
Expand All @@ -134,7 +128,7 @@ def parse_emconfig(
with open(emconfig, encoding="utf-8") as f:
code = f.read()
# EM_CONFIG file is a Python snippet
local: Dict[str, Any] = {}
local: dict[str, Any] = {}
exec(code, globals(), local)
emscripten_root = pathlib.Path(local["EMSCRIPTEN_ROOT"])
node_js = pathlib.Path(local["NODE_JS"])
Expand Down Expand Up @@ -192,16 +186,16 @@ class Platform:

name: str
pythonexe: str
config_site: Optional[pathlib.PurePath]
configure_wrapper: Optional[pathlib.Path]
make_wrapper: Optional[pathlib.PurePath]
environ: Dict[str, Any]
config_site: pathlib.PurePath | None
configure_wrapper: pathlib.Path | None
make_wrapper: pathlib.PurePath | None
environ: dict[str, Any]
check: Callable[[], None]
# Used for build_emports().
ports: Optional[pathlib.PurePath]
cc: Optional[pathlib.PurePath]
ports: pathlib.PurePath | None
cc: pathlib.PurePath | None

def getenv(self, profile: "BuildProfile") -> Dict[str, Any]:
def getenv(self, profile: "BuildProfile") -> dict[str, Any]:
return self.environ.copy()


Expand Down Expand Up @@ -264,7 +258,7 @@ def _check_emscripten() -> None:
# git / upstream / tot-upstream installation
version = version[:-4]
version_tuple = cast(
Tuple[int, int, int], tuple(int(v) for v in version.split("."))
tuple[int, int, int], tuple(int(v) for v in version.split("."))
)
if version_tuple < EMSDK_MIN_VERSION:
raise ConditionError(
Expand Down Expand Up @@ -388,7 +382,7 @@ def get_extra_paths(self) -> Iterable[pathlib.PurePath]:
return []

@property
def emport_args(self) -> List[str]:
def emport_args(self) -> list[str]:
"""Host-specific port args (Emscripten)."""
cls = type(self)
if self is cls.wasm64_emscripten:
Expand All @@ -399,7 +393,7 @@ def emport_args(self) -> List[str]:
return []

@property
def embuilder_args(self) -> List[str]:
def embuilder_args(self) -> list[str]:
"""Host-specific embuilder args (Emscripten)."""
cls = type(self)
if self is cls.wasm64_emscripten:
Expand All @@ -422,7 +416,7 @@ def is_browser(self) -> bool:
return self in {cls.browser, cls.browser_debug}

@property
def emport_args(self) -> List[str]:
def emport_args(self) -> list[str]:
"""Target-specific port args."""
cls = type(self)
if self in {cls.browser_debug, cls.node_debug}:
Expand All @@ -448,9 +442,9 @@ class BuildProfile:
name: str
support_level: SupportLevel
host: Host
target: Union[EmscriptenTarget, None] = None
dynamic_linking: Union[bool, None] = None
pthreads: Union[bool, None] = None
target: EmscriptenTarget | None = None
dynamic_linking: bool | None = None
pthreads: bool | None = None
default_testopts: str = "-j2"

@property
Expand All @@ -474,7 +468,7 @@ def makefile(self) -> pathlib.Path:
return self.builddir / "Makefile"

@property
def configure_cmd(self) -> List[str]:
def configure_cmd(self) -> list[str]:
"""Generate configure command"""
# use relative path, so WASI tests can find lib prefix.
# pathlib.Path.relative_to() does not work here.
Expand Down Expand Up @@ -509,15 +503,15 @@ def configure_cmd(self) -> List[str]:
return cmd

@property
def make_cmd(self) -> List[str]:
def make_cmd(self) -> list[str]:
"""Generate make command"""
cmd = ["make"]
platform = self.host.platform
if platform.make_wrapper:
cmd.insert(0, os.fspath(platform.make_wrapper))
return cmd

def getenv(self) -> Dict[str, Any]:
def getenv(self) -> dict[str, Any]:
"""Generate environ dict for platform"""
env = os.environ.copy()
if hasattr(os, "process_cpu_count"):
Expand All @@ -531,7 +525,7 @@ def getenv(self) -> Dict[str, Any]:
env.pop(key, None)
elif key == "PATH":
# list of path items, prefix with extra paths
new_path: List[pathlib.PurePath] = []
new_path: list[pathlib.PurePath] = []
new_path.extend(self.host.get_extra_paths())
new_path.extend(value)
env[key] = os.pathsep.join(os.fspath(p) for p in new_path)
Expand All @@ -549,7 +543,7 @@ def _run_cmd(
self,
cmd: Iterable[str],
args: Iterable[str] = (),
cwd: Optional[pathlib.Path] = None,
cwd: pathlib.Path | None = None,
) -> int:
cmd = list(cmd)
cmd.extend(args)
Expand Down Expand Up @@ -587,7 +581,7 @@ def run_pythoninfo(self, *args: str) -> int:
self._check_execute()
return self.run_make("pythoninfo", *args)

def run_test(self, target: str, testopts: Optional[str] = None) -> int:
def run_test(self, target: str, testopts: str | None = None) -> int:
"""Run buildbottests"""
self._check_execute()
if testopts is None:
Expand Down Expand Up @@ -823,8 +817,8 @@ def build_emports(self, force: bool = False) -> None:
)

# Don't list broken and experimental variants in help
platforms_choices = list(p.name for p in _profiles) + ["cleanall"]
platforms_help = list(p.name for p in _profiles if p.support_level) + [
platforms_choices = [p.name for p in _profiles] + ["cleanall"]
platforms_help = [p.name for p in _profiles if p.support_level] + [
"cleanall"
]
parser.add_argument(
Expand All @@ -834,18 +828,18 @@ def build_emports(self, force: bool = False) -> None:
choices=platforms_choices,
)

ops = dict(
build="auto build (build 'build' Python, emports, configure, compile)",
configure="run ./configure",
compile="run 'make all'",
pythoninfo="run 'make pythoninfo'",
test="run 'make buildbottest TESTOPTS=...' (supports parallel tests)",
hostrunnertest="run 'make hostrunnertest TESTOPTS=...'",
repl="start interactive REPL / webserver + browser session",
clean="run 'make clean'",
cleanall="remove all build directories",
emports="build Emscripten port with embuilder (only Emscripten)",
)
ops = {
"build": "auto build (build 'build' Python, emports, configure, compile)",
"configure": "run ./configure",
"compile": "run 'make all'",
"pythoninfo": "run 'make pythoninfo'",
"test": "run 'make buildbottest TESTOPTS=...' (supports parallel tests)",
"hostrunnertest": "run 'make hostrunnertest TESTOPTS=...'",
"repl": "start interactive REPL / webserver + browser session",
"clean": "run 'make clean'",
"cleanall": "remove all build directories",
"emports": "build Emscripten port with embuilder (only Emscripten)",
}
ops_help = "\n".join(f"{op:16s} {help}" for op, help in ops.items())
parser.add_argument(
"ops",
Expand Down