Test pytables refactor

pandas/tests/io/pytables/test_complex.py

@@ -1,10 +1,9 @@
-from distutils.version import LooseVersion
 from warnings import catch_warnings
 
 import numpy as np
 import pytest
 
-from pandas.util._test_decorators import xfail_non_writeable
+import pandas.util._test_decorators as td
 
 import pandas as pd
 from pandas import DataFrame, Series
@@ -71,7 +70,7 @@ def test_complex_table(setup_path):
         assert_frame_equal(df, reread)
 
 
-@xfail_non_writeable
+@td.xfail_non_writeable
 def test_complex_mixed_fixed(setup_path):
     complex64 = np.array(
         [1.0 + 1.0j, 1.0 + 1.0j, 1.0 + 1.0j, 1.0 + 1.0j], dtype=np.complex64

pandas/tests/io/pytables/test_store.py

@@ -11,7 +11,6 @@
 
 from pandas.compat import PY36, is_platform_little_endian, is_platform_windows
 import pandas.util._test_decorators as td
-from pandas.util._test_decorators import xfail_non_writeable
 
 from pandas.core.dtypes.common import is_categorical_dtype
 
@@ -812,7 +811,7 @@ def test_put_integer(self, setup_path):
         df = DataFrame(np.random.randn(50, 100))
         self._check_roundtrip(df, tm.assert_frame_equal, setup_path)
 
-    @xfail_non_writeable
+    @td.xfail_non_writeable
     def test_put_mixed_type(self, setup_path):
         df = tm.makeTimeDataFrame()
         df["obj1"] = "foo"
@@ -1415,7 +1414,7 @@ def test_to_hdf_with_min_itemsize(self, setup_path):
             )
 
     @pytest.mark.parametrize(
-        "format", [pytest.param("fixed", marks=xfail_non_writeable), "table"]
+        "format", [pytest.param("fixed", marks=td.xfail_non_writeable), "table"]
     )
     def test_to_hdf_errors(self, format, setup_path):
 
@@ -1812,7 +1811,7 @@ def test_pass_spec_to_storer(self, setup_path):
             with pytest.raises(TypeError):
                 store.select("df", where=[("columns=A")])
 
-    @xfail_non_writeable
+    @td.xfail_non_writeable
     def test_append_misc(self, setup_path):
 
         with ensure_clean_store(setup_path) as store:
@@ -2020,7 +2019,7 @@ def test_unimplemented_dtypes_table_columns(self, setup_path):
             with pytest.raises(TypeError):
                 store.append("df_unimplemented", df)
 
