hiveplotlib 0.26.1__tar.gz → 0.27.0__tar.gz

{hiveplotlib-0.26.1/src/hiveplotlib.egg-info → hiveplotlib-0.27.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: hiveplotlib
-Version: 0.26.1
+Version: 0.27.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.
@@ -34,27 +34,27 @@ License: Copyright (c) 2020 - 2024, Geometric Data Analytics, Inc.
         
 Project-URL: Documentation, https://hiveplotlib.readthedocs.io/stable/
 Project-URL: Source, https://gitlab.com/geomdata/hiveplotlib
-Requires-Python: >=3.9
+Requires-Python: >=3.10
 Description-Content-Type: text/markdown
 License-File: LICENSE
 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<3.7.0; extra == "dev"
+Requires-Dist: bokeh>=3.0.0; 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<1.20.2; 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"
@@ -63,6 +63,7 @@ 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 +71,15 @@ Requires-Dist: sphinx; extra == "docs"
 Requires-Dist: sphinx-copybutton; extra == "docs"
 Requires-Dist: toml; extra == "docs"
 Provides-Extra: holoviews
-Requires-Dist: bokeh<3.7.0; extra == "holoviews"
-Requires-Dist: holoviews<1.20.2; 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"
+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,6 +91,8 @@ 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)

{hiveplotlib-0.26.1 → hiveplotlib-0.27.0}/pyproject.toml

@@ -6,8 +6,8 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "hiveplotlib"
-requires-python = ">=3.9"
-version = "0.26.1"
+requires-python = ">=3.10"
+version = "0.27.0"
 authors = [
     {name="Gary Koplik", email="gary.koplik@geomdata.com"}
 ]
@@ -20,13 +20,13 @@ urls = {Documentation="https://hiveplotlib.readthedocs.io/stable/", Source="http
 dependencies = [
     "matplotlib",
     "numpy",
-    "pandas"
+    "pandas",
 ]
 
 [project.optional-dependencies]
 
 bokeh = [
-    "bokeh"
+    "bokeh>=3.0.0"
 ]
 
 datashader = [
@@ -38,13 +38,13 @@ datashader = [
 
 # developer dependencies
 dev = [
-    "bokeh<3.7.0",  # to maintain holoviews compatibility (see note below)
+    "bokeh>=3.0.0",
     "cartopy",
     "dask[dataframe]",  # https://github.com/holoviz/datashader/issues/1319
     "datashader",
     "flexitext",
     "geopandas",
-    "holoviews<1.20.2",  # to keep from forcing bokeh 3.7 (bokeh 3.6+ dropped python 3.9 compatibility)
+    "holoviews>=1.15",
     "jupyter",
     "networkx",
     "numba>0.54.0",  # https://github.com/numba/numba/issues/9708
@@ -56,6 +56,7 @@ dev = [
 
 # 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,8 +66,8 @@ docs = [
 ]
 
 holoviews = [
-    "bokeh<3.7.0",  # to maintain holoviews compatibility (see note below)
-    "holoviews<1.20.2",  # to keep from forcing bokeh 3.7 (bokeh 3.6+ dropped python 3.9 compatibility)
+    "bokeh>=3.0.0",
+    "holoviews>=1.15",
     "numba>0.54.0",  # https://github.com/numba/numba/issues/9708
 ]
 
@@ -74,13 +75,20 @@ networkx = [
     "networkx"
 ]
 
+# performance profiling extras
+perf = [
+    "pyinstrument",
+    "snakeviz",
+    "memory_profiler",
+]
+
 plotly = [
     "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.
@@ -121,32 +142,69 @@ extend-ignore = [
     "D203",  # don't require blank line before class docstring.
     "D212",  # require docstring text starts on the next line after the triple quotes.
     "E203",  # https://black.readthedocs.io/en/stable/faq.html#why-are-flake8-s-e203-and-w503-violated
-    "PD901",  # generic `df` name for pandas dataframes will be tolerated
-    "B905",  # this is a python 3.10 convention, drop ignore when we drop 3.9 support 
 ]
 
+
+
 extend-select = [
     "A",  # use flake8-builtins (check if variable name shadows python builtin names)
     "ANN",  # use flake8-annotations (checks type annotations)
     "ARG",  # use flake8-unused-arguments (checks for unused arguments)
     "B",  # use flake8-bugbear (nice for cleaner code)
-    "C4",  # use flake8-comprehensions (remove unnecessary literals, generators, lists, etc.) 
+    "C4",  # use flake8-comprehensions (remove unnecessary literals, generators, lists, etc.)
     "D",  # use pydoc style rules
+    # "DOC",  # usepydoclinter (additional docstring checks) (commented out because in preview at last change 12/31/25)
     "E",  # use pycodestyle warnings
+    "EM",  # use flake8-errmsg (improved error messages)
+    "ERA",  # use flake8-eradicate (checks for commented out code)
+    "F",  # use pyflakes rules
     "I",  # use isort rules
     "ICN",  # use flake-import-conventions (checks that imports use standard names)
+    "INP", # use flake8-no-pep420 (disallow implicit namespace packages)
+    "ISC",  # use flake8-implicit-str-concat (checks for implicit string concatenation),
     "N",  # use pep8 naming
     "NPY",  # numpy-specific rules
     "PERF",  # linter focused on avoiding performance anti-patterns
     "PIE",  # use flake8-pie (some misc additional linting)
     "PD",  # write pandas code more in line with pd recommendations
     "PT",  # use flake8-pytest-style (linting specifically for pytest)
+    "PTH",  # use flake8-pathlib (encourages use of pathlib over os.path)
+    "Q",  # use flake8-quotes (enforce consistent quote style)
     "RET",  # use flake8-return (linting on return / raise)
+    "RSE", # use flake8-raise (checks for unnecssary parentheses in raised exceptions)
+    "RUF",  # ruff's own linting rules
     "SIM",  # use flake8-simplify (helps simplify logic in code)
+    "T20",  # use flake8-print (to prevent print statements)
+    "TC",  # use flake8-type-checking (type checking imports)
     "TID",  # use flake8-tidy-imports (to prevent relative imports)
     "W",  # use pycodestyle warnings
 ] 
 
+[tool.ruff.lint.per-file-ignores]
+
+".gitlab/*" = [
+    "INP001",  # don't require __init__.py in folder
+    "T201",  # allow print statements
+]
+
+"docs/*" = [
+    "INP001",  # don't require __init__.py in folder
+]
+
+"examples/*" = [
+    "T201",  # allow print statements
+    "T203",  # allow pprint statements
+]
+
+"runners/*" = [
+    "INP001",  # don't require __init__.py in runners
+    "T201",  # allow print statements
+]
+
+"tests/*" = [
+    "ERA001",  # allow commented out code in tests
+]
+
 [tool.ruff.lint.pydocstyle]
 convention = "pep257"
 

{hiveplotlib-0.26.1 → hiveplotlib-0.27.0}/src/hiveplotlib/__init__.py

@@ -12,5 +12,9 @@ from hiveplotlib.hiveplot import (  # noqa: F401
     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.1 → hiveplotlib-0.27.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.26.1 → hiveplotlib-0.27.0}/src/hiveplotlib/converters.py

@@ -4,22 +4,22 @@
 Converters from various data structures to ``hiveplotlib``-ready structures.
 """
 
-from typing import Tuple
-
 import pandas as pd
 
-from hiveplotlib import Edges, Node, NodeCollection
-from hiveplotlib.node import node_collection_from_node_list
+from hiveplotlib import Edges, NodeCollection
 
-# say the graph type instead of calling `nx.Graph` to keep networkx dep out of this file.
-NetworkXGraph = "networkx.classes.graph.Graph instance"
+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: NetworkXGraph,
+    graph: nx.Graph,
     unique_id_name: str = "unique_id",
     check_uniqueness: bool = True,
-) -> Tuple[NodeCollection, Edges]:  # type: ignore
+) -> tuple[NodeCollection, Edges]:
     """
     Take a ``networkx`` graph and return ``hiveplotlib``-friendly data structures.
 
@@ -31,11 +31,14 @@ def networkx_to_nodes_edges(
     :param check_uniqueness: whether or not to check that provided ``Node`` instances have unique IDs.
     :return: ``list`` of ``Node`` instances, ``(n, 2)`` ``np.ndarray`` of edges.
     """
-    nodes = [Node(unique_id=i, data=data) for i, data in list(graph.nodes.data())]
-    edge_keys = pd.DataFrame(list(graph.edges.keys()), columns=["from", "to"])
-    edge_values = pd.DataFrame(list(graph.edges.values()))
-    return node_collection_from_node_list(
-        node_list=nodes,
-        unique_id_name=unique_id_name,
+    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_keys.join(edge_values))
+    ), Edges(data=edge_df)

{hiveplotlib-0.26.1 → hiveplotlib-0.27.0}/src/hiveplotlib/datasets/__init__.py

@@ -16,6 +16,6 @@ For Polar Parallel Coordinates Plots (P2CPs), many datasets are available throug
 `scikit-learn <https://scikit-learn.org/stable/datasets.html>`_.
 """
 
-from hiveplotlib.datasets.international_trade import *  # noqa: F401, F403
-from hiveplotlib.datasets.toy_hive_plots import *  # noqa: F401, F403
-from hiveplotlib.datasets.toy_p2cps import *  # noqa: F401, F403
+from hiveplotlib.datasets.international_trade import *  # noqa: F403
+from hiveplotlib.datasets.toy_hive_plots import *  # noqa: F403
+from hiveplotlib.datasets.toy_p2cps import *  # noqa: F403

{hiveplotlib-0.26.1 → hiveplotlib-0.27.0}/src/hiveplotlib/datasets/international_trade.py

@@ -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
@@ -62,15 +62,16 @@ def international_trade_data(
     )
 
     if not (data_path.exists() and metadata_path.exists()):
-        raise ValueError(
+        msg = (
             "Could not find data and / or metadata under specified `path`. If you specified your own path, double "
             "check that the path is correct. Your file names should be "
             "If you are using `hiveplotlib` supported data, note that only the following `year`, "
             f"`hs29_code` values are supported:\n{hiveplotlib_supported_values}"
         )
+        raise ValueError(msg)
 
     data = pd.read_csv(data_path)
-    with open(metadata_path, "r") as openfile:
+    with Path(metadata_path).open("r") as openfile:
         metadata = json.load(openfile)
 
     return data, metadata