Skip to content
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

Numpy v2 #584

Merged
merged 8 commits into from
Oct 11, 2024
Merged

Numpy v2 #584

merged 8 commits into from
Oct 11, 2024

Conversation

scottyhq
Copy link
Member

@scottyhq scottyhq commented Oct 1, 2024

Bring numpy v2 to pangeo-notebook. And nano by popular demand #576 :)

@pangeo-bot
Copy link
Collaborator

/condalock
Automatically locking new conda environment, building, and testing images...

Copy link
Contributor

github-actions bot commented Oct 1, 2024

Binder 👈 Try on Mybinder.org!

@@ -215,9 +214,7 @@ gcc_impl_linux-64==13.3.0
gcc_linux-64==13.3.0
gcm_filters==0.3.0
gcsfs==2024.9.0
gdal==3.9.2
Copy link
Member Author

Choose a reason for hiding this comment

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

Interesting, gdal command line tools it turns out have been coming from pyogrio, with the latest release it's just libgdal-core dependency https://github.com/geopandas/pyogrio/releases/tag/v0.10.0

Copy link
Member

Choose a reason for hiding this comment

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

Not just pyogrio but also rasterio has switched to libgdal-core, see conda-forge/pyogrio-feedstock#48 and conda-forge/rasterio-feedstock#303.

@scottyhq
Copy link
Member Author

scottyhq commented Oct 1, 2024

/condalock

@scottyhq scottyhq requested a review from weiji14 October 1, 2024 11:06
@@ -215,9 +214,7 @@ gcc_impl_linux-64==13.3.0
gcc_linux-64==13.3.0
gcm_filters==0.3.0
gcsfs==2024.9.0
gdal==3.9.2
Copy link
Member

Choose a reason for hiding this comment

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

Not just pyogrio but also rasterio has switched to libgdal-core, see conda-forge/pyogrio-feedstock#48 and conda-forge/rasterio-feedstock#303.

Comment on lines 37 to 38
# temporarily drop for numpy>=2 (can use xvec instead)
#- geocube
Copy link
Member

Choose a reason for hiding this comment

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

Interesting, so geocube pinned to numpy<2 here - corteva/geocube#175, but the incompatibility should have been fixed in rasterio 1.4 at rasterio/rasterio#3109 if I'm reading correctly. Could open an issue on geocube to check, but ok to temporarily remove for now.

Copy link
Member Author

Choose a reason for hiding this comment

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

but the incompatibility should have been fixed in rasterio 1.4 at rasterio/rasterio#3109 if I'm reading correctly. Could open an issue on geocube to check, but ok to temporarily remove for now.

That would be great! I took the lazy approach just to see if this was the last remaining hold-out :)

Copy link
Member

Choose a reason for hiding this comment

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

Opened a PR to remove the numpy<2 pin at corteva/geocube#179 🤞

Copy link
Member

Choose a reason for hiding this comment

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

Geocube 0.7.0 is out - conda-forge/geocube-feedstock#41. I'll update the environment.yml file and re-lock

@weiji14 weiji14 mentioned this pull request Oct 7, 2024
3 tasks
Partially revert 718d6c2 since geocube 0.7.0 support numpy=2 now.
@weiji14
Copy link
Member

weiji14 commented Oct 8, 2024

/condalock

@weiji14 weiji14 mentioned this pull request Oct 10, 2024
@weiji14
Copy link
Member

weiji14 commented Oct 10, 2024

/condalock

Copy link
Member

@weiji14 weiji14 left a comment

Choose a reason for hiding this comment

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

Have resolved the merge conflict after merging in #585. @scottyhq, feel free to merge and tag a new version when you're free.

Edit: I just realized #585 updated to Numpy v2 automatically 😆

@scottyhq scottyhq merged commit 09567e9 into master Oct 11, 2024
5 checks passed
@scottyhq scottyhq deleted the numpy2 branch October 11, 2024 07:16
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants