xray -> xarray

Author: jreback

pandas/core/generic.py

@@ -1041,9 +1041,9 @@ def to_clipboard(self, excel=None, sep=None, **kwargs):
         from pandas.io import clipboard
         clipboard.to_clipboard(self, excel=excel, sep=sep, **kwargs)
 
-    def to_xray(self):
+    def to_xarray(self):
         """
-        Return an xray object from the pandas object.
+        Return an xarray object from the pandas object.
 
         Returns
         -------

pandas/tests/test_generic.py

@@ -1034,17 +1034,17 @@ def test_describe_none(self):
         expected = Series([0, 0], index=['count', 'unique'], name='None')
         assert_series_equal(noneSeries.describe(), expected)
 
-    def test_to_xray(self):
+    def test_to_xarray(self):
 
-        tm._skip_if_no_xray()
+        tm._skip_if_no_xarray()
         import xray
         from xray import DataArray
 
         if LooseVersion(xray.__version__) > '0.6.1':
             # https://github.com/xray/xray/issues/697
             s = Series([])
             s.index.name = 'foo'
-            result = s.to_xray()
+            result = s.to_xarray()
             self.assertEqual(len(result), 0)
             self.assertEqual(len(result.coords), 1)
             self.assertEqual(result.coords.keys(), ['foo'])
@@ -1056,7 +1056,7 @@ def test_to_xray(self):
                       tm.makeTimedeltaIndex]:
             s = Series(range(6), index=index(6))
             s.index.name = 'foo'
-            result = s.to_xray()
+            result = s.to_xarray()
             repr(result)
             self.assertEqual(len(result), 6)
             self.assertEqual(len(result.coords), 1)
@@ -1072,12 +1072,12 @@ def test_to_xray(self):
             s = Series(range(6), index=index(6))
             s.index.name = 'foo'
 
-            result = s.to_xray()
+            result = s.to_xarray()
             self.assertRaises(ValueError, lambda: repr(result))
 
         s.index = pd.MultiIndex.from_product([['a', 'b'], range(3)],
                                              names=['one', 'two'])
-        result = s.to_xray()
+        result = s.to_xarray()
         self.assertEqual(len(result), 2)
         assert_almost_equal(result.coords.keys(), ['one', 'two'])
         self.assertIsInstance(result, DataArray)
@@ -1766,9 +1766,9 @@ def test_pct_change(self):
 
             self.assert_frame_equal(result, expected)
 
-    def test_to_xray(self):
+    def test_to_xarray(self):
 
-        tm._skip_if_no_xray()
+        tm._skip_if_no_xarray()
         import xray
         from xray import Dataset
 
@@ -1785,9 +1785,9 @@ def test_to_xray(self):
                        )
 
         if LooseVersion(xray.__version__) > '0.6.1':
-            # https://github.com/xray/xray/issues/697
+            # https://github.com/pydata/xarray/issues/697
             df.index.name = 'foo'
-            result = df[0:0].to_xray()
+            result = df[0:0].to_xarray()
             self.assertEqual(result.dims['foo'], 0)
             self.assertIsInstance(result, Dataset)
 
@@ -1798,7 +1798,7 @@ def test_to_xray(self):
             df.index = index(3)
             df.index.name = 'foo'
             df.columns.name = 'bar'
-            result = df.to_xray()
+            result = df.to_xarray()
             self.assertEqual(result.dims['foo'], 3)
             self.assertEqual(len(result.coords), 1)
             self.assertEqual(len(result.data_vars), 8)
@@ -1820,26 +1820,26 @@ def test_to_xray(self):
         # not implemented
         df.index = pd.MultiIndex.from_product([['a'], range(3)],
                                               names=['one', 'two'])
-        self.assertRaises(ValueError, lambda: df.to_xray())
+        self.assertRaises(ValueError, lambda: df.to_xarray())
 
 
 class TestPanel(tm.TestCase, Generic):
     _typ = Panel
     _comparator = lambda self, x, y: assert_panel_equal(x, y)
 
-    def test_to_xray(self):
+    def test_to_xarray(self):
 
-        tm._skip_if_no_xray()
+        tm._skip_if_no_xarray()
         import xray
         from xray import Dataset
 
         p = tm.makePanel()
 
         if LooseVersion(xray.__version__) > '0.6.1':
-            # https://github.com/xray/xray/issues/697
+            # https://github.com/pydata/xarray/issues/697
             pass
 
-        result = p.to_xray()
+        result = p.to_xarray()
         self.assertIsInstance(result, Dataset)
         self.assertEqual(len(result.coords), 3)
         assert_almost_equal(result.coords.keys(),
@@ -1851,9 +1851,9 @@ class TestPanel4D(tm.TestCase, Generic):
     _typ = Panel4D
     _comparator = lambda self, x, y: assert_panel4d_equal(x, y)
 
-    def test_to_xray(self):
+    def test_to_xarray(self):
 
-        tm._skip_if_no_xray()
+        tm._skip_if_no_xarray()
         import xray
         from xray import Dataset
 
@@ -1863,7 +1863,7 @@ def test_to_xray(self):
             # https://github.com/xray/xray/issues/697
             pass
 
-        result = p.to_xray()
+        result = p.to_xarray()
         self.assertIsInstance(result, Dataset)
         self.assertEqual(len(result.coords), 4)
         assert_almost_equal(result.coords.keys(),

pandas/util/testing.py

@@ -215,12 +215,12 @@ def _skip_if_no_scipy():
         raise nose.SkipTest('scipy.interpolate missing')
 
 
-def _skip_if_no_xray():
+def _skip_if_no_xarray():
     try:
         import xray
     except ImportError:
         import nose
-        raise nose.SkipTest("xray not installed")
+        raise nose.SkipTest("xarray not installed")
 
 
 def _skip_if_no_pytz():