From 46600794b60f2621916ccc347a18e04632487dc3 Mon Sep 17 00:00:00 2001 From: Dongdong Tian Date: Tue, 3 Dec 2024 11:43:08 +0800 Subject: [PATCH 1/2] CI: Pin rasterio < 1.4.3 --- .github/workflows/ci_docs.yml | 1 + .github/workflows/ci_doctests.yaml | 1 + .github/workflows/ci_tests.yaml | 4 ++-- .github/workflows/ci_tests_dev.yaml | 2 +- .github/workflows/ci_tests_legacy.yaml | 1 + ci/requirements/docs.yml | 1 + 6 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ci_docs.yml b/.github/workflows/ci_docs.yml index 1b7933ddcaa..a046551091a 100644 --- a/.github/workflows/ci_docs.yml +++ b/.github/workflows/ci_docs.yml @@ -104,6 +104,7 @@ jobs: geopandas<1.0 ipython pyarrow + rasterio<1.4.3 rioxarray make pip diff --git a/.github/workflows/ci_doctests.yaml b/.github/workflows/ci_doctests.yaml index 023584bd9ef..5af0276f5ca 100644 --- a/.github/workflows/ci_doctests.yaml +++ b/.github/workflows/ci_doctests.yaml @@ -61,6 +61,7 @@ jobs: geopandas ipython pyarrow + rasterio<1.4.3 rioxarray make pip diff --git a/.github/workflows/ci_tests.yaml b/.github/workflows/ci_tests.yaml index 1d65157803d..fa1e5e24114 100644 --- a/.github/workflows/ci_tests.yaml +++ b/.github/workflows/ci_tests.yaml @@ -73,13 +73,13 @@ jobs: numpy-version: '1.24' pandas-version: '=2.0' xarray-version: '=2023.04' - optional-packages: ' contextily geopandas<1 ipython pyarrow rioxarray sphinx-gallery' + optional-packages: ' contextily geopandas<1 ipython pyarrow rasterio<1.4.3 rioxarray sphinx-gallery' # Python 3.12 + core packages (latest versions) + optional packages - python-version: '3.12' numpy-version: '2.1' pandas-version: '' xarray-version: '' - optional-packages: ' contextily geopandas>=1.0 ipython pyarrow rioxarray sphinx-gallery' + optional-packages: ' contextily geopandas>=1.0 ipython pyarrow rasterio<1.4.3 rioxarray sphinx-gallery' # Python 3.11 + core packages (Linux only) - os: 'ubuntu-latest' python-version: '3.11' diff --git a/.github/workflows/ci_tests_dev.yaml b/.github/workflows/ci_tests_dev.yaml index d61d0ce9e1d..8ddf2c789af 100644 --- a/.github/workflows/ci_tests_dev.yaml +++ b/.github/workflows/ci_tests_dev.yaml @@ -152,7 +152,7 @@ jobs: python -m pip install --pre --prefer-binary \ --extra-index https://pypi.anaconda.org/scientific-python-nightly-wheels/simple \ numpy pandas xarray netCDF4 packaging \ - build contextily dvc geopandas ipython pyarrow rioxarray \ + build contextily dvc geopandas ipython pyarrow rasterio<1.4.3 rioxarray \ pytest pytest-cov pytest-doctestplus pytest-mpl pytest-rerunfailures \ sphinx-gallery diff --git a/.github/workflows/ci_tests_legacy.yaml b/.github/workflows/ci_tests_legacy.yaml index 466ca6db933..aa6530f134c 100644 --- a/.github/workflows/ci_tests_legacy.yaml +++ b/.github/workflows/ci_tests_legacy.yaml @@ -71,6 +71,7 @@ jobs: geopandas ipython pyarrow + rasterio<1.4.3 rioxarray sphinx-gallery make diff --git a/ci/requirements/docs.yml b/ci/requirements/docs.yml index 5902672fba5..dbef316ec94 100644 --- a/ci/requirements/docs.yml +++ b/ci/requirements/docs.yml @@ -17,6 +17,7 @@ dependencies: - geopandas<1.0 - ipython - pyarrow + - rasterio<1.4.3 - rioxarray # Development dependencies (general) - make From c9cbb32c43c3d37b4f1044060df7a8fccd0cd262 Mon Sep 17 00:00:00 2001 From: Dongdong Tian Date: Tue, 3 Dec 2024 11:57:51 +0800 Subject: [PATCH 2/2] Use single quotes in the GMT Dev workflow --- .github/workflows/ci_tests_dev.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci_tests_dev.yaml b/.github/workflows/ci_tests_dev.yaml index 8ddf2c789af..f5bbef85be6 100644 --- a/.github/workflows/ci_tests_dev.yaml +++ b/.github/workflows/ci_tests_dev.yaml @@ -152,7 +152,7 @@ jobs: python -m pip install --pre --prefer-binary \ --extra-index https://pypi.anaconda.org/scientific-python-nightly-wheels/simple \ numpy pandas xarray netCDF4 packaging \ - build contextily dvc geopandas ipython pyarrow rasterio<1.4.3 rioxarray \ + build contextily dvc geopandas ipython pyarrow 'rasterio<1.4.3' rioxarray \ pytest pytest-cov pytest-doctestplus pytest-mpl pytest-rerunfailures \ sphinx-gallery