Skip to content

Commit

Permalink
chore(deps): bump pyodide and docs build
Browse files Browse the repository at this point in the history
  • Loading branch information
cpcloud committed Jan 16, 2025
1 parent 39e0a42 commit 4259e92
Show file tree
Hide file tree
Showing 11 changed files with 48 additions and 32 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/docs-preview.yml
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
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
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
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
*.quarto_ipynb

# pixi environments
Expand Down

Large diffs are not rendered by default.

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
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
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
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" \
--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
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.6",
"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

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

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

0 comments on commit 4259e92

Please sign in to comment.