diff options
author | Charles Harris <charlesr.harris@gmail.com> | 2015-11-03 09:15:12 -0700 |
---|---|---|
committer | Charles Harris <charlesr.harris@gmail.com> | 2015-11-04 14:17:52 -0700 |
commit | cbfd9370ee273ef8f7694d1c689649e98d8ee08b (patch) | |
tree | 5b6453ec73781d05643a278800a413e9e9651c59 /doc | |
parent | 2bc5cb9a19027704d13f06b02c0bbd07e6aebd29 (diff) | |
download | numpy-cbfd9370ee273ef8f7694d1c689649e98d8ee08b.tar.gz |
BUG: Fix swig make_fortran function.
The function was calling PyArray_FromArray with NPY_FORTRANORDER instead
of NPY_ARRAY_F_CONTIGUOUS. The first is of type NPY_ORDER and the second
is a flag.
Closes #6618. [ci skip]
Diffstat (limited to 'doc')
-rw-r--r-- | doc/release/1.10.2-notes.rst | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/doc/release/1.10.2-notes.rst b/doc/release/1.10.2-notes.rst index efd57d927..31a793420 100644 --- a/doc/release/1.10.2-notes.rst +++ b/doc/release/1.10.2-notes.rst @@ -32,6 +32,7 @@ Issues Fixed * gh-6575 BUG: Split produces empty arrays with wrong number of dimensions * gh-6590 Fortran Array problem in numpy 1.10. * gh-6602 Random __all__ missing choice and dirichlet. +* gh-6618 NPY_FORTRANORDER in make_fortran() in numpy.i Merged PRs ========== @@ -67,6 +68,7 @@ The following PRs in master have been backported to 1.10.2 * gh-6596 BUG: Fix swig for relaxed stride checking. * gh-6606 DOC: Update 1.10.2 release notes. * gh-6614 BUG: Add choice and dirichlet to numpy.random.__all__. +* gh-6621 BUG: Fix swig make_fortran function. Initial support for mingwpy was reverted as it was causing problems for non-windows builds. |