fastquadtree 2.4.1__tar.gz → 2.4.2__tar.gz

{fastquadtree-2.4.1 → fastquadtree-2.4.2}/.github/workflows/release.yml

@@ -100,49 +100,61 @@ jobs:
           path: dist/*
 
   build_pyodide:
-    name: Build Pyodide wheel
+    name: Build Pyodide wheels
     needs: test
     runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        include:
+          - label: pyodide-2025
+            python_version: "3.13"
+            xbuildenv_channel: "nightly"
+            xbuildenv_version: "20260401"
+            emscripten_version: "4.0.9"
+            wheel_glob: "fastquadtree-*-cp39-abi3-pyemscripten_2025_0_wasm32.whl"
+          - label: pyodide-2026
+            python_version: "3.14"
+            xbuildenv_channel: "stable"
+            xbuildenv_version: "314.0.0"
+            emscripten_version: "5.0.3"
+            wheel_glob: "fastquadtree-*-cp39-abi3-pyemscripten_2026_0_wasm32.whl"
     steps:
       - uses: actions/checkout@v6
 
       - name: Set up Python
         uses: actions/setup-python@v6
         with:
-          python-version: "3.13"
-
-      - name: Set up Node
-        uses: actions/setup-node@v4
-        with:
-          node-version: "24"
+          python-version: ${{ matrix.python_version }}
 
       - name: Install uv
         uses: astral-sh/setup-uv@v8.1.0
         with:
           enable-cache: true
 
-      - name: Install pyodide CLI
-        run: uv tool install pyodide-cli --with pyodide-build
-
       - name: Cache Pyodide cross-build environment
         uses: actions/cache@v4
         with:
-          path: ~/.cache/fastquadtree-pyodide
-          key: pyodide-xbuildenv-${{ runner.os }}-20260401-1.93.0
+          path: ~/.cache/fastquadtree-${{ matrix.label }}
+          key: pyodide-xbuildenv-${{ runner.os }}-${{ matrix.label }}-${{ matrix.xbuildenv_version }}-${{ matrix.emscripten_version }}-rust-1.93.0
 
       - name: Build Pyodide wheel
         env:
-          PYODIDE_XBUILDENV_ROOT: ~/.cache/fastquadtree-pyodide
-          PYODIDE_ENV_VERSION: "20260401"
+          PYODIDE_HOST_PYTHON: ${{ matrix.python_version }}
+          PYODIDE_XBUILDENV_ROOT: ~/.cache/fastquadtree-${{ matrix.label }}
+          PYODIDE_XBUILDENV_CHANNEL: ${{ matrix.xbuildenv_channel }}
+          PYODIDE_XBUILDENV_VERSION: ${{ matrix.xbuildenv_version }}
+          PYODIDE_EMSCRIPTEN_VERSION: ${{ matrix.emscripten_version }}
           RUST_TOOLCHAIN: "1.93.0"
           UV_CACHE_DIR: ~/.cache/uv
+          PYODIDE_EXPECTED_WHEEL_GLOB: ${{ matrix.wheel_glob }}
         run: bash scripts/build_pyodide_wheel.sh
 
       - name: Upload Pyodide dist artifact
         uses: actions/upload-artifact@v7
         with:
-          name: dist-pyodide
-          path: dist/*pyemscripten*_wasm32.whl
+          name: dist-${{ matrix.label }}
+          path: dist/${{ matrix.wheel_glob }}
 
   publish:
     name: Publish distributions to PyPI

{fastquadtree-2.4.1 → fastquadtree-2.4.2}/.gitignore

@@ -219,4 +219,5 @@ __marimo__/
 *.lock
 
 # pyodide
-.pyodide*
+.pyodide*
+.venv-pyodide/

{fastquadtree-2.4.1 → fastquadtree-2.4.2}/Cargo.lock

@@ -44,7 +44,7 @@ dependencies = [
 
 [[package]]
 name = "fastquadtree"
-version = "2.4.1"
+version = "2.4.2"
 dependencies = [
  "num-traits",
  "numpy",

{fastquadtree-2.4.1 → fastquadtree-2.4.2}/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "fastquadtree"
-version = "2.4.1"
+version = "2.4.2"
 edition = "2021"
 rust-version = "1.89"
 readme = "README.md"

{fastquadtree-2.4.1 → fastquadtree-2.4.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: fastquadtree
-Version: 2.4.1
+Version: 2.4.2
 Classifier: Programming Language :: Python :: 3
 Classifier: Programming Language :: Python :: 3 :: Only
 Classifier: Programming Language :: Python :: 3.9

fastquadtree-2.4.2/scripts/build_pyodide_wheel.sh

@@ -0,0 +1,77 @@
+#!/usr/bin/env bash
+set -euo pipefail
+
+PROJECT_ROOT="$(cd "$(dirname "${BASH_SOURCE[0]}")/.." && pwd)"
+PYODIDE_HOST_PYTHON="${PYODIDE_HOST_PYTHON:-3.13}"
+PYODIDE_XBUILDENV_VERSION="${PYODIDE_XBUILDENV_VERSION:-20260401}"
+PYODIDE_XBUILDENV_CHANNEL="${PYODIDE_XBUILDENV_CHANNEL:-nightly}"
+PYODIDE_EMSCRIPTEN_VERSION="${PYODIDE_EMSCRIPTEN_VERSION:-4.0.9}"
+PYODIDE_XBUILDENV_ROOT="${PYODIDE_XBUILDENV_ROOT:-${XDG_CACHE_HOME:-$HOME/.cache}/fastquadtree-pyodide}"
+RUST_TOOLCHAIN="${RUST_TOOLCHAIN:-1.93.0}"
+UV_CACHE_DIR="${UV_CACHE_DIR:-${XDG_CACHE_HOME:-$HOME/.cache}/uv}"
+PYODIDE_EXPECTED_WHEEL_GLOB="${PYODIDE_EXPECTED_WHEEL_GLOB:-fastquadtree-*-cp39-abi3-pyemscripten_2025_0_wasm32.whl}"
+
+need_cmd() {
+    if ! command -v "$1" >/dev/null 2>&1; then
+        printf 'Missing required command: %s\n' "$1" >&2
+        exit 1
+    fi
+}
+
+need_cmd uv
+need_cmd rustup
+
+printf 'Using Pyodide xbuildenv root: %s\n' "$PYODIDE_XBUILDENV_ROOT"
+printf 'Using Pyodide host Python: %s\n' "$PYODIDE_HOST_PYTHON"
+printf 'Using Pyodide xbuildenv channel: %s\n' "$PYODIDE_XBUILDENV_CHANNEL"
+printf 'Using Pyodide xbuildenv version: %s\n' "$PYODIDE_XBUILDENV_VERSION"
+printf 'Using Emscripten version: %s\n' "$PYODIDE_EMSCRIPTEN_VERSION"
+printf 'Using Rust toolchain: %s\n' "$RUST_TOOLCHAIN"
+
+install_args=(
+    xbuildenv
+    install
+    "$PYODIDE_XBUILDENV_VERSION"
+    --path
+    "$PYODIDE_XBUILDENV_ROOT"
+)
+if [ "$PYODIDE_XBUILDENV_CHANNEL" = "nightly" ]; then
+    install_args+=(--nightly)
+fi
+
+uv run --python "$PYODIDE_HOST_PYTHON" --with pyodide-build pyodide "${install_args[@]}"
+uv run --python "$PYODIDE_HOST_PYTHON" --with pyodide-build pyodide \
+    xbuildenv install-emscripten \
+    --version "$PYODIDE_EMSCRIPTEN_VERSION" \
+    --path "$PYODIDE_XBUILDENV_ROOT"
+
+rustup toolchain install "$RUST_TOOLCHAIN"
+rustup target add wasm32-unknown-emscripten --toolchain "$RUST_TOOLCHAIN"
+
+EMSDK_ENV="$PYODIDE_XBUILDENV_ROOT/$PYODIDE_XBUILDENV_VERSION/emsdk/emsdk_env.sh"
+if [ ! -f "$EMSDK_ENV" ]; then
+    printf 'Expected emsdk activation script at %s\n' "$EMSDK_ENV" >&2
+    exit 1
+fi
+
+# shellcheck source=/dev/null
+source "$EMSDK_ENV" >/dev/null 2>&1
+
+export PYODIDE_XBUILDENV_PATH="$PYODIDE_XBUILDENV_ROOT"
+export RUSTUP_TOOLCHAIN="$RUST_TOOLCHAIN"
+export UV_CACHE_DIR
+
+cd "$PROJECT_ROOT"
+mkdir -p dist
+rm -f dist/fastquadtree-*-pyemscripten_*_wasm32.whl
+uv run --python "$PYODIDE_HOST_PYTHON" --with pyodide-build pyodide build . --outdir dist
+
+printf '\nBuilt wheel:\n'
+shopt -s nullglob
+matches=("$PROJECT_ROOT"/dist/$PYODIDE_EXPECTED_WHEEL_GLOB)
+if [ "${#matches[@]}" -eq 0 ]; then
+    printf 'No wheel matching expected Pyodide target was produced: %s\n' \
+        "$PYODIDE_EXPECTED_WHEEL_GLOB" >&2
+    exit 1
+fi
+printf '%s\n' "${matches[@]}" | sort

fastquadtree-2.4.1/scripts/build_pyodide_wheel.sh

@@ -1,49 +0,0 @@
-#!/usr/bin/env bash
-set -euo pipefail
-
-PROJECT_ROOT="$(cd "$(dirname "${BASH_SOURCE[0]}")/.." && pwd)"
-PYODIDE_ENV_VERSION="${PYODIDE_ENV_VERSION:-20260401}"
-PYODIDE_XBUILDENV_ROOT="${PYODIDE_XBUILDENV_ROOT:-${XDG_CACHE_HOME:-$HOME/.cache}/fastquadtree-pyodide}"
-RUST_TOOLCHAIN="${RUST_TOOLCHAIN:-1.93.0}"
-UV_CACHE_DIR="${UV_CACHE_DIR:-${XDG_CACHE_HOME:-$HOME/.cache}/uv}"
-
-need_cmd() {
-    if ! command -v "$1" >/dev/null 2>&1; then
-        printf 'Missing required command: %s\n' "$1" >&2
-        exit 1
-    fi
-}
-
-need_cmd pyodide
-need_cmd rustup
-
-printf 'Using Pyodide xbuildenv root: %s\n' "$PYODIDE_XBUILDENV_ROOT"
-printf 'Using Pyodide nightly env: %s\n' "$PYODIDE_ENV_VERSION"
-printf 'Using Rust toolchain: %s\n' "$RUST_TOOLCHAIN"
-
-if [ ! -d "$PYODIDE_XBUILDENV_ROOT/$PYODIDE_ENV_VERSION" ]; then
-    pyodide xbuildenv install "$PYODIDE_ENV_VERSION" --nightly --path "$PYODIDE_XBUILDENV_ROOT"
-fi
-
-pyodide xbuildenv install-emscripten --path "$PYODIDE_XBUILDENV_ROOT"
-rustup toolchain install "$RUST_TOOLCHAIN"
-rustup target add wasm32-unknown-emscripten --toolchain "$RUST_TOOLCHAIN"
-
-EMSDK_ENV="$PYODIDE_XBUILDENV_ROOT/$PYODIDE_ENV_VERSION/emsdk/emsdk_env.sh"
-if [ ! -f "$EMSDK_ENV" ]; then
-    printf 'Expected emsdk activation script at %s\n' "$EMSDK_ENV" >&2
-    exit 1
-fi
-
-# shellcheck source=/dev/null
-source "$EMSDK_ENV" >/dev/null 2>&1
-
-export PYODIDE_XBUILDENV_PATH="$PYODIDE_XBUILDENV_ROOT"
-export RUSTUP_TOOLCHAIN="$RUST_TOOLCHAIN"
-export UV_CACHE_DIR
-
-cd "$PROJECT_ROOT"
-pyodide build .
-
-printf '\nBuilt wheel:\n'
-find "$PROJECT_ROOT/dist" -maxdepth 1 -type f -name 'fastquadtree-*-pyemscripten_*_wasm32.whl' -print | sort