diff --git a/.gitignore b/.gitignore index f514337c7561..5389b17db1cd 100644 --- a/.gitignore +++ b/.gitignore @@ -152,3 +152,4 @@ docs/**/*.html # jupyterlite stuff .jupyterlite.doit.db docs/jupyter_lite_config.json +*.quarto_ipynb diff --git a/docs/_extensions/quarto-ext/fontawesome/_extension.yml b/docs/_extensions/fontawesome/_extension.yml similarity index 100% rename from docs/_extensions/quarto-ext/fontawesome/_extension.yml rename to docs/_extensions/fontawesome/_extension.yml diff --git a/docs/_extensions/quarto-ext/fontawesome/assets/css/all.css b/docs/_extensions/fontawesome/assets/css/all.css similarity index 100% rename from docs/_extensions/quarto-ext/fontawesome/assets/css/all.css rename to docs/_extensions/fontawesome/assets/css/all.css diff --git a/docs/_extensions/quarto-ext/fontawesome/assets/css/latex-fontsize.css b/docs/_extensions/fontawesome/assets/css/latex-fontsize.css similarity index 100% rename from docs/_extensions/quarto-ext/fontawesome/assets/css/latex-fontsize.css rename to docs/_extensions/fontawesome/assets/css/latex-fontsize.css diff --git a/docs/_extensions/quarto-ext/fontawesome/assets/webfonts/FontAwesome6Brands-Regular-400.ttf b/docs/_extensions/fontawesome/assets/webfonts/FontAwesome6Brands-Regular-400.ttf similarity index 100% rename from docs/_extensions/quarto-ext/fontawesome/assets/webfonts/FontAwesome6Brands-Regular-400.ttf rename to docs/_extensions/fontawesome/assets/webfonts/FontAwesome6Brands-Regular-400.ttf diff --git a/docs/_extensions/quarto-ext/fontawesome/assets/webfonts/FontAwesome6Brands-Regular-400.woff2 b/docs/_extensions/fontawesome/assets/webfonts/FontAwesome6Brands-Regular-400.woff2 similarity index 100% rename from docs/_extensions/quarto-ext/fontawesome/assets/webfonts/FontAwesome6Brands-Regular-400.woff2 rename to docs/_extensions/fontawesome/assets/webfonts/FontAwesome6Brands-Regular-400.woff2 diff --git a/docs/_extensions/quarto-ext/fontawesome/assets/webfonts/FontAwesome6Free-Regular-400.ttf b/docs/_extensions/fontawesome/assets/webfonts/FontAwesome6Free-Regular-400.ttf similarity index 100% rename from docs/_extensions/quarto-ext/fontawesome/assets/webfonts/FontAwesome6Free-Regular-400.ttf rename to docs/_extensions/fontawesome/assets/webfonts/FontAwesome6Free-Regular-400.ttf diff --git a/docs/_extensions/quarto-ext/fontawesome/assets/webfonts/FontAwesome6Free-Regular-400.woff2 b/docs/_extensions/fontawesome/assets/webfonts/FontAwesome6Free-Regular-400.woff2 similarity index 100% rename from docs/_extensions/quarto-ext/fontawesome/assets/webfonts/FontAwesome6Free-Regular-400.woff2 rename to docs/_extensions/fontawesome/assets/webfonts/FontAwesome6Free-Regular-400.woff2 diff --git a/docs/_extensions/quarto-ext/fontawesome/assets/webfonts/FontAwesome6Free-Solid-900.ttf b/docs/_extensions/fontawesome/assets/webfonts/FontAwesome6Free-Solid-900.ttf similarity index 100% rename from docs/_extensions/quarto-ext/fontawesome/assets/webfonts/FontAwesome6Free-Solid-900.ttf rename to docs/_extensions/fontawesome/assets/webfonts/FontAwesome6Free-Solid-900.ttf diff --git a/docs/_extensions/quarto-ext/fontawesome/assets/webfonts/FontAwesome6Free-Solid-900.woff2 b/docs/_extensions/fontawesome/assets/webfonts/FontAwesome6Free-Solid-900.woff2 similarity index 100% rename from docs/_extensions/quarto-ext/fontawesome/assets/webfonts/FontAwesome6Free-Solid-900.woff2 rename to docs/_extensions/fontawesome/assets/webfonts/FontAwesome6Free-Solid-900.woff2 diff --git a/docs/_extensions/quarto-ext/fontawesome/assets/webfonts/fa-brands-400.ttf b/docs/_extensions/fontawesome/assets/webfonts/fa-brands-400.ttf similarity index 100% rename from docs/_extensions/quarto-ext/fontawesome/assets/webfonts/fa-brands-400.ttf rename to docs/_extensions/fontawesome/assets/webfonts/fa-brands-400.ttf diff --git a/docs/_extensions/quarto-ext/fontawesome/assets/webfonts/fa-brands-400.woff2 b/docs/_extensions/fontawesome/assets/webfonts/fa-brands-400.woff2 similarity index 100% rename from docs/_extensions/quarto-ext/fontawesome/assets/webfonts/fa-brands-400.woff2 rename to docs/_extensions/fontawesome/assets/webfonts/fa-brands-400.woff2 diff --git a/docs/_extensions/quarto-ext/fontawesome/assets/webfonts/fa-regular-400.ttf b/docs/_extensions/fontawesome/assets/webfonts/fa-regular-400.ttf similarity index 100% rename from docs/_extensions/quarto-ext/fontawesome/assets/webfonts/fa-regular-400.ttf rename to docs/_extensions/fontawesome/assets/webfonts/fa-regular-400.ttf diff --git a/docs/_extensions/quarto-ext/fontawesome/assets/webfonts/fa-regular-400.woff2 b/docs/_extensions/fontawesome/assets/webfonts/fa-regular-400.woff2 similarity index 100% rename from docs/_extensions/quarto-ext/fontawesome/assets/webfonts/fa-regular-400.woff2 rename to docs/_extensions/fontawesome/assets/webfonts/fa-regular-400.woff2 diff --git a/docs/_extensions/quarto-ext/fontawesome/assets/webfonts/fa-solid-900.ttf b/docs/_extensions/fontawesome/assets/webfonts/fa-solid-900.ttf similarity index 100% rename from docs/_extensions/quarto-ext/fontawesome/assets/webfonts/fa-solid-900.ttf rename to docs/_extensions/fontawesome/assets/webfonts/fa-solid-900.ttf diff --git a/docs/_extensions/quarto-ext/fontawesome/assets/webfonts/fa-solid-900.woff2 b/docs/_extensions/fontawesome/assets/webfonts/fa-solid-900.woff2 similarity index 100% rename from docs/_extensions/quarto-ext/fontawesome/assets/webfonts/fa-solid-900.woff2 rename to docs/_extensions/fontawesome/assets/webfonts/fa-solid-900.woff2 diff --git a/docs/_extensions/quarto-ext/fontawesome/assets/webfonts/fa-v4compatibility.ttf b/docs/_extensions/fontawesome/assets/webfonts/fa-v4compatibility.ttf similarity index 100% rename from docs/_extensions/quarto-ext/fontawesome/assets/webfonts/fa-v4compatibility.ttf rename to docs/_extensions/fontawesome/assets/webfonts/fa-v4compatibility.ttf diff --git a/docs/_extensions/quarto-ext/fontawesome/assets/webfonts/fa-v4compatibility.woff2 b/docs/_extensions/fontawesome/assets/webfonts/fa-v4compatibility.woff2 similarity index 100% rename from docs/_extensions/quarto-ext/fontawesome/assets/webfonts/fa-v4compatibility.woff2 rename to docs/_extensions/fontawesome/assets/webfonts/fa-v4compatibility.woff2 diff --git a/docs/_extensions/quarto-ext/fontawesome/fontawesome.lua b/docs/_extensions/fontawesome/fontawesome.lua similarity index 100% rename from docs/_extensions/quarto-ext/fontawesome/fontawesome.lua rename to docs/_extensions/fontawesome/fontawesome.lua diff --git a/docs/_extensions/machow/interlinks/.gitignore b/docs/_extensions/interlinks/.gitignore similarity index 100% rename from docs/_extensions/machow/interlinks/.gitignore rename to docs/_extensions/interlinks/.gitignore diff --git a/docs/_extensions/machow/interlinks/_extension.yml b/docs/_extensions/interlinks/_extension.yml similarity index 100% rename from docs/_extensions/machow/interlinks/_extension.yml rename to docs/_extensions/interlinks/_extension.yml diff --git a/docs/_extensions/machow/interlinks/interlinks.lua b/docs/_extensions/interlinks/interlinks.lua similarity index 100% rename from docs/_extensions/machow/interlinks/interlinks.lua rename to docs/_extensions/interlinks/interlinks.lua diff --git a/docs/presentations/pycon2024/maintainers.qmd b/docs/presentations/pycon2024/maintainers.qmd index 0235ee55ddac..d3a282671171 100644 --- a/docs/presentations/pycon2024/maintainers.qmd +++ b/docs/presentations/pycon2024/maintainers.qmd @@ -245,6 +245,7 @@ _CI must complete "quickly"_ ::: {.callout-warning} ## Opinions follow +Opinions herein… ::: - **Env setup needs to be _fast_**: avoid constraint solving @@ -282,7 +283,8 @@ _We've added 3 or 4 new backends since the switch_ ## Tools: GitHub Actions {.smaller} ::: {.callout-note} -### I don't work for GitHub +## I don't work for GitHub +…even though it might seem like it ::: - Pay for the [the Teams plan](https://docs.github.com/en/actions/learn-github-actions/usage-limits-billing-and-administration#usage-limits) to get more concurrency diff --git a/nix/quarto/default.nix b/nix/quarto/default.nix index d7921ed90ba6..fe8be4b14c8a 100644 --- a/nix/quarto/default.nix +++ b/nix/quarto/default.nix @@ -17,15 +17,15 @@ let "aarch64-darwin" = "macos"; }; shas = { - "x86_64-linux" = "sha256-X+VgTY649Vo37u8byNzLD+KPVK3MRdySAPN0ZhdBw0g="; - "aarch64-linux" = "sha256-xOfh+lrLEaU2ph20COBBg+PuZjzNZwD1NSGjcCyoL1I="; - "aarch64-darwin" = "sha256-yK0y7gnYWKO5vRBoBtYva3cmIL4ddoeYhn2Gor/NUCs="; + "x86_64-linux" = "sha256-1HqjMENJ1H5RBaKIRZoUDGrdSEQOhhIiRLIQFqnkFlk="; + "aarch64-linux" = "sha256-kRh8wC4nzHuE25Ymj+e+cy6+cl0YYF44cUAZwbjCCvw="; + "aarch64-darwin" = "sha256-/1gV3MrRNuGPALzR+1o3x9BvZakyZDRYQwRUzagfHMA="; }; inherit (stdenv.hostPlatform) system; in stdenv.mkDerivation rec { pname = "quarto"; - version = "1.5.13"; + version = "1.5.55"; src = fetchurl { url = "https://github.com/quarto-dev/quarto-cli/releases/download/v${version}/quarto-${version}-${platforms.${system}}.tar.gz"; sha256 = shas.${system};