From f2d8447b35ed7221fa3d974e4c7bec2c27731e11 Mon Sep 17 00:00:00 2001
From: Brock <jbrockmendel@gmail.com>
Date: Wed, 8 Dec 2021 12:54:22 -0800
Subject: [PATCH 1/7] CI: Troubleshoot CI

---
 pandas/tests/arithmetic/test_timedelta64.py          | 8 +++++++-
 pandas/tests/frame/constructors/test_from_records.py | 5 +----
 pandas/tests/indexes/datetimes/test_indexing.py      | 4 ----
 pandas/tests/plotting/test_datetimelike.py           | 7 +------
 pandas/tests/reductions/test_stat_reductions.py      | 4 ++--
 5 files changed, 11 insertions(+), 17 deletions(-)

diff --git a/pandas/tests/arithmetic/test_timedelta64.py b/pandas/tests/arithmetic/test_timedelta64.py
index 29c01e45ed28d..15ba1b1089e1c 100644
--- a/pandas/tests/arithmetic/test_timedelta64.py
+++ b/pandas/tests/arithmetic/test_timedelta64.py
@@ -1472,7 +1472,13 @@ def test_td64arr_mul_int(self, box_with_array):
     def test_td64arr_mul_tdlike_scalar_raises(self, two_hours, box_with_array):
         rng = timedelta_range("1 days", "10 days", name="foo")
         rng = tm.box_expected(rng, box_with_array)
-        msg = "argument must be an integer|cannot use operands with types dtype"
+        msg = "|".join(
+            [
+                "argument must be an integer",
+                "cannot use operands with types dtype",
+                r"unsupported operand type(s) for \*",
+            ]
+        )
         with pytest.raises(TypeError, match=msg):
             rng * two_hours
 
diff --git a/pandas/tests/frame/constructors/test_from_records.py b/pandas/tests/frame/constructors/test_from_records.py
index abb70089f1fef..4aa150afadef6 100644
--- a/pandas/tests/frame/constructors/test_from_records.py
+++ b/pandas/tests/frame/constructors/test_from_records.py
@@ -33,10 +33,7 @@ def test_from_records_with_datetimes(self):
         arrdata = [np.array([datetime(2005, 3, 1, 0, 0), None])]
         dtypes = [("EXPIRY", "<M8[ns]")]
 
-        try:
-            recarray = np.core.records.fromarrays(arrdata, dtype=dtypes)
-        except (ValueError):
-            pytest.skip("known failure of numpy rec array creation")
+        recarray = np.core.records.fromarrays(arrdata, dtype=dtypes)
 
         result = DataFrame.from_records(recarray)
         tm.assert_frame_equal(result, expected)
diff --git a/pandas/tests/indexes/datetimes/test_indexing.py b/pandas/tests/indexes/datetimes/test_indexing.py
index 9db6567ca1b56..c6afa3803bcb6 100644
--- a/pandas/tests/indexes/datetimes/test_indexing.py
+++ b/pandas/tests/indexes/datetimes/test_indexing.py
@@ -651,10 +651,6 @@ def test_get_indexer_mixed_dtypes(self, target):
             ([date(9999, 1, 1), date(9999, 1, 1)], [-1, -1]),
         ],
     )
-    # FIXME: these warnings are flaky GH#36131
-    @pytest.mark.filterwarnings(
-        "ignore:Comparison of Timestamp with datetime.date:FutureWarning"
-    )
     def test_get_indexer_out_of_bounds_date(self, target, positions):
         values = DatetimeIndex([Timestamp("2020-01-01"), Timestamp("2020-01-02")])
 
diff --git a/pandas/tests/plotting/test_datetimelike.py b/pandas/tests/plotting/test_datetimelike.py
index f74cab9ed04da..44113d1e217fd 100644
--- a/pandas/tests/plotting/test_datetimelike.py
+++ b/pandas/tests/plotting/test_datetimelike.py
@@ -179,12 +179,7 @@ def check_format_of_first_point(ax, expected_string):
             first_line = ax.get_lines()[0]
             first_x = first_line.get_xdata()[0].ordinal
             first_y = first_line.get_ydata()[0]
-            try:
-                assert expected_string == ax.format_coord(first_x, first_y)
-            except (ValueError):
-                pytest.skip(
-                    "skipping test because issue forming test comparison GH7664"
-                )
+            assert expected_string == ax.format_coord(first_x, first_y)
 
         annual = Series(1, index=date_range("2014-01-01", periods=3, freq="A-DEC"))
         _, ax = self.plt.subplots()
diff --git a/pandas/tests/reductions/test_stat_reductions.py b/pandas/tests/reductions/test_stat_reductions.py
index 0d1bb05c27564..0b9a7eca951f5 100644
--- a/pandas/tests/reductions/test_stat_reductions.py
+++ b/pandas/tests/reductions/test_stat_reductions.py
@@ -74,8 +74,8 @@ def test_td64_mean(self, box):
         obj = box(tdarr)
 
         result = obj.mean()
