Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
107 commits
Select commit Hold shift + click to select a range
ebee977
Updates to allow varying shape crs
hsteptoe Aug 22, 2024
e32f911
Ruff fixes
hsteptoe Aug 22, 2024
76eae38
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Aug 22, 2024
bcdca30
Merge branch 'SciTools:main' into bugfix-shape-masking
hsteptoe Nov 22, 2024
9dab7c6
Merge branch 'SciTools:main' into bugfix-shape-masking
hsteptoe Dec 6, 2024
ebaa1ee
Adding rasterio as optional dependency
hsteptoe Dec 6, 2024
103e3d7
Adding rasterio functionality
hsteptoe Dec 19, 2024
3c65dab
First working version with rasterio
hsteptoe Dec 20, 2024
25de18d
Add further shape geometry checks
hsteptoe Jan 3, 2025
10e4413
Update shapefile tests
hsteptoe Jan 3, 2025
cd5cf99
Reorganise test fixtures
hsteptoe Jan 3, 2025
edc25cc
Reorganise test fixtures
hsteptoe Jan 3, 2025
789c98d
Fix fixture fetching
hsteptoe Jan 3, 2025
27a9025
Merge branch 'SciTools:main' into bugfix-shape-masking
hsteptoe Jan 3, 2025
dc090a5
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Jan 3, 2025
5b1054b
Merge branch 'SciTools:main' into bugfix-shape-masking
hsteptoe Feb 7, 2025
8948ce6
Recording Affine transform trials
hsteptoe Feb 13, 2025
a77c628
Working masking
hsteptoe Feb 14, 2025
1793e1f
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Feb 14, 2025
32ebef8
Merge branch 'main' into bugfix-shape-masking
hsteptoe Apr 4, 2025
b972c35
Linting and doc edits
hsteptoe Apr 4, 2025
9675c0f
Merge remote-tracking branch 'refs/remotes/origin/bugfix-shape-maskin…
hsteptoe Apr 4, 2025
458d9b7
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Apr 4, 2025
e28bea3
Merge branch 'main' into bugfix-shape-masking
hsteptoe May 16, 2025
4fcac0e
Merge branch 'SciTools:main' into bugfix-shape-masking
hsteptoe May 22, 2025
768af68
First-cut rewrite of masking by weight
hsteptoe May 23, 2025
b062e8e
Tidy function calls
hsteptoe May 23, 2025
b70fd1d
Working mask by weight
hsteptoe May 27, 2025
45f5324
Refactor create_shapefile_mask
hsteptoe May 28, 2025
3ded4fd
Passing tests for test_is_geometry_valid.py
hsteptoe May 30, 2025
89aad15
Minor geometry additions to test_is_geometry_valid.py
hsteptoe May 30, 2025
19365be
Working tests for transform_geometry
hsteptoe Jun 3, 2025
6251093
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Jun 6, 2025
33c6b6e
Merge branch 'SciTools:main' into bugfix-shape-masking
hsteptoe Jul 1, 2025
b528b02
Complete draft units tests for transform_geometry
hsteptoe Jul 2, 2025
e803a3d
Complete draft units tests for create_shapefile_mask
hsteptoe Jul 2, 2025
c02bebc
Complete draft units tests for _make_raster_cube_transform
hsteptoe Jul 2, 2025
7b452cd
Complete draft units tests for is_geometry_valid
hsteptoe Jul 2, 2025
0ebb9af
Auto formatting fixes
hsteptoe Jul 2, 2025
417be29
Complete draft units tests for _get_weighted_mask
hsteptoe Jul 3, 2025
f91f26a
Merge branch 'bugfix-shape-masking' of github.com:hsteptoe/iris into …
hsteptoe Jul 3, 2025
dcb85f6
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Jul 3, 2025
df3e457
Merge branch 'main' into bugfix-shape-masking
hsteptoe Jul 3, 2025
df7c1a5
Remove def _get_mod_rebased_coord_bounds
hsteptoe Jul 3, 2025
42cca35
Update reqs to include affine package
hsteptoe Jul 3, 2025
24180a3
Linting edits
hsteptoe Jul 3, 2025
e322de4
Linting edits
hsteptoe Jul 3, 2025
e60f3ab
Add cube crs error checking
hsteptoe Jul 3, 2025
ab02993
Working integration tests for mask_cube_from_shapefie
hsteptoe Jul 4, 2025
f1c6c37
Working unit tests for mask_cube_from_shapefie
hsteptoe Jul 4, 2025
d2aa50a
Merge branch 'SciTools:main' into bugfix-shape-masking
hsteptoe Jul 4, 2025
42eed14
Merge branch 'bugfix-shape-masking' of github.com:hsteptoe/iris into …
hsteptoe Jul 4, 2025
f28f7b8
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Jul 4, 2025
55b4219
Further test tweaks
hsteptoe Jul 7, 2025
2b74b37
Merge branch 'bugfix-shape-masking' of github.com:hsteptoe/iris into …
hsteptoe Jul 7, 2025
ccb87bf
mypy fixes
hsteptoe Jul 7, 2025
c6d1acc
Update locks with rasterio and affine reqs
hsteptoe Jul 7, 2025
61c1fd4
Merge branch 'main' into bugfix-shape-masking
hsteptoe Jul 7, 2025
018b99b
Add whatsnew details
hsteptoe Jul 7, 2025
5d901c8
Merge branch 'bugfix-shape-masking' of github.com:hsteptoe/iris into …
hsteptoe Jul 7, 2025
b52a0d7
Add PROJ_NETWORK env variable fix
hsteptoe Jul 16, 2025
cfae6c1
Merge branch 'bugfix-shape-masking' into main
hsteptoe Aug 13, 2025
c3a75ac
Merge pull request #2 from hsteptoe/main
hsteptoe Aug 13, 2025
c2f85eb
Merge branch 'SciTools:main' into bugfix-shape-masking
hsteptoe Aug 13, 2025
4546500
Rename functions
hsteptoe Aug 13, 2025
83772eb
Merge branch 'bugfix-shape-masking' of github.com:hsteptoe/iris into …
hsteptoe Aug 13, 2025
d3d9c9b
Merge branch 'main' into bugfix-shape-masking
hsteptoe Aug 21, 2025
9787b6a
Merge branch 'SciTools:main' into bugfix-shape-masking
hsteptoe Aug 27, 2025
73e6113
Merge branch 'bugfix-shape-masking' of github.com:hsteptoe/iris into …
hsteptoe Aug 27, 2025
7311dac
Minor function call name change
hsteptoe Aug 27, 2025
2fd65bd
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Aug 27, 2025
b455a26
pre-commit fixes
hsteptoe Aug 27, 2025
e0a4eaf
Merge branch 'main' into bugfix-shape-masking
hsteptoe Aug 29, 2025
4bba208
Merge branch 'main' into bugfix-shape-masking
hsteptoe Oct 7, 2025
84fd9c2
Resolve lock files with added rasterio and affine
hsteptoe Oct 7, 2025
bb8ba7f
Sync branches
hsteptoe Oct 7, 2025
6f42579
Resolve lock files with added rasterio and affine
hsteptoe Oct 7, 2025
d17a4d5
Test consistency updates
hsteptoe Oct 7, 2025
c4a7b63
Merge branch 'main' into bugfix-shape-masking
hsteptoe Oct 7, 2025
1536638
Update lock file urls
hsteptoe Oct 15, 2025
3d2d60b
Merge branch 'SciTools:main' into bugfix-shape-masking
hsteptoe Oct 15, 2025
3a10a0e
Trying to fix numpy-doc error
hsteptoe Oct 15, 2025
1b2b0b3
Update lockfiles
hsteptoe Oct 15, 2025
8333991
Merge branch 'main' into bugfix-shape-masking
hsteptoe Oct 15, 2025
3ee3790
Unit test tweaks
hsteptoe Oct 15, 2025
a0f7e16
Update docs/src/whatsnew/latest.rst
hsteptoe Oct 17, 2025
1250496
Update lib/iris/util.py
hsteptoe Oct 17, 2025
1997c8d
Update lib/iris/util.py
hsteptoe Oct 17, 2025
192c013
More lockfile updating
hsteptoe Oct 17, 2025
fd7bcdd
Merge branch 'bugfix-shape-masking' of github.com:hsteptoe/iris into …
hsteptoe Oct 17, 2025
df75630
First batch of code-review changes
hsteptoe Oct 17, 2025
4ee5bdd
Test API updates
hsteptoe Oct 20, 2025
2383a5e
Second batch of code-review updates
hsteptoe Oct 20, 2025
0f9ac13
Get bounds bug fix
hsteptoe Oct 20, 2025
8b809fb
Test tweaks
hsteptoe Oct 20, 2025
c14c0fb
Merge branch 'main' into bugfix-shape-masking
hsteptoe Oct 22, 2025
7aa2abb
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Oct 22, 2025
2168eed
Merge branch 'bugfix-shape-masking' of github.com:hsteptoe/iris into …
hsteptoe Oct 22, 2025
4bdb617
Fix x_coord conversion
hsteptoe Oct 22, 2025
499370d
Basic handling of radian units
hsteptoe Oct 22, 2025
32ccccc
Add extra detail to docstring example
hsteptoe Oct 23, 2025
a5f407f
Function unit tests consistency updates
hsteptoe Oct 23, 2025
a9d064e
Merge branch 'main' into bugfix-shape-masking
hsteptoe Oct 23, 2025
24585ff
Fix doc formatting gremlins
hsteptoe Oct 23, 2025
37252e1
Merge branch 'bugfix-shape-masking' of github.com:hsteptoe/iris into …
hsteptoe Oct 23, 2025
cef3fcc
Fix lockfile dependency issues
hsteptoe Oct 24, 2025
5c73b84
Merge branch 'SciTools:main' into bugfix-shape-masking
hsteptoe Oct 27, 2025
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
18 changes: 16 additions & 2 deletions docs/src/whatsnew/latest.rst
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,12 @@ This document explains the changes made to Iris for this release
horizontal grid.
(:issue:`5770`, :pull:`6581`)

