updated Units.conform and new tests for issue NCAS-CMS#9

Changelog.rst

@@ -4,7 +4,7 @@ version 3.2.8
 
 **2020-07-02**
 
-* Allowed list and tuple to be input to `cfunits.Units.conform`
+* Allowed `list` and `tuple` to be input to `cfunits.Units.conform`
   (https://github.com/NCAS-CMS/cfunits/issues/9).
 
 version 3.2.7

MANIFEST.in

@@ -1,6 +1,7 @@
 include MANIFEST.in		
 include Changelog.md
 include README.md
+include requirements.txt
 recursive-include cfunits *
 recursive-exclude * *~ *.gz *.pyc
 recursive-exclude * *.o *.so .nfs*

cfunits/__init__.py

@@ -19,7 +19,7 @@
 __author__       = 'David Hassell'
 __author__     = 'David Hassell'
 __date__       = '2020-07-02'
-__version__    = '3.2.8b1'
+__version__    = '3.2.8'
 __cf_version__ = '1.8'
 
 from distutils.version import LooseVersion

cfunits/units.py

@@ -1948,13 +1948,16 @@ def conform(cls, x, from_units, to_units, inplace=False):
 
         '''
         if from_units.equals(to_units):
+            if not isinstance(x, (int, float)):
+                x = numpy_asanyarray(x)
+
             if inplace:
                 return x
             else:
                 try:
                     return x.copy()
                 except AttributeError:
-                    return deepcopy(x)
+                    x
         # --- End: if
 
         if not from_units.equivalent(to_units):

docs/source/installation.rst

@@ -35,6 +35,11 @@ example:
 	     
    pip install cfunits
 
+.. code-block:: shell
+   :caption: *Upgrade as root, with any missing dependencies.*
+	     
+   pip install cfunits --upgrade
+
 .. code-block:: shell
    :caption: *Install as a user, with any missing dependencies.*
 	     

docs/source/releases.rst

@@ -1,13 +1,16 @@
 .. currentmodule:: cfunits
 .. default-role:: obj
 
-**Older releases**
-==================
+.. _Releases:
+
+**Releases**
+============
 
 ----
 
-* `Version 3.2.7 <https://ncas-cms.github.io/cfunits/3.2.7>`_
-* `Version 3.2.6 <https://ncas-cms.github.io/cfunits/3.2.6>`_
-* `Version 3.2.5 <https://ncas-cms.github.io/cfunits/3.2.5>`_
-* `Version 3.2.4 <https://ncas-cms.github.io/cfunits/3.2.4>`_
-* `Version 3.2.3 <https://ncas-cms.github.io/cfunits/3.2.3>`_
+* `Version 3.2.8 <https://ncas-cms.github.io/cfunits/3.2.8>`_ (2020-07-02)
+* `Version 3.2.7 <https://ncas-cms.github.io/cfunits/3.2.7>`_ (2020-05-20)
+* `Version 3.2.6 <https://ncas-cms.github.io/cfunits/3.2.6>`_ (2020-04-27)
+* `Version 3.2.5 <https://ncas-cms.github.io/cfunits/3.2.5>`_ (2020-03-26)
+* `Version 3.2.4 <https://ncas-cms.github.io/cfunits/3.2.4>`_ (2020-01-07)
+* `Version 3.2.3 <https://ncas-cms.github.io/cfunits/3.2.3>`_ (2019-09-16)