[Numpy-svn] [numpy/numpy] 480432: WIP: Fix matplotlib, etc. errors

[GitHub]

  Branch: refs/heads/master
  Home:   https://github.com/numpy/numpy
  Commit: 480432b8988a9be8f8a43f4b3f0217c3eddd6c9f
      https://github.com/numpy/numpy/commit/480432b8988a9be8f8a43f4b3f0217c3eddd6c9f
  Author: Sebastian Berg <sebastian at sipsolutions.net>
  Date:   2014-06-15 (Sun, 15 Jun 2014)

  Changed paths:
    M numpy/core/src/multiarray/mapping.c
    M numpy/core/tests/test_indexing.py
    M numpy/core/tests/test_regression.py

  Log Message:
  -----------
  WIP: Fix matplotlib, etc. errors


  Commit: 743448139a4bca50209854dd8a6ffac97feafd30
      https://github.com/numpy/numpy/commit/743448139a4bca50209854dd8a6ffac97feafd30
  Author: Sebastian Berg <sebastian at sipsolutions.net>
  Date:   2014-07-05 (Sat, 05 Jul 2014)

  Changed paths:
    M numpy/core/src/multiarray/mapping.c

  Log Message:
  -----------
  DEP: Allow high dim boolean assignment, but deprecate it


  Commit: ed88fa9615c43da364a641c741badd855729dd3c
      https://github.com/numpy/numpy/commit/ed88fa9615c43da364a641c741badd855729dd3c
  Author: Sebastian Berg <sebastian at sipsolutions.net>
  Date:   2014-07-05 (Sat, 05 Jul 2014)

  Changed paths:
    M numpy/core/src/multiarray/mapping.c

  Log Message:
  -----------
  BUG: boolean assignment; allow wrong number of elements

Uses old code to be more broad then previous commit


  Commit: 9c4d48c3c27584e8a555b5e55d1634089db7a01a
      https://github.com/numpy/numpy/commit/9c4d48c3c27584e8a555b5e55d1634089db7a01a
  Author: Sebastian Berg <sebastian at sipsolutions.net>
  Date:   2014-07-05 (Sat, 05 Jul 2014)

  Changed paths:
    M numpy/core/src/multiarray/mapping.c

  Log Message:
  -----------
  BUG: Add missing error incref in 1d indexing fallback


  Commit: 8dba040fcc26c21c982d162b03948a0b21b65535
      https://github.com/numpy/numpy/commit/8dba040fcc26c21c982d162b03948a0b21b65535
  Author: Charles Harris <charlesr.harris at gmail.com>
  Date:   2014-07-06 (Sun, 06 Jul 2014)

  Changed paths:
    M numpy/core/src/multiarray/mapping.c
    M numpy/core/tests/test_indexing.py
    M numpy/core/tests/test_regression.py

  Log Message:
  -----------
  Merge pull request #4804 from seberg/fancy-ass-1d

WIP: Fix matplotlib, etc. errors


Compare: https://github.com/numpy/numpy/compare/81242f627582...8dba040fcc26