Fix test errors with numpy master #3223

Merged
merged 4 commits into from Jan 31, 2014

Conversation

Projects
None yet
4 participants
Owner

rgommers commented Jan 18, 2014

Also some cleanup in ndimage tests.

Coverage Status

Coverage remained the same when pulling 7915e29 on rgommers:ndimage-warnings into dc7555b on scipy:master.

@juliantaylor juliantaylor commented on the diff Jan 24, 2014

scipy/stats/tests/test_stats.py
@@ -1089,7 +1089,7 @@ def test_structured_arrays(self):
bb = np.array(list(zip(b, b)), dt)
v = stats.itemfreq(aa)
# Arrays don't compare equal because v[:,0] is object array
- assert_equal(v[2, 0], bb[2])
+ assert_equal(tuple(v[2, 0]), tuple(bb[2]))
@juliantaylor

juliantaylor Jan 24, 2014

Contributor

this is a know regression in numpy:
numpy/numpy#3804

@rgommers

rgommers Jan 24, 2014

Owner

Thanks. It was kinda puzzling. Still doesn't hurt to make this change here.

Owner

rgommers commented Jan 31, 2014

Any objections to merging this one? Should all be trivial fixes.

@pv pv added a commit that referenced this pull request Jan 31, 2014

@pv pv Merge pull request #3223 from rgommers/ndimage-warnings
TST: fix test errors with numpy master
2175c91

@pv pv merged commit 2175c91 into scipy:master Jan 31, 2014

1 check passed

default The Travis CI build passed
Details
Owner

pv commented Jan 31, 2014

Thanks, merged.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment