Merge branch 'master' into pint

Author: rcaneill

CHANGELOG.rst

@@ -1,5 +1,12 @@
 Changelog
 =========
+v0.2.1 - 2022-03-22
+-------------------
+Despite all the checking, we missed a bad bug.
+
+Bug Fixes
+`````````
+* Fixed a bug where attributes would attempt to be be added to non xr.DataArray objects if the gsw function has multiple return values.
 
 v0.2.0 - 2022-03-22
 -------------------

gsw_xarray/__init__.py

@@ -1,4 +1,4 @@
-__version__ = "0.2.0"
+__version__ = "0.2.1"
 
 from importlib import import_module
 

gsw_xarray/_core.py

@@ -20,7 +20,6 @@ def add_attrs(rv, attrs, name):
         rv.name = name
         rv.attrs = attrs
 
-
 def pint_compat(args, kwargs):
     if pint_xarray is None:
         return args, kwargs, False
@@ -74,7 +73,7 @@ def cf_attrs_wrapper(*args, **kwargs):
                         rv_updated.append(da)
 
                 rv = tuple(rv_updated)
-
+                
             else:
                 add_attrs(rv, attrs_checked, name)
                 if is_quantity:

gsw_xarray/tests/test_gsw_xarray.py

@@ -6,7 +6,7 @@
 
 
 def test_version():
-    assert __version__ == "0.2.0"
+    assert __version__ == "0.2.1"
 
 
 def test_func_standard(ds):

pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "gsw-xarray"
-version = "0.2.0"
+version = "0.2.1"
 description = "Drop in wrapper for gsw which adds CF standard name and units attributes to xarray results"
 authors = ["Andrew Barna <[email protected]>", "Romain Caneill <[email protected]>"]
 license = "BSD-3-Clause"