formatting and cosmetic updates to 2020.

2020/days/06/day6.py

@@ -2,15 +2,14 @@
 
 import pathlib
 import sys
-import re
-from dataclasses import dataclass
-from pprint import pprint
+
 
 def parse(puzzle_input: str):
     """Parse input"""
-    records = [[list(y) for y in x.splitlines()] for x in puzzle_input.split('\n\n')]
+    records = [[list(y) for y in x.splitlines()] for x in puzzle_input.split("\n\n")]
     return records
 
+
 def part1(data):
     """Solve part 1"""
     results = []
@@ -21,6 +20,7 @@ def part1(data):
         results.append(len(result))
     return sum(results)
 
+
 def part2(data):
     """Solve part 2"""
     results = []
@@ -31,6 +31,7 @@ def part2(data):
         results.append(len(result))
     return sum(results)
 
+
 def solve(puzzle_input):
     """Solve the puzzle for the given input"""
     data = parse(puzzle_input)
@@ -39,6 +40,7 @@ def solve(puzzle_input):
 
     return solution1, solution2
 
+
 if __name__ == "__main__":
     for path in sys.argv[1:]:
         print(f"{path}:")

2020/days/06/test_day6.py

@@ -6,50 +6,33 @@ import day6 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.txt").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 == [
-            [
-                ['a', 'b', 'c']
-                ],
-            [
-                ['a'],
-                ['b'],
-                ['c']
-                ],
-            [
-                ['a', 'b'],
-                ['a', 'c']
-            ],
-            [
-                ['a'],
-                ['a'],
-                ['a'],
-                ['a']
-            ],
-            [
-                ['b']
-            ]
-            ]
+    assert example == [
+        [["a", "b", "c"]],
+        [["a"], ["b"], ["c"]],
+        [["a", "b"], ["a", "c"]],
+        [["a"], ["a"], ["a"], ["a"]],
+        [["b"]],
+    ]
+
 
 # @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) == 11
+    assert aoc.part1(example) == 11
+
 
 # @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) == 6
+    assert aoc.part2(example) == 6