Drop py38 (#132)

Author: barrust

.github/workflows/python-package.yml

@@ -11,7 +11,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        python-version: ['3.8', '3.9', '3.10', '3.11', '3.12', '3.13']
+        python-version: ['3.9', '3.10', '3.11', '3.12', '3.13']
 
     steps:
     - uses: actions/checkout@v4

probables/__init__.py

@@ -9,7 +9,13 @@
     ExpandingBloomFilter,
     RotatingBloomFilter,
 )
-from probables.countminsketch import CountMeanMinSketch, CountMeanSketch, CountMinSketch, HeavyHitters, StreamThreshold
+from probables.countminsketch import (
+    CountMeanMinSketch,
+    CountMeanSketch,
+    CountMinSketch,
+    HeavyHitters,
+    StreamThreshold,
+)
 from probables.cuckoo import CountingCuckooFilter, CuckooFilter
 from probables.exceptions import (
     CuckooFilterFullError,
@@ -26,7 +32,7 @@
 __email__ = "barrust@gmail.com"
 __license__ = "MIT"
 __version__ = "0.6.1"
-__credits__: List[str] = []
+__credits__: list[str] = []
 __url__ = "https://github.com/barrust/pyprobables"
 __bugtrack_url__ = "https://github.com/barrust/pyprobables/issues"
 

probables/blooms/bloom.py

@@ -7,14 +7,15 @@
 import os
 from array import array
 from binascii import hexlify, unhexlify
+from collections.abc import ByteString
 from io import BytesIO, IOBase
 from mmap import mmap
 from numbers import Number
 from pathlib import Path
 from shutil import copyfile
 from struct import Struct
 from textwrap import wrap
-from typing import ByteString, Tuple, Union
+from typing import Union
 
 from probables.exceptions import InitializationError, NotSupportedError
 from probables.hashes import HashFuncT, HashResultsT, KeyT, default_fnv_1a
@@ -465,7 +466,7 @@ def jaccard_index(self, second: SimpleBloomT) -> Union[float, None]:
 
     # More private functions
     @classmethod
-    def _get_optimized_params(cls, estimated_elements: int, false_positive_rate: float) -> Tuple[float, int, int]:
+    def _get_optimized_params(cls, estimated_elements: int, false_positive_rate: float) -> tuple[float, int, int]:
         valid_prms = isinstance(estimated_elements, Number) and estimated_elements > 0
         if not valid_prms:
             msg = "Bloom: estimated elements must be greater than 0"
@@ -528,15 +529,16 @@ def _load(
         else:
             offset = self._FOOTER_STRUCT.size
             est_els, els_added, fpr, n_hashes, n_bits = self._parse_footer(
-                self._FOOTER_STRUCT, file[-1 * offset :]  # type: ignore
+                self._FOOTER_STRUCT,
+                file[-1 * offset :],  # type: ignore
             )
             self._set_values(est_els, fpr, n_hashes, n_bits, hash_function)
             # now read in the bit array!
             self._parse_bloom_array(file, self._IMPT_STRUCT.size * self.bloom_length)  # type: ignore
             self._els_added = els_added
 
     @classmethod
-    def _parse_footer(cls, stct: Struct, d: ByteString) -> Tuple[int, int, float, int, int]:
+    def _parse_footer(cls, stct: Struct, d: ByteString) -> tuple[int, int, float, int, int]:
         """parse footer returning the data: estimated elements, elements added,
         false positive rate, hash function, number hashes, number bits"""
         e_elms, e_added, fpr = stct.unpack_from(bytearray(d))

probables/blooms/countingbloom.py

@@ -4,9 +4,10 @@
     URL: https://github.com/barrust/counting_bloom
 """
 from array import array
+from collections.abc import ByteString
 from pathlib import Path
 from struct import Struct
-from typing import ByteString, Union
+from typing import Union
 
 from probables.blooms.bloom import BloomFilter
 from probables.constants import UINT32_T_MAX, UINT64_T_MAX

probables/blooms/expandingbloom.py

@@ -5,11 +5,12 @@
 """
 
 from array import array
+from collections.abc import ByteString
 from io import BytesIO, IOBase
 from mmap import mmap
 from pathlib import Path
 from struct import Struct
-from typing import ByteString, Tuple, Union
+from typing import Union
 
 from probables.blooms.bloom import BloomFilter
 from probables.exceptions import RotatingBloomFilterError
@@ -224,7 +225,7 @@ def __load(self, file: Union[Path, str, IOBase, mmap]):
             self._parse_blooms(file, size)  # type:ignore
 
     @classmethod
-    def _parse_footer(cls, b: ByteString) -> Tuple[int, int, int, float]:
+    def _parse_footer(cls, b: ByteString) -> tuple[int, int, int, float]:
         offset = cls.__FOOTER_STRUCT.size
         size, est_els, els_added, fpr = cls.__FOOTER_STRUCT.unpack(bytes(b[-1 * offset :]))
         return int(size), int(est_els), int(els_added), float(fpr)

probables/countminsketch/__init__.py

@@ -8,10 +8,4 @@
     StreamThreshold,
 )
 
-__all__ = [
-    "CountMinSketch",
-    "HeavyHitters",
-    "StreamThreshold",
-    "CountMeanSketch",
-    "CountMeanMinSketch",
-]
+__all__ = ["CountMinSketch", "HeavyHitters", "StreamThreshold", "CountMeanSketch", "CountMeanMinSketch"]

probables/countminsketch/countminsketch.py

@@ -6,12 +6,13 @@
 
 import math
 from array import array
+from collections.abc import ByteString
 from io import BytesIO, IOBase
 from mmap import mmap
 from numbers import Number
 from pathlib import Path
 from struct import Struct
-from typing import ByteString, Dict, Tuple, Union
+from typing import Union
 
 from probables.constants import INT32_T_MAX, INT32_T_MIN, INT64_T_MAX, INT64_T_MIN
 from probables.exceptions import CountMinSketchError, InitializationError, NotSupportedError
@@ -408,7 +409,7 @@ def __load(self, file: Union[Path, str, IOBase, mmap]):
             self._parse_bytes(file)  # type: ignore
 
     @classmethod
-    def _parse_footer(cls, file: ByteString) -> Tuple[int, int, int]:
+    def _parse_footer(cls, file: ByteString) -> tuple[int, int, int]:
         """return width, depth and elements added, in that order"""
         offset = cls.__FOOTER_STRUCT.size
         width, depth, elements_added = cls.__FOOTER_STRUCT.unpack_from(bytes(file[-1 * offset :]))
@@ -599,7 +600,7 @@ def __str__(self) -> str:
         )
 
     @property
