From 10e308c53c009f2e25ac6f037653015239125c00 Mon Sep 17 00:00:00 2001 From: Hood Chatham Date: Mon, 21 Sep 2026 18:52:53 -0700 Subject: [PATCH 1/2] gh-145177: Update to Emscripten 6.0.10 (#157935) Bump the Emscripten version, and drop the use of -sWASM_BIGINT because it's on by default now and Emscripten has started warning that the setting is deprecated. --- Platforms/emscripten/config.toml | 2 +- configure | 2 -- configure.ac | 3 --- 3 files changed, 1 insertion(+), 6 deletions(-) diff --git a/Platforms/emscripten/config.toml b/Platforms/emscripten/config.toml index 513b5ae25fc497d..45b57e731661298 100644 --- a/Platforms/emscripten/config.toml +++ b/Platforms/emscripten/config.toml @@ -1,7 +1,7 @@ # Any data that can vary between Python versions is to be kept in this file. # This allows for blanket copying of the Emscripten build code between supported # Python versions. -emscripten-version = "6.0.9" +emscripten-version = "6.0.10" node-version = "24" test-args = [ "-m", "test", diff --git a/configure b/configure index 9af81bf7cc67d1d..809885af1cd20d6 100755 --- a/configure +++ b/configure @@ -9974,8 +9974,6 @@ fi as_fn_append LINKFORSHARED " -sALLOW_MEMORY_GROWTH -sINITIAL_MEMORY=20971520" - as_fn_append LDFLAGS_NODIST " -sWASM_BIGINT" - as_fn_append LINKFORSHARED " -sFORCE_FILESYSTEM -lidbfs.js -lnodefs.js -lproxyfs.js -lworkerfs.js" as_fn_append LINKFORSHARED " -sEXPORTED_RUNTIME_METHODS=FS,callMain,ENV,HEAPU32,TTY,ERRNO_CODES" as_fn_append LINKFORSHARED " -sEXPORTED_FUNCTIONS=_main,_Py_Version,_PyGILState_GetThisThreadState,__PyEM_EMSCRIPTEN_TRAMPOLINE_OFFSET" diff --git a/configure.ac b/configure.ac index 92d7c17a6b448ba..8e5377a8f0ac754 100644 --- a/configure.ac +++ b/configure.ac @@ -2434,9 +2434,6 @@ AS_CASE([$ac_sys_system], dnl Start with 20 MB and allow to grow AS_VAR_APPEND([LINKFORSHARED], [" -sALLOW_MEMORY_GROWTH -sINITIAL_MEMORY=20971520"]) - dnl map int64_t and uint64_t to JS bigint - AS_VAR_APPEND([LDFLAGS_NODIST], [" -sWASM_BIGINT"]) - dnl Include file system support AS_VAR_APPEND([LINKFORSHARED], [" -sFORCE_FILESYSTEM -lidbfs.js -lnodefs.js -lproxyfs.js -lworkerfs.js"]) AS_VAR_APPEND([LINKFORSHARED], [" -sEXPORTED_RUNTIME_METHODS=FS,callMain,ENV,HEAPU32,TTY,ERRNO_CODES"]) From d5dede7442ebb4a05cff5309697fb5dcba3d5297 Mon Sep 17 00:00:00 2001 From: Zachary Ware Date: Mon, 21 Sep 2026 21:01:58 -0500 Subject: [PATCH 2/2] Disable inputrc in test_pyrepl basic REPL output test (GH-157827) Specifically, `test_no_newline` would fail if the user's `~/.inputrc` sets `editing-mode vi`, which adds `(ins)` for "insert mode" to the beginning of the prompt. --- Lib/test/test_pyrepl/test_pyrepl.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Lib/test/test_pyrepl/test_pyrepl.py b/Lib/test/test_pyrepl/test_pyrepl.py index 7cc178f19df6f9d..1e0f99f5f97c83a 100644 --- a/Lib/test/test_pyrepl/test_pyrepl.py +++ b/Lib/test/test_pyrepl/test_pyrepl.py @@ -2431,6 +2431,8 @@ def test_no_newline(self): env = os.environ.copy() env.pop("PYTHON_BASIC_REPL", "") env["PYTHON_BASIC_REPL"] = "1" + # Ensure user's .inputrc doesn't interfere with basic REPL output + env["INPUTRC"] = "/dev/null" commands = "print('Something pretty long', end='')\nexit()\n" expected_output_sequence = "Something pretty long>>> exit()"