Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP

Comparing changes

Choose two branches to see what's changed or to start a new pull request. If you need to, you can also compare across forks.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also compare across forks.
base fork: charris/numpy
...
head fork: charris/numpy
Checking mergeability… Don't worry, you can still create the pull request.
Commits on Dec 13, 2011
@pbrod pbrod ENH: enhance meshgrid to generate 3D grids, sparse grids, matrix inde…
…xing.
e37a90c
@rgommers rgommers MAINT: clean up docstring and some minor items in meshgrid. Remove nd…
…grid.
37d723c
Commits on Dec 28, 2011
@rgommers rgommers BUG: meshgrid: raise error on single input. 4e57117
@rgommers rgommers TST: meshgrid: test expected shapes for Cartesian and matrix indexing. 3fb541e
Commits on Feb 05, 2012
@rgommers rgommers STY: meshgrid: some minor changes to address review comments. d48b756
Commits on Jun 25, 2012
@teoliphant teoliphant Restore ability to not include semi-colons. 8006fd4
Commits on Jun 27, 2012
@ahmadia ahmadia prefer gfortran (g95) over vendor compilers, g77 and g95 on OSX and L…
…inux.


Retain preference for g77 on Windows and vendor compilers on other platforms.
7316499
Commits on Jun 28, 2012
@teoliphant teoliphant API: Restore ability to not use semicolons. 1d4decd
Commits on Jul 06, 2012
@nouiz nouiz Add doc for PyArray_FILLWBYTE to tell the ndarray must be c contiguous. b009f97
Commits on Jul 11, 2012
@teoliphant teoliphant Fix the deprecations language. 9a4ef17
@teoliphant teoliphant Fix-up deprecations language. 6f335e0
Commits on Jul 13, 2012
@pv pv BUG: core: don't pollute public namespace with PyIndex_Check on Pytho…
…n 2.4

Public numpy headers shouldn't define a replacement PyIndex_Check.  This
causes unexpected behavior in Python2.4 in 3rd party code.
ce0a791
@pv pv STY: core: move non-Py3 specific stuff out from npy_3kcompat.h to pri…
…vate npy_pycompat.h

npy_3kcompat.h is semi-private, so this can be done.
423ddfb
Commits on Jul 14, 2012
@charris STY: Remove duplicate #include. 9e5efde
@charris Merge pull request #355 from charris/updated-pull-307
Put PyIndex_Check in a private include file.
6a1ab03
Eric Fode BUG: ticket #2028: When min_scalar was not checking to see if numbers…
… could fit into unsigned long longs. This was fixed by adding an extra case to function to check if the passed number could fit into a unsigned long long if it could not fit into anything else. Additionaly, regression tests were added.
6966bdc
Commits on Jul 15, 2012
@matthew-brett matthew-brett BUG: change default threshold for matrix_rank
The default tolerance threshold for matrix_rank was passing as full rank
some matrices that were numerically rank deficient.  This commit changes
the default tolerance to match the algorithm in MATLAB and Numerical
recipes.
78b7693
@charris Merge branch 'pull-357'
* pull-357:
  BUG: change default threshold for matrix_rank