-        expected = np.array(tdarr).mean()
-        assert result == expected
+        np_tda = np.array(tdarr)
+        assert result == np_tda.mean()
 
         tdarr[0] = pd.NaT
         assert obj.mean(skipna=False) is pd.NaT

From a1997e9f747c04a6ffd352392148d2c4457400b4 Mon Sep 17 00:00:00 2001
From: Brock <jbrockmendel@gmail.com>
Date: Wed, 8 Dec 2021 15:00:35 -0800
Subject: [PATCH 2/7] typo fixup

---
 pandas/tests/arithmetic/test_timedelta64.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pandas/tests/arithmetic/test_timedelta64.py b/pandas/tests/arithmetic/test_timedelta64.py
index 15ba1b1089e1c..840426931b152 100644
--- a/pandas/tests/arithmetic/test_timedelta64.py
+++ b/pandas/tests/arithmetic/test_timedelta64.py
@@ -1476,7 +1476,7 @@ def test_td64arr_mul_tdlike_scalar_raises(self, two_hours, box_with_array):
             [
                 "argument must be an integer",
                 "cannot use operands with types dtype",
-                r"unsupported operand type(s) for \*",
+                r"unsupported operand type\(s\) for \*",
             ]
         )
         with pytest.raises(TypeError, match=msg):

From 2c49f2ea8bc661088e9c8637b5bcc5f9782e816b Mon Sep 17 00:00:00 2001
From: Brock <jbrockmendel@gmail.com>
Date: Thu, 9 Dec 2021 08:01:47 -0800
Subject: [PATCH 3/7] revert no-longer-needed

---
 pandas/tests/reductions/test_stat_reductions.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pandas/tests/reductions/test_stat_reductions.py b/pandas/tests/reductions/test_stat_reductions.py
index 0b9a7eca951f5..0d1bb05c27564 100644
--- a/pandas/tests/reductions/test_stat_reductions.py
+++ b/pandas/tests/reductions/test_stat_reductions.py
@@ -74,8 +74,8 @@ def test_td64_mean(self, box):
         obj = box(tdarr)
 
         result = obj.mean()
-        np_tda = np.array(tdarr)
-        assert result == np_tda.mean()
+        expected = np.array(tdarr).mean()
+        assert result == expected
 
         tdarr[0] = pd.NaT
         assert obj.mean(skipna=False) is pd.NaT

From 011021077121bae61a2d93eafbc70fb95aea8992 Mon Sep 17 00:00:00 2001
From: Brock <jbrockmendel@gmail.com>
Date: Thu, 9 Dec 2021 13:11:11 -0800
Subject: [PATCH 4/7] update exception messages

---
 pandas/tests/arithmetic/test_timedelta64.py | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/pandas/tests/arithmetic/test_timedelta64.py b/pandas/tests/arithmetic/test_timedelta64.py
index 840426931b152..fbb9ed41bf203 100644
--- a/pandas/tests/arithmetic/test_timedelta64.py
+++ b/pandas/tests/arithmetic/test_timedelta64.py
@@ -1984,7 +1984,16 @@ def test_td64arr_div_numeric_scalar(self, box_with_array, two):
         result = tdser / two
         tm.assert_equal(result, expected)
 
-        with pytest.raises(TypeError, match="Cannot divide"):
+        msg = "|".join(
+            [
+                "Cannot divide",
+                # 2021-12-09 npdev started giving a new message; not sure if it
+                #  will be changed back
+                "ufunc 'divide' cannot use operands with types "
+                r"dtype\('float64'\) and dtype\('<m8\[ns\]'\)",
+            ]
+        )
+        with pytest.raises(TypeError, match=msg):
             two / tdser
 
     @pytest.mark.parametrize("two", [2, 2.0, np.array(2), np.array(2.0)])
@@ -2061,6 +2070,9 @@ def test_td64arr_div_numeric_array(
                 "cannot perform __truediv__",
                 "unsupported operand",
                 "Cannot divide",
+                # 2021-12-09 new message on npdev
+                "ufunc 'divide' cannot use operands with types "
+                r"dtype\('float32'\) and dtype\('<m8\[ns\]'\)",
             ]
         )
         with pytest.raises(TypeError, match=pattern):

From 016e057fe4cb640087671b73779a7183b8fd38b2 Mon Sep 17 00:00:00 2001
From: Brock <jbrockmendel@gmail.com>
Date: Thu, 9 Dec 2021 15:12:19 -0800
Subject: [PATCH 5/7] update exc messages for npdev

---
 pandas/tests/arithmetic/test_numeric.py     | 18 ++++++++++++++++--
 pandas/tests/arithmetic/test_timedelta64.py |  4 ++--
 2 files changed, 18 insertions(+), 4 deletions(-)

diff --git a/pandas/tests/arithmetic/test_numeric.py b/pandas/tests/arithmetic/test_numeric.py
index 4935151ec986e..1e8cfe144ab1f 100644
--- a/pandas/tests/arithmetic/test_numeric.py
+++ b/pandas/tests/arithmetic/test_numeric.py
@@ -169,7 +169,14 @@ def test_div_td64arr(self, left, box_cls):
         result = right // left
         tm.assert_equal(result, expected)
 
-        msg = "Cannot divide"
+        msg = "|".join(
+            [
+                "Cannot divide",
+                # 2021-12-09 new message in npdev
+                "ufunc 'divide' cannot use operands with types "
+                r"dtype\('.*'\) and dtype\('<m8\[ns\]'\)",
+            ]
+        )
         with pytest.raises(TypeError, match=msg):
             left / right
 
@@ -246,7 +253,14 @@ def test_numeric_arr_rdiv_tdscalar(self, three_days, numeric_idx, box_with_array
         result = three_days / index
         tm.assert_equal(result, expected)
 
-        msg = "cannot use operands with types dtype"
+        msg = "|".join(
+            [
+                "cannot use operands with types dtype",
+                # 2021-12-09 new message in npdev
+                "ufunc 'divide' cannot use operands with types "
+                r"dtype\('.*'\) and dtype\('<m8\[ns\]'\)",
+            ]
+        )
         with pytest.raises(TypeError, match=msg):
             index / three_days
 
diff --git a/pandas/tests/arithmetic/test_timedelta64.py b/pandas/tests/arithmetic/test_timedelta64.py
index fbb9ed41bf203..c4087595f82fe 100644
--- a/pandas/tests/arithmetic/test_timedelta64.py
+++ b/pandas/tests/arithmetic/test_timedelta64.py
@@ -1990,7 +1990,7 @@ def test_td64arr_div_numeric_scalar(self, box_with_array, two):
                 # 2021-12-09 npdev started giving a new message; not sure if it
                 #  will be changed back
                 "ufunc 'divide' cannot use operands with types "
-                r"dtype\('float64'\) and dtype\('<m8\[ns\]'\)",
+                r"dtype\('.*'\) and dtype\('<m8\[ns\]'\)",
             ]
         )
         with pytest.raises(TypeError, match=msg):
@@ -2072,7 +2072,7 @@ def test_td64arr_div_numeric_array(
                 "Cannot divide",
                 # 2021-12-09 new message on npdev
                 "ufunc 'divide' cannot use operands with types "
-                r"dtype\('float32'\) and dtype\('<m8\[ns\]'\)",
+                r"dtype\('.*'\) and dtype\('<m8\[ns\]'\)",
             ]
         )
         with pytest.raises(TypeError, match=pattern):

From 206b2496bc6f6aa025cb26cb42f52abeec227741 Mon Sep 17 00:00:00 2001
From: Brock <jbrockmendel@gmail.com>
Date: Fri, 10 Dec 2021 09:40:27 -0800
Subject: [PATCH 6/7] fix array_ufunc bug

---
 pandas/_libs/ops_dispatch.pyx               |  2 +-
 pandas/tests/arithmetic/test_numeric.py     | 18 ++---------------
 pandas/tests/arithmetic/test_timedelta64.py | 22 ++-------------------
 3 files changed, 5 insertions(+), 37 deletions(-)

