Merge pull request #29 from data-science-extensions/updates

Updates

Author: chrimaho

.pre-commit-config.yaml

@@ -33,7 +33,7 @@ repos:
 
   # Linter
   - repo: https://github.com/psf/black
-    rev: "24.10.0"
+    rev: "25.1.0"
     hooks:
       - id: black
         language_version: python3.13
@@ -48,7 +48,7 @@ repos:
 
   # Run MyPy type checks
   - repo: https://github.com/pre-commit/mirrors-mypy
-    rev: "v1.13.0"
+    rev: "v1.15.0"
     hooks:
       - id: mypy
         files: src/toolbox_python
@@ -58,7 +58,7 @@ repos:
 
   # Reorder Python imports
   - repo: https://github.com/pycqa/isort
-    rev: "5.13.2"
+    rev: "6.0.0"
     hooks:
       - id: isort
         name: isort (python)
@@ -67,7 +67,7 @@ repos:
 
   # Find any outdated syntax and replace with modern equivalents
   - repo: https://github.com/asottile/pyupgrade
-    rev: "v3.19.0"
+    rev: "v3.19.1"
     hooks:
       - id: pyupgrade
         name: Upgrade Python features
@@ -76,7 +76,7 @@ repos:
 
   # Check spelling
   - repo: https://github.com/codespell-project/codespell
-    rev: "v2.3.0"
+    rev: "v2.4.1"
     hooks:
     - id: codespell
       additional_dependencies:
@@ -87,15 +87,15 @@ repos:
 
   # Remove unused import statements
   - repo: https://github.com/hadialqattan/pycln
-    rev: "v2.4.0"
+    rev: "v2.5.0"
     hooks:
       - id: pycln
         args:
           - "--all"
 
   # Check poetry configs
   - repo: https://github.com/python-poetry/poetry
-    rev: "1.8.0"
+    rev: "2.1.1"
     hooks:
       - id: poetry-check
 

Makefile

@@ -35,16 +35,22 @@ install-poetry:
 	$(PYTHON) -m pip install poetry
 	poetry --version
 install:
+	poetry lock
 	poetry install --no-interaction --only main
 install-dev:
+	poetry lock
 	poetry install --no-interaction --with dev
 install-docs:
+	poetry lock
 	poetry install --no-interaction --with docs
 install-test:
+	poetry lock
 	poetry install --no-interaction --with test
 install-dev-test:
+	poetry lock
 	poetry install --no-interaction --with dev,test
 install-all:
+	poetry lock
 	poetry install --no-interaction --with dev,docs,test
 
 

mkdocs.yaml

@@ -115,8 +115,6 @@ plugins:
             #   - docstring_inheritance.griffe
             allow_inspection: true
             docstring_style: google
-            docstring_options:
-              replace_admonitions: no
             show_root_heading: true
             show_root_toc_entry: false
             show_root_full_path: true

pyproject.toml

