Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Revert "DOC: add vstack, hstack, dstack reference to stack documentation."revert-7191-stack_documentation | Stephan Hoyer | 2016-02-05 | 1 | -5/+2 |
| | |||||
* | Merge pull request #7191 from aukejw/stack_documentation | Charles Harris | 2016-02-05 | 1 | -2/+5 |
|\ | | | | | DOC: add vstack, hstack, dstack reference to stack documentation. | ||||
| * | DOC: changed 'depth wise' to 'depthwise', 'the existing' to 'an existing' | auke | 2016-02-05 | 1 | -7/+5 |
| | | |||||
| * | DOC: add vstack, hstack, dstack reference to stack documentation. | auke | 2016-02-05 | 1 | -0/+5 |
| | | |||||
* | | Merge pull request #7193 from madphysicist/extra-assert | Charles Harris | 2016-02-05 | 1 | -3/+0 |
|\ \ | | | | | | | MAINT: Removed supurious assert in histogram estimators | ||||
| * | | MAINT: Removed supurious assert in histogram estimators | Joseph Fox-Rabinovitz | 2016-02-05 | 1 | -3/+0 |
| |/ | |||||
* | | Merge pull request #7195 from jakirkham/style_np_ma_fix | Charles Harris | 2016-02-05 | 1 | -3/+3 |
|\ \ | |/ |/| | STY: Drop some trailing spaces in `numpy.ma.core`. | ||||
| * | STY: Drop some trailing spaces in `numpy.ma.core`. | John Kirkham | 2016-02-05 | 1 | -3/+3 |
|/ | |||||
* | Merge pull request #7174 from gfyoung/pandas_link_fix | Charles Harris | 2016-02-02 | 1 | -8/+7 |
|\ | | | | | DOC: Fix broken pandas link in release notes | ||||
| * | DOC: Fix broken pandas link in 1.11.0 release notes | gfyoung | 2016-02-02 | 1 | -8/+7 |
|/ | | | | [ci skip] | ||||
* | Merge pull request #7171 from gfyoung/conda_f2py_patch | Charles Harris | 2016-02-02 | 1 | -8/+3 |
|\ | | | | | TST: Fixed f2py test for Anaconda non-win32 | ||||
| * | TST: Fixed f2py test for Anaconda non-win32 | gfyoung | 2016-02-02 | 1 | -8/+3 |
|/ | | | | | | | | | | | When you run 'python -V' under Anaconda, it returns for example, 'Python 3.4.3 :: Continuum Analytics, Inc.' However, the original parsing of the version in 'test_f2py' assumed there was nothing following the version number, causing a ValueError because you can't assign three variables to four components that you get from splitting on the '.' | ||||
* | Merge pull request #7167 from 153957/patch-1 | Jaime | 2016-02-02 | 1 | -12/+12 |
|\ | | | | | DOC: Update Wikipedia references for mtrand.pyx | ||||
| * | Update Wikipedia references for mtrand.pyx | Arne de Laat | 2016-02-02 | 1 | -12/+12 |
|/ | | | | Specifically the 'Logarithmic distribution' link is fixed. For others the links or article names are updated. | ||||
* | Merge pull request #6298 from nbeaver/check-lower-base-limit | Charles Harris | 2016-02-01 | 2 | -1/+9 |
|\ | | | | | Check lower base limit in base_repr. | ||||
| * | TST: out of bounds bases in base_repr | Nathaniel Beaver | 2016-02-01 | 1 | -0/+6 |
| | | |||||
| * | DOC: base_repr *can* handle negative integers. | Nathaniel Beaver | 2016-02-01 | 1 | -1/+1 |
| | | |||||
| * | BUG: check lower limit of base in base_repr. | Nathaniel Beaver | 2016-02-01 | 1 | -0/+2 |
|/ | |||||
* | Merge pull request #6656 from I--P/loadtxt-int | seberg | 2016-02-01 | 3 | -5/+73 |
|\ | | | | | ENH: usecols now accepts an int when only one column has to be read | ||||
| * | ENH: usecols now accepts an int when only one column has to be read | I--P | 2016-02-01 | 3 | -5/+73 |
|/ | |||||
* | Merge pull request #7129 from madphysicist/percentile-midpoint-interpolation | Charles Harris | 2016-01-31 | 3 | -3/+12 |
|\ | | | | | BUG: Fixed 'midpoint' interpolation of np.percentile in odd cases. | ||||
| * | BUG: Fixed 'midpoint' interpolation of np.percentile in odd cases. | Joseph Fox-Rabinovitz | 2016-01-31 | 3 | -3/+12 |
| | | | | | | | | | | 'midpoint' must return the same as 'higher' and 'lower' when the two are the same, not 'lower' + 0.5 as it was doing. | ||||
* | | Merge pull request #7145 from bastula/piecewise | Charles Harris | 2016-01-31 | 2 | -4/+20 |
|\ \ | | | | | | | BUG: Fixed regressions in np.piecewise in ref to #5737 and #5729. | ||||
| * | | MAINT: Addressed comments in PR #7145 | Aditya Panchal | 2016-01-31 | 1 | -2/+3 |
| | | | |||||
| * | | BUG: Fixed regressions in np.piecewise in ref to #5737 and #5729. | Aditya Panchal | 2016-01-29 | 2 | -4/+19 |
| | | | | | | | | | | | | Added unit tests for these conditions. | ||||
* | | | Merge pull request #7156 from mhvk/linspace-subclass-safe2 | Charles Harris | 2016-01-31 | 2 | -4/+22 |
|\ \ \ | | | | | | | | | Reascertain that linspace respects ndarray subclasses in start, stop. | ||||
| * | | | Reascertain that linspace respects ndarray subclasses in start, stop. | Marten van Kerkwijk | 2016-01-31 | 2 | -4/+22 |
| | | | | |||||
* | | | | Merge pull request #7119 from gfyoung/mingw_patch | Ralf Gommers | 2016-01-31 | 1 | -1/+1 |
|\ \ \ \ | | | | | | | | | | | BUG: Fixed mingw.lib error | ||||
| * | | | | BUG: Fixed mingw.lib error | gfyoung | 2016-01-25 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | Closes gh-647. | ||||
* | | | | | Merge pull request #7152 from bertrand-l/fix/unicode-kwarg-breaks-pad | Charles Harris | 2016-01-31 | 2 | -1/+12 |
|\ \ \ \ \ | | | | | | | | | | | | | BUG: mode kwargs passed as unicode to np.pad raises an exception | ||||
| * | | | | | BUG: mode kwargs passed as unicode to np.pad raises an exception | bertrand | 2016-01-30 | 2 | -1/+12 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | isinstance(mode, str) is False in python2.7 when mode is of unicode type, and mode is then mistakenly assumed to be a callable. See #7112 | ||||
* | | | | | | Merge pull request #7147 from njsmith/disable-numpy-ufunc | Charles Harris | 2016-01-31 | 3 | -18/+51 |
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | Temporarily disable __numpy_ufunc__ | ||||
| * | | | | | Temporarily disable __numpy_ufunc__ | Nathaniel J. Smith | 2016-01-29 | 3 | -0/+51 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Given that we accidentally released 1.11b2 with `__numpy_ufunc__` still enabled, we should probably just disable it in master for now. When ready to re-enable, grep for NUMPY_UFUNC_DISABLED. Or just revert this commit. | ||||
| * | | | | | TST: remove duplicate test | Nathaniel J. Smith | 2016-01-29 | 1 | -18/+0 |
| | |/ / / | |/| | | | | | | | | | | | | | | | | | | There are two identical copies of test_dot_override in test_multiarray.py. This seems surplus to requirements. | ||||
* | | | | | Merge pull request #7149 from seberg/missing-suffix | Charles Harris | 2016-01-30 | 1 | -1/+1 |
|\ \ \ \ \ | |/ / / / |/| | | | | TST: Add missing suffix to temppath manager | ||||
| * | | | | TST: Add missing suffix to temppath manager | Sebastian Berg | 2016-01-30 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | Without the suffix, np.save creates a new file and the file does not get cleaned up. | ||||
* | | | | | Merge pull request #7144 from dongjoon-hyun/recover_callfortran | Nathaniel J. Smith | 2016-01-30 | 1 | -1/+1 |
|\ \ \ \ \ | | | | | | | | | | | | | MAINT: Change `call_fortran` into `callfortran` in comments. | ||||
| * | | | | | MAINT: Change `call_fortran` into `callfortran` in comments. | Dongjoon Hyun | 2016-01-29 | 1 | -1/+1 |
|/ / / / / | | | | | | | | | | | | | | | | It was committed mistakenly in #7134. `callfortran` is used a lot really. | ||||
* | | | | | Merge pull request #7125 from madphysicist/percentile-doc | Stephan Hoyer | 2016-01-29 | 1 | -42/+39 |
|\ \ \ \ \ | | | | | | | | | | | | | DOC: Updated documentation wording and examples for np.percentile. | ||||
| * | | | | | MAINT: Accepted all review comments for PR#7125 | Joseph Fox-Rabinovitz | 2016-01-27 | 1 | -7/+3 |
| | | | | | | |||||
| * | | | | | DOC: Updated documentation wording and examples for np.percentile. | Joseph Fox-Rabinovitz | 2016-01-26 | 1 | -39/+40 |
| | |_|_|/ | |/| | | | | | | | | | | | | | Examples had some factual errors. Wording updated in a couple of places. | ||||
* | | | | | Merge pull request #7102 from kawochen/CLN-ISO-8601 | Charles Harris | 2016-01-29 | 1 | -3/+3 |
|\ \ \ \ \ | |_|/ / / |/| | | | | MAINT: Removed conditionals that are always false in datetime_strings.c | ||||
| * | | | | MAINT: Removed conditionals that are always true in datetime_strings.c | Ka Wo Chen | 2016-01-23 | 1 | -3/+3 |
| | | | | | |||||
* | | | | | Merge pull request #7141 from gmarkall/contig_void_unpickle | Julian Taylor | 2016-01-29 | 2 | -1/+10 |
|\ \ \ \ \ | | | | | | | | | | | | | BUG: Unpickled void scalars should be contiguous | ||||
| * | | | | | TST: Unpickled void scalars must be behaved | Graham Markall | 2016-01-29 | 1 | -0/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | Unpickled void scalars must be both aligned and writeable. | ||||
| * | | | | | BUG: Unpickled void scalars should be contiguous | Graham Markall | 2016-01-29 | 2 | -1/+8 |
|/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | Void scalars are both C- and Fortran-contiguous, so pickling and unpickling them should result in a new void scalar that also has these flags set. Fixes #7140. | ||||
* | | | | | Merge pull request #7026 from gfyoung/uniform_bounds_bug | Robert Kern | 2016-01-29 | 1 | -0/+6 |
|\ \ \ \ \ | |_|_|_|/ |/| | | | | DOC: Clarify behavior in np.random.uniform | ||||
| * | | | | DOC: Clarify behavior in np.random.uniform | gfyoung | 2016-01-25 | 1 | -0/+6 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Although the arguments are specified as 'high' and 'low', it is possible to pass in values for 'low' and 'high' where 'low' >= 'high' and still obtain well-defined behavior. The documentation has been expanded to reflect this fact, with a note to discourage passing in arguments satisfying 'low' > 'high'. | ||||
* | | | | | Auto merge of #7134 - dongjoon-hyun:fix_typos_in_code_comments, r=njsmithauto | Homu | 2016-01-28 | 30 | -38/+38 |
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | MAINT: Fix some typos in a code string and comments | ||||
| * | | | | | MAINT: Fix some typos in a code string and comments | Dongjoon Hyun | 2016-01-27 | 30 | -38/+38 |
|/ / / / / |