Skip to content

Commit c0a1eed

Browse files
texodustexodus
committed
WIP
Signed-off-by: Andrew Stein <steinlink@gmail.com>
1 parent 9a14dc5 commit c0a1eed

6 files changed

Lines changed: 32 additions & 33 deletions

File tree

‎.github/actions/install-deps/action.yaml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -116,14 +116,14 @@ runs:
116116
shell: bash
117117
run: echo "MACOSX_DEPLOYMENT_TARGET=$(sw_vers -productVersion)" >> $GITHUB_ENV
118118

119-
# Use python 3.9 from manylinu
120-
- run: echo "/opt/python/cp39-cp39/bin" >> $GITHUB_PATH
119+
# Use python 3.12 from manylinu
120+
- run: echo "/opt/python/cp311-cp311/bin" >> $GITHUB_PATH
121121
shell: bash
122122
if: ${{ runner.os == 'Linux' }}
123123

124124
- name: Set up Python ${{ matrix.python-version }}
125125
uses: actions/setup-python@v5
126-
if: ${{ inputs.python == 'true' && runner.os != 'Linux' }}
126+
if: ${{ inputs.python == 'true' && runner.manylinux == 'false' }}
127127
with:
128128
python-version: ${{ matrix.python-version }}
129129
cache: "pip"
@@ -199,7 +199,7 @@ runs:
199199
- name: Install Python dependencies
200200
shell: bash
201201
if: ${{ inputs.python == 'true' && inputs.manylinux == 'true' }}
202-
run: /opt/python/cp39-cp39/bin/python -m pip install -r rust/perspective-python/requirements.txt
202+
run: /opt/python/cp311-cp311/bin/python -m pip install -r rust/perspective-python/requirements.txt
203203

204204
- name: manylinux deps
205205
shell: bash

‎.github/workflows/build.yaml‎

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ jobs:
7272
os:
7373
- ubuntu-22.04
7474
python-version:
75-
- 3.12
75+
- 3.11
7676
node-version: [22.x]
7777

7878
steps:
@@ -124,7 +124,7 @@ jobs:
124124
os:
125125
- ubuntu-22.04
126126
python-version:
127-
- 3.12
127+
- 3.11
128128
node-version: [22.x]
129129

130130
steps:
@@ -192,16 +192,16 @@ jobs:
192192
- aarch64
193193
- x86_64
194194
python-version:
195-
- 3.12
195+
- 3.11
196196
node-version: [22.x]
197197
include:
198198
- os: ubuntu-22.04
199199
arch: x86_64
200-
python-version: 3.12
200+
python-version: 3.11
201201
container: quay.io/pypa/manylinux_2_28_x86_64
202202
- os: ubuntu-22.04-arm
203203
arch: aarch64
204-
python-version: 3.12
204+
python-version: 3.11
205205
container: quay.io/pypa/manylinux_2_28_aarch64
206206
is-release:
207207
- ${{ startsWith(github.ref, 'refs/tags/v') || github.ref_name == 'master' }}
@@ -394,7 +394,7 @@ jobs:
394394
arch:
395395
- x86_64
396396
python-version:
397-
- 3.12
397+
- 3.11
398398
node-version: [22.x]
399399
steps:
400400
- name: Checkout
@@ -442,7 +442,7 @@ jobs:
442442
arch:
443443
- x86_64
444444
python-version:
445-
- 3.12
445+
- 3.11
446446
node-version: [22.x]
447447
steps:
448448
- name: Checkout
@@ -509,7 +509,7 @@ jobs:
509509
- aarch64
510510
- x86_64
511511
python-version:
512-
- 3.12
512+
- 3.11
513513
node-version: [22.x]
514514
is-release:
515515
- ${{ startsWith(github.ref, 'refs/tags/v') || github.ref_name == 'master' }}
@@ -620,7 +620,7 @@ jobs:
620620
os:
621621
- ubuntu-22.04
622622
python-version:
623-
- 3.12
623+
- 3.11
624624
node-version: [22.x]
625625

626626
steps:
@@ -672,8 +672,8 @@ jobs:
672672
- x86_64
673673
- aarch64
674674
python-version:
675-
- 3.12
676-
# - 3.12
675+
- 3.11
676+
# - 3.11
677677
node-version: [22.x]
678678
is-release:
679679
- ${{ startsWith(github.ref, 'refs/tags/v') || github.ref_name == 'master' }}
@@ -733,7 +733,7 @@ jobs:
733733
arch:
734734
- x86_64
735735
python-version:
736-
- 3.12
736+
- 3.11
737737
steps:
738738
- name: Checkout
739739
uses: actions/checkout@v4
@@ -822,7 +822,7 @@ jobs:
822822
fail-fast: false
823823
matrix:
824824
os: [ubuntu-22.04]
825-
python-version: [3.12]
825+
python-version: [3.11]
826826
node-version: [22.x]
827827
arch: [x86_64]
828828
steps:
@@ -961,27 +961,27 @@ jobs:
961961

