Use PYARROW_STRINGS_AVAILABLE more

Author: jrbourbeau

conftest.py

@@ -28,15 +28,9 @@
     import pandas  # noqa: F401
 
     # Temporary changes to look for pyarrow string failures
-    import dask
-    from dask.dataframe._compat import PANDAS_GT_130
+    from dask.dataframe._pyarrow_utils import PYARROW_STRINGS_AVAILABLE
 
-    try:
-        import pyarrow
-    except ImportError:
-        pyarrow = False
-
-    if PANDAS_GT_130 and pyarrow:
+    if PYARROW_STRINGS_AVAILABLE:
         dask.config.set({"dataframe.object_as_pyarrow_string": True})
 except ImportError:
     collect_ignore_glob.append("dask/dataframe/*")

dask/dataframe/io/tests/test_csv.py

@@ -18,6 +18,7 @@
 from dask.bytes.utils import compress
 from dask.core import flatten
 from dask.dataframe._compat import tm
+from dask.dataframe._pyarrow_utils import PYARROW_STRINGS_AVAILABLE
 from dask.dataframe.io.csv import (
     _infer_block_size,
     auto_blocksize,
@@ -360,13 +361,8 @@ def test_read_csv(dd_read, pd_read, text, sep):
         assert_eq(result, pd_read(fn, sep=sep))
 
 
+@pytest.mark.skipif(not PYARROW_STRINGS_AVAILABLE, reason="Requires pyarrow strings")
 def test_read_csv_object_as_pyarrow_string_config():
-    pytest.importorskip(
-        "pandas",
-        minversion="1.3.0",
-        reason="Requires support for pyarrow strings",
-    )
-    pytest.importorskip("pyarrow", reason="Requires pyarrow")
     with filetext(csv_text) as fn:
         df = pd.read_csv(fn)
         with dask.config.set({"dataframe.object_as_pyarrow_string": True}):

dask/dataframe/io/tests/test_io.py

@@ -10,6 +10,7 @@
 from dask import config
 from dask.blockwise import Blockwise
 from dask.dataframe._compat import tm
+from dask.dataframe._pyarrow_utils import PYARROW_STRINGS_AVAILABLE
 from dask.dataframe.io.io import _meta_from_array
 from dask.dataframe.optimize import optimize
 from dask.dataframe.utils import assert_eq
@@ -275,14 +276,8 @@ def test_from_pandas_npartitions_duplicates(index):
     assert ddf.divisions == ("A", "B", "C", "C")
 
 
+@pytest.mark.skipif(not PYARROW_STRINGS_AVAILABLE, reason="Requires pyarrow strings")
 def test_from_pandas_object_as_pyarrow_string_config():
-    pytest.importorskip(
-        "pandas",
-        minversion="1.3.0",
-        reason="Requires support for pyarrow strings",
-    )
-    pytest.importorskip("pyarrow", reason="Requires pyarrow")
-
     # `dataframe.object_as_pyarrow_string` defaults to `False`
     s = pd.Series(["foo", "bar", "ricky", "bobby"], index=["a", "b", "c", "d"])
     df = pd.DataFrame(