Pull request #218: Hotfix/grabpropv2

Merge in HYP/hypernetx from hotfix/grabpropv2 to master * commit 'd625f2abc7ef6e7f4ab417a47177d77523e06788': bump: version 2.3.8 → 2.3.9 fix a missing line adding hotfix
pnnl · Dec 6, 2024 · d641ff0 · d641ff0
2 parents 0a8ec06 + d625f2a
commit d641ff0
Show file tree

Hide file tree

Showing 7 changed files with 15 additions and 7 deletions.
diff --git 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/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/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
@@ -11,4 +11,4 @@
 from hypernetx.utils import *
 from hypernetx.utils.toys import *
 
-__version__ = "2.3.8"
+__version__ = "2.3.9"
diff --git 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
@@ -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
@@ -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)

diff --git 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 <[email protected]>", "Dustin Arendt <[email protected]>",
     "Sinan Aksoy <[email protected]>", "Emilie Purvine <[email protected]>",