Merged
Conversation
github-actions
bot
force-pushed
the
auto-update-lockfiles
branch
2 times, most recently
from
e4fe4f4 to
1c71cd9
Compare
github-actions
bot
force-pushed
the
auto-update-lockfiles
branch
2 times, most recently
from
be60340 to
91ed151
Compare
github-actions
bot
force-pushed
the
auto-update-lockfiles
branch
from
91ed151 to
12036a6
Compare
stephenworsley
approved these changes
Feb 28, 2024
stephenworsley
added a commit
that referenced
this pull request
Feb 28, 2024
This reverts commit 6361b9b.
bjlittle
pushed a commit
that referenced
this pull request
Feb 28, 2024
stephenworsley
added a commit
to stephenworsley/iris-esmf-regrid
that referenced
this pull request
Apr 25, 2024
* main: (42 commits) Update lockfiles and fix for new esmpy (SciTools#342) Fix for esmpy (SciTools#353) Fix usage of map_blocks (SciTools#338) Revert "Updated environment lockfiles (SciTools#335)" (SciTools#341) Updated environment lockfiles (SciTools#335) Bump actions/cache from 3 to 4 (SciTools#333) Bump actions/upload-artifact from 3 to 4 (SciTools#324) Bump actions/stale from 8.0.0 to 9.0.0 (SciTools#322) fix asv (SciTools#339) [pre-commit.ci] pre-commit autoupdate (SciTools#330) Bump scitools/workflows from 2023.09.0 to 2024.01.0 (SciTools#334) Updated environment lockfiles (SciTools#327) [pre-commit.ci] pre-commit autoupdate (SciTools#328) Updated environment lockfiles (SciTools#304) Add CITATION.cff (SciTools#319) updated for enums (SciTools#293) Flake8 compliant type checking. (SciTools#316) update to v0.10.dev0 (SciTools#314) Update to v0.9 (SciTools#313) First pass at mesh to mesh (SciTools#311) ... # Conflicts: # CHANGELOG.md # esmf_regrid/esmf_regridder.py # esmf_regrid/schemes.py
stephenworsley
added a commit
to stephenworsley/iris-esmf-regrid
that referenced
this pull request
May 2, 2024
* main: (29 commits) Bump scitools/workflows from 2024.01.0 to 2024.04.3 (SciTools#356) Bump peter-evans/create-pull-request from 5.0.2 to 6.0.5 (SciTools#355) [pre-commit.ci] pre-commit autoupdate (SciTools#336) Updated environment lockfiles (SciTools#344) Update lockfiles and fix for new esmpy (SciTools#342) Fix for esmpy (SciTools#353) Fix usage of map_blocks (SciTools#338) Revert "Updated environment lockfiles (SciTools#335)" (SciTools#341) Updated environment lockfiles (SciTools#335) Bump actions/cache from 3 to 4 (SciTools#333) Bump actions/upload-artifact from 3 to 4 (SciTools#324) Bump actions/stale from 8.0.0 to 9.0.0 (SciTools#322) fix asv (SciTools#339) [pre-commit.ci] pre-commit autoupdate (SciTools#330) Bump scitools/workflows from 2023.09.0 to 2024.01.0 (SciTools#334) Updated environment lockfiles (SciTools#327) [pre-commit.ci] pre-commit autoupdate (SciTools#328) Updated environment lockfiles (SciTools#304) Add CITATION.cff (SciTools#319) updated for enums (SciTools#293) ... # Conflicts: # esmf_regrid/schemes.py
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Lockfiles updated to the latest resolvable environment.