summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Auto merge of #7134 - dongjoon-hyun:fix_typos_in_code_comments, r=njsmithautoHomu2016-01-2830-38/+38
|\ | | | | | | MAINT: Fix some typos in a code string and comments
| * MAINT: Fix some typos in a code string and commentsDongjoon Hyun2016-01-2730-38/+38
|/
* Merge pull request #7131 from charris/fix-setuptools-sdistCharles Harris2016-01-274-2/+25
|\ | | | | Fix setuptools sdist
| * MAINT: warn in egg_info command if using setuptools.sdist.Ralf Gommers2016-01-271-0/+8
| | | | | | | | | | | | Warn in numpy/distutils/command/egg_info.py if using setuptools.sdist. See gh-7127 for details.
| * BLD/BUG: revert usage of setuptools when building an sdist.Ralf Gommers2016-01-271-1/+1
| | | | | | | | | | This was seriously broken. Setuptools does unwanted 'smart' things and ignores MANIFEST.in. Closes gh-7127.
| * TST: test installing from sdist on TravisCI.Ralf Gommers2016-01-272-1/+16
|/
* Merge pull request #7118 from gfyoung/f2py_patch_linuxCharles Harris2016-01-261-4/+13
|\ | | | | TST: Fixed f2py test for non-versioned python executables
| * TST: Fixed f2py test for non-versioned python executablesgfyoung2016-01-251-4/+13
|/ | | | | | | | | | | The 'sys.executable' can come in various names, but the three main ones are "python", "python{major_version}", and "python{major_version.minor_version}". The current version of the f2py test assumes that only the latter two are used. Since "f2py" is generally versioned, using the executable basename "python" will make it impossible to find. This commit fixes that issue by using a sure-fire way of getting the Python version.
* Merge pull request #7116 from gfyoung/f2py_patchCharles Harris2016-01-251-1/+7
|\ | | | | TST: Fixed f2py test for win32 virtualenv
| * TST: Fixed f2py test for win32 virtualenvgfyoung2016-01-251-1/+7
|/ | | | | | | | Fixed test_scripts.test_f2py test so that it can pass correctly on win32 virtualenvs, in which the Python executable and the f2py.py file are both in the Scripts directory.
* Merge pull request #7114 from dongjoon-hyun/fix_typos_in_docJaime2016-01-2512-18/+18
|\ | | | | MAINT: Fix typos in docs
| * MAINT: Fix typos in docsDongjoon Hyun2016-01-2512-18/+18
|/
* Merge pull request #7055 from gfyoung/single_elt_array_return_matchingJaime2016-01-252-188/+274
|\ | | | | BUG: One Element Array Inputs Return Scalars in np.random
| * BUG: One element array inputs get one element arrays returned in np.randomgfyoung2016-01-242-188/+274
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes bug in np.random methods that would return scalars when passed one-element array inputs. This is because one-element ndarrays can be cast to integers / floats, which is what functions like PyFloat_AsDouble do before converting to the intended data type. This commit changes the check used to determine whether the inputs are purely scalar by converting all inputs to arrays and checking if the resulting shape is an empty tuple (scalar) or not (array). Closes gh-4263.
* | Merge pull request #7109 from argriffing/python-ver-dep-docsCharles Harris2016-01-241-2/+2
|\ \ | |/ |/| DOC: update Python versions requirements in the install docs
| * DOC: update Python versions requirements in the install docsalex2016-01-241-2/+2
|/
* Merge pull request #7082 from gfyoung/test_random_expandJaime2016-01-242-262/+880
|\ | | | | TST, DOC: Added Broadcasting Tests in test_random.py
| * DOC: Clarified output size for broadcastable mtrand.pyx functionsgfyoung2016-01-231-182/+243
| | | | | | | | | | | | | | Clarified the output size depending on whether scalar or non-scalar inputs are passed to functions in mtrand.pyx that can broadcast their arguments.
| * TST: Added broadcasting tests in test_random.pygfyoung2016-01-232-87/+644
| | | | | | | | | | | | Added a whole new suite of tests to ensure that functions in mtrand.pyx which are broadcastable actually broadcast their arguments properly.
* | Merge pull request #7073 from charris/update-1.11.0-notesCharles Harris2016-01-231-90/+136
|\ \ | |/ |/| DOC: Update the 1.11.0 release notes.
| * DOC: Update the 1.11.0 release notes.Charles Harris2016-01-231-90/+136
| | | | | | | | [ci skip]
* | Merge pull request #7088 from jakirkham/cast_float_linalgCharles Harris2016-01-222-9/+105
|\ \ | | | | | | BUG: Have `norm` cast non-floating point arrays to 64-bit float arrays
| * | DOC: Update `norm` docstring to include examples that reflect that all ↵John Kirkham2016-01-221-8/+8
| | | | | | | | | | | | computations are done with floating point numbers.
| * | BUG: Make sure that the `ord=0` case returns a float.John Kirkham2016-01-222-5/+2
| | |
| * | TST: Verify that `norm` is properly casting values to floats as needed.John Kirkham2016-01-221-0/+96
| | |
| * | BUG: In `norm`, always cast non-floating point arrays to 64-bit floats. ↵John Kirkham2016-01-221-0/+3
|/ / | | | | | | Otherwise, weird integer roundoff errors give faulty results in some cases.
* | Merge pull request #7092 from xdmiodz/glibc-checkCharles Harris2016-01-211-11/+8
|\ \ | | | | | | BLD: fix compilation on non glibc-Linuxes
| * | BLD: fix compilation on non glibc-LinuxesDmitry Odzerikho2016-01-221-11/+8
| | | | | | | | | | | | | | | Non-glibc Linuxes dont have the __GLIBC_PREREQ function and compilation of numpy fails on such platforms.
* | | Merge pull request #7091 from numpy/revert-7087-musl-buildCharles Harris2016-01-211-3/+3
|\ \ \ | | | | | | | | Revert "BLD: fix compilation on non glibc-Linuxes"
| * | | Revert "BLD: fix compilation on non glibc-Linuxes"revert-7087-musl-buildCharles Harris2016-01-211-3/+3
|/ / /
* | | Merge pull request #7087 from xdmiodz/musl-buildCharles Harris2016-01-211-3/+3
|\ \ \ | |/ / |/| | BLD: fix compilation on non glibc-Linuxes
| * | BLD: fix compilation on non glibc-LinuxesDmitry Odzerikho2016-01-211-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | Non-glibc Linuxes dont have the __GLIBC_PREREQ function and compilation of numpy fails on such platforms. To avoid this the TRIG_OK check should be done only in the glibc environment The patch is taken from AlpineLinux repository http://git.alpinelinux.org/cgit/aports/tree/testing/py-numpy/numpy-1.10.0-musl.patch?id=2e5c4bfcf1c9746edd58a8e684d01403f234e71d
* | | Merge pull request #7076 from charris/update-mailmapCharles Harris2016-01-211-0/+28
|\ \ \ | |/ / |/| | MAINT: Update the git .mailmap file.
| * | MAINT: Update the git .mailmap file.Charles Harris2016-01-201-0/+28
| |/ | | | | | | [ci skip]
* | Merge pull request #6997 from gfyoung/mtrand_helpers_compressJaime2016-01-201-104/+74
|\ \ | |/ |/| MAINT: Simplify mtrand.pyx helpers
| * MAINT: Simplified mtrand.pyx helpersgfyoung2016-01-201-104/+74
|/ | | | | | | Refactored methods that broadcast arguments together by finding additional common ground between code in the if...else branches that involved a size parameter being passed in.
* Merge pull request #7063 from charris/prepare-1.12-devCharles Harris2016-01-195-6/+70
|\ | | | | REL: Update master branch after 1.12.x branch has been made.
| * REL: Update master branch after 1.12.x branch has been made.Charles Harris2016-01-195-6/+70
|/ | | | | | | * Drop testing of Python 2.6, 3.2, and 3.3 * Create 1.12.0-notes.rst and add to source/documentation. * Update pavement.py to use 1.10.x as LOG_START * Update version numpy in setup.py
* Merge pull request #7062 from charris/pre-1.10.x-branchCharles Harris2016-01-193-1/+3
|\ | | | | REL: Prepare for 1.10.x branch.
| * REL: Prepare for 1.10.x branch.Charles Harris2016-01-193-1/+3
|/ | | | | | | * Add comment to cversions.txt (no change) * Add comment to setup_common.py (no change) * Nothing done for numpy/core/include/numpy/numpyconfig.h * Update log start to 1.10.0 in pavement.py.
* Merge pull request #7027 from gfyoung/test_fromnumeric_expandCharles Harris2016-01-194-198/+490
|\ | | | | TST, MAINT: Lots of new tests for fromnumeric.py
| * TST: Added lots of new tests for fromnumeric.pygfyoung2016-01-184-198/+490
| |
* | Merge pull request #7052 from charris/fixup-polynomialsCharles Harris2016-01-198-148/+122
|\ \ | | | | | | Refactor functionality added to the numpy.polynomial package in #6360.
| * | DOC: Update the 1.10.0 release notes.Charles Harris2016-01-191-10/+17
| | | | | | | | | | | | | | | | | | Rewrite the documentation of added functionality of the deg parameter of the polynomial fitting functions in the numpy.polynomial package and put it in the 'New Features' section.
| * | MAINT: Refactor polynomial leastsquares fits.Charles Harris2016-01-197-138/+105
| |/ | | | | | | | | | | | | * Rewrite the documentation for `deg`. * Check that the passed degrees are int and raise if not. * Do not accept `deg` arguments that do not convert as 0-D or 1-D. * Sort passed degree terms for repeatability.
* | Merge pull request #7053 from tushar-rishav/ifft_RAM_requirementsCharles Harris2016-01-191-1/+1
|\ \ | | | | | | BUG: Should fix astype cast bug in numpy.fft module
| * | BUG:Should fix astype cast bug in numpy.fft moduleTushar Gautam2016-01-191-1/+1
| |/ | | | | | | Closes #6693
* | Merge pull request #7057 from charris/nat-future-warningCharles Harris2016-01-192-3/+69
|\ \ | |/ |/| DEP: Emit FutureWarning for NAT comparisons.
| * TST: Add tests for NAT comparison FutureWarning.Charles Harris2016-01-181-0/+28
| | | | | | | | | | The behavior of NAT comparisons will change in Numpy 1.13. Make sure that a FutureWarning is emitted when the results will change.
| * DEP: Emit FutureWarning for NAT comparisons.Charles Harris2016-01-181-3/+41
|/ | | | | | In Numpy 1.13 the plan is for NAT comparisons to behave like NaN comparisons, e.g., False except for 'NAT != NAT', which will be True. See the discussion at gh-7019 for details.
View Lorry Controller Status