[Numpy-svn] [numpy/numpy] 250c4d: Make comparison function (gt, ge, ...) respect __a...

[GitHub]

  Branch: refs/heads/maintenance/1.7.x
  Home:   https://github.com/numpy/numpy
  Commit: 250c4d66dbdddf41070a2b2cfe02e27acff2dec3
      https://github.com/numpy/numpy/commit/250c4d66dbdddf41070a2b2cfe02e27acff2dec3
  Author: Frederic <nouiz at nouiz.org>
  Date:   2013-07-01 (Mon, 01 Jul 2013)

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

  Log Message:
  -----------
  Make comparison function (gt, ge, ...) respect __array_priority__.


  Commit: e2105b2d3c373bbf1968da1a04acb5aeab986fee
      https://github.com/numpy/numpy/commit/e2105b2d3c373bbf1968da1a04acb5aeab986fee
  Author: Frederic <nouiz at nouiz.org>
  Date:   2013-07-01 (Mon, 01 Jul 2013)

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

  Log Message:
  -----------
  Revert "Make comparison function (gt, ge, ...) respect __array_priority__."

This reverts commit aa7a04741146c44ab1735782a89a60b038028bf2.


  Commit: 18c4eafcfb979b3661821db17bf7c4e3d8ee3e94
      https://github.com/numpy/numpy/commit/18c4eafcfb979b3661821db17bf7c4e3d8ee3e94
  Author: Frederic <nouiz at nouiz.org>
  Date:   2013-07-01 (Mon, 01 Jul 2013)

  Changed paths:
    M numpy/core/src/multiarray/arrayobject.c
    M numpy/core/src/umath/ufunc_object.c

  Log Message:
  -----------
  Commit from @seberg to make comparison use respect __array_priority__


  Commit: 8fb0dedd61eb508c43b96654b865452a6693161f
      https://github.com/numpy/numpy/commit/8fb0dedd61eb508c43b96654b865452a6693161f
  Author: Frederic <nouiz at nouiz.org>
  Date:   2013-07-01 (Mon, 01 Jul 2013)

  Changed paths:
    M numpy/core/tests/test_multiarray.py

  Log Message:
  -----------
  Add test for the array_priority for comparison function.

Conflicts:
	numpy/core/tests/test_multiarray.py


  Commit: df388acd385300a03115721beee5892a703508ad
      https://github.com/numpy/numpy/commit/df388acd385300a03115721beee5892a703508ad
  Author: Frederic <nouiz at nouiz.org>
  Date:   2013-07-01 (Mon, 01 Jul 2013)

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

  Log Message:
  -----------
  reorder code to remove not needed computation in some cases.


  Commit: 473e3e31413ea80f0c186e345469930fc6dc49b0
      https://github.com/numpy/numpy/commit/473e3e31413ea80f0c186e345469930fc6dc49b0
  Author: Frederic <nouiz at nouiz.org>
  Date:   2013-07-01 (Mon, 01 Jul 2013)

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

  Log Message:
  -----------
  fix comment style.


  Commit: f77b43a3eb39b34918ef52ae8103dd78d07c7af5
      https://github.com/numpy/numpy/commit/f77b43a3eb39b34918ef52ae8103dd78d07c7af5
  Author: Frederic <nouiz at nouiz.org>
  Date:   2013-07-01 (Mon, 01 Jul 2013)

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

  Log Message:
  -----------
  remove comparison not needed as this is check above and we break in that case.


  Commit: 71858ddf54e9da3f9c19a0ecf506553b757d36d6
      https://github.com/numpy/numpy/commit/71858ddf54e9da3f9c19a0ecf506553b757d36d6
  Author: Frederic <nouiz at nouiz.org>
  Date:   2013-07-01 (Mon, 01 Jul 2013)

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

  Log Message:
  -----------
  Move computation inside an if to speed it up.


  Commit: 91cb5e377a95dbd8c63eeb9c04e354fa2621ef3f
      https://github.com/numpy/numpy/commit/91cb5e377a95dbd8c63eeb9c04e354fa2621ef3f
  Author: Frederic <nouiz at nouiz.org>
  Date:   2013-07-01 (Mon, 01 Jul 2013)

  Changed paths:
    M numpy/core/tests/test_multiarray.py

  Log Message:
  -----------
  use assert function instead of python keyword


  Commit: b97f500364d984485200af14332c3b9653c2813b
      https://github.com/numpy/numpy/commit/b97f500364d984485200af14332c3b9653c2813b
  Author: Frederic <nouiz at nouiz.org>
  Date:   2013-07-01 (Mon, 01 Jul 2013)

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

  Log Message:
  -----------
  updated the comment.


  Commit: f66a4063e077af33d32df782815909d950160070
      https://github.com/numpy/numpy/commit/f66a4063e077af33d32df782815909d950160070
  Author: Frederic <nouiz at nouiz.org>
  Date:   2013-07-01 (Mon, 01 Jul 2013)

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

  Log Message:
  -----------
  code clean up. Remove code that was never executed.

@seberg saw this.


  Commit: 854776e16d264a18e41c93b87ce304ff5d061295
      https://github.com/numpy/numpy/commit/854776e16d264a18e41c93b87ce304ff5d061295
  Author: Blake Griffith <blake.a.griffith at gmail.com>
  Date:   2013-07-01 (Mon, 01 Jul 2013)

  Changed paths:
    M numpy/core/tests/test_multiarray.py

  Log Message:
  -----------
  BUG: Class should inherit from object.


  Commit: 028a055f1377cea5ae33b957207b4ef06e12e49b
      https://github.com/numpy/numpy/commit/028a055f1377cea5ae33b957207b4ef06e12e49b
  Author: Charles Harris <charlesr.harris at gmail.com>
  Date:   2013-07-02 (Tue, 02 Jul 2013)

  Changed paths:
    M numpy/core/src/multiarray/arrayobject.c
    M numpy/core/src/umath/ufunc_object.c
    M numpy/core/tests/test_multiarray.py

  Log Message:
  -----------
  Merge pull request #3490 from cowlicks/backport-3324

Backport 3324


Compare: https://github.com/numpy/numpy/compare/51ebb86b1e4b...028a055f1377