diff options
| author | Charles Harris <charlesr.harris@gmail.com> | 2017-01-17 11:39:07 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-01-17 11:39:07 -0700 |
| commit | ce1b4fde081e92c93351589aef5516454f99c55a (patch) | |
| tree | edbd8d0b905ebf67837dc4a1952c02c32793436d | |
| parent | 3c3b8bda6f89d4711e27aa9019c9ba8bac3ec3e5 (diff) | |
| parent | 65c1daf6e0022a916a731ff1bd7c135b650761e3 (diff) | |
| download | numpy-ce1b4fde081e92c93351589aef5516454f99c55a.tar.gz | |
Merge pull request #8492 from jakirkham/rel_1.12_doc_code_bckport
DOC: Backport place np.average in inline code
| -rw-r--r-- | doc/release/1.12.0-notes.rst | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/doc/release/1.12.0-notes.rst b/doc/release/1.12.0-notes.rst index dbe4f1023..9889abb42 100644 --- a/doc/release/1.12.0-notes.rst +++ b/doc/release/1.12.0-notes.rst @@ -67,7 +67,7 @@ Future Changes * In 1.13 NAT will always compare False except for ``NAT != NAT``, which will be True. In short, NAT will behave like NaN -* In 1.13 np.average will preserve subclasses, to match the behavior of most +* In 1.13 ``np.average`` will preserve subclasses, to match the behavior of most other numpy functions such as np.mean. In particular, this means calls which returned a scalar may return a 0-d subclass object instead. @@ -121,7 +121,7 @@ FutureWarning to changed behavior * ``np.full`` now returns an array of the fill-value's dtype if no dtype is given, instead of defaulting to float. -* np.average will emit a warning if the argument is a subclass of ndarray, +* ``np.average`` will emit a warning if the argument is a subclass of ndarray, as the subclass will be preserved starting in 1.13. (see Future Changes) ``power`` and ``**`` raise errors for integer to negative integer powers |