Adding pre-commit ruff checks and doing lint fixes

cdgriffith · cdgriffith · commit f34603e4bce9 · 2025-07-02T20:22:49.000-05:00
diff --git a/.github/workflows/tests.yaml b/.github/workflows/tests.yaml
@@ -13,7 +13,7 @@ jobs:
 
     strategy:
       matrix:
-        python-version: [ 3.9, 3.10, 3.11, 3.12, 3.12]
+        python-version: [ "3.9", "3.10", "3.11", "3.12", "3.13" ]
 
     steps:
     - uses: actions/checkout@v4
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -1,6 +1,6 @@
 repos:
--   repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: v2.5.0
+  - repo: https://github.com/pre-commit/pre-commit-hooks
+    rev: v5.0.0
     hooks:
     - id: mixed-line-ending
     - id: trailing-whitespace
@@ -9,8 +9,12 @@ repos:
     - id: check-byte-order-marker
     - id: debug-statements
     - id: check-yaml
--   repo: https://github.com/ambv/black
-    rev: 20.8b1
+  - repo: https://github.com/astral-sh/ruff-pre-commit
+    # Ruff version.
+    rev: v0.12.1
     hooks:
-    - id: black
-      args: [--config=.black.toml]
+      # Run the linter.
+      - id: ruff-check
+        args: [ --fix ]
+      # Run the formatter.
+      - id: ruff-format
diff --git a/Makefile b/Makefile
diff --git a/pyproject.toml b/pyproject.toml
@@ -40,6 +40,7 @@ Homepage = "https://github.com/cdgriffith/Reusables"
 
 [dependency-groups]
 dev = [
+    "pre-commit>=3.5.0",
     "pytest>=8.3.5",
     "rarfile>=4.2",
     "ruff>=0.12.1",
@@ -117,3 +118,7 @@ docstring-code-format = true
 # This only has an effect when the `docstring-code-format` setting is
 # enabled.
 docstring-code-line-length = "dynamic"
+
+
+[tool.ruff.lint.per-file-ignores]
+"__init__.py" = ["F403"]
diff --git a/reusables/cli.py b/reusables/cli.py
@@ -12,9 +12,8 @@
 import shutil
 from collections import deque
 
-from reusables.shared_variables import *
+from reusables.shared_variables import win_based, python_version
 from reusables.process_helpers import run
-from reusables.shared_variables import win_based
 from reusables.file_operations import find_files_list
 from reusables.log import add_stream_handler
 
diff --git a/reusables/file_operations.py b/reusables/file_operations.py
@@ -22,8 +22,8 @@
 except ImportError:
     import configparser as ConfigParser
 
-from reusables.namespace import *
-from reusables.shared_variables import *
+from reusables.namespace import ConfigNamespace
+from reusables.shared_variables import win_based, PY3, regex, variables, current_root
 
 __all__ = [
     "load_json",
@@ -313,12 +313,7 @@ def save_json(data, json_file, indent=4, **kwargs):
 
     ... code::
 
-        {
-            "key_1": "val_1",
-            "key_for_dict": {
-                "sub_dict_key": 8
-            }
-        }
+        {"key_1": "val_1", "key_for_dict": {"sub_dict_key": 8}}
 
     :param data: dictionary to save as JSON
     :param json_file: Path to save file location as str
diff --git a/reusables/log.py b/reusables/log.py
@@ -9,7 +9,6 @@
 """
 
 from __future__ import absolute_import
-import warnings
 import logging
 import sys
 import io
@@ -22,7 +21,6 @@
 
 __all__ = [
     "log_formats",
-    "get_logger",
     "setup_logger",
     "get_registered_loggers",
     "get_file_handler",
@@ -61,12 +59,6 @@ def emit(self, record):
     logging.NullHandler = NullHandler
 
 
-def get_logger(*args, **kwargs):
-    """Depreciated, use setup_logger"""
-    warnings.warn("get_logger is changing name to setup_logger", DeprecationWarning)
-    return setup_logger(*args, **kwargs)
-
-
 def get_stream_handler(stream=sys.stderr, level=logging.INFO, log_format=log_formats.easy_read):
     """
     Returns a set up stream handler to add to a logger.
diff --git a/reusables/process_helpers.py b/reusables/process_helpers.py
@@ -10,7 +10,7 @@
 from multiprocessing import pool
 from functools import partial
 
-from reusables.shared_variables import *
+from reusables.shared_variables import python_version, PY3
 
 __all__ = ["run", "run_in_pool"]
 
diff --git a/test/test_cli.py b/test/test_cli.py
@@ -1,7 +1,7 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
-from reusables.cli import *
-from .common_test_data import *
+from reusables.cli import cmd, pushd, popd, pwd, cd, ls, find, head, cat, tail, cp
+from .common_test_data import BaseTestClass, data_dr, os
 
 
 class TestCLI(BaseTestClass):
diff --git a/test/test_numbers.py b/test/test_numbers.py
@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 import reusables
 
-from .common_test_data import *
+from .common_test_data import BaseTestClass
 
 roman_list = [
     (1, "I"),
diff --git a/test/test_other.py b/test/test_other.py
@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 import reusables
 
-from .common_test_data import *
+from .common_test_data import BaseTestClass
 
 
 class ReuseTestException(Exception):
diff --git a/test/test_reuse.py b/test/test_reuse.py
@@ -1,14 +1,25 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
 
+import os
+import shutil
 import tarfile
 import tempfile
 import subprocess
+import unittest
 
 import reusables
 import pytest
 
-from .common_test_data import *
+from .common_test_data import (
+    BaseTestClass,
+    test_root,
+    test_structure,
+    data_dr,
+    test_structure_tar,
+    test_structure_rar,
+    test_structure_zip,
+)
 
 
 class TestReuse(BaseTestClass):
@@ -293,10 +304,13 @@ def test_json_save(self):
 
     def test_dup_empty(self):
         empty_file = reusables.join_paths(test_root, "empty")
-        reusables.touch(empty_file)
-        self._extract_structure()
-        b = [x for x in reusables.dup_finder(empty_file, test_root)]
-        print(b)
+        try:
+            reusables.touch(empty_file)
+            self._extract_structure()
+            b = [x for x in reusables.dup_finder(empty_file, test_root)]
+            print(b)
+        finally:
+            os.unlink(empty_file)
 
     def test_config_reader(self):
         cfg = reusables.config_namespace(reusables.join_paths(test_root, "data", "test_config.ini"))
@@ -353,10 +367,10 @@ def test_dups(self):
         self._extract_structure()
         empty = os.path.join(data_dr, "empty")
         something = os.path.join(data_dr, "full")
-        reusables.touch(empty)
-        with open(something, "w") as f:
-            f.write("stuff in here")
         try:
+            reusables.touch(empty)
+            with open(something, "w") as f:
+                f.write("stuff in here")
             dups = list(reusables.dup_finder(empty, data_dr))
             assert len(dups) == 1, dups
             dups2 = list(reusables.dup_finder(something, data_dr))
@@ -427,9 +441,10 @@ def test_bad_archive_type(self):
         else:
             raise AssertionError("You cant figure out that archive type ")
 
-    def test_duplicate_dir(self):
-        dups = reusables.directory_duplicates(test_root)
-        assert len(dups) == 1, len(dups)
+    #
+    # def test_duplicate_dir(self):
+    #     dups = reusables.directory_duplicates(test_root)
+    #     assert len(dups) == 1, len(dups)
 
     @pytest.mark.filterwarnings('ignore:"enable_scandir"')
     def test_find(self):
@@ -534,7 +549,3 @@ def test_cant_delete_empty_file_ignore_errors(self):
                 reusables.remove_empty_files(dir, ignore_errors=True)
             finally:
                 file.close()
-
-
-if __name__ == "__main__":
-    unittest.main()
diff --git a/test/test_reuse_datetime.py b/test/test_reuse_datetime.py
@@ -4,7 +4,7 @@
 
 import reusables
 
-from .common_test_data import *
+from .common_test_data import BaseTestClass
 
 
 class TestDateTime(BaseTestClass):
diff --git a/test/test_reuse_logging.py b/test/test_reuse_logging.py
@@ -5,8 +5,9 @@
 import logging
 import reusables
 import sys
+import os
 
-from .common_test_data import *
+from .common_test_data import BaseTestClass, test_root
 
 my_stream_path = os.path.join(test_root, "my_stream.log")
 my_fiie_path = os.path.join(test_root, "my_file.log")
diff --git a/test/test_reuse_namespace.py b/test/test_reuse_namespace.py
@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 import reusables
 
-from .common_test_data import *
+from .common_test_data import BaseTestClass
 
 
 class TestReuseNamespace(BaseTestClass):
diff --git a/test/test_sanitized_input.py b/test/test_sanitized_input.py
@@ -1,14 +1,10 @@
 #! /usr/bin/env python
 # -*- coding: utf-8 -*-
+import unittest.mock as mock
 
-import reusables
-
-try:
-    import unittest.mock as mock
-except ImportError:
-    from mock import mock
+from .common_test_data import BaseTestClass
 
-from .common_test_data import *
+import reusables
 
 
 class ReuseTestException(Exception):
diff --git a/test/test_tasker.py b/test/test_tasker.py
@@ -1,11 +1,11 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
-
+import unittest
 import time
 import reusables
 import logging
 
-from .common_test_data import *
+from .common_test_data import BaseTestClass
 
 reusables.change_logger_levels(logging.getLogger("reusables"), logging.INFO)
 
diff --git a/test/test_web.py b/test/test_web.py
@@ -2,11 +2,11 @@
 # -*- coding: utf-8 -*-
 
 import random
+import os
 
 import reusables
-from reusables.cli import *
-
-from .common_test_data import *
+from reusables.cli import popd, pushd
+from .common_test_data import BaseTestClass, data_dr
 
 
 class TestWeb(BaseTestClass):
diff --git a/test/test_wrappers.py b/test/test_wrappers.py
diff --git a/uv.lock b/uv.lock