diff --git a/pandas/_libs/ops_dispatch.pyx b/pandas/_libs/ops_dispatch.pyx
index c34504732ac32..2b2a411e6635f 100644
--- a/pandas/_libs/ops_dispatch.pyx
+++ b/pandas/_libs/ops_dispatch.pyx
@@ -34,7 +34,7 @@ UFUNC_ALIASES = {
     "true_divide": "truediv",
     "power": "pow",
     "remainder": "mod",
-    "divide": "div",
+    "divide": "truediv",
     "equal": "eq",
     "not_equal": "ne",
     "less": "lt",
diff --git a/pandas/tests/arithmetic/test_numeric.py b/pandas/tests/arithmetic/test_numeric.py
index 1e8cfe144ab1f..4935151ec986e 100644
--- a/pandas/tests/arithmetic/test_numeric.py
+++ b/pandas/tests/arithmetic/test_numeric.py
@@ -169,14 +169,7 @@ def test_div_td64arr(self, left, box_cls):
         result = right // left
         tm.assert_equal(result, expected)
 
-        msg = "|".join(
-            [
-                "Cannot divide",
-                # 2021-12-09 new message in npdev
-                "ufunc 'divide' cannot use operands with types "
-                r"dtype\('.*'\) and dtype\('<m8\[ns\]'\)",
-            ]
-        )
+        msg = "Cannot divide"
         with pytest.raises(TypeError, match=msg):
             left / right
 
@@ -253,14 +246,7 @@ def test_numeric_arr_rdiv_tdscalar(self, three_days, numeric_idx, box_with_array
         result = three_days / index
         tm.assert_equal(result, expected)
 
-        msg = "|".join(
-            [
-                "cannot use operands with types dtype",
-                # 2021-12-09 new message in npdev
-                "ufunc 'divide' cannot use operands with types "
-                r"dtype\('.*'\) and dtype\('<m8\[ns\]'\)",
-            ]
-        )
+        msg = "cannot use operands with types dtype"
         with pytest.raises(TypeError, match=msg):
             index / three_days
 
diff --git a/pandas/tests/arithmetic/test_timedelta64.py b/pandas/tests/arithmetic/test_timedelta64.py
index c4087595f82fe..29c01e45ed28d 100644
--- a/pandas/tests/arithmetic/test_timedelta64.py
+++ b/pandas/tests/arithmetic/test_timedelta64.py
@@ -1472,13 +1472,7 @@ def test_td64arr_mul_int(self, box_with_array):
     def test_td64arr_mul_tdlike_scalar_raises(self, two_hours, box_with_array):
         rng = timedelta_range("1 days", "10 days", name="foo")
         rng = tm.box_expected(rng, box_with_array)
-        msg = "|".join(
-            [
-                "argument must be an integer",
-                "cannot use operands with types dtype",
-                r"unsupported operand type\(s\) for \*",
-            ]
-        )
+        msg = "argument must be an integer|cannot use operands with types dtype"
         with pytest.raises(TypeError, match=msg):
             rng * two_hours
 
@@ -1984,16 +1978,7 @@ def test_td64arr_div_numeric_scalar(self, box_with_array, two):
         result = tdser / two
         tm.assert_equal(result, expected)
 
-        msg = "|".join(
-            [
-                "Cannot divide",
-                # 2021-12-09 npdev started giving a new message; not sure if it
-                #  will be changed back
-                "ufunc 'divide' cannot use operands with types "
-                r"dtype\('.*'\) and dtype\('<m8\[ns\]'\)",
-            ]
-        )
-        with pytest.raises(TypeError, match=msg):
+        with pytest.raises(TypeError, match="Cannot divide"):
             two / tdser
 
     @pytest.mark.parametrize("two", [2, 2.0, np.array(2), np.array(2.0)])
@@ -2070,9 +2055,6 @@ def test_td64arr_div_numeric_array(
                 "cannot perform __truediv__",
                 "unsupported operand",
                 "Cannot divide",
-                # 2021-12-09 new message on npdev
-                "ufunc 'divide' cannot use operands with types "
-                r"dtype\('.*'\) and dtype\('<m8\[ns\]'\)",
             ]
         )
         with pytest.raises(TypeError, match=pattern):

From 2ae19f62ca547c857d9fc9a4e4330006b90ded67 Mon Sep 17 00:00:00 2001
From: Brock <jbrockmendel@gmail.com>
Date: Fri, 10 Dec 2021 12:01:31 -0800
Subject: [PATCH 7/7] revert numpy pin

---
 .github/workflows/python-dev.yml | 3 +--
 ci/deps/actions-39-numpydev.yaml | 3 +--
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/python-dev.yml b/.github/workflows/python-dev.yml
index 41e1a7c86d392..2639aa26b6eed 100644
--- a/.github/workflows/python-dev.yml
+++ b/.github/workflows/python-dev.yml
@@ -49,8 +49,7 @@ jobs:
       shell: bash
       run: |
         python -m pip install --upgrade pip setuptools wheel
-        # TODO: unpin
-        pip install -i https://pypi.anaconda.org/scipy-wheels-nightly/simple "numpy==1.23.0.dev0+101.ga81535a36"
+        pip install -i https://pypi.anaconda.org/scipy-wheels-nightly/simple numpy
         pip install git+https://github.com/nedbat/coveragepy.git
         pip install cython python-dateutil pytz hypothesis pytest>=6.2.5 pytest-xdist pytest-cov pytest-timeout
         pip list
diff --git a/ci/deps/actions-39-numpydev.yaml b/ci/deps/actions-39-numpydev.yaml
index 48c03399d5fa8..4b8c74d635323 100644
--- a/ci/deps/actions-39-numpydev.yaml
+++ b/ci/deps/actions-39-numpydev.yaml
@@ -19,6 +19,5 @@ dependencies:
     - cython==0.29.24 # GH#34014
     - "--extra-index-url https://pypi.anaconda.org/scipy-wheels-nightly/simple"
     - "--pre"
-    # TODO: Unpin
-    - "numpy==1.23.0.dev0+101.ga81535a36"
+    - "numpy"
     - "scipy"