Reinstall optional geopandas dependency on CI tests (#1331)

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, and include
geopandas in the conda environment.yml file.

Co-authored-by: Meghan Jones <[email protected]>

Author: weiji14

.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}

.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

environment.yml

@@ -11,6 +11,8 @@ dependencies:
     - xarray
     - netCDF4
     - packaging
+    # Optional dependencies
+    - geopandas
     # Development dependencies
     - black
     - blackdoc