summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | | | | | Merge pull request #6827 from charris/update-1.10.2-notesCharles Harris2015-12-121-0/+4
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | DOC: Update 1.10.2 release notes with fixes for windows i386.
| * | | | | | | | DOC: Update 1.10.2 release notes with fixes for windows i386.Charles Harris2015-12-121-0/+4
|/ / / / / / / /
* | | | | | | | Merge pull request #6817 from cgohlke/patch-1Charles Harris2015-12-121-0/+6
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | BUG: Disable 32-bit msvc9 compiler optimizations for npy_rint
| * | | | | | | | BUG: Disable 32-bit msvc9 compiler optimizations for npy_rintChristoph Gohlke2015-12-111-0/+6
| | | | | | | | |
* | | | | | | | | Merge pull request #6820 from madphysicist/patch-1Jaime2015-12-121-2/+2
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | Updated typos in histogram bin estimator equations
| * | | | | | | | | Updated typos in histogram bin estimator equationsMad Physicist2015-12-111-2/+2
| |/ / / / / / / / | | | | | | | | | | | | | | | | | | In all cases, it's either ...*n^(-1/3) or .../n^(1/3), not both. The actual functions are implemented correctly.
* | | | | | | | | Merge pull request #6791 from Daetalus/bug_fixingNathaniel J. Smith2015-12-121-1/+14
|\ \ \ \ \ \ \ \ \ | |_|/ / / / / / / |/| | | | | | | | BUG: Fix thinko in assert_deprecated()
| * | | | | | | | BUG: Fix thinko in assert_deprecated()Boxiang Sun2015-12-121-1/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | assert_deprecated() was recently reworked for stylistic changes (in 0aa32608 "STY: Minor style cleanups in tests and C code.") but made a thinko - `lst` is already a list of warnings, so we don't need to put that into [] braces when preparing assertion text. If we do the reporting breaks: In [1]: msg = "4 warnings found but 3 expected." In [2]: lst = ['CategoryA', 'CategoryB', 'CategoryC'] In [3]: n.join([msg] + [lst]) TypeError Traceback (most recent call last) ----> 1 n.join([msg] + [lst]) TypeError: sequence item 1: expected string, list found Fix it. Cc: Charles Harris <charlesr.harris@gmail.com>
* | | | | | | | | Merge pull request #6819 from cgohlke/patch-2Charles Harris2015-12-111-4/+4
|\ \ \ \ \ \ \ \ \ | |_|/ / / / / / / |/| | | | | | | | TST: Fix test_mvoid_multidim_print failures on Python 2.x for Windows
| * | | | | | | | TST: Fix test_mvoid_multidim_print failures on Python 2.x for WindowsChristoph Gohlke2015-12-111-4/+4
|/ / / / / / / /
* | | | | | | | Merge pull request #6813 from charris/fix-ma-print-testNathaniel J. Smith2015-12-111-1/+1
|\ \ \ \ \ \ \ \ | |_|_|_|/ / / / |/| | | | | | | TST,BUG: Make test_mvoid_multidim_print work for 32 bit systems.
| * | | | | | | TST,BUG: Make test_mvoid_multidim_print work for 32 bit systems.Charles Harris2015-12-111-1/+1
|/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The test currently uses an `<i8` type which is converted to a Python long integer when running on a 32 bit system with Python 2. That changes the string printed by appending `L` to the printed integer value and results in a failed test.
* | | | | | | Merge pull request #6808 from charris/fix-assert-in-testsJaime2015-12-1113-67/+68
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | MAINT: Replace assert with assert_(...) in some tests.
| * | | | | | | MAINT: Replace assert with assert_(...) in some tests.Charles Harris2015-12-1013-67/+68
| | |_|/ / / / | |/| | | | |
* | | | | | | Merge pull request #6768 from ogrisel/travis-wheelsNathaniel J. Smith2015-12-113-5/+26
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Deploy dev wheels to rackspace from travis
| * | | | | | | ENH deploy dev wheels to rackspaceOlivier Grisel2015-12-103-5/+26
|/ / / / / / /
* | | | | | | Merge pull request #6344 from matthew-brett/update-howto-releaseCharles Harris2015-12-101-46/+157
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | | MRG: update HOWTO_RELEASE document
| * | | | | | DOC: update HOWTO_RELEASE documentMatthew Brett2015-10-261-46/+157
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | An update of release notes from experience of releasing 1.9.3, with responses to comments by Chuck and Ralf.
* | | | | | | Merge pull request #6797 from njsmith/clean-up-builtin-alias-usagesseberg2015-12-091-3/+3
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | [TST] fix test_dtype_error to actually test what it's supposed to
| * | | | | | | [TST] fix test_dtype_error to actually test what it's supposed toNathaniel J. Smith2015-12-081-3/+3
|/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | Discovered while cleaning up uses of the silly aliases like 'np.object'.
* | | | | | | Merge pull request #6789 from njsmith/governance-title-tweakseberg2015-12-081-1/+1
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | | [doc] Fix title of governance section in docs
| * | | | | | [doc] Fix title of governance section in docsNathaniel J. Smith2015-12-071-1/+1
| | | | | | |
* | | | | | | Merge pull request #6778 from charris/update-1.10.2-notesCharles Harris2015-12-072-4/+64
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | WIP: Update 1.10.2 notes
| * | | | | | | DOC: Update the 1.10.0 release notes.Charles Harris2015-12-072-2/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Document that relaxed stride checking is no longer the default in 1.10.2. The 1.10.0 release notes may be read more often than the following notes, so this will help folks to notice the change. [ci skip]
| * | | | | | | DOC: update the 1.10.2 release notes.Charles Harris2015-12-071-4/+49
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Hopefully the final update before 1.10.2 is released. [ci skip]
* | | | | | | | Merge pull request #6775 from charris/add-future-importsCharles Harris2015-12-0711-2/+19
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | MAINT: Include from __future__ boilerplate in some files missing it.
| * | | | | | | | MAINT: Include from __future__ boilerplate in some files missing it.Charles Harris2015-12-0511-2/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Some newer *.py files are missing the `from __future__` boilerplate that helps assure Python2 and Python3 compatibility.
* | | | | | | | | Merge pull request #6785 from charris/fix-interpNathaniel J. Smith2015-12-072-22/+55
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / |/| | | | | | | | BUG: Quick and dirty fix for interp.
| * | | | | | | | BUG: Quick and dirty fix for interp.Charles Harris2015-12-072-22/+55
|/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The original had incorrect comparisons involving <=, <, and also failed when the number of data points was 2. This fixes the use of the comparisons and uses linear search for fewer than 5 data points. The whole routine needs a simplified rewrite, but this takes care of the bug. Closes #6468.
* | | | | | | | Merge pull request #6780 from ahaldane/preserve_metadataCharles Harris2015-12-062-0/+12
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | BUG: metadata is not copied to base_dtype
| * | | | | | | | BUG: metadata is not copied to base_dtypeAllan Haldane2015-12-062-0/+12
| |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The (somewhat obsolete) metadata attribute of the data_dtype should be carried over in dtype specifications of the form (base_dtype, data_dtype). Fixes #6771 Incidentally fixes a reference leak in `dtype(('i4,i4', 'i4,i4'))`
* | | | | | | | Merge pull request #6747 from charris/deprecate-fortran-viewCharles Harris2015-12-063-4/+47
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | DEP: Deprecate changing shape of non-C-contiguous array via descr.
| * | | | | | | DOC: Document fortran order view deprecation in 1.11 release notes.Charles Harris2015-12-031-1/+16
| | | | | | | |
| * | | | | | | DEP: Deprecate changing shape of non-C-contiguous array via descr.Charles Harris2015-11-292-4/+32
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This deprecates assignment of a new descriptor to the dtype attribute of a non-C-contiguous array if it result in changing the shape. This effectively bars viewing a multidimensional Fortran array using a dtype that changes the element size along the first axis. The reason for the deprecation is that, when relaxed strides checking is enabled, arrays that are both C and Fortran contiguous are always treated as C contiguous which breaks some code that depended the two being mutually exclusive for arrays of dimension > 1. The intent of this deprecation is to prepare the way to always enable relaxed stride checking. Example ------- ``` In [1]: import warnings In [2]: warnings.simplefilter('always') In [3]: a = ones((2, 1), order='F').view(complex) /home/charris/.local/bin/ipython:1: DeprecationWarning: Changing the shape of non-C contiguous array by descriptor assignment is deprecated. To maintain the Fortran contiguity of a multidimensional Fortran array, use 'a.T.view(...).T' instead ```
* | | | | | | | Merge pull request #6774 from pv/bench-py3Charles Harris2015-12-052-5/+9
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | BENCH: allow benchmark suite to run on Python 3
| * | | | | | | | BENCH: allow benchmark suite to run on Python 3Pauli Virtanen2015-12-062-5/+9
|/ / / / / / / /
* | | | | | | | Merge pull request #6756 from joernhees/patch-1Charles Harris2015-12-051-3/+15
|\ \ \ \ \ \ \ \ | |_|_|_|_|/ / / |/| | | | | | | TST: only test f2py, not f2py2.7 etc, fixes #6718
| * | | | | | | TST: test f2py, fallback on f2py2.7 etc., fixes #6718Jörn Hees2015-12-051-3/+15
| | | | | | | |
* | | | | | | | Merge pull request #6763 from ↵Charles Harris2015-12-042-0/+20
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | gerritholl/structured_multidim_masked_array_mvoid_alt BUG/TST: Fix for #6724, make numpy.ma.mvoid consistent with numpy.void
| * | | | | | | | BUG/TST: Fix for #6724, make numpy.ma.mvoid consistent with numpy.voidGerrit Holl2015-12-032-0/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make indexing on numpy.ma.mvoid consistent with indexing on numpy.void. Changes behaviour in rare cases (see below). Fixes #6724. Sometimes, indexing ma.mvoid results in a non-scalar mask. For example, dimension increases if indexing with a multi-dimensional field. Previously, this led to a ValueError (truth value ambiguous). With this commit, indexing now returns an ma.masked_array so that there is no loss of information. Note that there is a precedence for returning from void to array. Z = zeros((2,), dtype="(2,)i2,(2,)i2"), then Z[0] is a void, but Z[0][0] and Z[0]["f1"] are array. This commit therefore implements behaviouk such that numpy.ma.mvoid is consistent with numpy.void. Also adds a related test. The behaviour changes in cases where for a masked array `X`, X.dtype["A"] is multidimensional but size 1, such as in the example below. Any case where X.dtype["A"] is multidimensional but with size>1 would previously fail. Old behaviour: In [15]: X = ma.masked_array(data=[([0],)], mask=[([False],)], dtype=[("A", "(1,1)i2", (1,1))]) In [16]: X[0]["A"] Out[16]: array([[[[0]]]], dtype=int16) In [17]: X = ma.masked_array(data=[([0],)], mask=[([True],)], dtype=[("A", "(1,1)i2", (1,1))]) In [18]: X[0]["A"] Out[18]: masked New behaviour: In [1]: X = ma.masked_array(data=[([0],)], mask=[([False],)], dtype=[("A", "(1,1)i2", (1,1))]) In [2]: X[0]["A"] Out[2]: masked_array(data = [[[[0]]]], mask = [[[[False]]]], fill_value = [[[[16959]]]]) In [3]: X = ma.masked_array(data=[([0],)], mask=[([True],)], dtype=[("A", "(1,1)i2", (1,1))]) In [4]: X[0]["A"] Out[4]: masked_array(data = [[[[--]]]], mask = [[[[ True]]]], fill_value = [[[[16959]]]]) The new behaviour is more consistent with indexing the data themselves: In [7]: X.data[0]["A"] Out[7]: array([[[[0]]]], dtype=int16) In theory, this change in behaviour can break code, but I would consider it very unlikely.
* | | | | | | | | Merge pull request #6757 from ahaldane/link_cblasCharles Harris2015-12-041-11/+38
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | BUG: link cblas library if cblas is detected
| * | | | | | | | | BUG: link cblas library if cblas is detectedAllan Haldane2015-12-041-11/+38
| | |/ / / / / / / | |/| | | | | | |
* | | | | | | | | Merge pull request #6715 from charris/fix-gh-6694Charles Harris2015-12-031-0/+1
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | BUG: Include relevant files from numpy/linalg/lapack_lite in sdist.
| * | | | | | | | | BUG: Include relevant files from numpy/linalg/lapack_lite in sdist.Charles Harris2015-11-241-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | After 1e436a5 *.h and *.c files from numpy/linalg/lapack_lite were no longer included in source distributions. Fix this by adding them to MANIFEST.in. Closes #6694.
* | | | | | | | | | Merge pull request #6761 from gerritholl/structured_nested_masked_array_maskfillCharles Harris2015-12-032-1/+8
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | BUG/TST: Fix #6760 by correctly describing mask on nested subdtypes
| * | | | | | | | | | BUG/TST: Fix #6760 by correctly describing mask on nested subdtypesGerrit Holl2015-12-032-1/+8
| | |_|/ / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix #6760. In ma.core._recursive_make_descr, consider the case where a subdtype does itself have named fields. This ensures the correct mask for an array like `ma.zeros(2, dtype([("A", "(2,2)i1,(2,2)i1", (2,2))]))`.
* | | | | | | | | | Merge pull request #6758 from seberg/resize-emptyCharles Harris2015-12-022-2/+10
|\ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / |/| | | | | | | | | BUG: resizing empty array with complex dtype failed
| * | | | | | | | | BUG: resizing empty array with complex dtype failedSebastian Berg2015-12-022-2/+10
|/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is because the dtype was passed into the new array as a char, and many dtypes do not have a valid char representation. Closes gh-6740
* | | | | | | | | Merge pull request #6754 from saimn/ma-changelogCharles Harris2015-12-021-1/+8
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | | DOC: Add changelog for #6734 and #6748.
| * | | | | | | | DOC: Add changelog for #6734 and #6748.Simon Conseil2015-12-021-1/+8
|/ / / / / / / /