Merge pull request #59 from marcelblijleven/ci/fix-pipelines

Ci/fix pipelines

Author: marcelblijleven

.github/workflows/update_readme.yaml

@@ -27,5 +27,5 @@ jobs:
       run: |
         git config --global user.name 'Marcel Blijleven'
         git config --global user.email '[email protected]'
-        [[ -n $(git status -s) ]] && git commit -am "docs: update README"
+        [[ -n $(git status -s) ]] && git add -A && git commit -m "docs: update README"
         git push

src/adventofcode/year_2023/day_01_2023.py

@@ -1,5 +1,5 @@
-from adventofcode.util.exceptions import SolutionNotFoundError
 from adventofcode.registry.decorators import register_solution
+from adventofcode.util.exceptions import SolutionNotFoundError
 from adventofcode.util.input_helpers import get_input_for_day
 
 DIGITS = {
@@ -87,7 +87,7 @@ def part_two(input_data: list[str]):
     return answer
 
 
-if __name__ == '__main__':
+if __name__ == "__main__":
     data = get_input_for_day(2023, 1)
     part_one(data)
     part_two(data)

src/adventofcode/year_2023/day_02_2023.py

@@ -1,22 +1,20 @@
-import functools
 import math
-import operator
 import re
 
-from adventofcode.util.exceptions import SolutionNotFoundError
 from adventofcode.registry.decorators import register_solution
+from adventofcode.util.exceptions import SolutionNotFoundError
 from adventofcode.util.input_helpers import get_input_for_day
 
-game_pattern = re.compile("(?:(?P<amount>\d+)\s|(?P<color>red|blue|green))")
+game_pattern = re.compile(r"(?:(?P<amount>\d+)\s|(?P<color>red|blue|green))")
 
 
 def parse_game(line) -> list[dict[str, int]]:
     prefix, game = line.split(": ")
     game_values = []
     rounds = game.split("; ")
 
-    for round in rounds:
-        pairs = round.split(", ")
+    for _round in rounds:
+        pairs = _round.split(", ")
 
         round_values = {}
         for pair in pairs:
@@ -70,7 +68,7 @@ def find_possibilities(lines: list[str]) -> int:
 
 def find_minimum_possible(lines: list[str]) -> int:
     total: int = 0
-    for game_number, line in enumerate(lines, start=1):
+    for line in lines:
         game_values = parse_game(line)
 
         total += check_minimum(game_values)
@@ -98,7 +96,7 @@ def part_two(input_data: list[str]):
     return answer
 
 
-if __name__ == '__main__':
+if __name__ == "__main__":
     data = get_input_for_day(2023, 2)
     part_one(data)
     part_two(data)

tests/adventofcode/year_2023/test_day_01_2023.py

@@ -1,8 +1,11 @@
 import pytest
 
-from adventofcode.year_2023.day_01_2023 import (part_two, part_one, get_calibration_value,
-                                                get_calibration_value_with_words,
-                                                )
+from adventofcode.year_2023.day_01_2023 import (
+    get_calibration_value,
+    get_calibration_value_with_words,
+    part_one,
+    part_two,
+)
 
 test_input = [
     "1abc2",
@@ -22,25 +25,31 @@
 ]
 
 
-@pytest.mark.parametrize(["line", "expected"], [
-    ("1abc2", 12),
-    ("pqr3stu8vwx", 38),
-    ("a1b2c3d4e5f", 15),
-    ("treb7uchet", 77),
-])
+@pytest.mark.parametrize(
+    ["line", "expected"],
+    [
+        ("1abc2", 12),
+        ("pqr3stu8vwx", 38),
+        ("a1b2c3d4e5f", 15),
+        ("treb7uchet", 77),
+    ],
+)
 def test_get_calibration_value(line, expected):
     assert get_calibration_value(line) == expected
 
 
-@pytest.mark.parametrize(["line", "expected"], [
-    ("two1nine", 29),
-    ("eightwothree", 83),
-    ("abcone2threexyz", 13),
-    ("xtwone3four", 24),
-    ("4nineeightseven2", 42),
-    ("zoneight234", 14),
-    ("7pqrstsixteen", 76),
-])
+@pytest.mark.parametrize(
+    ["line", "expected"],
+    [
+        ("two1nine", 29),
+        ("eightwothree", 83),
+        ("abcone2threexyz", 13),
+        ("xtwone3four", 24),
+        ("4nineeightseven2", 42),
+        ("zoneight234", 14),
+        ("7pqrstsixteen", 76),
+    ],
+)
 def test_get_calibration_value_with_words(line, expected):
     assert get_calibration_value_with_words(line) == expected
 

tests/adventofcode/year_2023/test_day_02_2023.py

@@ -1,6 +1,6 @@
 import pytest
 
-from adventofcode.year_2023.day_02_2023 import part_two, part_one, parse_game
+from adventofcode.year_2023.day_02_2023 import parse_game, part_one, part_two
 
 test_input = [
     "Game 1: 3 blue, 4 red; 1 red, 2 green, 6 blue; 2 green",
@@ -11,21 +11,31 @@
 ]
 
 
-@pytest.mark.parametrize(["game", "expected"], [
-    ("Game 1: 3 blue, 4 red; 1 red, 2 green, 6 blue; 2 green",
-     [{'blue': 3, 'red': 4}, {'blue': 6, 'green': 2, 'red': 1}, {'green': 2}]),
-    ("Game 2: 1 blue, 2 green; 3 green, 4 blue, 1 red; 1 green, 1 blue", [{'blue': 1, 'green': 2},
-                                                                          {'blue': 4, 'green': 3, 'red': 1},
-                                                                          {'blue': 1, 'green': 1}]),
-    ("Game 3: 8 green, 6 blue, 20 red; 5 blue, 4 red, 13 green; 5 green, 1 red", [{'blue': 6, 'green': 8, 'red': 20},
-                                                                                  {'blue': 5, 'green': 13, 'red': 4},
-                                                                                  {'green': 5, 'red': 1}]),
-    ("Game 4: 1 green, 3 red, 6 blue; 3 green, 6 red; 3 green, 15 blue, 14 red", [{'blue': 6, 'green': 1, 'red': 3},
-                                                                                  {'green': 3, 'red': 6},
-                                                                                  {'blue': 15, 'green': 3, 'red': 14}]),
-    ("Game 5: 6 red, 1 blue, 3 green; 2 blue, 1 red, 2 green",
-     [{'blue': 1, 'green': 3, 'red': 6}, {'blue': 2, 'green': 2, 'red': 1}]),
-])
+@pytest.mark.parametrize(
+    ["game", "expected"],
+    [
+        (
+            "Game 1: 3 blue, 4 red; 1 red, 2 green, 6 blue; 2 green",
+            [{"blue": 3, "red": 4}, {"blue": 6, "green": 2, "red": 1}, {"green": 2}],
+        ),
+        (
+            "Game 2: 1 blue, 2 green; 3 green, 4 blue, 1 red; 1 green, 1 blue",
+            [{"blue": 1, "green": 2}, {"blue": 4, "green": 3, "red": 1}, {"blue": 1, "green": 1}],
+        ),
+        (
+            "Game 3: 8 green, 6 blue, 20 red; 5 blue, 4 red, 13 green; 5 green, 1 red",
+            [{"blue": 6, "green": 8, "red": 20}, {"blue": 5, "green": 13, "red": 4}, {"green": 5, "red": 1}],
+        ),
+        (
+            "Game 4: 1 green, 3 red, 6 blue; 3 green, 6 red; 3 green, 15 blue, 14 red",
+            [{"blue": 6, "green": 1, "red": 3}, {"green": 3, "red": 6}, {"blue": 15, "green": 3, "red": 14}],
+        ),
+        (
+            "Game 5: 6 red, 1 blue, 3 green; 2 blue, 1 red, 2 green",
+            [{"blue": 1, "green": 3, "red": 6}, {"blue": 2, "green": 2, "red": 1}],
+        ),
+    ],
+)
 def test_parse_game(game, expected):
     assert parse_game(game) == expected