8000 DOC: Clean up/fix several references to the "future" 1.10 release by njsmith · Pull Request #7015 · numpy/numpy · GitHub
[go: up one dir, main page]
Skip to content

DOC: Clean up/fix several references to the "future" 1.10 release #7015

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jan 15, 2016
Merged

DOC: Clean up/fix several references to the "future" 1.10 release #7015

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions doc/source/reference/ufuncs.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -333,8 +333,8 @@ advanced usage and will not typically be used.
with previous versions of NumPy, this defaults to 'unsafe' for numpy < 1.7.
In numpy 1.7 a transition to 'same_kind' was begun where ufuncs produce a
DeprecationWarning for calls which are allowed under the 'unsafe'
rules, but not under the 'same_kind' rules. In numpy 1.10 the default
will be 'same_kind'.
rules, but not under the 'same_kind' rules. From numpy 1.10 and
onwards, the default is 'same_kind'.

*order*

Expand Down
2 changes: 1 addition & 1 deletion numpy/add_newdocs.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3466,7 +3466,7 @@ def luf(lamdaexpr, *args, **kwargs):

Return specified diagonals. In NumPy 1.9 the returned array is a
read-only view instead of a copy as in previous NumPy versions. In
NumPy 1.10 the read-only restriction will be removed.
a future version the read-only restriction will be removed.

Refer to :func:`numpy.diagonal` for full documentation.

Expand Down
6 changes: 3 additions & 3 deletions numpy/core/fromnumeric.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1217,11 +1217,11 @@ def diagonal(a, offset=0, axis1=0, axis2=1):
but depending on this fact is deprecated. Writing to the resulting
array continues to work as it used to, but a FutureWarning is issued.

In NumPy 1.9 it returns a read-only view on the original array.
Starting in NumPy 1.9 it returns a read-only view on the original array.
Attempting to write to the resulting array will produce an error.

In NumPy 1.10, it will return a read/write view and writing to the
returned array will alter your original array. The returned array
In some future release, it will return a read/write view and writing to
the returned array will alter your original array. The returned array
will have the same type as the input array.

If you don't write to the array returned by this function, then you can
Expand Down
0