-
Notifications
You must be signed in to change notification settings - Fork 297
Refactor shape masking #6129
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
Merged
Merged
Refactor shape masking #6129
Changes from 72 commits
Commits
Show all changes
114 commits
Select commit
Hold shift + click to select a range
ebee977
Updates to allow varying shape crs
hsteptoe e32f911
Ruff fixes
hsteptoe 76eae38
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] bcdca30
Merge branch 'SciTools:main' into bugfix-shape-masking
hsteptoe 9dab7c6
Merge branch 'SciTools:main' into bugfix-shape-masking
hsteptoe ebaa1ee
Adding rasterio as optional dependency
hsteptoe 103e3d7
Adding rasterio functionality
hsteptoe 3c65dab
First working version with rasterio
hsteptoe 25de18d
Add further shape geometry checks
hsteptoe 10e4413
Update shapefile tests
hsteptoe cd5cf99
Reorganise test fixtures
hsteptoe edc25cc
Reorganise test fixtures
hsteptoe 789c98d
Fix fixture fetching
hsteptoe 27a9025
Merge branch 'SciTools:main' into bugfix-shape-masking
hsteptoe dc090a5
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] 5b1054b
Merge branch 'SciTools:main' into bugfix-shape-masking
hsteptoe 8948ce6
Recording Affine transform trials
hsteptoe a77c628
Working masking
hsteptoe 1793e1f
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] 32ebef8
Merge branch 'main' into bugfix-shape-masking
hsteptoe b972c35
Linting and doc edits
hsteptoe 9675c0f
Merge remote-tracking branch 'refs/remotes/origin/bugfix-shape-maskin…
hsteptoe 458d9b7
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] e28bea3
Merge branch 'main' into bugfix-shape-masking
hsteptoe 4fcac0e
Merge branch 'SciTools:main' into bugfix-shape-masking
hsteptoe 768af68
First-cut rewrite of masking by weight
hsteptoe b062e8e
Tidy function calls
hsteptoe b70fd1d
Working mask by weight
hsteptoe 45f5324
Refactor create_shapefile_mask
hsteptoe 3ded4fd
Passing tests for test_is_geometry_valid.py
hsteptoe 89aad15
Minor geometry additions to test_is_geometry_valid.py
hsteptoe 19365be
Working tests for transform_geometry
hsteptoe 6251093
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] 33c6b6e
Merge branch 'SciTools:main' into bugfix-shape-masking
hsteptoe b528b02
Complete draft units tests for transform_geometry
hsteptoe e803a3d
Complete draft units tests for create_shapefile_mask
hsteptoe c02bebc
Complete draft units tests for _make_raster_cube_transform
hsteptoe 7b452cd
Complete draft units tests for is_geometry_valid
hsteptoe 0ebb9af
Auto formatting fixes
hsteptoe 417be29
Complete draft units tests for _get_weighted_mask
hsteptoe f91f26a
Merge branch 'bugfix-shape-masking' of github.com:hsteptoe/iris into …
hsteptoe dcb85f6
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] df3e457
Merge branch 'main' into bugfix-shape-masking
hsteptoe df7c1a5
Remove def _get_mod_rebased_coord_bounds
hsteptoe 42cca35
Update reqs to include affine package
hsteptoe 24180a3
Linting edits
hsteptoe e322de4
Linting edits
hsteptoe e60f3ab
Add cube crs error checking
hsteptoe ab02993
Working integration tests for mask_cube_from_shapefie
hsteptoe f1c6c37
Working unit tests for mask_cube_from_shapefie
hsteptoe d2aa50a
Merge branch 'SciTools:main' into bugfix-shape-masking
hsteptoe 42eed14
Merge branch 'bugfix-shape-masking' of github.com:hsteptoe/iris into …
hsteptoe f28f7b8
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] 55b4219
Further test tweaks
hsteptoe 2b74b37
Merge branch 'bugfix-shape-masking' of github.com:hsteptoe/iris into …
hsteptoe ccb87bf
mypy fixes
hsteptoe c6d1acc
Update locks with rasterio and affine reqs
hsteptoe 61c1fd4
Merge branch 'main' into bugfix-shape-masking
hsteptoe 018b99b
Add whatsnew details
hsteptoe 5d901c8
Merge branch 'bugfix-shape-masking' of github.com:hsteptoe/iris into …
hsteptoe b52a0d7
Add PROJ_NETWORK env variable fix
hsteptoe cfae6c1
Merge branch 'bugfix-shape-masking' into main
hsteptoe c3a75ac
Merge pull request #2 from hsteptoe/main
hsteptoe c2f85eb
Merge branch 'SciTools:main' into bugfix-shape-masking
hsteptoe 4546500
Rename functions
hsteptoe 83772eb
Merge branch 'bugfix-shape-masking' of github.com:hsteptoe/iris into …
hsteptoe d3d9c9b
Merge branch 'main' into bugfix-shape-masking
hsteptoe 9787b6a
Merge branch 'SciTools:main' into bugfix-shape-masking
hsteptoe 73e6113
Merge branch 'bugfix-shape-masking' of github.com:hsteptoe/iris into …
hsteptoe 7311dac
Minor function call name change
hsteptoe 2fd65bd
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] b455a26
pre-commit fixes
hsteptoe e0a4eaf
Merge branch 'main' into bugfix-shape-masking
hsteptoe 4bba208
Merge branch 'main' into bugfix-shape-masking
hsteptoe 84fd9c2
Resolve lock files with added rasterio and affine
hsteptoe bb8ba7f
Sync branches
hsteptoe 6f42579
Resolve lock files with added rasterio and affine
hsteptoe d17a4d5
Test consistency updates
hsteptoe c4a7b63
Merge branch 'main' into bugfix-shape-masking
hsteptoe 1536638
Update lock file urls
hsteptoe 3d2d60b
Merge branch 'SciTools:main' into bugfix-shape-masking
hsteptoe 3a10a0e
Trying to fix numpy-doc error
hsteptoe 1b2b0b3
Update lockfiles
hsteptoe 8333991
Merge branch 'main' into bugfix-shape-masking
hsteptoe 3ee3790
Unit test tweaks
hsteptoe a0f7e16
Update docs/src/whatsnew/latest.rst
hsteptoe 1250496
Update lib/iris/util.py
hsteptoe 1997c8d
Update lib/iris/util.py
hsteptoe 192c013
More lockfile updating
hsteptoe fd7bcdd
Merge branch 'bugfix-shape-masking' of github.com:hsteptoe/iris into …
hsteptoe df75630
First batch of code-review changes
hsteptoe 4ee5bdd
Test API updates
hsteptoe 2383a5e
Second batch of code-review updates
hsteptoe 0f9ac13
Get bounds bug fix
hsteptoe 8b809fb
Test tweaks
hsteptoe c14c0fb
Merge branch 'main' into bugfix-shape-masking
hsteptoe 7aa2abb
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] 2168eed
Merge branch 'bugfix-shape-masking' of github.com:hsteptoe/iris into …
hsteptoe 4bdb617
Fix x_coord conversion
hsteptoe 499370d
Basic handling of radian units
hsteptoe 32ccccc
Add extra detail to docstring example
hsteptoe a5f407f
Function unit tests consistency updates
hsteptoe a9d064e
Merge branch 'main' into bugfix-shape-masking
hsteptoe 24585ff
Fix doc formatting gremlins
hsteptoe 37252e1
Merge branch 'bugfix-shape-masking' of github.com:hsteptoe/iris into …
hsteptoe cef3fcc
Fix lockfile dependency issues
hsteptoe 539db07
Minor test fixes
hsteptoe 5c73b84
Merge branch 'SciTools:main' into bugfix-shape-masking
hsteptoe 01219c0
Merge branch 'bugfix-shape-masking' of github.com:hsteptoe/iris into …
hsteptoe ba0ae9a
Merge branch 'main' into bugfix-shape-masking
hsteptoe 41a7171
Second round review updates
hsteptoe a5ff532
Merge branch 'bugfix-shape-masking' of github.com:hsteptoe/iris into …
hsteptoe fefea68
Fix test Raise -> Warn change
hsteptoe dfb0847
Further review responses
hsteptoe File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
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
Oops, something went wrong.
Oops, something went wrong.
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.
Uh oh!
There was an error while loading. Please reload this page.