Merge branch 'more-typescript-types' into nodylink-build

src/core/pyproxy.ts

@@ -18,7 +18,7 @@ declare var Tests: any;
 declare var Module: any;
 declare var Hiwire: any;
 
-import "lib";
+import {TypedArray} from "lib";
 import { warnOnce } from "pyodide_util";
 
 // pyodide-skip

src/js/api.ts

@@ -12,6 +12,7 @@ import { version } from "./version";
 import "./error_handling.gen.js";
 import { setStdin, setStdout, setStderr } from "./streams";
 import { makeWarnOnce } from "./pyodide_util";
+import { TypedArray } from "./lib";
 
 API.loadBinaryFile = loadBinaryFile;
 

src/js/ffi.ts

@@ -19,7 +19,7 @@ export type {
   PyMutableSequence,
 } from "./pyproxy.gen";
 
-export type { TypedArray };
+export type { TypedArray } from "./lib";
 
 export type { PythonError } from "./error_handling.gen";
 

src/js/lib.ts

@@ -5,19 +5,20 @@ import { type ConfigType } from "./pyodide";
 import { type InFuncType } from "./streams";
 import { type PackageData } from "./load-package";
 
+export type TypedArray =
+| Int8Array
+| Uint8Array
+| Int16Array
+| Uint16Array
+| Int32Array
+| Uint32Array
+| Uint8ClampedArray
+| Float32Array
+| Float64Array;
+
 declare global {
   export var Module: Module;
   export var API: API;
-  export type TypedArray =
-    | Int8Array
-    | Uint8Array
-    | Int16Array
-    | Uint16Array
-    | Int32Array
-    | Uint32Array
-    | Uint8ClampedArray
-    | Float32Array
-    | Float64Array;
 }
 
 // Emscripten runtime methods

src/js/pyodide.ts

@@ -9,6 +9,7 @@ import { version } from "./version";
 
 import type { PyodideInterface } from "./api.js";
 import type { PyProxy, PyDict } from "./pyproxy.gen";
+import type { TypedArray } from "./lib";
 export type { PyodideInterface, TypedArray };
 
 export type {

src/tests/test_core_python.py

@@ -95,6 +95,6 @@ def pytest_generate_tests(metafunc):
         tests = get_tests()
         metafunc.parametrize(
             "main_test",
-            pytest.param(tests, marks=pytest.mark.requires_dynamic_linking),
+            [pytest.param(t, marks=pytest.mark.requires_dynamic_linking) for t in tests],
             ids=[t[0] for t in tests],
         )