From aae46862cfc1fbf16939fa885097024af9be4643 Mon Sep 17 00:00:00 2001 From: andream Date: Tue, 25 Feb 2025 18:53:05 +0000 Subject: [PATCH 1/6] add 3.12 tests --- .github/workflows/ci.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index fad67c1e..ddc97d2b 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -72,10 +72,10 @@ jobs: # XXX: We don't currently have OpenGL installation on other platforms #os: ["windows-latest", "ubuntu-latest", "macos-latest"] os: ["ubuntu-latest"] - python-version: ["3.9", "3.11"] + python-version: ["3.9", "3.11", "3.12"] experimental: [false] include: - - python-version: "3.11" + - python-version: "3.12" os: "ubuntu-latest" experimental: true From 9407cf0203f2338d94ea1c183e16dd4f33cc6143 Mon Sep 17 00:00:00 2001 From: andream Date: Tue, 25 Feb 2025 19:07:58 +0000 Subject: [PATCH 2/6] accept <=3.12 in env --- continuous_integration/environment.yaml | 2 +- continuous_integration/rtd_environment.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/continuous_integration/environment.yaml b/continuous_integration/environment.yaml index c201ad93..99214ce6 100644 --- a/continuous_integration/environment.yaml +++ b/continuous_integration/environment.yaml @@ -3,7 +3,7 @@ channels: - conda-forge dependencies: # limiting python due to ecmwflibs - - python<=3.11 + - python<=3.12 - appdirs - defusedxml - Cython diff --git a/continuous_integration/rtd_environment.yaml b/continuous_integration/rtd_environment.yaml index 68730bbf..bfec234e 100644 --- a/continuous_integration/rtd_environment.yaml +++ b/continuous_integration/rtd_environment.yaml @@ -3,7 +3,7 @@ channels: - conda-forge dependencies: # limiting python due to ecmwflibs - - python<=3.11 + - python<=3.12 - appdirs - defusedxml - Cython From a26aad3f92f97804de499887a77c7af411cc8b13 Mon Sep 17 00:00:00 2001 From: andream Date: Tue, 25 Feb 2025 19:18:56 +0000 Subject: [PATCH 3/6] add quiet flag --- .github/workflows/ci.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index ddc97d2b..2bdeaf65 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -110,6 +110,7 @@ jobs: environment-file: continuous_integration/environment.yaml activate-environment: test-environment channels: conda-forge + quiet: true - name: Install unstable dependencies if: matrix.experimental == true From 918a9ba7e306be808207786bc33f83a8668bf315 Mon Sep 17 00:00:00 2001 From: andream Date: Tue, 25 Feb 2025 19:30:36 +0000 Subject: [PATCH 4/6] move ecmwflibs to conda --- .github/workflows/ci.yaml | 1 - continuous_integration/environment.yaml | 2 +- continuous_integration/rtd_environment.yaml | 2 +- 3 files changed, 2 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 2bdeaf65..ddc97d2b 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -110,7 +110,6 @@ jobs: environment-file: continuous_integration/environment.yaml activate-environment: test-environment channels: conda-forge - quiet: true - name: Install unstable dependencies if: matrix.experimental == true diff --git a/continuous_integration/environment.yaml b/continuous_integration/environment.yaml index 99214ce6..347a88fe 100644 --- a/continuous_integration/environment.yaml +++ b/continuous_integration/environment.yaml @@ -28,6 +28,7 @@ dependencies: - donfig # 2.19.1 seems to cause library linking issues - eccodes>=2.20 + - ecmwflibs - cfgrib - fsspec - h5netcdf @@ -61,4 +62,3 @@ dependencies: - trollimage - pyspectral - pyorbital - - ecmwflibs diff --git a/continuous_integration/rtd_environment.yaml b/continuous_integration/rtd_environment.yaml index bfec234e..d7a4b5f0 100644 --- a/continuous_integration/rtd_environment.yaml +++ b/continuous_integration/rtd_environment.yaml @@ -28,6 +28,7 @@ dependencies: - donfig # 2.19.1 seems to cause library linking issues - eccodes>=2.20 + - ecmwflibs - cfgrib - fsspec - h5netcdf @@ -61,7 +62,6 @@ dependencies: - trollimage - pyspectral - pyorbital - - ecmwflibs # docs: - blockdiag - sphinx From 2173ea98b65a107dbd31259e80fb13bd4b64991b Mon Sep 17 00:00:00 2001 From: andream Date: Tue, 25 Feb 2025 20:02:23 +0000 Subject: [PATCH 5/6] get rid of ecmwflibs in favour of newer eccodes that has it included --- continuous_integration/environment.yaml | 6 +----- continuous_integration/rtd_environment.yaml | 5 +---- setup.py | 3 +-- 3 files changed, 3 insertions(+), 11 deletions(-) diff --git a/continuous_integration/environment.yaml b/continuous_integration/environment.yaml index 347a88fe..bfcb16c0 100644 --- a/continuous_integration/environment.yaml +++ b/continuous_integration/environment.yaml @@ -2,7 +2,6 @@ name: test-environment channels: - conda-forge dependencies: - # limiting python due to ecmwflibs - python<=3.12 - appdirs - defusedxml @@ -26,9 +25,6 @@ dependencies: - bottleneck - dask - donfig - # 2.19.1 seems to cause library linking issues - - eccodes>=2.20 - - ecmwflibs - cfgrib - fsspec - h5netcdf @@ -39,7 +35,6 @@ dependencies: - pooch - pyhdf - pyresample - - python-eccodes - python-geotiepoints - pyyaml - rasterio @@ -62,3 +57,4 @@ dependencies: - trollimage - pyspectral - pyorbital + - eccodes>=2.37 # 2.37.0 has ecmwflibs integrated diff --git a/continuous_integration/rtd_environment.yaml b/continuous_integration/rtd_environment.yaml index d7a4b5f0..f5730823 100644 --- a/continuous_integration/rtd_environment.yaml +++ b/continuous_integration/rtd_environment.yaml @@ -26,9 +26,6 @@ dependencies: - bottleneck - dask - donfig - # 2.19.1 seems to cause library linking issues - - eccodes>=2.20 - - ecmwflibs - cfgrib - fsspec - h5netcdf @@ -39,7 +36,6 @@ dependencies: - pooch - pyhdf - pyresample - - python-eccodes - python-geotiepoints - pyyaml - rasterio @@ -69,3 +65,4 @@ dependencies: - sphinxcontrib-seqdiag - sphinxcontrib-blockdiag - psutil + - eccodes>=2.37 # 2.37.0 has ecmwflibs integrated diff --git a/setup.py b/setup.py index 2f55f684..a022e3b4 100644 --- a/setup.py +++ b/setup.py @@ -222,8 +222,7 @@ def run(self): "trollsift", "vispy>=0.10.0", 'pygrib;sys_platform=="linux" or sys_platform=="darwin"', - "ecmwflibs", - "eccodes", + "eccodes>=2.37", # has ecmwflibs included "cfgrib", ], tests_requires=["pytest", "pytest-qt", "pytest-mock"], From e64fc2c246a27084120861d53b932e217c80c872 Mon Sep 17 00:00:00 2001 From: andream Date: Tue, 25 Feb 2025 21:13:03 +0000 Subject: [PATCH 6/6] fix python version in deploy CI --- .github/workflows/deploy.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/deploy.yaml b/.github/workflows/deploy.yaml index ea690ee0..47fa760b 100644 --- a/.github/workflows/deploy.yaml +++ b/.github/workflows/deploy.yaml @@ -65,6 +65,7 @@ jobs: uses: conda-incubator/setup-miniconda@v3 with: miniforge-version: latest + python-version: ${{ matrix.python-version }} environment-file: continuous_integration/environment.yaml activate-environment: test-environment channels: conda-forge