[Numpy-svn] [numpy/numpy] e0cb3f: Revert "Merge pull request #7001 from shoyer/NaT-c...
GitHub
noreply at github.com
Sat Jan 16 23:44:13 EST 2016
Branch: refs/heads/master
Home: https://github.com/numpy/numpy
Commit: e0cb3f79936656d6d2f48cbad46a3a9f2bad5ae1
https://github.com/numpy/numpy/commit/e0cb3f79936656d6d2f48cbad46a3a9f2bad5ae1
Author: Charles Harris <charlesr.harris at gmail.com>
Date: 2016-01-16 (Sat, 16 Jan 2016)
Changed paths:
M numpy/core/arrayprint.py
M numpy/core/src/multiarray/scalartypes.c.src
M numpy/core/src/umath/loops.c.src
M numpy/core/tests/test_datetime.py
M numpy/ma/tests/test_extras.py
M numpy/ma/testutils.py
M numpy/testing/tests/test_utils.py
M numpy/testing/utils.py
Log Message:
-----------
Revert "Merge pull request #7001 from shoyer/NaT-comparison"
This reverts commit 7141f40b58ed1e7071cde78ab7bc8ab37e9c5983,
reversing changes made to 8fa6e3bef26a6d4a2c92f2824129aa4409be2590.
The original broke some pandas tests. The current plan to get this
in is
* reversion
* issue FutureWarning in 1.11 and 1.12
* make the change in 1.13.
Commit: 947b023a4999ec879b745c3e7b903d16d9ae65a1
https://github.com/numpy/numpy/commit/947b023a4999ec879b745c3e7b903d16d9ae65a1
Author: Charles Harris <charlesr.harris at gmail.com>
Date: 2016-01-16 (Sat, 16 Jan 2016)
Changed paths:
M numpy/core/arrayprint.py
M numpy/core/src/multiarray/scalartypes.c.src
M numpy/core/src/umath/loops.c.src
M numpy/core/tests/test_datetime.py
M numpy/ma/tests/test_extras.py
M numpy/ma/testutils.py
M numpy/testing/tests/test_utils.py
M numpy/testing/utils.py
Log Message:
-----------
Merge pull request #7042 from charris/revert-7001
Revert "Merge pull request #7001 from shoyer/NaT-comparison"
Compare: https://github.com/numpy/numpy/compare/865c3e375a59...947b023a4999
More information about the Numpy-svn
mailing list