3.15.4 merge

Changelog.rst

@@ -1,7 +1,7 @@
 version 3.15.4
 --------------
 
-**2023-10-??**
+**2023-10-10**
 
 * Record dimension coordinate cell characteristics
   (https://github.com/NCAS-CMS/cf-python/issues/692)

cf/__init__.py

@@ -75,7 +75,7 @@
 
 __Conventions__ = "CF-1.11"
 __date__ = "2023-??-??"
-__version__ = "3.17.0"
+__version__ = "3.16.0"
 
 _requires = (
     "numpy",

cf/data/array/mixin/filearraymixin.py

@@ -125,8 +125,7 @@ def file_locations(self):
 
             `tuple`
                 The file locations, one for each file, as absolute
-                paths with no trailing separate pathname component
-                separator.
+                paths with no trailing path name component separator.
 
         **Examples**
 

cf/data/data.py

@@ -456,7 +456,7 @@ def __init__(
             )
 
         # Set whether or not we're sure that the Data instance has a
-        # determinsitic name
+        # deterministic name
         self._custom["deterministic"] = not is_dask_collection(array)
 
         dx = to_dask(array, chunks, **kwargs)
@@ -6370,7 +6370,7 @@ def get_deterministic_name(self):
         that are considered equal by their `equals` methods might not
         have the same deterministic name.
 
-        An exception is raised if there is no determinisitic name.
+        An exception is raised if there is no deterministic name.
 
         .. versionadded:: 3.15.1
 
@@ -6597,7 +6597,7 @@ def add_file_location(self, location):
 
             `str`
                 The new location as an absolute path with no trailing
-                separate pathname component separator.
+                path name component separator.
 
         **Examples**
 
@@ -8887,7 +8887,7 @@ def file_locations(self):
 
             `set`
                 The unique file locations as absolute paths with no
-                trailing separate pathname component separator.
+                trailing path name component separator.
 
         **Examples**
 
@@ -9886,7 +9886,7 @@ def del_file_location(self, location):
 
             `str`
                 The removed location as an absolute path with no
-                trailing separate pathname component separator.
+                trailing path name component separator.
 
         **Examples**
 

cf/dimensioncoordinate.py

@@ -1068,14 +1068,14 @@ def set_cell_characteristics(self, cellsize, spacing):
                 the cell bounds) characteristic. May be a `Query`,
                 `TimeDuration`, scalar `Data`, scalar data_like
                 object, or `None`. A value of `None` means no
-                characteristc has been set.
+                characteristic has been set.
 
             spacing:
                 The cell spacing (i.e. the absolute difference between
                 two neighbouring coordinate values) characteristic.
                 May be a `Query`, `TimeDuration`, scalar `Data`,
                 scalar data_like object, or `None`. A value of `None`
-                means no characteristc has been set.
+                means no characteristic has been set.
 
         :Returns:
 

cf/docstring/docstring.py

@@ -471,7 +471,7 @@
                 .. note:: No checks are performed on an existing file
                           to ensure that the weights are appropriate
                           for the source field and the values of the
-                          keyword parameters. Inapproriate weights
+                          keyword parameters. Inappropriate weights
                           will produce incorrect results.
 
                           However, when regridding using weights from
@@ -493,7 +493,7 @@
 
                 The computation of the weights can be much more costly
                 than the regridding itself, in which case reading
-                pre-calcuated weights can improve performance.""",
+                pre-calculated weights can improve performance.""",
     # aggregated_units
     "{{aggregated_units: `str` or `None`, optional}}": """aggregated_units: `str` or `None`, optional
                 The units of the aggregated array. Set to `None` to

cf/domain.py

@@ -147,7 +147,7 @@ def add_file_location(
 
             `str`
                 The new location as an absolute path with no trailing
-                separate pathname component separator.
+                path name component separator.
 
         **Examples**
 
@@ -308,7 +308,7 @@ def del_file_location(
 
             `str`
                 The removed location as an absolute path with no
-                trailing separate pathname component separator.
+                trailing path name component separator.
 
         **Examples**
 
@@ -449,7 +449,7 @@ def file_locations(
 
             `set`
                 The unique file locations as absolute paths with no
-                trailing separate pathname component separator.
+                trailing path name component separator.
 
         **Examples**
 

cf/field.py

@@ -2520,7 +2520,7 @@ def del_file_location(
 
             `str`
                 The removed location as an absolute path with no
-                trailing separate pathname component separator.
+                trailing path name component separator.
 
         **Examples**
 
@@ -10528,7 +10528,7 @@ def file_locations(self, constructs=True):
 
             `set`
                 The unique file locations as absolute paths with no
-                trailing separate pathname component separator.
+                trailing path name component separator.
 
         **Examples**
 
@@ -13062,7 +13062,7 @@ def add_file_location(
 
             `str`
                 The new location as an absolute path with no trailing
-                separate pathname component separator.
+                path name component separator.
 
         **Examples**
 

cf/mixin/propertiesdata.py

@@ -1646,7 +1646,7 @@ def add_file_location(self, location):
 
             `str`
                 The new location as an absolute path with no trailing
-                separate pathname component separator.
+                path name component separator.
 
         **Examples**
 
@@ -3054,7 +3054,7 @@ def del_file_location(self, location):
 
             `str`
                 The removed location as an absolute path with no
-                trailing separate pathname component separator.
+                trailing path name component separator.
 
         **Examples**
 
@@ -3225,7 +3225,7 @@ def equivalent(self, other, rtol=None, atol=None, traceback=False):
             return True
 
         # Check that each instance is the same type
-        if type(self) is type(other):
+        if type(self) is not type(other):
             print(
                 f"{self.__class__.__name__}: Different types: "
                 f"{self.__class__.__name__}, {other.__class__.__name__}"
@@ -3411,7 +3411,7 @@ def file_locations(self):
 
             `set`
                 The unique file locations as absolute paths with no
-                trailing separate pathname component separator.
+                trailing path name component separator.
 
         **Examples**
 

cf/mixin/propertiesdatabounds.py

@@ -1170,7 +1170,7 @@ def add_file_location(self, location):
 
             `str`
                 The new location as an absolute path with no trailing
-                separate pathname component separator.
+                path name component separator.
 
         **Examples**
 
@@ -1675,7 +1675,7 @@ def equivalent(self, other, rtol=None, atol=None, traceback=False):
             return True
 
         # Check that each instance is the same type
-        if type(self) is type(other):
+        if type(self) is not type(other):
             print(
                 f"{self.__class__.__name__}: Different types: "
                 f"{self.__class__.__name__}, {other.__class__.__name__}"
@@ -2059,7 +2059,7 @@ def file_locations(self):
 
             `set`
                 The unique file locations as absolute paths with no
-                trailing separate pathname component separator.
+                trailing path name component separator.
 
         **Examples**
 
@@ -2169,7 +2169,7 @@ def del_file_location(self, location):
 
             `str`
                 The removed location as an absolute path with no
-                trailing separate pathname component separator.
+                trailing path name component separator.
 
         **Examples**
 

cf/test/test_general.py

@@ -43,6 +43,25 @@ def test_GENERAL(self):
 
         f == c
 
+        # +, -, *, /, **
+        h = g.copy()
+        h **= 2
+        h **= 0.5
+        h.standard_name = g.standard_name
+        self.assertTrue(g.data.allclose(h.data), repr(g.array - h.array))
+        h *= 10
+        h /= 10.0
+        self.assertTrue(g.data.allclose(h.data), repr(g.array - h.array))
+        h += 1
+        h -= 1
+        self.assertTrue(g.data.allclose(h.data), repr(g.array - h.array))
+        h = h * 10
+        h = h / 10.0
+        self.assertTrue(g.data.allclose(h.data), repr(g.array - h.array))
+        h = h + 1
+        h = h - 1
+        self.assertTrue(g.data.allclose(h.data), repr(g.array - h.array))
+
         # flip, expand_dims, squeeze and remove_axes
         h = g.copy()
         h.flip((1, 0), inplace=True)

docs/2_to_3_changes.html

@@ -44,7 +44,7 @@
 
 
 
-<h1 class="logo"><a href="index.html">cf 3.15.3</a></h1>
+<h1 class="logo"><a href="index.html">cf 3.15.4</a></h1>
 
 
 
@@ -142,7 +142,7 @@ <h2>Python<a class="headerlink" href="#python" title="Permalink to this headline
 </section>
 <section id="in-place-operations">
 <h2>In-place operations<a class="headerlink" href="#in-place-operations" title="Permalink to this headline">¶</a></h2>
-<p>At version 3.x, in-place operations return <a class="reference external" href="https://docs.python.org/3/library/constants.html#None" title="(in Python v3.11)"><code class="xref py py-obj docutils literal notranslate"><span class="pre">None</span></code></a>, rather than the
+<p>At version 3.x, in-place operations return <a class="reference external" href="https://docs.python.org/3/library/constants.html#None" title="(in Python v3.12)"><code class="xref py py-obj docutils literal notranslate"><span class="pre">None</span></code></a>, rather than the
 modified construct. The keyword that defines the operation to be
 in-place is now <em>inplace</em> (rather than <em>i</em>).</p>
 <div class="highlight-python notranslate"><div class="highlight"><pre><span></span><span class="gp">&gt;&gt;&gt; </span><span class="n">g</span> <span class="o">=</span> <span class="n">f</span><span class="o">.</span><span class="n">tranpose</span><span class="p">()</span>
@@ -491,7 +491,7 @@ <h2>Changes to the  API of existing methods<a class="headerlink" href="#changes-
     <div class="clearer"></div>
   </div>
     <div class="footer">
-      &copy;2023, NCAS | Page built on 2023-08-31.
+      &copy;2023, NCAS | Page built on 2023-10-10.
 
       |
       Powered by <a href="http://sphinx-doc.org/">Sphinx 2.4.5</a>