summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* DOC: expand sections on commit messages and merging/rebasing in the devguide.Ralf Gommers2012-09-231-2/+16
| | | | This commit address comments from Charles on PR #455.
* DOC: one more edit to the dev-guide.Ralf Gommers2012-09-221-1/+7
| | | | | Recommend to update master before creating your feature branch. Thanks to Nicky van Foreest for feedback on the dev-guide.
* DOC: remove section "Patching" from dev-guide.Ralf Gommers2012-09-224-133/+6
| | | | | This section is outdated, and following it pretty much ensures that your patches will languish in Trac.
* DOC: a few edits to make "Development Workflow" in the dev guide clearer.Ralf Gommers2012-09-221-12/+13
|
* DOC: document in dev-guide how to write a good commit message.Ralf Gommers2012-09-221-0/+28
|
* Merge pull request #420 from seberg/contignjsmith2012-09-212-0/+19
|\ | | | | Reset flags when Axes are removed. Array might now be 1D, or removed axe...
| * Tests related to Issue #387Sebastian Berg2012-09-041-0/+16
| |
| * Reset flags when Axes are removed. Array might now be 1D, or removed axes of ↵Sebastian Berg2012-09-031-0/+3
| | | | | | | | size 1 destroy contiguousity.
* | Merge pull request #365 from bfroehle/static_f2py_sizenjsmith2012-09-211-1/+1
|\ \ | | | | | | BUG: Exported f2py_size symbol prevents linking multiple f2py modules.
| * | BUG: Exported f2py_size symbol prevents linking multiple f2py modules.Bradley M. Froehle2012-07-301-1/+1
| | |
* | | Merge pull request #419 from stefanv/modinitnjsmith2012-09-1714-18/+17
|\ \ \ | | | | | | | | Use PyMODINIT_FUNC and update docs accordingly.
| * | | Use PyMODINIT_FUNC and update docs accordingly.cgohlke2012-09-0214-18/+17
| | |/ | |/| | | | | | | See https://github.com/scipy/scipy/pull/279
* | | Merge pull request #446 from cgohlke/patch-1njsmith2012-09-173-29/+29
|\ \ \ | | | | | | | | Style: consistently use spaces instead of tabs in .py files
| * | | Style: consistently use spaces instead of tabscgohlke2012-09-161-2/+2
| | | |
| * | | Style: use 4 spaces per indentation level as per PEP8cgohlke2012-09-161-26/+26
| | | |
| * | | Fix whitespace formattingcgohlke2012-09-161-1/+1
| | | | | | | | | | | | Use spaces instead of tabs
* | | | MAINT: Use linspace instead of arange in some examples.endolith2012-09-171-3/+3
|/ / / | | | | | | | | | | | | | | | The original code used arange with offsets and scaling to generate sample points. Using linspace simplifies the code and clarifies the intent.
* | | Merge pull request #441 from matthew-brett/astype-docTravis E. Oliphant2012-09-151-0/+8
|\ \ \ | | | | | | | | DOC: describe output from astype method
| * | | DOC: describe output from astype methodMatthew Brett2012-09-131-0/+8
| | | | | | | | | | | | | | | | Expand docstring for ``astype`` method.
* | | | Merge pull request #443 from 87/fix_concatTravis E. Oliphant2012-09-152-20/+37
|\ \ \ \ | | | | | | | | | | Fix for issue #442
| * | | | TST: Add test for concatenate with None-axisHan Genuit2012-09-151-3/+21
| | | | |
| * | | | BUG: Concatenate with axis None should work regardless of matching array shapesHan Genuit2012-09-151-17/+16
|/ / / /
* | | | Merge pull request #433 from rgommers/intel-fortran-flagsnjsmith2012-09-131-55/+16
|\ \ \ \ | |/ / / |/| | | MAINT: update Intel Fortran compiler flags for the 21st century.
| * | | MAINT: update Intel Fortran compiler flags for the 21st century.Ralf Gommers2012-09-091-55/+16
| | | | | | | | | | | | | | | | | | | | | | | | Thanks to Intel for this contribution. Note that there's also an MKL application note which recommends these flags: http://software.intel.com/en-us/articles/numpyscipy-with-intel-mkl
* | | | Merge pull request #432 from rgommers/silence-cython-warningsnjsmith2012-09-111-0/+6
|\ \ \ \ | | | | | | | | | | MAINT: silence Cython warnings about changes dtype/ufunc size.
| * | | | MAINT: silence Cython warnings about changes dtype/ufunc size.Ralf Gommers2012-09-081-0/+6
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | These warnings are visible whenever you import scipy (or another package) that was compiled against an older numpy than is installed. For example compiled against 1.5.1, like current scipy binaries are, and used with 1.7.0. These warnings aren't useful; if numpy would really break its ABI it would be noticed in no time without these warnings.
* | | | Merge pull request #429 from 87/fix_insertnjsmith2012-09-112-6/+17
|\ \ \ \ | | | | | | | | | | Fix for issues #392 and #378
| * | | | TST: Add test for boolean insertHan Genuit2012-09-071-0/+2
| | | | |
| * | | | TST: Add extra test for multidimensional inserts.Han Genuit2012-09-071-0/+7
| | | | |
| * | | | BUG: Fix for issues #378 and #392Han Genuit2012-09-071-6/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This should fix the problems with numpy.insert(), where the input values were not checked for all scalar types and where values did not get inserted properly, but got duplicated by default.
* | | | | Merge pull request #431 from njsmith/fix-travis-py24-buildnjsmith2012-09-111-1/+8
|\ \ \ \ \ | | | | | | | | | | | | FIX: use py24-compatible version of virtualenv on Travis
| * | | | | FIX: use py24-compatible version of virtualenv on TravisNathaniel J. Smith2012-09-081-1/+8
| | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Travis recently upgraded to virtualenv 1.8, which has dropped support for Python 2.4. So, in our Python 2.4 setup script, we need to explicitly fetch and use virtualenv 1.7. Likewise for pip 1.1. File imported from the already-fixed version for patsy: https://github.com/pydata/patsy/blob/0316d2901f4195db06e8091c15f37d9fe4ad09de/.travis-make-py24-virtualenv.sh
* | | | | Merge pull request #430 from njsmith/test_pareto-fixnjsmith2012-09-111-1/+7
|\ \ \ \ \ | |/ / / / |/| | | | FIX: loosen numerical tolerance in test_pareto()
| * | | | FIX: loosen numerical tolerance in test_pareto()Nathaniel J. Smith2012-09-071-1/+7
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The problem was that in 32bit Ubuntu 12.04, one gets the following: > /home/njs/numpy/.tox/py27/local/lib/python2.7/site-packages/numpy/random/tests/test_random.py(363)test_pareto() -> np.testing.assert_array_almost_equal(actual, desired, decimal=15) (Pdb) actual[1, 0] 52828779.702948704 (Pdb) desired[1, 0] 52828779.702948518 and the test was comparing the numbers to 1e-14, which obviously failed. Fixes #424.
* | | | BUG: fix npymath install location.David Cournapeau2012-09-062-3/+2
| | | |
* | | | BUG: fix custom post_check.David Cournapeau2012-09-061-7/+7
| | | |
* | | | BUG: forgot to build _dotblas in bento build.David Cournapeau2012-09-062-1/+4
| | | |
* | | | REF: remove unused imports in bscript.David Cournapeau2012-09-061-3/+0
|/ / /
* | | Update numpy/core/code_generators/ufunc_docstrings.pynjsmith2012-09-041-1/+1
| | | | | | | | | Revert PR #423 (which was based on a misunderstanding).
* | | Merge pull request #423 from adamlwgriffiths/masternjsmith2012-09-041-1/+1
|\ \ \ | |/ / |/| | Fix typo in documentation (101 instead of 10).
| * | Fix typo in documentation (101 instead of 10).Adam Griffiths2012-09-041-1/+1
|/ / | | | | | | | | | | | | | | Examples demonstrate using an array with (-10, 0, 10), but this specific example has a typo that lists the last number as 101. This is reflected in the diagrams having axis labeled from -10:+10.
* | Merge pull request #417 from certik/fix416Ondřej Čertík2012-09-021-7743/+8196
|\ \ | | | | | | FIX: Regenerate mtrand.c with Cython 0.17
| * | FIX: Regenerate mtrand.c with Cython 0.17Ondřej Čertík2012-09-021-7743/+8196
|/ / | | | | | | Fixes #416
* | Merge pull request #397 from certik/fix2189Ondřej Čertík2012-09-021-0/+10
|\ \ | | | | | | BUG: Add a test for Ticket #2189
| * | FIX: Add a test for Ticket #2066Ondřej Čertík2012-08-311-0/+4
| | |
| * | BUG: Add a test for Ticket #2189Ondřej Čertík2012-08-311-0/+6
| | |
* | | Merge pull request #376 from cgohlke/patch-2Ondřej Čertík2012-09-022-1/+6
|\ \ \ | | | | | | | | Allow long numbers in numpy.rec.array formats string
| * | | Remove test_recarray_from_long_formatscgohlke2012-08-071-8/+0
| | | |
| * | | Add test for long number in shape specifier of dtype stringcgohlke2012-08-071-0/+5
| | | |
| * | | Add test for long numbers in numpy.rec.array formats stringcgohlke2012-08-061-0/+8
| | | |