From 2372fff18a19ffe8c3bd177277b6d8d505d3cd6b Mon Sep 17 00:00:00 2001 From: "ryan.danehy@pnnl.gov" Date: Fri, 6 Dec 2024 10:43:02 -0800 Subject: [PATCH 1/3] adding hotfix --- docs/source/algorithms/algorithms.rst | 8 ++++++++ hypernetx/classes/hypergraph.py | 2 +- hypernetx/classes/property_store.py | 2 +- 3 files changed, 10 insertions(+), 2 deletions(-) diff --git a/docs/source/algorithms/algorithms.rst b/docs/source/algorithms/algorithms.rst index 7e160c16..891a77bb 100644 --- a/docs/source/algorithms/algorithms.rst +++ b/docs/source/algorithms/algorithms.rst @@ -44,6 +44,14 @@ algorithms.laplacians\_clustering module :undoc-members: :show-inheritance: +algorithms.matching\_algorithms module +-------------------------------------- + +.. automodule:: algorithms.matching_algorithms + :members: + :undoc-members: + :show-inheritance: + algorithms.s\_centrality\_measures module ----------------------------------------- diff --git a/hypernetx/classes/hypergraph.py b/hypernetx/classes/hypergraph.py index e66cfe8c..9ac21b89 100644 --- a/hypernetx/classes/hypergraph.py +++ b/hypernetx/classes/hypergraph.py @@ -389,7 +389,7 @@ def __init__( 1, weight_col=node_weight_prop_col, default_weight=default_node_weight, - misc_properties_col=misc_node_properties_col, + misc_properties_col=misc_properties_col, ) node_propertystore = PropertyStore( ndfp, default_weight=default_node_weight diff --git a/hypernetx/classes/property_store.py b/hypernetx/classes/property_store.py index af787c90..e0be79a7 100644 --- a/hypernetx/classes/property_store.py +++ b/hypernetx/classes/property_store.py @@ -233,7 +233,7 @@ def set_defaults(self, defaults) -> None: else: def grabprop(cell): - return cell.get(k, v) + return cell.pop(k, v) self._data[k] = self._data["misc_properties"].map(grabprop) new_cols.append(k) From 52c92abedffe46d91b589080740251333027476c Mon Sep 17 00:00:00 2001 From: "ryan.danehy@pnnl.gov" Date: Fri, 6 Dec 2024 10:53:33 -0800 Subject: [PATCH 2/3] fix a missing line --- hypernetx/classes/hypergraph.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hypernetx/classes/hypergraph.py b/hypernetx/classes/hypergraph.py index 9ac21b89..02d44cc3 100644 --- a/hypernetx/classes/hypergraph.py +++ b/hypernetx/classes/hypergraph.py @@ -370,7 +370,7 @@ def __init__( 0, weight_col=edge_weight_prop_col, default_weight=default_edge_weight, - misc_properties_col=misc_edge_properties_col, + misc_properties_col=misc_properties_col, ) edge_propertystore = PropertyStore( edfp, default_weight=default_edge_weight From d625f2abc7ef6e7f4ab417a47177d77523e06788 Mon Sep 17 00:00:00 2001 From: "ryan.danehy@pnnl.gov" Date: Fri, 6 Dec 2024 11:05:49 -0800 Subject: [PATCH 3/3] =?UTF-8?q?bump:=20version=202.3.8=20=E2=86=92=202.3.9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .cz.toml | 2 +- docs/source/conf.py | 2 +- hypernetx/__init__.py | 2 +- pyproject.toml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.cz.toml b/.cz.toml index 45c84afd..0cd719aa 100644 --- a/.cz.toml +++ b/.cz.toml @@ -1,6 +1,6 @@ [tool.commitizen] name = "cz_conventional_commits" -version = "2.3.8" +version = "2.3.9" version_provider = "poetry" version_files = [ "pyproject.toml", diff --git a/docs/source/conf.py b/docs/source/conf.py index 52050268..a3c85161 100644 --- a/docs/source/conf.py +++ b/docs/source/conf.py @@ -19,7 +19,7 @@ import os -__version__ = "2.3.8" +__version__ = "2.3.9" # If extensions (or modules to document with autodoc) are in another directory, diff --git a/hypernetx/__init__.py b/hypernetx/__init__.py index d198b9f7..ad0c8e00 100644 --- a/hypernetx/__init__.py +++ b/hypernetx/__init__.py @@ -11,4 +11,4 @@ from hypernetx.utils import * from hypernetx.utils.toys import * -__version__ = "2.3.8" +__version__ = "2.3.9" diff --git a/pyproject.toml b/pyproject.toml index 38627341..7ee9bd40 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,6 +1,6 @@ [tool.poetry] name = "hypernetx" -version = "2.3.8" +version = "2.3.9" description = "HyperNetX is a Python library for the creation and study of hypergraphs." authors = ["Brenda Praggastis ", "Dustin Arendt ", "Sinan Aksoy ", "Emilie Purvine ",