From a92d9d0a89b09c8ebd7c5dca5d1aa033d4c8bff3 Mon Sep 17 00:00:00 2001 From: Dongdong Tian Date: Wed, 4 Dec 2024 15:08:02 +0800 Subject: [PATCH] CI: Unpin geopandas and rasterio after the fix in #3672 (#3305) --- .github/workflows/ci_docs.yml | 3 +-- .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 | 3 +-- 6 files changed, 5 insertions(+), 9 deletions(-) diff --git a/.github/workflows/ci_docs.yml b/.github/workflows/ci_docs.yml index a39d4393f2d..d5c8a37bd7f 100644 --- a/.github/workflows/ci_docs.yml +++ b/.github/workflows/ci_docs.yml @@ -101,10 +101,9 @@ jobs: netCDF4 packaging contextily - geopandas<1.0 + geopandas ipython pyarrow - rasterio<1.4.3 rioxarray make pip diff --git a/.github/workflows/ci_doctests.yaml b/.github/workflows/ci_doctests.yaml index 5af0276f5ca..023584bd9ef 100644 --- a/.github/workflows/ci_doctests.yaml +++ b/.github/workflows/ci_doctests.yaml @@ -61,7 +61,6 @@ 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 fa1e5e24114..1d65157803d 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 rasterio<1.4.3 rioxarray sphinx-gallery' + optional-packages: ' contextily geopandas<1 ipython pyarrow 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 rasterio<1.4.3 rioxarray sphinx-gallery' + optional-packages: ' contextily geopandas>=1.0 ipython pyarrow 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 f5bbef85be6..d61d0ce9e1d 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 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 aa6530f134c..466ca6db933 100644 --- a/.github/workflows/ci_tests_legacy.yaml +++ b/.github/workflows/ci_tests_legacy.yaml @@ -71,7 +71,6 @@ 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 dfcf70704f7..b47a7a86b37 100644 --- a/ci/requirements/docs.yml +++ b/ci/requirements/docs.yml @@ -14,10 +14,9 @@ dependencies: - packaging # Optional dependencies - contextily - - geopandas<1.0 + - geopandas - ipython - pyarrow - - rasterio<1.4.3 - rioxarray # Development dependencies (general) - make