summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | | | | | | BUG: ma.make_mask should always return nomask for nomask argument.Charles Harris2015-11-112-4/+16
| |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When the mask argument was nomask, commit 8da9c71 changed the behavior to depend on shrink=True as well, resulting in array(False) false being returned when shrink=True, which in turn led to bugs because nomask is a singleton and is detected by `mask is nomask`. That dectection fails when nomask is replaced by array(False). Closes #6667.
* | | | | | | | Merge pull request #6671 from floatingpointstack/maint6670Charles Harris2015-11-121-1/+1
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | MAINT: Typo in arrays.indexing.rst Issue#6670
| * | | | | | | MAINT: Typo in arrays.indexing.rst Issue#6670floatingpointstack2015-11-121-1/+1
|/ / / / / / /
* | | | | | | Merge pull request #6665 from charris/sync-1.10.2-notesCharles Harris2015-11-101-2/+9
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | DOC: Sync 1.10.2 release notes with maintenance/1.10.x.
| * | | | | | | DOC: Sync 1.10.2 release notes with maintenance/1.10.x.Charles Harris2015-11-101-2/+9
|/ / / / / / / | | | | | | | | | | | | | | | | | | | | | [ci skip]
* | | | | | | Merge pull request #6653 from charris/fix-ma-dotCharles Harris2015-11-104-184/+262
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | Fix ma dot
| * | | | | | TST: Add tests for ma.dot.Charles Harris2015-11-102-21/+37
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Test that ma.dot always returns a masked array. Test basic that the new out parameter in ma.dot works.
| * | | | | | BUG, MAINT: Refactor ma.dot function and the corresponding method.Charles Harris2015-11-102-162/+221
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The basic implementation of ma.dot is moved from the method to the function and the function itself is moved from extras.py to core.py on account of import complications. The mask_rowcols function from extras is also moved to core.py as it is needed by dot. For backwards compatibility, both functions are still exported in extras.__all__ and can be imported from that module. They are not included in part of core.__all__. An out parameter is also added to ma.dot. This PR also closes #6611.
| * | | | | | STY: Minor style fixups.Charles Harris2015-11-072-3/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix some long lines and indentation in numpy/ma/core.py and numpy/ma/extras.py
* | | | | | | Merge pull request #6649 from sieben/dict_litteralJaime2015-11-077-49/+33
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | MAINT: Dictionary litteral
| * | | | | | | MAINT: Dictionary litteralRémy Léone2015-11-077-49/+33
| | | | | | | |
* | | | | | | | Merge pull request #6652 from rgommers/remove-wafCharles Harris2015-11-071-528/+0
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | MAINT: remove _build_utils/waf.py.
| * | | | | | | | MAINT: remove _build_utils/waf.py.Ralf Gommers2015-11-071-528/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This was used by Bento, and support for Bento was removed in gh-6268.
* | | | | | | | | Merge pull request #6648 from sieben/useless_semicolonJaime2015-11-072-2/+2
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | | MAINT: Remove useless semicolon
| * | | | | | | | MAINT: Remove useless semicolonRémy Léone2015-11-072-2/+2
| |/ / / / / / /
* | | | | | | | Merge pull request #6650 from sieben/list_litteralRalf Gommers2015-11-073-9/+3
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | | MAINT: use list litterals
| * | | | | | | MAINT: list litteralRémy Léone2015-11-073-9/+3
| |/ / / / / /
* | | | | | | Merge pull request #6642 from ahaldane/fix_dict_descr_memleakCharles Harris2015-11-061-8/+23
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | BUG: Fix memleak in _convert_from_dict
| * | | | | | | BUG: Fix memleak in _convert_from_dictAllan Haldane2015-11-061-8/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes a memleak introduced in #5920, where PyDict_GetItemString was replaced by PyMapping_GetItemString which returns a new ref. Fixes #6636
* | | | | | | | Merge pull request #6643 from ahaldane/recarray_getitem_returns_recarrayCharles Harris2015-11-062-0/+9
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | ENH: make recarray.getitem return a recarray
| * | | | | | | ENH: make recarray.getitem return a recarrayAllan Haldane2015-11-062-0/+9
|/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | recarray.__getitem__ should return a recarray when the returned value had structured type (it's documented to do so). Fixes #6641
* | | | | | | Merge pull request #6628 from charris/fix-allclose-return-typeCharles Harris2015-11-053-1/+14
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | | BUG: Make allclose return python bool.
| * | | | | | DOC: Update 1.10.2 release notes for gh-6475 fix.Charles Harris2015-11-041-0/+2
| | | | | | |
| * | | | | | BUG: Make allclose return python bool.Charles Harris2015-11-042-1/+12
|/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The function was returning an ndarray subtype when the at least one of the arguments was a subtype. Closes #6475.
* | | | | | Merge pull request #6621 from charris/fix-swig-make_fortranCharles Harris2015-11-042-1/+3
|\ \ \ \ \ \ | | | | | | | | | | | | | | BUG: Fix swig make_fortran function.
| * | | | | | BUG: Fix swig make_fortran function.Charles Harris2015-11-042-1/+3
|/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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]
* | | | | | Merge pull request #6614 from charris/update-random-allCharles Harris2015-11-022-0/+6
|\ \ \ \ \ \ | | | | | | | | | | | | | | BUG: Add choice and dirichlet to numpy.random.__all__.
| * | | | | | BUG: Add choice and dirichlet to numpy.random.__all__.Charles Harris2015-11-022-0/+6
| | |_|_|_|/ | |/| | | | | | | | | | | | | | | | Closes #6602.
* | | | | | Merge pull request #6613 from ev-br/noncentral_chisqCharles Harris2015-11-023-4/+14
|\ \ \ \ \ \ | |/ / / / / |/| | | | | MAINT: random: allow nonc==0 in noncentral_chisquare.
| * | | | | MAINT: random: allow nonc==0 in noncentral_chisquare.Evgeni Burovski2015-11-023-4/+14
|/ / / / / | | | | | | | | | | | | | | | | | | | | Noncentral chi-square reduces to a central chi-square, so just defer to that.
* | | | | Merge pull request #6606 from charris/update-1.10.2-release-notesCharles Harris2015-11-011-0/+2
|\ \ \ \ \ | | | | | | | | | | | | DOC: Update 1.10.2 release notes.
| * | | | | DOC: Update 1.10.2 release notes.Charles Harris2015-11-011-0/+2
|/ / / / / | | | | | | | | | | | | | | | [ci skip]
* | | | | Merge pull request #6605 from charris/sync-1.10.2-release-notesCharles Harris2015-11-011-11/+14
|\ \ \ \ \ | | | | | | | | | | | | DOC: Sync 1.10.2 release notes in master with 1.10.x.
| * | | | | DOC: Sync 1.10.2 release notes in master with 1.10.x.Charles Harris2015-11-011-11/+14
|/ / / / / | | | | | | | | | | | | | | | [ci skip]
* | | | | Merge pull request #6596 from charris/fix-swig-for-relaxed-stridesCharles Harris2015-11-013-4/+26
|\ \ \ \ \ | | | | | | | | | | | | Fix swig for relaxed stride checking
| * | | | | DOC: Update 1.10.2 release notes to mention fix to numpy.iCharles Harris2015-11-011-1/+19
| | | | | |
| * | | | | DOC: Update documentation for isfortran.Charles Harris2015-11-011-2/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Clarify isfortran checks if an array is both Fortran contiguous and *not* C contiguous. The suggests that it only checks if the array is F contiguous, but that is not the case.
| * | | | | BUG: Fix use of PyArray_ISFORTRAN in numpy.i.Charles Harris2015-11-011-1/+1
|/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PyArray_ISFORTRAN was used to implement array_is_fortran in numpy.i when what was wanted was PyArray_IS_F_CONTIGUOUS. The difference is that PyArray_ISFORTRAN will return False if the array is c_contiguous. Previous to relaxed stride checking this did not matter, but currently arrays with ndim > 1 may be both C and Fortran contiguous and that results in errors when PyArray_ISFORTRAN is mistakenly used to check for Fortran contiguity.
* | | | | Merge pull request #6603 from charris/update-1.10.2-notesCharles Harris2015-11-011-1/+2
|\ \ \ \ \ | | | | | | | | | | | | update 1.10.2 release notes
| * | | | | DOC: Update 1.10.2 release notes.Charles Harris2015-11-011-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | [ci skip]
* | | | | | Merge pull request #6588 from jjhelmus/fix_copy_mutableahaldane2015-11-012-45/+30
|\ \ \ \ \ \ | | | | | | | | | | | | | | BUG: immutable _arraymethod function in ma.core
| * | | | | | BUG: immutable _arraymethod function in ma.coreJonathan Helmus2015-10-292-45/+30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Replace the _arraymethod class in ma.core with a function factory which returns class method wrappers around basic array methods. These methods are bound to the MaskedArray instance and are immutable. Previously _arraymethod was a class which would incorrectly operate on the MaskedArray object which last accessed the particular named function. closes #5247
* | | | | | | Merge pull request #6592 from charris/remove-split-futurewarningCharles Harris2015-10-314-36/+40
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | DEP: Remove split `FutureWarning` for empty arrays in the result.
| * | | | | | | DOC: Update 1.11.0 release notes with np.lib.split changes.Charles Harris2015-10-311-4/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Note that the FutureWarning has been removed and that empty arrays resulting from np.lib.split will preserve dimensions instead of always having shape (0,).
| * | | | | | | DOC: Update 1.10.0 release notes for future changes to np.lib.split.Charles Harris2015-10-301-4/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Note that empty array resulting from a split will preserve dimensions starting in Numpy 1.11.
| * | | | | | | DEP: Remove FutureWarning from np.lib.split and go to future.Charles Harris2015-10-302-28/+13
| | |/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously an empty array resulting from split always had dimension 1-D. In Numpy 1.9 a FutureWarning was raised to notify users that it was planned to preserve the dimensions of empty arrays in a future numpy release. This removes the FutureWarning and implements preservation of dimensions. Note that there was a bug in numpy 1.9 and the dimensions of empty arrays was already preserved in some cases and no warning was issued. This PR fixes that inconsistency by preserving the dimensions in all cases rather than fixing the bug, as the dimension preserving behavior was already depended on by some users. See the discussion in gh-6575 about this change.
* | | | | | | Merge pull request #6594 from WarrenWeckesser/numpy-for-matlab-copyeditRalf Gommers2015-10-311-33/+35
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | | DOC: A bit of copy-editing of the 'NumPy for Matlab Users' guide.
| * | | | | | DOC: A bit of copy-editing of the 'NumPy for Matlab Users' guide.Warren Weckesser2015-10-301-33/+35
|/ / / / / /
* | | | | | Merge pull request #6593 from WarrenWeckesser/userdoc-fix-orderStephan Hoyer2015-10-301-1/+1
|\ \ \ \ \ \ | |/ / / / / |/| | | | | DOC: Fix an argument in 'Numpy for Matlab Users'.
| * | | | | DOC: Fix an argument in 'Numpy for Matlab Users'.Warren Weckesser2015-10-301-1/+1
|/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | I've seen at least three occurrences (a couple on stackoverflow, and one private email) of someone using the argument 'order=15' in a call to the 'set_integrator' method of 'scipy.integrate.ode'. Presumably this is because of the suggestion in the "NumPy for Matlab Users" guide to replace 'ode15s' with 'scipy.integrate.ode(f).set_integrator('vode', method='bdf', order=15)'. The stiff solver in 'vode'--presumably the solver of interest for someone using 'ode15s'--has a maximum order of 5, and the non-stiff solver has maximum order of 12. (The maximum order of 'ode15s' is also 5; the '15' in the name refers to the variable order ranging from 1 to 5.)