fix: format by ruff

Author: everysoftware

.pre-commit-config.yaml

@@ -11,27 +11,23 @@
 # git commit --no-verify
 
 default_language_version:
-    python: python3.12
+  python: python3.12
 repos:
--   repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: v4.6.0
+  - repo: https://github.com/pre-commit/pre-commit-hooks
+    rev: v5.0.0
     hooks:
-    -   id: check-added-large-files
+      - id: check-added-large-files
         args:
-        - --maxkb=1000
-    -   id: check-toml
-    -   id: check-yaml
+          - --maxkb=1000
+      - id: check-toml
+      - id: check-yaml
         args:
-        -   --unsafe
-    -   id: end-of-file-fixer
-    -   id: trailing-whitespace
--   repo: https://github.com/charliermarsh/ruff-pre-commit
-    rev: v0.4.5
+          - --unsafe
+      - id: end-of-file-fixer
+      - id: trailing-whitespace
+  - repo: local
     hooks:
-    -   id: ruff
-        args:
-        - --fix
-    -   id: ruff-format
-ci:
-    autofix_commit_msg: 🎨 [pre-commit.ci] Auto format from pre-commit.com hooks
-    autoupdate_commit_msg: ⬆ [pre-commit.ci] pre-commit autoupdate
+      - id: fix
+        name: fix
+        language: system
+        entry: make fix

Makefile

@@ -1,21 +1,26 @@
 .PHONY: test
 test:
 	@echo "Running tests..."
-	pytest -s -v tests
+	@pytest -s -v tests
 
 
 .PHONY: format
 format:
 	@echo "Running ruff..."
-	ruff format src tests
+	@ruff format .
 
 .PHONY: lint
 lint:
 	@echo "Running ruff and mypy..."
-	ruff check src tests --fix
-	mypy src --strict
+	@ruff check . --fix
+	@mypy src --strict
+
+.PHONY: fix
+fix:
+	@make lint
+	@make format
 
 .PHONY: freeze
 freeze:
 	@echo "Freezing requirements..."
-	pip freeze > requirements.txt
+	@pip freeze > requirements.txt

pyproject.toml

@@ -0,0 +1,22 @@
+[tool.ruff]
+line-length = 120
+indent-width = 4
+target-version = "py310"
+output-format = "concise"
+
+[tool.ruff.lint]
+select = [
+    "E",  # pycodestyle errors
+    "W",  # pycodestyle warnings
+    "F",  # pyflakes
+    "I",  # isort
+    "B",  # flake8-bugbear
+    "C4",  # flake8-comprehensions
+    "UP",  # pyupgrade
+]
+ignore = [
+    "E501",  # line too long, handled by ruff
+    "B008",  # do not perform function calls in argument defaults
+    "C901",  # too complex
+    "W191",  # indentation contains tabs
+]

ruff.toml

@@ -0,0 +1,44 @@
+import heapq
+
+
+def build_tree(s: str) -> dict[str, str]:
+    # составляем словарь частотности
+    d = {}
+    for c in s:
+        if c not in d:
+            d[c] = 0
+        d[c] += 1
+    if len(d) == 1:
+        return {s[0]: "0"}
+    # составляем очередь
+    q = [(v, k) for k, v in d.items()]
+    heapq.heapify(q)
+    tree = {}
+    # кодирование
+    while len(q) >= 2:
+        # достаем первые 2 элемента из очереди
+        v1, c1 = heapq.heappop(q)
+        v2, c2 = heapq.heappop(q)
+        # добавляем новый элемент
+        v3 = v1 + v2
+        c3 = c1 + c2
+        heapq.heappush(q, (v3, c3))
+        # рассматриваем левый узел
+        for c in c1:
+            if c not in tree:
+                tree[c] = ""
+            tree[c] += "0"
+        # рассматриваем правый узел
+        for c in c2:
+            if c not in tree:
+                tree[c] = ""
+            tree[c] += "1"
+    return tree
+
+
+def huffman(s: str) -> tuple[str, dict[str, str]]:
+    tree = build_tree(s)
+    result = ""
+    for c in s:
+        result += tree[c]
+    return result, tree

snippets/__init__.py

@@ -1,9 +1,10 @@
+from src.h_number_theory.fib_mod import fib_mod_pisano, fib_mod_two_last
+
 from .fib import (
+    fib_bine,
     fib_rec,
     fib_two_last,
-    fib_bine,
 )
-from src.h_number_theory.fib_mod import fib_mod_two_last, fib_mod_pisano
 
 __all__ = [
     "fib_rec",

snippets/huffman_heap.py

@@ -12,7 +12,7 @@ def fib_two_last(n: int) -> int:
     # Вычисление числа Фибоначчи методом двух последних чисел
     fib1 = 0
     fib2 = 1
-    for i in range(2, n + 1):
+    for _ in range(2, n + 1):
         fib1, fib2 = fib2, fib1 + fib2
     return fib2
 

src/a_intro/__init__.py

@@ -1,7 +1,7 @@
 # O(n)
 def brackets(s: str) -> int | None:
     open_brackets, close_brackets = "([{", ")]}"
-    d = dict(zip(open_brackets, close_brackets))
+    d = dict(zip(open_brackets, close_brackets, strict=False))
     stack = []
     for i, c in enumerate(s):
         if c in open_brackets:

src/a_intro/fib.py

@@ -5,7 +5,7 @@
 def net_packets(n: int, packets: list[tuple[int, int]], size: int) -> list[int]:
     queue: deque[int] = deque()
     start_times = []
-    for i, (arrival, duration) in enumerate(packets):
+    for arrival, duration in packets:
         # Удаляем из очереди пакеты, которые уже обработаны
         while queue and queue[0] <= arrival:
             queue.popleft()