From 8d8580ef5b39d67d736aa06874a4d6095430f342 Mon Sep 17 00:00:00 2001 From: Serge Rey Date: Sun, 13 Jun 2021 11:31:25 -0700 Subject: [PATCH] Generalize test_tabular for >= 3.6 --- libpysal/cg/ops/tests/test_tabular.py | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/libpysal/cg/ops/tests/test_tabular.py b/libpysal/cg/ops/tests/test_tabular.py index 52921cedf..e2c64a696 100644 --- a/libpysal/cg/ops/tests/test_tabular.py +++ b/libpysal/cg/ops/tests/test_tabular.py @@ -57,11 +57,15 @@ def test_dissolve(self): self.assertEqual(out[0].area, 2.0) self.assertEqual(out[1].area, 2.0) - answer_vertices0 = [(0, 0), (0, 1), (0, 2), (1, 2), (1, 1), (1, 0), (0, 0)] - answer_vertices1 = [(2, 1), (2, 0), (1, 0), (1, 1), (1, 2), (2, 2), (2, 1)] + answer_vertices0 = set([(0, 0), (0, 1), (0, 2), (1, 2), (1, 1), (1, 0), (0, 0)]) + answer_vertices1 = set([(2, 1), (2, 0), (1, 0), (1, 1), (1, 2), (2, 2), (2, 1)]) + + s0 = set([tuple(map(int,t)) for t in out[0].vertices]) + s1 = set([tuple(map(int,t)) for t in out[1].vertices]) + + self.assertTrue(s0==answer_vertices0) + self.assertTrue(s1==answer_vertices1) - np.testing.assert_allclose(out[0].vertices, answer_vertices0) - np.testing.assert_allclose(out[1].vertices, answer_vertices1) def test_clip(self): pass