Merge branch 'main' into dev/eglaser-kmeans-oop

Author: ethanglaser

.pre-commit-config.yaml

@@ -16,12 +16,12 @@
 
 repos:
   - repo: https://github.com/psf/black
-    rev: 23.7.0
+    rev: 24.1.1
     hooks:
       - id: black
         language_version: python3.10
   - repo: https://github.com/PyCQA/isort
-    rev: 5.12.0
+    rev: 5.13.2
     hooks:
       - id: isort
         language_version: python3.10

azure-pipelines.yml

@@ -19,14 +19,10 @@ jobs:
     pool:
       vmImage: 'ubuntu-22.04'
     steps:
-    - task: UsePythonVersion@0
-      inputs:
-        versionSpec: '3.10'
-        addToPath: true
     - script: |
-        python -m pip install --upgrade pip setuptools
-        pip install isort black
-        isort --check . && black --check .
+        python -m pip install --upgrade pip pre-commit==4.0.1
+        pre-commit install
+        pre-commit run --all-files --show-diff-on-failure
       displayName: 'Linting'
   - job: Linux
     dependsOn: Lint

sklbench/utils/common.py

@@ -66,7 +66,11 @@ def read_output_from_command(command: str) -> Tuple[int, str, str]:
         stderr=sp.PIPE,
         encoding="utf-8",
     )
-    return res.returncode, res.stdout[:-1], res.stderr[:-1]
+    return (
+        res.returncode,
+        res.stdout.strip(),
+        res.stderr.strip(),
+    )
 
 
 def hash_from_json_repr(x: JsonTypesUnion, hash_limit: int = 5) -> str:
@@ -120,7 +124,7 @@ def flatten_list(input_list: List, ensure_type_homogeneity: bool = False) -> Lis
 
 
 def get_module_members(
-    module_names_chain: Union[List, str]
+    module_names_chain: Union[List, str],
 ) -> Tuple[ModuleContentMap, ModuleContentMap]:
     def get_module_name(module_names_chain: List[str]) -> str:
         name = module_names_chain[0]