Skip to content

Reinstall optional geopandas dependency on CI tests #1331

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Jun 18, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/ci_tests.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ jobs:
optional-packages: ''
- python-version: 3.9
numpy-version: '1.20'
optional-packages: '' # 'geopandas'
optional-packages: 'geopandas'
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Seems like geopandas on conda-forge split into two packages in conda-forge/geopandas-feedstock#90. There is geopandas-base (light version) and geopandas (full version). An option might be to install geopandas-base and fiona (needed for doing I/O, c.f. #1000) instead of the full geopandas package (which brings in stuff like rtree and mapclassify that we probably don't need). Or we could keep things as is and just install geopandas since that's what most users would do.

defaults:
run:
shell: bash -l {0}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/ci_tests_dev.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Unpinning gdal here should fix the failing GMT Dev Tests on Windows (that have been failing for months now, e.g. at https://github.com/GenericMappingTools/pygmt/runs/2811637685?check_suite_focus=true#step:16:18) by installing the GMT 6.3.0 dev version. However, this will need to wait until conda-forge/gmt-feedstock#154 is merged.

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
Expand Down
2 changes: 2 additions & 0 deletions environment.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,8 @@ dependencies:
- xarray
- netCDF4
- packaging
# Optional dependencies
- geopandas
# Development dependencies
- black
- blackdoc
Expand Down