Add deprecation starting version to warning message

rtlee9 · rtlee9 · commit 4bcfc92dbaed · 2018-01-18T19:09:16.000-08:00
diff --git a/sklearn/utils/tests/test_validation.py b/sklearn/utils/tests/test_validation.py
@@ -249,22 +249,26 @@ def test_check_array():
     X_str = [['a', 'b'], ['c', 'd']]
     assert_warns_message(
         DeprecationWarning,
-        "array with dtype {} will be handled as object".format(np.dtype('U1')),
+        "arrays with dtype {} will be handled as arrays with dtype object"
+        .format(np.dtype('U1')),
         check_array, X_str, "numeric")
     assert_warns_message(
         DeprecationWarning,
-        "array with dtype {} will be handled as object".format(np.dtype('U1')),
+        "arrays with dtype {} will be handled as arrays with dtype object"
+        .format(np.dtype('U1')),
         check_array, np.array(X_str, dtype='U1'), "numeric")
 
     # deprecation warning if byte-like array with dtype="numeric"
     X_byte = [[b'a', b'b'], [b'c', b'd']]
     assert_warns_message(
         DeprecationWarning,
-        "array with dtype {} will be handled as object".format(np.dtype('S1')),
+        "arrays with dtype {} will be handled as arrays with dtype object"
+        .format(np.dtype('S1')),
         check_array, np.array(X_byte, dtype='S1'), "numeric")
     assert_warns_message(
         DeprecationWarning,
-        "array with dtype {} will be handled as object".format(np.dtype('V1')),
+        "arrays with dtype {} will be handled as arrays with dtype object"
+        .format(np.dtype('V1')),
         check_array, np.array(X_byte, dtype='V1'), "numeric")
 
 
diff --git a/sklearn/utils/validation.py b/sklearn/utils/validation.py
@@ -479,8 +479,9 @@ def check_array(array, accept_sparse=False, dtype="numeric", order=None,
         # in the future np.flexible dtypes will be handled like object dtypes
         if dtype_numeric and np.issubdtype(array.dtype, np.flexible):
             warnings.warn(
-                "In the future, array with dtype {} will be handled as object,"
-                " and will be attempted to be cast to numeric.".format(
+                "Beginning in version 0.22, arrays with dtype {} will be "
+                "handled as arrays with dtype object, and will be attempted "
+                "to be cast to numeric.".format(
                     array.dtype), DeprecationWarning)
 
         # make sure we actually converted to numeric:
