Update _validate_against_pure_literal to fail on Xarray objects#2527
Merged
VeckoTheGecko merged 3 commits intoParcels-code:mainfrom Mar 2, 2026
Merged
Update _validate_against_pure_literal to fail on Xarray objects#2527VeckoTheGecko merged 3 commits intoParcels-code:mainfrom
_validate_against_pure_literal to fail on Xarray objects#2527VeckoTheGecko merged 3 commits intoParcels-code:mainfrom
Conversation
Also cleaned out the test_typing.py and _typing.py modules
VeckoTheGecko
commented
Mar 2, 2026
tests-v3/test_typing.py
Outdated
Contributor
Author
There was a problem hiding this comment.
moved this file as well into the v4 testsuite
Comment on lines
+42
to
+46
| def _is_xarray_object(obj): # with no imports | ||
| try: | ||
| return "xarray.core" in obj.__module__ | ||
| except AttributeError: | ||
| return False |
Contributor
Author
There was a problem hiding this comment.
here we avoid importing xarray (otherwise we risk circular imports)
| raise ValueError(msg) | ||
|
|
||
|
|
||
| # Assertion functions to clean user input |
Contributor
Author
There was a problem hiding this comment.
assert_valid_interp_method and assert_valid_gridindexingtype unused in v4
VeckoTheGecko
changed the title
_validate_against_pure_literal_validate_against_pure_literal to skip Xarray objects
VeckoTheGecko
changed the title
_validate_against_pure_literal to skip Xarray objects_validate_against_pure_literal to fail on Xarray objects
erikvansebille
approved these changes
Mar 2, 2026
Member
erikvansebille
left a comment
erikvansebille
left a comment
There was a problem hiding this comment.
Looks good; one comment below
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
2 participants
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.
Due to a bug in xarray (pydata/xarray#11209) type guarding with
value in (....)wasn't working as expected.As an xarray dataset is never a value in a
Literal[...]typing statement - I have updated our typeguarding clause to error if its an xarray dataset.