iplotx 0.6.2__tar.gz → 0.6.4__tar.gz

{iplotx-0.6.2 → iplotx-0.6.4}/.github/workflows/test.yml

@@ -39,6 +39,8 @@ jobs:
 
     - name: Coveralls
       uses: coverallsapp/github-action@v2
+      with:
+        fail-on-error: false
 
     - name: Run flake8
       run: uv run flake8 iplotx --count --exit-zero --max-complexity=20 --max-line-length=127 --statistics

{iplotx-0.6.2 → iplotx-0.6.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: iplotx
-Version: 0.6.2
+Version: 0.6.4
 Summary: Plot networkx from igraph and networkx.
 Project-URL: Homepage, https://github.com/fabilab/iplotx
 Project-URL: Documentation, https://readthedocs.org/iplotx

{iplotx-0.6.2 → iplotx-0.6.4}/iplotx/utils/geometry.py

@@ -42,14 +42,15 @@ def convex_hull(points):
         pass
 
     # Otherwise, try scipy
-    try:
-        from scipy.spatial import ConvexHull
-
-        # NOTE: scipy guarantees counterclockwise ordering in 2D
-        # https://docs.scipy.org/doc/scipy/reference/generated/scipy.spatial.ConvexHull.html
-        hull_idx = ConvexHull(points).vertices[::-1]
-    except ImportError:
-        pass
+    if hull_idx is None:
+        try:
+            from scipy.spatial import ConvexHull
+
+            # NOTE: scipy guarantees counterclockwise ordering in 2D
+            # https://docs.scipy.org/doc/scipy/reference/generated/scipy.spatial.ConvexHull.html
+            hull_idx = ConvexHull(points).vertices[::-1]
+        except ImportError:
+            pass
 
     # Last resort: our own Graham scan
     if hull_idx is None:

{iplotx-0.6.2 → iplotx-0.6.4}/iplotx/version.py

@@ -2,4 +2,4 @@
 iplotx version information module.
 """
 
-__version__ = "0.6.2"
+__version__ = "0.6.4"

{iplotx-0.6.2 → iplotx-0.6.4}/tests/test_geometry.py

@@ -28,6 +28,44 @@ def four_points():
     )
 
 
+# 13: two tests fail with AssertionError
+def assert_array_equal_upon_cycling(points1, points2):
+    """Determine array equality but allow order to be different by cycling.
+
+    Parameters:
+        points1: First array of points.
+        points2: Second array of points.
+    Returns:
+        True if the arrays are equal upon cycling, False otherwise.
+    """
+
+    def _fun(points1, points2):
+        if len(points1) != len(points2):
+            return False
+
+        points1 = np.asarray(points1)
+        points2 = np.asarray(points2).astype(points1.dtype)
+
+        if (points1.ndim != 1) or (points2.ndim != 1):
+            raise ValueError("Only 1D arrays are supported.")
+
+        if (points1 == points2).all():
+            return True
+
+        # Cycle
+        points2 = np.concatenate([points2, points2])
+        i0 = np.flatnonzero((points2 == points1[0]))
+        if len(i0) != 2:
+            return False
+        i0 = i0[0]
+        points2 = points2[i0 : i0 + len(points1)]
+
+        # Check again
+        return bool((points1 == points2).all())
+
+    assert _fun(points1, points2)
+
+
 def test_squared_bezier(three_points):
     ev = partial(geometry._evaluate_squared_bezier, three_points)
     np.testing.assert_array_almost_equal(ev(0), three_points[0])
@@ -65,12 +103,12 @@ def test_hull_two(three_points):
 
 def test_hull_three(three_points):
     hull = geometry.convex_hull(three_points)
-    np.testing.assert_array_equal(hull, [2, 1, 0])
+    assert_array_equal_upon_cycling(hull, [2, 1, 0])
 
 
 def test_hull_four(four_points):
     hull = geometry.convex_hull(four_points)
-    np.testing.assert_array_equal(hull, [3, 2, 1, 0])
+    assert_array_equal_upon_cycling(hull, [3, 2, 1, 0])
 
 
 def test_hull_internal_three(three_points):