From 4787d6d65c51a8ba9532d98fb5c345c9b6230c72 Mon Sep 17 00:00:00 2001 From: Jack Gerrits Date: Sat, 2 Mar 2024 14:45:28 -0500 Subject: [PATCH] revert quarto upgrade (#1840) * revert quarto upgrade * fix ruff --- .devcontainer/Dockerfile | 6 +++--- .devcontainer/dev/Dockerfile | 8 ++++---- .github/workflows/deploy-website.yml | 12 ++++++------ website/process_notebooks.py | 10 +++++----- 4 files changed, 18 insertions(+), 18 deletions(-) diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile index 4431ee58b4f6..0ca2c2517a42 100644 --- a/.devcontainer/Dockerfile +++ b/.devcontainer/Dockerfile @@ -14,9 +14,9 @@ RUN apt-get update \ && apt-get -y install --no-install-recommends build-essential npm \ && apt-get autoremove -y \ && apt-get clean -y \ - && wget https://github.com/quarto-dev/quarto-cli/releases/download/v1.5.23/quarto-1.5.23-linux-amd64.deb \ - && dpkg -i quarto-1.5.23-linux-amd64.deb \ - && rm -rf /var/lib/apt/lists/* quarto-1.5.23-linux-amd64.deb + && wget https://github.com/quarto-dev/quarto-cli/releases/download/v1.4.549/quarto-1.4.549-linux-amd64.deb \ + && dpkg -i quarto-1.4.549-linux-amd64.deb \ + && rm -rf /var/lib/apt/lists/* quarto-1.4.549-linux-amd64.deb ENV DEBIAN_FRONTEND=dialog # For docs diff --git a/.devcontainer/dev/Dockerfile b/.devcontainer/dev/Dockerfile index 4749e41ba6df..4821574371c7 100644 --- a/.devcontainer/dev/Dockerfile +++ b/.devcontainer/dev/Dockerfile @@ -33,12 +33,12 @@ RUN cd website RUN yarn install --frozen-lockfile --ignore-engines RUN arch=$(arch | sed s/aarch64/arm64/ | sed s/x86_64/amd64/) && \ - wget -q https://github.com/quarto-dev/quarto-cli/releases/download/v1.5.23/quarto-1.5.23-linux-${arch}.tar.gz && \ + wget -q https://github.com/quarto-dev/quarto-cli/releases/download/v1.4.549/quarto-1.4.549-linux-${arch}.tar.gz && \ mkdir -p /home/autogen/quarto/ && \ - tar -xzf quarto-1.5.23-linux-${arch}.tar.gz --directory /home/autogen/quarto/ && \ - rm quarto-1.5.23-linux-${arch}.tar.gz + tar -xzf quarto-1.4.549-linux-${arch}.tar.gz --directory /home/autogen/quarto/ && \ + rm quarto-1.4.549-linux-${arch}.tar.gz -ENV PATH="${PATH}:/home/autogen/quarto/quarto-1.5.23/bin/" +ENV PATH="${PATH}:/home/autogen/quarto/quarto-1.4.549/bin/" # Exposes the Yarn port for Docusaurus EXPOSE 3000 diff --git a/.github/workflows/deploy-website.yml b/.github/workflows/deploy-website.yml index ae866ffcab96..c9c7deede620 100644 --- a/.github/workflows/deploy-website.yml +++ b/.github/workflows/deploy-website.yml @@ -44,9 +44,9 @@ jobs: - name: quarto install working-directory: ${{ runner.temp }} run: | - wget -q https://github.com/quarto-dev/quarto-cli/releases/download/v1.5.23/quarto-1.5.23-linux-amd64.tar.gz - tar -xzf quarto-1.5.23-linux-amd64.tar.gz - echo "$(pwd)/quarto-1.5.23/bin/" >> $GITHUB_PATH + wget -q https://github.com/quarto-dev/quarto-cli/releases/download/v1.4.549/quarto-1.4.549-linux-amd64.tar.gz + tar -xzf quarto-1.4.549-linux-amd64.tar.gz + echo "$(pwd)/quarto-1.4.549/bin/" >> $GITHUB_PATH - name: quarto run run: | quarto render . @@ -90,9 +90,9 @@ jobs: - name: quarto install working-directory: ${{ runner.temp }} run: | - wget -q https://github.com/quarto-dev/quarto-cli/releases/download/v1.5.23/quarto-1.5.23-linux-amd64.tar.gz - tar -xzf quarto-1.5.23-linux-amd64.tar.gz - echo "$(pwd)/quarto-1.5.23/bin/" >> $GITHUB_PATH + wget -q https://github.com/quarto-dev/quarto-cli/releases/download/v1.4.549/quarto-1.4.549-linux-amd64.tar.gz + tar -xzf quarto-1.4.549-linux-amd64.tar.gz + echo "$(pwd)/quarto-1.4.549/bin/" >> $GITHUB_PATH - name: quarto run run: | quarto render . diff --git a/website/process_notebooks.py b/website/process_notebooks.py index 8a2875c22770..56f1f190abb4 100755 --- a/website/process_notebooks.py +++ b/website/process_notebooks.py @@ -67,11 +67,11 @@ def __init__(self, returncode: int, stdout: str, stderr: str): def check_quarto_bin(quarto_bin: str = "quarto") -> None: """Check if quarto is installed.""" try: - version = subprocess.check_output([quarto_bin, "--version"], text=True).strip() - version = tuple(map(int, version.split("."))) - if version < (1, 5, 23): - print("Quarto version is too old. Please upgrade to 1.5.23 or later.") - sys.exit(1) + subprocess.check_output([quarto_bin, "--version"], text=True).strip() + # version = tuple(map(int, version.split("."))) + # if version < (1, 5, 23): + # print("Quarto version is too old. Please upgrade to 1.5.23 or later.") + # sys.exit(1) except FileNotFoundError: print("Quarto is not installed. Please install it from https://quarto.org")