Skip to content

make DriverVectorCube.from_geodataframe compatible with pandas 3 #460

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.

Sign up for GitHub

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

Draft
soxofaan wants to merge 1 commit into
base: master
Choose a base branch
from
+6 −2
Draft

make DriverVectorCube.from_geodataframe compatible with pandas 3 #460

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 5 additions & 1 deletion openeo_driver/datacube.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -354,7 +354,11 @@ def from_geodataframe(
columns_for_cube = cls.COLUMN_SELECTION_NUMERICAL

if columns_for_cube == cls.COLUMN_SELECTION_NUMERICAL:
columns_for_cube = [c for c in available_columns if numpy.issubdtype(data[c].dtype, numpy.number)]
columns_for_cube = [
c
for c in available_columns
if isinstance(data[c].dtype, numpy.dtype) and numpy.issubdtype(data[c].dtype, numpy.number)
]
elif columns_for_cube == cls.COLUMN_SELECTION_ALL:
columns_for_cube = available_columns
elif isinstance(columns_for_cube, list):
Expand Down
2 changes: 1 addition & 1 deletion setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@
"gunicorn>=20.0.1",
"numpy>=1.22.0",
"shapely>=1.8.5", # TODO #158 bump requirement to at least 2.0.0 for simplicity (once openeo-geopyspark-driver allows it too)
"pandas>=1.4.0,<3.0.0", # DriverVectorCube.from_geojson incompatiblity with pandas 3 https://github.com/Open-EO/openeo-python-driver/issues/459
"pandas>=1.4.0",
"geopandas>=0.11.0", # 0.11.0 fixes https://github.com/geopandas/geopandas/pull/2243
"xarray>=0.16.2",
"flask-cors",
Expand Down