-    def heavy_hitters(self) -> Dict[str, int]:
+    def heavy_hitters(self) -> dict[str, int]:
         """dict: Return the heavy hitters, or most common elements
 
         Note:
@@ -758,7 +759,7 @@ def __str__(self) -> str:
         )
 
     @property
-    def meets_threshold(self) -> Dict[str, int]:
+    def meets_threshold(self) -> dict[str, int]:
         """dict: Those keys that meet the required threshold (with value)"""
         return self.__meets_threshold
 

probables/cuckoo/countingcuckoo.py

@@ -5,11 +5,12 @@
 
 import random
 from array import array
+from collections.abc import ByteString
 from io import IOBase
 from mmap import mmap
 from pathlib import Path
 from struct import Struct
-from typing import ByteString, List, Union
+from typing import Union
 
 from probables.cuckoo.cuckoo import CuckooFilter
 from probables.exceptions import CuckooFilterFullError
@@ -145,7 +146,7 @@ def unique_elements(self) -> int:
         return self.__unique_elements
 
     @property
-    def buckets(self) -> List[List["CountingCuckooBin"]]:  # type: ignore
+    def buckets(self) -> list[list["CountingCuckooBin"]]:  # type: ignore
         """list(list): The buckets holding the fingerprints
 
         Note:

probables/cuckoo/cuckoo.py

@@ -6,12 +6,13 @@
 import math
 import random
 from array import array
+from collections.abc import ByteString
 from io import BytesIO, IOBase
 from mmap import mmap
 from numbers import Number
 from pathlib import Path
 from struct import Struct
-from typing import ByteString, List, Tuple, Union
+from typing import Union
 
 from probables.exceptions import CuckooFilterFullError, InitializationError
 from probables.hashes import KeyT, SimpleHashT, fnv_1a
@@ -226,7 +227,7 @@ def bucket_size(self) -> int:
         return self._bucket_size
 
     @property
-    def buckets(self) -> List[List[int]]:
+    def buckets(self) -> list[list[int]]:
         """list(list): The buckets holding the fingerprints
 
         Note:
@@ -491,7 +492,7 @@ def _indicies_from_fingerprint(self, fingerprint):
         idx_2 = self.__hash_func(str(fingerprint)) % self.capacity
         return idx_1, idx_2
 
-    def _generate_fingerprint_info(self, key: KeyT) -> Tuple[int, int, int]:
+    def _generate_fingerprint_info(self, key: KeyT) -> tuple[int, int, int]:
         """Generate the fingerprint and indicies using the provided key
 
         Args:

probables/hashes.py

@@ -3,13 +3,13 @@
 from functools import wraps
 from hashlib import md5, sha256
 from struct import unpack
-from typing import Callable, List, Union
+from typing import Callable, Union
 
 from probables.constants import UINT32_T_MAX, UINT64_T_MAX
 
 KeyT = Union[str, bytes]
 SimpleHashT = Callable[[KeyT, int], int]
-HashResultsT = List[int]
+HashResultsT = list[int]
 HashFuncT = Callable[[KeyT, int], HashResultsT]
 HashFuncBytesT = Callable[[KeyT, int], bytes]
 
@@ -67,7 +67,7 @@ def hashing_func(key, depth=1):
     return hashing_func
 
 
-def default_fnv_1a(key: KeyT, depth: int = 1) -> List[int]:
+def default_fnv_1a(key: KeyT, depth: int = 1) -> list[int]:
     """The default fnv-1a hashing routine
 
     Args: