formatting and cosmetic updates to 2020.

2020/days/01/day1.py

@@ -2,41 +2,43 @@
 
 import pathlib
 import sys
-import re
-from dataclasses import dataclass
+
 
 def parse(puzzle_input):
     """Parse input"""
     return [int(string) for string in puzzle_input.splitlines()]
 
-def part1(data:list[int]):
+
+def part1(data: list[int]):
     """Solve part 1"""
     data.sort()
     while True:
-        if len(data)<2:
-            raise ValueError('no match found')
-        s = data[0]+data[-1]
-        if s>2020:
+        if len(data) < 2:
+            raise ValueError("no match found")
+        s = data[0] + data[-1]
+        if s > 2020:
             data.pop(-1)
-        elif s<2020:
+        elif s < 2020:
             data.pop(0)
         else:
-            return data[0]*data[-1]
+            return data[0] * data[-1]
+
 
 def part2(data):
     """Solve part 2"""
     data.sort()
     while True:
-        if len(data)<3:
-            raise ValueError('no match found')
-        if data[0]+data[1]+data[-1]>2020:
+        if len(data) < 3:
+            raise ValueError("no match found")
+        if data[0] + data[1] + data[-1] > 2020:
             data.pop(-1)
-        elif data[0]+data[-1]+data[-2]<2020:
+        elif data[0] + data[-1] + data[-2] < 2020:
             data.pop(0)
-        elif data[0]+data[1]+data[-1]==2020:
-            return data[0]*data[1]*data[-1]
+        elif data[0] + data[1] + data[-1] == 2020:
+            return data[0] * data[1] * data[-1]
         else:
-            return data[0]*data[-1]*data[-2]
+            return data[0] * data[-1] * data[-2]
+
 
 def solve(puzzle_input):
     """Solve the puzzle for the given input"""
@@ -46,6 +48,7 @@ def solve(puzzle_input):
 
     return solution1, solution2
 
+
 if __name__ == "__main__":
     for path in sys.argv[1:]:
         print(f"{path}:")

2020/days/01/test_day1.py

@@ -6,28 +6,24 @@ import day1 as aoc
 
 PUZZLE_DIR = pathlib.Path(__file__).parent
 
-#these test fixtures setup the test, mainly by reading the filename into a string in this simple case.
+
+# these test fixtures setup the test, mainly by reading the filename into a string in this simple case.
 @pytest.fixture
-def example1():
-    puzzle_input = (PUZZLE_DIR / "example1").read_text().strip()
+def example():
+    puzzle_input = (PUZZLE_DIR / "example").read_text().strip()
     return aoc.parse(puzzle_input)
 
-@pytest.fixture
-def example2():
-    puzzle_input = (PUZZLE_DIR / "example2").read_text().strip()
-    return aoc.parse(puzzle_input)
 
-# @pytest.mark.skip(reason="Not implemented")
-def test_parse_example1(example1):
+def test_parse(example):
     """Test that input is parsed properly"""
-    assert example1 == [1721, 979, 366, 299, 675, 1456]
+    assert example == [1721, 979, 366, 299, 675, 1456]
 
-# @pytest.mark.skip(reason="Not implemented")
-def test_part1_example1(example1):
+
+def test_part1(example):
     """Test part 1 on example input"""
-    assert aoc.part1(example1) == 514579
+    assert aoc.part1(example) == 514579
 
-# @pytest.mark.skip(reason="Not implemented")
-def test_part2_example2(example1):
+
+def test_part2(example):
     """Test part 2 on example input"""
-    assert aoc.part2(example1) == 241861950
+    assert aoc.part2(example) == 241861950