v3.15.4 documentation

Author: davidhassell

cf/mixin/propertiesdata.py

@@ -3282,7 +3282,7 @@ def equivalent(self, other, rtol=None, atol=None, traceback=False):
             return True
 
         # Check that each instance is the same type
-        if type(self) != type(other):
+        if type(self) is not type(other):
             print(
                 f"{self.__class__.__name__}: Different types: "
                 f"{self.__class__.__name__}, {other.__class__.__name__}"

cf/mixin/propertiesdatabounds.py

@@ -1734,7 +1734,7 @@ def equivalent(self, other, rtol=None, atol=None, traceback=False):
             return True
 
         # Check that each instance is the same type
-        if type(self) != type(other):
+        if type(self) is not type(other):
             print(
                 f"{self.__class__.__name__}: Different types: "
                 f"{self.__class__.__name__}, {other.__class__.__name__}"

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>

docs/Changelog.html

@@ -5,21 +5,10 @@
 
 Computation times
 =================
-<<<<<<< HEAD
 **07:52.733** total execution time for **recipes** files:
 
 +-------------------------------------------------------------------+-----------+--------+
 | :ref:`sphx_glr_recipes_plot_15_recipe.py` (``plot_15_recipe.py``) | 07:52.733 | 0.0 MB |
-=======
-**60:33.053** total execution time for **recipes** files:
-
-+-------------------------------------------------------------------+-----------+--------+
-| :ref:`sphx_glr_recipes_plot_15_recipe.py` (``plot_15_recipe.py``) | 54:12.592 | 0.0 MB |
-+-------------------------------------------------------------------+-----------+--------+
-| :ref:`sphx_glr_recipes_plot_13_recipe.py` (``plot_13_recipe.py``) | 05:17.754 | 0.0 MB |
-+-------------------------------------------------------------------+-----------+--------+
-| :ref:`sphx_glr_recipes_plot_12_recipe.py` (``plot_12_recipe.py``) | 01:02.707 | 0.0 MB |
->>>>>>> 972cdaadceecfaa123a4956c50333c6bc1f0f56f
 +-------------------------------------------------------------------+-----------+--------+
 | :ref:`sphx_glr_recipes_plot_01_recipe.py` (``plot_01_recipe.py``) | 00:00.000 | 0.0 MB |
 +-------------------------------------------------------------------+-----------+--------+
@@ -43,12 +32,9 @@ Computation times
 +-------------------------------------------------------------------+-----------+--------+
 | :ref:`sphx_glr_recipes_plot_11_recipe.py` (``plot_11_recipe.py``) | 00:00.000 | 0.0 MB |
 +-------------------------------------------------------------------+-----------+--------+
-<<<<<<< HEAD
 | :ref:`sphx_glr_recipes_plot_12_recipe.py` (``plot_12_recipe.py``) | 00:00.000 | 0.0 MB |
 +-------------------------------------------------------------------+-----------+--------+
 | :ref:`sphx_glr_recipes_plot_13_recipe.py` (``plot_13_recipe.py``) | 00:00.000 | 0.0 MB |
 +-------------------------------------------------------------------+-----------+--------+
-=======
->>>>>>> 972cdaadceecfaa123a4956c50333c6bc1f0f56f
 | :ref:`sphx_glr_recipes_plot_14_recipe.py` (``plot_14_recipe.py``) | 00:00.000 | 0.0 MB |
 +-------------------------------------------------------------------+-----------+--------+

docs/_downloads/cf_tutorial_files.zip

@@ -16,6 +16,7 @@ Documentation for all versions of cf.
 **CF-1.10**
 -----------
 
+* `Version 3.15.4 <https://ncas-cms.github.io/cf-python-docs/3.15.4>`_ (2023-10-10)
 * `Version 3.15.3 <https://ncas-cms.github.io/cf-python-docs/3.15.3>`_ (2023-08-31)
 * `Version 3.15.2 <https://ncas-cms.github.io/cf-python-docs/3.15.2>`_ (2023-07-21)
 * `Version 3.15.1 <https://ncas-cms.github.io/cf-python-docs/3.15.1>`_ (2023-06-09)

docs/_sources/recipes/sg_execution_times.rst.txt

@@ -1,6 +1,6 @@
 var DOCUMENTATION_OPTIONS = {
     URL_ROOT: document.getElementById("documentation_options").getAttribute('data-url_root'),
-    VERSION: '3.15.3',
+    VERSION: '3.15.4',
     LANGUAGE: 'None',
     COLLAPSE_INDEX: false,
     BUILDER: 'html',

docs/_sources/releases.rst.txt

@@ -22,7 +22,6 @@ span.linenos.special { color: #000000; background-color: #ffffc0; padding-left:
 .highlight .cs { color: #8f5902; font-style: italic } /* Comment.Special */
 .highlight .gd { color: #a40000 } /* Generic.Deleted */
 .highlight .ge { color: #000000; font-style: italic } /* Generic.Emph */
-.highlight .ges { color: #000000 } /* Generic.EmphStrong */
 .highlight .gr { color: #ef2929 } /* Generic.Error */
 .highlight .gh { color: #000080; font-weight: bold } /* Generic.Heading */
 .highlight .gi { color: #00A000 } /* Generic.Inserted */

docs/_static/documentation_options.js

@@ -46,7 +46,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>
 
 
 
@@ -130,7 +130,7 @@ <h3>Related Topics</h3>
   <section id="aggregation-rules">
 <span id="id1"></span><h1><strong>Aggregation rules</strong><a class="headerlink" href="#aggregation-rules" title="Permalink to this headline">¶</a></h1>
 <hr class="docutils" />
-<p>Version 3.15.3 for version 1.10 of the CF conventions.</p>
+<p>Version 3.15.4 for version 1.10 of the CF conventions.</p>
 <p><em>David Hassell and Jonathan Gregory (2012)</em></p>
 <p><a class="reference external" href="https://cf-trac.llnl.gov/trac/ticket/78">https://cf-trac.llnl.gov/trac/ticket/78</a></p>
 <p>Aggregation is the combination of two field constructs <a class="reference internal" href="cf_data_model.html#term-field-construct"><span class="xref std std-term">field
@@ -347,7 +347,7 @@ <h3>Related Topics</h3>
     <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>