Merge branch 'release/0.10.10'

Author: szymonlopaciuk

.gitignore

@@ -9,3 +9,4 @@
 **/.coverage.*
 **/checkpoint_restart.dat
 build/
+xdeps/refs.c

tests/test_table.py

@@ -465,4 +465,33 @@ def test_table_row_iter_underscore():
 
     rb = table2.rows.at('b')
     assert rb.name == 'b'
-    assert rb._b == 2
+    assert rb._b == 2
+
+def test_table_does_not_create_cyclic_garbage():
+    import gc
+
+    def create_table():
+        data = {
+            "name": np.array(["a", "b", "c"]),
+            "c1": np.array([1, 2, 3]),
+            "c2": np.array([4, 5, 6]),
+        }
+        table = Table(data)
+        _ = table.rows
+        _ = table.cols
+
+    # Collect any existing garbage
+    gc.collect()
+
+    # Disable automatic garbage collection temporarily, reference counting
+    # still works, and we want to check that it is sufficient.
+    gc.disable()
+
+    try:
+        for _ in range(5):
+            create_table()
+
+        collected_count = gc.collect()
+        assert collected_count == 0
+    finally:
+        gc.enable()

xdeps/table.py

@@ -231,9 +231,6 @@ def __init__(
 
         # special init due to setattr redefinition
         init = {
-            #            "header": header,
-            "cols": _ColView(self),
-            "rows": _RowView(self),
             "_data": _data,
             "_col_names": _col_names,
             "_index": index,
@@ -253,6 +250,14 @@ def __init__(
             for kk in self._col_names:
                 self._data[kk] = self._data[kk].copy()
 
+    @property
+    def rows(self):
+        return _RowView(self)
+
+    @property
+    def cols(self):
+        return _ColView(self)
+
     @property
     def mask(self):
         raise DeprecationWarning(
@@ -972,7 +977,17 @@ def to_pandas(self, index=None, columns=None):
 
         import pandas as pd
 
-        df = pd.DataFrame(self._data, columns=self._col_names)
+        df_data = {}
+
+        for name in columns:
+            column = self._data[name]
+
+            if isinstance(column, np.ndarray) and column.ndim > 1:
+                df_data[name] = column.tolist()
+            else:
+                df_data[name] = column
+
+        df = pd.DataFrame(df_data, columns=columns)
         if index is not None:
             df.set_index(index, inplace=True)
         return df