diff options
| author | Sebastian Berg <sebastian@sipsolutions.net> | 2020-09-03 10:23:20 -0500 |
|---|---|---|
| committer | Sebastian Berg <sebastian@sipsolutions.net> | 2020-09-03 10:23:46 -0500 |
| commit | c8eb9d47c5562c665cb45d91bedbf689e0edf3f0 (patch) | |
| tree | 740e4a30dbf315a9125b9d4443af37366a8d9f5f | |
| parent | 1a79c064ff65a150c18d8c2ad3050350532f1b0e (diff) | |
| download | numpy-c8eb9d47c5562c665cb45d91bedbf689e0edf3f0.tar.gz | |
DOC: Fixup deprecation dates
| -rw-r--r-- | numpy/core/multiarray.py | 4 | ||||
| -rw-r--r-- | numpy/core/src/multiarray/multiarraymodule.c | 2 | ||||
| -rw-r--r-- | numpy/core/tests/test_deprecations.py | 1 |
3 files changed, 4 insertions, 3 deletions
diff --git a/numpy/core/multiarray.py b/numpy/core/multiarray.py index fade479c1..225c9554c 100644 --- a/numpy/core/multiarray.py +++ b/numpy/core/multiarray.py @@ -163,12 +163,12 @@ def concatenate(arrays, axis=None, out=None, *, dtype=None, casting=None): If provided, the destination array will have this dtype. Cannot be provided together with `out`. - ..versionadded:: 1.19.0 + ..versionadded:: 1.20.0 casting : {'no', 'equiv', 'safe', 'same_kind', 'unsafe'}, optional Controls what kind of data casting may occur. Defaults to 'same_kind'. - ..versionadded:: 1.19.0 + ..versionadded:: 1.20.0 Returns ------- diff --git a/numpy/core/src/multiarray/multiarraymodule.c b/numpy/core/src/multiarray/multiarraymodule.c index 8ff6a4866..276ceabc4 100644 --- a/numpy/core/src/multiarray/multiarraymodule.c +++ b/numpy/core/src/multiarray/multiarraymodule.c @@ -621,7 +621,7 @@ PyArray_ConcatenateFlattenedArrays(int narrays, PyArrayObject **arrays, arrays[iarrays], PyArray_DESCR(ret), casting)) { /* This should be an error, but was previously allowed here. */ if (casting_not_passed && out_passed) { - /* NumPy 1.19, 2020-04-30 */ + /* NumPy 1.20, 2020-09-03 */ if (give_deprecation_warning && DEPRECATE( "concatenate() with `axis=None` will use same-kind " "casting by default in the future. Please use " diff --git a/numpy/core/tests/test_deprecations.py b/numpy/core/tests/test_deprecations.py index ba49d61eb..17391e80c 100644 --- a/numpy/core/tests/test_deprecations.py +++ b/numpy/core/tests/test_deprecations.py @@ -709,6 +709,7 @@ class TestRaggedArray(_DeprecationTestCase): class FlatteningConcatenateUnsafeCast(_DeprecationTestCase): + # NumPy 1.20, 2020-09-03 message = "concatenate with `axis=None` will use same-kind casting" def test_deprecated(self): |