Replace black and isort with ruff (#558)

KapJI · Sep 9, 2024 · 3b2dc46 · 3b2dc46
1 parent 97a76c8
commit 3b2dc46
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 95 deletions.
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -27,15 +27,9 @@ repos:
         files: ^.+\.py$
   - repo: local
     hooks:
-      - id: black
-        name: black
-        entry: poetry run black
-        language: system
-        types: [python]
-        require_serial: true
-      - id: isort
-        name: isort
-        entry: poetry run isort
+      - id: ruff-format
+        name: ruff format
+        entry: poetry run ruff format
         language: system
         types: [python]
         require_serial: true

diff --git a/cgt_calc/main.py b/cgt_calc/main.py
@@ -707,9 +707,9 @@ def calculate_capital_gain(
                         date_index,
                     )
                     if date_index >= tax_year_start_index:
-                        calculation_log[date_index][
-                            f"buy${symbol}"
-                        ] = calculation_entries
+                        calculation_log[date_index][f"buy${symbol}"] = (
+                            calculation_entries
+                        )
             if date_index in self.disposal_list:
                 for symbol in self.disposal_list[date_index]:
                     (
@@ -755,9 +755,9 @@ def calculate_capital_gain(
                         assert transaction_capital_gain == round_decimal(
                             calculated_gain, 2
                         )
-                        calculation_log[date_index][
-                            f"sell${symbol}"
-                        ] = calculation_entries
+                        calculation_log[date_index][f"sell${symbol}"] = (
+                            calculation_entries
+                        )
                         if transaction_capital_gain > 0:
                             capital_gain += transaction_capital_gain
                         else:

diff --git a/poetry.lock b/poetry.lock
diff --git a/pyproject.toml b/pyproject.toml
@@ -34,9 +34,7 @@ types-requests = "^2.27.7"
 yfinance = "^0.2.36"
 
 [tool.poetry.group.dev.dependencies]
-black = "^24.1"
 codespell = "^2.2.6"
-isort = "^5.13.2"
 mypy = "^1.8"
 pandas-stubs = "^2.2"
 pre-commit = "^3.5.0"
@@ -52,11 +50,6 @@ cgt-calc = 'cgt_calc.main:init'
 requires = ["poetry-core>=1.0.0"]
 build-backend = "poetry.core.masonry.api"
 
-[tool.isort]
-profile = "black"
-force_sort_within_sections = true
-combine_as_imports = true
-
 [tool.pylint.main]
 py-version = "3.9"
 load-plugins = [
@@ -68,7 +61,6 @@ load-plugins = [
 max-line-length = 88
 jobs = 2
 
-
 [tool.pylint.messages_control]
 # Reasons disabled:
 # duplicate-code - unavoidable