Merge branch 'micol-altomare-replace-ensure-clean-store' of https://github.com/micol-altomare/pandas into micol-altomare-replace-ensure-clean-store

Author: micol-altomare

pandas/tests/io/pytables/test_complex.py

@@ -4,10 +4,10 @@
 import pandas as pd
 from pandas import (
     DataFrame,
+    HDFStore,
     Series,
 )
 import pandas._testing as tm
-from pandas.tests.io.pytables.common import ensure_clean_store
 
 from pandas.io.pytables import read_hdf
 
@@ -103,7 +103,7 @@ def test_complex_mixed_table(tmp_path, setup_path):
         index=list("abcd"),
     )
 
-    with ensure_clean_store(setup_path) as store:
+    with HDFStore(tmp_path / setup_path) as store:
         store.append("df", df, data_columns=["A", "B"])
         result = store.select("df", where="A>2")
         tm.assert_frame_equal(df.loc[df.A > 2], result)
@@ -139,7 +139,7 @@ def test_complex_across_dimensions(tmp_path, setup_path):
     tm.assert_frame_equal(df, reread)
 
 
-def test_complex_indexing_error(setup_path):
+def test_complex_indexing_error(tmp_path, setup_path):
     complex128 = np.array(
         [1.0 + 1.0j, 1.0 + 1.0j, 1.0 + 1.0j, 1.0 + 1.0j], dtype=np.complex128
     )
@@ -156,7 +156,7 @@ def test_complex_indexing_error(setup_path):
         "values to data_columns when initializing the table."
     )
 
-    with ensure_clean_store(setup_path) as store:
+    with HDFStore(tmp_path / setup_path) as store:
         with pytest.raises(TypeError, match=msg):
             store.append("df", df, data_columns=["C"])
 
@@ -183,15 +183,15 @@ def test_complex_series_error(tmp_path, setup_path):
     tm.assert_series_equal(s, reread)
 
 
-def test_complex_append(setup_path):
+def test_complex_append(tmp_path, setup_path):
     df = DataFrame(
         {
             "a": np.random.default_rng(2).standard_normal(100).astype(np.complex128),
             "b": np.random.default_rng(2).standard_normal(100),
         }
     )
 
-    with ensure_clean_store(setup_path) as store:
+    with HDFStore(tmp_path / setup_path) as store:
         store.append("df", df, data_columns=["b"])
         store.append("df", df)
         result = store.select("df")

pandas/tests/io/pytables/test_file_handling.py

@@ -24,7 +24,6 @@
 )
 from pandas.tests.io.pytables.common import (
     _maybe_remove,
-    ensure_clean_store,
     tables,
 )
 
@@ -188,8 +187,8 @@ def test_open_args(tmp_path, setup_path, using_infer_string):
     assert not os.path.exists(path)
 
 
-def test_flush(setup_path):
-    with ensure_clean_store(setup_path) as store:
+def test_flush(tmp_path, setup_path):
+    with HDFStore(tmp_path / setup_path, mode="a") as store:
         store["a"] = Series(range(5))
         store.flush()
         store.flush(fsync=True)
@@ -316,8 +315,8 @@ def test_complibs(tmp_path, lvl, lib, request):
 @pytest.mark.skipif(
     not is_platform_little_endian(), reason="reason platform is not little endian"
 )
-def test_encoding(setup_path):
-    with ensure_clean_store(setup_path) as store:
+def test_encoding(tmp_path, setup_path):
+    with HDFStore(tmp_path / setup_path) as store:
         df = DataFrame({"A": "foo", "B": "bar"}, index=range(5))
         df.loc[2, "A"] = np.nan
         df.loc[3, "B"] = np.nan

pandas/tests/io/pytables/test_keys.py

@@ -13,9 +13,8 @@
 pytestmark = [pytest.mark.single_cpu]
 
 
-def test_keys(tmp_path):
-    path = tmp_path / "test_keys.h5"
-    with HDFStore(path) as store:
+def test_keys(tmp_path, setup_path):
+    with HDFStore(tmp_path / setup_path) as store:
         store["a"] = Series(
             np.arange(10, dtype=np.float64), index=date_range("2020-01-01", periods=10)
         )
@@ -60,21 +59,20 @@ class Table3(tables.IsDescription):
             assert len(df.columns) == 1
 
 
-def test_keys_illegal_include_keyword_value(tmp_path):
-    path = tmp_path / "test_keys_illegal_include_keyword_value.h5"
-    with HDFStore(path) as store:
+def test_keys_illegal_include_keyword_value(tmp_path, setup_path):
+    with HDFStore(tmp_path / setup_path) as store:
         with pytest.raises(
             ValueError,
             match="`include` should be either 'pandas' or 'native' but is 'illegal'",
         ):
             store.keys(include="illegal")
 
 
-def test_keys_ignore_hdf_softlink(tmp_path):
+def test_keys_ignore_hdf_softlink(tmp_path, setup_path):
     # GH 20523
     # Puts a softlink into HDF file and rereads
-    path = tmp_path / "test_keys_ignore_hdf_softlink.h5"
-    with HDFStore(path) as store:
+
+    with HDFStore(tmp_path / setup_path) as store:
         df = DataFrame({"A": range(5), "B": range(5)})
         store.put("df", df)