From c62f8c454e37b7bb77d2ffd4be3774f02ed59f6e Mon Sep 17 00:00:00 2001 From: Phillip Cloud <417981+cpcloud@users.noreply.github.com> Date: Mon, 16 Dec 2024 12:50:01 -0500 Subject: [PATCH 1/2] chore(deps): bump quarto version --- nix/quarto/default.nix | 24 +++++++++++++----------- 1 file changed, 13 insertions(+), 11 deletions(-) diff --git a/nix/quarto/default.nix b/nix/quarto/default.nix index a0ccfa3998df..ea10b5d8dc3a 100644 --- a/nix/quarto/default.nix +++ b/nix/quarto/default.nix @@ -11,23 +11,25 @@ }: let - platforms = { - "x86_64-linux" = "linux-amd64"; - "aarch64-linux" = "linux-arm64"; - "aarch64-darwin" = "macos"; - "x86_64-darwin" = "macos"; + platforms = rec { + x86_64-linux = "linux-amd64"; + aarch64-linux = "linux-arm64"; + aarch64-darwin = "macos"; + x86_64-darwin = aarch64-darwin; }; - shas = { - "x86_64-linux" = "sha256-mVoFBQJJHGn5ZbwOtamshEQl9FzmRVEBye3bBXFUlUI="; - "aarch64-linux" = "sha256-TNik4+OdDqGwArw9wkrq4wNHt6tGgYo32V9KNPSsPWo="; - "aarch64-darwin" = "sha256-fjcmyVyPSHyHBICjpweuCnGtMAAlPNNzBMHEk+2emBA="; - "x86_64-darwin" = "sha256-fjcmyVyPSHyHBICjpweuCnGtMAAlPNNzBMHEk+2emBA="; + shas = rec { + x86_64-linux = "sha256-15fHlnE6V8FNgRX0mkXWJqFkeGlwlqBCHy0tmA5fnUo="; + aarch64-linux = "sha256-yzzaMnKyeEGGI3Col7iD6FAF3a6bXlfsE8EHmNRu4LY="; + aarch64-darwin = "sha256-W0IvOWdW7g7iaJcK6FF3X+1+EAWuqYUA1Zt/Es2aThY="; + # hashes are the same for both macos architectures, because the packages + # are identical + x86_64-darwin = aarch64-darwin; }; inherit (stdenv.hostPlatform) system; in stdenv.mkDerivation rec { pname = "quarto"; - version = "1.6.32"; + version = "1.6.39"; src = fetchurl { url = "https://github.com/quarto-dev/quarto-cli/releases/download/v${version}/quarto-${version}-${platforms.${system}}.tar.gz"; sha256 = shas.${system}; From 2b3c20c72a79be6d845d2b0afdf91ef2d4eb685b Mon Sep 17 00:00:00 2001 From: Phillip Cloud <417981+cpcloud@users.noreply.github.com> Date: Mon, 16 Dec 2024 13:13:21 -0500 Subject: [PATCH 2/2] docs(development-setup): fix support matrix --- docs/contribute/01_environment.qmd | 25 ++++++++++++------------- 1 file changed, 12 insertions(+), 13 deletions(-) diff --git a/docs/contribute/01_environment.qmd b/docs/contribute/01_environment.qmd index 0d5a5b5aa9fd..6eb9eab375dd 100644 --- a/docs/contribute/01_environment.qmd +++ b/docs/contribute/01_environment.qmd @@ -22,13 +22,13 @@ architectures. ### Support matrix [^conda-callout] -| | Python 3.9 | Python 3.10 | Python 3.11 | +| | Python 3.10 | Python 3.11 | Python 3.12 | | -----------------------------------------: | :--------------------------: | :--------------: | :--------------: | -| | | | | +| | | | | | **Linux** | {{< fa check >}}[^supported] | {{< fa check >}} | {{< fa check >}} | -| **macOS (x86_64)** | {{< fa check >}} | {{< fa check >}} | {{< fa check >}} | -| **macOS (aarch64)** | {{< fa check >}} | {{< fa check >}} | {{< fa check >}} | -| **Windows** | {{< fa check >}} | {{< fa check >}} | {{< fa check >}} | +| **macOS (x86_64)** | {{< fa check >}} | {{< fa check >}} | {{< fa check >}} | +| **macOS (aarch64)** | {{< fa check >}} | {{< fa check >}} | {{< fa check >}} | +| **Windows** | {{< fa check >}} | {{< fa check >}} | {{< fa check >}} | ::: {.panel-tabset} @@ -124,13 +124,13 @@ for manager, params in managers.items(): ### Support matrix -| | Python 3.9 | Python 3.10 | Python 3.11 | -| -----------------------------------------: | :--------------------------: | :-----------------------: | :-----------------------: | -| | | | | -| **Linux** | {{< fa check >}}[^supported] | {{< fa check >}} | {{< fa check >}} | -| **macOS (x86_64)** | {{< fa check >}} | {{< fa check >}} | {{< fa check >}} | -| **macOS (arm64/M1/M2)** | {{< fa ban >}}[^m1] | {{< fa ban >}}[^m1] | {{< fa ban >}}[^m1] | -| **Windows** | {{< fa ban >}}[^unlikely] | {{< fa ban >}}[^unlikely] | {{< fa ban >}}[^unlikely] | +| | Python 3.10 | Python 3.11 | Python 3.12 | Python 3.13 | +| -----------------------: | :--------------------------: | :-----------------------: | :-----------------------: | :-----------------------: | +| **Linux (x86_64)** | {{< fa check >}}[^supported] | {{< fa check >}} | {{< fa check >}} | {{< fa check >}} | +| **Linux (arm64)** | {{< fa check >}} | {{< fa check >}} | {{< fa check >}} | {{< fa check >}} | +| **macOS (x86_64)** | {{< fa check >}} | {{< fa check >}} | {{< fa check >}} | {{< fa check >}} | +| **macOS (arm64/M1/M2)** | {{< fa check >}} | {{< fa check >}} | {{< fa check >}} | {{< fa check >}} | +| **Windows** | {{< fa ban >}}[^unlikely] | {{< fa ban >}}[^unlikely] | {{< fa ban >}}[^unlikely] | {{< fa ban >}}[^unlikely] | 1. [Install `nix`](https://nixos.org/download.html) 1. Configure `nix` @@ -301,5 +301,4 @@ to build and serve the documentation. [^conda-callout]: Some optional dependencies for Windows and Mac OS are not available through `conda`/`mamba` [^supported]: Tested in CI. If this doesn't work for you, please [file an issue](https://github.com/ibis-project/ibis/issues/new). -[^m1]: Not working as of March 2024. See https://github.com/ibis-project/ibis/issues/8696 [^unlikely]: Unlikely to ever be supported or no upstream support.