Merge pull request #430 from olemke/fix-warnings

Fix several deprecation warnings

typhon/files/handlers/common.py

@@ -703,7 +703,7 @@ def _get_dimension_name(ds, group, path, dim):
                 ancestor_dim = "/".join(
                     ancestor_groups[1:len(ancestor_groups) - i] + [dim])
 
-            ancestor_size = ds.dims.get(ancestor_dim, None)
+            ancestor_size = ds.sizes.get(ancestor_dim, None)
 
             if ancestor_size is not None \
                     and group.dimensions[dim].size == ancestor_size:

typhon/spectroscopy.py

@@ -34,7 +34,7 @@ def linewidth(f, a):
         1.571048056449009
     """
     s = interpolate.UnivariateSpline(f, a - np.max(a)/2, s=0)
-    return float(np.diff(s.roots()))
+    return float(np.diff(s.roots())[0])
 
 
 def doppler_broadening(t, f0, m):

typhon/tests/utils/test_utils.py

@@ -38,7 +38,7 @@ def test_undo_xarray_floatification(self):
             {"a": (["x"], np.array([1, 2, 3], dtype="f4")),
              "b": (["x"], np.array([2.0, 3.0, 4.0])),
              "c": (["x"], np.array(["2010-01-01", "2010-01-02",
-                                       "2010-01-03"], dtype="M8"))})
+                                       "2010-01-03"], dtype="M8[ns]"))})
         ds["a"].encoding = {"dtype": np.dtype("i4"),
                             "_FillValue": 1234}
         # c should NOT be converted because it's a time

typhon/utils/common.py

@@ -389,7 +389,7 @@ def undo_xarray_floatification(ds, fields=None):
 
     to_correct = {k for (k, v) in ds.data_vars.items()
         if v.encoding.get("dtype", np.dtype("O")).kind[0] in "ui" and
-        not v.dtype.kind in "uiMm"} # don't convert datetime/deltas
+        v.dtype.kind not in "uiMm"} # don't convert datetime/deltas
 
     if fields is not None:
         to_correct &= fields