Merge pull request #5 from rkechols/fix-heap

Set 'Heap' things to use named-only args
rkechols · May 6, 2022 · 104815c · 104815c
2 parents 07eea3b + dbe6aef
commit 104815c
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 8 deletions.
diff --git a/ech_datastructures/heap.py b/ech_datastructures/heap.py
@@ -14,6 +14,7 @@ class _HeapElem(Generic[T]):
 
     def __init__(self,
                  val: T,
+                 *,
                  key: Callable[[T], Any],
                  reverse: bool):
         """
@@ -50,6 +51,7 @@ class Heap(Generic[T]):
 
     def __init__(self,
                  data: Iterable[T] = None,
+                 *,
                  key: Callable[[T], Any] = None,
                  reverse: bool = False):
         """
@@ -76,7 +78,7 @@ def __init__(self,
         if data is None:
             self._data = []
         else:
-            self._data = [_HeapElem(x, self._key, self._reverse) for x in data]
+            self._data = [_HeapElem(x, key=self._key, reverse=self._reverse) for x in data]
             heapq.heapify(self._data)
 
     @property
@@ -137,7 +139,7 @@ def add(self, new_item: T):
         -------
         None
         """
-        heapq.heappush(self._data, _HeapElem(new_item, self._key, self._reverse))
+        heapq.heappush(self._data, _HeapElem(new_item, key=self._key, reverse=self._reverse))
 
     def add_pop(self, new_item: T) -> T:
         """
@@ -152,7 +154,10 @@ def add_pop(self, new_item: T) -> T:
         -------
         T - popped item.
         """
-        return heapq.heappushpop(self._data, _HeapElem(new_item, self._key, self._reverse)).val
+        return heapq.heappushpop(
+            self._data,
+            _HeapElem(new_item, key=self._key, reverse=self._reverse)
+        ).val
 
     def pop_add(self, new_item: T) -> T:
         """
@@ -172,7 +177,10 @@ def pop_add(self, new_item: T) -> T:
         IndexError - Heap was empty at the start of the operation; nothing to pop.
         """
         try:
-            return heapq.heapreplace(self._data, _HeapElem(new_item, self._key, self._reverse)).val
+            return heapq.heapreplace(
+                self._data,
+                _HeapElem(new_item, key=self._key, reverse=self._reverse)
+            ).val
         except IndexError as e:
             raise IndexError("pop_add from empty Heap") from e
 

diff --git a/setup.py b/setup.py
@@ -7,7 +7,7 @@
 
 setup(
     name="ech-datastructures",
-    version="0.1.2",
+    version="0.1.3",
     description="Comprehensive package of Python-native datastructures.",
     long_description=readme_md,
     long_description_content_type="text/markdown",
@@ -36,9 +36,7 @@
              "util utils utility utilities",
     python_requires=">=3.8",
     packages=find_packages(
-        include=[
-            "ech_datastructures"
-        ]
+        exclude=["tests"]
     ),
     # install_requires=[],
 )