DM-10926: Incompatibility with NumPy 1.13 #249
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
parejkoj
reviewed
Jun 21, 2017
tests/test_astropyTableViews.py
Outdated
| @@ -127,9 +127,9 @@ def testFlagColumn(self): | |||
| """Test that Flag columns can be viewed if copy=True or unviewable="copy". | |||
| """ | |||
| v1 = self.catalog.asAstropy(unviewable="copy") | |||
| self.assertFloatsAlmostEqual(v1["a4"], self.catalog["a4"]) | |||
| self.assertFalse(np.any(np.logical_xor(v1["a4"], self.catalog["a4"]))) | |||
There was a problem hiding this comment.
I wonder if np.testing.assert_array_equal(v1["a4"], self.catalog["a4"]) (and similarly for the below) wouldn't be easier to interpret?
tests/test_simpleTable.py
Outdated
| @@ -357,8 +357,9 @@ def testExtract(self): | |||
| ]: | |||
| d = catalog.extract("*", **kwds) | |||
| self.assertFloatsEqual(d["a_b_c1"], catalog.get("a_b_c1")[idx]) | |||
| self.assertFloatsEqual(d["a_b_c2"], catalog.get("a_b_c2")[idx]) | |||
| self.assertFloatsEqual(d["a_d1"], catalog.get("a_d1")[idx]) | |||
| self.assertFalse(np.any(np.logical_xor( | |||
There was a problem hiding this comment.
Another case where np.testing would probably clarify the purpose of the test.
| allBits = self.catalog.getBits() | ||
| someBits = self.catalog.getBits(["a_flag", "c_flag"]) | ||
| self.assertEqual(allBits.getMask("a_flag"), 0x1) | ||
| self.assertEqual(allBits.getMask("b_flag"), 0x2) | ||
| self.assertEqual(allBits.getMask("c_flag"), 0x4) | ||
| self.assertEqual(someBits.getMask(self.fluxFlagKey), 0x1) | ||
| self.assertEqual(someBits.getMask(self.shapeFlagKey), 0x2) | ||
| self.assertFloatsEqual((allBits.array & 0x1 != 0), |
pschella
force-pushed
the
tickets/DM-10926
branch
2 times, most recently
from
8df0f75
to
2e1d673
Compare
- Stop using assertFloatEqual for non-float fields
pschella
force-pushed
the
tickets/DM-10926
branch
from
2e1d673
to
5553885
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.