Skip to content
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

chore(deps): update dependency jupyterlite-core to >=0.3,<0.6 #10663

Merged
merged 2 commits into from
Jan 16, 2025
Merged

chore(deps): update dependency jupyterlite-core to >=0.3,<0.6 #10663

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
39e0a42
chore(deps): update dependency jupyterlite-core to >=0.3,<0.6
renovate[bot] Jan 10, 2025
4259e92
chore(deps): bump pyodide and docs build
cpcloud Jan 14, 2025
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 .github/workflows/docs-preview.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ jobs:
path: docs/**/.jupyter_cache

- name: build docs
run: nix develop '.#ibis311' --ignore-environment --keep HOME -c just docs-build-all
run: nix develop '.#ibis312' --ignore-environment --keep HOME -c just docs-build-all

- name: install netlify cli
run: npm install -g netlify-cli
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/ibis-docs-main.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ jobs:
- name: run doctests
# keep HOME because duckdb (which we use for doctests) wants to use
# that for extensions
run: nix develop '.#ibis311' --ignore-environment --keep HOME --keep HYPOTHESIS_PROFILE -c just doctest
run: nix develop '.#ibis312' --ignore-environment --keep HOME --keep HYPOTHESIS_PROFILE -c just doctest

build:
runs-on: ubuntu-latest
Expand Down Expand Up @@ -69,10 +69,10 @@ jobs:
path: docs/**/.jupyter_cache

- name: build api docs
run: nix develop '.#ibis311' --ignore-environment -c just docs-apigen --verbose
run: nix develop '.#ibis312' --ignore-environment -c just docs-apigen --verbose

- name: build docs
run: nix develop '.#ibis311' --ignore-environment --keep HOME -c just docs-render
run: nix develop '.#ibis312' --ignore-environment --keep HOME -c just docs-render

- name: cache rendered notebooks
uses: actions/cache/save@v4
Expand All @@ -81,7 +81,7 @@ jobs:
path: docs/**/.jupyter_cache

- name: build jupyterlite
run: nix develop '.#ibis311' --ignore-environment --keep HOME -c just build-jupyterlite
run: nix develop '.#ibis312' --ignore-environment --keep HOME -c just build-jupyterlite

- name: check that all frozen computations were done before push
run: git diff --exit-code --stat
Expand Down
10 changes: 5 additions & 5 deletions .github/workflows/ibis-docs-pr.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ jobs:
- name: run doctests
# keep HOME because duckdb (which we use for doctests) wants to use
# that for extensions
run: nix develop '.#ibis311' --ignore-environment --keep HOME --keep HYPOTHESIS_PROFILE -c just doctest
run: nix develop '.#ibis312' --ignore-environment --keep HOME --keep HYPOTHESIS_PROFILE -c just doctest

check:
runs-on: ubuntu-latest
Expand All @@ -61,7 +61,7 @@ jobs:
uses: actions/checkout@v4

- name: run quarto check
run: nix develop '.#ibis311' --ignore-environment --keep HOME -c quarto check
run: nix develop '.#ibis312' --ignore-environment --keep HOME -c quarto check

build:
runs-on: ubuntu-latest
Expand Down Expand Up @@ -89,13 +89,13 @@ jobs:
path: docs/**/.jupyter_cache

- name: generate api docs
run: nix develop '.#ibis311' --ignore-environment -c just docs-apigen --verbose
run: nix develop '.#ibis312' --ignore-environment -c just docs-apigen --verbose

- name: build docs
run: nix develop '.#ibis311' --ignore-environment --keep HOME -c just docs-render
run: nix develop '.#ibis312' --ignore-environment --keep HOME -c just docs-render

- name: build jupyterlite
run: nix develop '.#ibis311' --ignore-environment --keep HOME -c just build-jupyterlite
run: nix develop '.#ibis312' --ignore-environment --keep HOME -c just build-jupyterlite

- name: check that all frozen computations were done before push
run: git diff --exit-code --stat
Expand Down
2 changes: 1 addition & 1 deletion .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -151,7 +151,7 @@ docs/**/*.html

# jupyterlite stuff
.jupyterlite.doit.db
docs/jupyter_lite_config.json
jupyter_lite_config.json
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This had to be moved up otherwise, jupyterlite wouldn't pick up the config.

*.quarto_ipynb

# pixi environments
Expand Down
16 changes: 16 additions & 0 deletions docs/_freeze/posts/classification-metrics-on-the-backend/index/execute-results/html.json
View file
Open in desktop

Large diffs are not rendered by default.

Binary file added ...sts/classification-metrics-on-the-backend/index/figure-html/cell-5-output-1.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
12 changes: 5 additions & 7 deletions docs/tutorials/browser/repl.qmd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,14 +16,12 @@ penguins[^1] dataset loaded into the DuckDB backend!
from urllib.parse import urlencode

lines = """
%pip install numpy pandas tzdata
import pyodide_js, pathlib, js
wheel_url = "https://storage.googleapis.com/ibis-wasm-wheels/pyarrow-17.0.0-cp311-cp311-emscripten_3_1_46_wasm32.whl"
await pyodide_js.loadPackage(wheel_url)
%pip install numpy pandas tzdata duckdb
import micropip, pathlib, js, unix_timezones
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

For some reason importing unix_timezones is required, because pyarrow's own import of it raises an exception. It doesn't really make much sense, but this works around the issue.

I'll report upstream.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Reported upstream here: pyodide/pyodide#5344

await micropip.install(["https://storage.googleapis.com/ibis-wasm-wheels/pyarrow-18.1.0-cp312-cp312-pyodide_2024_0_wasm32.whl"])
penguins_csv_url = "https://storage.googleapis.com/ibis-tutorial-data/penguins.csv"
penguins_text = await (await js.fetch(penguins_csv_url)).text()
pathlib.Path("penguins.csv").write_text(penguins_text)
del pyodide_js, pathlib, js, wheel_url, penguins_csv_url, penguins_text
pathlib.Path("penguins.csv").write_text(await (await js.fetch(penguins_csv_url)).text())
del micropip, pathlib, js, penguins_csv_url, unix_timezones
%clear
%pip install 'ibis-framework[duckdb]'
from ibis.interactive import *
Expand Down
6 changes: 4 additions & 2 deletions justfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -298,11 +298,13 @@ build-jupyterlite:

git checkout pyproject.toml ibis/__init__.py uv.lock

jq '{"PipliteAddon": {"piplite_urls": [$ibis]}}' -nM \
--arg ibis "dist/ibis_framework-${ibis_dev_version}-py3-none-any.whl" \
> jupyter_lite_config.json

jupyter lite build \
--debug \
--no-libarchive \
--piplite-wheels "dist/ibis_framework-${ibis_dev_version}-py3-none-any.whl" \
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

These flags now throw an error, and the duckdb wheel is no longer required as it ships with the latest pyodide distribution.

--piplite-wheels "https://duckdb.github.io/duckdb-pyodide/wheels/duckdb-1.1.2-cp311-cp311-emscripten_3_1_46_wasm32.whl" \
--apps repl \
--no-unused-shared-packages \
--output-dir docs/_output/jupyterlite
Expand Down
4 changes: 2 additions & 2 deletions pyproject.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -277,8 +277,8 @@ docs = [
"jupyter-cache>=1.0.0,<2",
"jupyterlab>=4.2.5,<5",
"jupyterlab-night>=0.4.6,<1",
"jupyterlite-core>=0.3,<0.4",
"jupyterlite-pyodide-kernel>=0.3,<0.4",
"jupyterlite-core>=0.5,<0.6",
"jupyterlite-pyodide-kernel>=0.5,<0.6",
]

[project.entry-points."ibis.backends"]
Expand Down
4 changes: 2 additions & 2 deletions requirements-dev.txt
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

16 changes: 8 additions & 8 deletions uv.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading