[Numpy-svn] [numpy/numpy] 00222c: BUG: make sure numpy imports on python 2.6 when no...

[GitHub]

  Branch: refs/heads/maintenance/1.11.x
  Home:   https://github.com/numpy/numpy
  Commit: 00222c7168f22a82d82573fc5eca2c5a8ae406f2
      https://github.com/numpy/numpy/commit/00222c7168f22a82d82573fc5eca2c5a8ae406f2
  Author: Evgeni Burovski <evgeny.burovskiy at gmail.com>
  Date:   2016-04-04 (Mon, 04 Apr 2016)

  Changed paths:
    M numpy/testing/utils.py

  Log Message:
  -----------
  BUG: make sure numpy imports on python 2.6 when nose is unavailable


  Commit: d51f874f7c30f335189e1175199f3275adfc79f8
      https://github.com/numpy/numpy/commit/d51f874f7c30f335189e1175199f3275adfc79f8
  Author: Nathaniel J. Smith <njs at pobox.com>
  Date:   2016-04-04 (Mon, 04 Apr 2016)

  Changed paths:
    M numpy/testing/utils.py

  Log Message:
  -----------
  Merge pull request #7506 from charris/fix-nose-import-2.6

BUG: make sure numpy imports on python 2.6 when nose is unavailable


Compare: https://github.com/numpy/numpy/compare/22118d037bc3...d51f874f7c30