From f34f51190e03e28cd3f120cfc58c8efb5845b774 Mon Sep 17 00:00:00 2001
From: jbrockmendel <jbrockmendel@gmail.com>
Date: Mon, 28 Sep 2020 14:36:32 -0700
Subject: [PATCH] Backport PR #36706: CI: npdev new exception message

---
 pandas/tests/arithmetic/common.py     | 7 +++++++
 pandas/tests/frame/test_arithmetic.py | 5 +++++
 2 files changed, 12 insertions(+)

diff --git a/pandas/tests/arithmetic/common.py b/pandas/tests/arithmetic/common.py
index 755fbd0d9036c..cd8dd102dc27c 100644
--- a/pandas/tests/arithmetic/common.py
+++ b/pandas/tests/arithmetic/common.py
@@ -76,6 +76,13 @@ def assert_invalid_comparison(left, right, box):
             "Cannot compare type",
             "not supported between",
             "invalid type promotion",
+            (
+                # GH#36706 npdev 1.20.0 2020-09-28
+                r"The DTypes <class 'numpy.dtype\[datetime64\]'> and "
+                r"<class 'numpy.dtype\[int64\]'> do not have a common DType. "
+                "For example they cannot be stored in a single array unless the "
+                "dtype is `object`."
+            ),
         ]
     )
     with pytest.raises(TypeError, match=msg):
diff --git a/pandas/tests/frame/test_arithmetic.py b/pandas/tests/frame/test_arithmetic.py
index e17357e9845b5..166f26f668502 100644
--- a/pandas/tests/frame/test_arithmetic.py
+++ b/pandas/tests/frame/test_arithmetic.py
@@ -53,6 +53,11 @@ def check(df, df2):
                 msgs = [
                     r"Invalid comparison between dtype=datetime64\[ns\] and ndarray",
                     "invalid type promotion",
+                    (
+                        # npdev 1.20.0
+                        r"The DTypes <class 'numpy.dtype\[.*\]'> and "
+                        r"<class 'numpy.dtype\[.*\]'> do not have a common DType."
+                    ),
                 ]
                 msg = "|".join(msgs)
                 with pytest.raises(TypeError, match=msg):