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): bump quarto version #10583

Merged
merged 2 commits into from
Dec 16, 2024
Merged

chore(deps): bump quarto version #10583

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
c62f8c4
chore(deps): bump quarto version
cpcloud Dec 16, 2024
2b3c20c
docs(development-setup): fix support matrix
cpcloud Dec 16, 2024
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
25 changes: 12 additions & 13 deletions docs/contribute/01_environment.qmd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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}

Expand Down Expand Up @@ -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`
Expand Down Expand Up @@ -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.
24 changes: 13 additions & 11 deletions nix/quarto/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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};
Expand Down
Loading