@@ -1,17 +1,19 @@
-[tool.poetry]
+
+[build-system]
+requires = ["poetry-core"]
+build-backend = "poetry.core.masonry.api"
+
+[project]
 name = "toolbox-python"
 version = "1.0.4"
 description = "Helper files/functions/classes for generic Python processes"
 readme = "README.md"
 license = "MIT"
 authors = [
-    "Admin <toolbox-python@data-science-extensions.com>",
+    {name="Chris Mahoney", email="toolbox-python@data-science-extensions.com"},
 ]
 maintainers = [
-    "Admin <toolbox-python@data-science-extensions.com>",
-]
-packages = [
-    { include = "toolbox_python", from = "src" },
+    {name="Chris Mahoney", email="toolbox-python@data-science-extensions.com"},
 ]
 classifiers = [
     "Topic :: Software Development :: Build Tools",
@@ -29,27 +31,32 @@ classifiers = [
     "Topic :: Software Development :: Testing :: Unit",
     "Topic :: Utilities",
 ]
+requires-python = ">3.9,<4.0"
+dependencies = [
+    "typeguard==4.*",
+    "more-itertools==10.*",
+]
 
-[tool.poetry.urls]
+[project.urls]
 Homepage = "https://data-science-extensions.com/python-toolbox"
 Documentation = "https://data-science-extensions.com/python-toolbox"
 Repository = "https://github.com/data-science-extensions/toolbox-python"
 Changelog = "https://github.com/data-science-extensions/toolbox-python/releases"
 Issues = "https://github.com/data-science-extensions/toolbox-python/issues"
 
-[tool.poetry.dependencies]
-python = ">3.9,<4.0"
-typeguard = "4.*"
-more-itertools = "10.*"
+[tool.poetry]
+packages = [
+    { include = "toolbox_python", from = "src" },
+]
 
 [tool.poetry.group.dev]
 optional = true
 
 [tool.poetry.group.dev.dependencies]
-black = "24.*"
+black = "25.*"
 blacken-docs = "1.*"
 pre-commit = "4.*"
-isort = "5.*"
+isort = "6.*"
 codespell = "2.*"
 pyupgrade = "3.*"
 pylint = "3.*"
@@ -68,7 +75,7 @@ mkdocs-coverage = "1.*"
 mkdocs-autorefs = "1.*"
 livereload = "2.*"
 mike = "2.*"
-black = "24.*"
+black = "25.*"
 docstring-inheritance = "2.*"
 
 [tool.poetry.group.test]
@@ -179,10 +186,6 @@ disable = [
 
 [[tool.poetry_bumpversion.replacements]]
 files = [
-    "src/toolbox_python/version.py",
+    "src/toolbox_python/__init__.py",
     "src/tests/test_version.py",
 ]
-
-[build-system]
-requires = ["poetry-core"]
-build-backend = "poetry.core.masonry.api"

src/tests/test_output.py

@@ -12,7 +12,9 @@
 
 # ## Python StdLib Imports ----
 import logging
-from typing import Generator, Literal, Union
+from collections.abc import Generator
+from functools import lru_cache
+from typing import Literal, Union
 from unittest import TestCase
 
 # ## Python Third Party Imports ----
@@ -183,6 +185,7 @@ def _pass_fixtures(self, capsys: pytest.CaptureFixture) -> None:
         self.capsys: pytest.CaptureFixture = capsys
 
     @staticmethod
+    @lru_cache
     def get_list_of_words(num_words: int = 100) -> str_list:
         word_url = "https://www.mit.edu/~ecprice/wordlist.10000"
         response: requests.Response = requests.get(word_url)
@@ -262,7 +265,9 @@ def test_5_rowwise(self) -> None:
         assert output == expected
 
     @parameterized.expand([("list"), ("tuple"), ("set"), ("generator")])
-    def test_6_types(self, input_type: Literal["list", "tuple", "set", "generator"]) -> None:
+    def test_6_types(
+        self, input_type: Literal["list", "tuple", "set", "generator"]
+    ) -> None:
         words: str_list = self.get_list_of_words(4 * 3)
         expected: str = "\n".join(
             [

src/tests/test_version.py

@@ -14,7 +14,7 @@
 from unittest import TestCase
 
 # ## Local First Party Imports ----
-from toolbox_python.version import __version__ as version
+from toolbox_python import __version__ as version
 
 
 # ---------------------------------------------------------------------------- #

src/toolbox_python/__init__.py

@@ -0,0 +1,2 @@
+__version__ = "1.0.4"
+__author__ = "Chris Mahoney"

src/toolbox_python/lists.py

@@ -195,7 +195,7 @@ def flatten(
     """
     return list(
         itertools_collapse(
-            iterable=list_of_lists,
+            iterable=list_of_lists,  # type: ignore
             base_type=base_type,
             levels=levels,
         )

src/toolbox_python/output.py

@@ -39,9 +39,10 @@
 
 
 # ## Python StdLib Imports ----
+from collections.abc import Generator
 from logging import Logger, _nameToLevel
 from math import ceil
-from typing import Any, Generator, Literal, Optional, Union
+from typing import Any, Literal, Optional, Union
 
 # ## Python Third Party Imports ----
 from typeguard import typechecked
@@ -382,7 +383,9 @@ def list_columns(
     ]
     if columnwise:
         if len(segmented_list[-1]) != cols_wide:
-            segmented_list[-1].extend([""] * (len(string_list) - len(segmented_list[-1])))
+            segmented_list[-1].extend(
+                [""] * (len(string_list) - len(segmented_list[-1]))
+            )
         combined_list: Union[list[str_list], Any] = zip(*segmented_list)
     else:
         combined_list = segmented_list