diff --git a/.github/workflows/reusable-wasi.yml b/.github/workflows/reusable-wasi.yml index a4673d74cbb177..7c40e566b2a0d1 100644 --- a/.github/workflows/reusable-wasi.yml +++ b/.github/workflows/reusable-wasi.yml @@ -13,10 +13,10 @@ env: jobs: build-wasi-reusable: name: 'build and test' - runs-on: ubuntu-24.04 + runs-on: ubuntu-24.04-arm timeout-minutes: 60 env: - WASMTIME_VERSION: 38.0.2 + WASMTIME_VERSION: 38.0.3 WASI_SDK_VERSION: 25 WASI_SDK_PATH: /opt/wasi-sdk CROSS_BUILD_PYTHON: cross-build/build @@ -40,7 +40,7 @@ jobs: if: steps.cache-wasi-sdk.outputs.cache-hit != 'true' run: | mkdir "${WASI_SDK_PATH}" && \ - curl -s -S --location "https://github.com/WebAssembly/wasi-sdk/releases/download/wasi-sdk-${WASI_SDK_VERSION}/wasi-sdk-${WASI_SDK_VERSION}.0-x86_64-linux.tar.gz" | \ + curl -s -S --location "https://github.com/WebAssembly/wasi-sdk/releases/download/wasi-sdk-${WASI_SDK_VERSION}/wasi-sdk-${WASI_SDK_VERSION}.0-arm64-linux.tar.gz" | \ tar --strip-components 1 --directory "${WASI_SDK_PATH}" --extract --gunzip - name: "Configure ccache action" uses: hendrikmuhs/ccache-action@v1.2 diff --git a/Lib/enum.py b/Lib/enum.py index 936bcea0619e7d..ad782b8c41e160 100644 --- a/Lib/enum.py +++ b/Lib/enum.py @@ -10,7 +10,8 @@ 'FlagBoundary', 'STRICT', 'CONFORM', 'EJECT', 'KEEP', 'global_flag_repr', 'global_enum_repr', 'global_str', 'global_enum', 'EnumCheck', 'CONTINUOUS', 'NAMED_FLAGS', 'UNIQUE', - 'pickle_by_global_name', 'pickle_by_enum_name', + 'pickle_by_global_name', 'pickle_by_enum_name', 'show_flag_values', + 'bin', ] diff --git a/Lib/test/test_enum.py b/Lib/test/test_enum.py index 7e509be0994248..66d78980c41cb6 100644 --- a/Lib/test/test_enum.py +++ b/Lib/test/test_enum.py @@ -5324,7 +5324,7 @@ def __new__(cls, value, label): class MiscTestCase(unittest.TestCase): def test__all__(self): - support.check__all__(self, enum, not_exported={'bin', 'show_flag_values'}) + support.check__all__(self, enum) @cpython_only def test_lazy_import(self): diff --git a/Misc/NEWS.d/next/Library/2025-10-29-16-53-00.gh-issue-140766.CNagKF.rst b/Misc/NEWS.d/next/Library/2025-10-29-16-53-00.gh-issue-140766.CNagKF.rst new file mode 100644 index 00000000000000..fce8dd33757aae --- /dev/null +++ b/Misc/NEWS.d/next/Library/2025-10-29-16-53-00.gh-issue-140766.CNagKF.rst @@ -0,0 +1 @@ +Add :func:`enum.show_flag_values` and ``enum.bin`` to ``enum.__all__``. diff --git a/Tools/wasm/wasi/__main__.py b/Tools/wasm/wasi/__main__.py index 50372cf6555de2..bb5ce30c5d8b4f 100644 --- a/Tools/wasm/wasi/__main__.py +++ b/Tools/wasm/wasi/__main__.py @@ -37,6 +37,30 @@ WASMTIME_HOST_RUNNER_VAR = f"{{{WASMTIME_VAR_NAME}}}" +def separator(): + """Print a separator line across the terminal width.""" + try: + tput_output = subprocess.check_output( + ["tput", "cols"], encoding="utf-8" + ) + except subprocess.CalledProcessError: + terminal_width = 80 + else: + terminal_width = int(tput_output.strip()) + print("โŽฏ" * terminal_width) + + +def log(emoji, message, *, spacing=None): + """Print a notification with an emoji. + + If 'spacing' is None, calculate the spacing based on the number of code points + in the emoji as terminals "eat" a space when the emoji has multiple code points. + """ + if spacing is None: + spacing = " " if len(emoji) == 1 else " " + print("".join([emoji, spacing, message])) + + def updated_env(updates={}): """Create a new dict representing the environment to use. @@ -60,9 +84,10 @@ def updated_env(updates={}): if os.environ.get(key) != value: env_diff[key] = value - print("๐ŸŒŽ Environment changes:") - for key in sorted(env_diff.keys()): - print(f" {key}={env_diff[key]}") + env_vars = ( + f"\n {key}={item}" for key, item in sorted(env_diff.items()) + ) + log("๐ŸŒŽ", f"Environment changes:{''.join(env_vars)}") return environment @@ -77,22 +102,14 @@ def wrapper(context): if callable(working_dir): working_dir = working_dir(context) - try: - tput_output = subprocess.check_output( - ["tput", "cols"], encoding="utf-8" - ) - except subprocess.CalledProcessError: - terminal_width = 80 - else: - terminal_width = int(tput_output.strip()) - print("โŽฏ" * terminal_width) - print("๐Ÿ“", working_dir) + separator() + log("๐Ÿ“", os.fsdecode(working_dir)) if ( clean_ok and getattr(context, "clean", False) and working_dir.exists() ): - print("๐Ÿšฎ Deleting directory (--clean)...") + log("๐Ÿšฎ", "Deleting directory (--clean)...") shutil.rmtree(working_dir) working_dir.mkdir(parents=True, exist_ok=True) @@ -116,7 +133,7 @@ def call(command, *, context=None, quiet=False, logdir=None, **kwargs): elif quiet and logdir is None: raise ValueError("When quiet is True, logdir must be specified") - print("โฏ", " ".join(map(str, command))) + log("โฏ", " ".join(map(str, command)), spacing=" ") if not quiet: stdout = None stderr = None @@ -130,7 +147,7 @@ def call(command, *, context=None, quiet=False, logdir=None, **kwargs): suffix=".log", ) stderr = subprocess.STDOUT - print(f"๐Ÿ“ Logging output to {stdout.name} (--quiet)...") + log("๐Ÿ“", f"Logging output to {stdout.name} (--quiet)...") subprocess.check_call(command, **kwargs, stdout=stdout, stderr=stderr) @@ -163,11 +180,11 @@ def configure_build_python(context, working_dir): """Configure the build/host Python.""" if LOCAL_SETUP.exists(): if LOCAL_SETUP.read_bytes() == LOCAL_SETUP_MARKER: - print(f"๐Ÿ‘ {LOCAL_SETUP} exists ...") + log("๐Ÿ‘", f"{LOCAL_SETUP} exists ...") else: - print(f"โš ๏ธ {LOCAL_SETUP} exists, but has unexpected contents") + log("โš ๏ธ", f"{LOCAL_SETUP} exists, but has unexpected contents") else: - print(f"๐Ÿ“ Creating {LOCAL_SETUP} ...") + log("๐Ÿ“", f"Creating {LOCAL_SETUP} ...") LOCAL_SETUP.write_bytes(LOCAL_SETUP_MARKER) configure = [os.path.relpath(CHECKOUT / "configure", working_dir)] @@ -191,7 +208,7 @@ def make_build_python(context, working_dir): ] version = subprocess.check_output(cmd, encoding="utf-8").strip() - print(f"๐ŸŽ‰ {binary} {version}") + log("๐ŸŽ‰", f"{binary} {version}") def find_wasi_sdk(): @@ -228,9 +245,10 @@ def find_wasi_sdk(): # supported version is a prefix of the found version (e.g. `25` and `2567`). if not found_version.startswith(f"{WASI_SDK_VERSION}."): major_version = found_version.partition(".")[0] - print( - f"โš ๏ธ Found WASI SDK {major_version}, " - f"but WASI SDK {WASI_SDK_VERSION} is the supported version" + log( + "โš ๏ธ", + f" Found WASI SDK {major_version}, " + f"but WASI SDK {WASI_SDK_VERSION} is the supported version", ) return wasi_sdk_path @@ -349,7 +367,7 @@ def configure_wasi_python(context, working_dir): with exec_script.open("w", encoding="utf-8") as file: file.write(f'#!/bin/sh\nexec {host_runner} {python_wasm} "$@"\n') exec_script.chmod(0o755) - print(f"๐Ÿƒโ€โ™€๏ธ Created {exec_script} (--host-runner)... ") + log("๐Ÿƒ", f"Created {exec_script} (--host-runner)... ") sys.stdout.flush() @@ -364,9 +382,10 @@ def make_wasi_python(context, working_dir): exec_script = working_dir / "python.sh" call([exec_script, "--version"], quiet=False) - print( - f"๐ŸŽ‰ Use `{exec_script.relative_to(context.init_dir)}` " - "to run CPython w/ the WASI host specified by --host-runner" + log( + "๐ŸŽ‰", + f"Use `{exec_script.relative_to(context.init_dir)}` " + "to run CPython w/ the WASI host specified by --host-runner", ) @@ -385,12 +404,12 @@ def build_all(context): def clean_contents(context): """Delete all files created by this script.""" if CROSS_BUILD_DIR.exists(): - print(f"๐Ÿงน Deleting {CROSS_BUILD_DIR} ...") + log("๐Ÿงน", f"Deleting {CROSS_BUILD_DIR} ...") shutil.rmtree(CROSS_BUILD_DIR) if LOCAL_SETUP.exists(): if LOCAL_SETUP.read_bytes() == LOCAL_SETUP_MARKER: - print(f"๐Ÿงน Deleting generated {LOCAL_SETUP} ...") + log("๐Ÿงน", f"Deleting generated {LOCAL_SETUP} ...") def main():