From 96a5e11bd7b4d01c5f57852faacad33c2308ab2f Mon Sep 17 00:00:00 2001 From: Lukas Kluft Date: Mon, 3 Nov 2025 13:16:23 +0100 Subject: [PATCH 1/5] Constrain pip version in GitHub action --- .github/workflows/build-book.yml | 2 +- .github/workflows/build-test.yml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build-book.yml b/.github/workflows/build-book.yml index 7694cc6..c1d2977 100644 --- a/.github/workflows/build-book.yml +++ b/.github/workflows/build-book.yml @@ -17,7 +17,7 @@ jobs: python-version: ${{ matrix.python-version }} - name: Install dependencies with pip run: | - python -m pip install --upgrade pip + python -m pip install --upgrade 'pip<25.3' python -m pip install wheel python -m pip install git+https://github.com/atmtools/climt@rrtmg-only --no-binary climt TARGET=HASWELL python -m pip install .[docs] diff --git a/.github/workflows/build-test.yml b/.github/workflows/build-test.yml index 12690c1..965b901 100644 --- a/.github/workflows/build-test.yml +++ b/.github/workflows/build-test.yml @@ -36,13 +36,13 @@ jobs: TARGET: HASWELL run: | brew install gcc@12 - python -m pip install --upgrade pip wheel + python -m pip install --upgrade 'pip<25.3' wheel python -m pip install git+https://github.com/atmtools/climt@rrtmg-only --no-binary climt - name: Install CliMT (Linux) if: matrix.name == 'ubuntu' run: | - python -m pip install --upgrade pip wheel + python -m pip install --upgrade 'pip<25.3' wheel python -m pip install git+https://github.com/atmtools/climt@rrtmg-only --no-binary climt - name: Install From 7d08d3153240a283b94b151d2f3e3b366128b5aa Mon Sep 17 00:00:00 2001 From: Lukas Kluft Date: Mon, 3 Nov 2025 13:22:56 +0100 Subject: [PATCH 2/5] Explicitly use python3 in readme --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index ed60509..375ce16 100644 --- a/README.md +++ b/README.md @@ -20,7 +20,7 @@ But of course, any other Python distribution is also working. ## Install stable release You can install the latest stable version of ``konrad`` using ``pip``: ```bash -python -m pip install konrad +python3 -m pip install konrad ``` Konrad depends on the [CliMT](https://github.com/CliMT/climt) package. @@ -31,7 +31,7 @@ However (for Python >3.7) the FORTRAN libraries need to be compiled locally. In this case, you need to specify a C compiler, a FORTRAN compiler, and the target architecture using the corresponding environment variables: ```bash -CC=gcc FC=gfortran TARGET=HASWELL python -m pip install konrad +CC=gcc FC=gfortran TARGET=HASWELL python3 -m pip install konrad ``` ### macOS From 608b79d11796603d93ccacb6abcb1dca6896ae13 Mon Sep 17 00:00:00 2001 From: Lukas Kluft Date: Mon, 3 Nov 2025 13:23:12 +0100 Subject: [PATCH 3/5] Rephrase installation note --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 375ce16..349883f 100644 --- a/README.md +++ b/README.md @@ -27,7 +27,7 @@ Konrad depends on the [CliMT](https://github.com/CliMT/climt) package. CliMT handles a variety of underlying FORTRAN code and provides precompiled binary wheels for some Python versions and operating systems. -However (for Python >3.7) the FORTRAN libraries need to be compiled locally. +However, on some architectures the FORTRAN libraries need to be compiled locally. In this case, you need to specify a C compiler, a FORTRAN compiler, and the target architecture using the corresponding environment variables: ```bash From 5ce2166ebc1384775d8887dbd97717cab49b97cd Mon Sep 17 00:00:00 2001 From: Lukas Kluft Date: Mon, 3 Nov 2025 13:30:41 +0100 Subject: [PATCH 4/5] Constrain jupyter-book version --- environment.yaml | 2 +- setup.cfg | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/environment.yaml b/environment.yaml index 7d7dac8..f34ab38 100644 --- a/environment.yaml +++ b/environment.yaml @@ -4,7 +4,7 @@ channels: - rttools dependencies: - python==3.10 - - jupyter-book + - jupyter-book<2 - matplotlib>=2.0.0 - netcdf4>=1.2.7 - numpy>1.22.0 diff --git a/setup.cfg b/setup.cfg index 097d896..b301e8b 100644 --- a/setup.cfg +++ b/setup.cfg @@ -32,7 +32,7 @@ install_requires = arts = pyarts>=2.5.8 docs = - jupyter-book + jupyter-book<2 sphinx sphinx_rtd_theme tests = From eac4ac1346975ec157ecc201fe68ed472c1ed711 Mon Sep 17 00:00:00 2001 From: Lukas Kluft Date: Mon, 3 Nov 2025 13:38:02 +0100 Subject: [PATCH 5/5] Drop conda info --- .github/workflows/build-book.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/build-book.yml b/.github/workflows/build-book.yml index c1d2977..7b4d7ae 100644 --- a/.github/workflows/build-book.yml +++ b/.github/workflows/build-book.yml @@ -24,7 +24,6 @@ jobs: python -m pip list - name: build book run: | - conda info jupyter-book build -W -n --keep-going howto - name: Archive build artifacts uses: actions/upload-artifact@v4