iplotx 0.6.1__tar.gz → 0.6.3__tar.gz

{iplotx-0.6.1 → iplotx-0.6.3}/.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.1 → iplotx-0.6.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: iplotx
-Version: 0.6.1
+Version: 0.6.3
 Summary: Plot networkx from igraph and networkx.
 Project-URL: Homepage, https://github.com/fabilab/iplotx
 Project-URL: Documentation, https://readthedocs.org/iplotx
@@ -11,7 +11,7 @@ Author-email: Fabio Zanini <fabio.zanini@unsw.edu.au>
 Maintainer-email: Fabio Zanini <fabio.zanini@unsw.edu.au>
 License: MIT
 Keywords: graph,network,plotting,visualisation
-Classifier: Development Status :: 4 - Beta
+Classifier: Development Status :: 5 - Production/Stable
 Classifier: Intended Audience :: Developers
 Classifier: Intended Audience :: Education
 Classifier: Intended Audience :: Science/Research
@@ -41,6 +41,8 @@ Description-Content-Type: text/markdown
 ![RTD](https://readthedocs.org/projects/iplotx/badge/?version=latest)
 [![Coverage Status](https://coveralls.io/repos/github/fabilab/iplotx/badge.svg?branch=main)](https://coveralls.io/github/fabilab/iplotx?branch=main)
 ![pylint](assets/pylint.svg)
+[![DOI](https://zenodo.org/badge/DOI/10.5281/zenodo.16599333.svg)](https://doi.org/10.5281/zenodo.16599333)
+
 
 # iplotx
 [![Banner](docs/source/_static/banner.png)](https://iplotx.readthedocs.io/en/latest/gallery/index.html).
@@ -61,8 +63,6 @@ Supports:
 
 In addition to the above, *any* network or tree analysis library can register an [entry point](https://iplotx.readthedocs.io/en/latest/providers.html#creating-a-custom-data-provider) to gain compatibility with `iplotx` with no intervention from our side.
 
-**NOTE**: This is currently late beta quality software. The API and functionality might break rarely.
-
 ## Installation
 ```bash
 pip install iplotx

{iplotx-0.6.1 → iplotx-0.6.3}/README.md

@@ -3,6 +3,8 @@
 ![RTD](https://readthedocs.org/projects/iplotx/badge/?version=latest)
 [![Coverage Status](https://coveralls.io/repos/github/fabilab/iplotx/badge.svg?branch=main)](https://coveralls.io/github/fabilab/iplotx?branch=main)
 ![pylint](assets/pylint.svg)
+[![DOI](https://zenodo.org/badge/DOI/10.5281/zenodo.16599333.svg)](https://doi.org/10.5281/zenodo.16599333)
+
 
 # iplotx
 [![Banner](docs/source/_static/banner.png)](https://iplotx.readthedocs.io/en/latest/gallery/index.html).
@@ -23,8 +25,6 @@ Supports:
 
 In addition to the above, *any* network or tree analysis library can register an [entry point](https://iplotx.readthedocs.io/en/latest/providers.html#creating-a-custom-data-provider) to gain compatibility with `iplotx` with no intervention from our side.
 
-**NOTE**: This is currently late beta quality software. The API and functionality might break rarely.
-
 ## Installation
 ```bash
 pip install iplotx

{iplotx-0.6.1 → iplotx-0.6.3}/iplotx/ingest/__init__.py

@@ -1,5 +1,5 @@
 """
-This module focuses on how to ingest network data into standard data structures no matter what library they come from.
+This module focuses on how to ingest network/tree data into standard data structures no matter what library they come from.
 """
 
 import pathlib

{iplotx-0.6.1 → iplotx-0.6.3}/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.1 → iplotx-0.6.3}/iplotx/version.py

@@ -2,4 +2,4 @@
 iplotx version information module.
 """
 
-__version__ = "0.6.1"
+__version__ = "0.6.3"

{iplotx-0.6.1 → iplotx-0.6.3}/iplotx/vertex.py

@@ -232,10 +232,12 @@ class VertexCollection(PatchCollection):
         else:
             cmap_fun = None
 
-        if style.get("size", 20) == "label":
+        size_tmp = style.get("size", 20)
+        if isinstance(size_tmp, str) and (size_tmp == "label"):
             if self._labels is None:
                 warnings.warn("No labels found, cannot resize vertices based on labels.")
                 style["size"] = get_style("default.vertex")["size"]
+        del size_tmp
 
         if "cmap" in style:
             colorarray = []

{iplotx-0.6.1 → iplotx-0.6.3}/pyproject.toml

@@ -24,7 +24,7 @@ license = {text = "MIT"}
 license-files = ["LICEN[CS]E.*"]
 keywords = ["network", "graph", "visualisation", "plotting"]
 classifiers = [
-  "Development Status :: 4 - Beta",
+  "Development Status :: 5 - Production/Stable",
   "Programming Language :: Python :: 3",
   "Programming Language :: Python :: 3.11",
   "Programming Language :: Python :: 3.12",

{iplotx-0.6.1 → iplotx-0.6.3}/tests/test_geometry.py

@@ -28,6 +28,40 @@ 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.
+    """
+    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())
+
+
 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 +99,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):

{iplotx-0.6.1 → iplotx-0.6.3}/tests/test_igraph.py

@@ -1,4 +1,5 @@
 import unittest
+import numpy as np
 import importlib
 import matplotlib as mpl
 
@@ -38,6 +39,18 @@ class GraphTestRunner(unittest.TestCase):
         fig, ax = plt.subplots(figsize=(3, 3))
         ipx.plot(g, ax=ax, layout=self.layout_small_ring)
 
+    @image_comparison(baseline_images=["graph_vertexsize"], remove_text=True)
+    def test_vertexsize(self):
+        g = ig.Graph.Ring(5)
+        fig, ax = plt.subplots(figsize=(3, 3))
+        ipx.plot(
+            g,
+            ax=ax,
+            layout=self.layout_small_ring,
+            vertex_size=np.linspace(10, 30, 5),
+            margins=0.15,
+        )
+
     @image_comparison(baseline_images=["graph_labels"], remove_text=True)
     def test_labels(self):
         g = ig.Graph.Ring(5)