Skip to content

Commit 9d2eba5

Browse files
texodustexodus
committed
Upgrade rust toolchain, maturin, emscripten, Python min version to 3.11
Signed-off-by: Andrew Stein <steinlink@gmail.com>
1 parent b5f3732 commit 9d2eba5

31 files changed

Lines changed: 285 additions & 389 deletions

File tree

‎.cargo/config.toml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ bundle = "run -p perspective-bundle"
33

44
[build]
55
# rustflags = ["--cfg=web_sys_unstable_apis", "--cfg=pyo3_disable_reference_pool"]
6-
rustflags = ["--cfg=web_sys_unstable_apis"]
6+
rustflags = ["--cfg=web_sys_unstable_apis", "-Csymbol-mangling-version=v0"]
77
target-dir = "rust/target"
88

99
[target.wasm32-unknown-unknown]

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

Lines changed: 7 additions & 8 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' && inputs.manylinux == 'false' }}
127127
with:
128128
python-version: ${{ matrix.python-version }}
129129
cache: "pip"
@@ -145,23 +145,23 @@ runs:
145145
uses: dtolnay/rust-toolchain@nightly
146146
if: ${{ inputs.rust == 'true' && inputs.arch != 'aarch64' }}
147147
with:
148-
toolchain: nightly-2025-02-01
148+
toolchain: nightly-2026-01-01
149149
targets: wasm32-unknown-unknown
150150
components: rustfmt, clippy, rust-src
151151

152152
- name: Install rust (aarch64 OSX)
153153
uses: dtolnay/rust-toolchain@nightly
154154
if: ${{ inputs.rust == 'true' && inputs.arch == 'aarch64' && runner.os == 'macOS' }}
155155
with:
156-
toolchain: nightly-2025-02-01
156+
toolchain: nightly-2026-01-01
157157
targets: aarch64-apple-darwin
158158
components: rust-src
159159

160160
- name: Install rust (aarch64 Linux)
161161
uses: dtolnay/rust-toolchain@nightly
162162
if: ${{ inputs.rust == 'true' && inputs.arch == 'aarch64' && runner.os == 'Linux' }}
163163
with:
164-
toolchain: nightly-2025-02-01
164+
toolchain: nightly-2026-01-01
165165
targets: aarch64-unknown-linux-gnu
166166
components: rust-src
167167

@@ -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
@@ -225,4 +225,3 @@ runs:
225225
# if: ${{ runner.os == 'Linux' }}
226226
# run: |
227227
# rm -rf /__t/*
228-

‎.github/workflows/build.yaml‎

Lines changed: 20 additions & 20 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.9
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.9
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.9
195+
- 3.11
196196
node-version: [22.x]
197197
include:
198198
- os: ubuntu-22.04
199199
arch: x86_64
200-
python-version: 3.9
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.9
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.9
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.9
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.9
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.9
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.9
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.9
736+
- 3.11
737737
steps:
738738
- name: Checkout
739739
uses: actions/checkout@v4
@@ -788,8 +788,8 @@ jobs:
788788
# Maturin got this wrong: the packages should be in .dist-info/licenses/
789789
# Newer versions of Maturin will fix it, so search for either location.
790790
# https://github.com/PyO3/maturin/pull/862 https://github.com/PyO3/maturin/pull/2181
791-
grep -E '.dist-info/(license|license_files)/LICENSE.md' wheel_installed_files.txt
792-
grep -E '.dist-info/(license|license_files)/LICENSE_THIRDPARTY_cargo.yml' wheel_installed_files.txt
791+
grep -E '.dist-info/(licenses|license|license_files)/LICENSE.md' wheel_installed_files.txt
792+
grep -E '.dist-info/(licenses|license|license_files)/LICENSE_THIRDPARTY_cargo.yml' wheel_installed_files.txt
793793
794794
- name: Verify labextension
795795
shell: bash
@@ -822,7 +822,7 @@ jobs:
822822
fail-fast: false
823823
matrix:
824824
os: [ubuntu-22.04]
825-
python-version: [3.9]
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.9
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.9
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.9
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.9
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.9
984+
name: perspective-python-dist-wasm32-emscripten-3.11
985985

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

0 commit comments

Comments
 (0)