From b557e5070b03d8e240d0f2388924f7182171adf4 Mon Sep 17 00:00:00 2001 From: Lukas Heumos Date: Sat, 6 Apr 2024 05:08:50 -0700 Subject: [PATCH] Switch to lastest jupyterbook version (#264) Signed-off-by: zethson --- .github/workflows/build_book.yml | 26 +++++++++++++----------- .github/workflows/build_environments.yml | 2 +- .github/workflows/labeler.yml | 2 +- .github/workflows/pre_commit.yml | 4 ++-- .github/workflows/publish_book.yml | 10 ++++----- .pre-commit-config.yaml | 6 ------ environment.yml | 8 ++++---- 7 files changed, 27 insertions(+), 31 deletions(-) diff --git a/.github/workflows/build_book.yml b/.github/workflows/build_book.yml index f2fefb80..e51ff393 100644 --- a/.github/workflows/build_book.yml +++ b/.github/workflows/build_book.yml @@ -6,15 +6,17 @@ jobs: build-book: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - - name: Set up Python 3.10 - uses: actions/setup-python@v4 + - name: Set up Python 3.11 + uses: actions/setup-python@v5 with: - python-version: "3.10" + python-version: "3.11" - name: Setup environment - run: pip install --upgrade jupyter-book jupytext beautifulsoup4 + run: | + pip install uv + uv pip install --system jupyter-book jupytext beautifulsoup4 - name: Cache jupyter-cache folder uses: actions/cache@v2 @@ -35,17 +37,17 @@ jobs: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - - name: Set up Python 3.10 - uses: actions/setup-python@v4 + - name: Set up Python 3.11 + uses: actions/setup-python@v5 with: - python-version: "3.10" + python-version: "3.11" - name: Install Python dependencies run: | - python -m pip install --upgrade pip - pip install jupyter-book jupytext beautifulsoup4 + python -m pip install --upgrade uv + uv pip install --system jupyter-book jupytext beautifulsoup4 - name: Install Headless Chrome dependencies run: | @@ -53,7 +55,7 @@ jobs: sudo apt-get install -yq $(cat .github/workflows/pyppeteer_requirements.txt) - name: Install Chromium - run: pip install pyppeteer + run: uv pip install --system pyppeteer - name: Build PDF from HTML (Docs) run: make pdf diff --git a/.github/workflows/build_environments.yml b/.github/workflows/build_environments.yml index 676b32bf..0ef119fd 100644 --- a/.github/workflows/build_environments.yml +++ b/.github/workflows/build_environments.yml @@ -27,7 +27,7 @@ jobs: "jupyter-book/multimodal_integration/advanced_integration.yml", ] steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Install Conda environment with Micromamba uses: mamba-org/provision-with-micromamba@main diff --git a/.github/workflows/labeler.yml b/.github/workflows/labeler.yml index f62967b1..b4fb2cad 100644 --- a/.github/workflows/labeler.yml +++ b/.github/workflows/labeler.yml @@ -11,7 +11,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Check out the repository - uses: actions/checkout@v2.3.3 + uses: actions/checkout@v4 - name: Run Labeler uses: crazy-max/ghaction-github-labeler@v3.1.1 diff --git a/.github/workflows/pre_commit.yml b/.github/workflows/pre_commit.yml index dafd1287..01810ec8 100644 --- a/.github/workflows/pre_commit.yml +++ b/.github/workflows/pre_commit.yml @@ -6,6 +6,6 @@ jobs: pre-commit: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 - - uses: actions/setup-python@v3 + - uses: actions/checkout@v4 + - uses: actions/setup-python@v5 - uses: pre-commit/action@v2.0.0 diff --git a/.github/workflows/publish_book.yml b/.github/workflows/publish_book.yml index 4b38a614..a32be549 100644 --- a/.github/workflows/publish_book.yml +++ b/.github/workflows/publish_book.yml @@ -9,15 +9,15 @@ jobs: build-book: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 - - name: Set up Python 3.9 - uses: actions/setup-python@v2 + - name: Set up Python 3.11 + uses: actions/setup-python@v5 with: - python-version: 3.9 + python-version: 3.11 - name: Setup environment - run: pip install --upgrade jupyter-book==0.13.2 jupytext beautifulsoup4 + run: pip install --upgrade jupyter-book jupytext beautifulsoup4 - name: Cache jupyter-cache folder uses: actions/cache@v2 diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 04327105..ea71bbc5 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -10,12 +10,6 @@ repos: rev: v2.5.1 hooks: - id: prettier - # Newer versions of node don't work on systems that have an older version of GLIBC - # (in particular Ubuntu 18.04 and Centos 7) - # EOL of Centos 7 is in 2024-06, we can probably get rid of this then. - # See https://github.com/scverse/cookiecutter-scverse/issues/143 and - # https://github.com/jupyterlab/jupyterlab/issues/12675 - language_version: "17.9.1" - repo: https://github.com/psf/black rev: 22.3.0 hooks: diff --git a/environment.yml b/environment.yml index 064c4e67..81d64e7c 100644 --- a/environment.yml +++ b/environment.yml @@ -3,7 +3,7 @@ channels: - defaults - conda-forge dependencies: - - conda-forge::python=3.10.6 - - conda-forge::jupyter-book==0.13.1 - - conda-forge::jupytext==1.14.4 - - conda-forge::beautifulsoup4==4.11.1 + - conda-forge::python=3.11.8 + - conda-forge::jupyter-book==1.0.0 + - conda-forge::jupytext==1.16.1 + - conda-forge::beautifulsoup4==4.12.3