-    @xfail_non_writeable
+    @td.xfail_non_writeable
     @pytest.mark.skipif(
         LooseVersion(np.__version__) == LooseVersion("1.15.0"),
         reason=(
@@ -2255,7 +2254,7 @@ def test_float_index(self, setup_path):
         s = Series(np.random.randn(10), index=index)
         self._check_roundtrip(s, tm.assert_series_equal, path=setup_path)
 
-    @xfail_non_writeable
+    @td.xfail_non_writeable
     def test_tuple_index(self, setup_path):
 
         # GH #492
@@ -2268,7 +2267,7 @@ def test_tuple_index(self, setup_path):
             simplefilter("ignore", pd.errors.PerformanceWarning)
             self._check_roundtrip(DF, tm.assert_frame_equal, path=setup_path)
 
-    @xfail_non_writeable
+    @td.xfail_non_writeable
     @pytest.mark.filterwarnings("ignore::pandas.errors.PerformanceWarning")
     def test_index_types(self, setup_path):
 
@@ -2332,7 +2331,7 @@ def test_timeseries_preepoch(self, setup_path):
         except OverflowError:
             pytest.skip("known failer on some windows platforms")
 
-    @xfail_non_writeable
+    @td.xfail_non_writeable
     @pytest.mark.parametrize(
         "compression", [False, pytest.param(True, marks=td.skip_if_windows_python_3)]
     )
@@ -2366,7 +2365,7 @@ def test_frame(self, compression, setup_path):
         # empty
         self._check_roundtrip(df[:0], tm.assert_frame_equal, path=setup_path)
 
-    @xfail_non_writeable
+    @td.xfail_non_writeable
     def test_empty_series_frame(self, setup_path):
         s0 = Series()
         s1 = Series(name="myseries")
@@ -2380,7 +2379,7 @@ def test_empty_series_frame(self, setup_path):
         self._check_roundtrip(df1, tm.assert_frame_equal, path=setup_path)
         self._check_roundtrip(df2, tm.assert_frame_equal, path=setup_path)
 
-    @xfail_non_writeable
+    @td.xfail_non_writeable
     @pytest.mark.parametrize(
         "dtype", [np.int64, np.float64, np.object, "m8[ns]", "M8[ns]"]
     )
@@ -2466,7 +2465,7 @@ def test_store_series_name(self, setup_path):
             recons = store["series"]
             tm.assert_series_equal(recons, series)
 
-    @xfail_non_writeable
+    @td.xfail_non_writeable
     @pytest.mark.parametrize(
         "compression", [False, pytest.param(True, marks=td.skip_if_windows_python_3)]
     )
@@ -4024,7 +4023,7 @@ def test_pytables_native2_read(self, datapath, setup_path):
             d1 = store["detector"]
             assert isinstance(d1, DataFrame)
 
-    @xfail_non_writeable
+    @td.xfail_non_writeable
     def test_legacy_table_fixed_format_read_py2(self, datapath, setup_path):
         # GH 24510
         # legacy table with fixed format written in Python 2
@@ -4183,7 +4182,7 @@ def test_unicode_longer_encoded(self, setup_path):
             result = store.get("df")
             tm.assert_frame_equal(result, df)
 
-    @xfail_non_writeable
+    @td.xfail_non_writeable
     def test_store_datetime_mixed(self, setup_path):
 
         df = DataFrame({"a": [1, 2, 3], "b": [1.0, 2.0, 3.0], "c": ["a", "b", "c"]})

pandas/tests/series/test_operators.py

@@ -1,6 +1,6 @@
 from datetime import datetime, timedelta
 import operator
-
+import re
 import numpy as np
 import pytest
 
@@ -94,24 +94,25 @@ def test_logical_operators_int_dtype_with_int_scalar(self):
     def test_logical_operators_int_dtype_with_float(self):
         # GH#9016: support bitwise op for integer types
         s_0123 = Series(range(4), dtype="int64")
-
-        with pytest.raises(TypeError):
+        msg = r"cannot compare a dtyped \[int64\] array with a scalar of type \[float\]"
+        with pytest.raises(TypeError, match=msg):
             s_0123 & np.NaN
-        with pytest.raises(TypeError):
+        msg = r"cannot compare a dtyped \[int64\] array with a scalar of type \[bool\]"
+        with pytest.raises(TypeError, match=msg):
             s_0123 & 3.14
-        with pytest.raises(TypeError):
+        with pytest.raises(TypeError, match="unsupported.* 'int' and 'float'"):
             s_0123 & [0.1, 4, 3.14, 2]
-        with pytest.raises(TypeError):
+        with pytest.raises(TypeError, match="unsupported.* 'int' and 'float'"):
             s_0123 & np.array([0.1, 4, 3.14, 2])
-        with pytest.raises(TypeError):
+        with pytest.raises(TypeError, match="unsupported.* 'int' and 'float'"):
             s_0123 & Series([0.1, 4, -3.14, 2])
 
     def test_logical_operators_int_dtype_with_str(self):
         s_1111 = Series([1] * 4, dtype="int8")
-
-        with pytest.raises(TypeError):
+        msg = r"cannot compare a dtyped \[int8\] array with a scalar of type \[bool\]"
+        with pytest.raises(TypeError, match=msg):
             s_1111 & "a"
-        with pytest.raises(TypeError):
+        with pytest.raises(TypeError, match="unsupported.* 'int' and 'str'"):
             s_1111 & ["a", "b", "c", "d"]
 
     def test_logical_operators_int_dtype_with_bool(self):
@@ -228,8 +229,8 @@ def test_logical_operators_int_dtype_with_bool_dtype_and_reindex(self):
 
     def test_scalar_na_logical_ops_corners(self):
         s = Series([2, 3, 4, 5, 6, 7, 8, 9, 10])
-
-        with pytest.raises(TypeError):
+        msg = r"cannot compare a dtyped \[int64\] array with a scalar of type \[bool\]"
+        with pytest.raises(TypeError, match=msg):
             s & datetime(2005, 1, 1)
 
         s = Series([2, 3, 4, 5, 6, 7, 8, 9, datetime(2005, 1, 1)])
@@ -247,11 +248,13 @@ def test_scalar_na_logical_ops_corners(self):
 
         # this is an alignment issue; these are equivalent
         # https://github.com/pandas-dev/pandas/issues/5284
-
-        with pytest.raises(TypeError):
+        msg = (
+            r"cannot compare a dtyped \[float64\] array with a scalar of type \[float\]"
+        )
+        with pytest.raises(TypeError, match=msg):
             d.__and__(s, axis="columns")
 
-        with pytest.raises(TypeError):
+        with pytest.raises(TypeError, match=msg):
             s & d
 
         # this is wrong as its not a boolean result

pandas/util/_test_decorators.py

@@ -79,7 +79,8 @@ def safe_import(mod_name, min_version=None):
 # and pytables 3.4.4
 tables = safe_import("tables")
 xfail_non_writeable = pytest.mark.xfail(
-    LooseVersion(np.__version__) >= LooseVersion("1.16")
+    tables
+    and LooseVersion(np.__version__) >= LooseVersion("1.16")
     and LooseVersion(tables.__version__) < LooseVersion("3.5.1"),
     reason=(
         "gh-25511, gh-24839. pytables needs a "