Merge remote-tracking branch 'upstream/main' into coercion

Author: MarcoGorelli

asv_bench/asv.conf.json

@@ -41,7 +41,7 @@
     // pip (with all the conda available packages installed first,
     // followed by the pip installed packages).
     "matrix": {
-        "numpy": [],
+        "numpy": ["1.23.5"],  // https://github.com/pandas-dev/pandas/pull/50356
         "Cython": ["0.29.32"],
         "matplotlib": [],
         "sqlalchemy": [],

ci/deps/actions-310-numpydev.yaml

@@ -22,5 +22,5 @@ dependencies:
     - "cython"
     - "--extra-index-url https://pypi.anaconda.org/scipy-wheels-nightly/simple"
     - "--pre"
-    - "numpy"
+    - "numpy<1.24"
     - "scipy"

ci/deps/actions-310.yaml

@@ -18,7 +18,7 @@ dependencies:
 
   # required dependencies
   - python-dateutil
-  - numpy
+  - numpy<1.24
   - pytz
 
   # optional dependencies

ci/deps/actions-38-downstream_compat.yaml

@@ -19,7 +19,7 @@ dependencies:
 
   # required dependencies
   - python-dateutil
-  - numpy
+  - numpy<1.24
   - pytz
 
   # optional dependencies

ci/deps/actions-38.yaml

@@ -18,7 +18,7 @@ dependencies:
 
   # required dependencies
   - python-dateutil
-  - numpy
+  - numpy<1.24
   - pytz
 
   # optional dependencies

ci/deps/actions-39.yaml

@@ -18,7 +18,7 @@ dependencies:
 
   # required dependencies
   - python-dateutil
-  - numpy
+  - numpy<1.24
   - pytz
 
   # optional dependencies

ci/deps/actions-pypy-38.yaml

@@ -19,6 +19,6 @@ dependencies:
   - hypothesis>=5.5.3
 
   # required
-  - numpy
+  - numpy<1.24
   - python-dateutil
   - pytz

ci/deps/circle-38-arm64.yaml

@@ -18,7 +18,7 @@ dependencies:
 
   # required dependencies
   - python-dateutil
-  - numpy
+  - numpy<1.24
   - pytz
 
   # optional dependencies

doc/source/whatsnew/v2.0.0.rst

@@ -896,6 +896,7 @@ I/O
 Period
 ^^^^^^
 - Bug in :meth:`Period.strftime` and :meth:`PeriodIndex.strftime`, raising ``UnicodeDecodeError`` when a locale-specific directive was passed (:issue:`46319`)
+- Bug in adding a :class:`Period` object to an array of :class:`DateOffset` objects incorrectly raising ``TypeError`` (:issue:`50162`)
 -
 
 Plotting

environment.yml

@@ -20,7 +20,7 @@ dependencies:
 
   # required dependencies
   - python-dateutil
-  - numpy
+  - numpy<1.24
   - pytz
 
   # optional dependencies

pandas/_libs/tslibs/period.pyx

@@ -1741,6 +1741,11 @@ cdef class _Period(PeriodMixin):
             raise TypeError(f"unsupported operand type(s) for +: '{sname}' "
                             f"and '{oname}'")
 
+        elif util.is_array(other):
+            if other.dtype == object:
+                # GH#50162
+                return np.array([self + x for x in other], dtype=object)
+
         return NotImplemented
 
     def __radd__(self, other):
@@ -1767,11 +1772,22 @@ cdef class _Period(PeriodMixin):
         elif other is NaT:
             return NaT
 
+        elif util.is_array(other):
+            if other.dtype == object:
+                # GH#50162
+                return np.array([self - x for x in other], dtype=object)
+
         return NotImplemented
 
     def __rsub__(self, other):
         if other is NaT:
             return NaT
+
+        elif util.is_array(other):
+            if other.dtype == object:
+                # GH#50162
+                return np.array([x - self for x in other], dtype=object)
+
         return NotImplemented
 
     def asfreq(self, freq, how="E") -> "Period":

pandas/core/arrays/string_.py

@@ -266,7 +266,7 @@ class StringArray(BaseStringArray, PandasArray):
 
     See Also
     --------
-    array
+    :func:`pandas.array`
         The recommended function for creating a StringArray.
     Series.str
         The string methods are available on Series backed by

pandas/core/arrays/string_arrow.py

@@ -84,7 +84,7 @@ class ArrowStringArray(ArrowExtensionArray, BaseStringArray, ObjectStringArrayMi
 
     See Also
     --------
-    array
+    :func:`pandas.array`
         The recommended function for creating a ArrowStringArray.
     Series.str
         The string methods are available on Series backed by

pandas/core/generic.py

@@ -6580,6 +6580,7 @@ def fillna(
     def fillna(
         self: NDFrameT,
         value: Hashable | Mapping | Series | DataFrame = None,
+        *,
         method: FillnaOptions | None = None,
         axis: Axis | None = None,
         inplace: bool_t = False,

pandas/io/json/_table_schema.py

@@ -1,7 +1,7 @@
 """
 Table Schema builders
 
-https://specs.frictionlessdata.io/json-table-schema/
+https://specs.frictionlessdata.io/table-schema/
 """
 from __future__ import annotations
 

pandas/tests/arithmetic/test_object.py

@@ -73,6 +73,18 @@ def test_more_na_comparisons(self, dtype):
 
 
 class TestArithmetic:
+    def test_add_period_to_array_of_offset(self):
+        # GH#50162
+        per = pd.Period("2012-1-1", freq="D")
+        pi = pd.period_range("2012-1-1", periods=10, freq="D")
+        idx = per - pi
+
+        expected = pd.Index([x + per for x in idx], dtype=object)
+        result = idx + per
+        tm.assert_index_equal(result, expected)
+
+        result = per + idx
+        tm.assert_index_equal(result, expected)
 
     # TODO: parametrize
     def test_pow_ops_object(self):

requirements-dev.txt

@@ -11,7 +11,7 @@ psutil
 pytest-asyncio>=0.17
 coverage
 python-dateutil
-numpy
+numpy<1.24
 pytz
 beautifulsoup4
 blosc