post merge fixup

Author: simonjayhawkins

pandas/core/arrays/string_.py

@@ -19,6 +19,7 @@
     Scalar,
     type_t,
 )
+from pandas.compat import pa_version_under1p0
 from pandas.compat.numpy import function as nv
 
 from pandas.core.dtypes.base import (
@@ -94,6 +95,11 @@ def __init__(self, storage=None):
             raise ValueError(
                 f"Storage must be 'python' or 'pyarrow'. Got {storage} instead."
             )
+        if storage == "pyarrow" and pa_version_under1p0:
+            raise ImportError(
+                "pyarrow>=1.0.0 is required for PyArrow backed StringArray."
+            )
+
         self.storage = storage
 
     @property

pandas/tests/arrays/string_/test_string_arrow.py

@@ -11,11 +11,15 @@
     StringArray,
     StringDtype,
 )
-from pandas.core.arrays.string_arrow import (
-    ArrowStringArray,
+from pandas.core.arrays.string_arrow import ArrowStringArray
+
+skip_if_no_pyarrow = pytest.mark.skipif(
+    pa_version_under1p0,
+    reason="pyarrow>=1.0.0 is required for PyArrow backed StringArray",
 )
 
 
+@skip_if_no_pyarrow
 def test_eq_all_na():
     a = pd.array([pd.NA, pd.NA], dtype=StringDtype("pyarrow"))
     result = a == a
@@ -41,10 +45,7 @@ def test_config_bad_storage_raises():
         pd.options.mode.string_storage = "foo"
 
 
-@pytest.mark.skipif(
-    pa_version_under1p0,
-    reason="pyarrow>=1.0.0 is required for PyArrow backed StringArray",
-)
+@skip_if_no_pyarrow
 @pytest.mark.parametrize("chunked", [True, False])
 @pytest.mark.parametrize("array", ["numpy", "pyarrow"])
 def test_constructor_not_string_type_raises(array, chunked):
@@ -67,6 +68,7 @@ def test_constructor_not_string_type_raises(array, chunked):
         ArrowStringArray(arr)
 
 
+@skip_if_no_pyarrow
 def test_from_sequence_wrong_dtype_raises():
     with pd.option_context("string_storage", "python"):
         ArrowStringArray._from_sequence(["a", None, "c"], dtype="string")