Formatting and linting

Author: mbrickerd

.github/workflows/python-ci.yml

@@ -44,7 +44,7 @@ jobs:
         run: poetry run black . --check
 
       - name: Lint with flake8
-        run: poetry run flake8 . --max-line-length=100
+        run: poetry run flake8 . --max-line-length=120 --exclude=.venv
 
   test:
     name: Tests

aoc/models/file.py

@@ -1,11 +1,10 @@
 import json
 import os
 import sys
-import urllib.parse
 from datetime import datetime
 from pathlib import Path
 from time import sleep
-from typing import Dict, Optional
+from typing import Dict
 from urllib.request import Request, urlopen
 
 import requests
@@ -203,7 +202,8 @@ def add_day(day: int) -> None:
 
             while now < available_to_download:
                 logger.info(
-                    "\033[Fnow:", now.strftime("%Y-%m-%d %H:%M:%S.%f")[:-3], "UTC"
+                    "\033[Fnow:", now.strftime(
+                        "%Y-%m-%d %H:%M:%S.%f")[:-3], "UTC"
                 )
                 sleep(1)
                 now = datetime.now()
@@ -254,7 +254,8 @@ def add_test_input(day: int, part_num: int) -> None:
 
             while now < available_to_download:
                 logger.info(
-                    "\033[Fnow:", now.strftime("%Y-%m-%d %H:%M:%S.%f")[:-3], "UTC"
+                    "\033[Fnow:", now.strftime(
+                        "%Y-%m-%d %H:%M:%S.%f")[:-3], "UTC"
                 )
                 sleep(1)
                 now = datetime.now()
@@ -289,7 +290,8 @@ def add_test_file(day: int) -> None:
         if not test_path.exists():
             sample_file = f"{path}/templates/tests/sample.txt"
             if not os.path.exists(sample_file):
-                raise FileNotFoundError(f"Template file not found: {sample_file}")
+                raise FileNotFoundError(
+                    f"Template file not found: {sample_file}")
 
             with open(sample_file, "r") as file:
                 content = file.read()

aoc/models/reader.py

@@ -15,7 +15,8 @@ class Reader:
             the `aoc` package location.
     """
 
-    PROJECT_ROOT = os.path.dirname(os.path.abspath(__file__).rsplit("aoc", 1)[0])
+    PROJECT_ROOT = os.path.dirname(
+        os.path.abspath(__file__).rsplit("aoc", 1)[0])
 
     @staticmethod
     def get_path() -> str:

aoc/models/submission.py

@@ -110,13 +110,15 @@ def submit(day: int, level: int, answer: int) -> None:
         values = {"level": level, "answer": answer}
         data = urllib.parse.urlencode(values).encode("utf-8")
 
-        req = urllib.request.Request(url, method=method, headers=headers, data=data)
+        req = urllib.request.Request(
+            url, method=method, headers=headers, data=data)
 
         with urllib.request.urlopen(req) as response:
             content = response.read().decode("utf-8")
 
         # Extract and format the response message
-        article = re.findall(r"<article>(.*?)</article>", content, re.DOTALL)[0]
+        article = re.findall(r"<article>(.*?)</article>",
+                             content, re.DOTALL)[0]
         article = "".join(article.split("</p>"))
         article = article.replace("\n", "")
         article = re.sub(r"<.*?>", "", article, re.DOTALL)

solutions/day02.py

@@ -117,10 +117,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 :])
+                and self.between_range(ls[:i] + ls[i + 1:])
                 for i in range(len(ls))
             )
             or (

solutions/day05.py

@@ -41,8 +41,10 @@ def parse_data(
                     "3,1,2"
                 Returns: ([(1,2), (2,3)], [[1,2,3], [3,1,2]])
         """
-        rules, ordering = [part.splitlines() for part in "\n".join(data).split("\n\n")]
-        rules = [(int(a), int(b)) for a, b in (rule.split("|") for rule in rules)]
+        rules, ordering = [part.splitlines()
+                           for part in "\n".join(data).split("\n\n")]
+        rules = [(int(a), int(b))
+                 for a, b in (rule.split("|") for rule in rules)]
         ordering = [[int(x) for x in line.split(",")] for line in ordering]
 
         return rules, ordering

solutions/day06.py

@@ -21,7 +21,8 @@ class Solution(SolutionBase):
     guard movement and analyze possible paths.
     """
 
-    moves = {"^": (-1, 0), ">": (0, 1), "v": (1, 0), "<": (0, -1)}  # Direction vectors
+    moves = {"^": (-1, 0), ">": (0, 1), "v": (1, 0),
+             "<": (0, -1)}  # Direction vectors
     turns = {"^": ">", ">": "v", "v": "<", "<": "^"}  # Right turn mappings
 
     def find_start(self, grid: List[List[str]]) -> Tuple[int, int, str]:

solutions/day08.py

@@ -149,7 +149,7 @@ def part1(self, data: List[str]) -> int:
         for positions in antennas.values():
             # For each pair of same-frequency antennas
             for i, ant1 in enumerate(positions):
-                for ant2 in positions[i + 1 :]:
+                for ant2 in positions[i + 1:]:
                     # Find antinodes for this pair
                     antinodes = self.find_antinodes(ant1, ant2, data)
                     all_antinodes.update(antinodes)
@@ -181,7 +181,7 @@ def part2(self, data: List[str]) -> int:
 
             # For each pair of same-frequency antennas
             for i, ant1 in enumerate(positions):
-                for j, ant2 in enumerate(positions[i + 1 :], start=i + 1):
+                for j, ant2 in enumerate(positions[i + 1:], start=i + 1):
                     # Add both antenna positions as they are collinear with at least two antennas
                     all_antinodes.add(ant1)
                     all_antinodes.add(ant2)