962962
- uses: actions/download-artifact@v4
963963
with:
964-
name: perspective-python-dist-aarch64-macos-14-3.12
964+
name: perspective-python-dist-aarch64-macos-14-3.11
965965

966966
- uses: actions/download-artifact@v4
967967
with:
968-
name: perspective-python-dist-aarch64-ubuntu-22.04-arm-3.12
968+
name: perspective-python-dist-aarch64-ubuntu-22.04-arm-3.11
969969

970970
# - uses: actions/download-artifact@v4
971971
# with:
972972
# name: perspective-python-dist-x86_64-macos-14-3.9
973973

974974
- uses: actions/download-artifact@v4
975975
with:
976-
name: perspective-python-dist-x86_64-windows-2022-3.12
976+
name: perspective-python-dist-x86_64-windows-2022-3.11
977977

978978
- uses: actions/download-artifact@v4
979979
with:
980-
name: perspective-python-dist-x86_64-ubuntu-22.04-3.12
980+
name: perspective-python-dist-x86_64-ubuntu-22.04-3.11
981981

982982
- uses: actions/download-artifact@v4
983983
with:
984-
name: perspective-python-dist-wasm32-emscripten-3.12
984+
name: perspective-python-dist-wasm32-emscripten-3.11
985985

986986
- uses: actions/download-artifact@v4
987987
with:

‎package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
"type": "module",
1616
"emscripten": "4.0.9",
1717
"llvm": "17.0.6",
18-
"pyodide": "0.28.3",
18+
"pyodide": "0.29.3",
1919
"engines": {
2020
"node": ">=16 <23"
2121
},

‎rust/perspective-python/Cargo.toml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ rustdoc-args = ["--html-in-header", "docs/index.html"]
4242

4343
[features]
4444
default = []
45-
abi3 = ["pyo3/abi3-py312"]
45+
abi3 = ["pyo3/abi3-py311"]
4646
external-cpp = ["perspective-server/external-cpp"]
4747
generate-proto = ["perspective-client/generate-proto"]
4848
protobuf-src = ["perspective-client/protobuf-src"]

‎rust/perspective-server/cpp/perspective/CMakeLists.txt‎

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -210,6 +210,10 @@ if(NOT DEFINED PSP_WASM_EXCEPTIONS AND NOT PSP_PYTHON_BUILD)
210210
set(PSP_WASM_EXCEPTIONS ON)
211211
endif()
212212

213+
if(PSP_PYODIDE)
214+
set(PSP_WASM_EXCEPTIONS ON)
215+
endif()
216+
213217
set(DEBUG_LEVEL "0")
214218
if(PSP_HEAP_INSTRUMENTS)
215219
set(DEBUG_LEVEL "3")
@@ -351,16 +355,11 @@ if(PSP_PYODIDE)
351355
string(APPEND CMAKE_EXE_LINKER_FLAGS "${RELOCATABLE_FLAGS} -sWASM_BIGINT=1 ")
352356
string(APPEND CMAKE_C_FLAGS "${RELOCATABLE_FLAGS}")
353357
string(APPEND CMAKE_CXX_FLAGS "${RELOCATABLE_FLAGS}")
354-
endif()
355-
356-
if(PSP_PYODIDE)
357358
string(APPEND CMAKE_CXX_FLAGS " -fvisibility=hidden")
358-
endif()
359359

360-
# if (PSP_PYODIDE AND NOT PSP_WASM_EXCEPTIONS)
361-
# # Emscripten exceptions
362-
# string(APPEND CMAKE_CXX_FLAGS " -fexceptions")
363-
# endif()
360+
# Emscripten exceptions
361+
string(APPEND CMAKE_CXX_FLAGS " -fexceptions")
362+
endif()
364363

365364
# Build (read: download and extract) header-only dependencies from external sources
366365
set(all_deps_INCLUDE_DIRS "")

‎tools/scripts/workspace.mjs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ export function getRustWheelsDir() {
3939
}
4040
export function getEmscriptenWheelPath() {
4141
const pspVersion = getWorkspacePackageJson().version.replace("-", ".");
42-
const wheeljunk = "cp39-abi3-emscripten_4_0_9_wasm32";
42+
const wheeljunk = "cp311-abi3-emscripten_4_0_9_wasm32";
4343
return path.join(
4444
rustWheelsDir,
4545
`perspective_python-${pspVersion}-${wheeljunk}.whl`,

0 commit comments

Comments
 (0)