secomind · michelepuppin · Apr 16, 2025 · Apr 15, 2025 · Apr 15, 2025 · Apr 15, 2025
diff --git a/pyproject.toml b/pyproject.toml
@@ -0,0 +1,37 @@
+[build-system]
+requires = ["setuptools>=60.5", "wheel"]
+build-backend = "setuptools.build_meta"
+
+[project]
+name = "colint"
+version = "0.1"
+description = ""
+authors = [
+    { name = "Davide Colì", email = "davide.coli@secomind.com" },
+]
+readme = "README.md"
+requires-python = ">=3.10"
+dependencies = [
+    "black>=25.1.0",
+    "exceptiongroup>=1.2.2",
+    "flake8-docstrings>=1.7.0",
+    "GitPython>=3.1.43",
+    "ipykernel>=6.29.5",
+    "isort>=6.0.1",
+    "tokenize-rt>=6.0.0",
+    "toml>=0.10.2",
+    "tomli>=2.0.1",
+    "typing-extensions>=4.12.2",
+]
+
+[project.scripts]
+colint = "colint.colinter:main"
+
+[tool.setuptools]
+package-dir = {"" = "src"}
+
+[tool.setuptools.packages.find]
+where = ["src"]
+
+[tool.setuptools.package-data]
+"colint" = ["*.toml"]
diff --git a/requirements.txt b/requirements.txt
diff --git a/setup.py b/setup.py
diff --git a/colint/__init__.py → src/colint/__init__.py b/colint/__init__.py → src/colint/__init__.py
diff --git a/colint/clean_jupyter/__init__.py → src/colint/clean_jupyter/__init__.py b/colint/clean_jupyter/__init__.py → src/colint/clean_jupyter/__init__.py
diff --git a/colint/clean_jupyter/clean_jupyter.py → src/colint/clean_jupyter/clean_jupyter.py b/colint/clean_jupyter/clean_jupyter.py → src/colint/clean_jupyter/clean_jupyter.py
diff --git a/colint/code_format/__init__.py → src/colint/code_format/__init__.py b/colint/code_format/__init__.py → src/colint/code_format/__init__.py
diff --git a/colint/code_format/code_format.py → src/colint/code_format/code_format.py b/colint/code_format/code_format.py → src/colint/code_format/code_format.py
diff --git a/colint/colinter.py → src/colint/colinter.py b/colint/colinter.py → src/colint/colinter.py
@@ -10,7 +10,7 @@
 from .params.params import Params
 from .sort_libraries.sorter import sort_imports
 
