From efca0a99ee516c0be4576a35370fb0ed2bf18027 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 29 Aug 2024 18:17:19 +0000 Subject: [PATCH 1/2] CI: (deps): Bump geopandas from 0.14.4 to 1.0.1 in /ci Bumps [geopandas](https://github.com/geopandas/geopandas) from 0.14.4 to 1.0.1. - [Release notes](https://github.com/geopandas/geopandas/releases) - [Changelog](https://github.com/geopandas/geopandas/blob/main/CHANGELOG.md) - [Commits](https://github.com/geopandas/geopandas/compare/v0.14.4...v1.0.1) --- updated-dependencies: - dependency-name: geopandas dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- ci/doc_requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci/doc_requirements.txt b/ci/doc_requirements.txt index c933d75603..c51eb17063 100644 --- a/ci/doc_requirements.txt +++ b/ci/doc_requirements.txt @@ -4,5 +4,5 @@ sphinx-design==0.6.1 sphinx-gallery==0.17.1 myst-parser==4.0.0 netCDF4==1.7.1 -geopandas==0.14.4 +geopandas==1.0.1 rtree==1.3.0 From b67ef63c73c765aca58c3968a2b4db9c5aadd134 Mon Sep 17 00:00:00 2001 From: Ryan May Date: Thu, 29 Aug 2024 12:56:45 -0600 Subject: [PATCH 2/2] MNT: Update `op` parameter to `predicate` Apparently this was deprecated in 0.14, but we never noticed the warning since it's only in the generated docs. --- examples/plots/nhc_wind_probabilities.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/examples/plots/nhc_wind_probabilities.py b/examples/plots/nhc_wind_probabilities.py index 667ae87453..653d357adc 100644 --- a/examples/plots/nhc_wind_probabilities.py +++ b/examples/plots/nhc_wind_probabilities.py @@ -57,7 +57,7 @@ # cities we selected above. Geopandas provides a spatial join method, which merges the two # GeoDataFrames and can tell us which wind speed probability polygon each of our city points # lies within. That information is stored in the 'PERCENTAGE' column below. -cities = geopandas.sjoin(cities, wind_data, how='left', op='within') +cities = geopandas.sjoin(cities, wind_data, how='left', predicate='within') cities ###########################