Update xfails for 2.3.x

Author: jorisvandenbossche

pandas/tests/arrays/categorical/test_analytics.py

@@ -4,12 +4,7 @@
 import numpy as np
 import pytest
 
-from pandas._config import using_string_dtype
-
-from pandas.compat import (
-    HAS_PYARROW,
-    PYPY,
-)
+from pandas.compat import PYPY
 
 from pandas import (
     Categorical,
@@ -301,9 +296,6 @@ def test_nbytes(self):
         exp = 3 + 3 * 8  # 3 int8s for values + 3 int64s for categories
         assert cat.nbytes == exp
 
-    @pytest.mark.xfail(
-        using_string_dtype() and HAS_PYARROW, reason="TODO(infer_string)"
-    )
     def test_memory_usage(self):
         cat = Categorical([1, 2, 3])
 

pandas/tests/copy_view/test_array.py

@@ -1,8 +1,6 @@
 import numpy as np
 import pytest
 
-from pandas._config import using_string_dtype
-
 from pandas import (
     DataFrame,
     Series,
@@ -159,7 +157,6 @@ def test_dataframe_array_ea_dtypes(using_copy_on_write):
         assert arr.flags.writeable is True
 
 
-@pytest.mark.xfail(using_string_dtype(), reason="TODO(infer_string)")
 def test_dataframe_array_string_dtype(using_copy_on_write, using_array_manager):
     df = DataFrame({"a": ["a", "b"]}, dtype="string")
     arr = np.asarray(df)

pandas/tests/copy_view/test_interp_fillna.py

@@ -3,8 +3,6 @@
 
 from pandas._config import using_string_dtype
 
-from pandas.compat import HAS_PYARROW
-
 from pandas import (
     NA,
     ArrowDtype,
@@ -161,7 +159,7 @@ def test_interpolate_cleaned_fill_method(using_copy_on_write):
     tm.assert_frame_equal(df, df_orig)
 
 
-@pytest.mark.xfail(using_string_dtype() and HAS_PYARROW, reason="TODO(infer_string)")
+@pytest.mark.xfail(using_string_dtype(), reason="TODO(infer_string)")
 def test_interpolate_object_convert_no_op(using_copy_on_write):
     df = DataFrame({"a": ["a", "b", "c"], "b": 1})
     arr_a = get_array(df, "a")

pandas/tests/frame/methods/test_info.py

@@ -10,7 +10,6 @@
 from pandas._config import using_string_dtype
 
 from pandas.compat import (
-    HAS_PYARROW,
     IS64,
     PYPY,
 )
@@ -521,7 +520,7 @@ def test_info_int_columns():
     assert result == expected
 
 
-@pytest.mark.xfail(using_string_dtype() and HAS_PYARROW, reason="TODO(infer_string)")
+@pytest.mark.xfail(using_string_dtype(), reason="TODO(infer_string)")
 def test_memory_usage_empty_no_warning():
     # GH#50066
     df = DataFrame(index=["a", "b"])

pandas/tests/groupby/aggregate/test_cython.py

@@ -164,7 +164,6 @@ def test_cython_agg_return_dict():
     tm.assert_series_equal(ts, expected)
 
 
-@pytest.mark.xfail(using_string_dtype(), reason="TODO(infer_string)")
 def test_cython_fail_agg():
     dr = bdate_range("1/1/2000", periods=50)
     ts = Series(["A", "B", "C", "D", "E"] * 10, index=dr)

pandas/tests/indexes/base_class/test_reshape.py

@@ -4,6 +4,7 @@
 import numpy as np
 import pytest
 
+import pandas as pd
 from pandas import Index
 import pandas._testing as tm
 
@@ -35,7 +36,9 @@ def test_insert(self):
         null_index = Index([])
         tm.assert_index_equal(Index(["a"], dtype=object), null_index.insert(0, "a"))
 
-    def test_insert_missing(self, nulls_fixture, using_infer_string):
+    def test_insert_missing(self, request, nulls_fixture, using_infer_string):
+        if using_infer_string and nulls_fixture is pd.NA:
+            request.applymarker(pytest.mark.xfail(reason="TODO(infer_string)"))
         # GH#22295
         # test there is no mangling of NA values
         expected = Index(["a", nulls_fixture, "b", "c"], dtype=object)

pandas/tests/indexing/test_loc.py

@@ -1443,6 +1443,9 @@ def test_loc_setitem_listlike_with_timedelta64index(self, indexer, expected):
 
         tm.assert_frame_equal(expected, df)
 
+    @pytest.mark.xfail(
+        using_string_dtype() and not HAS_PYARROW, reason="TODO(infer_string)"
+    )
     def test_loc_setitem_categorical_values_partial_column_slice(self):
         # Assigning a Category to parts of a int/... column uses the values of
         # the Categorical

pandas/tests/io/parser/common/test_common_basic.py

@@ -14,6 +14,7 @@
 
 from pandas._config import using_string_dtype
 
+from pandas.compat import HAS_PYARROW
 from pandas.errors import (
     EmptyDataError,
     ParserError,
@@ -917,7 +918,7 @@ def test_dict_keys_as_names(all_parsers):
     tm.assert_frame_equal(result, expected)
 
 
-@pytest.mark.xfail(using_string_dtype(), reason="TODO(infer_string)")
+@pytest.mark.xfail(using_string_dtype() and HAS_PYARROW, reason="TODO(infer_string)")
 @xfail_pyarrow  # UnicodeDecodeError: 'utf-8' codec can't decode byte 0xed in position 0
 def test_encoding_surrogatepass(all_parsers):
     # GH39017

pandas/tests/series/methods/test_replace.py

@@ -391,6 +391,7 @@ def test_replace_mixed_types_with_string(self):
         expected = pd.Series([1, np.nan, 3, np.nan, 4, 5])
         tm.assert_series_equal(expected, result)
 
+    @pytest.mark.xfail(using_string_dtype(), reason="TODO(infer_string)")
     @pytest.mark.parametrize(
         "categorical, numeric",
         [

pandas/tests/series/test_logical_ops.py

@@ -368,7 +368,9 @@ def test_reverse_ops_with_index(self, op, expected):
         result = op(ser, idx)
         tm.assert_series_equal(result, expected)
 
-    @pytest.mark.xfail(using_string_dtype(), reason="TODO(infer_string)")
+    @pytest.mark.xfail(
+        using_string_dtype() and not HAS_PYARROW, reason="TODO(infer_string)"
+    )
     def test_logical_ops_label_based(self, using_infer_string):
         # GH#4947
         # logical ops should be label based