TST: [ArrowStringArray] more parameterised testing - part 1

pandas/conftest.py

@@ -1131,6 +1131,24 @@ def string_dtype(request):
  return request.param
 
 
+@pytest.fixture(
+ params=[
+ "string",
+ pytest.param(
+ "arrow_string", marks=td.skip_if_no("pyarrow", min_version="1.0.0")
+ ),
+ ]
+)
+def nullable_string_dtype(request):
+ """
+ Parametrized fixture for string dtypes.
+
+ * 'string'
+ * 'arrow_string'
+ """
+ return request.param
+
+
 @pytest.fixture(params=tm.BYTES_DTYPES)
 def bytes_dtype(request):
  """

pandas/tests/dtypes/test_common.py

@@ -281,7 +281,10 @@ def test_is_string_dtype():
  assert com.is_string_dtype(object)
  assert com.is_string_dtype(np.array(["a", "b"]))
  assert com.is_string_dtype(pd.StringDtype())
- assert com.is_string_dtype(pd.array(["a", "b"], dtype="string"))
+
+
+def test_is_string_dtype_nullable(nullable_string_dtype):
+ assert com.is_string_dtype(pd.array(["a", "b"], dtype=nullable_string_dtype))
 
 
 integer_dtypes: List = []

pandas/tests/extension/json/array.py

@@ -39,6 +39,7 @@
  ExtensionDtype,
 )
 from pandas.api.types import is_bool_dtype
+from pandas.core.arrays.string_arrow import ArrowStringDtype
 
 
 class JSONDtype(ExtensionDtype):
@@ -194,7 +195,7 @@ def astype(self, dtype, copy=True):
  if copy:
  return self.copy()
  return self
- elif isinstance(dtype, StringDtype):
+ elif isinstance(dtype, (StringDtype, ArrowStringDtype)):
  value = self.astype(str) # numpy doesn'y like nested dicts
  return dtype.construct_array_type()._from_sequence(value, copy=False)
 

pandas/tests/frame/methods/test_combine_first.py

@@ -381,15 +381,17 @@ def test_combine_first_with_asymmetric_other(self, val):
 
  tm.assert_frame_equal(res, exp)
 
- def test_combine_first_string_dtype_only_na(self):
+ def test_combine_first_string_dtype_only_na(self, nullable_string_dtype):
  # GH: 37519
- df = DataFrame({"a": ["962", "85"], "b": [pd.NA] * 2}, dtype="string")
- df2 = DataFrame({"a": ["85"], "b": [pd.NA]}, dtype="string")
+ df = DataFrame(
+ {"a": ["962", "85"], "b": [pd.NA] * 2}, dtype=nullable_string_dtype
+ )
+ df2 = DataFrame({"a": ["85"], "b": [pd.NA]}, dtype=nullable_string_dtype)
  df.set_index(["a", "b"], inplace=True)
  df2.set_index(["a", "b"], inplace=True)
  result = df.combine_first(df2)
  expected = DataFrame(
- {"a": ["962", "85"], "b": [pd.NA] * 2}, dtype="string"
+ {"a": ["962", "85"], "b": [pd.NA] * 2}, dtype=nullable_string_dtype
  ).set_index(["a", "b"])
  tm.assert_frame_equal(result, expected)
 

pandas/tests/frame/test_constructors.py

@@ -1654,10 +1654,10 @@ def test_constructor_empty_with_string_dtype(self):
  df = DataFrame(index=[0, 1], columns=[0, 1], dtype="U5")
  tm.assert_frame_equal(df, expected)
 
- def test_constructor_empty_with_string_extension(self):
+ def test_constructor_empty_with_string_extension(self, nullable_string_dtype):
  # GH 34915
- expected = DataFrame(index=[], columns=["c1"], dtype="string")
- df = DataFrame(columns=["c1"], dtype="string")
+ expected = DataFrame(index=[], columns=["c1"], dtype=nullable_string_dtype)
+ df = DataFrame(columns=["c1"], dtype=nullable_string_dtype)
  tm.assert_frame_equal(df, expected)
 
  def test_constructor_single_value(self):

pandas/tests/tools/test_to_numeric.py

@@ -725,9 +725,9 @@ def test_precision_float_conversion(strrep):
  (["1", "2", "3.5"], Series([1, 2, 3.5])),
  ],
 )
-def test_to_numeric_from_nullable_string(values, expected):
+def test_to_numeric_from_nullable_string(values, nullable_string_dtype, expected):
  # https://github.com/pandas-dev/pandas/issues/37262
- s = Series(values, dtype="string")
+ s = Series(values, dtype=nullable_string_dtype)
  result = to_numeric(s)
  tm.assert_series_equal(result, expected)