hiveplotlib 0.26.2__tar.gz → 0.28.0__tar.gz

{hiveplotlib-0.26.2 → hiveplotlib-0.28.0}/LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2020 - 2024, Geometric Data Analytics, Inc.
+Copyright (c) 2020 - 2026, Gary Koplik
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without modification,
@@ -11,7 +11,7 @@ Redistributions in binary form must reproduce the above copyright notice,
 this list of conditions and the following disclaimer in the documentation
 and/or other materials provided with the distribution.
 
-Neither the name of Geometric Data Analytics nor the names of any contributors
+Neither the name of Gary Koplik nor the names of any contributors
 may be used to endorse or promote products derived from this software
 without specific prior written permission.
 

{hiveplotlib-0.26.2/src/hiveplotlib.egg-info → hiveplotlib-0.28.0}/PKG-INFO

@@ -1,9 +1,9 @@
 Metadata-Version: 2.4
 Name: hiveplotlib
-Version: 0.26.2
+Version: 0.28.0
 Summary: Visualize Network Data with Hive Plots
-Author-email: Gary Koplik <gary.koplik@geomdata.com>
-License: Copyright (c) 2020 - 2024, Geometric Data Analytics, Inc.
+Author-email: Gary Koplik <gary.koplik@gmail.com>
+License: Copyright (c) 2020 - 2026, Gary Koplik
         All rights reserved.
         
         Redistribution and use in source and binary forms, with or without modification,
@@ -16,7 +16,7 @@ License: Copyright (c) 2020 - 2024, Geometric Data Analytics, Inc.
         this list of conditions and the following disclaimer in the documentation
         and/or other materials provided with the distribution.
         
-        Neither the name of Geometric Data Analytics nor the names of any contributors
+        Neither the name of Gary Koplik nor the names of any contributors
         may be used to endorse or promote products derived from this software
         without specific prior written permission.
         
@@ -33,7 +33,7 @@ License: Copyright (c) 2020 - 2024, Geometric Data Analytics, Inc.
         THE POSSIBILITY OF SUCH DAMAGE.
         
 Project-URL: Documentation, https://hiveplotlib.readthedocs.io/stable/
-Project-URL: Source, https://gitlab.com/geomdata/hiveplotlib
+Project-URL: Source, https://gitlab.com/hiveplotlib/hiveplotlib
 Requires-Python: >=3.10
 Description-Content-Type: text/markdown
 License-File: LICENSE
@@ -41,28 +41,28 @@ Requires-Dist: matplotlib
 Requires-Dist: numpy
 Requires-Dist: pandas
 Provides-Extra: bokeh
-Requires-Dist: bokeh; extra == "bokeh"
+Requires-Dist: bokeh>=3.0.0; extra == "bokeh"
 Provides-Extra: datashader
 Requires-Dist: dask[dataframe]; extra == "datashader"
 Requires-Dist: datashader; extra == "datashader"
 Requires-Dist: numba>0.54.0; extra == "datashader"
 Requires-Dist: seaborn; extra == "datashader"
 Provides-Extra: dev
-Requires-Dist: bokeh; extra == "dev"
 Requires-Dist: cartopy; extra == "dev"
-Requires-Dist: dask[dataframe]; extra == "dev"
-Requires-Dist: datashader; extra == "dev"
 Requires-Dist: flexitext; extra == "dev"
 Requires-Dist: geopandas; extra == "dev"
-Requires-Dist: holoviews; extra == "dev"
+Requires-Dist: hiveplotlib[bokeh]; extra == "dev"
+Requires-Dist: hiveplotlib[datashader]; extra == "dev"
+Requires-Dist: hiveplotlib[holoviews]; extra == "dev"
+Requires-Dist: hiveplotlib[networkx]; extra == "dev"
+Requires-Dist: hiveplotlib[plotly]; extra == "dev"
+Requires-Dist: holoviews>=1.15; extra == "dev"
 Requires-Dist: jupyter; extra == "dev"
-Requires-Dist: networkx; extra == "dev"
-Requires-Dist: numba>0.54.0; extra == "dev"
-Requires-Dist: plotly; extra == "dev"
+Requires-Dist: nx-parallel; extra == "dev"
 Requires-Dist: pybadges; extra == "dev"
-Requires-Dist: seaborn; extra == "dev"
 Requires-Dist: tqdm; extra == "dev"
 Provides-Extra: docs
+Requires-Dist: ipywidgets; extra == "docs"
 Requires-Dist: myst-parser; extra == "docs"
 Requires-Dist: nbsphinx; extra == "docs"
 Requires-Dist: pydata-sphinx-theme; extra == "docs"
@@ -70,11 +70,16 @@ Requires-Dist: sphinx; extra == "docs"
 Requires-Dist: sphinx-copybutton; extra == "docs"
 Requires-Dist: toml; extra == "docs"
 Provides-Extra: holoviews
-Requires-Dist: bokeh; extra == "holoviews"
-Requires-Dist: holoviews; extra == "holoviews"
+Requires-Dist: bokeh>=3.0.0; extra == "holoviews"
+Requires-Dist: holoviews>=1.15; extra == "holoviews"
 Requires-Dist: numba>0.54.0; extra == "holoviews"
 Provides-Extra: networkx
 Requires-Dist: networkx; extra == "networkx"
+Requires-Dist: scipy; extra == "networkx"
+Provides-Extra: perf
+Requires-Dist: pyinstrument; extra == "perf"
+Requires-Dist: snakeviz; extra == "perf"
+Requires-Dist: memory_profiler; extra == "perf"
 Provides-Extra: plotly
 Requires-Dist: plotly; extra == "plotly"
 Provides-Extra: ruff
@@ -86,19 +91,22 @@ Requires-Dist: pytest-html; extra == "testing"
 Requires-Dist: pytest-timeout; extra == "testing"
 Requires-Dist: pytest-xdist; extra == "testing"
 Requires-Dist: toml; extra == "testing"
+Provides-Extra: ty
+Requires-Dist: ty==0.0.20; extra == "ty"
 Dynamic: license-file
 
 ![Hiveplotlib Logo](https://hiveplotlib.readthedocs.io/stable/_static/hiveplotlib.svg)
 
 A plotting package for generating and visualizing static Hive Plots in Python.
 
-![Supported Python Versions Matches PSF support](https://gitlab.com/geomdata/hiveplotlib/-/raw/master/.gitlab/python_badge.svg)
+![Supported Python Versions Matches PSF support](https://gitlab.com/hiveplotlib/hiveplotlib/-/raw/master/.gitlab/python_badge.svg)
 
-[![Matplotlib Support](https://gitlab.com/geomdata/hiveplotlib/-/raw/master/.gitlab/matplotlib_badge.svg)](https://matplotlib.org/)
-[![Bokeh Support](https://gitlab.com/geomdata/hiveplotlib/-/raw/master/.gitlab/bokeh_badge.svg)](https://docs.bokeh.org/en/latest/)
-[![Holoviews Support](https://gitlab.com/geomdata/hiveplotlib/-/raw/master/.gitlab/holoviews_badge.svg)](https://holoviews.org/index.html)
-[![Plotly Support](https://gitlab.com/geomdata/hiveplotlib/-/raw/master/.gitlab/plotly_badge.svg)](https://plotly.com/python/)
-[![Datashader Support](https://gitlab.com/geomdata/hiveplotlib/-/raw/master/.gitlab/datashader_badge.svg)](https://datashader.org/)
+[![Matplotlib Support](https://gitlab.com/hiveplotlib/hiveplotlib/-/raw/master/.gitlab/matplotlib_badge.svg)](https://matplotlib.org/)
+[![Bokeh Support](https://gitlab.com/hiveplotlib/hiveplotlib/-/raw/master/.gitlab/bokeh_badge.svg)](https://docs.bokeh.org/en/latest/)
+[![Holoviews Support](https://gitlab.com/hiveplotlib/hiveplotlib/-/raw/master/.gitlab/holoviews_badge.svg)](https://holoviews.org/index.html)
+[![Plotly Support](https://gitlab.com/hiveplotlib/hiveplotlib/-/raw/master/.gitlab/plotly_badge.svg)](https://plotly.com/python/)
+[![Datashader Support](https://gitlab.com/hiveplotlib/hiveplotlib/-/raw/master/.gitlab/datashader_badge.svg)](https://datashader.org/)
+[![NetworkX Support](https://gitlab.com/hiveplotlib/hiveplotlib/-/raw/master/.gitlab/networkx_badge.svg)](https://networkx.org/)
 
 # Installation
 
@@ -122,6 +130,10 @@ and [plotly](https://plotly.com/python/) visualizations, which can be installed
 `hiveplotlib` also supports large network visualization via the [datashader](https://datashader.org/) backend,
 which can be installed as `pip install hiveplotlib[datashader]`.
 
+Beyond the visualization backends, `hiveplotlib` integrates with [networkx](https://networkx.org/): build a hive plot
+directly from a `networkx` graph and compute graph metrics on it. Install this integration with
+`pip install hiveplotlib[networkx]`.
+
 # How to Use and Examples
 
 For more on how to use the software and examples, see the
@@ -133,7 +145,7 @@ We recommend starting with our
 [Quick Start Hive Plots](https://hiveplotlib.readthedocs.io/stable/notebooks/quick_hive_plots.html) pages.
 
 All the example notebooks are available for download as `jupyter` notebooks in the repository under the
-[examples](https://gitlab.com/geomdata/hiveplotlib/-/tree/master/examples) directory.
+[examples](https://gitlab.com/hiveplotlib/hiveplotlib/-/tree/master/examples) directory.
 
 To install this environment and associated `jupyter` kernel used to run the notebooks, clone the repository and run:
 
@@ -151,7 +163,7 @@ For more on Hive Plots, see our
 
 For additional resources, see:
 
-- [http://www.hiveplot.com/](http://www.hiveplot.com/)
+- [https://hiveplot.com/](https://hiveplot.com/)
 
 - Krzywinski M, Birol I, Jones S, Marra M (2011). Hive Plots — Rational Approach to
 Visualizing Networks. Briefings in Bioinformatics (early access 9 December 2011,
@@ -159,7 +171,7 @@ doi: 10.1093/bib/bbr069).
 
 # Contributing
 
-For more on contributing to the project, see [CONTRIBUTING.md](https://gitlab.com/geomdata/hiveplotlib/-/blob/master/CONTRIBUTING.md)
+For more on contributing to the project, see [CONTRIBUTING.md](https://gitlab.com/hiveplotlib/hiveplotlib/-/blob/master/CONTRIBUTING.md)
 
 ## Acknowledgements
 

{hiveplotlib-0.26.2 → hiveplotlib-0.28.0}/README.md

@@ -2,13 +2,14 @@
 
 A plotting package for generating and visualizing static Hive Plots in Python.
 
-![Supported Python Versions Matches PSF support](https://gitlab.com/geomdata/hiveplotlib/-/raw/master/.gitlab/python_badge.svg)
+![Supported Python Versions Matches PSF support](https://gitlab.com/hiveplotlib/hiveplotlib/-/raw/master/.gitlab/python_badge.svg)
 
-[![Matplotlib Support](https://gitlab.com/geomdata/hiveplotlib/-/raw/master/.gitlab/matplotlib_badge.svg)](https://matplotlib.org/)
-[![Bokeh Support](https://gitlab.com/geomdata/hiveplotlib/-/raw/master/.gitlab/bokeh_badge.svg)](https://docs.bokeh.org/en/latest/)
-[![Holoviews Support](https://gitlab.com/geomdata/hiveplotlib/-/raw/master/.gitlab/holoviews_badge.svg)](https://holoviews.org/index.html)
-[![Plotly Support](https://gitlab.com/geomdata/hiveplotlib/-/raw/master/.gitlab/plotly_badge.svg)](https://plotly.com/python/)
-[![Datashader Support](https://gitlab.com/geomdata/hiveplotlib/-/raw/master/.gitlab/datashader_badge.svg)](https://datashader.org/)
+[![Matplotlib Support](https://gitlab.com/hiveplotlib/hiveplotlib/-/raw/master/.gitlab/matplotlib_badge.svg)](https://matplotlib.org/)
+[![Bokeh Support](https://gitlab.com/hiveplotlib/hiveplotlib/-/raw/master/.gitlab/bokeh_badge.svg)](https://docs.bokeh.org/en/latest/)
+[![Holoviews Support](https://gitlab.com/hiveplotlib/hiveplotlib/-/raw/master/.gitlab/holoviews_badge.svg)](https://holoviews.org/index.html)
+[![Plotly Support](https://gitlab.com/hiveplotlib/hiveplotlib/-/raw/master/.gitlab/plotly_badge.svg)](https://plotly.com/python/)
+[![Datashader Support](https://gitlab.com/hiveplotlib/hiveplotlib/-/raw/master/.gitlab/datashader_badge.svg)](https://datashader.org/)
+[![NetworkX Support](https://gitlab.com/hiveplotlib/hiveplotlib/-/raw/master/.gitlab/networkx_badge.svg)](https://networkx.org/)
 
 # Installation
 
@@ -32,6 +33,10 @@ and [plotly](https://plotly.com/python/) visualizations, which can be installed
 `hiveplotlib` also supports large network visualization via the [datashader](https://datashader.org/) backend,
 which can be installed as `pip install hiveplotlib[datashader]`.
 
+Beyond the visualization backends, `hiveplotlib` integrates with [networkx](https://networkx.org/): build a hive plot
+directly from a `networkx` graph and compute graph metrics on it. Install this integration with
+`pip install hiveplotlib[networkx]`.
+
 # How to Use and Examples
 
 For more on how to use the software and examples, see the
@@ -43,7 +48,7 @@ We recommend starting with our
 [Quick Start Hive Plots](https://hiveplotlib.readthedocs.io/stable/notebooks/quick_hive_plots.html) pages.
 
 All the example notebooks are available for download as `jupyter` notebooks in the repository under the
-[examples](https://gitlab.com/geomdata/hiveplotlib/-/tree/master/examples) directory.
+[examples](https://gitlab.com/hiveplotlib/hiveplotlib/-/tree/master/examples) directory.
 
 To install this environment and associated `jupyter` kernel used to run the notebooks, clone the repository and run:
 
@@ -61,7 +66,7 @@ For more on Hive Plots, see our
 
 For additional resources, see:
 
-- [http://www.hiveplot.com/](http://www.hiveplot.com/)
+- [https://hiveplot.com/](https://hiveplot.com/)
 
 - Krzywinski M, Birol I, Jones S, Marra M (2011). Hive Plots — Rational Approach to
 Visualizing Networks. Briefings in Bioinformatics (early access 9 December 2011,
@@ -69,7 +74,7 @@ doi: 10.1093/bib/bbr069).
 
 # Contributing
 
-For more on contributing to the project, see [CONTRIBUTING.md](https://gitlab.com/geomdata/hiveplotlib/-/blob/master/CONTRIBUTING.md)
+For more on contributing to the project, see [CONTRIBUTING.md](https://gitlab.com/hiveplotlib/hiveplotlib/-/blob/master/CONTRIBUTING.md)
 
 ## Acknowledgements
 

{hiveplotlib-0.26.2 → hiveplotlib-0.28.0}/pyproject.toml

@@ -7,26 +7,26 @@ build-backend = "setuptools.build_meta"
 [project]
 name = "hiveplotlib"
 requires-python = ">=3.10"
-version = "0.26.2"
+version = "0.28.0"
 authors = [
-    {name="Gary Koplik", email="gary.koplik@geomdata.com"}
+    {name="Gary Koplik", email="gary.koplik@gmail.com"}
 ]
 description = "Visualize Network Data with Hive Plots"
 readme = "README.md"
 license = {file = "LICENSE"}
-urls = {Documentation="https://hiveplotlib.readthedocs.io/stable/", Source="https://gitlab.com/geomdata/hiveplotlib" }
+urls = {Documentation="https://hiveplotlib.readthedocs.io/stable/", Source="https://gitlab.com/hiveplotlib/hiveplotlib" }
 
 
 dependencies = [
     "matplotlib",
     "numpy",
-    "pandas"
+    "pandas",
 ]
 
 [project.optional-dependencies]
 
 bokeh = [
-    "bokeh"
+    "bokeh>=3.0.0"
 ]
 
 datashader = [
@@ -38,24 +38,24 @@ datashader = [
 
 # developer dependencies
 dev = [
-    "bokeh",
     "cartopy",
-    "dask[dataframe]",  # https://github.com/holoviz/datashader/issues/1319
-    "datashader",
     "flexitext",
     "geopandas",
-    "holoviews",
+    "hiveplotlib[bokeh]",
+    "hiveplotlib[datashader]",
+    "hiveplotlib[holoviews]",
+    "hiveplotlib[networkx]",
+    "hiveplotlib[plotly]",
+    "holoviews>=1.15",
     "jupyter",
-    "networkx",
-    "numba>0.54.0",  # https://github.com/numba/numba/issues/9708
-    "plotly",
+    "nx-parallel",  # CI-testable networkx dispatch backend for `graph_metric_backend` tests
     "pybadges",
-    "seaborn",
     "tqdm",
 ]
 
 # for building documentation
 docs = [
+    "ipywidgets",  # so nbsphinx can handle notebooks with widget metadata (e.g. tqdm progress bars)
     "myst-parser",
     "nbsphinx",
     "pydata-sphinx-theme",
@@ -65,13 +65,21 @@ docs = [
 ]
 
 holoviews = [
-    "bokeh",
-    "holoviews",
+    "bokeh>=3.0.0",
+    "holoviews>=1.15",
     "numba>0.54.0",  # https://github.com/numba/numba/issues/9708
 ]
 
 networkx = [
-    "networkx"
+    "networkx",
+    "scipy",  # for some graph feature computations
+]
+
+# performance profiling extras
+perf = [
+    "pyinstrument",
+    "snakeviz",
+    "memory_profiler",
 ]
 
 plotly = [
@@ -80,7 +88,7 @@ plotly = [
 
 # ruff code hygeine checks
 ruff = [
-    "ruff" 
+    "ruff",
 ]
 
 testing = [
@@ -92,10 +100,23 @@ testing = [
     "toml",
 ]
 
+# ty code hygeine checks
+ty = [
+    "ty==0.0.20",  # pinning for now, 0.0.21 would require non trivial type hint changes that affect the user
+]
+
 [tool.setuptools.packages.find]
 where = ["src"]
 include = ["hiveplotlib*"]
 
+[tool.ty.src]
+exclude = [
+    "docs",
+    "examples",
+    "runners",
+    "sandbox",
+]
+
 [tool.ruff]
 # ruff performs our linting and formatting.
 # if you receive an error you don't understand, you can run `ruff rule <error code>` to learn more.

{hiveplotlib-0.26.2 → hiveplotlib-0.28.0}/src/hiveplotlib/__init__.py

@@ -10,7 +10,10 @@ from hiveplotlib.hiveplot import (  # noqa: F401
     SUPPORTED_VIZ_BACKENDS,
     BaseHivePlot,
     HivePlot,
-    hive_plot_n_axes,
+)
+from hiveplotlib.hiveplot_matrix import (  # noqa: F401
+    HPM_SUPPORTED_VIZ_BACKENDS,
+    HivePlotMatrix,
 )
 from hiveplotlib.node import Node, NodeCollection  # noqa: F401
 from hiveplotlib.p2cp import P2CP, p2cp_n_axes  # noqa: F401

{hiveplotlib-0.26.2 → hiveplotlib-0.28.0}/src/hiveplotlib/axis.py

@@ -6,6 +6,7 @@ Definition of ``Axis`` instance and helper static methods for generating and wor
 
 from typing import Hashable, Optional
 
+import numpy as np
 import pandas as pd
 
 from hiveplotlib.utils import polar2cartesian
@@ -93,7 +94,9 @@ class Axis:
         self.sorting_variable = None
 
         # hold all the cartesian coordinates, polar rho, corresponding labels, and node metadata in a pandas dataframe
-        self.node_placements = pd.DataFrame(columns=["x", "y", "unique_id", "rho"])
+        self.node_placements = pd.DataFrame(
+            columns=np.array(["x", "y", "unique_id", "rho"])
+        )
 
         # hold the current vmin and vmax used to place nodes on an axis in a ``HivePlot`` instance.
         self.vmin = None

hiveplotlib-0.28.0/src/hiveplotlib/converters.py

@@ -0,0 +1,166 @@
+# converters.py
+
+"""
+Converters from various data structures to ``hiveplotlib``-ready structures.
+"""
+
+from typing import Optional
+
+import pandas as pd
+
+from hiveplotlib import Edges, NodeCollection
+
+try:
+    import networkx as nx
+except ImportError as ie:  # pragma: no cover
+    msg = "`networkx` dependencies not installed, but can be installed by running `pip install hiveplotlib[networkx]`"
+    raise ImportError(msg) from ie
+
+
+def networkx_to_nodes_edges(
+    graph: nx.Graph,
+    unique_id_name: str = "unique_id",
+    check_uniqueness: bool = True,
+) -> tuple[NodeCollection, Edges]:
+    """
+    Take a ``networkx`` graph and return ``hiveplotlib``-friendly data structures.
+
+    Specifically, returns a ``NodeCollection`` instance of node data and an ``Edges`` instance of
+    edge data. These outputs can be fed directly into :py:func:`~hiveplotlib.HivePlot`.
+
+    :param graph: ``networkx`` graph (any of :py:class:`~networkx.Graph`, :py:class:`~networkx.DiGraph`,
+        :py:class:`~networkx.MultiGraph`, or :py:class:`~networkx.MultiDiGraph`).
+    :param unique_id_name: name to use for unique IDs.
+    :param check_uniqueness: whether or not to check that provided ``Node`` instances have unique IDs.
+    :return: a ``(NodeCollection, Edges)`` pair of ``hiveplotlib`` data structures.
+    """
+    node_data = []
+    for node, attributes in graph.nodes(data=True):
+        node_data.append({unique_id_name: node, **attributes})
+
+    node_df = pd.DataFrame(node_data)
+    edge_df = nx.to_pandas_edgelist(graph, source="from", target="to")
+    return NodeCollection(
+        data=node_df,
+        unique_id_column=unique_id_name,
+        check_uniqueness=check_uniqueness,
+    ), Edges(data=edge_df)
+
+
+def nodes_edges_to_networkx(
+    nodes: NodeCollection,
+    edges: Edges,
+    *,
+    directed: bool = True,
+    multigraph: bool = True,
+    tag_attribute_name: str = "tag",
+    source_attribute_name: Optional[str] = None,
+) -> nx.Graph:
+    """
+    Convert a (``NodeCollection``, ``Edges``) pair to a ``networkx`` graph.
+
+    The concrete return type is determined by ``directed`` and ``multigraph``:
+
+    - ``directed=True``,  ``multigraph=True``  → :py:class:`networkx.MultiDiGraph` (default).
+    - ``directed=True``,  ``multigraph=False`` → :py:class:`networkx.DiGraph`.
+    - ``directed=False``, ``multigraph=True``  → :py:class:`networkx.MultiGraph`.
+    - ``directed=False``, ``multigraph=False`` → :py:class:`networkx.Graph`.
+
+    The defaults preserve duplicate edges faithfully and assume directed edges.
+
+    All non-(from / to) ``Edges`` DataFrame columns become edge attributes on the resulting graph. All
+    non-``unique_id_column`` node DataFrame columns become node attributes. The visualization-only attributes
+    ``node_viz_kwargs`` / ``edge_viz_kwargs`` are *not* included.
+
+    Multi-tag :py:class:`hiveplotlib.Edges`: when more than one tag is present, the original tag is written as an edge
+    attribute under ``tag_attribute_name`` (default ``"tag"``). If that name collides with an existing column on any
+    tag's edge DataFrame, a :class:`ValueError` is raised. Single-tag input does not write a tag attribute.
+
+    Optional source-row annotation: pass a string for ``source_attribute_name`` to tag each edge with a
+    ``(tag, row_index)`` tuple pointing back to its source row in the input :py:class:`hiveplotlib.Edges`. This is
+    useful for joining graph-level computations (e.g. edge metrics) back onto the original edge DataFrame (including
+    when there are multiple parallel edges in a multigraph). Default ``None`` skips this annotation.
+
+    .. note::
+        When ``multigraph=False`` but duplicate ``(from, to)`` pairs exist, ``networkx``'s :py:class:`networkx.Graph` /
+        :py:class:`networkx.DiGraph` will silently merge duplicates (last write wins). For an undirected
+        :py:class:`networkx.Graph`, reciprocal ``(a, b)`` / ``(b, a)`` rows likewise merge into a single undirected edge
+        (last write wins), so the merged edge carries only the surviving row's attributes (e.g. a ``weight``). Build
+        with ``multigraph=True`` to retain both edges as parallel edges, or pre-aggregate the weights into a single edge
+        beforehand.
+
+    :param nodes: :py:class:`hiveplotlib.NodeCollection` of node data.
+    :param edges: :py:class:`hiveplotlib.Edges` of edge data (single-tag or multi-tag).
+    :param directed: whether to return a :py:class:`networkx.DiGraph`-family graph. Default ``True``.
+    :param multigraph: whether to return a ``Multi*``-family graph. Default ``True``.
+    :param tag_attribute_name: edge-attribute name to use when storing the original tag on multi-tag inputs. Default
+        ``"tag"``.
+    :param source_attribute_name: optional edge-attribute name under which to store a ``(tag, row_index)`` source-row
+        identifier for every edge, useful for joining graph-level computations back onto the original edge DataFrame.
+        Default ``None`` skips annotation.
+    :return: ``networkx`` graph (one of :py:class:`networkx.Graph`, :py:class:`networkx.DiGraph`,
+        :py:class:`networkx.MultiGraph`, or :py:class:`networkx.MultiDiGraph`).
+    :raises ValueError: if ``tag_attribute_name`` collides with an existing edge column on a multi-tag
+        :py:class:`hiveplotlib.Edges` instance.
+    :raises ValueError: if ``source_attribute_name`` is a string and collides with an existing edge column on any tag.
+    """
+    if directed and multigraph:
+        graph_class = nx.MultiDiGraph
+    elif directed:
+        graph_class = nx.DiGraph
+    elif multigraph:
+        graph_class = nx.MultiGraph
+    else:
+        graph_class = nx.Graph
+    g = graph_class()
+
+    unique_id_column = nodes.unique_id_column
+    node_attr_cols = [c for c in nodes.data.columns if c != unique_id_column]
+    if node_attr_cols:
+        attr_records = nodes.data[node_attr_cols].to_dict(orient="records")
+        g.add_nodes_from(zip(nodes.data[unique_id_column], attr_records, strict=True))
+    else:
+        g.add_nodes_from(nodes.data[unique_id_column])
+
+    from_col = edges.from_column_name
+    to_col = edges.to_column_name
+    multi_tag = len(edges._data) > 1
+
+    if multi_tag:
+        for tag, df in edges._data.items():
+            if tag_attribute_name in df.columns:
+                msg = (
+                    f"Cannot write tag attribute under name '{tag_attribute_name}' "
+                    f"because tag '{tag}' already has a column with that name. "
+                    "Pass `tag_attribute_name='<new_name>'` to choose a different "
+                    "attribute name."
+                )
+                raise ValueError(msg)
+
+    if source_attribute_name is not None:
+        for tag, df in edges._data.items():
+            if source_attribute_name in df.columns:
+                msg = (
+                    f"Cannot write source attribute under name '{source_attribute_name}' "
+                    f"because tag '{tag}' already has a column with that name. "
+                    "Pass `source_attribute_name='<new_name>'` to choose a different "
+                    "attribute name."
+                )
+                raise ValueError(msg)
+
+    for tag, df in edges._data.items():
+        edge_attr_cols = [c for c in df.columns if c not in (from_col, to_col)]
+        attr_records = (
+            df[edge_attr_cols].to_dict(orient="records")
+            if edge_attr_cols
+            else [{} for _ in range(len(df))]
+        )
+        if multi_tag:
+            for attrs in attr_records:
+                attrs[tag_attribute_name] = tag
+        if source_attribute_name is not None:
+            for attrs, row_index in zip(attr_records, df.index, strict=True):
+                attrs[source_attribute_name] = (tag, row_index)
+        g.add_edges_from(zip(df[from_col], df[to_col], attr_records, strict=True))
+
+    return g

{hiveplotlib-0.26.2 → hiveplotlib-0.28.0}/src/hiveplotlib/datasets/international_trade.py

@@ -21,7 +21,7 @@ def international_trade_data(
         roughly 300mb. However, the raw data are available at the
         `Harvard Growth Lab's website <https://doi.org/10.7910/DVN/T4CHWJ>`_, and the runner to produce the necessary
         files to use this reader function is available in the
-        `repository <https://gitlab.com/geomdata/hiveplotlib/-/blob/master/runners/make_trade_network_dataset.py>`_
+        `repository <https://gitlab.com/hiveplotlib/hiveplotlib/-/blob/master/runners/make_trade_network_dataset.py>`_
         (``make_trade_network_dataset.py``).
 
         If you are using the runner to make your own trade datasets that you will read in locally with this
@@ -52,7 +52,7 @@ def international_trade_data(
     csv_years = [i.split("_")[2] for i in csv_files]
     csv_hs92 = [i.split("_")[-1] for i in csv_files]
     hiveplotlib_supported_values = pd.DataFrame(
-        np.c_[csv_years, csv_hs92], columns=["Year", "Trade Code"]
+        np.c_[csv_years, csv_hs92], columns=np.array(["Year", "Trade Code"])
     )
 
     # check that our implied data and metadata files exist