Added FUTURE_INFER_STRING catch, edited documentation

Author: eicchen

doc/source/whatsnew/v3.0.0.rst

@@ -200,7 +200,7 @@ Other enhancements
 - :class:`Holiday` has gained the constructor argument and field ``exclude_dates`` to exclude specific datetimes from a custom holiday calendar (:issue:`54382`)
 - :class:`Rolling` and :class:`Expanding` now support ``nunique`` (:issue:`26958`)
 - :class:`Rolling` and :class:`Expanding` now support aggregations ``first`` and ``last`` (:issue:`33155`)
-- :class:`StringDtype` now supports addition to Series/DataFrame with floats, ints, and strings (:issue:`61581`)
+- :class:`StringDtype` now supports addition to Series/DataFrame with floats, ints, and strings(Only for future string) (:issue:`61581`)
 - :func:`read_parquet` accepts ``to_pandas_kwargs`` which are forwarded to :meth:`pyarrow.Table.to_pandas` which enables passing additional keywords to customize the conversion to pandas, such as ``maps_as_pydicts`` to read the Parquet map data type as python dictionaries (:issue:`56842`)
 - :meth:`.DataFrameGroupBy.transform`, :meth:`.SeriesGroupBy.transform`, :meth:`.DataFrameGroupBy.agg`, :meth:`.SeriesGroupBy.agg`, :meth:`.SeriesGroupBy.apply`, :meth:`.DataFrameGroupBy.apply` now support ``kurt`` (:issue:`40139`)
 - :meth:`DataFrame.apply` supports using third-party execution engines like the Bodo.ai JIT compiler (:issue:`60668`)

pandas/tests/arrays/floating/test_arithmetic.py

@@ -154,10 +154,14 @@ def test_error_invalid_values(data, all_arithmetic_operators):
 
     # invalid array-likes
     str_ser = pd.Series("foo", index=s.index)
-    if all_arithmetic_operators in [
-        "__add__",
-        "__radd__",
-    ]:
+    if (
+        all_arithmetic_operators
+        in [
+            "__add__",
+            "__radd__",
+        ]
+        and pd.options.future.infer_string
+    ):
         res = ops(str_ser)
         if all_arithmetic_operators == "__radd__":
             data_expected = []

pandas/tests/arrays/integer/test_arithmetic.py

@@ -197,10 +197,14 @@ def test_error_invalid_values(data, all_arithmetic_operators):
         #  assert_almost_equal stricter, but the expected with pd.NA seems
         #  more-correct than np.nan here.
         tm.assert_series_equal(res, expected)
-    elif all_arithmetic_operators in [
-        "__add__",
-        "__radd__",
-    ]:
+    elif (
+        all_arithmetic_operators
+        in [
+            "__add__",
+            "__radd__",
+        ]
+        and pd.options.future.infer_string
+    ):
         res = ops(str_ser)
         if all_arithmetic_operators == "__radd__":
             expected = pd.Series(