Skip to content

Upgrade toolchain #3118

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
texodus merged 1 commit into from
Feb 7, 2026
Merged

Upgrade toolchain #3118

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion .cargo/config.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ bundle = "run -p perspective-bundle"

[build]
# rustflags = ["--cfg=web_sys_unstable_apis", "--cfg=pyo3_disable_reference_pool"]
rustflags = ["--cfg=web_sys_unstable_apis"]
rustflags = ["--cfg=web_sys_unstable_apis", "-Csymbol-mangling-version=v0"]
target-dir = "rust/target"

[target.wasm32-unknown-unknown]
Expand Down
15 changes: 7 additions & 8 deletions .github/actions/install-deps/action.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -116,14 +116,14 @@ runs:
shell: bash
run: echo "MACOSX_DEPLOYMENT_TARGET=$(sw_vers -productVersion)" >> $GITHUB_ENV

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

- name: Set up Python ${{ matrix.python-version }}
uses: actions/setup-python@v5
if: ${{ inputs.python == 'true' && runner.os != 'Linux' }}
if: ${{ inputs.python == 'true' && inputs.manylinux == 'false' }}
with:
python-version: ${{ matrix.python-version }}
cache: "pip"
Expand All @@ -145,23 +145,23 @@ runs:
uses: dtolnay/rust-toolchain@nightly
if: ${{ inputs.rust == 'true' && inputs.arch != 'aarch64' }}
with:
toolchain: nightly-2025-02-01
toolchain: nightly-2026-01-01
targets: wasm32-unknown-unknown
components: rustfmt, clippy, rust-src

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

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

Expand Down Expand Up @@ -199,7 +199,7 @@ runs:
- name: Install Python dependencies
shell: bash
if: ${{ inputs.python == 'true' && inputs.manylinux == 'true' }}
run: /opt/python/cp39-cp39/bin/python -m pip install -r rust/perspective-python/requirements.txt
run: /opt/python/cp311-cp311/bin/python -m pip install -r rust/perspective-python/requirements.txt

- name: manylinux deps
shell: bash
Expand All @@ -225,4 +225,3 @@ runs:
# if: ${{ runner.os == 'Linux' }}
# run: |
# rm -rf /__t/*

40 changes: 20 additions & 20 deletions .github/workflows/build.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ jobs:
os:
- ubuntu-22.04
python-version:
- 3.9
- 3.11
node-version: [22.x]

steps:
Expand Down Expand Up @@ -124,7 +124,7 @@ jobs:
os:
- ubuntu-22.04
python-version:
- 3.9
- 3.11
node-version: [22.x]

steps:
Expand Down Expand Up @@ -192,16 +192,16 @@ jobs:
- aarch64
- x86_64
python-version:
- 3.9
- 3.11
node-version: [22.x]
include:
- os: ubuntu-22.04
arch: x86_64
python-version: 3.9
python-version: 3.11
container: quay.io/pypa/manylinux_2_28_x86_64
- os: ubuntu-22.04-arm
arch: aarch64
python-version: 3.9
python-version: 3.11
container: quay.io/pypa/manylinux_2_28_aarch64
is-release:
- ${{ startsWith(github.ref, 'refs/tags/v') || github.ref_name == 'master' }}
Expand Down Expand Up @@ -394,7 +394,7 @@ jobs:
arch:
- x86_64
python-version:
- 3.9
- 3.11
node-version: [22.x]
steps:
- name: Checkout
Expand Down Expand Up @@ -442,7 +442,7 @@ jobs:
arch:
- x86_64
python-version:
- 3.9
- 3.11
node-version: [22.x]
steps:
- name: Checkout
Expand Down Expand Up @@ -509,7 +509,7 @@ jobs:
- aarch64
- x86_64
python-version:
- 3.9
- 3.11
node-version: [22.x]
is-release:
- ${{ startsWith(github.ref, 'refs/tags/v') || github.ref_name == 'master' }}
Expand Down Expand Up @@ -620,7 +620,7 @@ jobs:
os:
- ubuntu-22.04
python-version:
- 3.9
- 3.11
node-version: [22.x]

steps:
Expand Down Expand Up @@ -672,8 +672,8 @@ jobs:
- x86_64
- aarch64
python-version:
- 3.9
# - 3.12
- 3.11
# - 3.11
node-version: [22.x]
is-release:
- ${{ startsWith(github.ref, 'refs/tags/v') || github.ref_name == 'master' }}
Expand Down Expand Up @@ -733,7 +733,7 @@ jobs:
arch:
- x86_64
python-version:
- 3.9
- 3.11
steps:
- name: Checkout
uses: actions/checkout@v4
Expand Down Expand Up @@ -788,8 +788,8 @@ jobs:
# Maturin got this wrong: the packages should be in .dist-info/licenses/
# Newer versions of Maturin will fix it, so search for either location.
# https://github.com/PyO3/maturin/pull/862 https://github.com/PyO3/maturin/pull/2181
grep -E '.dist-info/(license|license_files)/LICENSE.md' wheel_installed_files.txt
grep -E '.dist-info/(license|license_files)/LICENSE_THIRDPARTY_cargo.yml' wheel_installed_files.txt
grep -E '.dist-info/(licenses|license|license_files)/LICENSE.md' wheel_installed_files.txt
grep -E '.dist-info/(licenses|license|license_files)/LICENSE_THIRDPARTY_cargo.yml' wheel_installed_files.txt

- name: Verify labextension
shell: bash
Expand Down Expand Up @@ -822,7 +822,7 @@ jobs:
fail-fast: false
matrix:
os: [ubuntu-22.04]
python-version: [3.9]
python-version: [3.11]
node-version: [22.x]
arch: [x86_64]
steps:
Expand Down Expand Up @@ -961,27 +961,27 @@ jobs:

- uses: actions/download-artifact@v4
with:
name: perspective-python-dist-aarch64-macos-14-3.9
name: perspective-python-dist-aarch64-macos-14-3.11

- uses: actions/download-artifact@v4
with:
name: perspective-python-dist-aarch64-ubuntu-22.04-arm-3.9
name: perspective-python-dist-aarch64-ubuntu-22.04-arm-3.11

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

- uses: actions/download-artifact@v4
with:
name: perspective-python-dist-x86_64-windows-2022-3.9
name: perspective-python-dist-x86_64-windows-2022-3.11

- uses: actions/download-artifact@v4
with:
name: perspective-python-dist-x86_64-ubuntu-22.04-3.9
name: perspective-python-dist-x86_64-ubuntu-22.04-3.11

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

- uses: actions/download-artifact@v4
with:
Expand Down
Loading
Loading