Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
10 changes: 5 additions & 5 deletions .github/workflows/build.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -511,7 +511,7 @@ jobs:
arch:
- x86_64
python-version:
- "3.13"
- "3.14"
node-version: [22.x]
steps:
- name: Checkout
Expand Down Expand Up @@ -578,8 +578,8 @@ jobs:
for w in "${wheels[@]}"; do
echo "checking $w"
case "$w" in
*pyemscripten_2025_0_wasm32.whl) ;;
*) echo "::error::$w is not tagged pyemscripten_2025_0_wasm32"; exit 1 ;;
*pyemscripten_2026_0_wasm32.whl) ;;
*) echo "::error::$w is not tagged pyemscripten_2026_0_wasm32"; exit 1 ;;
esac
unzip -l "$w" | grep 'perspective/widget/static/perspective-anywidget.js' \
|| { echo "::error::$w is missing the anywidget JS bundle"; exit 1; }
Expand All @@ -605,7 +605,7 @@ jobs:
arch:
- x86_64
python-version:
- "3.13"
- "3.14"
node-version: [22.x]
steps:
- name: Checkout
Expand Down Expand Up @@ -1240,7 +1240,7 @@ jobs:

- uses: actions/download-artifact@v4
with:
name: perspective-python-dist-wasm32-emscripten-3.13
name: perspective-python-dist-wasm32-emscripten-3.14

- uses: actions/download-artifact@v4
with:
Expand Down
4 changes: 2 additions & 2 deletions DEVELOPMENT.md
Original file line number Diff line number Diff line change
Expand Up @@ -138,10 +138,10 @@ Deviating from this specific version of Emscripten specified in the project's
`package.json` can introduce various errors that are extremely difficult to
debug.

To install a specific version of Emscripten (e.g. `4.0.9`):
To install a specific version of Emscripten (e.g. `5.0.3`):

```bash
./emsdk install 4.0.9
./emsdk install 5.0.3
```

Set `PSP_SKIP_EMSDK_INSTALL=1` to prevent `pnpm install` from downloading the
Expand Down
4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,10 @@
}
},
"type": "module",
"emscripten": "4.0.9",
"emscripten": "5.0.3",
"binaryen": "version_132",
"llvm": "17.0.6",
"pyodide": "0.29.4",
"pyodide": "314.0.7",
"engines": {
"node": ">=16 <27"
},
Expand Down
4 changes: 2 additions & 2 deletions rust/perspective-python/build.mjs
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ if (!!process.env.PSP_DEBUG) {
const is_pyodide = !!process.env.PSP_PYODIDE;

const python_version =
process.env.PSP_PYTHON_VERSION || (is_pyodide ? "3.13" : "3.12");
process.env.PSP_PYTHON_VERSION || (is_pyodide ? "3.14" : "3.12");

const version = pkg.version;

Expand All @@ -50,7 +50,7 @@ if (is_pyodide) {
);
emsdk_prefix = `cd ${emsdkdir} && . ./emsdk_env.sh && ./emsdk activate ${emscripten} && cd ${cwd} && `;
env.MATURIN_PYEMSCRIPTEN_PLATFORM_VERSION =
process.env.MATURIN_PYEMSCRIPTEN_PLATFORM_VERSION || "2025_0";
process.env.MATURIN_PYEMSCRIPTEN_PLATFORM_VERSION || "2026_0";
}

// if not windows
Expand Down
1 change: 1 addition & 0 deletions rust/perspective-python/pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,7 @@ classifiers = [
"Programming Language :: Python :: 3.11",
"Programming Language :: Python :: 3.12",
"Programming Language :: Python :: 3.13",
"Programming Language :: Python :: 3.14",
"Framework :: Jupyter",
"Framework :: Jupyter :: JupyterLab",
"Framework :: Jupyter :: JupyterLab :: 3",
Expand Down
2 changes: 1 addition & 1 deletion rust/perspective-server/cpp/perspective/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -369,7 +369,7 @@ endif()
set(RAPIDJSON_BUILD_TESTS OFF CACHE BOOL "Disable rapidjson tests")

if(PSP_PYODIDE)
set(RELOCATABLE_FLAGS " -sRELOCATABLE=1 -sSIDE_MODULE=2 -fwasm-exceptions -sSUPPORT_LONGJMP=wasm \ ")
set(RELOCATABLE_FLAGS " -sSIDE_MODULE=2 -fwasm-exceptions -sSUPPORT_LONGJMP=wasm \ ")
string(APPEND CMAKE_EXE_LINKER_FLAGS "${RELOCATABLE_FLAGS} -sWASM_BIGINT=1 ")
string(APPEND CMAKE_C_FLAGS "${RELOCATABLE_FLAGS}")
string(APPEND CMAKE_CXX_FLAGS "${RELOCATABLE_FLAGS}")
Expand Down
2 changes: 1 addition & 1 deletion tools/scripts/workspace.mjs
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ export function getRustWheelsDir() {

export function getEmscriptenWheelPath() {
const pspVersion = getWorkspacePackageJson().version.replace("-", ".");
const wheeljunk = "cp311-abi3-pyemscripten_2025_0_wasm32";
const wheeljunk = "cp311-abi3-pyemscripten_2026_0_wasm32";
return path.join(
rustWheelsDir,
`perspective_python-${pspVersion}-${wheeljunk}.whl`,
Expand Down
Loading