f9c6867
@ericfode ericfode Style Fix 3d31029
@ericfode ericfode Tab Fix 681bceb
@lpellis lpellis BUG: Ticket #808: Insert was not performing properly when an integer was
the argument passed to be used as the item to be insterted, and a list was
passed as the positions. This was fixed by simply duplicating the item to
be inserted so that it was a list of equal length and then control was
passed to the already exsisting code to handel this case
2c04244
@ericfode ericfode more tabs removed (hunting for c formatter to take care of this next …
…time)
120c6bd
@rgommers rgommers DOC: add details on how to use generator tests to documentation.
Thanks to Pauli Virtanen for this useful suggestion.
23dba57
@njsmith njsmith Merge pull request #358 from rgommers/howto-generator-tests
DOC: add details on how to use generator tests to documentation.
4a2295d
@ericfode ericfode Added cast to error check, and fixed indentation. 78f6672
@rgommers rgommers DOC: add info on docstrings in test functions/methods. Also fix a typo.
Reviewed by @charris in combination with PR-358.
4d37169
Commits on Jul 16, 2012
@nouiz nouiz better new doc sentence following code review. 0d59c78
@charris Merge pull request #332 from nouiz/fillwbyte_doc
Add doc for PyArray_FILLWBYTE to tell the ndarray must be c contiguous.
f369ed6
@cgohlke cgohlke Fix `WindowsError: [Error 32]` in test_not_closing_opened_fid (test_i…
…o.TestSavezLoad)
08c507b
@charris Merge pull request #360 from cgohlke/patch-3
Fix `WindowsError: [Error 32]` in test_not_closing_opened_fid (test_io.T...
1234d1c
Commits on Jul 17, 2012
@teoliphant teoliphant DOC: update language of C-API deprecations. 93e42dd
@njsmith njsmith [FIX] Make np.random.shuffle less brain-dead
The logic in np.random.shuffle was... not very sensible. Fixes trac
ticket #2074.

This patch also exposes a completely unrelated issue in
numpy.testing. Filed as Github issue #347 and marked as knownfail for
now.
b26c675
@njsmith njsmith Switch WARN_ON_WRITE to issuing FutureWarnings instead of Deprecation…
…Warnings

FutureWarnings are displayed by default, so they should be used
whenever a future change will change the semantics of existing code
(as opposed to making existing code simply stop working).

List discussion:
  http://www.mail-archive.com/numpy-discussion@scipy.org/msg37500.html
b798f12
@teoliphant teoliphant DOC: Update API description with suggestions from charris. b8a2ea7
@teoliphant teoliphant Merge pull request #361 from njsmith/warn-on-write-futurewarning
Switch WARN_ON_WRITE to issuing FutureWarnings instead of DeprecationWarnings
6c772fa
@jayvius jayvius Add ability to get view when selecting subset of fields.
Add ability to get view when selecting subset of fields in a struct array,
for numpy 1.8.0. Currently a copy is still returned - set WARN_ON_WRITE flag
which will be removed in a future version of numpy.
6363bb7
@jayvius jayvius fix previous commit to return copy of view instead of view 0c09e1f
@jayvius jayvius Change WARN_ON_WRITE Deprecation Warning
Change WARN_ON_WRITE Deprecation Warning to include returning a copy
when selecting muultiple fields of a structured array.
91cb088
@jayvius jayvius Call view object's copy method a32325d
@jayvius jayvius Updated reference docs for DeprecationWarning 781468b
@jayvius jayvius update 1.7 release notes bf58296
@jayvius jayvius Add tests for record array indexing
- add tests for record array indexing with multiple field names
- add tests for DeprecationWarning when writing to array returned
  by record array indexing with multiple field names
2eb9610
@jayvius jayvius change DeprecationWarning to FutureWarning a03e8b4
@ahmadia ahmadia Merge branch 'master' of https://github.com/numpy/numpy into patch-2 a419a30
@ahmadia ahmadia prefer gfortran over g77 and vendor compilers on OS X and Linux 2d4a1cf
@njsmith njsmith Merge pull request #348 from njsmith/fix-shuffle
[FIX] Make np.random.shuffle less brain-dead
bf2c101
Commits on Jul 18, 2012
@teoliphant teoliphant Merge pull request #327 from teoliphant/restore_api
Restore ability to not include semi-colons.
c83e5b6
@teoliphant teoliphant Merge pull request #192 from rgommers/meshgrid3d
Meshgrid enhancements (>2-D, sparse grids, matrix indexing)
0b2bfa9
@teoliphant teoliphant Merge pull request #352 from HackerSchool12/bugfix808
BF bug #808
578a419
@teoliphant teoliphant Merge pull request #350 from jayvius/get-view2
Add transition code for returning view when selecting subset of fields
bc10053
@teoliphant teoliphant Merge remote-tracking branch 'hackerschool/2028fix' 7b8d30b
@teoliphant teoliphant Fix-up logic so that it is more readable. 88cf94d
@teoliphant teoliphant BUG: Fix some tests in PR #192 5b4e61b
@teoliphant teoliphant Merge pull request #325 from ahmadia/patch-2
prefer gfortran (gnu95) over vendor compilers, g77, g95 on OSX & Linux
a806876
@teoliphant teoliphant Update release notes. efcb8bf
@teoliphant teoliphant Merge remote-tracking branch 'upstream/master' 9cb8c3b