#. `@hsteptoe`_ and `@trexfeathers`_ (reviewer) added :func:`iris.util.mask_cube_from_shape`
to handle additional Point and Line shape types. This change also facilitates the use of
shapefiles that use a different projection system to the cube that they are being applied to,
and makes performance improvements to the mask weighting calculations.
(:issue:`6126`, :pull:`6129`).

#. `@bjlittle`_ extended ``zlib`` compression of :class:`~iris.cube.Cube` data
payload when saving to NetCDF to also include any attached `CF-UGRID`_
:class:`~iris.mesh.components.MeshXY`. Additionally,
Expand Down Expand Up @@ -106,15 +112,20 @@ This document explains the changes made to Iris for this release
🔗 Dependencies
===============

#. N/A

#. `@hsteptoe`_ added `rasterio`_ and `affine`_ as optional dependencies that facilitate
:func:`iris.util.mask_cube_from_shape`. These packages support new functionality that
handles additional shapefile types and projections. (:issue:`6126`, :pull:`6129`)

📚 Documentation
================

#. `@rcomer`_ updated all Cartopy references to point to the new location at
https://cartopy.readthedocs.io (:pull:`6636`)

#. `@hsteptoe`_ added additional worked examples to the :func:`iris.util.mask_cube_from_shape`
documentation, to demonstrate how to use the function with different types of shapefiles.
(:pull:`6129`)


💼 Internal
===========
Expand All @@ -138,11 +149,14 @@ This document explains the changes made to Iris for this release
Whatsnew author names (@github name) in alphabetical order. Note that,
core dev names are automatically included by the common_links.inc:

.. _@hsteptoe: https://github.com/hsteptoe
.. _@melissaKG: https://github.com/melissaKG



.. comment
Whatsnew resources in alphabetical order:

.. _affine: https://affine.readthedocs.io/en/latest/
.. _netcdf-c#3183: https://github.com/Unidata/netcdf-c/issues/3183
.. _rasterio: https://rasterio.readthedocs.io/en/stable/index.html
Loading
Loading