diff options
| author | Charles Harris <charlesr.harris@gmail.com> | 2017-01-17 10:51:52 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-01-17 10:51:52 -0700 |
| commit | 50956653118ec062ea429d423816e6cbfe10f24b (patch) | |
| tree | 990612c6925a14cde6d20fb5d2bfa2edfce451f3 | |
| parent | 5223d433b3a867ea81037c7e585f182476af7619 (diff) | |
| parent | 0f343f8c53d2725a0859f5aa613fe1d9a3b97942 (diff) | |
| download | numpy-50956653118ec062ea429d423816e6cbfe10f24b.tar.gz | |
Merge pull request #8490 from jakirkham/rel_1.12_doc_code
DOC: 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 |