Merge branch 'main' into create-bounds

Author: davidhassell

Changelog.rst

@@ -9,7 +9,7 @@ version 3.??.?
 version 3.17.0
 --------------
 
-**2025-03-??**
+**2025-03-24**
 
 * Set new minimum version of `dask`: ``2025.2.0``
   (https://github.com/NCAS-CMS/cf-python/issues/849)
@@ -21,6 +21,9 @@ version 3.17.0
   ``key`` (https://github.com/NCAS-CMS/cf-python/issues/802)
 * New keyword parameter to `cf.histogram`: ``density``
   (https://github.com/NCAS-CMS/cf-python/issues/794)
+* Fix bug that caused `Data._axes` to be incorrect after a call to
+  `cf.Field.collapse`
+  (https://github.com/NCAS-CMS/cf-python/issues/857)
 * Changed dependency: ``Python>=3.9.0``
 * Changed dependency: ``numpy>=2.0.0``
 * Changed dependency: ``cfdm>=1.12.0.0, <1.12.1.0``

DOCUMENTATION.md

@@ -37,7 +37,7 @@
   ```
 
 * If the filter doesn't exist, it has to be added in `<div class="filter-menu">` 
-  alphabetically for `/docs/source/recipes/README.rst`, e.g.,
+  alphabetically for `docs/source/recipes/README.rst`, e.g.,
 
   ```html
   <div class="filter-menu">

cf/__init__.py

@@ -72,15 +72,15 @@
 
 Powerful, flexible, and very simple to produce visualisations of field
 constructs uses the `cfplot` package
-(http://ajheaps.github.io/cf-plot), that is automatically installed
+(https://ncas-cms.github.io/cf-plot/build/), that is automatically installed
 along with with `cf`.
 
 See the :ref:`cf-python home page <cf-python-home>` for documentation,
 installation and source code.
 
 """
 
-__date__ = "2025-03-??"
+__date__ = "2025-03-24"
 __version__ = "3.17.0"
 
 _requires = (

cf/aggregate.py

@@ -5005,7 +5005,7 @@ def dsg_feature_type_axis(meta, axis):
 def _fix_promoted_field_ancillaries(output_meta, axes_aggregated):
     """Remove non-aggregated axes from promoted field ancillaries.
 
-    .. versionadded:: NEXTVERSION
+    .. versionadded:: 3.17.0
 
     :Parameters:
 

cf/data/array/aggregatedarray.py

@@ -7,14 +7,14 @@
 class AggregatedArray(Container, cfdm.AggregatedArray):
     """An array stored in a CF aggregation variable.
 
-    .. versionadded:: NEXTVERSION
+    .. versionadded:: 3.17.0
 
     """
 
     def __new__(cls, *args, **kwargs):
         """Store fragment array classes.
 
-        .. versionadded:: NEXTVERSION
+        .. versionadded:: 3.17.0
 
         """
         # Override the inherited FragmentFileArray class

cf/data/array/umarray.py

@@ -635,7 +635,7 @@ def get_byte_ordering(self):
 
             `str` or `None`
                 ``'little_endian'`` or ``'big_endian'``. If the byte
-                ordereing has not been set then `None` is returned, in
+                ordering has not been set then `None` is returned, in
                 which case byte ordering will be detected
                 automatically (if possible) when the file is opened
                 with `open`.

cf/data/data.py

@@ -2807,7 +2807,7 @@ def _concatenate_conform_units(cls, data1, units0, relaxed_units, copy):
         overridden in subclasses, to allow for customisation of the
         concatenation process.
 
-        .. versionadded:: NEXTVERSION
+        .. versionadded:: 3.17.0
 
         .. seealso:: `concatenate`
 
@@ -2868,7 +2868,7 @@ def _concatenate_post_process(
         overridden in subclasses, to allow for customisation of the
         concatenation process.
 
-        .. versionadded:: NEXTVERSION
+        .. versionadded:: 3.17.0
 
         .. seealso:: `concatenate`
 

cf/data/fragment/fragmentfilearray.py

@@ -9,14 +9,14 @@ class FragmentFileArray(
 ):
     """Fragment of aggregated data in a file.
 
-    .. versionadded:: NEXTVERSION
+    .. versionadded:: 3.17.0
 
     """
 
     def __new__(cls, *args, **kwargs):
         """Store fragment classes.
 
-        .. versionadded:: NEXTVERSION
+        .. versionadded:: 3.17.0
 
         """
         # Import fragment classes. Do this here (as opposed to outside

cf/data/utils.py

@@ -402,8 +402,14 @@ def collapse(
             weights, axis)``.
 
     """
+    original_size = d.size
+    if axis is None:
+        axis = range(d.ndim)
+    else:
+        axis = d._parse_axes(axis)
+
     kwargs = {
-        "axis": axis,
+        "axis": tuple(axis),
         "keepdims": keepdims,
         "split_every": split_every,
         "mtol": mtol,
@@ -424,6 +430,14 @@ def collapse(
     dx = func(dx, **kwargs)
     d._set_dask(dx)
 
+    if not keepdims:
+        # Remove collapsed axis names
+        d._axes = [a for i, a in enumerate(d._axes) if i not in axis]
+
+    if d.size != original_size:
+        # Remove the out-dated HDF5 chunking strategy
+        d.nc_clear_hdf5_chunksizes()
+
     return d, weights
 
 

cf/dimensioncoordinate.py

@@ -279,7 +279,7 @@ def anchor(self, value, cell=False, parameters=None, inplace=False):
                 units as the coordinates.
 
                 The coordinate values are transformed so the first
-                corodinate is the closest to *value* from above (for
+                coordinate is the closest to *value* from above (for
                 increasing coordinates), or the closest to *value* from
                 above (for decreasing coordinates)
 
@@ -328,7 +328,7 @@ def anchor(self, value, cell=False, parameters=None, inplace=False):
 
             parameters: `dict`, optional
                 If a `dict` is provided then it will be updated
-                in-place with parameters which describe thethe
+                in-place with parameters which describe the
                 anchoring process.
 
             {{inplace: `bool`, optional}}