From 3185f1b8e84f5eba18e0f723e2e4b01539c20121 Mon Sep 17 00:00:00 2001 From: Wei Ji <23487320+weiji14@users.noreply.github.com> Date: Tue, 15 Jun 2021 10:51:22 +1200 Subject: [PATCH 1/2] Reinstall optional geopandas dependency on CI tests Add `geopandas` as a dependency again on the latest NEP29 Python 3.9/NumPy 1.20 tests. Also unpin gdal version on ci_tests.yaml so that tests run on gdal>=3.3. --- .github/workflows/ci_tests.yaml | 2 +- .github/workflows/ci_tests_dev.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci_tests.yaml b/.github/workflows/ci_tests.yaml index 9a3411e339f..9366552ebb0 100644 --- a/.github/workflows/ci_tests.yaml +++ b/.github/workflows/ci_tests.yaml @@ -52,7 +52,7 @@ jobs: optional-packages: '' - python-version: 3.9 numpy-version: '1.20' - optional-packages: '' # 'geopandas' + optional-packages: 'geopandas' defaults: run: shell: bash -l {0} diff --git a/.github/workflows/ci_tests_dev.yaml b/.github/workflows/ci_tests_dev.yaml index 586ae5e3f11..937696b77f8 100644 --- a/.github/workflows/ci_tests_dev.yaml +++ b/.github/workflows/ci_tests_dev.yaml @@ -83,7 +83,7 @@ jobs: # Install dependencies from conda-forge - name: Install dependencies run: | - conda install ninja cmake libblas libcblas liblapack fftw gdal=3.2 geopandas \ + conda install ninja cmake libblas libcblas liblapack fftw gdal geopandas \ ghostscript libnetcdf hdf5 zlib curl pcre make dvc pip install --pre numpy pandas xarray netCDF4 packaging \ ipython pytest-cov pytest-mpl pytest>=6.0 sphinx-gallery From 35562cda427b5772a9a670db1f4a19d67a277c6e Mon Sep 17 00:00:00 2001 From: Wei Ji <23487320+weiji14@users.noreply.github.com> Date: Fri, 18 Jun 2021 11:40:37 +1200 Subject: [PATCH 2/2] Include geopandas as an optional dependency in conda environment.yml Co-Authored-By: Meghan Jones --- environment.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/environment.yml b/environment.yml index b8980edba8a..460710ba983 100644 --- a/environment.yml +++ b/environment.yml @@ -11,6 +11,8 @@ dependencies: - xarray - netCDF4 - packaging + # Optional dependencies + - geopandas # Development dependencies - black - blackdoc