flake8 max-line-length 120 -> 100

mbrickerd · mbrickerd · commit 38015594d7c3 · 2024-12-12T08:56:27.000+01:00
diff --git a/aoc/models/base.py b/aoc/models/base.py
@@ -38,8 +38,10 @@ def __init__(
             day (int, optional): The day number of the puzzle (1-25). Defaults to -1.
             part_num (int, optional): Which part of the day's puzzle (1 or 2). Defaults to 1.
             is_raw (bool, optional): Whether to load input as raw text. Defaults to `False`.
-            skip_test (bool, optional): Whether to use puzzle input instead of test input. Defaults to `True`.
-            benchmark (bool, optional): Whether to measure solution execution time. Defaults to `False`.
+            skip_test (bool, optional): Whether to use puzzle input instead of test input.
+                Defaults to `True`.
+            benchmark (bool, optional): Whether to measure solution execution time.
+                Defaults to `False`.
         """
         self.day = day
         self.part_num = part_num
diff --git a/aoc/models/file.py b/aoc/models/file.py
@@ -30,7 +30,9 @@ def get_path() -> str:
             str: Absolute path to either the directory containing the script or
                 the script's directory if it is itself a directory.
         """
-        return path if os.path.isdir(path := os.path.realpath(sys.argv[0])) else os.path.dirname(path)
+        return (
+            path if os.path.isdir(path := os.path.realpath(sys.argv[0])) else os.path.dirname(path)
+        )
 
     @staticmethod
     def get_session() -> str:
@@ -133,7 +135,9 @@ def download_test_input(day: int, part_num: int) -> str | None:
         if response.status_code == 200:
             content = response.text
             soup = BeautifulSoup(content, "html.parser")
-            code_elements = [element for element in soup.find_all("code") if element.text.count("\n") > 0]
+            code_elements = [
+                element for element in soup.find_all("code") if element.text.count("\n") > 0
+            ]
             return code_elements[part_num - 1].text
 
         else:
@@ -181,7 +185,9 @@ def add_day(day: int) -> None:
 
         if file_path.stat().st_size == 0:
             now = datetime.now()
-            available_to_download = datetime(int(path.split(os.sep)[-1].split("-")[-1]), 12, day, 5, 0, 0)
+            available_to_download = datetime(
+                int(path.split(os.sep)[-1].split("-")[-1]), 12, day, 5, 0, 0
+            )
 
             if now < available_to_download:
                 logger.info(
@@ -228,7 +234,9 @@ def add_test_input(day: int, part_num: int) -> None:
 
         if file_path.stat().st_size == 0:
             now = datetime.now()
-            available_to_download = datetime(int(path.split(os.sep)[-1].split("-")[-1]), 12, day, 5, 0, 0)
+            available_to_download = datetime(
+                int(path.split(os.sep)[-1].split("-")[-1]), 12, day, 5, 0, 0
+            )
 
             if now < available_to_download:
                 logger.info(
@@ -256,7 +264,8 @@ def add_test_file(day: int) -> None:
             day (int): The day number (1-25) to create test file for.
 
         Note:
-            Creates test file at: `tests/test_XX.py` using template from `templates/tests/sample.txt`
+            Creates test file at:
+                `tests/test_XX.py` using template from `templates/tests/sample.txt`
             Replaces placeholders in template with actual day number.
 
         Raises:
diff --git a/aoc/models/reader.py b/aoc/models/reader.py
@@ -26,7 +26,9 @@ def get_path() -> str:
             str: Absolute path to either the directory containing the script or
                 the script's directory if it is itself a directory.
         """
-        return path if os.path.isdir(path := os.path.realpath(sys.argv[0])) else os.path.dirname(path)
+        return (
+            path if os.path.isdir(path := os.path.realpath(sys.argv[0])) else os.path.dirname(path)
+        )
 
     @staticmethod
     def get_puzzle_input(day: int, is_raw: bool) -> List[str]:
@@ -65,6 +67,8 @@ def get_test_input(day: int, is_raw: bool, part_num: int) -> List[str]:
             Expects input file at: `tests/data/dayXX/test_YY_input.txt`
             where `XX` is the zero-padded day number and `YY` is the zero-padded part number.
         """
-        file_path = os.path.join(Reader.PROJECT_ROOT, f"tests/data/day{day:02d}/test_{part_num:02d}_input.txt")
+        file_path = os.path.join(
+            Reader.PROJECT_ROOT, f"tests/data/day{day:02d}/test_{part_num:02d}_input.txt"
+        )
         with open(file_path, "r") as file:
             return [line.strip("\n") if is_raw else line.strip() for line in file.readlines()]
diff --git a/aoc/models/submission.py b/aoc/models/submission.py
@@ -26,7 +26,9 @@ def get_path() -> str:
             str: Absolute path to either the directory containing the script or
                  the script's directory if it is itself a directory.
         """
-        return path if os.path.isdir(path := os.path.realpath(sys.argv[0])) else os.path.dirname(path)
+        return (
+            path if os.path.isdir(path := os.path.realpath(sys.argv[0])) else os.path.dirname(path)
+        )
 
     @staticmethod
     def get_session() -> str:
diff --git a/aoc/models/tester.py b/aoc/models/tester.py
@@ -57,4 +57,6 @@ def run_test(
         result = part_method(data=test_input)
 
         # Assert the result
-        assert result == expected, f"Test failed for Day {day}, Part {part_num}: Expected {expected}, got {result}."
+        assert (
+            result == expected
+        ), f"Test failed for Day {day}, Part {part_num}: Expected {expected}, got {result}."
diff --git a/main.py b/main.py
@@ -136,7 +136,9 @@ def main():
             args.day, args.part, args.raw, args.skip_test, args.benchmark
         )
         logger.info(
-            f"The test answer is {answer}\n" if (answer := solution.solve(part_num=args.part)) is not None else ""
+            f"The test answer is {answer}\n"
+            if (answer := solution.solve(part_num=args.part)) is not None
+            else ""
         )
         solution.benchmark(_print=True)
 
@@ -145,7 +147,11 @@ def main():
         solution = import_module(f"solutions.day{args.day:02d}").Solution(
             args.day, args.part, args.raw, args.skip_test, args.benchmark
         )
-        logger.info(f"The answer is {answer}\n" if (answer := solution.solve(part_num=args.part)) is not None else "")
+        logger.info(
+            f"The answer is {answer}\n"
+            if (answer := solution.solve(part_num=args.part)) is not None
+            else ""
+        )
         solution.benchmark(_print=True)
 
         if answer and args.submit is True:
diff --git a/pyproject.toml b/pyproject.toml
@@ -23,17 +23,17 @@ pytest = "^8.3.4"
 flake8-pyproject = "^1.2.3"
 
 [tool.black]
-line-length = 120
+line-length = 100
 target-version = ["py311"]
 include = '\.pyi?$'
 
 [tool.isort]
 profile = "black"
-line_length = 120
+line_length = 100
 multi_line_output = 3
 
 [tool.flake8]
-max-line-length = 120
+max-line-length = 100
 extend-ignore = ["E203", "W503"]
 exclude = [".venv", ".git", "__pycache__"]
 
diff --git a/solutions/day02.py b/solutions/day02.py
@@ -115,7 +115,10 @@ def part2(self, data: List[str]) -> int:
         """
         return sum(
             any(
-                (self.is_increasing(ls[:i] + ls[i + 1 :]) or self.is_decreasing(ls[:i] + ls[i + 1 :]))
+                (
+                    self.is_increasing(ls[:i] + ls[i + 1 :])
+                    or self.is_decreasing(ls[:i] + ls[i + 1 :])
+                )
                 and self.between_range(ls[:i] + ls[i + 1 :])
                 for i in range(len(ls))
             )
diff --git a/solutions/day04.py b/solutions/day04.py
@@ -34,7 +34,9 @@ def check_mas(self, data: List[str], row: int, col: int, dr: int, dc: int) -> bo
         rows, cols = len(data), len(data[0])
         pattern = "MAS"
         return all(
-            0 <= row + i * dr < rows and 0 <= col + i * dc < cols and data[row + i * dr][col + i * dc] == pattern[i]
+            0 <= row + i * dr < rows
+            and 0 <= col + i * dc < cols
+            and data[row + i * dr][col + i * dc] == pattern[i]
             for i in range(3)
         )
 
@@ -69,7 +71,9 @@ def part1(self, data: List[str]) -> int:
             for c in range(cols):
                 for dr, dc in directions:
                     if all(
-                        0 <= r + i * dr < rows and 0 <= c + i * dc < cols and data[r + i * dr][c + i * dc] == "XMAS"[i]
+                        0 <= r + i * dr < rows
+                        and 0 <= c + i * dc < cols
+                        and data[r + i * dr][c + i * dc] == "XMAS"[i]
                         for i in range(4)
                     ):
                         count += 1
diff --git a/solutions/day05.py b/solutions/day05.py
@@ -50,7 +50,8 @@ def is_valid_order(self, pages: List[int], rules: List[Tuple[int, int]]) -> bool
 
         Args:
             pages (List[int]): List of page numbers in their print order
-            rules (List[Tuple[int, int]]): List of (before, after) pairs specifying required ordering
+            rules (List[Tuple[int, int]]): List of (before, after) pairs specifying
+                required ordering
 
         Returns:
             bool: `True` if all rules are satisfied (each 'before' page appears before its
@@ -60,7 +61,9 @@ def is_valid_order(self, pages: List[int], rules: List[Tuple[int, int]]) -> bool
         """
         position = {num: i for i, num in enumerate(pages)}
         return all(
-            position[before] < position[after] for before, after in rules if before in position and after in position
+            position[before] < position[after]
+            for before, after in rules
+            if before in position and after in position
         )
 
     def fix_order(self, pages: List[int], rules: List[tuple]) -> List[int]:
@@ -99,7 +102,9 @@ def part1(self, data: List[str]) -> int:
                 (orders that already satisfy all rules).
         """
         rules, ordering = self.parse_data(data)
-        return sum(pages[len(pages) // 2] for pages in ordering if self.is_valid_order(pages, rules))
+        return sum(
+            pages[len(pages) // 2] for pages in ordering if self.is_valid_order(pages, rules)
+        )
 
     def part2(self, data: List[str]) -> int:
         """Sum middle pages from fixed invalid print orders.
@@ -113,5 +118,7 @@ def part2(self, data: List[str]) -> int:
         """
         rules, ordering = self.parse_data(data)
         return sum(
-            self.fix_order(pages, rules)[len(pages) // 2] for pages in ordering if not self.is_valid_order(pages, rules)
+            self.fix_order(pages, rules)[len(pages) // 2]
+            for pages in ordering
+            if not self.is_valid_order(pages, rules)
         )
diff --git a/solutions/day06.py b/solutions/day06.py
@@ -34,7 +34,12 @@ def find_start(self, grid: List[List[str]]) -> Tuple[int, int, str]:
             Tuple[int, int, str]: Row index, column index, and direction character
                 of the guard's start position.
         """
-        return next((i, j, char) for i, row in enumerate(grid) for j, char in enumerate(row) if char in "^>v<")
+        return next(
+            (i, j, char)
+            for i, row in enumerate(grid)
+            for j, char in enumerate(row)
+            if char in "^>v<"
+        )
 
     def get_next_position(self, row: int, col: int, dir: str) -> Tuple[int, int]:
         """Calculate next position based on current position and direction.
diff --git a/solutions/day08.py b/solutions/day08.py
@@ -71,7 +71,9 @@ def distance(self, p1: Tuple[int, int], p2: Tuple[int, int]) -> float:
         """
         return ((p1[0] - p2[0]) ** 2 + (p1[1] - p2[1]) ** 2) ** 0.5
 
-    def find_antinodes(self, ant1: Tuple[int, int], ant2: Tuple[int, int], data: List[str]) -> Set[Tuple[int, int]]:
+    def find_antinodes(
+        self, ant1: Tuple[int, int], ant2: Tuple[int, int], data: List[str]
+    ) -> Set[Tuple[int, int]]:
         """Find all antinodes created by a pair of antennas.
 
         For Part 1, antinodes occur at points where one antenna is twice as far
diff --git a/solutions/day09.py b/solutions/day09.py
@@ -130,7 +130,9 @@ def part1(self, data: List[str]) -> int:
 
         while space_count and current_space_idx is not None:
             if len(current_block) == 0:
-                while blocks and blocks[-1].type == Block.TYPE_SPACE and not blocks[-1].filled_files:
+                while (
+                    blocks and blocks[-1].type == Block.TYPE_SPACE and not blocks[-1].filled_files
+                ):
                     blocks.pop()
                     if space_idx:
                         space_idx.pop()
diff --git a/solutions/day10.py b/solutions/day10.py
@@ -21,7 +21,9 @@ class Solution(SolutionBase):
     and calculate trailhead scores.
     """
 
-    def get_neighbors(self, grid: List[List[int]], x: int, y: int, target_height: int) -> List[Tuple[int, int]]:
+    def get_neighbors(
+        self, grid: List[List[int]], x: int, y: int, target_height: int
+    ) -> List[Tuple[int, int]]:
         """Find valid neighboring positions with a specific target height.
 
         Args:
@@ -38,12 +40,18 @@ def get_neighbors(self, grid: List[List[int]], x: int, y: int, target_height: in
         neighbors = []
         for dx, dy in [(0, 1), (1, 0), (0, -1), (-1, 0)]:  # right, down, left, up
             new_x, new_y = x + dx, y + dy
-            if 0 <= new_x < len(grid) and 0 <= new_y < len(grid[0]) and grid[new_x][new_y] == target_height:
+            if (
+                0 <= new_x < len(grid)
+                and 0 <= new_y < len(grid[0])
+                and grid[new_x][new_y] == target_height
+            ):
                 neighbors.append((new_x, new_y))
 
         return neighbors
 
-    def find_paths_to_nine(self, grid: List[List[int]], start_x: int, start_y: int) -> Set[Tuple[int, int]]:
+    def find_paths_to_nine(
+        self, grid: List[List[int]], start_x: int, start_y: int
+    ) -> Set[Tuple[int, int]]:
         """Find all height-9 positions reachable via valid hiking trails from a starting position.
 
         A valid hiking trail must:
