hiveplotlib 0.26.0rc1__tar.gz → 0.26.2__tar.gz

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: hiveplotlib
-Version: 0.26.0rc1
+Version: 0.26.2
 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,7 +34,7 @@ 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
@@ -48,13 +48,13 @@ 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; 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; extra == "dev"
 Requires-Dist: jupyter; extra == "dev"
 Requires-Dist: networkx; extra == "dev"
 Requires-Dist: numba>0.54.0; extra == "dev"
@@ -70,8 +70,8 @@ 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; extra == "holoviews"
+Requires-Dist: holoviews; extra == "holoviews"
 Requires-Dist: numba>0.54.0; extra == "holoviews"
 Provides-Extra: networkx
 Requires-Dist: networkx; extra == "networkx"

{hiveplotlib-0.26.0rc1 → hiveplotlib-0.26.2}/pyproject.toml

@@ -6,8 +6,8 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "hiveplotlib"
-requires-python = ">=3.9"
-version = "0.26.0rc1"
+requires-python = ">=3.10"
+version = "0.26.2"
 authors = [
     {name="Gary Koplik", email="gary.koplik@geomdata.com"}
 ]
@@ -38,13 +38,13 @@ datashader = [
 
 # developer dependencies
 dev = [
-    "bokeh<3.7.0",  # to maintain holoviews compatibility (see note below)
+    "bokeh",
     "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",
     "jupyter",
     "networkx",
     "numba>0.54.0",  # https://github.com/numba/numba/issues/9708
@@ -65,8 +65,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",
+    "holoviews",
     "numba>0.54.0",  # https://github.com/numba/numba/issues/9708
 ]
 
@@ -121,32 +121,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.0rc1 → hiveplotlib-0.26.2}/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.0rc1 → hiveplotlib-0.26.2}/src/hiveplotlib/datasets/international_trade.py

@@ -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

{hiveplotlib-0.26.0rc1 → hiveplotlib-0.26.2}/src/hiveplotlib/edges.py

@@ -83,9 +83,7 @@ class Edges:
             return "hiveplotlib.Edges of 0 edges."
 
         if len(kws) == 1:
-            return (
-                f"hiveplotlib.Edges of {list(self._data.values())[0].shape[0]} edges."
-            )
+            return f"hiveplotlib.Edges of {next(iter(self._data.values())).shape[0]} edges."
 
         sizes = [self._data[kw].shape[0] for kw in kws]
         return f"hiveplotlib.Edges of {sum(sizes)} edges across {len(kws)} tags."
@@ -181,7 +179,7 @@ class Edges:
             corresponds to the tag assigned for each set of edges.
         """
         if len(self._data) == 1:
-            return list(self._data.values())[0]
+            return next(iter(self._data.values()))
         return self._data
 
     def add_edges(

hiveplotlib-0.26.2/src/hiveplotlib/exceptions/__init__.py

@@ -0,0 +1,6 @@
+"""
+Custom exceptions for hiveplotlib.
+"""
+
+from hiveplotlib.exceptions.hive_plot import *  # noqa: F403
+from hiveplotlib.exceptions.node import *  # noqa: F403

{hiveplotlib-0.26.0rc1 → hiveplotlib-0.26.2}/src/hiveplotlib/hiveplot.py

@@ -247,11 +247,12 @@ class BaseHivePlot:
         :return: ``None``.
         """
         if unique_ids is not None:
-            raise TypeError(
+            msg = (
                 "As of hiveplotlib>=0.26.0, `place_nodes_on_axis() now takes node subsets via the `node_df` parameter, "
                 "with support dropped for `unique_ids`. Node dataframe subsetting should be performed on the hive "
                 "plot's node dataframe, stored under the hive plot's ``nodes.data`` attribute."
             )
+            raise TypeError(msg)
         # ToDo: allow rescaling option before thresholding on min and max values (e.g. put in log scale)
 
         if node_df is None:
@@ -406,7 +407,8 @@ class BaseHivePlot:
                         self.edges.relevant_edges[axis_id_1].setdefault(axis_id_2, {})
                         self.edges.relevant_edges[axis_id_1][axis_id_2][tag] = {}
                 else:
-                    raise ValueError("Key to delete not found. No edge data deleted.")
+                    msg = "Key to delete not found. No edge data deleted."
+                    raise ValueError(msg)
             if a2_to_a1:
                 if tag in self.hive_plot_edges[axis_id_2][axis_id_1]:
                     del self.hive_plot_edges[axis_id_2][axis_id_1][tag]
@@ -415,7 +417,8 @@ class BaseHivePlot:
                         self.edges.relevant_edges[axis_id_2].setdefault(axis_id_1, {})
                         self.edges.relevant_edges[axis_id_2][axis_id_1][tag] = {}
                 else:
-                    raise ValueError("Key to delete not found. No edge data deleted.")
+                    msg = "Key to delete not found. No edge data deleted."
+                    raise ValueError(msg)
 
         # just to and from axes => kill all the connections between the two axes
         elif axis_id_2 is not None and axis_id_1 is not None:
@@ -447,9 +450,8 @@ class BaseHivePlot:
                             self.edges.relevant_edges[a0][axis_id_1] = {}
 
         else:
-            raise NotImplementedError(
-                "See the docstring for ``BaseHivePlot.reset_edges()`` for more on supported uses."
-            )
+            msg = "See the docstring for ``BaseHivePlot.reset_edges()`` for more on supported uses."
+            raise NotImplementedError(msg)
 
     def __check_unique_edge_subset_tag(
         self, tag: Hashable, from_axis_id: Hashable, to_axis_id: Hashable
@@ -465,10 +467,11 @@ class BaseHivePlot:
         :return: ``None``.
         """
         if tag in self.hive_plot_edges[from_axis_id][to_axis_id]:
-            raise ValueError(
+            msg = (
                 f"Non-unique tag ({tag}) specified from {from_axis_id} to {to_axis_id}.\n"
                 "Please provide edge subset with a new unique tag."
             )
+            raise ValueError(msg)
 
     def _find_unique_tag(
         self, from_axis_id: Hashable, to_axis_id: Hashable, bidirectional: bool = False
@@ -623,7 +626,8 @@ class BaseHivePlot:
         if a1_to_a2 and a2_to_a1 and tag is None:
             bidirectional = True
         elif not a1_to_a2 and not a2_to_a1:
-            raise ValueError("One of `a1_to_a2` or `a2_to_a1` must be true.")
+            msg = "One of `a1_to_a2` or `a2_to_a1` must be true."
+            raise ValueError(msg)
         else:
             bidirectional = False
         # axis 1 to axis 2
@@ -762,9 +766,9 @@ class BaseHivePlot:
                     "No edges specified to construct. Be sure to run the `add_edge_ids()` method first."
                 )
 
-                a1_to_a2_tag = list(self.hive_plot_edges[axis_id_1][axis_id_2].keys())[
-                    0
-                ]
+                a1_to_a2_tag = next(
+                    iter(self.hive_plot_edges[axis_id_1][axis_id_2].keys())
+                )
 
                 if len(list(self.hive_plot_edges[axis_id_1][axis_id_2].keys())) > 1:
                     a1_to_a2_failure = True
@@ -776,33 +780,36 @@ class BaseHivePlot:
                     "No edges specified to construct. Be sure to run the `add_edge_ids()` method first."
                 )
 
-                a2_to_a1_tag = list(self.hive_plot_edges[axis_id_2][axis_id_1].keys())[
-                    0
-                ]
+                a2_to_a1_tag = next(
+                    iter(self.hive_plot_edges[axis_id_2][axis_id_1].keys())
+                )
 
                 if len(list(self.hive_plot_edges[axis_id_2][axis_id_1].keys())) > 1:
                     a2_to_a1_failure = True
 
             if a1_to_a2_failure and a2_to_a1_failure:
-                raise ValueError(
+                msg = (
                     "Must specify precise `tag` to handle both `a1_to_a2=True` and `a2_to_a1=True` here. "
                     "The current tags for the specified axes are:\n"
-                    f"{axis_id_2} -> {axis_id_1: {list(self.hive_plot_edges[axis_id_2][axis_id_1].keys())}}\n"
-                    f"{axis_id_2} -> {axis_id_1: {list(self.hive_plot_edges[axis_id_2][axis_id_1].keys())}}"
+                    f"{axis_id_2} -> {axis_id_1}: {list(self.hive_plot_edges[axis_id_2][axis_id_1].keys())}\n"
+                    f"{axis_id_2} -> {axis_id_1}: {list(self.hive_plot_edges[axis_id_2][axis_id_1].keys())}"
                 )
+                raise ValueError(msg)
 
             if a1_to_a2_failure:
-                raise ValueError(
+                msg = (
                     "Must specify precise `tag` to handle `a1_to_a2=True` here. "
                     "The current tags for the specified axes are:\n"
-                    f"{axis_id_1} -> {axis_id_2: {list(self.hive_plot_edges[axis_id_1][axis_id_2].keys())}}"
+                    f"{axis_id_1} -> {axis_id_2}: {list(self.hive_plot_edges[axis_id_1][axis_id_2].keys())}"
                 )
+                raise ValueError(msg)
             if a2_to_a1_failure:
-                raise ValueError(
+                msg = (
                     "Must specify precise `tag` to handle `a2_to_a1=True` here. "
                     "The current tags for the specified axes are:\n"
-                    f"{axis_id_2} -> {axis_id_1: {list(self.hive_plot_edges[axis_id_2][axis_id_1].keys())}}"
+                    f"{axis_id_2} -> {axis_id_1}: {list(self.hive_plot_edges[axis_id_2][axis_id_1].keys())}"
                 )
+                raise ValueError(msg)
 
         else:
             a1_to_a2_tag = tag
@@ -817,10 +824,11 @@ class BaseHivePlot:
                 all_connections.append(temp_connections)
                 direction.append("a1_to_a2")
             except KeyError as ke:
-                raise KeyError(
+                msg = (
                     f"`self.edges[{axis_id_1}][{axis_id_2}][{a1_to_a2_tag}]['ids']` does not appear to exist. "
                     "It is expected you have run `self.add_edge_ids()` first for the two axes of interest."
-                ) from ke
+                )
+                raise KeyError(msg) from ke
         if a2_to_a1:
             try:
                 ids = self.hive_plot_edges[axis_id_2][axis_id_1][a2_to_a1_tag]["ids"]
@@ -828,17 +836,20 @@ class BaseHivePlot:
                 all_connections.append(temp_connections)
                 direction.append("a2_to_a1")
             except KeyError as ke:
-                raise KeyError(
+                msg = (
                     f"`self.edges[{axis_id_2}][{axis_id_1}][{a2_to_a1_tag}]['ids']` does not appear to exist. "
                     "It is expected you have run `self.add_edge_ids()` first for the two axes of interest."
-                ) from ke
+                )
+                raise KeyError(msg) from ke
 
         if len(all_connections) == 0:
-            raise ValueError("One of `a1_to_a2` or `a2_to_a1` must be true.")
+            msg = "One of `a1_to_a2` or `a2_to_a1` must be true."
+            raise ValueError(msg)
 
         for connections, edge_direction in zip(
             all_connections,
             direction,
+            strict=True,
         ):
             # left join the flattened start and stop values array with the cartesian and polar node locations
             #  Note: sorting behavior is not cooperating, so needed a trivial np.arange to re-sort at end
@@ -1113,9 +1124,9 @@ class BaseHivePlot:
                         a1_to_a2 = False
 
                     else:
-                        a1_to_a2_tag = list(
-                            self.hive_plot_edges[axis_id_1][axis_id_2].keys()
-                        )[0]
+                        a1_to_a2_tag = next(
+                            iter(self.hive_plot_edges[axis_id_1][axis_id_2].keys())
+                        )
 
                         if (
                             len(list(self.hive_plot_edges[axis_id_1][axis_id_2].keys()))
@@ -1166,9 +1177,9 @@ class BaseHivePlot:
                         a2_to_a1 = False
 
                     else:
-                        a2_to_a1_tag = list(
-                            self.hive_plot_edges[axis_id_2][axis_id_1].keys()
-                        )[0]
+                        a2_to_a1_tag = next(
+                            iter(self.hive_plot_edges[axis_id_2][axis_id_1].keys())
+                        )
 
                         if (
                             len(list(self.hive_plot_edges[axis_id_2][axis_id_1].keys()))
@@ -1190,24 +1201,27 @@ class BaseHivePlot:
                     a2_to_a1 = False
 
             if a1_to_a2_failure and a2_to_a1_failure:
-                raise ValueError(
+                msg = (
                     "Must specify precise `tag` to handle both `a1_to_a2=True` and `a2_to_a1=True` here. "
                     "The current tags for the specified axes are:\n"
                     f"{axis_id_2} -> {axis_id_1}: {list(self.hive_plot_edges[axis_id_2][axis_id_1].keys())}\n"
                     f"{axis_id_2} -> {axis_id_1}: {list(self.hive_plot_edges[axis_id_2][axis_id_1].keys())}"
                 )
+                raise ValueError(msg)
             if a1_to_a2_failure:
-                raise ValueError(
+                msg = (
                     "Must specify precise `tag` to handle `a1_to_a2=True` here. "
                     "The current tags for the specified axes are:\n"
                     f"{axis_id_1} -> {axis_id_2}: {list(self.hive_plot_edges[axis_id_1][axis_id_2].keys())}"
                 )
+                raise ValueError(msg)
             if a2_to_a1_failure:
-                raise ValueError(
+                msg = (
                     "Must specify precise `tag` to handle `a2_to_a1=True` here. "
                     "The current tags for the specified axes are:\n"
                     f"{axis_id_2} -> {axis_id_1}: {list(self.hive_plot_edges[axis_id_2][axis_id_1].keys())}"
                 )
+                raise ValueError(msg)
 
         else:
             a1_to_a2_tag = tag
@@ -1219,6 +1233,7 @@ class BaseHivePlot:
             [a1_to_a2, a2_to_a1],
             [[axis_id_1, axis_id_2], [axis_id_2, axis_id_1]],
             [a1_to_a2_tag, a2_to_a1_tag],
+            strict=True,
         ):
             if direction:
                 if axis_ids[0] not in self.hive_plot_edges:
@@ -1241,7 +1256,7 @@ class BaseHivePlot:
                 axes.append([axis_ids[0], axis_ids[1]])
                 tags.append(t)
         # store the kwargs
-        for [a1, a2], t in zip(axes, tags):
+        for [a1, a2], t in zip(axes, tags, strict=True):
             if (
                 reset_existing_kwargs
                 and "edge_kwargs" in self.hive_plot_edges[a1][a2][t]
@@ -1544,7 +1559,7 @@ class HivePlot(BaseHivePlot):
         sorting_variables: Union[Hashable, Dict[Hashable, Hashable]],
         backend: SUPPORTED_VIZ_BACKENDS = "matplotlib",  # type: ignore
         repeat_axes: Union[bool, Hashable, List[Hashable]] = False,
-        axes_order: Union[bool, List[Hashable]] = None,
+        axes_order: Union[bool, List[Hashable]] | None = None,
         rotation: float = 0,
         angle_between_repeat_axes: float = 40,
         axis_kwargs: Optional[Dict[Hashable, Dict]] = None,
@@ -1625,9 +1640,8 @@ class HivePlot(BaseHivePlot):
         if axis_kwargs is not None:
             for ax in axis_kwargs:
                 if ax not in valid_keys:
-                    raise InvalidAxisNameError(
-                        f"{ax} not in partition variables {valid_keys}."
-                    )
+                    msg = f"{ax} not in partition variables {valid_keys}."
+                    raise InvalidAxisNameError(msg)
                 self.update_axis(
                     axis_id=ax,
                     **axis_kwargs[ax],
@@ -1778,10 +1792,11 @@ class HivePlot(BaseHivePlot):
         if check_repeat_in_name and any(
             i[-7:] == "_repeat" for i in proposed_axes if isinstance(i, str)
         ):
-            raise RepeatInPartitionAxisNameError(
+            msg = (
                 "Proposed axes names must never end with '_repeat', as this naming is reserved for repeat axes. "
                 f"Current names being generated parititioning with variable {self.partition_variable}: {proposed_axes}."
             )
+            raise RepeatInPartitionAxisNameError(msg)
 
     def set_repeat_axes(
         self,
@@ -1903,15 +1918,15 @@ class HivePlot(BaseHivePlot):
                 else:  # pragma: no cover
                     # if no sorting variable is specified, raise an error
                     # but this should be impossible to get to in the code
-                    raise MissingSortingVariableError(
+                    msg = (
                         f"Repeat axis {repeat_axis_name} has no sorting variable specified.\n"
                         f"This should be impossible to hit! We'd appreciate if you could file a bug report here:\n"
                         "https://gitlab.com/geomdata/hiveplotlib/-/issues/new"
                     )
+                    raise MissingSortingVariableError(msg)
         else:  # pragma: no cover
-            raise NotImplementedError(
-                "Unsupported format for `sorting_variables` parameter."
-            )
+            msg = "Unsupported format for `sorting_variables` parameter."
+            raise NotImplementedError(msg)
         self.update_sorting_variables(
             sorting_variables=sorting_variables_dict,
             build_hive_plot=False,
@@ -1982,7 +1997,7 @@ class HivePlot(BaseHivePlot):
         """
         if not isinstance(sorting_variables, dict):
             # if specifying same sorting variable for all axes, also propagate to the collapsed group axis name
-            axes_to_update = list(self.axes.keys()) + [self.collapsed_group_axis_name]
+            axes_to_update = [*list(self.axes.keys()), self.collapsed_group_axis_name]
             original_sorting_variable = sorting_variables
             sorting_variables = {
                 k: original_sorting_variable for k, _ in self.partition
@@ -1997,10 +2012,11 @@ class HivePlot(BaseHivePlot):
         # make sure all the sorting variables are valid before assigning new `sorting_variables` attribute
         for k in sorting_variables:
             if sorting_variables[k] not in self.nodes.data.columns:
-                raise InvalidSortingVariableError(
+                msg = (
                     f"Invalid `sorting_variables` ('{sorting_variables[k]}') provided for axis {k}, "
                     f"must be column of node data: {self.nodes.data.columns.to_list()}"
                 )
+                raise InvalidSortingVariableError(msg)
 
         # otherwise, double check we have valid axis values
         proposed_axes = list(sorting_variables.keys())
@@ -2017,11 +2033,12 @@ class HivePlot(BaseHivePlot):
             set(self.sorting_variables.keys())
         )
         if len(missing_axes) > 0:
-            raise MissingSortingVariableError(
+            msg = (
                 f"Provided `sorting_variables` axes {list(proposed_axes)} do not cover *all* the necessary axes "
                 f"specified by the current partition: ({list(expected_axes_names)}).\n"
                 f"The following axes specifications must be included: {list(missing_axes)}"
             )
+            raise MissingSortingVariableError(msg)
 
         update_axis_kwargs = {}
         if reset_vmin_and_vmax:
@@ -2057,10 +2074,11 @@ class HivePlot(BaseHivePlot):
         :return: ``None``.
         """
         if partition_variable not in self.nodes.data.columns:
-            raise InvalidPartitionVariableError(
+            msg = (
                 f"Invalid `partition_variable` ('{partition_variable}') provided, "
                 f"must be column of node data: {self.nodes.data.columns.to_list()}"
             )
+            raise InvalidPartitionVariableError(msg)
 
         partition = self.nodes.data.groupby(partition_variable)
 
@@ -2260,21 +2278,23 @@ class HivePlot(BaseHivePlot):
         )
 
         if unacceptable_names:
-            raise InvalidAxesOrderError(
+            msg = (
                 "Axes order set with incorrect names "
                 f"for the current partition variable {self.partition_variable}.\n"
                 f"Axes names that must be provided (in any order): {list(valid_names)}.\n"
                 "(Can also include `None` to collapse any unspecifed groups from the partition into a single axis.)\n"
                 f"Names provided: {list(axes)}."
             )
+            raise InvalidAxesOrderError(msg)
 
         if None in axes:
             unspecified_axes = set(valid_names).difference(set(axes))
             if len(unspecified_axes) == 0:
-                raise InvalidAxesOrderError(
+                msg = (
                     "Provided `None` in for axes order, but no unspecified axes to collapse onto this 'Other' axis.\n"
                     f"Axes order names provided: {list(axes)}."
                 )
+                raise InvalidAxesOrderError(msg)
 
             if collapsed_group_axis_name is not None:
                 self.collapsed_group_axis_name = collapsed_group_axis_name
@@ -2309,10 +2329,11 @@ class HivePlot(BaseHivePlot):
                 check_collapsed_group_sorting_variable
                 and self.collapsed_group_axis_name not in self.sorting_variables
             ):
-                raise MissingSortingVariableError(
+                msg = (
                     f"Sorting variable for collapsed group axis {self.collapsed_group_axis_name} not provided and "
                     f"not available in the current sorting variables: {self.sorting_variables}"
                 )
+                raise MissingSortingVariableError(msg)
 
             # use new name for axes downstream
             axes = [
@@ -2324,12 +2345,13 @@ class HivePlot(BaseHivePlot):
             # if we are requiring all partition names, then make sure we have all of them
             missing_partition_names = set(valid_names).difference(set(axes))
             if len(missing_partition_names) > 0:
-                raise InvalidAxesOrderError(
+                msg = (
                     f"Provided axes order {list(axes)} does not include all partition names: {list(valid_names)}.\n"
                     f"Missing partition names: {list(missing_partition_names)}.\n"
                     "If you want to only show a subset of the partition names, then run set_partition() with the "
                     "desired `axes_order`."
                 )
+                raise InvalidAxesOrderError(msg)
 
         # preserve original hive plot edges info so we can bring back the user-provided kwargs if desired
         original_edge_info = deepcopy(self.hive_plot_edges)
@@ -2520,9 +2542,8 @@ class HivePlot(BaseHivePlot):
         :return: ``None``.
         """
         if backend not in get_args(SUPPORTED_VIZ_BACKENDS):
-            raise InvalidVizBackendError(
-                f"Requested backend '{backend}' not among supported backends {get_args(SUPPORTED_VIZ_BACKENDS)}."
-            )
+            msg = f"Requested backend '{backend}' not among supported backends {get_args(SUPPORTED_VIZ_BACKENDS)}."
+            raise InvalidVizBackendError(msg)
         self.backend = backend
 
         return
@@ -2622,10 +2643,11 @@ class HivePlot(BaseHivePlot):
             partition_id_1 not in valid_partition_variables
             or partition_id_2 not in valid_partition_variables
         ):
-            raise InvalidPartitionVariableError(
+            msg = (
                 "Invalid partition variables (`partition_id_1` or `partition_id_2`) provided. "
                 f"Must be one of: {valid_partition_variables}."
             )
+            raise InvalidPartitionVariableError(msg)
 
         # default params will come from original settings
         edges_instantiation_params = {
@@ -2656,11 +2678,10 @@ class HivePlot(BaseHivePlot):
                     and len(self.hive_plot_edges[p1][p2]) > 0
                 ):
                     if len(self.hive_plot_edges[p1][p2]) > 1 and tag is None:
-                        raise UnspecifiedTagError(
-                            "`tag` must be specified when there are multiple tags."
-                        )
+                        msg = "`tag` must be specified when there are multiple tags."
+                        raise UnspecifiedTagError(msg)
                     if tag is None:
-                        tag = list(self.hive_plot_edges[p1][p2].keys())[0]
+                        tag = next(iter(self.hive_plot_edges[p1][p2].keys()))
                     if (
                         tag in self.hive_plot_edges[p1][p2]
                         and "curves" in self.hive_plot_edges[p1][p2][tag]
@@ -2827,10 +2848,11 @@ class HivePlot(BaseHivePlot):
 
         if sorting_variable is not None:
             if sorting_variable not in self.nodes.data.columns:
-                raise InvalidSortingVariableError(
+                msg = (
                     f"Invalid `sorting_variable` ('{sorting_variable}') provided for axis {axis_id}, "
                     f"must be column of node data: {self.nodes.data.columns.to_list()}"
                 )
+                raise InvalidSortingVariableError(msg)
             # old edges with axis invalid if user changed sorting variable
             self.reset_edges(axis_id_1=axis_id)
             node_placement_params["sorting_feature_to_use"] = sorting_variable
@@ -3494,11 +3516,12 @@ class HivePlot(BaseHivePlot):
         if order_values != expected_values or len(order) != len(
             self._edge_kwarg_hierarchy
         ):
-            raise InvalidEdgeKwargHierarchyError(
+            msg = (
                 "Invalid provided `order` to `HivePlot.edge_kwarg_hierarchy`.\n"
                 "All of the following values must be provided exactly once:\n"
                 f"{list(self.edge_plotting_keyword_arguments.keys())}"
             )
+            raise InvalidEdgeKwargHierarchyError(msg)
 
         self._edge_kwarg_hierarchy = list(order)
 
@@ -3708,7 +3731,7 @@ def hive_plot_n_axes(
     axes_assignments: List[List[Union[Hashable, None]]],
     sorting_variables: List[Hashable],
     nodes: Union[NodeCollection, List[Node]] = None,
-    node_list: list[Node] = None,
+    node_list: list[Node] | None = None,
     axes_names: Optional[List[Hashable]] = None,
     repeat_axes: Optional[List[bool]] = None,
     vmins: Optional[List[float]] = None,

{hiveplotlib-0.26.0rc1 → hiveplotlib-0.26.2}/src/hiveplotlib/node.py

@@ -156,10 +156,11 @@ class NodeCollection:
             len(np.unique(self.data[self.unique_id_column].values))
             != self.data.shape[0]
         ):
-            raise RepeatUniqueNodeIDsError(
+            msg = (
                 "Found repeat unique IDs:\n"
                 f"{self.data[self.data.duplicated(subset=self.unique_id_column, keep=False)]}"
             )
+            raise RepeatUniqueNodeIDsError(msg)
         self.node_viz_kwargs = {} if node_viz_kwargs is None else node_viz_kwargs.copy()
 
     def copy(self) -> "NodeCollection":
@@ -217,10 +218,11 @@ class NodeCollection:
             protected name for internal use.
         """
         if data_column not in self.data.columns:
-            raise InvalidPartitionVariableError(
+            msg = (
                 f"Invalid `partition_variable` ({data_column}) provided, "
                 f"must be column of node data: {self.data.columns.to_list()}"
             )
+            raise InvalidPartitionVariableError(msg)
         if partition_variable_name is None:
             i = 0
             # keep trying new names til we get a unique one
@@ -231,9 +233,8 @@ class NodeCollection:
                 i += 1
         else:
             if partition_variable_name.endswith("_collapsed_axis"):
-                raise InvalidPartitionVariableError(
-                    "Cannot use partition variable name ending in `_collapsed_axis`."
-                )
+                msg = "Cannot use partition variable name ending in `_collapsed_axis`."
+                raise InvalidPartitionVariableError(msg)
 
         # int cutoffs dictates quantile cut, otherwise cut
         if not isinstance(cutoffs, int):

{hiveplotlib-0.26.0rc1 → hiveplotlib-0.26.2}/src/hiveplotlib/p2cp.py

@@ -203,6 +203,7 @@ class P2CP:
             axis_kwargs,
             vmins,
             vmaxes,
+            strict=True,
         ):
             if c in self.axes:
                 c += "\nRepeat"
@@ -394,8 +395,8 @@ class P2CP:
         # want to loop over the nested tags, not the axes like with hive plots
         #  (since every point in a tag is a complete loop)
         #  so let's just grab the first axis pair we can find and grab those tags, then loop over the tags instead
-        temp_first_axis = list(edge_info.keys())[0]
-        temp_second_axis = list(edge_info[temp_first_axis].keys())[0]
+        temp_first_axis = next(iter(edge_info.keys()))
+        temp_second_axis = next(iter(edge_info[temp_first_axis].keys()))
 
         for tag in edge_info[temp_first_axis][temp_second_axis]:
             new_dict[tag] = {}

{hiveplotlib-0.26.0rc1 → hiveplotlib-0.26.2}/src/hiveplotlib/viz/base.py

@@ -146,9 +146,8 @@ def edge_viz_preparation(
                             stacklevel=3,
                         )
                     else:  # pragma: no cover
-                        raise NotImplementedError(
-                            "No instances should ever reach this point..."
-                        )
+                        msg = "No instances should ever reach this point..."
+                        raise NotImplementedError(msg)
                 # only warn once per tag over all axes
                 elif name == "P2CP" and tag not in already_warned_p2cp_tags:
                     warnings.warn(
@@ -218,10 +217,11 @@ def hover_input_check(
         if pd.api.types.is_list_like(hover):
             for h in hover:
                 if h not in ["nodes", "edges", "axes"]:
-                    raise InvalidHoverVariableError(
+                    msg = (
                         "Hover information is only supported for `'nodes'`, `'axes'`, and / or `'edges'` "
                         f"(provided values: {hover})"
                     )
+                    raise InvalidHoverVariableError(msg)
     return
 
 

{hiveplotlib-0.26.0rc1 → hiveplotlib-0.26.2}/src/hiveplotlib/viz/bokeh.py

@@ -8,9 +8,8 @@ try:
     from bokeh.models import ColumnDataSource, Label, Range1d
     from bokeh.plotting import figure
 except ImportError as ie:  # pragma: no cover
-    raise ImportError(
-        "bokeh not installed, but can be installed by running `pip install hiveplotlib[bokeh]`"
-    ) from ie
+    msg = "bokeh not installed, but can be installed by running `pip install hiveplotlib[bokeh]`"
+    raise ImportError(msg) from ie
 
 import warnings
 from typing import Hashable, List, Literal, Optional, Union
@@ -606,7 +605,7 @@ def edge_viz(
                     hive_plot.edges.to_column_name,
                 ]
                 else ""
-                for i in hive_plot.edges._data[list(tags_to_plot)[0]].columns
+                for i in hive_plot.edges._data[next(iter(tags_to_plot))].columns
             ]
             right_arrow = "➡"
             tooltips = f"""

{hiveplotlib-0.26.0rc1 → hiveplotlib-0.26.2}/src/hiveplotlib/viz/datashader.py

@@ -21,10 +21,11 @@ try:
     import datashader as ds
     import seaborn as sns
 except ImportError as ie:  # pragma: no cover
-    raise ImportError(
+    msg = (
         "Datashader or seaborn not installed, but can be installed by running "
         "`pip install hiveplotlib[datashader]`"
-    ) from ie
+    )
+    raise ImportError(msg) from ie
 
 
 def datashade_edges_mpl(

{hiveplotlib-0.26.0rc1 → hiveplotlib-0.26.2}/src/hiveplotlib/viz/holoviews.py

@@ -4,16 +4,13 @@
 Currently, ``hiveplotlib`` supports a ``bokeh`` and ``matplotlib`` backend for ``holoviews``.
 """
 
-# __all__ = []
-
 try:
     import holoviews as hv
     from bokeh.models import HoverTool
     from holoviews import dim
 except ImportError as ie:  # pragma: no cover
-    raise ImportError(
-        "`holoviews` not installed, but can be installed by running `pip install hiveplotlib[holoviews]`"
-    ) from ie
+    msg = "`holoviews` not installed, but can be installed by running `pip install hiveplotlib[holoviews]`"
+    raise ImportError(msg) from ie
 
 import warnings
 from typing import Hashable, List, Literal, Optional, Union, get_args
@@ -262,7 +259,7 @@ def axes_viz(
         kdims=[original_to_sanitized_map[i] for i in ["x_0", "y_0", "x_1", "y_1"]],
         vdims=[
             original_to_sanitized_map[i]
-            for i in ["long_name"] + list(axis_metadata_variables)
+            for i in ["long_name", *list(axis_metadata_variables)]
             if i not in ["x_0", "x_1", "y_0", "y_1"]
         ],
     ).opts(
@@ -647,10 +644,13 @@ def edge_viz(
                         | hive_plot.hive_plot_edges[a0][a1][tag]["edge_kwargs"]
                     )
                     if backend == "bokeh" and "line_color" in final_edge_kwargs:
-                        raise ValueError(
+                        msg = (
                             "Hiveplotlib does not support using the 'line_color' parameter"
                             " with the `holoviews-bokeh` backend. "
-                            "Please switch to using the 'color' parameter instead.",
+                            "Please switch to using the 'color' parameter instead."
+                        )
+                        raise ValueError(
+                            msg,
                         )
                     # if any kwarg value corresponds to an edge data column name, use the edge data values
                     keys_vals = final_edge_kwargs.copy().items()
@@ -693,7 +693,9 @@ def edge_viz(
                         ]
                         contours = [
                             {"x": x, "y": y, **data_dict}
-                            for (x, y, data_dict) in zip(xs, ys, data_dicts)
+                            for (x, y, data_dict) in zip(
+                                xs, ys, data_dicts, strict=True
+                            )
                         ]
 
                         # HACK: solution to https://github.com/holoviz/holoviews/issues/6469 for the moment
@@ -740,7 +742,7 @@ def edge_viz(
                     hive_plot.edges.to_column_name,
                 ]
                 else ""
-                for i in hive_plot.edges._data[list(tags_to_plot)[0]].columns
+                for i in hive_plot.edges._data[next(iter(tags_to_plot))].columns
             ]
             right_arrow = "➡"
             tooltips = f"""

{hiveplotlib-0.26.0rc1 → hiveplotlib-0.26.2}/src/hiveplotlib/viz/input_checks.py

@@ -41,9 +41,8 @@ def input_check(
         hive_plot = instance._hiveplot
         name = "P2CP"
     else:
-        raise NotImplementedError(
-            "Can only handle `HivePlot`, `BaseHivePlot`, and `P2CP` instances"
-        )
+        msg = "Can only handle `HivePlot`, `BaseHivePlot`, and `P2CP` instances"
+        raise NotImplementedError(msg)
 
     warning_raised = False
 
@@ -124,8 +123,7 @@ def input_check(
                         )
                     warning_raised = True
     else:  # pragma: no cover
-        raise NotImplementedError(
-            f"`objects_to plot` must be one of 'axes', 'edges', or 'nodes', but user provided '{objects_to_plot}'."
-        )
+        msg = f"`objects_to plot` must be one of 'axes', 'edges', or 'nodes', but user provided '{objects_to_plot}'."
+        raise NotImplementedError(msg)
 
     return hive_plot, name, warning_raised

{hiveplotlib-0.26.0rc1 → hiveplotlib-0.26.2}/src/hiveplotlib/viz/matplotlib.py

@@ -58,7 +58,7 @@ def _matplotlib_fig_setup(
         fig, ax = plt.subplots(**fig_kwargs)
 
     if center_plot and hive_plot.max_polar_end is not None:
-        ax.axis("equal")
+        ax.set_aspect("equal", adjustable="box")
         # center plot at (0, 0)
         max_radius = hive_plot.max_polar_end
         # throw in a minor buffer

{hiveplotlib-0.26.0rc1 → hiveplotlib-0.26.2}/src/hiveplotlib/viz/plotly.py

@@ -7,9 +7,8 @@
 try:
     import plotly.graph_objects as go
 except ImportError as ie:  # pragma: no cover
-    raise ImportError(
-        "plotly not installed, but can be installed by running `pip install hiveplotlib[plotly]`"
-    ) from ie
+    msg = "plotly not installed, but can be installed by running `pip install hiveplotlib[plotly]`"
+    raise ImportError(msg) from ie
 
 import warnings
 from typing import Hashable, List, Literal, Optional, Union

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: hiveplotlib
-Version: 0.26.0rc1
+Version: 0.26.2
 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,7 +34,7 @@ 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
@@ -48,13 +48,13 @@ 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; 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; extra == "dev"
 Requires-Dist: jupyter; extra == "dev"
 Requires-Dist: networkx; extra == "dev"
 Requires-Dist: numba>0.54.0; extra == "dev"
@@ -70,8 +70,8 @@ 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; extra == "holoviews"
+Requires-Dist: holoviews; extra == "holoviews"
 Requires-Dist: numba>0.54.0; extra == "holoviews"
 Provides-Extra: networkx
 Requires-Dist: networkx; extra == "networkx"

{hiveplotlib-0.26.0rc1 → hiveplotlib-0.26.2}/src/hiveplotlib.egg-info/requires.txt

@@ -12,13 +12,13 @@ numba>0.54.0
 seaborn
 
 [dev]
-bokeh<3.7.0
+bokeh
 cartopy
 dask[dataframe]
 datashader
 flexitext
 geopandas
-holoviews<1.20.2
+holoviews
 jupyter
 networkx
 numba>0.54.0
@@ -36,8 +36,8 @@ sphinx-copybutton
 toml
 
 [holoviews]
-bokeh<3.7.0
-holoviews<1.20.2
+bokeh
+holoviews
 numba>0.54.0
 
 [networkx]

hiveplotlib-0.26.0rc1/src/hiveplotlib/exceptions/__init__.py

@@ -1,6 +0,0 @@
-"""
-Custom exceptions for hiveplotlib.
-"""
-
-from hiveplotlib.exceptions.hive_plot import *  # noqa: F401, F403
-from hiveplotlib.exceptions.node import *  # noqa: F401, F403