-config_file = Path(__file__).parent / "pyproject.toml"
+config_file = Path(__file__).parent / "config.toml"
 params = Params.from_toml(config_file)
 
 COMMANDS = {

diff --git a/colint/pyproject.toml → src/colint/config.toml b/colint/pyproject.toml → src/colint/config.toml
diff --git a/colint/docformat/__init__.py → src/colint/docformat/__init__.py b/colint/docformat/__init__.py → src/colint/docformat/__init__.py
diff --git a/colint/docformat/apply_google_style.py → src/colint/docformat/apply_google_style.py b/colint/docformat/apply_google_style.py → src/colint/docformat/apply_google_style.py
diff --git a/colint/docformat/docformat.py → src/colint/docformat/docformat.py b/colint/docformat/docformat.py → src/colint/docformat/docformat.py
diff --git a/colint/docformat/format_commented_lines.py → ...olint/docformat/format_commented_lines.py b/colint/docformat/format_commented_lines.py → ...olint/docformat/format_commented_lines.py
diff --git a/colint/docformat/format_docstring.py → src/colint/docformat/format_docstring.py b/colint/docformat/format_docstring.py → src/colint/docformat/format_docstring.py
diff --git a/colint/docformat/format_text.py → src/colint/docformat/format_text.py b/colint/docformat/format_text.py → src/colint/docformat/format_text.py
diff --git a/colint/grammar_libraries/__init__.py → src/colint/grammar_libraries/__init__.py b/colint/grammar_libraries/__init__.py → src/colint/grammar_libraries/__init__.py
diff --git a/colint/grammar_libraries/flake8error.py → src/colint/grammar_libraries/flake8error.py b/colint/grammar_libraries/flake8error.py → src/colint/grammar_libraries/flake8error.py
diff --git a/...ammar_libraries/get_custom_style_guide.py → ...ammar_libraries/get_custom_style_guide.py b/...ammar_libraries/get_custom_style_guide.py → ...ammar_libraries/get_custom_style_guide.py
diff --git a/colint/grammar_libraries/grammar_check.py → ...colint/grammar_libraries/grammar_check.py b/colint/grammar_libraries/grammar_check.py → ...colint/grammar_libraries/grammar_check.py
diff --git a/colint/newline_fix/__init__.py → src/colint/newline_fix/__init__.py b/colint/newline_fix/__init__.py → src/colint/newline_fix/__init__.py
diff --git a/colint/newline_fix/newline_fix.py → src/colint/newline_fix/newline_fix.py b/colint/newline_fix/newline_fix.py → src/colint/newline_fix/newline_fix.py
diff --git a/colint/params/__init__.py → src/colint/params/__init__.py b/colint/params/__init__.py → src/colint/params/__init__.py
diff --git a/colint/params/black_params.py → src/colint/params/black_params.py b/colint/params/black_params.py → src/colint/params/black_params.py
diff --git a/colint/params/exceptions.py → src/colint/params/exceptions.py b/colint/params/exceptions.py → src/colint/params/exceptions.py
diff --git a/colint/params/flake8_params.py → src/colint/params/flake8_params.py b/colint/params/flake8_params.py → src/colint/params/flake8_params.py
diff --git a/colint/params/isort_params.py → src/colint/params/isort_params.py b/colint/params/isort_params.py → src/colint/params/isort_params.py
diff --git a/colint/params/params.py → src/colint/params/params.py b/colint/params/params.py → src/colint/params/params.py
diff --git a/colint/sort_libraries/__init__.py → src/colint/sort_libraries/__init__.py b/colint/sort_libraries/__init__.py → src/colint/sort_libraries/__init__.py
diff --git a/colint/sort_libraries/sorter.py → src/colint/sort_libraries/sorter.py b/colint/sort_libraries/sorter.py → src/colint/sort_libraries/sorter.py
@@ -1,11 +1,12 @@
 import io
+import os
 from pathlib import Path
 
 import isort
 
 from ..params.isort_params import IsortParams
 from ..utils.jupyter_utils import JupyterNotebokParser
-from ..utils.os_utils import get_valid_files
+from ..utils.os_utils import get_git_repo, get_valid_files
 from ..utils.text_styling_utils import TextModifiers, style_text
 
 FILE_SORTED_MESSAGE = "! File has been sorted: "
@@ -89,6 +90,12 @@ def sort_imports(path: str, only_check: bool, params: IsortParams) -> bool:
         bool: Boolean indicating if any imports have been sorted in any file.
     """
     files = get_valid_files(path)
+    git_repo = get_git_repo(path)
+    current_directory = os.getcwd()
+
+    if git_repo is not None:
+        new_dir = Path(git_repo.git_dir).parent.absolute()
+        os.chdir(str(new_dir))
 
     some_file_has_been_sorted = False
 
@@ -125,4 +132,7 @@ def sort_imports(path: str, only_check: bool, params: IsortParams) -> bool:
         if file_not_linted:
             print(__style_message(f, only_check))
 
+    if os.getcwd() != current_directory:
+        os.chdir(current_directory)
+
     return some_file_has_been_sorted
diff --git a/colint/utils/__init__.py → src/colint/utils/__init__.py b/colint/utils/__init__.py → src/colint/utils/__init__.py
diff --git a/colint/utils/exceptions.py → src/colint/utils/exceptions.py b/colint/utils/exceptions.py → src/colint/utils/exceptions.py
diff --git a/colint/utils/jupyter_utils.py → src/colint/utils/jupyter_utils.py b/colint/utils/jupyter_utils.py → src/colint/utils/jupyter_utils.py
diff --git a/colint/utils/os_utils.py → src/colint/utils/os_utils.py b/colint/utils/os_utils.py → src/colint/utils/os_utils.py
@@ -52,8 +52,12 @@ def get_valid_files(path: str | Path) -> list[str]:
         str(f) for f in Path(path).rglob("*") if f.is_file() and ".git" not in f.parts
     ]
 
+    valid_files = set(files)
+
     if repo:  # If a git repository exists, remove files in gitignore
-        repo_ignore = set(repo.ignored(files))
-        files = list(set(files).difference(repo_ignore))
+        batch_size = 100
+        for k in range(0, len(files), batch_size):
+            repo_ignore = set(repo.ignored(files[k : k + batch_size]))
+            valid_files.difference_update(repo_ignore)
 
-    return sorted(files)
+    return sorted(list(valid_files))
diff --git a/colint/utils/text_styling_utils.py → src/colint/utils/text_styling_utils.py b/colint/utils/text_styling_utils.py → src/colint/utils/text_styling_utils.py