Merge branch 'master' of https://github.com/pandas-dev/pandas into ci-10

Author: jbrockmendel

pandas/tests/scalar/test_na_scalar.py

@@ -305,3 +305,11 @@ def test_pickle_roundtrip_containers(as_frame, values, dtype):
         s = s.to_frame(name="A")
     result = tm.round_trip_pickle(s)
     tm.assert_equal(result, s)
+
+
+@pytest.mark.parametrize("array", [np.array(["a"], dtype=object), ["a"]])
+def test_array_contains_na(array):
+    # GH 31922
+    msg = "boolean value of NA is ambiguous"
+    with pytest.raises(TypeError, match=msg):
+        NA in array