mRevert and recover the issue again

Author: mroeschke

pandas/tests/io/test_common.py

@@ -222,12 +222,7 @@ def test_read_non_existent(self, reader, module, error_class, fn_ext):
             (pd.DataFrame.to_html, "os", OSError, "html"),
             (pd.DataFrame.to_excel, "xlrd", OSError, "xlsx"),
             (pd.DataFrame.to_feather, "pyarrow", OSError, "feather"),
-            (
-                pd.DataFrame.to_parquet,
-                "pyarrow",
-                (OSError, FileNotFoundError),
-                "parquet",
-            ),
+            (pd.DataFrame.to_parquet, "pyarrow", OSError, "parquet"),
             (pd.DataFrame.to_stata, "os", OSError, "dta"),
             (pd.DataFrame.to_json, "os", OSError, "json"),
             (pd.DataFrame.to_pickle, "os", OSError, "pickle"),
@@ -241,13 +236,10 @@ def test_write_missing_parent_directory(self, method, module, error_class, fn_ex
 
         path = os.path.join(HERE, "data", "missing_folder", "does_not_exist." + fn_ext)
 
-        msg = "|".join(
-            [
-                r"\[Errno 2\] No such",
-                "Cannot save file into a non-existent directory: .*missing_folder",
-            ]
-        )
-        with pytest.raises(error_class, match=msg):
+        with pytest.raises(
+            error_class,
+            match=r"Cannot save file into a non-existent directory: .*missing_folder",
+        ):
             method(dummy_frame, path)
 
     @pytest.mark.parametrize(

pandas/tests/io/test_fsspec.py

@@ -3,7 +3,6 @@
 import numpy as np
 import pytest
 
-from pandas.compat import is_platform_mac
 from pandas.compat._optional import VERSIONS
 
 from pandas import (
@@ -161,12 +160,6 @@ def test_to_parquet_new_file(monkeypatch, cleared_fs):
     )
 
 
-@pytest.mark.xfail(
-    is_platform_mac(),
-    raises=ImportError,
-    reason="Raises Library not loaded: @rpath/libssl.1.1.dylib in CI",
-    strict=False,
-)
 @td.skip_if_no("pyarrow", min_version="2")
 def test_arrowparquet_options(fsspectest):
     """Regression test for writing to a not-yet-existent GCS Parquet file."""

pandas/tests/io/test_parquet.py

@@ -13,10 +13,7 @@
 
 from pandas._config import get_option
 
-from pandas.compat import (
-    is_platform_mac,
-    is_platform_windows,
-)
+from pandas.compat import is_platform_windows
 from pandas.compat.pyarrow import (
     pa_version_under2p0,
     pa_version_under5p0,
@@ -258,12 +255,6 @@ def test_invalid_engine(df_compat):
         check_round_trip(df_compat, "foo", "bar")
 
 
-@pytest.mark.xfail(
-    is_platform_mac(),
-    raises=ImportError,
-    reason="Raises Library not loaded: @rpath/libssl.1.1.dylib in CI",
-    strict=False,
-)
 def test_options_py(df_compat, pa):
     # use the set option
 
@@ -285,12 +276,6 @@ def test_options_auto(df_compat, fp, pa):
         check_round_trip(df_compat)
 
 
-@pytest.mark.xfail(
-    is_platform_mac(),
-    raises=ImportError,
-    reason="Raises Library not loaded: @rpath/libssl.1.1.dylib in CI",
-    strict=False,
-)
 def test_options_get_engine(fp, pa):
     assert isinstance(get_engine("pyarrow"), PyArrowImpl)
     assert isinstance(get_engine("fastparquet"), FastParquetImpl)
@@ -354,12 +339,6 @@ def test_get_engine_auto_error_message():
                 get_engine("auto")
 
 
-@pytest.mark.xfail(
-    is_platform_mac(),
-    raises=ImportError,
-    reason="Raises Library not loaded: @rpath/libssl.1.1.dylib in CI",
-    strict=False,
-)
 def test_cross_engine_pa_fp(df_cross_compat, pa, fp):
     # cross-compat with differing reading/writing engines
 
@@ -374,13 +353,7 @@ def test_cross_engine_pa_fp(df_cross_compat, pa, fp):
         tm.assert_frame_equal(result, df[["a", "d"]])
 
 
-@pytest.mark.xfail(
-    is_platform_mac(),
-    raises=ImportError,
-    reason="Raises Library not loaded: @rpath/libssl.1.1.dylib in CI",
-    strict=False,
-)
-def test_cross_engine_fp_pa(df_cross_compat, pa, fp):
+def test_cross_engine_fp_pa(request, df_cross_compat, pa, fp):
     # cross-compat with differing reading/writing engines
     df = df_cross_compat
     with tm.ensure_clean() as path:
@@ -420,12 +393,6 @@ def test_parquet_read_from_url(self, df_compat, engine):
         tm.assert_frame_equal(df, df_compat)
 
 
-@pytest.mark.xfail(
-    is_platform_mac(),
-    raises=ImportError,
-    reason="Raises Library not loaded: @rpath/libssl.1.1.dylib in CI",
-    strict=False,
-)
 class TestBasic(Base):
     def test_error(self, engine):
         for obj in [
@@ -701,12 +668,6 @@ def test_read_empty_array(self, pa, dtype):
         check_round_trip(df, pa, read_kwargs={"use_nullable_dtypes": True})
 
 
-@pytest.mark.xfail(
-    is_platform_mac(),
-    raises=ImportError,
-    reason="Raises Library not loaded: @rpath/libssl.1.1.dylib in CI",
-    strict=False,
-)
 @pytest.mark.filterwarnings("ignore:CategoricalBlock is deprecated:DeprecationWarning")
 class TestParquetPyArrow(Base):
     def test_basic(self, pa, df_full):
@@ -874,7 +835,7 @@ def test_s3_roundtrip_for_dir(
             repeat=1,
         )
 
-    @td.skip_if_no("pyarrow", min_version="3")
+    @td.skip_if_no("pyarrow")
     def test_read_file_like_obj_support(self, df_compat):
         buffer = BytesIO()
         df_compat.to_parquet(buffer)