[Numpy-svn] [numpy/numpy] f2d9c1: Revert "Merge pull request #5614 from charris/clea...

[GitHub]

  Branch: refs/heads/maintenance/1.10.x
  Home:   https://github.com/numpy/numpy
  Commit: f2d9c138f4ddc3d73307b7966714b044d2861070
      https://github.com/numpy/numpy/commit/f2d9c138f4ddc3d73307b7966714b044d2861070
  Author: Charles Harris <charlesr.harris at gmail.com>
  Date:   2015-10-20 (Tue, 20 Oct 2015)

  Changed paths:
    M INSTALL.txt
    M numpy/core/src/multiarray/multiarraymodule.c
    M numpy/distutils/fcompiler/gnu.py
    M numpy/distutils/mingw32ccompiler.py
    M numpy/distutils/system_info.py
    M numpy/lib/tests/test_function_base.py
    M setup.py

  Log Message:
  -----------
  Revert "Merge pull request #5614 from charris/cleanup-gh-5587"

Revert mingwpy distutils modifications they cause problems on
non-windows platforms.

This reverts commit 96abd32de241864ee97f30357234cbc9a96c43ae, reversing
changes made to 06af9918f6bf03b8d818ec834f9fb48db57d1489.


  Commit: 49156689e6049debf4b07b3512a797f2003663de
      https://github.com/numpy/numpy/commit/49156689e6049debf4b07b3512a797f2003663de
  Author: Charles Harris <charlesr.harris at gmail.com>
  Date:   2015-10-20 (Tue, 20 Oct 2015)

  Changed paths:
    M numpy/lib/tests/test_function_base.py

  Log Message:
  -----------
  MAINT: Keep test fix that came in with #5614.

The fix went away in the reversion of #5614.


  Commit: b3c772c74bcf722b50c02232ec3571ad7f77b846
      https://github.com/numpy/numpy/commit/b3c772c74bcf722b50c02232ec3571ad7f77b846
  Author: Charles Harris <charlesr.harris at gmail.com>
  Date:   2015-10-20 (Tue, 20 Oct 2015)

  Changed paths:
    M INSTALL.txt
    M numpy/core/src/multiarray/multiarraymodule.c
    M numpy/distutils/fcompiler/gnu.py
    M numpy/distutils/mingw32ccompiler.py
    M numpy/distutils/system_info.py
    M setup.py

  Log Message:
  -----------
  Merge pull request #6536 from charris/revert-5614

Revert 5614


Compare: https://github.com/numpy/numpy/compare/5c0c994d05d1...b3c772c74bcf