Switch linting to black and ruff

Author: xnuinside

.flake8

@@ -20,13 +20,14 @@ jobs:
       uses: actions/setup-python@v5
       with:
         python-version: "3.12"
-    - name: Install flake8
+    - name: Install black and ruff
       run: |
         python -m pip install --upgrade pip
-        pip install flake8
-    - name: Run flake8
+        pip install black ruff
+    - name: Run black and ruff
       run: |
-        flake8 codegraph/ tests/
+        black .
+        ruff check .
 
   tests:
     runs-on: ubuntu-latest
@@ -115,4 +116,4 @@ jobs:
         path: 'docs'
     - name: Deploy to GitHub Pages
       id: deployment
-      uses: actions/deploy-pages@v4
+      uses: actions/deploy-pages@v4

.github/workflows/main.yml

@@ -1,18 +1,10 @@
 repos:
--   repo: https://github.com/asottile/seed-isort-config
-    rev: v2.2.0
-    hooks:
-    - id: seed-isort-config
--   repo: https://github.com/pycqa/isort
-    rev: 5.13.2
-    hooks:
-      - id: isort
--   repo: https://github.com/ambv/black
+-   repo: https://github.com/psf/black
     rev: 24.10.0
     hooks:
     - id: black
       language_version: python3.12
--   repo: https://github.com/PyCQA/flake8
-    rev: 7.1.1
+-   repo: https://github.com/astral-sh/ruff-pre-commit
+    rev: v0.6.9
     hooks:
-    - id: flake8
+    - id: ruff

.isort.cfg

@@ -21,4 +21,13 @@ To follow code styles and successfully pass github pipelines install pre-commit
 
     pre-commit install
 
-```
+```
+
+### Formatting and linting
+
+Before committing changes, run the formatter and linter:
+
+```
+    black .
+    ruff check .
+```

.pre-commit-config.yaml

@@ -1,4 +1,4 @@
-""" main module of testsdiffer for console (cli) usage"""
+"""main module of testsdiffer for console (cli) usage"""
 
 import logging
 import pprint

CONTRIBUTING.md

@@ -22,9 +22,7 @@ def usage_graph(self, modules_data: Dict) -> Dict:
     def get_entity_metadata(self, modules_data: Dict) -> Dict:
         raise NotImplementedError
 
-    def get_dependencies(
-        self, usage_graph: Dict, file_path: str, distance: int
-    ) -> Dict[int, Set[str]]:
+    def get_dependencies(self, usage_graph: Dict, file_path: str, distance: int) -> Dict[int, Set[str]]:
         """
         Default implementation that expects dependencies as "module.entity".
         Parsers can override this to handle language-specific dependency formats.

codegraph/main.py

@@ -44,9 +44,7 @@ def get_source_files(self, paths) -> List[str]:
         return get_python_paths_list(paths)
 
     def parse_files(self, paths_list: List[str]) -> Dict:
-        self._module_names_set = {
-            os.path.basename(path).replace(".py", "") for path in paths_list
-        }
+        self._module_names_set = {os.path.basename(path).replace(".py", "") for path in paths_list}
         all_data = {}
         for path in paths_list:
             source = self._read_file_content(path)
@@ -121,9 +119,7 @@ def _read_file_content(self, path: Text) -> Text:
     def _parse_source(self, source: Text, filename: Text):
         if self._major == 2:
             if ast27 is None:
-                raise ImportError(
-                    "typed_ast is required to parse Python 2 source code."
-                )
+                raise ImportError("typed_ast is required to parse Python 2 source code.")
             return ast27.parse(source, filename=filename, mode="exec")
 
         return self._parse_with_feature_version(source, filename, self._feature_version)
@@ -233,9 +229,7 @@ def _collect_dependencies_in_module(
     ) -> List[str]:
         deps: List[str] = []
         ast_mod = self._ast_mod
-        collector = self._make_dependency_collector(
-            local_entities, module_aliases, entity_aliases, ast_mod
-        )
+        collector = self._make_dependency_collector(local_entities, module_aliases, entity_aliases, ast_mod)
         for node in getattr(ast_tree, "body", []):
             if isinstance(node, (ast_mod.FunctionDef, ast_mod.ClassDef)):
                 continue
@@ -259,28 +253,20 @@ def _collect_dependencies_in_entity(
         if isinstance(node, ast_mod.ClassDef):
             for base in node.bases:
                 if isinstance(base, ast_mod.Attribute):
-                    dep = self._resolve_attribute(
-                        base, local_entities, module_aliases, entity_aliases, ast_mod
-                    )
+                    dep = self._resolve_attribute(base, local_entities, module_aliases, entity_aliases, ast_mod)
                 elif isinstance(base, ast_mod.Name):
-                    dep = self._resolve_name(
-                        base.id, local_entities, module_aliases, entity_aliases
-                    )
+                    dep = self._resolve_name(base.id, local_entities, module_aliases, entity_aliases)
                 else:
                     dep = None
                 if dep:
                     deps.append(dep)
-            collector = self._make_dependency_collector(
-                local_entities, module_aliases, entity_aliases, ast_mod
-            )
+            collector = self._make_dependency_collector(local_entities, module_aliases, entity_aliases, ast_mod)
             for child in node.body:
                 collector.visit(child)
             deps.extend(collector.dependencies)
             return deps
 
-        collector = self._make_dependency_collector(
-            local_entities, module_aliases, entity_aliases, ast_mod
-        )
+        collector = self._make_dependency_collector(local_entities, module_aliases, entity_aliases, ast_mod)
         collector.visit(node)
         deps.extend(collector.dependencies)
         return deps
@@ -311,13 +297,9 @@ def _resolve_call_target(
         ast_mod,
     ) -> Optional[str]:
         if isinstance(func_node, ast_mod.Name):
-            return self._resolve_name(
-                func_node.id, local_entities, module_aliases, entity_aliases
-            )
+            return self._resolve_name(func_node.id, local_entities, module_aliases, entity_aliases)
         if isinstance(func_node, ast_mod.Attribute):
-            return self._resolve_attribute(
-                func_node, local_entities, module_aliases, entity_aliases, ast_mod
-            )
+            return self._resolve_attribute(func_node, local_entities, module_aliases, entity_aliases, ast_mod)
         return None
 
     def _resolve_attribute(

codegraph/parsers/base.py

@@ -4,7 +4,6 @@
 from codegraph.parsers.python_parser import PythonParser
 from codegraph.parsers.rust_parser import RustParser
 
-
 _PARSERS: Dict[str, Type[BaseParser]] = {
     "python": PythonParser,
     "rust": RustParser,

codegraph/parsers/python_parser.py

@@ -18,10 +18,7 @@ def get_paths_list(paths: Union[str, List], extensions: Iterable[str]) -> List[s
         if not path.exists():
             raise ValueError(f"Path {path.as_posix()} does not exist")
         for ext in extensions:
-            paths_list += [
-                Path(p).as_posix()
-                for p in glob.glob(str(path / "**" / f"*{ext}"), recursive=True)
-            ]
+            paths_list += [Path(p).as_posix() for p in glob.glob(str(path / "**" / f"*{ext}"), recursive=True)]
     return paths_list