From f2740a1e36e3ceea38f5449695d1d3111cae5d79 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 6 Jan 2021 04:04:49 +0000
Subject: [PATCH 001/371] Bump numpy from 1.19.4 to 1.19.5

Bumps [numpy](https://github.com/numpy/numpy) from 1.19.4 to 1.19.5.
- [Release notes](https://github.com/numpy/numpy/releases)
- [Changelog](https://github.com/numpy/numpy/blob/master/doc/HOWTO_RELEASE.rst.txt)
- [Commits](https://github.com/numpy/numpy/compare/v1.19.4...v1.19.5)

Signed-off-by: dependabot[bot] <support@github.com>
---
 requirements.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/requirements.txt b/requirements.txt
index 0881e459..d8b4c25b 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -3,7 +3,7 @@ black
 Click
 cookiecutter
 matplotlib
-numpy==1.19.4
+numpy==1.19.5
 pytest
 pytest-cov
 pytest-xdist

From 5f4ec1271108244bcc2dbba3fd09655cce2bff83 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 1 Feb 2021 04:25:52 +0000
Subject: [PATCH 002/371] Bump numpy from 1.19.5 to 1.20.0

Bumps [numpy](https://github.com/numpy/numpy) from 1.19.5 to 1.20.0.
- [Release notes](https://github.com/numpy/numpy/releases)
- [Changelog](https://github.com/numpy/numpy/blob/master/doc/HOWTO_RELEASE.rst.txt)
- [Commits](https://github.com/numpy/numpy/compare/v1.19.5...v1.20.0)

Signed-off-by: dependabot[bot] <support@github.com>
---
 requirements.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/requirements.txt b/requirements.txt
index d8b4c25b..3538b247 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -3,7 +3,7 @@ black
 Click
 cookiecutter
 matplotlib
-numpy==1.19.5
+numpy==1.20.0
 pytest
 pytest-cov
 pytest-xdist

From fc566325abd761542041055851b00d648cb91f88 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 12 May 2021 05:30:22 +0000
Subject: [PATCH 003/371] Bump actions/setup-python from 2 to 2.2.2

Bumps [actions/setup-python](https://github.com/actions/setup-python) from 2 to 2.2.2.
- [Release notes](https://github.com/actions/setup-python/releases)
- [Commits](https://github.com/actions/setup-python/compare/v2...v2.2.2)

Signed-off-by: dependabot[bot] <support@github.com>
---
 .github/workflows/tox.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/tox.yml b/.github/workflows/tox.yml
index dbc47138..aa918d34 100644
--- a/.github/workflows/tox.yml
+++ b/.github/workflows/tox.yml
@@ -14,7 +14,7 @@ jobs:
     - uses: actions/checkout@v2
 
     - name: Set up Python ${{ matrix.python-version }}
-      uses: actions/setup-python@v2
+      uses: actions/setup-python@v2.2.2
       with:
         python-version: ${{ matrix.python-version }}
 

From ff18212211029d1ed16e5a5e90e76e90cc014f06 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 14 Sep 2021 01:03:44 +0000
Subject: [PATCH 004/371] Bump codecov/codecov-action from 1 to 2.1.0

Bumps [codecov/codecov-action](https://github.com/codecov/codecov-action) from 1 to 2.1.0.
- [Release notes](https://github.com/codecov/codecov-action/releases)
- [Changelog](https://github.com/codecov/codecov-action/blob/master/CHANGELOG.md)
- [Commits](https://github.com/codecov/codecov-action/compare/v1...v2.1.0)

---
updated-dependencies:
- dependency-name: codecov/codecov-action
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 .github/workflows/tox.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/tox.yml b/.github/workflows/tox.yml
index dbc47138..b4d6a020 100644
--- a/.github/workflows/tox.yml
+++ b/.github/workflows/tox.yml
@@ -33,7 +33,7 @@ jobs:
       run: tox -e py
 
     - name: Upload coverage to Codecov
-      uses: codecov/codecov-action@v1
+      uses: codecov/codecov-action@v2.1.0
       with:
         file: ./coverage.xml
         fail_ci_if_error: true

From 7c785c0c476680540c37a23536c05228760676df Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 5 Nov 2021 04:06:28 +0000
Subject: [PATCH 005/371] Bump numpy from 1.20.0 to 1.21.4

Bumps [numpy](https://github.com/numpy/numpy) from 1.20.0 to 1.21.4.
- [Release notes](https://github.com/numpy/numpy/releases)
- [Changelog](https://github.com/numpy/numpy/blob/main/doc/HOWTO_RELEASE.rst.txt)
- [Commits](https://github.com/numpy/numpy/compare/v1.20.0...v1.21.4)

---
updated-dependencies:
- dependency-name: numpy
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 requirements.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/requirements.txt b/requirements.txt
index 3538b247..2d2fba68 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -3,7 +3,7 @@ black
 Click
 cookiecutter
 matplotlib
-numpy==1.20.0
+numpy==1.21.4
 pytest
 pytest-cov
 pytest-xdist

From bf1c593b9e4856e454d8053df20d8b6271de1609 Mon Sep 17 00:00:00 2001
From: Roel Adriaans <roel.adriaans@ordina.nl>
Date: Tue, 9 Nov 2021 21:47:50 +0100
Subject: [PATCH 006/371] Run black against newest version

---
 src/adventofcode2020/solutions/day05.py                       | 4 ++--
 src/adventofcode2020/solutions/day11.py                       | 4 ++--
 src/adventofcode2020/solutions/day14.py                       | 2 +-
 .../tests/solutions/test_{{cookiecutter.file_name}}_a.py      | 2 +-
 .../tests/solutions/test_{{cookiecutter.file_name}}_b.py      | 2 +-
 tests/solutions/test_day01_a.py                               | 2 +-
 tests/solutions/test_day01_b.py                               | 2 +-
 tests/solutions/test_day02_a.py                               | 2 +-
 tests/solutions/test_day02_b.py                               | 2 +-
 tests/solutions/test_day03_a.py                               | 2 +-
 tests/solutions/test_day03_b.py                               | 2 +-
 tests/solutions/test_day04_a.py                               | 2 +-
 tests/solutions/test_day04_b.py                               | 2 +-
 tests/solutions/test_day05_a.py                               | 2 +-
 tests/solutions/test_day05_b.py                               | 2 +-
 tests/solutions/test_day06_a.py                               | 2 +-
 tests/solutions/test_day06_b.py                               | 2 +-
 tests/solutions/test_day07_a.py                               | 2 +-
 tests/solutions/test_day07_b.py                               | 2 +-
 tests/solutions/test_day08_a.py                               | 2 +-
 tests/solutions/test_day08_b.py                               | 2 +-
 tests/solutions/test_day09_a.py                               | 2 +-
 tests/solutions/test_day09_b.py                               | 2 +-
 tests/solutions/test_day10_a.py                               | 2 +-
 tests/solutions/test_day10_b.py                               | 2 +-
 tests/solutions/test_day11_a.py                               | 2 +-
 tests/solutions/test_day11_b.py                               | 2 +-
 tests/solutions/test_day12_a.py                               | 2 +-
 tests/solutions/test_day12_b.py                               | 2 +-
 tests/solutions/test_day13_a.py                               | 2 +-
 tests/solutions/test_day13_b.py                               | 2 +-
 tests/solutions/test_day14_a.py                               | 2 +-
 tests/solutions/test_day14_b.py                               | 2 +-
 tests/solutions/test_day15_a.py                               | 2 +-
 34 files changed, 36 insertions(+), 36 deletions(-)

diff --git a/src/adventofcode2020/solutions/day05.py b/src/adventofcode2020/solutions/day05.py
index 0c72c2b1..9a8385cd 100644
--- a/src/adventofcode2020/solutions/day05.py
+++ b/src/adventofcode2020/solutions/day05.py
@@ -22,7 +22,7 @@ def from_str(input_str) -> BoardingTicket:
 class Day05:
     @staticmethod
     def compute_position_row(input_str: str) -> int:
-        """ Compute binary string to place in the plane, compute the row"""
+        """Compute binary string to place in the plane, compute the row"""
         hi = 128
         lo = 0
         for x in input_str[:6]:
@@ -41,7 +41,7 @@ def compute_position_row(input_str: str) -> int:
 
     @staticmethod
     def compute_position_col(input_str: str) -> int:
-        """ Compute binary string to place in the plane, compute the column """
+        """Compute binary string to place in the plane, compute the column"""
         hi = 8
         lo = 0
         for x in input_str[-3:]:
diff --git a/src/adventofcode2020/solutions/day11.py b/src/adventofcode2020/solutions/day11.py
index c79be82f..f4a46d5c 100644
--- a/src/adventofcode2020/solutions/day11.py
+++ b/src/adventofcode2020/solutions/day11.py
@@ -10,7 +10,7 @@ class Day11:
 
     @abstractmethod
     def count_next_to_it(self, grid, row, col) -> int:
-        """ Count the number of seats next to it/ Depends on the part"""
+        """Count the number of seats next to it/ Depends on the part"""
 
     def str_to_map(self, input_data) -> Dict[int, Dict]:
         grid = {}
@@ -86,7 +86,7 @@ class Day11PartA(Day11, FileReaderSolution):
     count_seats = 4
 
     def count_next_to_it(self, grid, row, col) -> int:
-        """ Returns how many seats next to this one are filled"""
+        """Returns how many seats next to this one are filled"""
         res = [
             grid.get(row, {}).get(col - 1, 0),  # Left
             grid.get(row, {}).get(col + 1, 0),  # Right
diff --git a/src/adventofcode2020/solutions/day14.py b/src/adventofcode2020/solutions/day14.py
index d8269666..a934467c 100644
--- a/src/adventofcode2020/solutions/day14.py
+++ b/src/adventofcode2020/solutions/day14.py
@@ -50,7 +50,7 @@ def compute_sum(self) -> int:
 
     @abstractmethod
     def process_programs(self, programs: List[Program]):
-        """ Process the program based on the version"""
+        """Process the program based on the version"""
 
     def solve(self, input_data: str) -> int:
         self.memory = defaultdict(int)
diff --git a/template/{{cookiecutter.advendofcode2020}}/tests/solutions/test_{{cookiecutter.file_name}}_a.py b/template/{{cookiecutter.advendofcode2020}}/tests/solutions/test_{{cookiecutter.file_name}}_a.py
index 45b5c664..ae9e5997 100644
--- a/template/{{cookiecutter.advendofcode2020}}/tests/solutions/test_{{cookiecutter.file_name}}_a.py
+++ b/template/{{cookiecutter.advendofcode2020}}/tests/solutions/test_{{cookiecutter.file_name}}_a.py
@@ -13,7 +13,7 @@ def test_{{cookiecutter.file_name}}a_solve(self, input_data, expected_result):
         assert result == expected_result
 
     def test_{{cookiecutter.file_name}}a_data(self):
-        """ Result we got when we did the real solution """
+        """Result we got when we did the real solution"""
         solution = {{cookiecutter.class_name}}PartA()
         res = solution("{{cookiecutter.directory_name}}/{{cookiecutter.file_name}}.txt")
         assert res == 0
diff --git a/template/{{cookiecutter.advendofcode2020}}/tests/solutions/test_{{cookiecutter.file_name}}_b.py b/template/{{cookiecutter.advendofcode2020}}/tests/solutions/test_{{cookiecutter.file_name}}_b.py
index 887f8ff5..fa002abb 100644
--- a/template/{{cookiecutter.advendofcode2020}}/tests/solutions/test_{{cookiecutter.file_name}}_b.py
+++ b/template/{{cookiecutter.advendofcode2020}}/tests/solutions/test_{{cookiecutter.file_name}}_b.py
@@ -13,7 +13,7 @@ def test_{{cookiecutter.file_name}}b_solve(self, input_data, expected_result):
         assert result == expected_result
 
     def test_{{cookiecutter.file_name}}b_data(self):
-        """ Result we got when we did the real solution """
+        """Result we got when we did the real solution"""
         solution = {{cookiecutter.class_name}}PartB()
         res = solution("{{cookiecutter.directory_name}}/{{cookiecutter.file_name}}.txt")
         assert res == 0
diff --git a/tests/solutions/test_day01_a.py b/tests/solutions/test_day01_a.py
index 68e07fea..865d0852 100644
--- a/tests/solutions/test_day01_a.py
+++ b/tests/solutions/test_day01_a.py
@@ -3,7 +3,7 @@
 
 class TestDay01PartA:
     def test_day01a_data(self):
-        """ Result we got when we did the real solution """
+        """Result we got when we did the real solution"""
         solution = Day01PartA()
         res = solution("day_01/day01.txt")
         assert res == 437931
diff --git a/tests/solutions/test_day01_b.py b/tests/solutions/test_day01_b.py
index 34b77506..5668ad37 100644
--- a/tests/solutions/test_day01_b.py
+++ b/tests/solutions/test_day01_b.py
@@ -3,7 +3,7 @@
 
 class TestDay01PartB:
     def test_day01b_data(self):
-        """ Result we got when we did the real solution """
+        """Result we got when we did the real solution"""
         solution = Day01PartB()
         res = solution("day_01/day01.txt")
         assert res == 157667328
diff --git a/tests/solutions/test_day02_a.py b/tests/solutions/test_day02_a.py
index b2186d6c..92a56828 100644
--- a/tests/solutions/test_day02_a.py
+++ b/tests/solutions/test_day02_a.py
@@ -22,7 +22,7 @@ def test_day02a_solve(self, input_data, expected_result):
         assert result == expected_result
 
     def test_day02a_data(self):
-        """ Result we got when we did the real solution """
+        """Result we got when we did the real solution"""
         solution = Day02PartA()
         res = solution("day_02/day02.txt")
         assert res == 465
diff --git a/tests/solutions/test_day02_b.py b/tests/solutions/test_day02_b.py
index 0361728b..cd0be46b 100644
--- a/tests/solutions/test_day02_b.py
+++ b/tests/solutions/test_day02_b.py
@@ -14,7 +14,7 @@ def test_day02b_solve(self, input_data, expected_result):
         assert result == expected_result
 
     def test_day02b_data(self):
-        """ Result we got when we did the real solution """
+        """Result we got when we did the real solution"""
         solution = Day02PartB()
         res = solution("day_02/day02.txt")
         assert res == 294
diff --git a/tests/solutions/test_day03_a.py b/tests/solutions/test_day03_a.py
index dfd90a63..66339305 100644
--- a/tests/solutions/test_day03_a.py
+++ b/tests/solutions/test_day03_a.py
@@ -3,7 +3,7 @@
 
 class TestDay03PartA:
     def test_day03a_data(self):
-        """ Result we got when we did the real solution """
+        """Result we got when we did the real solution"""
         solution = Day03PartA()
         res = solution("day_03/day03.txt")
         assert res != 105
diff --git a/tests/solutions/test_day03_b.py b/tests/solutions/test_day03_b.py
index 6cf64fad..b06aaec0 100644
--- a/tests/solutions/test_day03_b.py
+++ b/tests/solutions/test_day03_b.py
@@ -3,7 +3,7 @@
 
 class TestDay03PartB:
     def test_day03b_data(self):
-        """ Result we got when we did the real solution """
+        """Result we got when we did the real solution"""
         solution = Day03PartB()
         res = solution("day_03/day03.txt")
         assert res != 294
diff --git a/tests/solutions/test_day04_a.py b/tests/solutions/test_day04_a.py
index 1353d060..e0aa116b 100644
--- a/tests/solutions/test_day04_a.py
+++ b/tests/solutions/test_day04_a.py
@@ -21,7 +21,7 @@ def test_day04a_solve(self):
         assert result == 2
 
     def test_day04a_data(self):
-        """ Result we got when we did the real solution """
+        """Result we got when we did the real solution"""
         solution = Day04PartA()
         res = solution("day_04/day04.txt")
         assert res == 216
diff --git a/tests/solutions/test_day04_b.py b/tests/solutions/test_day04_b.py
index 2265e4f8..c538616a 100644
--- a/tests/solutions/test_day04_b.py
+++ b/tests/solutions/test_day04_b.py
@@ -51,7 +51,7 @@ def test_day04b_solve(self, input_data, expected_result):
         assert result == expected_result
 
     def test_day04b_data(self):
-        """ Result we got when we did the real solution """
+        """Result we got when we did the real solution"""
         solution = Day04PartB()
         res = solution("day_04/day04.txt")
         assert res != 80
diff --git a/tests/solutions/test_day05_a.py b/tests/solutions/test_day05_a.py
index d61288b1..74fcef5f 100644
--- a/tests/solutions/test_day05_a.py
+++ b/tests/solutions/test_day05_a.py
@@ -26,7 +26,7 @@ def test_bin_search(self, input_data: str, row: int, col: int, seat_nr: int):
         assert solution.compute_seat_nr(input_data) == seat_nr
 
     def test_day05a_data(self):
-        """ Result we got when we did the real solution """
+        """Result we got when we did the real solution"""
         solution = Day05PartA()
         res = solution("day_05/day05.txt")
         assert res != 807  # Too low
diff --git a/tests/solutions/test_day05_b.py b/tests/solutions/test_day05_b.py
index 66adb753..9cd58ccc 100644
--- a/tests/solutions/test_day05_b.py
+++ b/tests/solutions/test_day05_b.py
@@ -3,7 +3,7 @@
 
 class TestDay05PartB:
     def test_day05b_data(self):
-        """ Result we got when we did the real solution """
+        """Result we got when we did the real solution"""
         solution = Day05PartB()
         res = solution("day_05/day05.txt")
         assert res == 612
diff --git a/tests/solutions/test_day06_a.py b/tests/solutions/test_day06_a.py
index ae866019..48d30905 100644
--- a/tests/solutions/test_day06_a.py
+++ b/tests/solutions/test_day06_a.py
@@ -33,7 +33,7 @@ def test_day06a_solve(self, input_data, expected_result):
         assert result == expected_result
 
     def test_day06a_data(self):
-        """ Result we got when we did the real solution """
+        """Result we got when we did the real solution"""
         solution = Day06PartA()
         res = solution("day_06/day06.txt")
         assert res == 6549
diff --git a/tests/solutions/test_day06_b.py b/tests/solutions/test_day06_b.py
index 67a6dfe8..324b1acb 100644
--- a/tests/solutions/test_day06_b.py
+++ b/tests/solutions/test_day06_b.py
@@ -33,7 +33,7 @@ def test_day06b_solve(self, input_data, expected_result):
         assert result == expected_result
 
     def test_day06b_data(self):
-        """ Result we got when we did the real solution """
+        """Result we got when we did the real solution"""
         solution = Day06PartB()
         res = solution("day_06/day06.txt")
         assert res == 3466
diff --git a/tests/solutions/test_day07_a.py b/tests/solutions/test_day07_a.py
index 3de898c9..4e73adfc 100644
--- a/tests/solutions/test_day07_a.py
+++ b/tests/solutions/test_day07_a.py
@@ -49,7 +49,7 @@ def test_day07a_solve(self):
         assert result == 4
 
     def test_day07a_data(self):
-        """ Result we got when we did the real solution """
+        """Result we got when we did the real solution"""
         solution = Day07PartA()
         res = solution("day_07/day07.txt")
         assert res == 151
diff --git a/tests/solutions/test_day07_b.py b/tests/solutions/test_day07_b.py
index 34b67934..1031e014 100644
--- a/tests/solutions/test_day07_b.py
+++ b/tests/solutions/test_day07_b.py
@@ -39,7 +39,7 @@ def test_day07b_test2(self):
         assert result == 126
 
     def test_day07b_data(self):
-        """ Result we got when we did the real solution """
+        """Result we got when we did the real solution"""
         solution = Day07PartB()
         res = solution("day_07/day07.txt")
         assert res == 41559
diff --git a/tests/solutions/test_day08_a.py b/tests/solutions/test_day08_a.py
index cd2158b4..5b3546bb 100644
--- a/tests/solutions/test_day08_a.py
+++ b/tests/solutions/test_day08_a.py
@@ -25,7 +25,7 @@ def test_day08a_solve(self, instructions, expected_result):
         assert result == expected_result
 
     def test_day08a_data(self):
-        """ Result we got when we did the real solution """
+        """Result we got when we did the real solution"""
         solution = Day08PartA()
         res = solution("day_08/day08.txt")
         assert res == 2080
diff --git a/tests/solutions/test_day08_b.py b/tests/solutions/test_day08_b.py
index c8eadf8b..04c52103 100644
--- a/tests/solutions/test_day08_b.py
+++ b/tests/solutions/test_day08_b.py
@@ -25,7 +25,7 @@ def test_day08b_solve(self, input_data, expected_result):
         assert result == expected_result
 
     def test_day08b_data(self):
-        """ Result we got when we did the real solution """
+        """Result we got when we did the real solution"""
         solution = Day08PartB()
         res = solution("day_08/day08.txt")
         assert res == 2477
diff --git a/tests/solutions/test_day09_a.py b/tests/solutions/test_day09_a.py
index e9ab59c0..9a2ee855 100644
--- a/tests/solutions/test_day09_a.py
+++ b/tests/solutions/test_day09_a.py
@@ -29,7 +29,7 @@ def test_day09a_solve(self, begin, is_valid):
         assert result is is_valid
 
     def test_day09a_data(self):
-        """ Result we got when we did the real solution """
+        """Result we got when we did the real solution"""
         solution = Day09PartA()
         res = solution("day_09/day09.txt")
         assert res != 53
diff --git a/tests/solutions/test_day09_b.py b/tests/solutions/test_day09_b.py
index db5ca3cf..ece1921c 100644
--- a/tests/solutions/test_day09_b.py
+++ b/tests/solutions/test_day09_b.py
@@ -16,7 +16,7 @@ def test_day09b_solve(self):
         assert result == 62
 
     def test_day09b_data(self):
-        """ Result we got when we did the real solution """
+        """Result we got when we did the real solution"""
         solution = Day09PartB()
         res = solution("day_09/day09.txt")
         assert res == 238243506
diff --git a/tests/solutions/test_day10_a.py b/tests/solutions/test_day10_a.py
index b9f15835..61911076 100644
--- a/tests/solutions/test_day10_a.py
+++ b/tests/solutions/test_day10_a.py
@@ -29,7 +29,7 @@ def test_day10a_solve(self, input_data, expected_result):
         assert result == expected_result
 
     def test_day10a_data(self):
-        """ Result we got when we did the real solution """
+        """Result we got when we did the real solution"""
         solution = Day10PartA()
         res = solution("day_10/day10.txt")
         assert res == 1700
diff --git a/tests/solutions/test_day10_b.py b/tests/solutions/test_day10_b.py
index 9bcd071d..887e590f 100644
--- a/tests/solutions/test_day10_b.py
+++ b/tests/solutions/test_day10_b.py
@@ -33,7 +33,7 @@ def test_day10b_solve(self, input_data, expected_result):
         assert result == expected_result
 
     def test_day10b_data(self):
-        """ Result we got when we did the real solution """
+        """Result we got when we did the real solution"""
         solution = Day10PartB()
         res = solution("day_10/day10.txt")
         assert res == 12401793332096
diff --git a/tests/solutions/test_day11_a.py b/tests/solutions/test_day11_a.py
index e17e527b..6c681914 100644
--- a/tests/solutions/test_day11_a.py
+++ b/tests/solutions/test_day11_a.py
@@ -28,7 +28,7 @@ def test_day11a_solve(self, input_data, expected_result):
         assert result == expected_result
 
     def test_day11a_data(self):
-        """ Result we got when we did the real solution """
+        """Result we got when we did the real solution"""
         solution = Day11PartA()
         res = solution("day_11/day11.txt")
         assert res != 6415  # Too high
diff --git a/tests/solutions/test_day11_b.py b/tests/solutions/test_day11_b.py
index 593da30d..10e270fe 100644
--- a/tests/solutions/test_day11_b.py
+++ b/tests/solutions/test_day11_b.py
@@ -28,7 +28,7 @@ def test_day11b_solve(self, input_data, expected_result):
         assert result == expected_result
 
     def test_day11b_data(self):
-        """ Result we got when we did the real solution """
+        """Result we got when we did the real solution"""
         solution = Day11PartB()
         res = solution("day_11/day11.txt")
         assert res == 2085
diff --git a/tests/solutions/test_day12_a.py b/tests/solutions/test_day12_a.py
index ad6a773b..9d5fb02d 100644
--- a/tests/solutions/test_day12_a.py
+++ b/tests/solutions/test_day12_a.py
@@ -28,7 +28,7 @@ def test_day12a_solve(self, input_data, expected_result):
         assert result == expected_result
 
     def test_day12a_data(self):
-        """ Result we got when we did the real solution """
+        """Result we got when we did the real solution"""
         solution = Day12PartA()
         res = solution("day_12/day12.txt")
         assert res != 746  # Too high
diff --git a/tests/solutions/test_day12_b.py b/tests/solutions/test_day12_b.py
index 1a4e551c..6f3bd2b3 100644
--- a/tests/solutions/test_day12_b.py
+++ b/tests/solutions/test_day12_b.py
@@ -33,7 +33,7 @@ def test_day12b_solve(self, input_data, expected_result):
         assert result == expected_result
 
     def test_day12b_data(self):
-        """ Result we got when we did the real solution """
+        """Result we got when we did the real solution"""
         solution = Day12PartB()
         res = solution("day_12/day12.txt")
         assert res < 35575  # Too high
diff --git a/tests/solutions/test_day13_a.py b/tests/solutions/test_day13_a.py
index e7158a01..daa5dc6f 100644
--- a/tests/solutions/test_day13_a.py
+++ b/tests/solutions/test_day13_a.py
@@ -13,7 +13,7 @@ def test_day13a_solve(self, input_data, expected_result):
         assert result == expected_result
 
     def test_day13a_data(self):
-        """ Result we got when we did the real solution """
+        """Result we got when we did the real solution"""
         solution = Day13PartA()
         res = solution("day_13/day13.txt")
         assert res == 2545
diff --git a/tests/solutions/test_day13_b.py b/tests/solutions/test_day13_b.py
index a19568e5..a81e812e 100644
--- a/tests/solutions/test_day13_b.py
+++ b/tests/solutions/test_day13_b.py
@@ -17,7 +17,7 @@ def test_day13b_solve(self, input_data, expected_result):
         assert result == expected_result
 
     def test_day13b_data(self):
-        """ Result we got when we did the real solution """
+        """Result we got when we did the real solution"""
         solution = Day13PartB()
         res = solution("day_13/day13.txt")
         assert res == 266204454441577
diff --git a/tests/solutions/test_day14_a.py b/tests/solutions/test_day14_a.py
index d058d090..4723a79a 100644
--- a/tests/solutions/test_day14_a.py
+++ b/tests/solutions/test_day14_a.py
@@ -25,7 +25,7 @@ def test_day14a_solve(self, input_data, expected_result):
         assert result == expected_result
 
     def test_day14a_data(self):
-        """ Result we got when we did the real solution """
+        """Result we got when we did the real solution"""
         solution = Day14PartA()
         res = solution("day_14/day14.txt")
         assert res == 18630548206046
diff --git a/tests/solutions/test_day14_b.py b/tests/solutions/test_day14_b.py
index 6684c460..05c67b3b 100644
--- a/tests/solutions/test_day14_b.py
+++ b/tests/solutions/test_day14_b.py
@@ -63,7 +63,7 @@ def test_day14b_solve(self, input_data, expected_result):
         assert result == expected_result
 
     def test_day14b_data(self):
-        """ Result we got when we did the real solution """
+        """Result we got when we did the real solution"""
         solution = Day14PartB()
         res = solution("day_14/day14.txt")
         assert res == 4254673508445
diff --git a/tests/solutions/test_day15_a.py b/tests/solutions/test_day15_a.py
index c44faed2..89429432 100644
--- a/tests/solutions/test_day15_a.py
+++ b/tests/solutions/test_day15_a.py
@@ -22,7 +22,7 @@ def test_day15a_solve(self, input_data, expected_result):
         assert result == expected_result
 
     def test_day15a_data(self):
-        """ Result we got when we did the real solution """
+        """Result we got when we did the real solution"""
         solution = Day15PartA()
         res = solution("day_15/day15.txt")
         assert res == 206

From 04257f040793335573d9f1775ab0ba8d93e32c74 Mon Sep 17 00:00:00 2001
From: Roel Adriaans <roel.adriaans@ordina.nl>
Date: Tue, 9 Nov 2021 21:56:43 +0100
Subject: [PATCH 007/371] Ignore N818, since ProgramFinished is not really an
 exception, just ugly

---
 src/adventofcode2020/solutions/handheld.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/adventofcode2020/solutions/handheld.py b/src/adventofcode2020/solutions/handheld.py
index 301cade1..3dda53fe 100644
--- a/src/adventofcode2020/solutions/handheld.py
+++ b/src/adventofcode2020/solutions/handheld.py
@@ -8,7 +8,7 @@
 logger = logging.getLogger(__name__)
 
 
-class ProgramFinished(Exception):
+class ProgramFinished(Exception):   # noqa: N818
     """
     This exception is raised when the program is finished.
     This exception is usually not a fatal error, but used for control structure.

From fdb403303267a6ed8e7bfac4be37cd5d15cd0735 Mon Sep 17 00:00:00 2001
From: Roel Adriaans <roel.adriaans@ordina.nl>
Date: Tue, 9 Nov 2021 22:05:12 +0100
Subject: [PATCH 008/371] Add python 3.10 to the mix

---
 .github/workflows/tox.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/tox.yml b/.github/workflows/tox.yml
index dbc47138..dd345b4b 100644
--- a/.github/workflows/tox.yml
+++ b/.github/workflows/tox.yml
@@ -8,7 +8,7 @@ jobs:
     strategy:
       max-parallel: 4
       matrix:
-        python-version: [3.9]
+        python-version: [3.9, 3.10]
 
     steps:
     - uses: actions/checkout@v2

From bebc7f26cfe7389341e3bd50a117b7f54a0dd53c Mon Sep 17 00:00:00 2001
From: Roel Adriaans <roel.adriaans@ordina.nl>
Date: Tue, 9 Nov 2021 22:05:49 +0100
Subject: [PATCH 009/371] Run black. Again.

---
 src/adventofcode2020/solutions/handheld.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/adventofcode2020/solutions/handheld.py b/src/adventofcode2020/solutions/handheld.py
index 3dda53fe..3cd68be1 100644
--- a/src/adventofcode2020/solutions/handheld.py
+++ b/src/adventofcode2020/solutions/handheld.py
@@ -8,7 +8,7 @@
 logger = logging.getLogger(__name__)
 
 
-class ProgramFinished(Exception):   # noqa: N818
+class ProgramFinished(Exception):  # noqa: N818
     """
     This exception is raised when the program is finished.
     This exception is usually not a fatal error, but used for control structure.

From 5b30d9ac1de667647e299a83e8a753815a463fb0 Mon Sep 17 00:00:00 2001
From: Roel Adriaans <roel.adriaans@ordina.nl>
Date: Tue, 9 Nov 2021 22:08:09 +0100
Subject: [PATCH 010/371] Quote versions, yay yml

---
 .github/workflows/tox.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/tox.yml b/.github/workflows/tox.yml
index dd345b4b..ed00579f 100644
--- a/.github/workflows/tox.yml
+++ b/.github/workflows/tox.yml
@@ -8,7 +8,7 @@ jobs:
     strategy:
       max-parallel: 4
       matrix:
-        python-version: [3.9, 3.10]
+        python-version: ['3.9', '3.10']
 
     steps:
     - uses: actions/checkout@v2

From c8c793d788144b8c404601ee2ec10b3141ea8b6b Mon Sep 17 00:00:00 2001
From: Roel Adriaans <roel.adriaans@ordina.nl>
Date: Tue, 9 Nov 2021 22:34:37 +0100
Subject: [PATCH 011/371] ignore mypy errors, update numpy, update pre-commit
 stuff

---
 .pre-commit-config.yaml                 | 12 ++++++------
 mypy.ini                                |  3 +++
 requirements.txt                        |  2 +-
 src/adventofcode2020/solutions/day14.py |  8 ++++----
 4 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index bdf67b2c..799dcaa4 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -2,24 +2,24 @@
 
 repos:
   - repo: https://github.com/ambv/black
-    rev: 20.8b1
+    rev: 21.10b0
     hooks:
     - id: black
-      language_version: python3.9
+      language_version: 'python3.10'
 
-  - repo: https://gitlab.com/pycqa/flake8
-    rev: 3.8.4
+  - repo: https://github.com/pycqa/flake8
+    rev: 4.0.1
     hooks:
     - id: flake8
       args: ["--ignore", "E203,W503"]
 
   - repo: https://github.com/PyCQA/isort
-    rev: 5.6.4
+    rev: 5.10.1
     hooks:
     - id: isort
 
   - repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: v3.3.0
+    rev: v4.0.1
     hooks:
     - id: check-yaml
     - id: end-of-file-fixer
diff --git a/mypy.ini b/mypy.ini
index 40a3d81e..cbe1c877 100644
--- a/mypy.ini
+++ b/mypy.ini
@@ -6,3 +6,6 @@ linecount_report = .typecov/report
 
 [mypy-tqdm]
 ignore_missing_imports = True
+
+[mypy-click]
+ignore_missing_imports = True
diff --git a/requirements.txt b/requirements.txt
index 3538b247..2d2fba68 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -3,7 +3,7 @@ black
 Click
 cookiecutter
 matplotlib
-numpy==1.20.0
+numpy==1.21.4
 pytest
 pytest-cov
 pytest-xdist
diff --git a/src/adventofcode2020/solutions/day14.py b/src/adventofcode2020/solutions/day14.py
index a934467c..84cda1bc 100644
--- a/src/adventofcode2020/solutions/day14.py
+++ b/src/adventofcode2020/solutions/day14.py
@@ -46,14 +46,14 @@ def parse_programs(input_data: str) -> List[Program]:
         return programs
 
     def compute_sum(self) -> int:
-        return sum(self.memory.values())
+        return sum(self.memory.values())  # type: ignore
 
     @abstractmethod
     def process_programs(self, programs: List[Program]):
         """Process the program based on the version"""
 
     def solve(self, input_data: str) -> int:
-        self.memory = defaultdict(int)
+        self.memory = defaultdict(int)  # type: ignore
 
         programs = self.parse_programs(input_data)
         self.process_programs(programs)
@@ -80,7 +80,7 @@ def process_programs(self, programs: List[Program]):
                 # Bitwise OR, keeping X as 0
                 value |= bits_one
 
-                self.memory[instr.address] = value
+                self.memory[instr.address] = value  # type: ignore
 
 
 class Day14PartB(Day14, FileReaderSolution):
@@ -141,4 +141,4 @@ def process_programs(self, programs: List[Program]):
                     mask=prog.bitmask, address=entry.address
                 )
                 for address in addresses:
-                    self.memory[address] = entry.value
+                    self.memory[address] = entry.value  # type: ignore

From 596f893fee163b0c1e321618344ab4b3ce3dae2f Mon Sep 17 00:00:00 2001
From: Roel Adriaans <roel@adriaans.org>
Date: Wed, 10 Nov 2021 19:55:59 +0100
Subject: [PATCH 012/371] Fix typo

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 30711730..8fd68e64 100644
--- a/README.md
+++ b/README.md
@@ -16,7 +16,7 @@ cookiecutter template -f
 ```
 
 Answer the questions:
-* `advendofcode2020` : Accept default answer. This installs the result in the currect directory
+* `advendofcode2020` : Accept default answer. This installs the result in the current directory
 * `day` : Answer with day you're working on, with leading zero. Eg: 07, 10, 31.
 * `directory_name`, `file_name`, `class_name` : Accept default answer
 

From 3d859a3ae8821bf42de31c192b360fac0d4d4c50 Mon Sep 17 00:00:00 2001
From: Roel Adriaans <roel@adriaans.org>
Date: Wed, 10 Nov 2021 20:07:51 +0100
Subject: [PATCH 013/371] Make tox.ini for every python version since github
 performs 3.9 and 3.10 tests, matlibplot to rc to support 3.10 wheels

---
 requirements.txt | 2 +-
 tox.ini          | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/requirements.txt b/requirements.txt
index 2d2fba68..13225095 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -2,7 +2,7 @@ anytree
 black
 Click
 cookiecutter
-matplotlib
+matplotlib==3.5.0rc1
 numpy==1.21.4
 pytest
 pytest-cov
diff --git a/tox.ini b/tox.ini
index b2a08a18..575db0a4 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,6 +1,6 @@
 [tox]
 envlist =
-    py39
+    py
     linters
 [pytest]
 # Makes all warnings be fatal

From cd14f7ee6719d171ca6ef09d1d021d9ac8745dd7 Mon Sep 17 00:00:00 2001
From: Roel Adriaans <roel.adriaans@ordina.nl>
Date: Wed, 10 Nov 2021 21:19:40 +0100
Subject: [PATCH 014/371] Switch to poetry

---
 poetry.lock      | 1165 ++++++++++++++++++++++++++++++++++++++++++++++
 pyproject.toml   |   29 ++
 requirements.txt |   11 -
 setup.py         |   19 -
 4 files changed, 1194 insertions(+), 30 deletions(-)
 create mode 100644 poetry.lock
 create mode 100644 pyproject.toml
 delete mode 100644 requirements.txt
 delete mode 100644 setup.py

diff --git a/poetry.lock b/poetry.lock
new file mode 100644
index 00000000..1d83657f
--- /dev/null
+++ b/poetry.lock
@@ -0,0 +1,1165 @@
+[[package]]
+name = "anytree"
+version = "2.8.0"
+description = "Powerful and Lightweight Python Tree Data Structure.."
+category = "main"
+optional = false
+python-versions = "*"
+
+[package.dependencies]
+six = ">=1.9.0"
+
+[package.extras]
+dev = ["check-manifest"]
+test = ["coverage"]
+
+[[package]]
+name = "arrow"
+version = "1.2.1"
+description = "Better dates & times for Python"
+category = "dev"
+optional = false
+python-versions = ">=3.6"
+
+[package.dependencies]
+python-dateutil = ">=2.7.0"
+
+[[package]]
+name = "atomicwrites"
+version = "1.4.0"
+description = "Atomic file writes."
+category = "dev"
+optional = false
+python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*"
+
+[[package]]
+name = "attrs"
+version = "21.2.0"
+description = "Classes Without Boilerplate"
+category = "dev"
+optional = false
+python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*"
+
+[package.extras]
+dev = ["coverage[toml] (>=5.0.2)", "hypothesis", "pympler", "pytest (>=4.3.0)", "six", "mypy", "pytest-mypy-plugins", "zope.interface", "furo", "sphinx", "sphinx-notfound-page", "pre-commit"]
+docs = ["furo", "sphinx", "zope.interface", "sphinx-notfound-page"]
+tests = ["coverage[toml] (>=5.0.2)", "hypothesis", "pympler", "pytest (>=4.3.0)", "six", "mypy", "pytest-mypy-plugins", "zope.interface"]
+tests_no_zope = ["coverage[toml] (>=5.0.2)", "hypothesis", "pympler", "pytest (>=4.3.0)", "six", "mypy", "pytest-mypy-plugins"]
+
+[[package]]
+name = "backports.entry-points-selectable"
+version = "1.1.1"
+description = "Compatibility shim providing selectable entry points for older implementations"
+category = "dev"
+optional = false
+python-versions = ">=2.7"
+
+[package.extras]
+docs = ["sphinx", "jaraco.packaging (>=8.2)", "rst.linker (>=1.9)"]
+testing = ["pytest", "pytest-flake8", "pytest-cov", "pytest-black (>=0.3.7)", "pytest-mypy", "pytest-checkdocs (>=2.4)", "pytest-enabler (>=1.0.1)"]
+
+[[package]]
+name = "binaryornot"
+version = "0.4.4"
+description = "Ultra-lightweight pure Python package to check if a file is binary or text."
+category = "dev"
+optional = false
+python-versions = "*"
+
+[package.dependencies]
+chardet = ">=3.0.2"
+
+[[package]]
+name = "black"
+version = "21.10b0"
+description = "The uncompromising code formatter."
+category = "dev"
+optional = false
+python-versions = ">=3.6.2"
+
+[package.dependencies]
+click = ">=7.1.2"
+mypy-extensions = ">=0.4.3"
+pathspec = ">=0.9.0,<1"
+platformdirs = ">=2"
+regex = ">=2020.1.8"
+tomli = ">=0.2.6,<2.0.0"
+typing-extensions = [
+    {version = ">=3.10.0.0", markers = "python_version < \"3.10\""},
+    {version = "!=3.10.0.1", markers = "python_version >= \"3.10\""},
+]
+
+[package.extras]
+colorama = ["colorama (>=0.4.3)"]
+d = ["aiohttp (>=3.7.4)"]
+jupyter = ["ipython (>=7.8.0)", "tokenize-rt (>=3.2.0)"]
+python2 = ["typed-ast (>=1.4.3)"]
+uvloop = ["uvloop (>=0.15.2)"]
+
+[[package]]
+name = "certifi"
+version = "2021.10.8"
+description = "Python package for providing Mozilla's CA Bundle."
+category = "dev"
+optional = false
+python-versions = "*"
+
+[[package]]
+name = "chardet"
+version = "4.0.0"
+description = "Universal encoding detector for Python 2 and 3"
+category = "dev"
+optional = false
+python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*"
+
+[[package]]
+name = "charset-normalizer"
+version = "2.0.7"
+description = "The Real First Universal Charset Detector. Open, modern and actively maintained alternative to Chardet."
+category = "dev"
+optional = false
+python-versions = ">=3.5.0"
+
+[package.extras]
+unicode_backport = ["unicodedata2"]
+
+[[package]]
+name = "click"
+version = "8.0.3"
+description = "Composable command line interface toolkit"
+category = "main"
+optional = false
+python-versions = ">=3.6"
+
+[package.dependencies]
+colorama = {version = "*", markers = "platform_system == \"Windows\""}
+
+[[package]]
+name = "colorama"
+version = "0.4.4"
+description = "Cross-platform colored terminal text."
+category = "main"
+optional = false
+python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*"
+
+[[package]]
+name = "cookiecutter"
+version = "1.7.3"
+description = "A command-line utility that creates projects from project templates, e.g. creating a Python package project from a Python package project template."
+category = "dev"
+optional = false
+python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*"
+
+[package.dependencies]
+binaryornot = ">=0.4.4"
+click = ">=7.0"
+Jinja2 = ">=2.7,<4.0.0"
+jinja2-time = ">=0.2.0"
+poyo = ">=0.5.0"
+python-slugify = ">=4.0.0"
+requests = ">=2.23.0"
+six = ">=1.10"
+
+[[package]]
+name = "coverage"
+version = "6.1.1"
+description = "Code coverage measurement for Python"
+category = "dev"
+optional = false
+python-versions = ">=3.6"
+
+[package.dependencies]
+tomli = {version = "*", optional = true, markers = "extra == \"toml\""}
+
+[package.extras]
+toml = ["tomli"]
+
+[[package]]
+name = "cycler"
+version = "0.11.0"
+description = "Composable style cycles"
+category = "main"
+optional = false
+python-versions = ">=3.6"
+
+[[package]]
+name = "distlib"
+version = "0.3.3"
+description = "Distribution utilities"
+category = "dev"
+optional = false
+python-versions = "*"
+
+[[package]]
+name = "execnet"
+version = "1.9.0"
+description = "execnet: rapid multi-Python deployment"
+category = "dev"
+optional = false
+python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*"
+
+[package.extras]
+testing = ["pre-commit"]
+
+[[package]]
+name = "filelock"
+version = "3.3.2"
+description = "A platform independent file lock."
+category = "dev"
+optional = false
+python-versions = ">=3.6"
+
+[package.extras]
+docs = ["furo (>=2021.8.17b43)", "sphinx (>=4.1)", "sphinx-autodoc-typehints (>=1.12)"]
+testing = ["covdefaults (>=1.2.0)", "coverage (>=4)", "pytest (>=4)", "pytest-cov", "pytest-timeout (>=1.4.2)"]
+
+[[package]]
+name = "fonttools"
+version = "4.28.1"
+description = "Tools to manipulate font files"
+category = "main"
+optional = false
+python-versions = ">=3.7"
+
+[package.extras]
+all = ["fs (>=2.2.0,<3)", "lxml (>=4.0,<5)", "zopfli (>=0.1.4)", "lz4 (>=1.7.4.2)", "matplotlib", "sympy", "skia-pathops (>=0.5.0)", "brotlicffi (>=0.8.0)", "scipy", "brotli (>=1.0.1)", "munkres", "unicodedata2 (>=13.0.0)", "xattr"]
+graphite = ["lz4 (>=1.7.4.2)"]
+interpolatable = ["scipy", "munkres"]
+lxml = ["lxml (>=4.0,<5)"]
+pathops = ["skia-pathops (>=0.5.0)"]
+plot = ["matplotlib"]
+symfont = ["sympy"]
+type1 = ["xattr"]
+ufo = ["fs (>=2.2.0,<3)"]
+unicode = ["unicodedata2 (>=13.0.0)"]
+woff = ["zopfli (>=0.1.4)", "brotlicffi (>=0.8.0)", "brotli (>=1.0.1)"]
+
+[[package]]
+name = "idna"
+version = "3.3"
+description = "Internationalized Domain Names in Applications (IDNA)"
+category = "dev"
+optional = false
+python-versions = ">=3.5"
+
+[[package]]
+name = "iniconfig"
+version = "1.1.1"
+description = "iniconfig: brain-dead simple config-ini parsing"
+category = "dev"
+optional = false
+python-versions = "*"
+
+[[package]]
+name = "jinja2"
+version = "3.0.3"
+description = "A very fast and expressive template engine."
+category = "dev"
+optional = false
+python-versions = ">=3.6"
+
+[package.dependencies]
+MarkupSafe = ">=2.0"
+
+[package.extras]
+i18n = ["Babel (>=2.7)"]
+
+[[package]]
+name = "jinja2-time"
+version = "0.2.0"
+description = "Jinja2 Extension for Dates and Times"
+category = "dev"
+optional = false
+python-versions = "*"
+
+[package.dependencies]
+arrow = "*"
+jinja2 = "*"
+
+[[package]]
+name = "kiwisolver"
+version = "1.3.2"
+description = "A fast implementation of the Cassowary constraint solver"
+category = "main"
+optional = false
+python-versions = ">=3.7"
+
+[[package]]
+name = "markupsafe"
+version = "2.0.1"
+description = "Safely add untrusted strings to HTML/XML markup."
+category = "dev"
+optional = false
+python-versions = ">=3.6"
+
+[[package]]
+name = "matplotlib"
+version = "3.5.0rc1"
+description = "Python plotting package"
+category = "main"
+optional = false
+python-versions = ">=3.7"
+
+[package.dependencies]
+cycler = ">=0.10"
+fonttools = ">=4.22.0"
+kiwisolver = ">=1.0.1"
+numpy = ">=1.17"
+packaging = ">=20.0"
+pillow = ">=6.2.0"
+pyparsing = ">=2.2.1"
+python-dateutil = ">=2.7"
+setuptools_scm = ">=4"
+
+[[package]]
+name = "mypy-extensions"
+version = "0.4.3"
+description = "Experimental type system extensions for programs checked with the mypy typechecker."
+category = "dev"
+optional = false
+python-versions = "*"
+
+[[package]]
+name = "numpy"
+version = "1.21.4"
+description = "NumPy is the fundamental package for array computing with Python."
+category = "main"
+optional = false
+python-versions = ">=3.7,<3.11"
+
+[[package]]
+name = "packaging"
+version = "21.2"
+description = "Core utilities for Python packages"
+category = "main"
+optional = false
+python-versions = ">=3.6"
+
+[package.dependencies]
+pyparsing = ">=2.0.2,<3"
+
+[[package]]
+name = "pathspec"
+version = "0.9.0"
+description = "Utility library for gitignore style pattern matching of file paths."
+category = "dev"
+optional = false
+python-versions = "!=3.0.*,!=3.1.*,!=3.2.*,!=3.3.*,!=3.4.*,>=2.7"
+
+[[package]]
+name = "pillow"
+version = "8.4.0"
+description = "Python Imaging Library (Fork)"
+category = "main"
+optional = false
+python-versions = ">=3.6"
+
+[[package]]
+name = "platformdirs"
+version = "2.4.0"
+description = "A small Python module for determining appropriate platform-specific dirs, e.g. a \"user data dir\"."
+category = "dev"
+optional = false
+python-versions = ">=3.6"
+
+[package.extras]
+docs = ["Sphinx (>=4)", "furo (>=2021.7.5b38)", "proselint (>=0.10.2)", "sphinx-autodoc-typehints (>=1.12)"]
+test = ["appdirs (==1.4.4)", "pytest (>=6)", "pytest-cov (>=2.7)", "pytest-mock (>=3.6)"]
+
+[[package]]
+name = "pluggy"
+version = "1.0.0"
+description = "plugin and hook calling mechanisms for python"
+category = "dev"
+optional = false
+python-versions = ">=3.6"
+
+[package.extras]
+dev = ["pre-commit", "tox"]
+testing = ["pytest", "pytest-benchmark"]
+
+[[package]]
+name = "poyo"
+version = "0.5.0"
+description = "A lightweight YAML Parser for Python. 🐓"
+category = "dev"
+optional = false
+python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*"
+
+[[package]]
+name = "py"
+version = "1.11.0"
+description = "library with cross-python path, ini-parsing, io, code, log facilities"
+category = "dev"
+optional = false
+python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*"
+
+[[package]]
+name = "pyparsing"
+version = "2.4.7"
+description = "Python parsing module"
+category = "main"
+optional = false
+python-versions = ">=2.6, !=3.0.*, !=3.1.*, !=3.2.*"
+
+[[package]]
+name = "pytest"
+version = "6.2.5"
+description = "pytest: simple powerful testing with Python"
+category = "dev"
+optional = false
+python-versions = ">=3.6"
+
+[package.dependencies]
+atomicwrites = {version = ">=1.0", markers = "sys_platform == \"win32\""}
+attrs = ">=19.2.0"
+colorama = {version = "*", markers = "sys_platform == \"win32\""}
+iniconfig = "*"
+packaging = "*"
+pluggy = ">=0.12,<2.0"
+py = ">=1.8.2"
+toml = "*"
+
+[package.extras]
+testing = ["argcomplete", "hypothesis (>=3.56)", "mock", "nose", "requests", "xmlschema"]
+
+[[package]]
+name = "pytest-cov"
+version = "3.0.0"
+description = "Pytest plugin for measuring coverage."
+category = "dev"
+optional = false
+python-versions = ">=3.6"
+
+[package.dependencies]
+coverage = {version = ">=5.2.1", extras = ["toml"]}
+pytest = ">=4.6"
+
+[package.extras]
+testing = ["fields", "hunter", "process-tests", "six", "pytest-xdist", "virtualenv"]
+
+[[package]]
+name = "pytest-forked"
+version = "1.3.0"
+description = "run tests in isolated forked subprocesses"
+category = "dev"
+optional = false
+python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*"
+
+[package.dependencies]
+py = "*"
+pytest = ">=3.10"
+
+[[package]]
+name = "pytest-xdist"
+version = "2.4.0"
+description = "pytest xdist plugin for distributed testing and loop-on-failing modes"
+category = "dev"
+optional = false
+python-versions = ">=3.6"
+
+[package.dependencies]
+execnet = ">=1.1"
+pytest = ">=6.0.0"
+pytest-forked = "*"
+
+[package.extras]
+psutil = ["psutil (>=3.0)"]
+setproctitle = ["setproctitle"]
+testing = ["filelock"]
+
+[[package]]
+name = "python-dateutil"
+version = "2.8.2"
+description = "Extensions to the standard Python datetime module"
+category = "main"
+optional = false
+python-versions = "!=3.0.*,!=3.1.*,!=3.2.*,>=2.7"
+
+[package.dependencies]
+six = ">=1.5"
+
+[[package]]
+name = "python-slugify"
+version = "5.0.2"
+description = "A Python Slugify application that handles Unicode"
+category = "dev"
+optional = false
+python-versions = ">=3.6"
+
+[package.dependencies]
+text-unidecode = ">=1.3"
+
+[package.extras]
+unidecode = ["Unidecode (>=1.1.1)"]
+
+[[package]]
+name = "regex"
+version = "2021.11.10"
+description = "Alternative regular expression module, to replace re."
+category = "dev"
+optional = false
+python-versions = "*"
+
+[[package]]
+name = "requests"
+version = "2.26.0"
+description = "Python HTTP for Humans."
+category = "dev"
+optional = false
+python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*, !=3.5.*"
+
+[package.dependencies]
+certifi = ">=2017.4.17"
+charset-normalizer = {version = ">=2.0.0,<2.1.0", markers = "python_version >= \"3\""}
+idna = {version = ">=2.5,<4", markers = "python_version >= \"3\""}
+urllib3 = ">=1.21.1,<1.27"
+
+[package.extras]
+socks = ["PySocks (>=1.5.6,!=1.5.7)", "win-inet-pton"]
+use_chardet_on_py3 = ["chardet (>=3.0.2,<5)"]
+
+[[package]]
+name = "setuptools-scm"
+version = "6.3.2"
+description = "the blessed package to manage your versions by scm tags"
+category = "main"
+optional = false
+python-versions = ">=3.6"
+
+[package.dependencies]
+packaging = ">=20.0"
+tomli = ">=1.0.0"
+
+[package.extras]
+toml = ["setuptools (>=42)", "tomli (>=1.0.0)"]
+
+[[package]]
+name = "six"
+version = "1.16.0"
+description = "Python 2 and 3 compatibility utilities"
+category = "main"
+optional = false
+python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*"
+
+[[package]]
+name = "text-unidecode"
+version = "1.3"
+description = "The most basic Text::Unidecode port"
+category = "dev"
+optional = false
+python-versions = "*"
+
+[[package]]
+name = "toml"
+version = "0.10.2"
+description = "Python Library for Tom's Obvious, Minimal Language"
+category = "dev"
+optional = false
+python-versions = ">=2.6, !=3.0.*, !=3.1.*, !=3.2.*"
+
+[[package]]
+name = "tomli"
+version = "1.2.2"
+description = "A lil' TOML parser"
+category = "main"
+optional = false
+python-versions = ">=3.6"
+
+[[package]]
+name = "tox"
+version = "3.24.4"
+description = "tox is a generic virtualenv management and test command line tool"
+category = "dev"
+optional = false
+python-versions = "!=3.0.*,!=3.1.*,!=3.2.*,!=3.3.*,!=3.4.*,>=2.7"
+
+[package.dependencies]
+colorama = {version = ">=0.4.1", markers = "platform_system == \"Windows\""}
+filelock = ">=3.0.0"
+packaging = ">=14"
+pluggy = ">=0.12.0"
+py = ">=1.4.17"
+six = ">=1.14.0"
+toml = ">=0.9.4"
+virtualenv = ">=16.0.0,<20.0.0 || >20.0.0,<20.0.1 || >20.0.1,<20.0.2 || >20.0.2,<20.0.3 || >20.0.3,<20.0.4 || >20.0.4,<20.0.5 || >20.0.5,<20.0.6 || >20.0.6,<20.0.7 || >20.0.7"
+
+[package.extras]
+docs = ["pygments-github-lexers (>=0.0.5)", "sphinx (>=2.0.0)", "sphinxcontrib-autoprogram (>=0.1.5)", "towncrier (>=18.5.0)"]
+testing = ["flaky (>=3.4.0)", "freezegun (>=0.3.11)", "psutil (>=5.6.1)", "pytest (>=4.0.0)", "pytest-cov (>=2.5.1)", "pytest-mock (>=1.10.0)", "pytest-randomly (>=1.0.0)", "pytest-xdist (>=1.22.2)", "pathlib2 (>=2.3.3)"]
+
+[[package]]
+name = "tqdm"
+version = "4.62.3"
+description = "Fast, Extensible Progress Meter"
+category = "main"
+optional = false
+python-versions = "!=3.0.*,!=3.1.*,!=3.2.*,!=3.3.*,>=2.7"
+
+[package.dependencies]
+colorama = {version = "*", markers = "platform_system == \"Windows\""}
+
+[package.extras]
+dev = ["py-make (>=0.1.0)", "twine", "wheel"]
+notebook = ["ipywidgets (>=6)"]
+telegram = ["requests"]
+
+[[package]]
+name = "typing-extensions"
+version = "3.10.0.2"
+description = "Backported and Experimental Type Hints for Python 3.5+"
+category = "dev"
+optional = false
+python-versions = "*"
+
+[[package]]
+name = "urllib3"
+version = "1.26.7"
+description = "HTTP library with thread-safe connection pooling, file post, and more."
+category = "dev"
+optional = false
+python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*, <4"
+
+[package.extras]
+brotli = ["brotlipy (>=0.6.0)"]
+secure = ["pyOpenSSL (>=0.14)", "cryptography (>=1.3.4)", "idna (>=2.0.0)", "certifi", "ipaddress"]
+socks = ["PySocks (>=1.5.6,!=1.5.7,<2.0)"]
+
+[[package]]
+name = "virtualenv"
+version = "20.10.0"
+description = "Virtual Python Environment builder"
+category = "dev"
+optional = false
+python-versions = "!=3.0.*,!=3.1.*,!=3.2.*,!=3.3.*,!=3.4.*,>=2.7"
+
+[package.dependencies]
+"backports.entry-points-selectable" = ">=1.0.4"
+distlib = ">=0.3.1,<1"
+filelock = ">=3.2,<4"
+platformdirs = ">=2,<3"
+six = ">=1.9.0,<2"
+
+[package.extras]
+docs = ["proselint (>=0.10.2)", "sphinx (>=3)", "sphinx-argparse (>=0.2.5)", "sphinx-rtd-theme (>=0.4.3)", "towncrier (>=21.3)"]
+testing = ["coverage (>=4)", "coverage-enable-subprocess (>=1)", "flaky (>=3)", "pytest (>=4)", "pytest-env (>=0.6.2)", "pytest-freezegun (>=0.4.1)", "pytest-mock (>=2)", "pytest-randomly (>=1)", "pytest-timeout (>=1)", "packaging (>=20.0)"]
+
+[metadata]
+lock-version = "1.1"
+python-versions = ">=3.9,<3.11"
+content-hash = "0aa5474e364e74927148858eea6c899b68f43c6f95c8ed4c6980b7f2598682b2"
+
+[metadata.files]
+anytree = [
+    {file = "anytree-2.8.0-py2.py3-none-any.whl", hash = "sha256:14c55ac77492b11532395049a03b773d14c7e30b22aa012e337b1e983de31521"},
+    {file = "anytree-2.8.0.tar.gz", hash = "sha256:3f0f93f355a91bc3e6245319bf4c1d50e3416cc7a35cc1133c1ff38306bbccab"},
+]
+arrow = [
+    {file = "arrow-1.2.1-py3-none-any.whl", hash = "sha256:6b2914ef3997d1fd7b37a71ce9dd61a6e329d09e1c7b44f4d3099ca4a5c0933e"},
+    {file = "arrow-1.2.1.tar.gz", hash = "sha256:c2dde3c382d9f7e6922ce636bf0b318a7a853df40ecb383b29192e6c5cc82840"},
+]
+atomicwrites = [
+    {file = "atomicwrites-1.4.0-py2.py3-none-any.whl", hash = "sha256:6d1784dea7c0c8d4a5172b6c620f40b6e4cbfdf96d783691f2e1302a7b88e197"},
+    {file = "atomicwrites-1.4.0.tar.gz", hash = "sha256:ae70396ad1a434f9c7046fd2dd196fc04b12f9e91ffb859164193be8b6168a7a"},
+]
+attrs = [
+    {file = "attrs-21.2.0-py2.py3-none-any.whl", hash = "sha256:149e90d6d8ac20db7a955ad60cf0e6881a3f20d37096140088356da6c716b0b1"},
+    {file = "attrs-21.2.0.tar.gz", hash = "sha256:ef6aaac3ca6cd92904cdd0d83f629a15f18053ec84e6432106f7a4d04ae4f5fb"},
+]
+"backports.entry-points-selectable" = [
+    {file = "backports.entry_points_selectable-1.1.1-py2.py3-none-any.whl", hash = "sha256:7fceed9532a7aa2bd888654a7314f864a3c16a4e710b34a58cfc0f08114c663b"},
+    {file = "backports.entry_points_selectable-1.1.1.tar.gz", hash = "sha256:914b21a479fde881635f7af5adc7f6e38d6b274be32269070c53b698c60d5386"},
+]
+binaryornot = [
+    {file = "binaryornot-0.4.4-py2.py3-none-any.whl", hash = "sha256:b8b71173c917bddcd2c16070412e369c3ed7f0528926f70cac18a6c97fd563e4"},
+    {file = "binaryornot-0.4.4.tar.gz", hash = "sha256:359501dfc9d40632edc9fac890e19542db1a287bbcfa58175b66658392018061"},
+]
+black = [
+    {file = "black-21.10b0-py3-none-any.whl", hash = "sha256:6eb7448da9143ee65b856a5f3676b7dda98ad9abe0f87fce8c59291f15e82a5b"},
+    {file = "black-21.10b0.tar.gz", hash = "sha256:a9952229092e325fe5f3dae56d81f639b23f7131eb840781947e4b2886030f33"},
+]
+certifi = [
+    {file = "certifi-2021.10.8-py2.py3-none-any.whl", hash = "sha256:d62a0163eb4c2344ac042ab2bdf75399a71a2d8c7d47eac2e2ee91b9d6339569"},
+    {file = "certifi-2021.10.8.tar.gz", hash = "sha256:78884e7c1d4b00ce3cea67b44566851c4343c120abd683433ce934a68ea58872"},
+]
+chardet = [
+    {file = "chardet-4.0.0-py2.py3-none-any.whl", hash = "sha256:f864054d66fd9118f2e67044ac8981a54775ec5b67aed0441892edb553d21da5"},
+    {file = "chardet-4.0.0.tar.gz", hash = "sha256:0d6f53a15db4120f2b08c94f11e7d93d2c911ee118b6b30a04ec3ee8310179fa"},
+]
+charset-normalizer = [
+    {file = "charset-normalizer-2.0.7.tar.gz", hash = "sha256:e019de665e2bcf9c2b64e2e5aa025fa991da8720daa3c1138cadd2fd1856aed0"},
+    {file = "charset_normalizer-2.0.7-py3-none-any.whl", hash = "sha256:f7af805c321bfa1ce6714c51f254e0d5bb5e5834039bc17db7ebe3a4cec9492b"},
+]
+click = [
+    {file = "click-8.0.3-py3-none-any.whl", hash = "sha256:353f466495adaeb40b6b5f592f9f91cb22372351c84caeb068132442a4518ef3"},
+    {file = "click-8.0.3.tar.gz", hash = "sha256:410e932b050f5eed773c4cda94de75971c89cdb3155a72a0831139a79e5ecb5b"},
+]
+colorama = [
+    {file = "colorama-0.4.4-py2.py3-none-any.whl", hash = "sha256:9f47eda37229f68eee03b24b9748937c7dc3868f906e8ba69fbcbdd3bc5dc3e2"},
+    {file = "colorama-0.4.4.tar.gz", hash = "sha256:5941b2b48a20143d2267e95b1c2a7603ce057ee39fd88e7329b0c292aa16869b"},
+]
+cookiecutter = [
+    {file = "cookiecutter-1.7.3-py2.py3-none-any.whl", hash = "sha256:f8671531fa96ab14339d0c59b4f662a4f12a2ecacd94a0f70a3500843da588e2"},
+    {file = "cookiecutter-1.7.3.tar.gz", hash = "sha256:6b9a4d72882e243be077a7397d0f1f76fe66cf3df91f3115dbb5330e214fa457"},
+]
+coverage = [
+    {file = "coverage-6.1.1-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:42a1fb5dee3355df90b635906bb99126faa7936d87dfc97eacc5293397618cb7"},
+    {file = "coverage-6.1.1-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:a00284dbfb53b42e35c7dd99fc0e26ef89b4a34efff68078ed29d03ccb28402a"},
+    {file = "coverage-6.1.1-cp310-cp310-manylinux_2_5_i686.manylinux1_i686.manylinux_2_12_i686.manylinux2010_i686.whl", hash = "sha256:51a441011a30d693e71dea198b2a6f53ba029afc39f8e2aeb5b77245c1b282ef"},
+    {file = "coverage-6.1.1-cp310-cp310-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:e76f017b6d4140a038c5ff12be1581183d7874e41f1c0af58ecf07748d36a336"},
+    {file = "coverage-6.1.1-cp310-cp310-musllinux_1_1_aarch64.whl", hash = "sha256:7833c872718dc913f18e51ee97ea0dece61d9930893a58b20b3daf09bb1af6b6"},
+    {file = "coverage-6.1.1-cp310-cp310-musllinux_1_1_i686.whl", hash = "sha256:8186b5a4730c896cbe1e4b645bdc524e62d874351ae50e1db7c3e9f5dc81dc26"},
+    {file = "coverage-6.1.1-cp310-cp310-musllinux_1_1_x86_64.whl", hash = "sha256:bbca34dca5a2d60f81326d908d77313816fad23d11b6069031a3d6b8c97a54f9"},
+    {file = "coverage-6.1.1-cp310-cp310-win32.whl", hash = "sha256:72bf437d54186d104388cbae73c9f2b0f8a3e11b6e8d7deb593bd14625c96026"},
+    {file = "coverage-6.1.1-cp310-cp310-win_amd64.whl", hash = "sha256:994ce5a7b3d20981b81d83618aa4882f955bfa573efdbef033d5632b58597ba9"},
+    {file = "coverage-6.1.1-cp36-cp36m-macosx_10_9_x86_64.whl", hash = "sha256:ab6a0fe4c96f8058d41948ddf134420d3ef8c42d5508b5a341a440cce7a37a1d"},
+    {file = "coverage-6.1.1-cp36-cp36m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:10ab138b153e4cc408b43792cb7f518f9ee02f4ff55cd1ab67ad6fd7e9905c7e"},
+    {file = "coverage-6.1.1-cp36-cp36m-manylinux_2_5_i686.manylinux1_i686.manylinux_2_12_i686.manylinux2010_i686.whl", hash = "sha256:7e083d32965d2eb6638a77e65b622be32a094fdc0250f28ce6039b0732fbcaa8"},
+    {file = "coverage-6.1.1-cp36-cp36m-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:359a32515e94e398a5c0fa057e5887a42e647a9502d8e41165cf5cb8d3d1ca67"},
+    {file = "coverage-6.1.1-cp36-cp36m-musllinux_1_1_aarch64.whl", hash = "sha256:bf656cd74ff7b4ed7006cdb2a6728150aaad69c7242b42a2a532f77b63ea233f"},
+    {file = "coverage-6.1.1-cp36-cp36m-musllinux_1_1_i686.whl", hash = "sha256:dc5023be1c2a8b0a0ab5e31389e62c28b2453eb31dd069f4b8d1a0f9814d951a"},
+    {file = "coverage-6.1.1-cp36-cp36m-musllinux_1_1_x86_64.whl", hash = "sha256:557594a50bfe3fb0b1b57460f6789affe8850ad19c1acf2d14a3e12b2757d489"},
+    {file = "coverage-6.1.1-cp36-cp36m-win32.whl", hash = "sha256:9eb0a1923354e0fdd1c8a6f53f5db2e6180d670e2b587914bf2e79fa8acfd003"},
+    {file = "coverage-6.1.1-cp36-cp36m-win_amd64.whl", hash = "sha256:04a92a6cf9afd99f9979c61348ec79725a9f9342fb45e63c889e33c04610d97b"},
+    {file = "coverage-6.1.1-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:479228e1b798d3c246ac89b09897ee706c51b3e5f8f8d778067f38db73ccc717"},
+    {file = "coverage-6.1.1-cp37-cp37m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:78287731e3601ea5ce9d6468c82d88a12ef8fe625d6b7bdec9b45d96c1ad6533"},
+    {file = "coverage-6.1.1-cp37-cp37m-manylinux_2_5_i686.manylinux1_i686.manylinux_2_12_i686.manylinux2010_i686.whl", hash = "sha256:c95257aa2ccf75d3d91d772060538d5fea7f625e48157f8ca44594f94d41cb33"},
+    {file = "coverage-6.1.1-cp37-cp37m-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:9ad5895938a894c368d49d8470fe9f519909e5ebc6b8f8ea5190bd0df6aa4271"},
+    {file = "coverage-6.1.1-cp37-cp37m-musllinux_1_1_aarch64.whl", hash = "sha256:326d944aad0189603733d646e8d4a7d952f7145684da973c463ec2eefe1387c2"},
+    {file = "coverage-6.1.1-cp37-cp37m-musllinux_1_1_i686.whl", hash = "sha256:e7d5606b9240ed4def9cbdf35be4308047d11e858b9c88a6c26974758d6225ce"},
+    {file = "coverage-6.1.1-cp37-cp37m-musllinux_1_1_x86_64.whl", hash = "sha256:572f917267f363101eec375c109c9c1118037c7cc98041440b5eabda3185ac7b"},
+    {file = "coverage-6.1.1-cp37-cp37m-win32.whl", hash = "sha256:35cd2230e1ed76df7d0081a997f0fe705be1f7d8696264eb508076e0d0b5a685"},
+    {file = "coverage-6.1.1-cp37-cp37m-win_amd64.whl", hash = "sha256:65ad3ff837c89a229d626b8004f0ee32110f9bfdb6a88b76a80df36ccc60d926"},
+    {file = "coverage-6.1.1-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:977ce557d79577a3dd510844904d5d968bfef9489f512be65e2882e1c6eed7d8"},
+    {file = "coverage-6.1.1-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:62512c0ec5d307f56d86504c58eace11c1bc2afcdf44e3ff20de8ca427ca1d0e"},
+    {file = "coverage-6.1.1-cp38-cp38-manylinux_2_5_i686.manylinux1_i686.manylinux_2_12_i686.manylinux2010_i686.whl", hash = "sha256:2e5b9c17a56b8bf0c0a9477fcd30d357deb486e4e1b389ed154f608f18556c8a"},
+    {file = "coverage-6.1.1-cp38-cp38-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:666c6b32b69e56221ad1551d377f718ed00e6167c7a1b9257f780b105a101271"},
+    {file = "coverage-6.1.1-cp38-cp38-musllinux_1_1_aarch64.whl", hash = "sha256:fb2fa2f6506c03c48ca42e3fe5a692d7470d290c047ee6de7c0f3e5fa7639ac9"},
+    {file = "coverage-6.1.1-cp38-cp38-musllinux_1_1_i686.whl", hash = "sha256:f0f80e323a17af63eac6a9db0c9188c10f1fd815c3ab299727150cc0eb92c7a4"},
+    {file = "coverage-6.1.1-cp38-cp38-musllinux_1_1_x86_64.whl", hash = "sha256:738e823a746841248b56f0f3bd6abf3b73af191d1fd65e4c723b9c456216f0ad"},
+    {file = "coverage-6.1.1-cp38-cp38-win32.whl", hash = "sha256:8605add58e6a960729aa40c0fd9a20a55909dd9b586d3e8104cc7f45869e4c6b"},
+    {file = "coverage-6.1.1-cp38-cp38-win_amd64.whl", hash = "sha256:6e994003e719458420e14ffb43c08f4c14990e20d9e077cb5cad7a3e419bbb54"},
+    {file = "coverage-6.1.1-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:e3c4f5211394cd0bf6874ac5d29684a495f9c374919833dcfff0bd6d37f96201"},
+    {file = "coverage-6.1.1-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:e14bceb1f3ae8a14374be2b2d7bc12a59226872285f91d66d301e5f41705d4d6"},
+    {file = "coverage-6.1.1-cp39-cp39-manylinux_2_5_i686.manylinux1_i686.manylinux_2_12_i686.manylinux2010_i686.whl", hash = "sha256:0147f7833c41927d84f5af9219d9b32f875c0689e5e74ac8ca3cb61e73a698f9"},
+    {file = "coverage-6.1.1-cp39-cp39-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:b1d0a1bce919de0dd8da5cff4e616b2d9e6ebf3bd1410ff645318c3dd615010a"},
+    {file = "coverage-6.1.1-cp39-cp39-win32.whl", hash = "sha256:a11a2c019324fc111485e79d55907e7289e53d0031275a6c8daed30690bc50c0"},
+    {file = "coverage-6.1.1-cp39-cp39-win_amd64.whl", hash = "sha256:4d8b453764b9b26b0dd2afb83086a7c3f9379134e340288d2a52f8a91592394b"},
+    {file = "coverage-6.1.1-pp36-none-any.whl", hash = "sha256:3b270c6b48d3ff5a35deb3648028ba2643ad8434b07836782b1139cf9c66313f"},
+    {file = "coverage-6.1.1-pp37-none-any.whl", hash = "sha256:ffa8fee2b1b9e60b531c4c27cf528d6b5d5da46b1730db1f4d6eee56ff282e07"},
+    {file = "coverage-6.1.1-pp38-none-any.whl", hash = "sha256:4cd919057636f63ab299ccb86ea0e78b87812400c76abab245ca385f17d19fb5"},
+    {file = "coverage-6.1.1.tar.gz", hash = "sha256:b8e4f15b672c9156c1154249a9c5746e86ac9ae9edc3799ee3afebc323d9d9e0"},
+]
+cycler = [
+    {file = "cycler-0.11.0-py3-none-any.whl", hash = "sha256:3a27e95f763a428a739d2add979fa7494c912a32c17c4c38c4d5f082cad165a3"},
+    {file = "cycler-0.11.0.tar.gz", hash = "sha256:9c87405839a19696e837b3b818fed3f5f69f16f1eec1a1ad77e043dcea9c772f"},
+]
+distlib = [
+    {file = "distlib-0.3.3-py2.py3-none-any.whl", hash = "sha256:c8b54e8454e5bf6237cc84c20e8264c3e991e824ef27e8f1e81049867d861e31"},
+    {file = "distlib-0.3.3.zip", hash = "sha256:d982d0751ff6eaaab5e2ec8e691d949ee80eddf01a62eaa96ddb11531fe16b05"},
+]
+execnet = [
+    {file = "execnet-1.9.0-py2.py3-none-any.whl", hash = "sha256:a295f7cc774947aac58dde7fdc85f4aa00c42adf5d8f5468fc630c1acf30a142"},
+    {file = "execnet-1.9.0.tar.gz", hash = "sha256:8f694f3ba9cc92cab508b152dcfe322153975c29bda272e2fd7f3f00f36e47c5"},
+]
+filelock = [
+    {file = "filelock-3.3.2-py3-none-any.whl", hash = "sha256:bb2a1c717df74c48a2d00ed625e5a66f8572a3a30baacb7657add1d7bac4097b"},
+    {file = "filelock-3.3.2.tar.gz", hash = "sha256:7afc856f74fa7006a289fd10fa840e1eebd8bbff6bffb69c26c54a0512ea8cf8"},
+]
+fonttools = [
+    {file = "fonttools-4.28.1-py3-none-any.whl", hash = "sha256:68071406009e7ef6a5fdcd85d95975cd6963867bb226f2b786bfffe15d1959ef"},
+    {file = "fonttools-4.28.1.zip", hash = "sha256:8c8f84131bf04f3b1dcf99b9763cec35c347164ab6ad006e18d2f99fcab05529"},
+]
+idna = [
+    {file = "idna-3.3-py3-none-any.whl", hash = "sha256:84d9dd047ffa80596e0f246e2eab0b391788b0503584e8945f2368256d2735ff"},
+    {file = "idna-3.3.tar.gz", hash = "sha256:9d643ff0a55b762d5cdb124b8eaa99c66322e2157b69160bc32796e824360e6d"},
+]
+iniconfig = [
+    {file = "iniconfig-1.1.1-py2.py3-none-any.whl", hash = "sha256:011e24c64b7f47f6ebd835bb12a743f2fbe9a26d4cecaa7f53bc4f35ee9da8b3"},
+    {file = "iniconfig-1.1.1.tar.gz", hash = "sha256:bc3af051d7d14b2ee5ef9969666def0cd1a000e121eaea580d4a313df4b37f32"},
+]
+jinja2 = [
+    {file = "Jinja2-3.0.3-py3-none-any.whl", hash = "sha256:077ce6014f7b40d03b47d1f1ca4b0fc8328a692bd284016f806ed0eaca390ad8"},
+    {file = "Jinja2-3.0.3.tar.gz", hash = "sha256:611bb273cd68f3b993fabdc4064fc858c5b47a973cb5aa7999ec1ba405c87cd7"},
+]
+jinja2-time = [
+    {file = "jinja2-time-0.2.0.tar.gz", hash = "sha256:d14eaa4d315e7688daa4969f616f226614350c48730bfa1692d2caebd8c90d40"},
+    {file = "jinja2_time-0.2.0-py2.py3-none-any.whl", hash = "sha256:d3eab6605e3ec8b7a0863df09cc1d23714908fa61aa6986a845c20ba488b4efa"},
+]
+kiwisolver = [
+    {file = "kiwisolver-1.3.2-cp310-cp310-macosx_10_9_universal2.whl", hash = "sha256:1d819553730d3c2724582124aee8a03c846ec4362ded1034c16fb3ef309264e6"},
+    {file = "kiwisolver-1.3.2-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:8d93a1095f83e908fc253f2fb569c2711414c0bfd451cab580466465b235b470"},
+    {file = "kiwisolver-1.3.2-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:c4550a359c5157aaf8507e6820d98682872b9100ce7607f8aa070b4b8af6c298"},
+    {file = "kiwisolver-1.3.2-cp310-cp310-manylinux_2_12_i686.manylinux2010_i686.whl", hash = "sha256:2210f28778c7d2ee13f3c2a20a3a22db889e75f4ec13a21072eabb5693801e84"},
+    {file = "kiwisolver-1.3.2-cp310-cp310-manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:82f49c5a79d3839bc8f38cb5f4bfc87e15f04cbafa5fbd12fb32c941cb529cfb"},
+    {file = "kiwisolver-1.3.2-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:9661a04ca3c950a8ac8c47f53cbc0b530bce1b52f516a1e87b7736fec24bfff0"},
+    {file = "kiwisolver-1.3.2-cp310-cp310-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:2ddb500a2808c100e72c075cbb00bf32e62763c82b6a882d403f01a119e3f402"},
+    {file = "kiwisolver-1.3.2-cp310-cp310-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:72be6ebb4e92520b9726d7146bc9c9b277513a57a38efcf66db0620aec0097e0"},
+    {file = "kiwisolver-1.3.2-cp310-cp310-win32.whl", hash = "sha256:83d2c9db5dfc537d0171e32de160461230eb14663299b7e6d18ca6dca21e4977"},
+    {file = "kiwisolver-1.3.2-cp310-cp310-win_amd64.whl", hash = "sha256:cba430db673c29376135e695c6e2501c44c256a81495da849e85d1793ee975ad"},
+    {file = "kiwisolver-1.3.2-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:4116ba9a58109ed5e4cb315bdcbff9838f3159d099ba5259c7c7fb77f8537492"},
+    {file = "kiwisolver-1.3.2-cp37-cp37m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:19554bd8d54cf41139f376753af1a644b63c9ca93f8f72009d50a2080f870f77"},
+    {file = "kiwisolver-1.3.2-cp37-cp37m-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:a7a4cf5bbdc861987a7745aed7a536c6405256853c94abc9f3287c3fa401b174"},
+    {file = "kiwisolver-1.3.2-cp37-cp37m-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:0007840186bacfaa0aba4466d5890334ea5938e0bb7e28078a0eb0e63b5b59d5"},
+    {file = "kiwisolver-1.3.2-cp37-cp37m-manylinux_2_5_i686.manylinux1_i686.whl", hash = "sha256:ec2eba188c1906b05b9b49ae55aae4efd8150c61ba450e6721f64620c50b59eb"},
+    {file = "kiwisolver-1.3.2-cp37-cp37m-manylinux_2_5_x86_64.manylinux1_x86_64.whl", hash = "sha256:3dbb3cea20b4af4f49f84cffaf45dd5f88e8594d18568e0225e6ad9dec0e7967"},
+    {file = "kiwisolver-1.3.2-cp37-cp37m-win32.whl", hash = "sha256:5326ddfacbe51abf9469fe668944bc2e399181a2158cb5d45e1d40856b2a0589"},
+    {file = "kiwisolver-1.3.2-cp37-cp37m-win_amd64.whl", hash = "sha256:c6572c2dab23c86a14e82c245473d45b4c515314f1f859e92608dcafbd2f19b8"},
+    {file = "kiwisolver-1.3.2-cp38-cp38-macosx_10_9_universal2.whl", hash = "sha256:b5074fb09429f2b7bc82b6fb4be8645dcbac14e592128beeff5461dcde0af09f"},
+    {file = "kiwisolver-1.3.2-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:22521219ca739654a296eea6d4367703558fba16f98688bd8ce65abff36eaa84"},
+    {file = "kiwisolver-1.3.2-cp38-cp38-macosx_11_0_arm64.whl", hash = "sha256:c358721aebd40c243894298f685a19eb0491a5c3e0b923b9f887ef1193ddf829"},
+    {file = "kiwisolver-1.3.2-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:7ba5a1041480c6e0a8b11a9544d53562abc2d19220bfa14133e0cdd9967e97af"},
+    {file = "kiwisolver-1.3.2-cp38-cp38-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:44e6adf67577dbdfa2d9f06db9fbc5639afefdb5bf2b4dfec25c3a7fbc619536"},
+    {file = "kiwisolver-1.3.2-cp38-cp38-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:1d45d1c74f88b9f41062716c727f78f2a59a5476ecbe74956fafb423c5c87a76"},
+    {file = "kiwisolver-1.3.2-cp38-cp38-manylinux_2_5_i686.manylinux1_i686.whl", hash = "sha256:70adc3658138bc77a36ce769f5f183169bc0a2906a4f61f09673f7181255ac9b"},
+    {file = "kiwisolver-1.3.2-cp38-cp38-manylinux_2_5_x86_64.manylinux1_x86_64.whl", hash = "sha256:b6a5431940f28b6de123de42f0eb47b84a073ee3c3345dc109ad550a3307dd28"},
+    {file = "kiwisolver-1.3.2-cp38-cp38-win32.whl", hash = "sha256:ee040a7de8d295dbd261ef2d6d3192f13e2b08ec4a954de34a6fb8ff6422e24c"},
+    {file = "kiwisolver-1.3.2-cp38-cp38-win_amd64.whl", hash = "sha256:8dc3d842fa41a33fe83d9f5c66c0cc1f28756530cd89944b63b072281e852031"},
+    {file = "kiwisolver-1.3.2-cp39-cp39-macosx_10_9_universal2.whl", hash = "sha256:a498bcd005e8a3fedd0022bb30ee0ad92728154a8798b703f394484452550507"},
+    {file = "kiwisolver-1.3.2-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:80efd202108c3a4150e042b269f7c78643420cc232a0a771743bb96b742f838f"},
+    {file = "kiwisolver-1.3.2-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:f8eb7b6716f5b50e9c06207a14172cf2de201e41912ebe732846c02c830455b9"},
+    {file = "kiwisolver-1.3.2-cp39-cp39-manylinux_2_12_i686.manylinux2010_i686.whl", hash = "sha256:f441422bb313ab25de7b3dbfd388e790eceb76ce01a18199ec4944b369017009"},
+    {file = "kiwisolver-1.3.2-cp39-cp39-manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:30fa008c172355c7768159983a7270cb23838c4d7db73d6c0f6b60dde0d432c6"},
+    {file = "kiwisolver-1.3.2-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:2f8f6c8f4f1cff93ca5058d6ec5f0efda922ecb3f4c5fb76181f327decff98b8"},
+    {file = "kiwisolver-1.3.2-cp39-cp39-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:ba677bcaff9429fd1bf01648ad0901cea56c0d068df383d5f5856d88221fe75b"},
+    {file = "kiwisolver-1.3.2-cp39-cp39-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:7843b1624d6ccca403a610d1277f7c28ad184c5aa88a1750c1a999754e65b439"},
+    {file = "kiwisolver-1.3.2-cp39-cp39-win32.whl", hash = "sha256:e6f5eb2f53fac7d408a45fbcdeda7224b1cfff64919d0f95473420a931347ae9"},
+    {file = "kiwisolver-1.3.2-cp39-cp39-win_amd64.whl", hash = "sha256:eedd3b59190885d1ebdf6c5e0ca56828beb1949b4dfe6e5d0256a461429ac386"},
+    {file = "kiwisolver-1.3.2-pp37-pypy37_pp73-macosx_10_9_x86_64.whl", hash = "sha256:dedc71c8eb9c5096037766390172c34fb86ef048b8e8958b4e484b9e505d66bc"},
+    {file = "kiwisolver-1.3.2-pp37-pypy37_pp73-manylinux_2_12_i686.manylinux2010_i686.whl", hash = "sha256:bf7eb45d14fc036514c09554bf983f2a72323254912ed0c3c8e697b62c4c158f"},
+    {file = "kiwisolver-1.3.2-pp37-pypy37_pp73-manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:2b65bd35f3e06a47b5c30ea99e0c2b88f72c6476eedaf8cfbc8e66adb5479dcf"},
+    {file = "kiwisolver-1.3.2-pp37-pypy37_pp73-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:25405f88a37c5f5bcba01c6e350086d65e7465fd1caaf986333d2a045045a223"},
+    {file = "kiwisolver-1.3.2-pp37-pypy37_pp73-win_amd64.whl", hash = "sha256:bcadb05c3d4794eb9eee1dddf1c24215c92fb7b55a80beae7a60530a91060560"},
+    {file = "kiwisolver-1.3.2.tar.gz", hash = "sha256:fc4453705b81d03568d5b808ad8f09c77c47534f6ac2e72e733f9ca4714aa75c"},
+]
+markupsafe = [
+    {file = "MarkupSafe-2.0.1-cp310-cp310-macosx_10_9_universal2.whl", hash = "sha256:d8446c54dc28c01e5a2dbac5a25f071f6653e6e40f3a8818e8b45d790fe6ef53"},
+    {file = "MarkupSafe-2.0.1-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:36bc903cbb393720fad60fc28c10de6acf10dc6cc883f3e24ee4012371399a38"},
+    {file = "MarkupSafe-2.0.1-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:2d7d807855b419fc2ed3e631034685db6079889a1f01d5d9dac950f764da3dad"},
+    {file = "MarkupSafe-2.0.1-cp310-cp310-manylinux_2_5_i686.manylinux1_i686.manylinux_2_12_i686.manylinux2010_i686.whl", hash = "sha256:add36cb2dbb8b736611303cd3bfcee00afd96471b09cda130da3581cbdc56a6d"},
+    {file = "MarkupSafe-2.0.1-cp310-cp310-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:168cd0a3642de83558a5153c8bd34f175a9a6e7f6dc6384b9655d2697312a646"},
+    {file = "MarkupSafe-2.0.1-cp310-cp310-musllinux_1_1_aarch64.whl", hash = "sha256:4dc8f9fb58f7364b63fd9f85013b780ef83c11857ae79f2feda41e270468dd9b"},
+    {file = "MarkupSafe-2.0.1-cp310-cp310-musllinux_1_1_i686.whl", hash = "sha256:20dca64a3ef2d6e4d5d615a3fd418ad3bde77a47ec8a23d984a12b5b4c74491a"},
+    {file = "MarkupSafe-2.0.1-cp310-cp310-musllinux_1_1_x86_64.whl", hash = "sha256:cdfba22ea2f0029c9261a4bd07e830a8da012291fbe44dc794e488b6c9bb353a"},
+    {file = "MarkupSafe-2.0.1-cp310-cp310-win32.whl", hash = "sha256:99df47edb6bda1249d3e80fdabb1dab8c08ef3975f69aed437cb69d0a5de1e28"},
+    {file = "MarkupSafe-2.0.1-cp310-cp310-win_amd64.whl", hash = "sha256:e0f138900af21926a02425cf736db95be9f4af72ba1bb21453432a07f6082134"},
+    {file = "MarkupSafe-2.0.1-cp36-cp36m-macosx_10_9_x86_64.whl", hash = "sha256:f9081981fe268bd86831e5c75f7de206ef275defcb82bc70740ae6dc507aee51"},
+    {file = "MarkupSafe-2.0.1-cp36-cp36m-manylinux1_i686.whl", hash = "sha256:0955295dd5eec6cb6cc2fe1698f4c6d84af2e92de33fbcac4111913cd100a6ff"},
+    {file = "MarkupSafe-2.0.1-cp36-cp36m-manylinux1_x86_64.whl", hash = "sha256:0446679737af14f45767963a1a9ef7620189912317d095f2d9ffa183a4d25d2b"},
+    {file = "MarkupSafe-2.0.1-cp36-cp36m-manylinux2010_i686.whl", hash = "sha256:f826e31d18b516f653fe296d967d700fddad5901ae07c622bb3705955e1faa94"},
+    {file = "MarkupSafe-2.0.1-cp36-cp36m-manylinux2010_x86_64.whl", hash = "sha256:fa130dd50c57d53368c9d59395cb5526eda596d3ffe36666cd81a44d56e48872"},
+    {file = "MarkupSafe-2.0.1-cp36-cp36m-manylinux2014_aarch64.whl", hash = "sha256:905fec760bd2fa1388bb5b489ee8ee5f7291d692638ea5f67982d968366bef9f"},
+    {file = "MarkupSafe-2.0.1-cp36-cp36m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:bf5d821ffabf0ef3533c39c518f3357b171a1651c1ff6827325e4489b0e46c3c"},
+    {file = "MarkupSafe-2.0.1-cp36-cp36m-manylinux_2_5_i686.manylinux1_i686.manylinux_2_12_i686.manylinux2010_i686.whl", hash = "sha256:0d4b31cc67ab36e3392bbf3862cfbadac3db12bdd8b02a2731f509ed5b829724"},
+    {file = "MarkupSafe-2.0.1-cp36-cp36m-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:baa1a4e8f868845af802979fcdbf0bb11f94f1cb7ced4c4b8a351bb60d108145"},
+    {file = "MarkupSafe-2.0.1-cp36-cp36m-musllinux_1_1_aarch64.whl", hash = "sha256:deb993cacb280823246a026e3b2d81c493c53de6acfd5e6bfe31ab3402bb37dd"},
+    {file = "MarkupSafe-2.0.1-cp36-cp36m-musllinux_1_1_i686.whl", hash = "sha256:63f3268ba69ace99cab4e3e3b5840b03340efed0948ab8f78d2fd87ee5442a4f"},
+    {file = "MarkupSafe-2.0.1-cp36-cp36m-musllinux_1_1_x86_64.whl", hash = "sha256:8d206346619592c6200148b01a2142798c989edcb9c896f9ac9722a99d4e77e6"},
+    {file = "MarkupSafe-2.0.1-cp36-cp36m-win32.whl", hash = "sha256:6c4ca60fa24e85fe25b912b01e62cb969d69a23a5d5867682dd3e80b5b02581d"},
+    {file = "MarkupSafe-2.0.1-cp36-cp36m-win_amd64.whl", hash = "sha256:b2f4bf27480f5e5e8ce285a8c8fd176c0b03e93dcc6646477d4630e83440c6a9"},
+    {file = "MarkupSafe-2.0.1-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:0717a7390a68be14b8c793ba258e075c6f4ca819f15edfc2a3a027c823718567"},
+    {file = "MarkupSafe-2.0.1-cp37-cp37m-manylinux1_i686.whl", hash = "sha256:6557b31b5e2c9ddf0de32a691f2312a32f77cd7681d8af66c2692efdbef84c18"},
+    {file = "MarkupSafe-2.0.1-cp37-cp37m-manylinux1_x86_64.whl", hash = "sha256:49e3ceeabbfb9d66c3aef5af3a60cc43b85c33df25ce03d0031a608b0a8b2e3f"},
+    {file = "MarkupSafe-2.0.1-cp37-cp37m-manylinux2010_i686.whl", hash = "sha256:d7f9850398e85aba693bb640262d3611788b1f29a79f0c93c565694658f4071f"},
+    {file = "MarkupSafe-2.0.1-cp37-cp37m-manylinux2010_x86_64.whl", hash = "sha256:6a7fae0dd14cf60ad5ff42baa2e95727c3d81ded453457771d02b7d2b3f9c0c2"},
+    {file = "MarkupSafe-2.0.1-cp37-cp37m-manylinux2014_aarch64.whl", hash = "sha256:b7f2d075102dc8c794cbde1947378051c4e5180d52d276987b8d28a3bd58c17d"},
+    {file = "MarkupSafe-2.0.1-cp37-cp37m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:e9936f0b261d4df76ad22f8fee3ae83b60d7c3e871292cd42f40b81b70afae85"},
+    {file = "MarkupSafe-2.0.1-cp37-cp37m-manylinux_2_5_i686.manylinux1_i686.manylinux_2_12_i686.manylinux2010_i686.whl", hash = "sha256:2a7d351cbd8cfeb19ca00de495e224dea7e7d919659c2841bbb7f420ad03e2d6"},
+    {file = "MarkupSafe-2.0.1-cp37-cp37m-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:60bf42e36abfaf9aff1f50f52644b336d4f0a3fd6d8a60ca0d054ac9f713a864"},
+    {file = "MarkupSafe-2.0.1-cp37-cp37m-musllinux_1_1_aarch64.whl", hash = "sha256:d6c7ebd4e944c85e2c3421e612a7057a2f48d478d79e61800d81468a8d842207"},
+    {file = "MarkupSafe-2.0.1-cp37-cp37m-musllinux_1_1_i686.whl", hash = "sha256:f0567c4dc99f264f49fe27da5f735f414c4e7e7dd850cfd8e69f0862d7c74ea9"},
+    {file = "MarkupSafe-2.0.1-cp37-cp37m-musllinux_1_1_x86_64.whl", hash = "sha256:89c687013cb1cd489a0f0ac24febe8c7a666e6e221b783e53ac50ebf68e45d86"},
+    {file = "MarkupSafe-2.0.1-cp37-cp37m-win32.whl", hash = "sha256:a30e67a65b53ea0a5e62fe23682cfe22712e01f453b95233b25502f7c61cb415"},
+    {file = "MarkupSafe-2.0.1-cp37-cp37m-win_amd64.whl", hash = "sha256:611d1ad9a4288cf3e3c16014564df047fe08410e628f89805e475368bd304914"},
+    {file = "MarkupSafe-2.0.1-cp38-cp38-macosx_10_9_universal2.whl", hash = "sha256:5bb28c636d87e840583ee3adeb78172efc47c8b26127267f54a9c0ec251d41a9"},
+    {file = "MarkupSafe-2.0.1-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:be98f628055368795d818ebf93da628541e10b75b41c559fdf36d104c5787066"},
+    {file = "MarkupSafe-2.0.1-cp38-cp38-manylinux1_i686.whl", hash = "sha256:1d609f577dc6e1aa17d746f8bd3c31aa4d258f4070d61b2aa5c4166c1539de35"},
+    {file = "MarkupSafe-2.0.1-cp38-cp38-manylinux1_x86_64.whl", hash = "sha256:7d91275b0245b1da4d4cfa07e0faedd5b0812efc15b702576d103293e252af1b"},
+    {file = "MarkupSafe-2.0.1-cp38-cp38-manylinux2010_i686.whl", hash = "sha256:01a9b8ea66f1658938f65b93a85ebe8bc016e6769611be228d797c9d998dd298"},
+    {file = "MarkupSafe-2.0.1-cp38-cp38-manylinux2010_x86_64.whl", hash = "sha256:47ab1e7b91c098ab893b828deafa1203de86d0bc6ab587b160f78fe6c4011f75"},
+    {file = "MarkupSafe-2.0.1-cp38-cp38-manylinux2014_aarch64.whl", hash = "sha256:97383d78eb34da7e1fa37dd273c20ad4320929af65d156e35a5e2d89566d9dfb"},
+    {file = "MarkupSafe-2.0.1-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:6fcf051089389abe060c9cd7caa212c707e58153afa2c649f00346ce6d260f1b"},
+    {file = "MarkupSafe-2.0.1-cp38-cp38-manylinux_2_5_i686.manylinux1_i686.manylinux_2_12_i686.manylinux2010_i686.whl", hash = "sha256:5855f8438a7d1d458206a2466bf82b0f104a3724bf96a1c781ab731e4201731a"},
+    {file = "MarkupSafe-2.0.1-cp38-cp38-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:3dd007d54ee88b46be476e293f48c85048603f5f516008bee124ddd891398ed6"},
+    {file = "MarkupSafe-2.0.1-cp38-cp38-musllinux_1_1_aarch64.whl", hash = "sha256:aca6377c0cb8a8253e493c6b451565ac77e98c2951c45f913e0b52facdcff83f"},
+    {file = "MarkupSafe-2.0.1-cp38-cp38-musllinux_1_1_i686.whl", hash = "sha256:04635854b943835a6ea959e948d19dcd311762c5c0c6e1f0e16ee57022669194"},
+    {file = "MarkupSafe-2.0.1-cp38-cp38-musllinux_1_1_x86_64.whl", hash = "sha256:6300b8454aa6930a24b9618fbb54b5a68135092bc666f7b06901f897fa5c2fee"},
+    {file = "MarkupSafe-2.0.1-cp38-cp38-win32.whl", hash = "sha256:023cb26ec21ece8dc3907c0e8320058b2e0cb3c55cf9564da612bc325bed5e64"},
+    {file = "MarkupSafe-2.0.1-cp38-cp38-win_amd64.whl", hash = "sha256:984d76483eb32f1bcb536dc27e4ad56bba4baa70be32fa87152832cdd9db0833"},
+    {file = "MarkupSafe-2.0.1-cp39-cp39-macosx_10_9_universal2.whl", hash = "sha256:2ef54abee730b502252bcdf31b10dacb0a416229b72c18b19e24a4509f273d26"},
+    {file = "MarkupSafe-2.0.1-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:3c112550557578c26af18a1ccc9e090bfe03832ae994343cfdacd287db6a6ae7"},
+    {file = "MarkupSafe-2.0.1-cp39-cp39-manylinux1_i686.whl", hash = "sha256:53edb4da6925ad13c07b6d26c2a852bd81e364f95301c66e930ab2aef5b5ddd8"},
+    {file = "MarkupSafe-2.0.1-cp39-cp39-manylinux1_x86_64.whl", hash = "sha256:f5653a225f31e113b152e56f154ccbe59eeb1c7487b39b9d9f9cdb58e6c79dc5"},
+    {file = "MarkupSafe-2.0.1-cp39-cp39-manylinux2010_i686.whl", hash = "sha256:4efca8f86c54b22348a5467704e3fec767b2db12fc39c6d963168ab1d3fc9135"},
+    {file = "MarkupSafe-2.0.1-cp39-cp39-manylinux2010_x86_64.whl", hash = "sha256:ab3ef638ace319fa26553db0624c4699e31a28bb2a835c5faca8f8acf6a5a902"},
+    {file = "MarkupSafe-2.0.1-cp39-cp39-manylinux2014_aarch64.whl", hash = "sha256:f8ba0e8349a38d3001fae7eadded3f6606f0da5d748ee53cc1dab1d6527b9509"},
+    {file = "MarkupSafe-2.0.1-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:c47adbc92fc1bb2b3274c4b3a43ae0e4573d9fbff4f54cd484555edbf030baf1"},
+    {file = "MarkupSafe-2.0.1-cp39-cp39-manylinux_2_5_i686.manylinux1_i686.manylinux_2_12_i686.manylinux2010_i686.whl", hash = "sha256:37205cac2a79194e3750b0af2a5720d95f786a55ce7df90c3af697bfa100eaac"},
+    {file = "MarkupSafe-2.0.1-cp39-cp39-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:1f2ade76b9903f39aa442b4aadd2177decb66525062db244b35d71d0ee8599b6"},
+    {file = "MarkupSafe-2.0.1-cp39-cp39-musllinux_1_1_aarch64.whl", hash = "sha256:4296f2b1ce8c86a6aea78613c34bb1a672ea0e3de9c6ba08a960efe0b0a09047"},
+    {file = "MarkupSafe-2.0.1-cp39-cp39-musllinux_1_1_i686.whl", hash = "sha256:9f02365d4e99430a12647f09b6cc8bab61a6564363f313126f775eb4f6ef798e"},
+    {file = "MarkupSafe-2.0.1-cp39-cp39-musllinux_1_1_x86_64.whl", hash = "sha256:5b6d930f030f8ed98e3e6c98ffa0652bdb82601e7a016ec2ab5d7ff23baa78d1"},
+    {file = "MarkupSafe-2.0.1-cp39-cp39-win32.whl", hash = "sha256:10f82115e21dc0dfec9ab5c0223652f7197feb168c940f3ef61563fc2d6beb74"},
+    {file = "MarkupSafe-2.0.1-cp39-cp39-win_amd64.whl", hash = "sha256:693ce3f9e70a6cf7d2fb9e6c9d8b204b6b39897a2c4a1aa65728d5ac97dcc1d8"},
+    {file = "MarkupSafe-2.0.1.tar.gz", hash = "sha256:594c67807fb16238b30c44bdf74f36c02cdf22d1c8cda91ef8a0ed8dabf5620a"},
+]
+matplotlib = [
+    {file = "matplotlib-3.5.0rc1-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:2304ed74bac2e42ce855bae10ee8df50037ccfa8f3219d2a14d12d884aef35bf"},
+    {file = "matplotlib-3.5.0rc1-cp310-cp310-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:0c9796b7d7c2d8369596cc1b831b354a31bbbbebc9fd6d0cdaed57772258e752"},
+    {file = "matplotlib-3.5.0rc1-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:6bf9a9b7f11911f38ada0619f752b030a3f7cfeb191207baddf3ba59d8eaf354"},
+    {file = "matplotlib-3.5.0rc1-cp310-cp310-win32.whl", hash = "sha256:76a992ad48c51b1161baa210dc9dd9859162000512ca7f62c13b793f583fa752"},
+    {file = "matplotlib-3.5.0rc1-cp310-cp310-win_amd64.whl", hash = "sha256:0deaf6dd1eb86bc14ae9b973dae75597307fcf13646bab9aa1dd36ce371a7739"},
+    {file = "matplotlib-3.5.0rc1-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:00d469bed4903cc614fb76c7eabaf4846a26ae6b97f66dac455a49cb466dc22d"},
+    {file = "matplotlib-3.5.0rc1-cp37-cp37m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:cca24b40748dd1f2228134b29f12db824ed1559831a47be3fd139aade6c67afb"},
+    {file = "matplotlib-3.5.0rc1-cp37-cp37m-manylinux_2_5_i686.manylinux1_i686.whl", hash = "sha256:2f0c242d1b81f399d9019be4d6814cf73a2aee0ccb75e2ce6694341948663f3a"},
+    {file = "matplotlib-3.5.0rc1-cp37-cp37m-manylinux_2_5_x86_64.manylinux1_x86_64.whl", hash = "sha256:b0cda4c634bf704f72be071b7ba3328f07fcc35bfea98ea0afb307e69c723c92"},
+    {file = "matplotlib-3.5.0rc1-cp37-cp37m-win32.whl", hash = "sha256:ab8eb6010162620c9ae1082e9cc700d4b1906663c7ffaedad9d1ccd2cdfa4c78"},
+    {file = "matplotlib-3.5.0rc1-cp37-cp37m-win_amd64.whl", hash = "sha256:9684081b91cd0bc92acb4ac5b82c05b5d5da3fb4105793cbbcc06fc9b53ddea3"},
+    {file = "matplotlib-3.5.0rc1-cp38-cp38-macosx_10_9_universal2.whl", hash = "sha256:dedb66611175dbec03de5788c03b88b08c48ddb67fcda090dd6b5069aa295ae2"},
+    {file = "matplotlib-3.5.0rc1-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:a2bda16b30c166d91b5186efa17b783862ac43b77a79be3aa52dd9bd8c399668"},
+    {file = "matplotlib-3.5.0rc1-cp38-cp38-macosx_11_0_arm64.whl", hash = "sha256:0a032584a62835c2a4d0949ed6e0287e531d92dd37de86f11f2b5c691cbf22a9"},
+    {file = "matplotlib-3.5.0rc1-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:282eaa1250322304778e3e2caf3055699cc17ee3bb72cbc5218abb8834c19afe"},
+    {file = "matplotlib-3.5.0rc1-cp38-cp38-manylinux_2_5_i686.manylinux1_i686.whl", hash = "sha256:faf0bbc742d51064cd028095d95c352b7a024c77eac6b88a15070464aaa9bee3"},
+    {file = "matplotlib-3.5.0rc1-cp38-cp38-manylinux_2_5_x86_64.manylinux1_x86_64.whl", hash = "sha256:fe2a594b65b5f2c8ec3d5211b9fd5ba290f3ed931aec93cd42bf14087d400e99"},
+    {file = "matplotlib-3.5.0rc1-cp38-cp38-win32.whl", hash = "sha256:9d7c1aff047f85f856f9889ac6daf096f8df9e73b12f025d00ef5615fe252d59"},
+    {file = "matplotlib-3.5.0rc1-cp38-cp38-win_amd64.whl", hash = "sha256:1d70aa938e75ae527e828a21d1fde5d020287329240b9d88c0f919b2dcd13b91"},
+    {file = "matplotlib-3.5.0rc1-cp39-cp39-macosx_10_9_universal2.whl", hash = "sha256:0a516408a46c9c241cf4768ddef0e3c44e7f1ccb3977e11266f3e4a0494d5027"},
+    {file = "matplotlib-3.5.0rc1-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:54d8ebf4cf75e84aeb280f27e564c9dc5520e7c3e31b41fa10efb99d1cd46d82"},
+    {file = "matplotlib-3.5.0rc1-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:7180977b113ab24f9676cac38e04dd6fc615678127f1399baa184a3f92f2f252"},
+    {file = "matplotlib-3.5.0rc1-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:78391a9d47d1880265726aecfbc9ad7c96bd7f67979f4e4b0e99012152a9d430"},
+    {file = "matplotlib-3.5.0rc1-cp39-cp39-manylinux_2_5_i686.manylinux1_i686.whl", hash = "sha256:877c3c09527d7c2c09fec87303fd1d8167418c5a29a7fd06fa2ef8aa02c9aa0d"},
+    {file = "matplotlib-3.5.0rc1-cp39-cp39-manylinux_2_5_x86_64.manylinux1_x86_64.whl", hash = "sha256:0a8f71944ec1b7e053d6a5c95589eb50becfb60099ed6f5435ce5e72dc3357f2"},
+    {file = "matplotlib-3.5.0rc1-cp39-cp39-win32.whl", hash = "sha256:06161e27ab0cf20004596e60b7305f12c451ea37dffc8d6fb902c53f5419af67"},
+    {file = "matplotlib-3.5.0rc1-cp39-cp39-win_amd64.whl", hash = "sha256:6dcc0010abbc2c46391517907463aeab9facfe2fe32001b065517a1f60f64ca3"},
+    {file = "matplotlib-3.5.0rc1-pp37-pypy37_pp73-macosx_10_9_x86_64.whl", hash = "sha256:03fccdf87bdf91e086a095327d26b1ba4e146c4279f380e6e9391d03ff2bf86a"},
+    {file = "matplotlib-3.5.0rc1-pp37-pypy37_pp73-manylinux_2_12_i686.manylinux2010_i686.whl", hash = "sha256:1d7bee5982f00d4d6d646702200aba22b38a91064ccd9bfd85d4ff1df4c677f4"},
+    {file = "matplotlib-3.5.0rc1-pp37-pypy37_pp73-manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:a8ca7cc1c93794ed3fd55c21d47aa1765b93907a98ed2a6e2aaf51403a303f1c"},
+    {file = "matplotlib-3.5.0rc1.tar.gz", hash = "sha256:30752c0505f73167cddc3480ff6f747a557dd6a34b54b3008f47254b4d3078d0"},
+]
+mypy-extensions = [
+    {file = "mypy_extensions-0.4.3-py2.py3-none-any.whl", hash = "sha256:090fedd75945a69ae91ce1303b5824f428daf5a028d2f6ab8a299250a846f15d"},
+    {file = "mypy_extensions-0.4.3.tar.gz", hash = "sha256:2d82818f5bb3e369420cb3c4060a7970edba416647068eb4c5343488a6c604a8"},
+]
+numpy = [
+    {file = "numpy-1.21.4-cp310-cp310-macosx_10_9_universal2.whl", hash = "sha256:8890b3360f345e8360133bc078d2dacc2843b6ee6059b568781b15b97acbe39f"},
+    {file = "numpy-1.21.4-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:69077388c5a4b997442b843dbdc3a85b420fb693ec8e33020bb24d647c164fa5"},
+    {file = "numpy-1.21.4-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:e89717274b41ebd568cd7943fc9418eeb49b1785b66031bc8a7f6300463c5898"},
+    {file = "numpy-1.21.4-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:0b78ecfa070460104934e2caf51694ccd00f37d5e5dbe76f021b1b0b0d221823"},
+    {file = "numpy-1.21.4-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:615d4e328af7204c13ae3d4df7615a13ff60a49cb0d9106fde07f541207883ca"},
+    {file = "numpy-1.21.4-cp310-cp310-win_amd64.whl", hash = "sha256:1403b4e2181fc72664737d848b60e65150f272fe5a1c1cbc16145ed43884065a"},
+    {file = "numpy-1.21.4-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:74b85a17528ca60cf98381a5e779fc0264b4a88b46025e6bcbe9621f46bb3e63"},
+    {file = "numpy-1.21.4-cp37-cp37m-manylinux_2_12_i686.manylinux2010_i686.whl", hash = "sha256:92aafa03da8658609f59f18722b88f0a73a249101169e28415b4fa148caf7e41"},
+    {file = "numpy-1.21.4-cp37-cp37m-manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:5d95668e727c75b3f5088ec7700e260f90ec83f488e4c0aaccb941148b2cd377"},
+    {file = "numpy-1.21.4-cp37-cp37m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:f5162ec777ba7138906c9c274353ece5603646c6965570d82905546579573f73"},
+    {file = "numpy-1.21.4-cp37-cp37m-win32.whl", hash = "sha256:81225e58ef5fce7f1d80399575576fc5febec79a8a2742e8ef86d7b03beef49f"},
+    {file = "numpy-1.21.4-cp37-cp37m-win_amd64.whl", hash = "sha256:32fe5b12061f6446adcbb32cf4060a14741f9c21e15aaee59a207b6ce6423469"},
+    {file = "numpy-1.21.4-cp38-cp38-macosx_10_9_universal2.whl", hash = "sha256:c449eb870616a7b62e097982c622d2577b3dbc800aaf8689254ec6e0197cbf1e"},
+    {file = "numpy-1.21.4-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:2e4ed57f45f0aa38beca2a03b6532e70e548faf2debbeb3291cfc9b315d9be8f"},
+    {file = "numpy-1.21.4-cp38-cp38-macosx_11_0_arm64.whl", hash = "sha256:1247ef28387b7bb7f21caf2dbe4767f4f4175df44d30604d42ad9bd701ebb31f"},
+    {file = "numpy-1.21.4-cp38-cp38-manylinux_2_12_i686.manylinux2010_i686.whl", hash = "sha256:34f3456f530ae8b44231c63082c8899fe9c983fd9b108c997c4b1c8c2d435333"},
+    {file = "numpy-1.21.4-cp38-cp38-manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:4c9c23158b87ed0e70d9a50c67e5c0b3f75bcf2581a8e34668d4e9d7474d76c6"},
+    {file = "numpy-1.21.4-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:e4799be6a2d7d3c33699a6f77201836ac975b2e1b98c2a07f66a38f499cb50ce"},
+    {file = "numpy-1.21.4-cp38-cp38-win32.whl", hash = "sha256:bc988afcea53e6156546e5b2885b7efab089570783d9d82caf1cfd323b0bb3dd"},
+    {file = "numpy-1.21.4-cp38-cp38-win_amd64.whl", hash = "sha256:170b2a0805c6891ca78c1d96ee72e4c3ed1ae0a992c75444b6ab20ff038ba2cd"},
+    {file = "numpy-1.21.4-cp39-cp39-macosx_10_9_universal2.whl", hash = "sha256:fde96af889262e85aa033f8ee1d3241e32bf36228318a61f1ace579df4e8170d"},
+    {file = "numpy-1.21.4-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:c885bfc07f77e8fee3dc879152ba993732601f1f11de248d4f357f0ffea6a6d4"},
+    {file = "numpy-1.21.4-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:9e6f5f50d1eff2f2f752b3089a118aee1ea0da63d56c44f3865681009b0af162"},
+    {file = "numpy-1.21.4-cp39-cp39-manylinux_2_12_i686.manylinux2010_i686.whl", hash = "sha256:ad010846cdffe7ec27e3f933397f8a8d6c801a48634f419e3d075db27acf5880"},
+    {file = "numpy-1.21.4-cp39-cp39-manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:c74c699b122918a6c4611285cc2cad4a3aafdb135c22a16ec483340ef97d573c"},
+    {file = "numpy-1.21.4-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:9864424631775b0c052f3bd98bc2712d131b3e2cd95d1c0c68b91709170890b0"},
+    {file = "numpy-1.21.4-cp39-cp39-win32.whl", hash = "sha256:b1e2312f5b8843a3e4e8224b2b48fe16119617b8fc0a54df8f50098721b5bed2"},
+    {file = "numpy-1.21.4-cp39-cp39-win_amd64.whl", hash = "sha256:e3c3e990274444031482a31280bf48674441e0a5b55ddb168f3a6db3e0c38ec8"},
+    {file = "numpy-1.21.4-pp37-pypy37_pp73-manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:a3deb31bc84f2b42584b8c4001c85d1934dbfb4030827110bc36bfd11509b7bf"},
+    {file = "numpy-1.21.4.zip", hash = "sha256:e6c76a87633aa3fa16614b61ccedfae45b91df2767cf097aa9c933932a7ed1e0"},
+]
+packaging = [
+    {file = "packaging-21.2-py3-none-any.whl", hash = "sha256:14317396d1e8cdb122989b916fa2c7e9ca8e2be9e8060a6eff75b6b7b4d8a7e0"},
+    {file = "packaging-21.2.tar.gz", hash = "sha256:096d689d78ca690e4cd8a89568ba06d07ca097e3306a4381635073ca91479966"},
+]
+pathspec = [
+    {file = "pathspec-0.9.0-py2.py3-none-any.whl", hash = "sha256:7d15c4ddb0b5c802d161efc417ec1a2558ea2653c2e8ad9c19098201dc1c993a"},
+    {file = "pathspec-0.9.0.tar.gz", hash = "sha256:e564499435a2673d586f6b2130bb5b95f04a3ba06f81b8f895b651a3c76aabb1"},
+]
+pillow = [
+    {file = "Pillow-8.4.0-cp310-cp310-macosx_10_10_universal2.whl", hash = "sha256:81f8d5c81e483a9442d72d182e1fb6dcb9723f289a57e8030811bac9ea3fef8d"},
+    {file = "Pillow-8.4.0-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:3f97cfb1e5a392d75dd8b9fd274d205404729923840ca94ca45a0af57e13dbe6"},
+    {file = "Pillow-8.4.0-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:eb9fc393f3c61f9054e1ed26e6fe912c7321af2f41ff49d3f83d05bacf22cc78"},
+    {file = "Pillow-8.4.0-cp310-cp310-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:d82cdb63100ef5eedb8391732375e6d05993b765f72cb34311fab92103314649"},
+    {file = "Pillow-8.4.0-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:62cc1afda735a8d109007164714e73771b499768b9bb5afcbbee9d0ff374b43f"},
+    {file = "Pillow-8.4.0-cp310-cp310-win32.whl", hash = "sha256:e3dacecfbeec9a33e932f00c6cd7996e62f53ad46fbe677577394aaa90ee419a"},
+    {file = "Pillow-8.4.0-cp310-cp310-win_amd64.whl", hash = "sha256:620582db2a85b2df5f8a82ddeb52116560d7e5e6b055095f04ad828d1b0baa39"},
+    {file = "Pillow-8.4.0-cp36-cp36m-macosx_10_10_x86_64.whl", hash = "sha256:1bc723b434fbc4ab50bb68e11e93ce5fb69866ad621e3c2c9bdb0cd70e345f55"},
+    {file = "Pillow-8.4.0-cp36-cp36m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:72cbcfd54df6caf85cc35264c77ede902452d6df41166010262374155947460c"},
+    {file = "Pillow-8.4.0-cp36-cp36m-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:70ad9e5c6cb9b8487280a02c0ad8a51581dcbbe8484ce058477692a27c151c0a"},
+    {file = "Pillow-8.4.0-cp36-cp36m-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:25a49dc2e2f74e65efaa32b153527fc5ac98508d502fa46e74fa4fd678ed6645"},
+    {file = "Pillow-8.4.0-cp36-cp36m-win32.whl", hash = "sha256:93ce9e955cc95959df98505e4608ad98281fff037350d8c2671c9aa86bcf10a9"},
+    {file = "Pillow-8.4.0-cp36-cp36m-win_amd64.whl", hash = "sha256:2e4440b8f00f504ee4b53fe30f4e381aae30b0568193be305256b1462216feff"},
+    {file = "Pillow-8.4.0-cp37-cp37m-macosx_10_10_x86_64.whl", hash = "sha256:8c803ac3c28bbc53763e6825746f05cc407b20e4a69d0122e526a582e3b5e153"},
+    {file = "Pillow-8.4.0-cp37-cp37m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:c8a17b5d948f4ceeceb66384727dde11b240736fddeda54ca740b9b8b1556b29"},
+    {file = "Pillow-8.4.0-cp37-cp37m-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:1394a6ad5abc838c5cd8a92c5a07535648cdf6d09e8e2d6df916dfa9ea86ead8"},
+    {file = "Pillow-8.4.0-cp37-cp37m-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:792e5c12376594bfcb986ebf3855aa4b7c225754e9a9521298e460e92fb4a488"},
+    {file = "Pillow-8.4.0-cp37-cp37m-win32.whl", hash = "sha256:d99ec152570e4196772e7a8e4ba5320d2d27bf22fdf11743dd882936ed64305b"},
+    {file = "Pillow-8.4.0-cp37-cp37m-win_amd64.whl", hash = "sha256:7b7017b61bbcdd7f6363aeceb881e23c46583739cb69a3ab39cb384f6ec82e5b"},
+    {file = "Pillow-8.4.0-cp38-cp38-macosx_10_10_x86_64.whl", hash = "sha256:d89363f02658e253dbd171f7c3716a5d340a24ee82d38aab9183f7fdf0cdca49"},
+    {file = "Pillow-8.4.0-cp38-cp38-macosx_11_0_arm64.whl", hash = "sha256:0a0956fdc5defc34462bb1c765ee88d933239f9a94bc37d132004775241a7585"},
+    {file = "Pillow-8.4.0-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:5b7bb9de00197fb4261825c15551adf7605cf14a80badf1761d61e59da347779"},
+    {file = "Pillow-8.4.0-cp38-cp38-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:72b9e656e340447f827885b8d7a15fc8c4e68d410dc2297ef6787eec0f0ea409"},
+    {file = "Pillow-8.4.0-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:a5a4532a12314149d8b4e4ad8ff09dde7427731fcfa5917ff16d0291f13609df"},
+    {file = "Pillow-8.4.0-cp38-cp38-win32.whl", hash = "sha256:82aafa8d5eb68c8463b6e9baeb4f19043bb31fefc03eb7b216b51e6a9981ae09"},
+    {file = "Pillow-8.4.0-cp38-cp38-win_amd64.whl", hash = "sha256:066f3999cb3b070a95c3652712cffa1a748cd02d60ad7b4e485c3748a04d9d76"},
+    {file = "Pillow-8.4.0-cp39-cp39-macosx_10_10_x86_64.whl", hash = "sha256:5503c86916d27c2e101b7f71c2ae2cddba01a2cf55b8395b0255fd33fa4d1f1a"},
+    {file = "Pillow-8.4.0-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:4acc0985ddf39d1bc969a9220b51d94ed51695d455c228d8ac29fcdb25810e6e"},
+    {file = "Pillow-8.4.0-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:0b052a619a8bfcf26bd8b3f48f45283f9e977890263e4571f2393ed8898d331b"},
+    {file = "Pillow-8.4.0-cp39-cp39-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:493cb4e415f44cd601fcec11c99836f707bb714ab03f5ed46ac25713baf0ff20"},
+    {file = "Pillow-8.4.0-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:b8831cb7332eda5dc89b21a7bce7ef6ad305548820595033a4b03cf3091235ed"},
+    {file = "Pillow-8.4.0-cp39-cp39-win32.whl", hash = "sha256:5e9ac5f66616b87d4da618a20ab0a38324dbe88d8a39b55be8964eb520021e02"},
+    {file = "Pillow-8.4.0-cp39-cp39-win_amd64.whl", hash = "sha256:3eb1ce5f65908556c2d8685a8f0a6e989d887ec4057326f6c22b24e8a172c66b"},
+    {file = "Pillow-8.4.0-pp36-pypy36_pp73-macosx_10_10_x86_64.whl", hash = "sha256:ddc4d832a0f0b4c52fff973a0d44b6c99839a9d016fe4e6a1cb8f3eea96479c2"},
+    {file = "Pillow-8.4.0-pp36-pypy36_pp73-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:9a3e5ddc44c14042f0844b8cf7d2cd455f6cc80fd7f5eefbe657292cf601d9ad"},
+    {file = "Pillow-8.4.0-pp36-pypy36_pp73-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:c70e94281588ef053ae8998039610dbd71bc509e4acbc77ab59d7d2937b10698"},
+    {file = "Pillow-8.4.0-pp37-pypy37_pp73-macosx_10_10_x86_64.whl", hash = "sha256:3862b7256046fcd950618ed22d1d60b842e3a40a48236a5498746f21189afbbc"},
+    {file = "Pillow-8.4.0-pp37-pypy37_pp73-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:a4901622493f88b1a29bd30ec1a2f683782e57c3c16a2dbc7f2595ba01f639df"},
+    {file = "Pillow-8.4.0-pp37-pypy37_pp73-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:84c471a734240653a0ec91dec0996696eea227eafe72a33bd06c92697728046b"},
+    {file = "Pillow-8.4.0-pp37-pypy37_pp73-win_amd64.whl", hash = "sha256:244cf3b97802c34c41905d22810846802a3329ddcb93ccc432870243211c79fc"},
+    {file = "Pillow-8.4.0.tar.gz", hash = "sha256:b8e2f83c56e141920c39464b852de3719dfbfb6e3c99a2d8da0edf4fb33176ed"},
+]
+platformdirs = [
+    {file = "platformdirs-2.4.0-py3-none-any.whl", hash = "sha256:8868bbe3c3c80d42f20156f22e7131d2fb321f5bc86a2a345375c6481a67021d"},
+    {file = "platformdirs-2.4.0.tar.gz", hash = "sha256:367a5e80b3d04d2428ffa76d33f124cf11e8fff2acdaa9b43d545f5c7d661ef2"},
+]
+pluggy = [
+    {file = "pluggy-1.0.0-py2.py3-none-any.whl", hash = "sha256:74134bbf457f031a36d68416e1509f34bd5ccc019f0bcc952c7b909d06b37bd3"},
+    {file = "pluggy-1.0.0.tar.gz", hash = "sha256:4224373bacce55f955a878bf9cfa763c1e360858e330072059e10bad68531159"},
+]
+poyo = [
+    {file = "poyo-0.5.0-py2.py3-none-any.whl", hash = "sha256:3e2ca8e33fdc3c411cd101ca395668395dd5dc7ac775b8e809e3def9f9fe041a"},
+    {file = "poyo-0.5.0.tar.gz", hash = "sha256:e26956aa780c45f011ca9886f044590e2d8fd8b61db7b1c1cf4e0869f48ed4dd"},
+]
+py = [
+    {file = "py-1.11.0-py2.py3-none-any.whl", hash = "sha256:607c53218732647dff4acdfcd50cb62615cedf612e72d1724fb1a0cc6405b378"},
+    {file = "py-1.11.0.tar.gz", hash = "sha256:51c75c4126074b472f746a24399ad32f6053d1b34b68d2fa41e558e6f4a98719"},
+]
+pyparsing = [
+    {file = "pyparsing-2.4.7-py2.py3-none-any.whl", hash = "sha256:ef9d7589ef3c200abe66653d3f1ab1033c3c419ae9b9bdb1240a85b024efc88b"},
+    {file = "pyparsing-2.4.7.tar.gz", hash = "sha256:c203ec8783bf771a155b207279b9bccb8dea02d8f0c9e5f8ead507bc3246ecc1"},
+]
+pytest = [
+    {file = "pytest-6.2.5-py3-none-any.whl", hash = "sha256:7310f8d27bc79ced999e760ca304d69f6ba6c6649c0b60fb0e04a4a77cacc134"},
+    {file = "pytest-6.2.5.tar.gz", hash = "sha256:131b36680866a76e6781d13f101efb86cf674ebb9762eb70d3082b6f29889e89"},
+]
+pytest-cov = [
+    {file = "pytest-cov-3.0.0.tar.gz", hash = "sha256:e7f0f5b1617d2210a2cabc266dfe2f4c75a8d32fb89eafb7ad9d06f6d076d470"},
+    {file = "pytest_cov-3.0.0-py3-none-any.whl", hash = "sha256:578d5d15ac4a25e5f961c938b85a05b09fdaae9deef3bb6de9a6e766622ca7a6"},
+]
+pytest-forked = [
+    {file = "pytest-forked-1.3.0.tar.gz", hash = "sha256:6aa9ac7e00ad1a539c41bec6d21011332de671e938c7637378ec9710204e37ca"},
+    {file = "pytest_forked-1.3.0-py2.py3-none-any.whl", hash = "sha256:dc4147784048e70ef5d437951728825a131b81714b398d5d52f17c7c144d8815"},
+]
+pytest-xdist = [
+    {file = "pytest-xdist-2.4.0.tar.gz", hash = "sha256:89b330316f7fc475f999c81b577c2b926c9569f3d397ae432c0c2e2496d61ff9"},
+    {file = "pytest_xdist-2.4.0-py3-none-any.whl", hash = "sha256:7b61ebb46997a0820a263553179d6d1e25a8c50d8a8620cd1aa1e20e3be99168"},
+]
+python-dateutil = [
+    {file = "python-dateutil-2.8.2.tar.gz", hash = "sha256:0123cacc1627ae19ddf3c27a5de5bd67ee4586fbdd6440d9748f8abb483d3e86"},
+    {file = "python_dateutil-2.8.2-py2.py3-none-any.whl", hash = "sha256:961d03dc3453ebbc59dbdea9e4e11c5651520a876d0f4db161e8674aae935da9"},
+]
+python-slugify = [
+    {file = "python-slugify-5.0.2.tar.gz", hash = "sha256:f13383a0b9fcbe649a1892b9c8eb4f8eab1d6d84b84bb7a624317afa98159cab"},
+    {file = "python_slugify-5.0.2-py2.py3-none-any.whl", hash = "sha256:6d8c5df75cd4a7c3a2d21e257633de53f52ab0265cd2d1dc62a730e8194a7380"},
+]
+regex = [
+    {file = "regex-2021.11.10-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:9345b6f7ee578bad8e475129ed40123d265464c4cfead6c261fd60fc9de00bcf"},
+    {file = "regex-2021.11.10-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:416c5f1a188c91e3eb41e9c8787288e707f7d2ebe66e0a6563af280d9b68478f"},
+    {file = "regex-2021.11.10-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:e0538c43565ee6e703d3a7c3bdfe4037a5209250e8502c98f20fea6f5fdf2965"},
+    {file = "regex-2021.11.10-cp310-cp310-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:7ee1227cf08b6716c85504aebc49ac827eb88fcc6e51564f010f11a406c0a667"},
+    {file = "regex-2021.11.10-cp310-cp310-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:6650f16365f1924d6014d2ea770bde8555b4a39dc9576abb95e3cd1ff0263b36"},
+    {file = "regex-2021.11.10-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:30ab804ea73972049b7a2a5c62d97687d69b5a60a67adca07eb73a0ddbc9e29f"},
+    {file = "regex-2021.11.10-cp310-cp310-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:68a067c11463de2a37157930d8b153005085e42bcb7ad9ca562d77ba7d1404e0"},
+    {file = "regex-2021.11.10-cp310-cp310-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:162abfd74e88001d20cb73ceaffbfe601469923e875caf9118333b1a4aaafdc4"},
+    {file = "regex-2021.11.10-cp310-cp310-win32.whl", hash = "sha256:98ba568e8ae26beb726aeea2273053c717641933836568c2a0278a84987b2a1a"},
+    {file = "regex-2021.11.10-cp310-cp310-win_amd64.whl", hash = "sha256:780b48456a0f0ba4d390e8b5f7c661fdd218934388cde1a974010a965e200e12"},
+    {file = "regex-2021.11.10-cp36-cp36m-macosx_10_9_x86_64.whl", hash = "sha256:dba70f30fd81f8ce6d32ddeef37d91c8948e5d5a4c63242d16a2b2df8143aafc"},
+    {file = "regex-2021.11.10-cp36-cp36m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:e1f54b9b4b6c53369f40028d2dd07a8c374583417ee6ec0ea304e710a20f80a0"},
+    {file = "regex-2021.11.10-cp36-cp36m-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:fbb9dc00e39f3e6c0ef48edee202f9520dafb233e8b51b06b8428cfcb92abd30"},
+    {file = "regex-2021.11.10-cp36-cp36m-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:666abff54e474d28ff42756d94544cdfd42e2ee97065857413b72e8a2d6a6345"},
+    {file = "regex-2021.11.10-cp36-cp36m-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:5537f71b6d646f7f5f340562ec4c77b6e1c915f8baae822ea0b7e46c1f09b733"},
+    {file = "regex-2021.11.10-cp36-cp36m-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:ed2e07c6a26ed4bea91b897ee2b0835c21716d9a469a96c3e878dc5f8c55bb23"},
+    {file = "regex-2021.11.10-cp36-cp36m-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:ca5f18a75e1256ce07494e245cdb146f5a9267d3c702ebf9b65c7f8bd843431e"},
+    {file = "regex-2021.11.10-cp36-cp36m-win32.whl", hash = "sha256:93a5051fcf5fad72de73b96f07d30bc29665697fb8ecdfbc474f3452c78adcf4"},
+    {file = "regex-2021.11.10-cp36-cp36m-win_amd64.whl", hash = "sha256:b483c9d00a565633c87abd0aaf27eb5016de23fed952e054ecc19ce32f6a9e7e"},
+    {file = "regex-2021.11.10-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:fff55f3ce50a3ff63ec8e2a8d3dd924f1941b250b0aac3d3d42b687eeff07a8e"},
+    {file = "regex-2021.11.10-cp37-cp37m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:e32d2a2b02ccbef10145df9135751abea1f9f076e67a4e261b05f24b94219e36"},
+    {file = "regex-2021.11.10-cp37-cp37m-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:53db2c6be8a2710b359bfd3d3aa17ba38f8aa72a82309a12ae99d3c0c3dcd74d"},
+    {file = "regex-2021.11.10-cp37-cp37m-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:2207ae4f64ad3af399e2d30dde66f0b36ae5c3129b52885f1bffc2f05ec505c8"},
+    {file = "regex-2021.11.10-cp37-cp37m-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:d5ca078bb666c4a9d1287a379fe617a6dccd18c3e8a7e6c7e1eb8974330c626a"},
+    {file = "regex-2021.11.10-cp37-cp37m-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:dd33eb9bdcfbabab3459c9ee651d94c842bc8a05fabc95edf4ee0c15a072495e"},
+    {file = "regex-2021.11.10-cp37-cp37m-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:05b7d6d7e64efe309972adab77fc2af8907bb93217ec60aa9fe12a0dad35874f"},
+    {file = "regex-2021.11.10-cp37-cp37m-win32.whl", hash = "sha256:e71255ba42567d34a13c03968736c5d39bb4a97ce98188fafb27ce981115beec"},
+    {file = "regex-2021.11.10-cp37-cp37m-win_amd64.whl", hash = "sha256:07856afef5ffcc052e7eccf3213317fbb94e4a5cd8177a2caa69c980657b3cb4"},
+    {file = "regex-2021.11.10-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:ba05430e819e58544e840a68b03b28b6d328aff2e41579037e8bab7653b37d83"},
+    {file = "regex-2021.11.10-cp38-cp38-macosx_11_0_arm64.whl", hash = "sha256:7f301b11b9d214f83ddaf689181051e7f48905568b0c7017c04c06dfd065e244"},
+    {file = "regex-2021.11.10-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:4aaa4e0705ef2b73dd8e36eeb4c868f80f8393f5f4d855e94025ce7ad8525f50"},
+    {file = "regex-2021.11.10-cp38-cp38-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:788aef3549f1924d5c38263104dae7395bf020a42776d5ec5ea2b0d3d85d6646"},
+    {file = "regex-2021.11.10-cp38-cp38-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:f8af619e3be812a2059b212064ea7a640aff0568d972cd1b9e920837469eb3cb"},
+    {file = "regex-2021.11.10-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:85bfa6a5413be0ee6c5c4a663668a2cad2cbecdee367630d097d7823041bdeec"},
+    {file = "regex-2021.11.10-cp38-cp38-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:f23222527b307970e383433daec128d769ff778d9b29343fb3496472dc20dabe"},
+    {file = "regex-2021.11.10-cp38-cp38-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:da1a90c1ddb7531b1d5ff1e171b4ee61f6345119be7351104b67ff413843fe94"},
+    {file = "regex-2021.11.10-cp38-cp38-win32.whl", hash = "sha256:0617383e2fe465732af4509e61648b77cbe3aee68b6ac8c0b6fe934db90be5cc"},
+    {file = "regex-2021.11.10-cp38-cp38-win_amd64.whl", hash = "sha256:a3feefd5e95871872673b08636f96b61ebef62971eab044f5124fb4dea39919d"},
+    {file = "regex-2021.11.10-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:f7f325be2804246a75a4f45c72d4ce80d2443ab815063cdf70ee8fb2ca59ee1b"},
+    {file = "regex-2021.11.10-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:537ca6a3586931b16a85ac38c08cc48f10fc870a5b25e51794c74df843e9966d"},
+    {file = "regex-2021.11.10-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:eef2afb0fd1747f33f1ee3e209bce1ed582d1896b240ccc5e2697e3275f037c7"},
+    {file = "regex-2021.11.10-cp39-cp39-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:432bd15d40ed835a51617521d60d0125867f7b88acf653e4ed994a1f8e4995dc"},
+    {file = "regex-2021.11.10-cp39-cp39-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:b43c2b8a330a490daaef5a47ab114935002b13b3f9dc5da56d5322ff218eeadb"},
+    {file = "regex-2021.11.10-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:962b9a917dd7ceacbe5cd424556914cb0d636001e393b43dc886ba31d2a1e449"},
+    {file = "regex-2021.11.10-cp39-cp39-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:fa8c626d6441e2d04b6ee703ef2d1e17608ad44c7cb75258c09dd42bacdfc64b"},
+    {file = "regex-2021.11.10-cp39-cp39-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:3c5fb32cc6077abad3bbf0323067636d93307c9fa93e072771cf9a64d1c0f3ef"},
+    {file = "regex-2021.11.10-cp39-cp39-win32.whl", hash = "sha256:3b5df18db1fccd66de15aa59c41e4f853b5df7550723d26aa6cb7f40e5d9da5a"},
+    {file = "regex-2021.11.10-cp39-cp39-win_amd64.whl", hash = "sha256:83ee89483672b11f8952b158640d0c0ff02dc43d9cb1b70c1564b49abe92ce29"},
+    {file = "regex-2021.11.10.tar.gz", hash = "sha256:f341ee2df0999bfdf7a95e448075effe0db212a59387de1a70690e4acb03d4c6"},
+]
+requests = [
+    {file = "requests-2.26.0-py2.py3-none-any.whl", hash = "sha256:6c1246513ecd5ecd4528a0906f910e8f0f9c6b8ec72030dc9fd154dc1a6efd24"},
+    {file = "requests-2.26.0.tar.gz", hash = "sha256:b8aa58f8cf793ffd8782d3d8cb19e66ef36f7aba4353eec859e74678b01b07a7"},
+]
+setuptools-scm = [
+    {file = "setuptools_scm-6.3.2-py3-none-any.whl", hash = "sha256:4c64444b1d49c4063ae60bfe1680f611c8b13833d556fd1d6050c0023162a119"},
+    {file = "setuptools_scm-6.3.2.tar.gz", hash = "sha256:a49aa8081eeb3514eb9728fa5040f2eaa962d6c6f4ec9c32f6c1fba88f88a0f2"},
+]
+six = [
+    {file = "six-1.16.0-py2.py3-none-any.whl", hash = "sha256:8abb2f1d86890a2dfb989f9a77cfcfd3e47c2a354b01111771326f8aa26e0254"},
+    {file = "six-1.16.0.tar.gz", hash = "sha256:1e61c37477a1626458e36f7b1d82aa5c9b094fa4802892072e49de9c60c4c926"},
+]
+text-unidecode = [
+    {file = "text-unidecode-1.3.tar.gz", hash = "sha256:bad6603bb14d279193107714b288be206cac565dfa49aa5b105294dd5c4aab93"},
+    {file = "text_unidecode-1.3-py2.py3-none-any.whl", hash = "sha256:1311f10e8b895935241623731c2ba64f4c455287888b18189350b67134a822e8"},
+]
+toml = [
+    {file = "toml-0.10.2-py2.py3-none-any.whl", hash = "sha256:806143ae5bfb6a3c6e736a764057db0e6a0e05e338b5630894a5f779cabb4f9b"},
+    {file = "toml-0.10.2.tar.gz", hash = "sha256:b3bda1d108d5dd99f4a20d24d9c348e91c4db7ab1b749200bded2f839ccbe68f"},
+]
+tomli = [
+    {file = "tomli-1.2.2-py3-none-any.whl", hash = "sha256:f04066f68f5554911363063a30b108d2b5a5b1a010aa8b6132af78489fe3aade"},
+    {file = "tomli-1.2.2.tar.gz", hash = "sha256:c6ce0015eb38820eaf32b5db832dbc26deb3dd427bd5f6556cf0acac2c214fee"},
+]
+tox = [
+    {file = "tox-3.24.4-py2.py3-none-any.whl", hash = "sha256:5e274227a53dc9ef856767c21867377ba395992549f02ce55eb549f9fb9a8d10"},
+    {file = "tox-3.24.4.tar.gz", hash = "sha256:c30b57fa2477f1fb7c36aa1d83292d5c2336cd0018119e1b1c17340e2c2708ca"},
+]
+tqdm = [
+    {file = "tqdm-4.62.3-py2.py3-none-any.whl", hash = "sha256:8dd278a422499cd6b727e6ae4061c40b48fce8b76d1ccbf5d34fca9b7f925b0c"},
+    {file = "tqdm-4.62.3.tar.gz", hash = "sha256:d359de7217506c9851b7869f3708d8ee53ed70a1b8edbba4dbcb47442592920d"},
+]
+typing-extensions = [
+    {file = "typing_extensions-3.10.0.2-py2-none-any.whl", hash = "sha256:d8226d10bc02a29bcc81df19a26e56a9647f8b0a6d4a83924139f4a8b01f17b7"},
+    {file = "typing_extensions-3.10.0.2-py3-none-any.whl", hash = "sha256:f1d25edafde516b146ecd0613dabcc61409817af4766fbbcfb8d1ad4ec441a34"},
+    {file = "typing_extensions-3.10.0.2.tar.gz", hash = "sha256:49f75d16ff11f1cd258e1b988ccff82a3ca5570217d7ad8c5f48205dd99a677e"},
+]
+urllib3 = [
+    {file = "urllib3-1.26.7-py2.py3-none-any.whl", hash = "sha256:c4fdf4019605b6e5423637e01bc9fe4daef873709a7973e195ceba0a62bbc844"},
+    {file = "urllib3-1.26.7.tar.gz", hash = "sha256:4987c65554f7a2dbf30c18fd48778ef124af6fab771a377103da0585e2336ece"},
+]
+virtualenv = [
+    {file = "virtualenv-20.10.0-py2.py3-none-any.whl", hash = "sha256:4b02e52a624336eece99c96e3ab7111f469c24ba226a53ec474e8e787b365814"},
+    {file = "virtualenv-20.10.0.tar.gz", hash = "sha256:576d05b46eace16a9c348085f7d0dc8ef28713a2cabaa1cf0aea41e8f12c9218"},
+]
diff --git a/pyproject.toml b/pyproject.toml
new file mode 100644
index 00000000..39f08180
--- /dev/null
+++ b/pyproject.toml
@@ -0,0 +1,29 @@
+[tool.poetry]
+name = "adventofcode2020"
+version = "0.1.0"
+description = "Advent of Code - 2020"
+authors = ["Roel Adriaans <roel.adriaans@ordina.nl>"]
+license = "MIT License"
+
+[tool.poetry.dependencies]
+python = ">=3.9,<3.11"
+anytree = "^2.8.0"
+click = "^8.0.3"
+matplotlib = "3.5.0rc1"
+numpy = "^1.21.4"
+tqdm = "^4.62.3"
+
+[tool.poetry.dev-dependencies]
+black = "^21.10b0"
+cookiecutter = "^1.7.3"
+pytest = "^6.2.5"
+pytest-cov = "^3.0.0"
+pytest-xdist = "^2.4.0"
+tox = "^3.24.4"
+
+[tool.poetry.scripts]
+adventofcode = "adventofcode2020.main:main"
+
+[build-system]
+requires = ["poetry-core>=1.0.0"]
+build-backend = "poetry.core.masonry.api"
diff --git a/requirements.txt b/requirements.txt
deleted file mode 100644
index 13225095..00000000
--- a/requirements.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-anytree
-black
-Click
-cookiecutter
-matplotlib==3.5.0rc1
-numpy==1.21.4
-pytest
-pytest-cov
-pytest-xdist
-tox
-tqdm
diff --git a/setup.py b/setup.py
deleted file mode 100644
index 6ef2d82a..00000000
--- a/setup.py
+++ /dev/null
@@ -1,19 +0,0 @@
-from setuptools import find_packages, setup
-
-with open("requirements.txt") as f:
-    requirements = f.read().splitlines()
-
-setup(
-    name="adventofcode2020",
-    author="Roel Adriaans",
-    author_email="roel@adriaans.org",
-    url="https://github.com/roeladriaans",
-    entry_points={"console_scripts": ["adventofcode = adventofcode2020.main:main"]},
-    python_requires=">=3.9.*",
-    packages=find_packages(where="src", exclude=["tests.*", "test*"]),
-    package_dir={"": "src"},
-    install_requires=requirements,
-    include_package_data=True,
-    use_scm_version=True,
-    setup_requires=["setuptools_scm"],
-)

From 60d96e2e57b3b0188f59670fdabab9031209b124 Mon Sep 17 00:00:00 2001
From: Roel Adriaans <roel.adriaans@ordina.nl>
Date: Wed, 10 Nov 2021 21:22:33 +0100
Subject: [PATCH 015/371] Make tox compatible with poetry
 (https://tox.wiki/en/latest/example/package.html#poetry)

---
 tox.ini | 1 +
 1 file changed, 1 insertion(+)

diff --git a/tox.ini b/tox.ini
index 575db0a4..deebf128 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,4 +1,5 @@
 [tox]
+isolated_build = True
 envlist =
     py
     linters

From c0e256ddf977ff61d0c50ce941a19e873fe2aefc Mon Sep 17 00:00:00 2001
From: Roel Adriaans <roel.adriaans@ordina.nl>
Date: Wed, 10 Nov 2021 21:36:40 +0100
Subject: [PATCH 016/371] Missed link to poetry

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 8fd68e64..a83715e0 100644
--- a/README.md
+++ b/README.md
@@ -35,7 +35,7 @@ The new solution still have to be added to the `main.py` file.
 Install the application with:
 
 ```
-pip3 install -e .
+poetry install
 ```
 
 ### Run

From 796795bcfe6ac1dabdbfcf4bfb762fc13469b9d4 Mon Sep 17 00:00:00 2001
From: Roel Adriaans <roel.adriaans@ordina.nl>
Date: Sun, 14 Nov 2021 00:08:02 +0100
Subject: [PATCH 017/371] Download solution and create scaffolding from main
 executable, add pre-commit as dev requirements

---
 README.md                    |  21 ++++
 mypy.ini                     |   6 +
 poetry.lock                  | 224 ++++++++++++++++++++++++++---------
 pyproject.toml               |   3 +
 src/adventofcode2020/main.py | 100 +++++++++++++++-
 tox.ini                      |   1 +
 6 files changed, 300 insertions(+), 55 deletions(-)

diff --git a/README.md b/README.md
index a83715e0..9708861c 100644
--- a/README.md
+++ b/README.md
@@ -6,6 +6,27 @@ Advent of Code 2020 with tests and utils etc
 
 - Complete all puzzles (Doh)
 
+## Create a new day
+
+You can use the adventofcode script to create the scaffolding and download the
+input file for that day.
+
+An example:
+
+    adventofcode --create 20
+
+### Env variables
+
+Create a file `.env` with the content:
+
+```ini
+# Store the session key here
+AOC_SESSION = ""
+```
+
+The variable AOC_SESSION is the cookie from <https://adventofcode.com/>. This is available
+in your browser after you've logged in.
+
 ## Cookiecutter
 
 To create a new day with the CookieCutter version run the command from the
diff --git a/mypy.ini b/mypy.ini
index cbe1c877..3c176ac3 100644
--- a/mypy.ini
+++ b/mypy.ini
@@ -9,3 +9,9 @@ ignore_missing_imports = True
 
 [mypy-click]
 ignore_missing_imports = True
+
+[mypy-cookiecutter.main]
+ignore_missing_imports = True
+
+[mypy-dotenv]
+ignore_missing_imports = True
diff --git a/poetry.lock b/poetry.lock
index 1d83657f..d12cb422 100644
--- a/poetry.lock
+++ b/poetry.lock
@@ -100,10 +100,18 @@ uvloop = ["uvloop (>=0.15.2)"]
 name = "certifi"
 version = "2021.10.8"
 description = "Python package for providing Mozilla's CA Bundle."
-category = "dev"
+category = "main"
 optional = false
 python-versions = "*"
 
+[[package]]
+name = "cfgv"
+version = "3.3.1"
+description = "Validate configuration and produce human readable error messages."
+category = "dev"
+optional = false
+python-versions = ">=3.6.1"
+
 [[package]]
 name = "chardet"
 version = "4.0.0"
@@ -116,7 +124,7 @@ python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*"
 name = "charset-normalizer"
 version = "2.0.7"
 description = "The Real First Universal Charset Detector. Open, modern and actively maintained alternative to Chardet."
-category = "dev"
+category = "main"
 optional = false
 python-versions = ">=3.5.0"
 
@@ -162,7 +170,7 @@ six = ">=1.10"
 
 [[package]]
 name = "coverage"
-version = "6.1.1"
+version = "6.1.2"
 description = "Code coverage measurement for Python"
 category = "dev"
 optional = false
@@ -234,11 +242,22 @@ ufo = ["fs (>=2.2.0,<3)"]
 unicode = ["unicodedata2 (>=13.0.0)"]
 woff = ["zopfli (>=0.1.4)", "brotlicffi (>=0.8.0)", "brotli (>=1.0.1)"]
 
+[[package]]
+name = "identify"
+version = "2.3.5"
+description = "File identification library for Python"
+category = "dev"
+optional = false
+python-versions = ">=3.6.1"
+
+[package.extras]
+license = ["editdistance-s"]
+
 [[package]]
 name = "idna"
 version = "3.3"
 description = "Internationalized Domain Names in Applications (IDNA)"
-category = "dev"
+category = "main"
 optional = false
 python-versions = ">=3.5"
 
@@ -319,6 +338,14 @@ category = "dev"
 optional = false
 python-versions = "*"
 
+[[package]]
+name = "nodeenv"
+version = "1.6.0"
+description = "Node.js virtual environment builder"
+category = "dev"
+optional = false
+python-versions = "*"
+
 [[package]]
 name = "numpy"
 version = "1.21.4"
@@ -386,6 +413,22 @@ category = "dev"
 optional = false
 python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*"
 
+[[package]]
+name = "pre-commit"
+version = "2.15.0"
+description = "A framework for managing and maintaining multi-language pre-commit hooks."
+category = "dev"
+optional = false
+python-versions = ">=3.6.1"
+
+[package.dependencies]
+cfgv = ">=2.0.0"
+identify = ">=1.0.0"
+nodeenv = ">=0.11.1"
+pyyaml = ">=5.1"
+toml = "*"
+virtualenv = ">=20.0.8"
+
 [[package]]
 name = "py"
 version = "1.11.0"
@@ -479,6 +522,17 @@ python-versions = "!=3.0.*,!=3.1.*,!=3.2.*,>=2.7"
 [package.dependencies]
 six = ">=1.5"
 
+[[package]]
+name = "python-dotenv"
+version = "0.19.2"
+description = "Read key-value pairs from a .env file and set them as environment variables"
+category = "dev"
+optional = false
+python-versions = ">=3.5"
+
+[package.extras]
+cli = ["click (>=5.0)"]
+
 [[package]]
 name = "python-slugify"
 version = "5.0.2"
@@ -493,6 +547,14 @@ text-unidecode = ">=1.3"
 [package.extras]
 unidecode = ["Unidecode (>=1.1.1)"]
 
+[[package]]
+name = "pyyaml"
+version = "6.0"
+description = "YAML parser and emitter for Python"
+category = "dev"
+optional = false
+python-versions = ">=3.6"
+
 [[package]]
 name = "regex"
 version = "2021.11.10"
@@ -505,7 +567,7 @@ python-versions = "*"
 name = "requests"
 version = "2.26.0"
 description = "Python HTTP for Humans."
-category = "dev"
+category = "main"
 optional = false
 python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*, !=3.5.*"
 
@@ -616,7 +678,7 @@ python-versions = "*"
 name = "urllib3"
 version = "1.26.7"
 description = "HTTP library with thread-safe connection pooling, file post, and more."
-category = "dev"
+category = "main"
 optional = false
 python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*, <4"
 
@@ -647,7 +709,7 @@ testing = ["coverage (>=4)", "coverage-enable-subprocess (>=1)", "flaky (>=3)",
 [metadata]
 lock-version = "1.1"
 python-versions = ">=3.9,<3.11"
-content-hash = "0aa5474e364e74927148858eea6c899b68f43c6f95c8ed4c6980b7f2598682b2"
+content-hash = "ded08b647a2ea89d61d9cf3ee0fd8f936403f49e11ed270994247f95b6923d8b"
 
 [metadata.files]
 anytree = [
@@ -682,6 +744,10 @@ certifi = [
     {file = "certifi-2021.10.8-py2.py3-none-any.whl", hash = "sha256:d62a0163eb4c2344ac042ab2bdf75399a71a2d8c7d47eac2e2ee91b9d6339569"},
     {file = "certifi-2021.10.8.tar.gz", hash = "sha256:78884e7c1d4b00ce3cea67b44566851c4343c120abd683433ce934a68ea58872"},
 ]
+cfgv = [
+    {file = "cfgv-3.3.1-py2.py3-none-any.whl", hash = "sha256:c6a0883f3917a037485059700b9e75da2464e6c27051014ad85ba6aaa5884426"},
+    {file = "cfgv-3.3.1.tar.gz", hash = "sha256:f5a830efb9ce7a445376bb66ec94c638a9787422f96264c98edc6bdeed8ab736"},
+]
 chardet = [
     {file = "chardet-4.0.0-py2.py3-none-any.whl", hash = "sha256:f864054d66fd9118f2e67044ac8981a54775ec5b67aed0441892edb553d21da5"},
     {file = "chardet-4.0.0.tar.gz", hash = "sha256:0d6f53a15db4120f2b08c94f11e7d93d2c911ee118b6b30a04ec3ee8310179fa"},
@@ -703,52 +769,53 @@ cookiecutter = [
     {file = "cookiecutter-1.7.3.tar.gz", hash = "sha256:6b9a4d72882e243be077a7397d0f1f76fe66cf3df91f3115dbb5330e214fa457"},
 ]
 coverage = [
-    {file = "coverage-6.1.1-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:42a1fb5dee3355df90b635906bb99126faa7936d87dfc97eacc5293397618cb7"},
-    {file = "coverage-6.1.1-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:a00284dbfb53b42e35c7dd99fc0e26ef89b4a34efff68078ed29d03ccb28402a"},
-    {file = "coverage-6.1.1-cp310-cp310-manylinux_2_5_i686.manylinux1_i686.manylinux_2_12_i686.manylinux2010_i686.whl", hash = "sha256:51a441011a30d693e71dea198b2a6f53ba029afc39f8e2aeb5b77245c1b282ef"},
-    {file = "coverage-6.1.1-cp310-cp310-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:e76f017b6d4140a038c5ff12be1581183d7874e41f1c0af58ecf07748d36a336"},
-    {file = "coverage-6.1.1-cp310-cp310-musllinux_1_1_aarch64.whl", hash = "sha256:7833c872718dc913f18e51ee97ea0dece61d9930893a58b20b3daf09bb1af6b6"},
-    {file = "coverage-6.1.1-cp310-cp310-musllinux_1_1_i686.whl", hash = "sha256:8186b5a4730c896cbe1e4b645bdc524e62d874351ae50e1db7c3e9f5dc81dc26"},
-    {file = "coverage-6.1.1-cp310-cp310-musllinux_1_1_x86_64.whl", hash = "sha256:bbca34dca5a2d60f81326d908d77313816fad23d11b6069031a3d6b8c97a54f9"},
-    {file = "coverage-6.1.1-cp310-cp310-win32.whl", hash = "sha256:72bf437d54186d104388cbae73c9f2b0f8a3e11b6e8d7deb593bd14625c96026"},
-    {file = "coverage-6.1.1-cp310-cp310-win_amd64.whl", hash = "sha256:994ce5a7b3d20981b81d83618aa4882f955bfa573efdbef033d5632b58597ba9"},
-    {file = "coverage-6.1.1-cp36-cp36m-macosx_10_9_x86_64.whl", hash = "sha256:ab6a0fe4c96f8058d41948ddf134420d3ef8c42d5508b5a341a440cce7a37a1d"},
-    {file = "coverage-6.1.1-cp36-cp36m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:10ab138b153e4cc408b43792cb7f518f9ee02f4ff55cd1ab67ad6fd7e9905c7e"},
-    {file = "coverage-6.1.1-cp36-cp36m-manylinux_2_5_i686.manylinux1_i686.manylinux_2_12_i686.manylinux2010_i686.whl", hash = "sha256:7e083d32965d2eb6638a77e65b622be32a094fdc0250f28ce6039b0732fbcaa8"},
-    {file = "coverage-6.1.1-cp36-cp36m-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:359a32515e94e398a5c0fa057e5887a42e647a9502d8e41165cf5cb8d3d1ca67"},
-    {file = "coverage-6.1.1-cp36-cp36m-musllinux_1_1_aarch64.whl", hash = "sha256:bf656cd74ff7b4ed7006cdb2a6728150aaad69c7242b42a2a532f77b63ea233f"},
-    {file = "coverage-6.1.1-cp36-cp36m-musllinux_1_1_i686.whl", hash = "sha256:dc5023be1c2a8b0a0ab5e31389e62c28b2453eb31dd069f4b8d1a0f9814d951a"},
-    {file = "coverage-6.1.1-cp36-cp36m-musllinux_1_1_x86_64.whl", hash = "sha256:557594a50bfe3fb0b1b57460f6789affe8850ad19c1acf2d14a3e12b2757d489"},
-    {file = "coverage-6.1.1-cp36-cp36m-win32.whl", hash = "sha256:9eb0a1923354e0fdd1c8a6f53f5db2e6180d670e2b587914bf2e79fa8acfd003"},
-    {file = "coverage-6.1.1-cp36-cp36m-win_amd64.whl", hash = "sha256:04a92a6cf9afd99f9979c61348ec79725a9f9342fb45e63c889e33c04610d97b"},
-    {file = "coverage-6.1.1-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:479228e1b798d3c246ac89b09897ee706c51b3e5f8f8d778067f38db73ccc717"},
-    {file = "coverage-6.1.1-cp37-cp37m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:78287731e3601ea5ce9d6468c82d88a12ef8fe625d6b7bdec9b45d96c1ad6533"},
-    {file = "coverage-6.1.1-cp37-cp37m-manylinux_2_5_i686.manylinux1_i686.manylinux_2_12_i686.manylinux2010_i686.whl", hash = "sha256:c95257aa2ccf75d3d91d772060538d5fea7f625e48157f8ca44594f94d41cb33"},
-    {file = "coverage-6.1.1-cp37-cp37m-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:9ad5895938a894c368d49d8470fe9f519909e5ebc6b8f8ea5190bd0df6aa4271"},
-    {file = "coverage-6.1.1-cp37-cp37m-musllinux_1_1_aarch64.whl", hash = "sha256:326d944aad0189603733d646e8d4a7d952f7145684da973c463ec2eefe1387c2"},
-    {file = "coverage-6.1.1-cp37-cp37m-musllinux_1_1_i686.whl", hash = "sha256:e7d5606b9240ed4def9cbdf35be4308047d11e858b9c88a6c26974758d6225ce"},
-    {file = "coverage-6.1.1-cp37-cp37m-musllinux_1_1_x86_64.whl", hash = "sha256:572f917267f363101eec375c109c9c1118037c7cc98041440b5eabda3185ac7b"},
-    {file = "coverage-6.1.1-cp37-cp37m-win32.whl", hash = "sha256:35cd2230e1ed76df7d0081a997f0fe705be1f7d8696264eb508076e0d0b5a685"},
-    {file = "coverage-6.1.1-cp37-cp37m-win_amd64.whl", hash = "sha256:65ad3ff837c89a229d626b8004f0ee32110f9bfdb6a88b76a80df36ccc60d926"},
-    {file = "coverage-6.1.1-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:977ce557d79577a3dd510844904d5d968bfef9489f512be65e2882e1c6eed7d8"},
-    {file = "coverage-6.1.1-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:62512c0ec5d307f56d86504c58eace11c1bc2afcdf44e3ff20de8ca427ca1d0e"},
-    {file = "coverage-6.1.1-cp38-cp38-manylinux_2_5_i686.manylinux1_i686.manylinux_2_12_i686.manylinux2010_i686.whl", hash = "sha256:2e5b9c17a56b8bf0c0a9477fcd30d357deb486e4e1b389ed154f608f18556c8a"},
-    {file = "coverage-6.1.1-cp38-cp38-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:666c6b32b69e56221ad1551d377f718ed00e6167c7a1b9257f780b105a101271"},
-    {file = "coverage-6.1.1-cp38-cp38-musllinux_1_1_aarch64.whl", hash = "sha256:fb2fa2f6506c03c48ca42e3fe5a692d7470d290c047ee6de7c0f3e5fa7639ac9"},
-    {file = "coverage-6.1.1-cp38-cp38-musllinux_1_1_i686.whl", hash = "sha256:f0f80e323a17af63eac6a9db0c9188c10f1fd815c3ab299727150cc0eb92c7a4"},
-    {file = "coverage-6.1.1-cp38-cp38-musllinux_1_1_x86_64.whl", hash = "sha256:738e823a746841248b56f0f3bd6abf3b73af191d1fd65e4c723b9c456216f0ad"},
-    {file = "coverage-6.1.1-cp38-cp38-win32.whl", hash = "sha256:8605add58e6a960729aa40c0fd9a20a55909dd9b586d3e8104cc7f45869e4c6b"},
-    {file = "coverage-6.1.1-cp38-cp38-win_amd64.whl", hash = "sha256:6e994003e719458420e14ffb43c08f4c14990e20d9e077cb5cad7a3e419bbb54"},
-    {file = "coverage-6.1.1-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:e3c4f5211394cd0bf6874ac5d29684a495f9c374919833dcfff0bd6d37f96201"},
-    {file = "coverage-6.1.1-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:e14bceb1f3ae8a14374be2b2d7bc12a59226872285f91d66d301e5f41705d4d6"},
-    {file = "coverage-6.1.1-cp39-cp39-manylinux_2_5_i686.manylinux1_i686.manylinux_2_12_i686.manylinux2010_i686.whl", hash = "sha256:0147f7833c41927d84f5af9219d9b32f875c0689e5e74ac8ca3cb61e73a698f9"},
-    {file = "coverage-6.1.1-cp39-cp39-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:b1d0a1bce919de0dd8da5cff4e616b2d9e6ebf3bd1410ff645318c3dd615010a"},
-    {file = "coverage-6.1.1-cp39-cp39-win32.whl", hash = "sha256:a11a2c019324fc111485e79d55907e7289e53d0031275a6c8daed30690bc50c0"},
-    {file = "coverage-6.1.1-cp39-cp39-win_amd64.whl", hash = "sha256:4d8b453764b9b26b0dd2afb83086a7c3f9379134e340288d2a52f8a91592394b"},
-    {file = "coverage-6.1.1-pp36-none-any.whl", hash = "sha256:3b270c6b48d3ff5a35deb3648028ba2643ad8434b07836782b1139cf9c66313f"},
-    {file = "coverage-6.1.1-pp37-none-any.whl", hash = "sha256:ffa8fee2b1b9e60b531c4c27cf528d6b5d5da46b1730db1f4d6eee56ff282e07"},
-    {file = "coverage-6.1.1-pp38-none-any.whl", hash = "sha256:4cd919057636f63ab299ccb86ea0e78b87812400c76abab245ca385f17d19fb5"},
-    {file = "coverage-6.1.1.tar.gz", hash = "sha256:b8e4f15b672c9156c1154249a9c5746e86ac9ae9edc3799ee3afebc323d9d9e0"},
+    {file = "coverage-6.1.2-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:675adb3b3380967806b3cbb9c5b00ceb29b1c472692100a338730c1d3e59c8b9"},
+    {file = "coverage-6.1.2-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:95a58336aa111af54baa451c33266a8774780242cab3704b7698d5e514840758"},
+    {file = "coverage-6.1.2-cp310-cp310-manylinux_2_5_i686.manylinux1_i686.manylinux_2_12_i686.manylinux2010_i686.whl", hash = "sha256:d0a595a781f8e186580ff8e3352dd4953b1944289bec7705377c80c7e36c4d6c"},
+    {file = "coverage-6.1.2-cp310-cp310-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:d3c5f49ce6af61154060640ad3b3281dbc46e2e0ef2fe78414d7f8a324f0b649"},
+    {file = "coverage-6.1.2-cp310-cp310-musllinux_1_1_aarch64.whl", hash = "sha256:310c40bed6b626fd1f463e5a83dba19a61c4eb74e1ac0d07d454ebbdf9047e9d"},
+    {file = "coverage-6.1.2-cp310-cp310-musllinux_1_1_i686.whl", hash = "sha256:a4d48e42e17d3de212f9af44f81ab73b9378a4b2b8413fd708d0d9023f2bbde4"},
+    {file = "coverage-6.1.2-cp310-cp310-musllinux_1_1_x86_64.whl", hash = "sha256:ffa545230ca2ad921ad066bf8fd627e7be43716b6e0fcf8e32af1b8188ccb0ab"},
+    {file = "coverage-6.1.2-cp310-cp310-win32.whl", hash = "sha256:cd2d11a59afa5001ff28073ceca24ae4c506da4355aba30d1e7dd2bd0d2206dc"},
+    {file = "coverage-6.1.2-cp310-cp310-win_amd64.whl", hash = "sha256:96129e41405887a53a9cc564f960d7f853cc63d178f3a182fdd302e4cab2745b"},
+    {file = "coverage-6.1.2-cp311-cp311-macosx_10_14_x86_64.whl", hash = "sha256:1de9c6f5039ee2b1860b7bad2c7bc3651fbeb9368e4c4d93e98a76358cdcb052"},
+    {file = "coverage-6.1.2-cp311-cp311-manylinux_2_5_x86_64.manylinux1_x86_64.whl", hash = "sha256:80cb70264e9a1d04b519cdba3cd0dc42847bf8e982a4d55c769b9b0ee7cdce1e"},
+    {file = "coverage-6.1.2-cp311-cp311-win_amd64.whl", hash = "sha256:ba6125d4e55c0b8e913dad27b22722eac7abdcb1f3eab1bd090eee9105660266"},
+    {file = "coverage-6.1.2-cp36-cp36m-macosx_10_9_x86_64.whl", hash = "sha256:8492d37acdc07a6eac6489f6c1954026f2260a85a4c2bb1e343fe3d35f5ee21a"},
+    {file = "coverage-6.1.2-cp36-cp36m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:66af99c7f7b64d050d37e795baadf515b4561124f25aae6e1baa482438ecc388"},
+    {file = "coverage-6.1.2-cp36-cp36m-manylinux_2_5_i686.manylinux1_i686.manylinux_2_12_i686.manylinux2010_i686.whl", hash = "sha256:ebcc03e1acef4ff44f37f3c61df478d6e469a573aa688e5a162f85d7e4c3860d"},
+    {file = "coverage-6.1.2-cp36-cp36m-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:98d44a8136eebbf544ad91fef5bd2b20ef0c9b459c65a833c923d9aa4546b204"},
+    {file = "coverage-6.1.2-cp36-cp36m-musllinux_1_1_aarch64.whl", hash = "sha256:c18725f3cffe96732ef96f3de1939d81215fd6d7d64900dcc4acfe514ea4fcbf"},
+    {file = "coverage-6.1.2-cp36-cp36m-musllinux_1_1_i686.whl", hash = "sha256:c8e9c4bcaaaa932be581b3d8b88b677489975f845f7714efc8cce77568b6711c"},
+    {file = "coverage-6.1.2-cp36-cp36m-musllinux_1_1_x86_64.whl", hash = "sha256:06d009e8a29483cbc0520665bc46035ffe9ae0e7484a49f9782c2a716e37d0a0"},
+    {file = "coverage-6.1.2-cp36-cp36m-win32.whl", hash = "sha256:e5432d9c329b11c27be45ee5f62cf20a33065d482c8dec1941d6670622a6fb8f"},
+    {file = "coverage-6.1.2-cp36-cp36m-win_amd64.whl", hash = "sha256:82fdcb64bf08aa5db881db061d96db102c77397a570fbc112e21c48a4d9cb31b"},
+    {file = "coverage-6.1.2-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:94f558f8555e79c48c422045f252ef41eb43becdd945e9c775b45ebfc0cbd78f"},
+    {file = "coverage-6.1.2-cp37-cp37m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:046647b96969fda1ae0605f61288635209dd69dcd27ba3ec0bf5148bc157f954"},
+    {file = "coverage-6.1.2-cp37-cp37m-manylinux_2_5_i686.manylinux1_i686.manylinux_2_12_i686.manylinux2010_i686.whl", hash = "sha256:cc799916b618ec9fd00135e576424165691fec4f70d7dc12cfaef09268a2478c"},
+    {file = "coverage-6.1.2-cp37-cp37m-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:62646d98cf0381ffda301a816d6ac6c35fc97aa81b09c4c52d66a15c4bef9d7c"},
+    {file = "coverage-6.1.2-cp37-cp37m-musllinux_1_1_aarch64.whl", hash = "sha256:27a3df08a855522dfef8b8635f58bab81341b2fb5f447819bc252da3aa4cf44c"},
+    {file = "coverage-6.1.2-cp37-cp37m-musllinux_1_1_i686.whl", hash = "sha256:610c0ba11da8de3a753dc4b1f71894f9f9debfdde6559599f303286e70aeb0c2"},
+    {file = "coverage-6.1.2-cp37-cp37m-musllinux_1_1_x86_64.whl", hash = "sha256:35b246ae3a2c042dc8f410c94bcb9754b18179cdb81ff9477a9089dbc9ecc186"},
+    {file = "coverage-6.1.2-cp37-cp37m-win32.whl", hash = "sha256:0cde7d9fe2fb55ff68ebe7fb319ef188e9b88e0a3d1c9c5db7dd829cd93d2193"},
+    {file = "coverage-6.1.2-cp37-cp37m-win_amd64.whl", hash = "sha256:958ac66272ff20e63d818627216e3d7412fdf68a2d25787b89a5c6f1eb7fdd93"},
+    {file = "coverage-6.1.2-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:a300b39c3d5905686c75a369d2a66e68fd01472ea42e16b38c948bd02b29e5bd"},
+    {file = "coverage-6.1.2-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:5d3855d5d26292539861f5ced2ed042fc2aa33a12f80e487053aed3bcb6ced13"},
+    {file = "coverage-6.1.2-cp38-cp38-manylinux_2_5_i686.manylinux1_i686.manylinux_2_12_i686.manylinux2010_i686.whl", hash = "sha256:586d38dfc7da4a87f5816b203ff06dd7c1bb5b16211ccaa0e9788a8da2b93696"},
+    {file = "coverage-6.1.2-cp38-cp38-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:a34fccb45f7b2d890183a263578d60a392a1a218fdc12f5bce1477a6a68d4373"},
+    {file = "coverage-6.1.2-cp38-cp38-musllinux_1_1_aarch64.whl", hash = "sha256:bc1ee1318f703bc6c971da700d74466e9b86e0c443eb85983fb2a1bd20447263"},
+    {file = "coverage-6.1.2-cp38-cp38-musllinux_1_1_i686.whl", hash = "sha256:3f546f48d5d80a90a266769aa613bc0719cb3e9c2ef3529d53f463996dd15a9d"},
+    {file = "coverage-6.1.2-cp38-cp38-musllinux_1_1_x86_64.whl", hash = "sha256:fd92ece726055e80d4e3f01fff3b91f54b18c9c357c48fcf6119e87e2461a091"},
+    {file = "coverage-6.1.2-cp38-cp38-win32.whl", hash = "sha256:24ed38ec86754c4d5a706fbd5b52b057c3df87901a8610d7e5642a08ec07087e"},
+    {file = "coverage-6.1.2-cp38-cp38-win_amd64.whl", hash = "sha256:97ef6e9119bd39d60ef7b9cd5deea2b34869c9f0b9777450a7e3759c1ab09b9b"},
+    {file = "coverage-6.1.2-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:6e5a8c947a2a89c56655ecbb789458a3a8e3b0cbf4c04250331df8f647b3de59"},
+    {file = "coverage-6.1.2-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:7a39590d1e6acf6a3c435c5d233f72f5d43b585f5be834cff1f21fec4afda225"},
+    {file = "coverage-6.1.2-cp39-cp39-manylinux_2_5_i686.manylinux1_i686.manylinux_2_12_i686.manylinux2010_i686.whl", hash = "sha256:9d2c2e3ce7b8cc932a2f918186964bd44de8c84e2f9ef72dc616f5bb8be22e71"},
+    {file = "coverage-6.1.2-cp39-cp39-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:3348865798c077c695cae00da0924136bb5cc501f236cfd6b6d9f7a3c94e0ec4"},
+    {file = "coverage-6.1.2-cp39-cp39-win32.whl", hash = "sha256:fae3fe111670e51f1ebbc475823899524e3459ea2db2cb88279bbfb2a0b8a3de"},
+    {file = "coverage-6.1.2-cp39-cp39-win_amd64.whl", hash = "sha256:af45eea024c0e3a25462fade161afab4f0d9d9e0d5a5d53e86149f74f0a35ecc"},
+    {file = "coverage-6.1.2-pp36.pp37.pp38-none-any.whl", hash = "sha256:eab14fdd410500dae50fd14ccc332e65543e7b39f6fc076fe90603a0e5d2f929"},
+    {file = "coverage-6.1.2.tar.gz", hash = "sha256:d9a635114b88c0ab462e0355472d00a180a5fbfd8511e7f18e4ac32652e7d972"},
 ]
 cycler = [
     {file = "cycler-0.11.0-py3-none-any.whl", hash = "sha256:3a27e95f763a428a739d2add979fa7494c912a32c17c4c38c4d5f082cad165a3"},
@@ -770,6 +837,10 @@ fonttools = [
     {file = "fonttools-4.28.1-py3-none-any.whl", hash = "sha256:68071406009e7ef6a5fdcd85d95975cd6963867bb226f2b786bfffe15d1959ef"},
     {file = "fonttools-4.28.1.zip", hash = "sha256:8c8f84131bf04f3b1dcf99b9763cec35c347164ab6ad006e18d2f99fcab05529"},
 ]
+identify = [
+    {file = "identify-2.3.5-py2.py3-none-any.whl", hash = "sha256:ba945bddb4322394afcf3f703fa68eda08a6acc0f99d9573eb2be940aa7b9bba"},
+    {file = "identify-2.3.5.tar.gz", hash = "sha256:6f0368ba0f21c199645a331beb7425d5374376e71bc149e9cb55e45cb45f832d"},
+]
 idna = [
     {file = "idna-3.3-py3-none-any.whl", hash = "sha256:84d9dd047ffa80596e0f246e2eab0b391788b0503584e8945f2368256d2735ff"},
     {file = "idna-3.3.tar.gz", hash = "sha256:9d643ff0a55b762d5cdb124b8eaa99c66322e2157b69160bc32796e824360e6d"},
@@ -940,6 +1011,10 @@ mypy-extensions = [
     {file = "mypy_extensions-0.4.3-py2.py3-none-any.whl", hash = "sha256:090fedd75945a69ae91ce1303b5824f428daf5a028d2f6ab8a299250a846f15d"},
     {file = "mypy_extensions-0.4.3.tar.gz", hash = "sha256:2d82818f5bb3e369420cb3c4060a7970edba416647068eb4c5343488a6c604a8"},
 ]
+nodeenv = [
+    {file = "nodeenv-1.6.0-py2.py3-none-any.whl", hash = "sha256:621e6b7076565ddcacd2db0294c0381e01fd28945ab36bcf00f41c5daf63bef7"},
+    {file = "nodeenv-1.6.0.tar.gz", hash = "sha256:3ef13ff90291ba2a4a7a4ff9a979b63ffdd00a464dbe04acf0ea6471517a4c2b"},
+]
 numpy = [
     {file = "numpy-1.21.4-cp310-cp310-macosx_10_9_universal2.whl", hash = "sha256:8890b3360f345e8360133bc078d2dacc2843b6ee6059b568781b15b97acbe39f"},
     {file = "numpy-1.21.4-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:69077388c5a4b997442b843dbdc3a85b420fb693ec8e33020bb24d647c164fa5"},
@@ -1035,6 +1110,10 @@ poyo = [
     {file = "poyo-0.5.0-py2.py3-none-any.whl", hash = "sha256:3e2ca8e33fdc3c411cd101ca395668395dd5dc7ac775b8e809e3def9f9fe041a"},
     {file = "poyo-0.5.0.tar.gz", hash = "sha256:e26956aa780c45f011ca9886f044590e2d8fd8b61db7b1c1cf4e0869f48ed4dd"},
 ]
+pre-commit = [
+    {file = "pre_commit-2.15.0-py2.py3-none-any.whl", hash = "sha256:a4ed01000afcb484d9eb8d504272e642c4c4099bbad3a6b27e519bd6a3e928a6"},
+    {file = "pre_commit-2.15.0.tar.gz", hash = "sha256:3c25add78dbdfb6a28a651780d5c311ac40dd17f160eb3954a0c59da40a505a7"},
+]
 py = [
     {file = "py-1.11.0-py2.py3-none-any.whl", hash = "sha256:607c53218732647dff4acdfcd50cb62615cedf612e72d1724fb1a0cc6405b378"},
     {file = "py-1.11.0.tar.gz", hash = "sha256:51c75c4126074b472f746a24399ad32f6053d1b34b68d2fa41e558e6f4a98719"},
@@ -1063,10 +1142,49 @@ python-dateutil = [
     {file = "python-dateutil-2.8.2.tar.gz", hash = "sha256:0123cacc1627ae19ddf3c27a5de5bd67ee4586fbdd6440d9748f8abb483d3e86"},
     {file = "python_dateutil-2.8.2-py2.py3-none-any.whl", hash = "sha256:961d03dc3453ebbc59dbdea9e4e11c5651520a876d0f4db161e8674aae935da9"},
 ]
+python-dotenv = [
+    {file = "python-dotenv-0.19.2.tar.gz", hash = "sha256:a5de49a31e953b45ff2d2fd434bbc2670e8db5273606c1e737cc6b93eff3655f"},
+    {file = "python_dotenv-0.19.2-py2.py3-none-any.whl", hash = "sha256:32b2bdc1873fd3a3c346da1c6db83d0053c3c62f28f1f38516070c4c8971b1d3"},
+]
 python-slugify = [
     {file = "python-slugify-5.0.2.tar.gz", hash = "sha256:f13383a0b9fcbe649a1892b9c8eb4f8eab1d6d84b84bb7a624317afa98159cab"},
     {file = "python_slugify-5.0.2-py2.py3-none-any.whl", hash = "sha256:6d8c5df75cd4a7c3a2d21e257633de53f52ab0265cd2d1dc62a730e8194a7380"},
 ]
+pyyaml = [
+    {file = "PyYAML-6.0-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:d4db7c7aef085872ef65a8fd7d6d09a14ae91f691dec3e87ee5ee0539d516f53"},
+    {file = "PyYAML-6.0-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:9df7ed3b3d2e0ecfe09e14741b857df43adb5a3ddadc919a2d94fbdf78fea53c"},
+    {file = "PyYAML-6.0-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:77f396e6ef4c73fdc33a9157446466f1cff553d979bd00ecb64385760c6babdc"},
+    {file = "PyYAML-6.0-cp310-cp310-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:a80a78046a72361de73f8f395f1f1e49f956c6be882eed58505a15f3e430962b"},
+    {file = "PyYAML-6.0-cp310-cp310-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:f84fbc98b019fef2ee9a1cb3ce93e3187a6df0b2538a651bfb890254ba9f90b5"},
+    {file = "PyYAML-6.0-cp310-cp310-win32.whl", hash = "sha256:2cd5df3de48857ed0544b34e2d40e9fac445930039f3cfe4bcc592a1f836d513"},
+    {file = "PyYAML-6.0-cp310-cp310-win_amd64.whl", hash = "sha256:daf496c58a8c52083df09b80c860005194014c3698698d1a57cbcfa182142a3a"},
+    {file = "PyYAML-6.0-cp36-cp36m-macosx_10_9_x86_64.whl", hash = "sha256:897b80890765f037df3403d22bab41627ca8811ae55e9a722fd0392850ec4d86"},
+    {file = "PyYAML-6.0-cp36-cp36m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:50602afada6d6cbfad699b0c7bb50d5ccffa7e46a3d738092afddc1f9758427f"},
+    {file = "PyYAML-6.0-cp36-cp36m-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:48c346915c114f5fdb3ead70312bd042a953a8ce5c7106d5bfb1a5254e47da92"},
+    {file = "PyYAML-6.0-cp36-cp36m-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:98c4d36e99714e55cfbaaee6dd5badbc9a1ec339ebfc3b1f52e293aee6bb71a4"},
+    {file = "PyYAML-6.0-cp36-cp36m-win32.whl", hash = "sha256:0283c35a6a9fbf047493e3a0ce8d79ef5030852c51e9d911a27badfde0605293"},
+    {file = "PyYAML-6.0-cp36-cp36m-win_amd64.whl", hash = "sha256:07751360502caac1c067a8132d150cf3d61339af5691fe9e87803040dbc5db57"},
+    {file = "PyYAML-6.0-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:819b3830a1543db06c4d4b865e70ded25be52a2e0631ccd2f6a47a2822f2fd7c"},
+    {file = "PyYAML-6.0-cp37-cp37m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:473f9edb243cb1935ab5a084eb238d842fb8f404ed2193a915d1784b5a6b5fc0"},
+    {file = "PyYAML-6.0-cp37-cp37m-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:0ce82d761c532fe4ec3f87fc45688bdd3a4c1dc5e0b4a19814b9009a29baefd4"},
+    {file = "PyYAML-6.0-cp37-cp37m-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:231710d57adfd809ef5d34183b8ed1eeae3f76459c18fb4a0b373ad56bedcdd9"},
+    {file = "PyYAML-6.0-cp37-cp37m-win32.whl", hash = "sha256:c5687b8d43cf58545ade1fe3e055f70eac7a5a1a0bf42824308d868289a95737"},
+    {file = "PyYAML-6.0-cp37-cp37m-win_amd64.whl", hash = "sha256:d15a181d1ecd0d4270dc32edb46f7cb7733c7c508857278d3d378d14d606db2d"},
+    {file = "PyYAML-6.0-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:0b4624f379dab24d3725ffde76559cff63d9ec94e1736b556dacdfebe5ab6d4b"},
+    {file = "PyYAML-6.0-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:213c60cd50106436cc818accf5baa1aba61c0189ff610f64f4a3e8c6726218ba"},
+    {file = "PyYAML-6.0-cp38-cp38-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:9fa600030013c4de8165339db93d182b9431076eb98eb40ee068700c9c813e34"},
+    {file = "PyYAML-6.0-cp38-cp38-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:277a0ef2981ca40581a47093e9e2d13b3f1fbbeffae064c1d21bfceba2030287"},
+    {file = "PyYAML-6.0-cp38-cp38-win32.whl", hash = "sha256:d4eccecf9adf6fbcc6861a38015c2a64f38b9d94838ac1810a9023a0609e1b78"},
+    {file = "PyYAML-6.0-cp38-cp38-win_amd64.whl", hash = "sha256:1e4747bc279b4f613a09eb64bba2ba602d8a6664c6ce6396a4d0cd413a50ce07"},
+    {file = "PyYAML-6.0-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:055d937d65826939cb044fc8c9b08889e8c743fdc6a32b33e2390f66013e449b"},
+    {file = "PyYAML-6.0-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:e61ceaab6f49fb8bdfaa0f92c4b57bcfbea54c09277b1b4f7ac376bfb7a7c174"},
+    {file = "PyYAML-6.0-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:d67d839ede4ed1b28a4e8909735fc992a923cdb84e618544973d7dfc71540803"},
+    {file = "PyYAML-6.0-cp39-cp39-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:cba8c411ef271aa037d7357a2bc8f9ee8b58b9965831d9e51baf703280dc73d3"},
+    {file = "PyYAML-6.0-cp39-cp39-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:40527857252b61eacd1d9af500c3337ba8deb8fc298940291486c465c8b46ec0"},
+    {file = "PyYAML-6.0-cp39-cp39-win32.whl", hash = "sha256:b5b9eccad747aabaaffbc6064800670f0c297e52c12754eb1d976c57e4f74dcb"},
+    {file = "PyYAML-6.0-cp39-cp39-win_amd64.whl", hash = "sha256:b3d267842bf12586ba6c734f89d1f5b871df0273157918b0ccefa29deb05c21c"},
+    {file = "PyYAML-6.0.tar.gz", hash = "sha256:68fb519c14306fec9720a2a5b45bc9f0c8d1b9c72adf45c37baedfcd949c35a2"},
+]
 regex = [
     {file = "regex-2021.11.10-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:9345b6f7ee578bad8e475129ed40123d265464c4cfead6c261fd60fc9de00bcf"},
     {file = "regex-2021.11.10-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:416c5f1a188c91e3eb41e9c8787288e707f7d2ebe66e0a6563af280d9b68478f"},
diff --git a/pyproject.toml b/pyproject.toml
index 39f08180..74a92daa 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -12,6 +12,7 @@ click = "^8.0.3"
 matplotlib = "3.5.0rc1"
 numpy = "^1.21.4"
 tqdm = "^4.62.3"
+requests = "^2.26.0"
 
 [tool.poetry.dev-dependencies]
 black = "^21.10b0"
@@ -19,7 +20,9 @@ cookiecutter = "^1.7.3"
 pytest = "^6.2.5"
 pytest-cov = "^3.0.0"
 pytest-xdist = "^2.4.0"
+python-dotenv = "^0.19.2"
 tox = "^3.24.4"
+pre-commit = "^2.15.0"
 
 [tool.poetry.scripts]
 adventofcode = "adventofcode2020.main:main"
diff --git a/src/adventofcode2020/main.py b/src/adventofcode2020/main.py
index ed212f07..7c402e19 100644
--- a/src/adventofcode2020/main.py
+++ b/src/adventofcode2020/main.py
@@ -1,10 +1,15 @@
 import importlib
 import logging
+import os
 import sys
 import timeit
+from pathlib import Path
 
 import click
+import requests
 import tqdm
+from cookiecutter.main import cookiecutter
+from dotenv import load_dotenv
 
 logger = logging.getLogger(__name__)
 
@@ -14,6 +19,11 @@
     "day",
     type=click.IntRange(1, 25),
 )
+@click.option(
+    "--create",
+    is_flag=True,
+    help="Create the files for a specific day",
+)
 @click.option("--parta", "part", flag_value="parta")
 @click.option("--partb", "part", flag_value="partb")
 @click.option(
@@ -24,7 +34,7 @@
     help="Test the solution using timeit with timeit iterations",
 )
 @click.option("-v", "--verbose", is_flag=True)
-def main(day, part, timeit_, verbose):
+def main(day, create, part, timeit_, verbose):
     """
     Simple program that runs a module from the advent of code.
     DAY is an integer representing the day (1 - 25) that runs that day.
@@ -39,12 +49,98 @@ def main(day, part, timeit_, verbose):
         datefmt="%H:%M:%S",
     )
 
+    # Load env values from .env file, or from environment variables if set
+    load_dotenv()
+
     day = f"{int(day):02}"
 
     print(
-        f"Welcome to Advent of Code 2020 - {day=} - {part=} - {timeit_=} - {verbose=}"
+        f"Welcome to Advent of Code 2020 - {day=} - {part=} - {timeit_=} - "
+        f"{verbose=} - {create=}"
+    )
+
+    if create:
+        # Create a new solution
+        ensure_correct_directory()
+        create_solution(day=day)
+        download_input_data(year="2020", day=day)
+    else:
+        # Run a specific day
+        run_solution(day=day, timeit_=timeit_, part=part)
+
+
+def ensure_correct_directory():
+    """Make sure that we are in the correct directory: Main sources root"""
+    main_file = Path("src/adventofcode2020/main.py")
+    if main_file.exists():
+        return True
+    else:
+        current_path = Path(__file__).parent.parent.parent.resolve()
+        print(f"Not in the correct folder. Please execute: cd {current_path}")
+        sys.exit(-65)
+
+
+def create_solution(day):
+    print(f"Creating solution for {day} --")
+
+    # Check before we overwrite
+    import_path = f"adventofcode2020.solutions.day{day}"
+    logger.debug(f"Importing {import_path}")
+    try:
+        importlib.import_module(import_path)
+    except ModuleNotFoundError:
+        pass
+        logger.debug(f"{import_path} does not exist, we can continue")
+    else:
+        print("Module already exists - Not creating")
+        sys.exit(-65)
+
+    cookiecutter(
+        "template/",
+        no_input=True,
+        extra_context={"day": day},
+        overwrite_if_exists=True,
+    )
+
+
+def download_input_data(year: str, day: str):
+    """Download the input data"""
+    session = os.environ.get("AOC_SESSION")
+    if not session:
+        print("AOC_SESSION key is not set in envonrment or .env file")
+        sys.exit(-65)
+
+    # Download the content, using the session key
+    r = requests.get(
+        f"https://adventofcode.com/{year}/day/{day}/input",
+        cookies={"session": session},
     )
+    if r.status_code != 200:
+        print(f"Unable to download the input data. Response code {r.status_code}")
+        if r.status_code == 500:
+            print("An internal server error accured. Is your session valid?")
+        elif r.status_code == 404:
+            print(
+                "Solution not found: You are too early, or this day does not"
+                "have an input file."
+            )
+        else:
+            print(r.content)
+
+        sys.exit(-65)
+
+    logger.debug(f"Received data, length {len(r.content)}")
+
+    data_path = f"day_{day}/day{day}.txt"
+    root_dir = Path(__file__).parent
+    filename = root_dir / "solutions" / "data" / data_path
+    with open(filename, "wb") as f:
+        f.write(r.content)
+
+    logger.info(f"Input data writen to {filename}")
+
 
+def run_solution(day, timeit_, part):
     # Try to import the solution
     import_path = f"adventofcode2020.solutions.day{day}"
     data_path = f"day_{day}/day{day}.txt"
diff --git a/tox.ini b/tox.ini
index deebf128..26159ecc 100644
--- a/tox.ini
+++ b/tox.ini
@@ -88,6 +88,7 @@ description = type check ourselves
 deps =
     mypy
     lxml
+    types-requests
 commands =
     python -m mypy --config-file mypy.ini src/
 

From e295fe930dbeb223b0c68794d45bf1f24d44368c Mon Sep 17 00:00:00 2001
From: Roel Adriaans <roel.adriaans@ordina.nl>
Date: Sun, 14 Nov 2021 20:01:01 +0100
Subject: [PATCH 018/371] Fix empty lines for day 1

---
 src/adventofcode2020/solutions/day01.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/adventofcode2020/solutions/day01.py b/src/adventofcode2020/solutions/day01.py
index 5cf411e6..6bc51286 100644
--- a/src/adventofcode2020/solutions/day01.py
+++ b/src/adventofcode2020/solutions/day01.py
@@ -10,7 +10,7 @@
 class Day01:
     @staticmethod
     def compute_factor(input_data, n):
-        ints = [int(x) for x in input_data.split("\n")]
+        ints = [int(x) for x in input_data.split("\n") if x]
         for x in combinations(ints, n):
             if sum(x) == 2020:
                 logger.debug(f"Found the values {x}")

From 6c2f2e0c26e5a640e89d976fa2b4458b23e7e2e5 Mon Sep 17 00:00:00 2001
From: Roel Adriaans <roel.adriaans@ordina.nl>
Date: Sun, 14 Nov 2021 20:57:36 +0100
Subject: [PATCH 019/371] Download and push solutions to adventofcode.com, fix
 newline for day 3

---
 poetry.lock                             | 33 ++++++++-
 pyproject.toml                          |  1 +
 src/adventofcode2020/main.py            | 93 ++++++++++++++++++++++---
 src/adventofcode2020/solutions/day03.py |  2 +-
 4 files changed, 116 insertions(+), 13 deletions(-)

diff --git a/poetry.lock b/poetry.lock
index d12cb422..7c7ed9c4 100644
--- a/poetry.lock
+++ b/poetry.lock
@@ -58,6 +58,21 @@ python-versions = ">=2.7"
 docs = ["sphinx", "jaraco.packaging (>=8.2)", "rst.linker (>=1.9)"]
 testing = ["pytest", "pytest-flake8", "pytest-cov", "pytest-black (>=0.3.7)", "pytest-mypy", "pytest-checkdocs (>=2.4)", "pytest-enabler (>=1.0.1)"]
 
+[[package]]
+name = "beautifulsoup4"
+version = "4.10.0"
+description = "Screen-scraping library"
+category = "main"
+optional = false
+python-versions = ">3.0.0"
+
+[package.dependencies]
+soupsieve = ">1.2"
+
+[package.extras]
+html5lib = ["html5lib"]
+lxml = ["lxml"]
+
 [[package]]
 name = "binaryornot"
 version = "0.4.4"
@@ -604,6 +619,14 @@ category = "main"
 optional = false
 python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*"
 
+[[package]]
+name = "soupsieve"
+version = "2.3.1"
+description = "A modern CSS selector implementation for Beautiful Soup."
+category = "main"
+optional = false
+python-versions = ">=3.6"
+
 [[package]]
 name = "text-unidecode"
 version = "1.3"
@@ -709,7 +732,7 @@ testing = ["coverage (>=4)", "coverage-enable-subprocess (>=1)", "flaky (>=3)",
 [metadata]
 lock-version = "1.1"
 python-versions = ">=3.9,<3.11"
-content-hash = "ded08b647a2ea89d61d9cf3ee0fd8f936403f49e11ed270994247f95b6923d8b"
+content-hash = "1041cc220cd154a3d2a3f836d994da22654dc969b065c6080803699c7e3e66f2"
 
 [metadata.files]
 anytree = [
@@ -732,6 +755,10 @@ attrs = [
     {file = "backports.entry_points_selectable-1.1.1-py2.py3-none-any.whl", hash = "sha256:7fceed9532a7aa2bd888654a7314f864a3c16a4e710b34a58cfc0f08114c663b"},
     {file = "backports.entry_points_selectable-1.1.1.tar.gz", hash = "sha256:914b21a479fde881635f7af5adc7f6e38d6b274be32269070c53b698c60d5386"},
 ]
+beautifulsoup4 = [
+    {file = "beautifulsoup4-4.10.0-py3-none-any.whl", hash = "sha256:9a315ce70049920ea4572a4055bc4bd700c940521d36fc858205ad4fcde149bf"},
+    {file = "beautifulsoup4-4.10.0.tar.gz", hash = "sha256:c23ad23c521d818955a4151a67d81580319d4bf548d3d49f4223ae041ff98891"},
+]
 binaryornot = [
     {file = "binaryornot-0.4.4-py2.py3-none-any.whl", hash = "sha256:b8b71173c917bddcd2c16070412e369c3ed7f0528926f70cac18a6c97fd563e4"},
     {file = "binaryornot-0.4.4.tar.gz", hash = "sha256:359501dfc9d40632edc9fac890e19542db1a287bbcfa58175b66658392018061"},
@@ -1248,6 +1275,10 @@ six = [
     {file = "six-1.16.0-py2.py3-none-any.whl", hash = "sha256:8abb2f1d86890a2dfb989f9a77cfcfd3e47c2a354b01111771326f8aa26e0254"},
     {file = "six-1.16.0.tar.gz", hash = "sha256:1e61c37477a1626458e36f7b1d82aa5c9b094fa4802892072e49de9c60c4c926"},
 ]
+soupsieve = [
+    {file = "soupsieve-2.3.1-py3-none-any.whl", hash = "sha256:1a3cca2617c6b38c0343ed661b1fa5de5637f257d4fe22bd9f1338010a1efefb"},
+    {file = "soupsieve-2.3.1.tar.gz", hash = "sha256:b8d49b1cd4f037c7082a9683dfa1801aa2597fb11c3a1155b7a5b94829b4f1f9"},
+]
 text-unidecode = [
     {file = "text-unidecode-1.3.tar.gz", hash = "sha256:bad6603bb14d279193107714b288be206cac565dfa49aa5b105294dd5c4aab93"},
     {file = "text_unidecode-1.3-py2.py3-none-any.whl", hash = "sha256:1311f10e8b895935241623731c2ba64f4c455287888b18189350b67134a822e8"},
diff --git a/pyproject.toml b/pyproject.toml
index 74a92daa..280dc172 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -13,6 +13,7 @@ matplotlib = "3.5.0rc1"
 numpy = "^1.21.4"
 tqdm = "^4.62.3"
 requests = "^2.26.0"
+beautifulsoup4 = "^4.10.0"
 
 [tool.poetry.dev-dependencies]
 black = "^21.10b0"
diff --git a/src/adventofcode2020/main.py b/src/adventofcode2020/main.py
index 7c402e19..e6a818f7 100644
--- a/src/adventofcode2020/main.py
+++ b/src/adventofcode2020/main.py
@@ -8,6 +8,7 @@
 import click
 import requests
 import tqdm
+from bs4 import BeautifulSoup
 from cookiecutter.main import cookiecutter
 from dotenv import load_dotenv
 
@@ -24,6 +25,16 @@
     is_flag=True,
     help="Create the files for a specific day",
 )
+@click.option(
+    "--submit",
+    is_flag=True,
+    help="Submit the results to Advent of Code",
+)
+@click.option(
+    "--download",
+    is_flag=True,
+    help="Download fresh copy of the input before starting",
+)
 @click.option("--parta", "part", flag_value="parta")
 @click.option("--partb", "part", flag_value="partb")
 @click.option(
@@ -34,7 +45,7 @@
     help="Test the solution using timeit with timeit iterations",
 )
 @click.option("-v", "--verbose", is_flag=True)
-def main(day, create, part, timeit_, verbose):
+def main(day, create, submit, download, part, timeit_, verbose):
     """
     Simple program that runs a module from the advent of code.
     DAY is an integer representing the day (1 - 25) that runs that day.
@@ -43,6 +54,17 @@ def main(day, create, part, timeit_, verbose):
         level = logging.DEBUG
     else:
         level = logging.WARNING
+
+    if create and submit:
+        print("Create and submit cannot be used at the same time")
+        sys.exit(-65)
+
+    if submit and not part:
+        print(
+            "Submit can only be used ony part at a time (Eg specify --parta or --partb)"
+        )
+        sys.exit(-65)
+
     logging.basicConfig(
         level=level,
         format="%(asctime)s - %(name)s - %(levelname)s - %(message)s",
@@ -66,7 +88,9 @@ def main(day, create, part, timeit_, verbose):
         download_input_data(year="2020", day=day)
     else:
         # Run a specific day
-        run_solution(day=day, timeit_=timeit_, part=part)
+        if download:
+            download_input_data(year="2020", day=day)
+        run_solution(day=day, timeit_=timeit_, part=part, submit=submit)
 
 
 def ensure_correct_directory():
@@ -103,17 +127,20 @@ def create_solution(day):
     )
 
 
-def download_input_data(year: str, day: str):
-    """Download the input data"""
+def _get_session():
     session = os.environ.get("AOC_SESSION")
     if not session:
         print("AOC_SESSION key is not set in envonrment or .env file")
         sys.exit(-65)
+    return session
+
 
+def download_input_data(year: str, day: str):
+    """Download the input data"""
     # Download the content, using the session key
     r = requests.get(
-        f"https://adventofcode.com/{year}/day/{day}/input",
-        cookies={"session": session},
+        f"https://adventofcode.com/{year}/day/{day.lstrip('0')}/input",
+        cookies={"session": _get_session()},
     )
     if r.status_code != 200:
         print(f"Unable to download the input data. Response code {r.status_code}")
@@ -140,7 +167,7 @@ def download_input_data(year: str, day: str):
     logger.info(f"Input data writen to {filename}")
 
 
-def run_solution(day, timeit_, part):
+def run_solution(day, timeit_, part, submit):
     # Try to import the solution
     import_path = f"adventofcode2020.solutions.day{day}"
     data_path = f"day_{day}/day{day}.txt"
@@ -173,15 +200,21 @@ def run_solution(day, timeit_, part):
         )
     else:
         print("Results:")
-        print(run_day(data_path, day, day_module, part))
+        print(run_day(data_path, day, day_module, part, submit))
 
 
-def run_day(data_path, day, day_module, part):
+def run_day(data_path, day, day_module, part, submit):
     if part == "parta":
-        return run_parta(data_path, day, day_module)
+        result = run_parta(data_path, day, day_module)
+        if submit:
+            submit_result(year=2020, day=day, part=part, result=result)
+        return result
 
     elif part == "partb":
-        return run_partb(data_path, day, day_module)
+        result = run_partb(data_path, day, day_module)
+        if submit:
+            submit_result(year=2020, day=day, part=part, result=result)
+        return result
 
     else:
         a = run_parta(data_path, day, day_module)
@@ -200,5 +233,43 @@ def run_partb(data_path, day, day_module):
     return result
 
 
+def submit_result(year, day, part, result):
+    """Submit a solution to advent of code"""
+    day = day.lstrip("0")
+    post_url = f"https://adventofcode.com/{year}/day/{day}/answer"
+    logger.debug(f"Posting to {post_url}")
+
+    level = 1 if part == "parta" else 2
+    data = {"level": level, "answer": result}
+
+    logger.debug(f"Posting data: {data}")
+
+    r = requests.post(
+        url=post_url,
+        data=data,
+        cookies={"session": _get_session()},
+    )
+
+    result = parse_result(r.text)
+
+    if result:
+        print(f"{result}")
+    else:
+        print(f"Could not parse content. Raw result:\n{r.content}")
+
+
+def parse_result(html_doc):
+    # Parse the result, and print the first main.article
+    soup = BeautifulSoup(html_doc, "html.parser")
+    result = []
+    for m in soup.main:
+        # Skip empty sections or java scripts
+        if m == "\n" or "<script>" in str(m):
+            continue
+        else:
+            result.append(str(m.get_text()))
+    return result
+
+
 if __name__ == "__main__":
     main()
diff --git a/src/adventofcode2020/solutions/day03.py b/src/adventofcode2020/solutions/day03.py
index b0cb3af2..4add0793 100644
--- a/src/adventofcode2020/solutions/day03.py
+++ b/src/adventofcode2020/solutions/day03.py
@@ -7,7 +7,7 @@ class Day03:
     def solve_options(self, input_data: str, right: int, down: int) -> int:
         count = 0
         pos = 0
-        lines = input_data.split("\n")
+        lines = input_data.rstrip("\n").split("\n")
         for idx in range(0, len(lines), down):
             line = lines[idx]
             pos_mod = pos % len(line)

From 12c61b017bf3f1099cfb16443959d916d4bb377b Mon Sep 17 00:00:00 2001
From: Roel Adriaans <roel.adriaans@ordina.nl>
Date: Sun, 14 Nov 2021 21:02:28 +0100
Subject: [PATCH 020/371] Add automerge

---
 .github/workflows/automerge.yml | 31 +++++++++++++++++++++++++++++++
 1 file changed, 31 insertions(+)
 create mode 100644 .github/workflows/automerge.yml

diff --git a/.github/workflows/automerge.yml b/.github/workflows/automerge.yml
new file mode 100644
index 00000000..68203f88
--- /dev/null
+++ b/.github/workflows/automerge.yml
@@ -0,0 +1,31 @@
+name: automerge
+on:
+  pull_request:
+    types:
+      - labeled
+      - unlabeled
+      - synchronize
+      - opened
+      - edited
+      - ready_for_review
+      - reopened
+      - unlocked
+  pull_request_review:
+    types:
+      - submitted
+  check_suite:
+    types:
+      - completed
+  status: {}
+jobs:
+  automerge:
+    runs-on: ubuntu-latest
+    steps:
+      - name: automerge
+        uses: "pascalgn/automerge-action@v0.14.3"
+        env:
+          GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN }}"
+          MERGE_LABELS: automerge
+          MERGE_REMOVE_LABELS: automerge
+          MERGE_RETRIES: "60"
+          MERGE_RETRY_SLEEP: "15000"

From e22076b9502be6e8e6779278d2b0d3b578e4b55d Mon Sep 17 00:00:00 2001
From: Roel Adriaans <roel.adriaans@ordina.nl>
Date: Sun, 14 Nov 2021 21:13:13 +0100
Subject: [PATCH 021/371] Fix some errors, add bs4 to mypy ignore

---
 mypy.ini                     | 3 +++
 src/adventofcode2020/main.py | 4 ++--
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/mypy.ini b/mypy.ini
index 3c176ac3..733d3a49 100644
--- a/mypy.ini
+++ b/mypy.ini
@@ -15,3 +15,6 @@ ignore_missing_imports = True
 
 [mypy-dotenv]
 ignore_missing_imports = True
+
+[mypy-bs4]
+ignore_missing_imports = True
diff --git a/src/adventofcode2020/main.py b/src/adventofcode2020/main.py
index e6a818f7..5b8ab176 100644
--- a/src/adventofcode2020/main.py
+++ b/src/adventofcode2020/main.py
@@ -186,7 +186,7 @@ def run_solution(day, timeit_, part, submit):
         for _ in tqdm.trange(timeit_):
             time_prior = timeit.default_timer()
 
-            results = run_day(data_path, day, day_module, part)
+            results = run_day(data_path, day, day_module, part, submit=False)
 
             time_after = timeit.default_timer()
             execution_times.append(time_after - time_prior)
@@ -255,7 +255,7 @@ def submit_result(year, day, part, result):
     if result:
         print(f"{result}")
     else:
-        print(f"Could not parse content. Raw result:\n{r.content}")
+        print(f"Could not parse content. Raw result:\n{str(r.content)}")
 
 
 def parse_result(html_doc):

From 2db826890bd653c164d550da0ef6286cee39ad7e Mon Sep 17 00:00:00 2001
From: Roel Adriaans <roel@adriaans.org>
Date: Tue, 16 Nov 2021 09:21:31 +0100
Subject: [PATCH 022/371] Update some dependencies

---
 poetry.lock | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

diff --git a/poetry.lock b/poetry.lock
index 7c7ed9c4..4f7c0a49 100644
--- a/poetry.lock
+++ b/poetry.lock
@@ -259,7 +259,7 @@ woff = ["zopfli (>=0.1.4)", "brotlicffi (>=0.8.0)", "brotli (>=1.0.1)"]
 
 [[package]]
 name = "identify"
-version = "2.3.5"
+version = "2.3.6"
 description = "File identification library for Python"
 category = "dev"
 optional = false
@@ -691,11 +691,11 @@ telegram = ["requests"]
 
 [[package]]
 name = "typing-extensions"
-version = "3.10.0.2"
-description = "Backported and Experimental Type Hints for Python 3.5+"
+version = "4.0.0"
+description = "Backported and Experimental Type Hints for Python 3.6+"
 category = "dev"
 optional = false
-python-versions = "*"
+python-versions = ">=3.6"
 
 [[package]]
 name = "urllib3"
@@ -865,8 +865,8 @@ fonttools = [
     {file = "fonttools-4.28.1.zip", hash = "sha256:8c8f84131bf04f3b1dcf99b9763cec35c347164ab6ad006e18d2f99fcab05529"},
 ]
 identify = [
-    {file = "identify-2.3.5-py2.py3-none-any.whl", hash = "sha256:ba945bddb4322394afcf3f703fa68eda08a6acc0f99d9573eb2be940aa7b9bba"},
-    {file = "identify-2.3.5.tar.gz", hash = "sha256:6f0368ba0f21c199645a331beb7425d5374376e71bc149e9cb55e45cb45f832d"},
+    {file = "identify-2.3.6-py2.py3-none-any.whl", hash = "sha256:8cb609a671d2f861ae7fe583711a43fd2faab0c892f39cbc4568b0c51b354238"},
+    {file = "identify-2.3.6.tar.gz", hash = "sha256:4f85f9bd8e6e5e2d61b2f8de5ff5313d8a1cfac4c88822d74406de45ad10bd82"},
 ]
 idna = [
     {file = "idna-3.3-py3-none-any.whl", hash = "sha256:84d9dd047ffa80596e0f246e2eab0b391788b0503584e8945f2368256d2735ff"},
@@ -1300,9 +1300,8 @@ tqdm = [
     {file = "tqdm-4.62.3.tar.gz", hash = "sha256:d359de7217506c9851b7869f3708d8ee53ed70a1b8edbba4dbcb47442592920d"},
 ]
 typing-extensions = [
-    {file = "typing_extensions-3.10.0.2-py2-none-any.whl", hash = "sha256:d8226d10bc02a29bcc81df19a26e56a9647f8b0a6d4a83924139f4a8b01f17b7"},
-    {file = "typing_extensions-3.10.0.2-py3-none-any.whl", hash = "sha256:f1d25edafde516b146ecd0613dabcc61409817af4766fbbcfb8d1ad4ec441a34"},
-    {file = "typing_extensions-3.10.0.2.tar.gz", hash = "sha256:49f75d16ff11f1cd258e1b988ccff82a3ca5570217d7ad8c5f48205dd99a677e"},
+    {file = "typing_extensions-4.0.0-py3-none-any.whl", hash = "sha256:829704698b22e13ec9eaf959122315eabb370b0884400e9818334d8b677023d9"},
+    {file = "typing_extensions-4.0.0.tar.gz", hash = "sha256:2cdf80e4e04866a9b3689a51869016d36db0814d84b8d8a568d22781d45d27ed"},
 ]
 urllib3 = [
     {file = "urllib3-1.26.7-py2.py3-none-any.whl", hash = "sha256:c4fdf4019605b6e5423637e01bc9fe4daef873709a7973e195ceba0a62bbc844"},

From 8df84137f897e85443a533256235526ba88b896b Mon Sep 17 00:00:00 2001
From: Roel Adriaans <roel@adriaans.org>
Date: Tue, 16 Nov 2021 16:08:09 +0100
Subject: [PATCH 023/371] Add force overwrite option

---
 src/adventofcode2020/main.py | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

diff --git a/src/adventofcode2020/main.py b/src/adventofcode2020/main.py
index 5b8ab176..61fa7adb 100644
--- a/src/adventofcode2020/main.py
+++ b/src/adventofcode2020/main.py
@@ -25,6 +25,11 @@
     is_flag=True,
     help="Create the files for a specific day",
 )
+@click.option(
+    "--force",
+    is_flag=True,
+    help="Overwrite if files already exist",
+)
 @click.option(
     "--submit",
     is_flag=True,
@@ -45,7 +50,7 @@
     help="Test the solution using timeit with timeit iterations",
 )
 @click.option("-v", "--verbose", is_flag=True)
-def main(day, create, submit, download, part, timeit_, verbose):
+def main(day, create, force, submit, download, part, timeit_, verbose):
     """
     Simple program that runs a module from the advent of code.
     DAY is an integer representing the day (1 - 25) that runs that day.
@@ -84,7 +89,7 @@ def main(day, create, submit, download, part, timeit_, verbose):
     if create:
         # Create a new solution
         ensure_correct_directory()
-        create_solution(day=day)
+        create_solution(force=force, day=day)
         download_input_data(year="2020", day=day)
     else:
         # Run a specific day
@@ -104,7 +109,7 @@ def ensure_correct_directory():
         sys.exit(-65)
 
 
-def create_solution(day):
+def create_solution(force, day):
     print(f"Creating solution for {day} --")
 
     # Check before we overwrite
@@ -116,8 +121,9 @@ def create_solution(day):
         pass
         logger.debug(f"{import_path} does not exist, we can continue")
     else:
-        print("Module already exists - Not creating")
-        sys.exit(-65)
+        if not force:
+            print("Module already exists - Not creating")
+            sys.exit(-65)
 
     cookiecutter(
         "template/",

From 199861211b19a877f70147c80c659b44198a672f Mon Sep 17 00:00:00 2001
From: Roel Adriaans <roel@adriaans.org>
Date: Tue, 16 Nov 2021 16:36:05 +0100
Subject: [PATCH 024/371] Parse tickets

---
 .../solutions/data/day_16/day16.txt           | 260 ++++++++++++++++++
 src/adventofcode2020/solutions/day16.py       |  53 ++++
 tests/solutions/test_day16_a.py               |  27 ++
 tests/solutions/test_day16_b.py               |  17 ++
 4 files changed, 357 insertions(+)
 create mode 100644 src/adventofcode2020/solutions/data/day_16/day16.txt
 create mode 100644 src/adventofcode2020/solutions/day16.py
 create mode 100644 tests/solutions/test_day16_a.py
 create mode 100644 tests/solutions/test_day16_b.py

diff --git a/src/adventofcode2020/solutions/data/day_16/day16.txt b/src/adventofcode2020/solutions/data/day_16/day16.txt
new file mode 100644
index 00000000..0fa48ead
--- /dev/null
+++ b/src/adventofcode2020/solutions/data/day_16/day16.txt
@@ -0,0 +1,260 @@
+departure location: 29-458 or 484-956
+departure station: 40-723 or 738-960
+departure platform: 30-759 or 784-956
+departure track: 37-608 or 623-964
+departure date: 31-664 or 685-950
+departure time: 27-498 or 508-959
+arrival location: 36-245 or 269-961
+arrival station: 35-808 or 814-973
+arrival platform: 40-831 or 856-951
+arrival track: 36-857 or 875-971
+class: 43-161 or 167-963
+duration: 25-75 or 91-966
+price: 37-708 or 724-972
+route: 39-370 or 396-971
+row: 47-280 or 299-949
+seat: 41-105 or 125-952
+train: 43-351 or 359-966
+type: 34-575 or 586-965
+wagon: 27-397 or 420-953
+zone: 48-206 or 226-965
+
+your ticket:
+61,151,59,101,173,71,103,167,127,157,137,73,181,97,179,149,131,139,67,53
+
+nearby tickets:
+136,368,517,218,187,318,185,172,146,646,804,747,816,625,695,701,420,588,167,302
+144,452,191,495,196,652,878,605,607,61,932,897,539,82,456,806,587,595,153,168
+517,981,569,738,886,608,935,882,943,627,884,644,228,698,640,53,748,570,880,322
+65,428,312,692,61,465,626,312,644,645,539,189,485,182,310,555,442,493,550,275
+701,547,434,796,278,451,179,397,233,645,741,512,442,800,693,213,188,429,654,707
+898,573,456,132,190,898,705,447,875,160,688,592,627,520,434,81,517,634,240,185
+155,433,198,917,513,425,143,149,421,131,815,13,69,887,928,451,497,923,623,347
+908,896,430,539,532,406,439,75,857,134,589,631,552,541,633,933,522,557,807,917
+367,397,712,343,276,195,334,131,137,881,884,912,197,548,817,744,54,226,457,899
+340,453,916,915,430,487,816,543,485,712,703,899,638,756,431,649,364,925,238,815
+525,70,427,894,279,430,792,365,278,946,624,568,371,61,453,595,324,947,598,104
+986,444,243,741,822,745,484,878,457,486,937,368,746,652,126,589,907,317,828,741
+171,830,687,65,815,368,508,799,71,230,560,595,364,303,312,757,112,274,597,881
+917,135,661,130,898,699,618,58,206,73,149,488,458,818,69,803,572,328,888,75
+270,133,228,458,519,56,425,450,277,750,365,538,591,522,925,201,533,982,857,190
+810,599,315,529,515,898,857,605,92,438,629,533,899,491,360,603,537,458,542,597
+307,128,930,489,156,323,924,900,309,216,101,127,312,647,605,491,237,523,746,875
+632,660,660,701,700,106,169,144,341,625,432,196,799,880,808,944,443,200,341,750
+349,881,943,793,541,772,643,171,540,572,647,55,882,569,934,365,944,199,278,568
+703,755,639,929,140,196,897,235,342,79,360,370,302,314,818,786,565,535,186,444
+936,458,393,624,509,563,540,830,788,902,200,628,896,917,795,95,496,332,941,308
+154,234,305,793,927,947,632,661,367,271,273,205,527,638,151,547,285,806,186,328
+641,530,616,660,626,274,368,171,280,149,269,456,658,336,306,194,659,102,318,149
+322,72,125,138,550,365,688,280,442,303,491,509,136,696,996,235,202,704,334,913
+640,571,170,700,803,650,592,545,421,703,600,638,590,242,316,203,3,531,906,233
+424,899,571,333,226,66,159,698,326,330,62,662,140,191,933,742,755,478,349,99
+645,790,316,205,637,935,187,700,565,485,746,947,130,188,436,726,311,827,309,58
+153,200,307,361,169,634,608,312,228,163,313,654,520,511,527,705,300,173,306,433
+125,56,770,177,237,447,425,55,557,192,275,652,160,568,495,508,525,100,487,588
+877,457,275,799,205,889,890,304,568,893,237,825,597,202,911,175,917,164,337,822
+312,306,427,893,562,326,904,931,703,693,946,71,181,631,328,566,552,190,750,709
+91,137,910,193,277,702,142,457,562,335,228,568,672,195,349,139,759,754,946,57
+548,892,303,808,883,514,69,705,942,615,128,822,514,366,54,934,554,420,433,926
+306,518,931,549,652,792,282,808,157,752,60,857,341,104,632,202,806,98,336,940
+144,991,568,185,756,367,893,695,784,631,901,797,607,69,545,696,369,944,948,641
+60,542,350,690,178,793,273,322,688,321,719,433,592,67,518,808,449,758,180,447
+901,740,339,828,898,913,895,284,93,794,789,894,529,238,75,439,519,797,54,890
+301,314,556,624,202,207,161,277,140,138,330,740,908,553,190,432,99,532,789,54
+534,67,160,994,129,272,550,599,657,630,786,556,626,319,245,692,64,948,397,532
+518,545,351,652,920,142,105,706,185,167,268,549,540,184,140,347,597,830,653,753
+275,75,743,916,512,918,162,805,150,798,797,178,67,935,603,300,94,494,491,452
+555,322,542,648,363,787,747,747,909,245,305,203,455,758,920,110,349,150,451,315
+640,309,891,542,541,519,69,720,699,435,799,131,699,686,948,541,520,703,529,696
+918,924,201,345,458,359,821,535,528,431,164,93,563,497,657,187,606,102,325,897
+154,877,828,160,346,675,144,300,304,174,605,708,437,831,934,234,234,911,550,793
+428,128,570,341,530,891,303,184,366,752,485,573,156,277,335,104,217,202,174,149
+500,558,336,927,881,135,640,440,931,242,648,304,338,235,895,232,126,61,308,551
+201,899,52,447,175,624,677,518,519,915,343,788,429,664,647,233,420,276,655,490
+396,884,892,744,877,186,988,203,639,103,143,181,900,510,346,556,631,788,742,177
+630,534,685,517,134,590,908,627,370,525,541,907,320,807,302,186,706,340,815,247
+791,490,78,232,73,273,890,589,543,271,655,169,180,530,441,137,629,918,278,920
+814,0,436,661,362,458,497,787,72,318,900,341,190,130,897,896,487,602,95,904
+918,179,141,508,886,99,307,894,686,634,641,318,546,232,563,165,543,885,705,929
+652,807,144,143,642,265,420,887,55,51,157,513,748,169,420,427,651,692,880,937
+318,565,305,929,754,587,318,308,306,825,568,457,72,218,146,805,160,342,269,70
+555,688,323,557,816,651,229,491,237,795,694,517,931,827,629,586,150,229,108,663
+907,230,149,455,109,536,910,601,801,548,346,942,159,125,158,59,74,174,446,496
+396,756,177,597,157,940,802,337,122,623,795,938,883,746,397,227,741,70,900,55
+536,159,803,195,336,426,228,888,434,911,887,753,888,735,309,185,876,920,799,623
+280,920,396,155,202,367,656,454,454,875,324,24,240,562,885,821,493,519,702,142
+491,199,150,134,433,186,949,200,101,97,546,152,706,788,337,56,760,366,145,857
+644,528,644,422,752,165,351,593,549,347,941,243,244,512,757,537,99,626,905,804
+631,901,747,424,904,510,206,99,594,820,180,910,357,171,231,488,59,328,805,656
+229,923,194,517,656,364,74,485,99,804,943,190,946,343,573,751,392,819,420,236
+616,823,922,633,149,746,565,558,322,593,319,897,695,496,914,568,552,511,94,587
+119,568,129,320,302,305,804,554,232,647,303,194,923,891,915,744,485,551,540,68
+74,336,432,197,715,923,914,527,278,660,910,53,692,452,422,513,568,531,650,944
+787,604,243,646,429,56,73,546,553,883,170,883,432,200,634,701,920,22,54,896
+318,271,875,590,360,445,177,63,999,154,746,637,535,329,92,892,949,204,442,435
+51,558,155,421,441,325,920,568,820,300,804,537,544,423,74,231,91,616,245,312
+659,652,941,431,349,351,50,662,520,646,305,642,96,490,350,697,671,637,495,797
+776,131,949,887,272,457,910,642,940,425,702,176,746,510,271,245,885,928,886,562
+313,420,594,938,946,571,193,999,938,534,161,100,607,136,101,894,934,595,561,590
+269,745,143,347,305,593,722,69,487,662,60,137,569,240,653,71,590,891,648,632
+542,623,629,806,515,178,898,230,496,143,748,509,485,604,518,445,918,981,818,626
+706,303,536,635,196,190,642,884,300,55,179,920,813,634,520,328,796,189,560,101
+239,542,116,685,104,801,759,52,567,436,322,745,628,487,687,520,203,856,191,641
+332,748,664,896,929,593,740,881,318,654,427,148,7,235,939,205,422,348,128,800
+919,553,103,430,426,727,437,663,368,368,795,103,912,751,933,922,361,492,231,516
+231,586,567,204,101,574,762,167,567,567,161,568,317,934,603,510,68,655,892,907
+491,273,431,135,161,192,930,484,167,361,396,197,247,830,938,454,939,363,605,931
+339,888,500,830,328,630,629,750,273,300,279,603,562,103,57,277,127,342,309,306
+733,68,884,341,650,602,804,656,307,891,551,789,201,485,185,488,69,188,183,600
+525,601,168,649,235,519,922,453,130,193,87,105,529,943,799,880,898,788,320,56
+822,164,814,195,519,700,546,896,595,94,916,492,457,745,491,919,597,278,67,894
+703,310,529,551,898,564,857,924,915,538,530,61,529,788,920,819,730,314,493,699
+497,337,168,443,698,502,911,496,700,800,814,905,422,62,493,202,881,820,430,891
+185,794,689,155,191,797,131,103,163,91,897,602,902,154,520,927,686,447,364,277
+927,607,746,440,322,752,202,596,427,101,194,22,346,630,127,128,752,947,561,508
+159,513,441,763,644,856,146,698,527,595,239,439,178,918,142,600,149,494,820,552
+343,557,340,70,452,655,381,883,785,137,130,908,496,653,877,894,940,791,151,433
+169,586,177,757,332,717,367,540,826,536,815,750,542,800,520,792,831,364,324,902
+935,516,687,946,99,337,447,625,936,422,351,518,79,661,149,826,184,457,73,434
+744,289,881,568,484,703,640,334,520,917,828,133,199,328,304,137,345,370,560,439
+804,487,367,273,67,239,739,587,892,697,158,508,929,143,523,909,418,637,184,135
+297,627,931,235,828,324,941,586,703,520,934,634,423,439,941,158,67,180,883,902
+432,155,443,557,254,311,340,450,807,239,277,243,628,817,789,689,591,554,696,517
+307,73,278,429,881,197,328,792,900,918,882,332,105,740,58,758,933,195,92,81
+697,759,167,816,537,430,875,444,790,943,498,649,144,525,655,359,463,909,324,573
+370,883,875,67,428,97,206,143,518,124,920,513,439,201,918,179,791,176,650,641
+792,63,139,564,738,520,175,520,365,591,694,932,631,249,887,438,103,946,174,98
+945,909,559,597,605,270,928,692,881,149,366,571,703,754,784,744,572,898,495,162
+754,316,191,157,704,153,111,551,883,535,362,800,925,130,929,949,425,686,91,923
+551,440,753,714,104,749,691,445,143,340,427,555,277,167,758,606,300,305,314,302
+433,604,649,372,751,889,568,305,654,160,194,536,921,930,573,337,230,552,303,817
+568,926,140,332,144,183,724,924,313,935,132,935,795,535,798,823,146,201,591,233
+351,605,724,662,56,704,443,562,896,787,347,234,793,816,494,561,659,898,552,454
+857,893,188,127,184,93,562,795,125,490,54,243,361,943,276,348,988,818,103,540
+308,787,793,232,426,273,704,397,740,907,830,311,126,100,985,542,628,636,157,485
+650,551,594,909,534,514,277,554,745,432,569,494,582,230,590,922,750,562,126,311
+814,904,444,204,821,160,492,205,324,489,792,912,699,454,828,341,983,275,830,187
+637,924,804,175,948,515,211,604,624,827,746,820,798,742,485,451,785,488,184,100
+153,208,199,827,200,56,530,185,655,821,177,700,148,170,535,337,707,900,343,521
+192,878,310,319,922,133,898,368,794,804,898,96,311,622,787,894,564,690,589,942
+242,899,820,143,58,623,811,52,661,342,702,562,878,146,538,510,307,206,795,900
+928,893,947,827,895,161,275,266,99,338,882,930,227,445,129,50,192,626,337,906
+756,554,564,101,96,287,198,800,192,92,798,639,687,878,932,321,785,694,153,631
+789,743,557,565,915,188,481,740,538,422,159,625,70,270,660,143,139,695,523,701
+437,657,397,336,698,592,329,175,452,913,492,816,492,478,313,923,915,181,819,645
+926,248,489,490,180,526,273,91,819,515,742,875,65,875,62,307,439,930,701,442
+787,892,816,592,332,299,331,786,151,547,161,755,798,95,572,235,499,567,644,311
+754,125,490,559,71,553,514,279,397,437,929,5,204,327,228,132,234,340,560,633
+913,87,426,522,242,240,184,193,708,750,510,558,697,103,151,651,625,332,948,571
+300,427,555,241,423,949,59,230,339,590,685,806,647,914,100,630,544,213,71,100
+755,343,926,350,822,445,943,693,932,200,905,97,129,664,159,916,251,450,557,589
+698,54,529,201,71,55,693,187,488,24,607,915,456,448,179,489,454,160,876,545
+437,756,54,565,445,901,194,206,945,821,349,59,696,496,902,532,166,160,633,150
+101,177,158,698,165,928,572,364,60,545,547,554,706,350,319,200,95,97,327,697
+51,68,223,67,883,827,533,432,949,643,497,906,519,66,312,593,188,97,635,66
+306,98,918,128,664,184,428,140,181,492,758,325,291,922,590,441,231,878,562,789
+468,541,235,433,334,946,192,97,449,940,168,61,495,155,560,639,657,825,587,948
+451,541,754,99,586,534,692,19,132,758,441,366,929,531,420,690,633,876,178,532
+553,331,320,193,887,433,104,817,241,374,91,700,708,498,269,708,151,269,635,739
+630,824,178,166,829,645,68,339,397,747,103,132,857,243,596,204,690,97,898,335
+550,741,634,426,58,381,934,363,456,895,345,487,898,703,99,906,528,498,635,360
+907,934,498,698,793,810,691,275,423,238,313,438,575,425,141,563,322,884,135,201
+14,330,588,105,146,173,309,897,59,176,334,891,785,656,492,315,571,426,104,795
+153,876,887,321,657,931,855,510,362,333,556,92,64,591,180,641,54,179,931,910
+361,328,275,565,359,532,894,133,61,567,701,632,470,67,509,806,626,747,911,271
+2,198,322,698,608,447,817,454,532,68,888,540,690,447,434,921,949,705,946,97
+182,361,485,348,368,922,52,799,433,187,298,369,238,168,693,797,156,631,200,936
+754,553,559,545,685,191,490,634,589,539,392,879,128,105,701,509,549,815,511,687
+882,564,261,156,564,655,455,908,739,359,137,516,485,426,904,933,597,307,349,660
+419,896,64,802,443,543,804,300,746,914,793,593,426,314,489,803,929,743,275,59
+171,636,681,93,927,315,520,587,168,694,50,130,333,441,795,628,702,202,68,920
+139,738,164,895,128,344,806,653,438,887,136,939,351,458,361,239,746,102,510,594
+921,911,367,799,548,897,51,122,366,934,929,229,625,157,685,945,130,513,916,367
+947,195,626,827,707,535,439,700,707,326,657,455,109,179,147,450,599,96,690,159
+438,95,521,520,937,226,794,364,522,127,883,645,424,423,524,704,312,917,1,344
+947,635,455,738,814,740,422,450,793,138,519,988,232,947,792,64,426,65,663,428
+840,367,447,188,909,333,130,245,927,241,73,315,574,173,229,325,273,508,878,689
+882,143,361,90,309,447,909,929,330,234,509,363,743,50,931,756,336,603,516,332
+129,829,154,143,646,350,105,155,524,443,171,65,338,345,336,742,302,644,982,688
+575,739,805,347,944,747,308,509,686,569,928,203,757,92,436,912,822,281,205,808
+744,710,565,141,237,67,694,569,147,434,664,949,700,528,820,623,337,597,68,340
+719,185,486,550,369,316,831,175,420,632,490,629,899,364,912,485,923,657,61,646
+885,276,511,745,789,313,400,545,573,708,687,650,72,692,876,625,202,823,750,608
+74,930,695,875,635,608,335,658,642,689,227,657,743,16,896,142,944,795,167,525
+423,831,603,795,452,351,794,238,857,97,606,360,735,426,426,895,931,336,514,315
+902,227,487,754,520,177,98,191,316,332,745,738,502,645,828,240,148,826,703,541
+136,173,317,265,640,348,653,894,75,686,563,125,949,443,641,183,634,104,650,334
+191,628,943,661,808,657,645,160,316,148,316,637,166,606,652,344,277,943,565,448
+370,949,693,569,147,938,204,926,796,700,880,437,328,891,172,308,5,100,635,145
+498,304,533,453,446,52,184,310,634,527,933,59,405,913,650,624,545,521,59,446
+451,14,454,313,143,799,643,784,485,690,651,58,565,938,330,742,300,756,193,556
+799,103,882,650,785,603,820,317,636,453,111,593,626,902,630,795,638,928,534,527
+303,134,527,820,145,127,548,825,200,232,801,573,594,598,920,456,925,723,593,341
+829,540,461,605,702,534,785,237,587,155,635,143,176,489,930,205,126,705,228,320
+915,144,484,559,142,804,158,76,237,335,921,660,531,370,194,457,891,660,627,508
+426,239,910,745,557,805,435,154,431,795,528,856,989,539,206,346,659,231,182,326
+54,893,815,195,567,142,940,452,628,638,533,319,936,760,547,425,569,695,749,818
+663,157,244,699,323,129,489,510,93,100,143,821,72,543,549,172,335,648,165,228
+597,426,936,829,799,315,787,148,98,259,913,497,200,326,344,641,276,278,201,822
+250,941,689,157,312,639,631,588,572,902,632,334,311,226,921,522,647,240,566,820
+746,928,535,791,342,51,931,167,637,935,155,655,848,831,926,342,881,882,126,136
+437,792,745,628,556,69,91,893,161,436,64,877,186,436,533,679,423,184,552,170
+147,192,755,556,570,199,181,642,103,128,125,549,593,741,934,202,984,435,101,308
+275,948,568,340,538,947,338,156,541,487,334,336,219,561,738,365,530,188,624,422
+531,397,664,617,908,57,93,171,149,364,598,148,875,818,199,823,455,128,328,820
+193,489,794,169,159,365,76,803,75,484,915,634,276,330,229,421,156,98,587,456
+324,159,6,66,237,458,489,167,887,155,530,934,321,53,226,97,748,605,359,179
+744,596,339,431,759,453,889,456,441,130,12,485,927,877,498,561,746,545,457,300
+944,194,517,587,426,489,129,96,136,885,801,788,554,157,457,538,615,154,527,428
+628,485,820,803,883,203,888,599,204,794,784,564,245,692,606,288,327,906,434,146
+510,314,660,644,698,568,262,351,359,513,946,361,657,607,56,310,351,884,624,498
+798,928,439,531,555,159,4,331,742,75,931,790,532,822,425,792,144,196,305,902
+786,751,749,893,808,91,190,445,944,877,921,887,686,165,97,820,135,234,337,662
+829,925,635,819,559,748,205,594,803,71,791,319,449,937,203,132,71,386,62,520
+892,226,631,900,803,172,203,305,495,397,143,175,328,194,72,171,588,130,722,320
+301,518,630,913,143,548,226,132,184,448,304,229,662,231,608,763,245,906,828,437
+453,273,189,550,269,600,441,703,125,299,631,759,436,321,882,125,644,263,815,426
+787,879,590,455,154,203,74,95,334,359,559,314,552,319,513,454,24,299,364,656
+429,437,322,739,827,230,168,197,708,701,186,441,749,312,635,856,445,777,902,635
+946,4,831,146,508,326,450,206,492,662,69,98,897,650,658,547,333,889,197,129
+300,917,642,791,661,825,306,450,278,237,940,943,188,158,138,713,630,946,550,817
+511,340,588,630,545,554,359,443,269,824,325,639,752,829,128,423,493,936,787,123
+928,92,807,754,161,280,317,337,877,493,299,546,940,802,820,877,716,143,707,902
+207,424,789,178,179,552,707,785,275,233,455,598,887,68,921,641,522,754,432,738
+514,116,60,191,534,633,598,427,327,369,341,54,130,599,347,572,707,337,102,232
+807,530,347,364,543,330,695,93,901,190,333,603,615,57,648,697,449,320,592,822
+878,696,303,298,892,366,697,234,754,186,443,572,488,188,172,700,443,935,927,183
+495,147,901,788,647,197,171,925,745,919,701,941,73,568,542,390,429,912,529,131
+800,696,330,793,655,914,59,180,447,816,50,321,806,917,58,51,78,900,430,881
+166,808,924,185,139,428,64,888,659,151,519,336,277,194,91,484,875,488,526,363
+875,172,904,364,919,794,926,236,915,816,816,135,909,118,595,750,530,925,656,193
+807,379,919,57,440,741,931,426,307,757,487,940,487,362,485,195,226,623,323,493
+206,789,424,130,573,831,355,945,60,658,790,368,931,944,548,534,757,942,341,486
+948,280,664,190,126,560,436,885,571,893,550,785,68,281,159,889,881,312,942,705
+557,542,818,697,913,351,635,130,801,930,66,946,351,230,170,260,508,93,438,903
+890,570,314,658,785,245,882,510,325,636,929,322,337,710,923,451,303,550,187,458
+891,790,943,449,689,549,519,588,2,443,304,160,556,240,553,75,320,275,436,572
+56,946,556,623,142,930,875,318,686,285,454,562,637,935,152,902,496,704,97,917
+637,102,294,643,179,522,493,442,546,453,884,185,351,652,178,206,129,341,931,168
+522,626,821,308,198,547,637,792,984,827,693,456,596,330,73,204,646,234,698,149
+198,327,324,564,815,904,947,702,798,70,203,758,233,129,647,96,880,269,2,904
+682,420,455,944,928,168,368,943,947,273,940,556,552,424,924,135,346,324,56,561
+508,101,190,526,934,622,945,925,341,159,586,549,180,703,437,820,65,368,635,396
+748,787,876,487,158,589,169,653,905,334,631,637,329,270,338,615,625,324,238,228
+183,803,751,563,206,204,320,876,13,949,594,647,568,317,750,628,877,155,546,880
+90,818,606,509,636,172,59,599,818,498,435,229,234,801,904,168,802,315,567,458
+522,327,105,857,186,641,131,234,821,154,817,887,718,608,232,140,566,598,804,485
+645,744,827,913,103,602,229,525,569,187,544,163,370,793,450,925,245,510,68,738
+932,365,93,115,147,237,654,137,50,913,485,92,458,787,342,174,898,58,817,910
+315,488,205,645,638,699,235,364,663,74,687,597,771,749,896,631,139,532,897,550
+145,130,336,914,322,76,492,338,359,798,536,64,361,509,917,370,95,586,934,935
+525,544,796,226,96,572,367,916,652,71,634,745,161,998,591,942,547,344,227,626
+794,806,486,897,231,361,808,739,183,370,227,192,69,136,560,439,887,109,269,331
+496,928,270,550,800,179,788,646,197,789,906,511,640,550,904,227,592,81,895,92
+396,334,738,230,104,929,502,137,302,440,927,175,449,169,304,451,421,559,901,513
+899,187,303,161,608,545,638,160,496,537,338,426,516,374,66,303,650,430,453,758
+95,991,554,932,943,95,740,276,323,190,856,697,888,270,498,595,600,786,149,454
+384,155,54,630,181,230,645,58,540,745,548,520,430,935,155,755,171,571,592,892
+892,695,529,937,330,605,60,901,520,539,553,330,205,588,538,472,689,753,934,423
+53,195,67,817,21,625,543,912,368,945,509,183,425,486,367,922,156,829,755,793
+271,337,271,229,827,947,313,163,548,278,823,186,687,747,59,328,149,897,926,892
diff --git a/src/adventofcode2020/solutions/day16.py b/src/adventofcode2020/solutions/day16.py
new file mode 100644
index 00000000..c1c787f8
--- /dev/null
+++ b/src/adventofcode2020/solutions/day16.py
@@ -0,0 +1,53 @@
+import re
+from typing import NamedTuple
+
+from adventofcode2020.utils.abstract import FileReaderSolution
+
+
+class Ticket(NamedTuple):
+    rule: str
+    upper_range_1: int
+    lower_range_1: int
+    upper_range_2: int
+    lower_range_2: int
+
+    @staticmethod
+    def parse_input(rule: str) -> "Ticket":
+        """
+        Parse input, for example:
+        departure track: 37-608 or 623-964
+        """
+        regex = r"^(.*): (\d*)-(\d*) or (\d*)-(\d*)"
+        results = re.match(regex, rule)
+
+        return Ticket(
+            rule=results[1],
+            lower_range_1=int(results[2]),
+            upper_range_1=int(results[3]),
+            lower_range_2=int(results[4]),
+            upper_range_2=int(results[5]),
+        )
+
+    def is_valid(self, number) -> bool:
+        """Is this number valid?"""
+        if (
+            self.lower_range_1 <= number <= self.upper_range_1
+            or self.lower_range_2 <= number <= self.upper_range_2
+        ):
+            return True
+        else:
+            return False
+
+
+class Day16:
+    pass
+
+
+class Day16PartA(Day16, FileReaderSolution):
+    def solve(self, input_data: str) -> int:
+        raise NotImplementedError
+
+
+class Day16PartB(Day16, FileReaderSolution):
+    def solve(self, input_data: str) -> int:
+        raise NotImplementedError
diff --git a/tests/solutions/test_day16_a.py b/tests/solutions/test_day16_a.py
new file mode 100644
index 00000000..ac56db16
--- /dev/null
+++ b/tests/solutions/test_day16_a.py
@@ -0,0 +1,27 @@
+import pytest
+
+from adventofcode2020.solutions.day16 import Day16PartA, Ticket
+
+
+class TestDay16PartA:
+    def test_ticket_range(self):
+        ticket = Ticket.parse_input("class: 1-3 or 5-7")
+
+        assert ticket.rule == "class"
+        assert ticket.is_valid(1)
+        assert ticket.is_valid(2)
+        assert ticket.is_valid(3)
+        assert not ticket.is_valid(4)
+        assert ticket.is_valid(5)
+
+    @pytest.mark.parametrize(("input_data", "expected_result"), [("", ""), ("", "")])
+    def test_day16a_solve(self, input_data, expected_result):
+        solution = Day16PartA()
+        result = solution.solve(input_data)
+        assert result == expected_result
+
+    def test_day16a_data(self):
+        """Result we got when we did the real solution"""
+        solution = Day16PartA()
+        res = solution("day_16/day16.txt")
+        assert res == 0
diff --git a/tests/solutions/test_day16_b.py b/tests/solutions/test_day16_b.py
new file mode 100644
index 00000000..103c5cc4
--- /dev/null
+++ b/tests/solutions/test_day16_b.py
@@ -0,0 +1,17 @@
+import pytest
+
+from adventofcode2020.solutions.day16 import Day16PartB
+
+
+class TestDay16PartB:
+    @pytest.mark.parametrize(("input_data", "expected_result"), [("", ""), ("", "")])
+    def test_day16b_solve(self, input_data, expected_result):
+        solution = Day16PartB()
+        result = solution.solve(input_data)
+        assert result == expected_result
+
+    def test_day16b_data(self):
+        """Result we got when we did the real solution"""
+        solution = Day16PartB()
+        res = solution("day_16/day16.txt")
+        assert res == 0

From 9386a8eed738c057a1fed8086a62ee94b4f1f26d Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 17 Nov 2021 04:07:34 +0000
Subject: [PATCH 025/371] Bump black from 21.10b0 to 21.11b0

Bumps [black](https://github.com/psf/black) from 21.10b0 to 21.11b0.
- [Release notes](https://github.com/psf/black/releases)
- [Changelog](https://github.com/psf/black/blob/main/CHANGES.md)
- [Commits](https://github.com/psf/black/commits)

---
updated-dependencies:
- dependency-name: black
  dependency-type: direct:development
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 poetry.lock    | 8 ++++----
 pyproject.toml | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/poetry.lock b/poetry.lock
index 4f7c0a49..6743556d 100644
--- a/poetry.lock
+++ b/poetry.lock
@@ -86,7 +86,7 @@ chardet = ">=3.0.2"
 
 [[package]]
 name = "black"
-version = "21.10b0"
+version = "21.11b0"
 description = "The uncompromising code formatter."
 category = "dev"
 optional = false
@@ -732,7 +732,7 @@ testing = ["coverage (>=4)", "coverage-enable-subprocess (>=1)", "flaky (>=3)",
 [metadata]
 lock-version = "1.1"
 python-versions = ">=3.9,<3.11"
-content-hash = "1041cc220cd154a3d2a3f836d994da22654dc969b065c6080803699c7e3e66f2"
+content-hash = "333b2eefa38d8be218660cccc919141182d9025a63af7b978d8c88b479a8631e"
 
 [metadata.files]
 anytree = [
@@ -764,8 +764,8 @@ binaryornot = [
     {file = "binaryornot-0.4.4.tar.gz", hash = "sha256:359501dfc9d40632edc9fac890e19542db1a287bbcfa58175b66658392018061"},
 ]
 black = [
-    {file = "black-21.10b0-py3-none-any.whl", hash = "sha256:6eb7448da9143ee65b856a5f3676b7dda98ad9abe0f87fce8c59291f15e82a5b"},
-    {file = "black-21.10b0.tar.gz", hash = "sha256:a9952229092e325fe5f3dae56d81f639b23f7131eb840781947e4b2886030f33"},
+    {file = "black-21.11b0-py3-none-any.whl", hash = "sha256:0b1f66cbfadcd332ceeaeecf6373d9991d451868d2e2219ad0ac1213fb701117"},
+    {file = "black-21.11b0.tar.gz", hash = "sha256:83f3852301c8dcb229e9c444dd79f573c8d31c7c2dad9bbaaa94c808630e32aa"},
 ]
 certifi = [
     {file = "certifi-2021.10.8-py2.py3-none-any.whl", hash = "sha256:d62a0163eb4c2344ac042ab2bdf75399a71a2d8c7d47eac2e2ee91b9d6339569"},
diff --git a/pyproject.toml b/pyproject.toml
index 280dc172..1e630778 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -16,7 +16,7 @@ requests = "^2.26.0"
 beautifulsoup4 = "^4.10.0"
 
 [tool.poetry.dev-dependencies]
-black = "^21.10b0"
+black = "^21.11b0"
 cookiecutter = "^1.7.3"
 pytest = "^6.2.5"
 pytest-cov = "^3.0.0"

From 1e082ef1da82a148be92ab55dc2ec646d950cd7c Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 17 Nov 2021 05:40:38 +0000
Subject: [PATCH 026/371] Bump matplotlib from 3.5.0rc1 to 3.5.0

Bumps [matplotlib](https://github.com/matplotlib/matplotlib) from 3.5.0rc1 to 3.5.0.
- [Release notes](https://github.com/matplotlib/matplotlib/releases)
- [Commits](https://github.com/matplotlib/matplotlib/compare/v3.5.0rc1...v3.5.0)

---
updated-dependencies:
- dependency-name: matplotlib
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 poetry.lock    | 70 ++++++++++++++++++++++++++------------------------
 pyproject.toml |  2 +-
 2 files changed, 38 insertions(+), 34 deletions(-)

diff --git a/poetry.lock b/poetry.lock
index 6743556d..55979226 100644
--- a/poetry.lock
+++ b/poetry.lock
@@ -328,7 +328,7 @@ python-versions = ">=3.6"
 
 [[package]]
 name = "matplotlib"
-version = "3.5.0rc1"
+version = "3.5.0"
 description = "Python plotting package"
 category = "main"
 optional = false
@@ -732,7 +732,7 @@ testing = ["coverage (>=4)", "coverage-enable-subprocess (>=1)", "flaky (>=3)",
 [metadata]
 lock-version = "1.1"
 python-versions = ">=3.9,<3.11"
-content-hash = "333b2eefa38d8be218660cccc919141182d9025a63af7b978d8c88b479a8631e"
+content-hash = "100af27b825f3eb1dd5d3d49696ed4d9412617fb665ecb95f69285d3163754a9"
 
 [metadata.files]
 anytree = [
@@ -1002,37 +1002,41 @@ markupsafe = [
     {file = "MarkupSafe-2.0.1.tar.gz", hash = "sha256:594c67807fb16238b30c44bdf74f36c02cdf22d1c8cda91ef8a0ed8dabf5620a"},
 ]
 matplotlib = [
-    {file = "matplotlib-3.5.0rc1-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:2304ed74bac2e42ce855bae10ee8df50037ccfa8f3219d2a14d12d884aef35bf"},
-    {file = "matplotlib-3.5.0rc1-cp310-cp310-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:0c9796b7d7c2d8369596cc1b831b354a31bbbbebc9fd6d0cdaed57772258e752"},
-    {file = "matplotlib-3.5.0rc1-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:6bf9a9b7f11911f38ada0619f752b030a3f7cfeb191207baddf3ba59d8eaf354"},
-    {file = "matplotlib-3.5.0rc1-cp310-cp310-win32.whl", hash = "sha256:76a992ad48c51b1161baa210dc9dd9859162000512ca7f62c13b793f583fa752"},
-    {file = "matplotlib-3.5.0rc1-cp310-cp310-win_amd64.whl", hash = "sha256:0deaf6dd1eb86bc14ae9b973dae75597307fcf13646bab9aa1dd36ce371a7739"},
-    {file = "matplotlib-3.5.0rc1-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:00d469bed4903cc614fb76c7eabaf4846a26ae6b97f66dac455a49cb466dc22d"},
-    {file = "matplotlib-3.5.0rc1-cp37-cp37m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:cca24b40748dd1f2228134b29f12db824ed1559831a47be3fd139aade6c67afb"},
-    {file = "matplotlib-3.5.0rc1-cp37-cp37m-manylinux_2_5_i686.manylinux1_i686.whl", hash = "sha256:2f0c242d1b81f399d9019be4d6814cf73a2aee0ccb75e2ce6694341948663f3a"},
-    {file = "matplotlib-3.5.0rc1-cp37-cp37m-manylinux_2_5_x86_64.manylinux1_x86_64.whl", hash = "sha256:b0cda4c634bf704f72be071b7ba3328f07fcc35bfea98ea0afb307e69c723c92"},
-    {file = "matplotlib-3.5.0rc1-cp37-cp37m-win32.whl", hash = "sha256:ab8eb6010162620c9ae1082e9cc700d4b1906663c7ffaedad9d1ccd2cdfa4c78"},
-    {file = "matplotlib-3.5.0rc1-cp37-cp37m-win_amd64.whl", hash = "sha256:9684081b91cd0bc92acb4ac5b82c05b5d5da3fb4105793cbbcc06fc9b53ddea3"},
-    {file = "matplotlib-3.5.0rc1-cp38-cp38-macosx_10_9_universal2.whl", hash = "sha256:dedb66611175dbec03de5788c03b88b08c48ddb67fcda090dd6b5069aa295ae2"},
-    {file = "matplotlib-3.5.0rc1-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:a2bda16b30c166d91b5186efa17b783862ac43b77a79be3aa52dd9bd8c399668"},
-    {file = "matplotlib-3.5.0rc1-cp38-cp38-macosx_11_0_arm64.whl", hash = "sha256:0a032584a62835c2a4d0949ed6e0287e531d92dd37de86f11f2b5c691cbf22a9"},
-    {file = "matplotlib-3.5.0rc1-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:282eaa1250322304778e3e2caf3055699cc17ee3bb72cbc5218abb8834c19afe"},
-    {file = "matplotlib-3.5.0rc1-cp38-cp38-manylinux_2_5_i686.manylinux1_i686.whl", hash = "sha256:faf0bbc742d51064cd028095d95c352b7a024c77eac6b88a15070464aaa9bee3"},
-    {file = "matplotlib-3.5.0rc1-cp38-cp38-manylinux_2_5_x86_64.manylinux1_x86_64.whl", hash = "sha256:fe2a594b65b5f2c8ec3d5211b9fd5ba290f3ed931aec93cd42bf14087d400e99"},
-    {file = "matplotlib-3.5.0rc1-cp38-cp38-win32.whl", hash = "sha256:9d7c1aff047f85f856f9889ac6daf096f8df9e73b12f025d00ef5615fe252d59"},
-    {file = "matplotlib-3.5.0rc1-cp38-cp38-win_amd64.whl", hash = "sha256:1d70aa938e75ae527e828a21d1fde5d020287329240b9d88c0f919b2dcd13b91"},
-    {file = "matplotlib-3.5.0rc1-cp39-cp39-macosx_10_9_universal2.whl", hash = "sha256:0a516408a46c9c241cf4768ddef0e3c44e7f1ccb3977e11266f3e4a0494d5027"},
-    {file = "matplotlib-3.5.0rc1-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:54d8ebf4cf75e84aeb280f27e564c9dc5520e7c3e31b41fa10efb99d1cd46d82"},
-    {file = "matplotlib-3.5.0rc1-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:7180977b113ab24f9676cac38e04dd6fc615678127f1399baa184a3f92f2f252"},
-    {file = "matplotlib-3.5.0rc1-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:78391a9d47d1880265726aecfbc9ad7c96bd7f67979f4e4b0e99012152a9d430"},
-    {file = "matplotlib-3.5.0rc1-cp39-cp39-manylinux_2_5_i686.manylinux1_i686.whl", hash = "sha256:877c3c09527d7c2c09fec87303fd1d8167418c5a29a7fd06fa2ef8aa02c9aa0d"},
-    {file = "matplotlib-3.5.0rc1-cp39-cp39-manylinux_2_5_x86_64.manylinux1_x86_64.whl", hash = "sha256:0a8f71944ec1b7e053d6a5c95589eb50becfb60099ed6f5435ce5e72dc3357f2"},
-    {file = "matplotlib-3.5.0rc1-cp39-cp39-win32.whl", hash = "sha256:06161e27ab0cf20004596e60b7305f12c451ea37dffc8d6fb902c53f5419af67"},
-    {file = "matplotlib-3.5.0rc1-cp39-cp39-win_amd64.whl", hash = "sha256:6dcc0010abbc2c46391517907463aeab9facfe2fe32001b065517a1f60f64ca3"},
-    {file = "matplotlib-3.5.0rc1-pp37-pypy37_pp73-macosx_10_9_x86_64.whl", hash = "sha256:03fccdf87bdf91e086a095327d26b1ba4e146c4279f380e6e9391d03ff2bf86a"},
-    {file = "matplotlib-3.5.0rc1-pp37-pypy37_pp73-manylinux_2_12_i686.manylinux2010_i686.whl", hash = "sha256:1d7bee5982f00d4d6d646702200aba22b38a91064ccd9bfd85d4ff1df4c677f4"},
-    {file = "matplotlib-3.5.0rc1-pp37-pypy37_pp73-manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:a8ca7cc1c93794ed3fd55c21d47aa1765b93907a98ed2a6e2aaf51403a303f1c"},
-    {file = "matplotlib-3.5.0rc1.tar.gz", hash = "sha256:30752c0505f73167cddc3480ff6f747a557dd6a34b54b3008f47254b4d3078d0"},
+    {file = "matplotlib-3.5.0-cp310-cp310-macosx_10_9_universal2.whl", hash = "sha256:4b018ea6f26424a0852eb60eb406420d9f0d34f65736ea7bbfbb104946a66d86"},
+    {file = "matplotlib-3.5.0-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:a07ff2565da72a7b384a9e000b15b6b8270d81370af8a3531a16f6fbcee023cc"},
+    {file = "matplotlib-3.5.0-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:2eea16883aa7724c95eea0eb473ab585c6cf66f0e28f7f13e63deb38f4fd6d0f"},
+    {file = "matplotlib-3.5.0-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:0e020a42f3338823a393dd2f80e39a2c07b9f941dfe2c778eb104eeb33d60bb5"},
+    {file = "matplotlib-3.5.0-cp310-cp310-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:9bac8eb1eccef540d7f4e844b6313d9f7722efd48c07e1b4bfec1056132127fd"},
+    {file = "matplotlib-3.5.0-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:7a7cb59ebd63a8ac4542ec1c61dd08724f82ec3aa7bb6b4b9e212d43c611ce3d"},
+    {file = "matplotlib-3.5.0-cp310-cp310-win32.whl", hash = "sha256:6e0e6b2111165522ad336705499b1f968c34a9e84d05d498ee5af0b5697d1efe"},
+    {file = "matplotlib-3.5.0-cp310-cp310-win_amd64.whl", hash = "sha256:ff5d9fe518ad2de14ce82ab906b6ab5c2b0c7f4f984400ff8a7a905daa580a0a"},
+    {file = "matplotlib-3.5.0-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:66b172610db0ececebebb09d146f54205f87c7b841454e408fba854764f91bdd"},
+    {file = "matplotlib-3.5.0-cp37-cp37m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:ee3d9ff16d749a9aa521bd7d86f0dbf256b2d2ac8ce31b19e4d2c86d2f2ff0b6"},
+    {file = "matplotlib-3.5.0-cp37-cp37m-manylinux_2_5_i686.manylinux1_i686.whl", hash = "sha256:970aa97297537540369d05fe0fd1bb952593f9ab696c9b427c06990a83e2418b"},
+    {file = "matplotlib-3.5.0-cp37-cp37m-manylinux_2_5_x86_64.manylinux1_x86_64.whl", hash = "sha256:153a0cf6a6ff4f406a0600d2034710c49988bacc6313d193b32716f98a697580"},
+    {file = "matplotlib-3.5.0-cp37-cp37m-win32.whl", hash = "sha256:6db02c5605f063b67780f4d5753476b6a4944343284aa4e93c5e8ff6e9ec7f76"},
+    {file = "matplotlib-3.5.0-cp37-cp37m-win_amd64.whl", hash = "sha256:df0042cab69f4d246f4cb8fc297770ac4ae6ec2983f61836b04a117722037dcd"},
+    {file = "matplotlib-3.5.0-cp38-cp38-macosx_10_9_universal2.whl", hash = "sha256:a7bf8b05c214d32fb7ca7c001fde70b9b426378e897b0adbf77b85ea3569d56a"},
+    {file = "matplotlib-3.5.0-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:0abf8b51cc6d3ba34d1b15b26e329f23879848a0cf1216954c1f432ffc7e1af7"},
+    {file = "matplotlib-3.5.0-cp38-cp38-macosx_11_0_arm64.whl", hash = "sha256:13930a0c9bec0fd25f43c448b047a21af1353328b946f044a8fc3be077c6b1a8"},
+    {file = "matplotlib-3.5.0-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:18f6e52386300db5cc4d1e9019ad9da2e80658bab018834d963ebb0aa5355095"},
+    {file = "matplotlib-3.5.0-cp38-cp38-manylinux_2_5_i686.manylinux1_i686.whl", hash = "sha256:ba107add08e12600b072cf3c47aaa1ab85dd4d3c48107a5d3377d1bf80f8b235"},
+    {file = "matplotlib-3.5.0-cp38-cp38-manylinux_2_5_x86_64.manylinux1_x86_64.whl", hash = "sha256:2089b9014792dcc87bb1d620cde847913338abf7d957ef05587382b0cb76d44e"},
+    {file = "matplotlib-3.5.0-cp38-cp38-win32.whl", hash = "sha256:f23fbf70d2e80f4e03a83fc1206a8306d9bc50482fee4239f10676ce7e470c83"},
+    {file = "matplotlib-3.5.0-cp38-cp38-win_amd64.whl", hash = "sha256:71a1851111f23f82fc43d2b6b2bfdd3f760579a664ebc939576fe21cc6133d01"},
+    {file = "matplotlib-3.5.0-cp39-cp39-macosx_10_9_universal2.whl", hash = "sha256:d092b7ba63182d2dd427904e3eb58dd5c46ec67c5968de14a4b5007010a3a4cc"},
+    {file = "matplotlib-3.5.0-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:ac17a7e7b06ee426a4989f0b7f24ab1a592e39cdf56353a90f4e998bc0bf44d6"},
+    {file = "matplotlib-3.5.0-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:a5b62d1805cc83d755972033c05cea78a1e177a159fc84da5c9c4ab6303ccbd9"},
+    {file = "matplotlib-3.5.0-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:666d717a4798eb9c5d3ae83fe80c7bc6ed696b93e879cb01cb24a74155c73612"},
+    {file = "matplotlib-3.5.0-cp39-cp39-manylinux_2_5_i686.manylinux1_i686.whl", hash = "sha256:65f877882b7ddede7090c7d87be27a0f4720fe7fc6fddd4409c06e1aa0f1ae8d"},
+    {file = "matplotlib-3.5.0-cp39-cp39-manylinux_2_5_x86_64.manylinux1_x86_64.whl", hash = "sha256:7baf23adb698d8c6ca7339c9dde00931bc47b2dd82fa912827fef9f93db77f5e"},
+    {file = "matplotlib-3.5.0-cp39-cp39-win32.whl", hash = "sha256:b3b687e905da32e5f2e5f16efa713f5d1fcd9fb8b8c697895de35c91fedeb086"},
+    {file = "matplotlib-3.5.0-cp39-cp39-win_amd64.whl", hash = "sha256:a6cef5b31e27c31253c0f852b629a38d550ae66ec6850129c49d872f9ee428cb"},
+    {file = "matplotlib-3.5.0-pp37-pypy37_pp73-macosx_10_9_x86_64.whl", hash = "sha256:a0dcaf5648cecddc328e81a0421821a1f65a1d517b20746c94a1f0f5c36fb51a"},
+    {file = "matplotlib-3.5.0-pp37-pypy37_pp73-manylinux_2_12_i686.manylinux2010_i686.whl", hash = "sha256:b5e439d9e55d645f2a4dca63e2f66d68fe974c405053b132d61c7e98c25dfeb2"},
+    {file = "matplotlib-3.5.0-pp37-pypy37_pp73-manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:dc8c5c23e7056e126275dbf29efba817b3d94196690930d0968873ac3a94ab82"},
+    {file = "matplotlib-3.5.0-pp37-pypy37_pp73-win_amd64.whl", hash = "sha256:a0ea10faa3bab0714d3a19c7e0921279a68d57552414d6eceaea99f97d7735db"},
+    {file = "matplotlib-3.5.0.tar.gz", hash = "sha256:38892a254420d95594285077276162a5e9e9c30b6da08bdc2a4d53331ad9a6fa"},
 ]
 mypy-extensions = [
     {file = "mypy_extensions-0.4.3-py2.py3-none-any.whl", hash = "sha256:090fedd75945a69ae91ce1303b5824f428daf5a028d2f6ab8a299250a846f15d"},
diff --git a/pyproject.toml b/pyproject.toml
index 1e630778..8c8dbf34 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -9,7 +9,7 @@ license = "MIT License"
 python = ">=3.9,<3.11"
 anytree = "^2.8.0"
 click = "^8.0.3"
-matplotlib = "3.5.0rc1"
+matplotlib = "3.5.0"
 numpy = "^1.21.4"
 tqdm = "^4.62.3"
 requests = "^2.26.0"

From 724fe01500e429fb86480eca50ba95a2a72af5ba Mon Sep 17 00:00:00 2001
From: Roel Adriaans <roel@adriaans.org>
Date: Wed, 17 Nov 2021 20:08:00 +0100
Subject: [PATCH 027/371] Solution day 16, part 1

---
 src/adventofcode2020/solutions/day16.py | 31 ++++++++++++++++++++++---
 tests/solutions/test_day16_a.py         | 24 +++++++++++++------
 2 files changed, 45 insertions(+), 10 deletions(-)

diff --git a/src/adventofcode2020/solutions/day16.py b/src/adventofcode2020/solutions/day16.py
index c1c787f8..f45ada7b 100644
--- a/src/adventofcode2020/solutions/day16.py
+++ b/src/adventofcode2020/solutions/day16.py
@@ -1,5 +1,5 @@
 import re
-from typing import NamedTuple
+from typing import List, NamedTuple
 
 from adventofcode2020.utils.abstract import FileReaderSolution
 
@@ -40,12 +40,37 @@ def is_valid(self, number) -> bool:
 
 
 class Day16:
-    pass
+    ticket_rules: List[Ticket]
+    my_tickets: List[int]
+    nearby_tickets: List[List[int]]
+
+    def parse(self, input_data):
+        rules, my_tickets, nearby = input_data.split("\n\n")
+        self.ticket_rules = [
+            Ticket.parse_input(rule) for rule in rules.split("\n") if rule
+        ]
+        self.my_tickets = [
+            int(ticket) for ticket in my_tickets.split("\n")[1].split(",")
+        ]
+
+        rows = [row.split(",") for row in nearby.split("\n")[1:] if row]
+
+        self.nearby_tickets = []
+        for row in rows:
+            self.nearby_tickets.append([int(x) for x in row])
 
 
 class Day16PartA(Day16, FileReaderSolution):
     def solve(self, input_data: str) -> int:
-        raise NotImplementedError
+        self.parse(input_data)
+        numbers = [val for sublist in self.nearby_tickets for val in sublist]
+        error = []
+        for number in numbers:
+            valids = [rule.is_valid(number) for rule in self.ticket_rules]
+            if not any(valids):
+                error.append(number)
+
+        return sum(error)
 
 
 class Day16PartB(Day16, FileReaderSolution):
diff --git a/tests/solutions/test_day16_a.py b/tests/solutions/test_day16_a.py
index ac56db16..0576e8be 100644
--- a/tests/solutions/test_day16_a.py
+++ b/tests/solutions/test_day16_a.py
@@ -1,5 +1,3 @@
-import pytest
-
 from adventofcode2020.solutions.day16 import Day16PartA, Ticket
 
 
@@ -14,14 +12,26 @@ def test_ticket_range(self):
         assert not ticket.is_valid(4)
         assert ticket.is_valid(5)
 
-    @pytest.mark.parametrize(("input_data", "expected_result"), [("", ""), ("", "")])
-    def test_day16a_solve(self, input_data, expected_result):
+    def test_day16a_solve(self):
+        test_data = """class: 1-3 or 5-7
+row: 6-11 or 33-44
+seat: 13-40 or 45-50
+
+your ticket:
+7,1,14
+
+nearby tickets:
+7,3,47
+40,4,50
+55,2,20
+38,6,12
+"""
         solution = Day16PartA()
-        result = solution.solve(input_data)
-        assert result == expected_result
+        result = solution.solve(test_data)
+        assert result == 71
 
     def test_day16a_data(self):
         """Result we got when we did the real solution"""
         solution = Day16PartA()
         res = solution("day_16/day16.txt")
-        assert res == 0
+        assert res == 20048

From f1eb2229bd4e1b24442c5263fa75cfdcb8953f86 Mon Sep 17 00:00:00 2001
From: Roel Adriaans <roel@adriaans.org>
Date: Wed, 17 Nov 2021 22:30:50 +0100
Subject: [PATCH 028/371] Solve day 16 part 2.

---
 src/adventofcode2020/solutions/day16.py | 78 ++++++++++++++++++++++++-
 tests/solutions/test_day16_b.py         | 37 +++++++++---
 2 files changed, 106 insertions(+), 9 deletions(-)

diff --git a/src/adventofcode2020/solutions/day16.py b/src/adventofcode2020/solutions/day16.py
index f45ada7b..3f344039 100644
--- a/src/adventofcode2020/solutions/day16.py
+++ b/src/adventofcode2020/solutions/day16.py
@@ -1,5 +1,6 @@
+import math
 import re
-from typing import List, NamedTuple
+from typing import Dict, List, NamedTuple
 
 from adventofcode2020.utils.abstract import FileReaderSolution
 
@@ -74,5 +75,78 @@ def solve(self, input_data: str) -> int:
 
 
 class Day16PartB(Day16, FileReaderSolution):
+    def remove_invalid_tickets(self):
+        """Remove the invalid tickets from self.nearby_tickets"""
+        valid_tickets = []
+        for ticket in self.nearby_tickets:
+            valids = []
+            for number in ticket:
+                valids.append(
+                    any([rule.is_valid(number) for rule in self.ticket_rules])
+                )
+            if all(valids):
+                valid_tickets.append(ticket)
+        self.nearby_tickets = valid_tickets
+
+    def compute_mapping(self) -> Dict[str, int]:
+        """Compute the mapping from all the valid tickets
+
+        We need to find the rules that we can apply here. Algorirm:
+        Create a dict aith all the options, and all the rows, eg:
+        class: 0, 1, 2
+        row:  0, 1, 2
+        seat:  0, 1, 2
+
+        Now we need to figure out from the right options.
+        So, for every ticket we seek the options:
+        Ticket 1: 3, 9, 18
+        3 -> Valid for row and seat. Delete 0 from class, no match
+        9 and 18 -> Valid for row, seat and class. Do nothing.
+
+        In the end we should end up with only one option per group.
+        """
+
+        options = {}
+        for rule in self.ticket_rules:
+            options[rule.rule] = set(range(len(self.my_tickets)))
+
+        for ticket in self.nearby_tickets:
+            for idx, number in enumerate(ticket):
+                # idx will have the option index, number will have the ticket number
+                for rule in self.ticket_rules:
+                    if not rule.is_valid(number):
+                        options[rule.rule].discard(idx)
+
+        # We now have eliminated all the options, but we have to remove the duplicates
+        # Eg in out test data:
+        # seat: 2
+        # class: 1, 2
+        # row: 0, 1, 2
+        # This ends up as seat 2, class 1, row = 0
+        # Loop for as long we have an set that is bigger then one
+        while any([len(s) > 1 for s in options.values()]):
+            for rule in options:
+                if len(options[rule]) == 1:
+                    # We have only option, remove this option from the rest of the set
+                    for remove in options:
+                        if remove != rule:
+                            options[remove].discard(list(options[rule])[0])
+        # Cleanup, remove set
+        for rule in options:
+            options[rule] = list(options[rule])[0]
+        return options
+
     def solve(self, input_data: str) -> int:
-        raise NotImplementedError
+        self.parse(input_data)
+        self.remove_invalid_tickets()
+        mapping = self.compute_mapping()
+
+        numbers = []
+        for rule in self.ticket_rules:
+            if "departure" in rule.rule:
+                index = mapping[rule.rule]
+                numbers.append(self.my_tickets[index])
+
+        # Compute the product
+        product = math.prod(numbers)
+        return product
diff --git a/tests/solutions/test_day16_b.py b/tests/solutions/test_day16_b.py
index 103c5cc4..68714b33 100644
--- a/tests/solutions/test_day16_b.py
+++ b/tests/solutions/test_day16_b.py
@@ -1,17 +1,40 @@
-import pytest
-
 from adventofcode2020.solutions.day16 import Day16PartB
 
 
 class TestDay16PartB:
-    @pytest.mark.parametrize(("input_data", "expected_result"), [("", ""), ("", "")])
-    def test_day16b_solve(self, input_data, expected_result):
+    def test_day16b_solve(self):
+        test_data = """class: 0-1 or 4-19
+row: 0-5 or 8-19
+seat: 0-13 or 16-19
+
+your ticket:
+11,12,13
+
+nearby tickets:
+3,9,18
+15,1,5
+5,14,9
+1,99,9
+"""
         solution = Day16PartB()
-        result = solution.solve(input_data)
-        assert result == expected_result
+        solution.parse(test_data)
+
+        assert len(solution.nearby_tickets) == 4
+        solution.remove_invalid_tickets()
+        assert len(solution.nearby_tickets) == 3
+
+        mapping = solution.compute_mapping()
+
+        assert mapping["class"] == 1
+        assert mapping["row"] == 0
+        assert mapping["seat"] == 2
+
+        assert solution.my_tickets[mapping["class"]] == 12
+        assert solution.my_tickets[mapping["row"]] == 11
+        assert solution.my_tickets[mapping["seat"]] == 13
 
     def test_day16b_data(self):
         """Result we got when we did the real solution"""
         solution = Day16PartB()
         res = solution("day_16/day16.txt")
-        assert res == 0
+        assert res == 4810284647569

From 82cc227d27be89cae39b3d3a9919ffbb13c106f0 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 18 Nov 2021 01:04:45 +0000
Subject: [PATCH 029/371] Bump actions/setup-python from 2.2.2 to 2.3.0

Bumps [actions/setup-python](https://github.com/actions/setup-python) from 2.2.2 to 2.3.0.
- [Release notes](https://github.com/actions/setup-python/releases)
- [Commits](https://github.com/actions/setup-python/compare/v2.2.2...v2.3.0)

---
updated-dependencies:
- dependency-name: actions/setup-python
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 .github/workflows/tox.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/tox.yml b/.github/workflows/tox.yml
index b9a4cc30..c68bbe1d 100644
--- a/.github/workflows/tox.yml
+++ b/.github/workflows/tox.yml
@@ -14,7 +14,7 @@ jobs:
     - uses: actions/checkout@v2
 
     - name: Set up Python ${{ matrix.python-version }}
-      uses: actions/setup-python@v2.2.2
+      uses: actions/setup-python@v2.3.0
       with:
         python-version: ${{ matrix.python-version }}
 

From de561aa632f9be5da8afb08e706296fc0f0a66b9 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 18 Nov 2021 04:07:58 +0000
Subject: [PATCH 030/371] Bump black from 21.11b0 to 21.11b1

Bumps [black](https://github.com/psf/black) from 21.11b0 to 21.11b1.
- [Release notes](https://github.com/psf/black/releases)
- [Changelog](https://github.com/psf/black/blob/main/CHANGES.md)
- [Commits](https://github.com/psf/black/commits)

---
updated-dependencies:
- dependency-name: black
  dependency-type: direct:development
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 poetry.lock    | 10 +++++-----
 pyproject.toml |  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/poetry.lock b/poetry.lock
index 55979226..b0113d56 100644
--- a/poetry.lock
+++ b/poetry.lock
@@ -86,7 +86,7 @@ chardet = ">=3.0.2"
 
 [[package]]
 name = "black"
-version = "21.11b0"
+version = "21.11b1"
 description = "The uncompromising code formatter."
 category = "dev"
 optional = false
@@ -97,7 +97,7 @@ click = ">=7.1.2"
 mypy-extensions = ">=0.4.3"
 pathspec = ">=0.9.0,<1"
 platformdirs = ">=2"
-regex = ">=2020.1.8"
+regex = ">=2021.4.4"
 tomli = ">=0.2.6,<2.0.0"
 typing-extensions = [
     {version = ">=3.10.0.0", markers = "python_version < \"3.10\""},
@@ -732,7 +732,7 @@ testing = ["coverage (>=4)", "coverage-enable-subprocess (>=1)", "flaky (>=3)",
 [metadata]
 lock-version = "1.1"
 python-versions = ">=3.9,<3.11"
-content-hash = "100af27b825f3eb1dd5d3d49696ed4d9412617fb665ecb95f69285d3163754a9"
+content-hash = "2ff255607ba44295aad4a47a860bfc57659312f4a8f7ce48683bddfe77906b03"
 
 [metadata.files]
 anytree = [
@@ -764,8 +764,8 @@ binaryornot = [
     {file = "binaryornot-0.4.4.tar.gz", hash = "sha256:359501dfc9d40632edc9fac890e19542db1a287bbcfa58175b66658392018061"},
 ]
 black = [
-    {file = "black-21.11b0-py3-none-any.whl", hash = "sha256:0b1f66cbfadcd332ceeaeecf6373d9991d451868d2e2219ad0ac1213fb701117"},
-    {file = "black-21.11b0.tar.gz", hash = "sha256:83f3852301c8dcb229e9c444dd79f573c8d31c7c2dad9bbaaa94c808630e32aa"},
+    {file = "black-21.11b1-py3-none-any.whl", hash = "sha256:802c6c30b637b28645b7fde282ed2569c0cd777dbe493a41b6a03c1d903f99ac"},
+    {file = "black-21.11b1.tar.gz", hash = "sha256:a042adbb18b3262faad5aff4e834ff186bb893f95ba3a8013f09de1e5569def2"},
 ]
 certifi = [
     {file = "certifi-2021.10.8-py2.py3-none-any.whl", hash = "sha256:d62a0163eb4c2344ac042ab2bdf75399a71a2d8c7d47eac2e2ee91b9d6339569"},
diff --git a/pyproject.toml b/pyproject.toml
index 8c8dbf34..1ea6ac24 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -16,7 +16,7 @@ requests = "^2.26.0"
 beautifulsoup4 = "^4.10.0"
 
 [tool.poetry.dev-dependencies]
-black = "^21.11b0"
+black = "^21.11b1"
 cookiecutter = "^1.7.3"
 pytest = "^6.2.5"
 pytest-cov = "^3.0.0"

From 05c7ddc15d917b8abe946bc3a7c1c3587072452b Mon Sep 17 00:00:00 2001
From: Roel Adriaans <roel@adriaans.org>
Date: Thu, 18 Nov 2021 16:14:40 +0100
Subject: [PATCH 031/371] Make sure the ticket line is valid

---
 src/adventofcode2020/solutions/day16.py | 3 +++
 tests/solutions/test_day16_a.py         | 6 ++++++
 2 files changed, 9 insertions(+)

diff --git a/src/adventofcode2020/solutions/day16.py b/src/adventofcode2020/solutions/day16.py
index 3f344039..1afb688c 100644
--- a/src/adventofcode2020/solutions/day16.py
+++ b/src/adventofcode2020/solutions/day16.py
@@ -21,6 +21,9 @@ def parse_input(rule: str) -> "Ticket":
         regex = r"^(.*): (\d*)-(\d*) or (\d*)-(\d*)"
         results = re.match(regex, rule)
 
+        if not results:
+            raise ValueError("Rule is not valid")
+
         return Ticket(
             rule=results[1],
             lower_range_1=int(results[2]),
diff --git a/tests/solutions/test_day16_a.py b/tests/solutions/test_day16_a.py
index 0576e8be..7158c9c6 100644
--- a/tests/solutions/test_day16_a.py
+++ b/tests/solutions/test_day16_a.py
@@ -1,7 +1,13 @@
+import pytest
+
 from adventofcode2020.solutions.day16 import Day16PartA, Ticket
 
 
 class TestDay16PartA:
+    def test_invalid_ticket(self):
+        with pytest.raises(ValueError):
+            Ticket.parse_input("class 1-3, 5-7")
+
     def test_ticket_range(self):
         ticket = Ticket.parse_input("class: 1-3 or 5-7")
 

From dee72894a909ccd1ebdcc9e53ae325343b56a0e6 Mon Sep 17 00:00:00 2001
From: Roel Adriaans <roel@adriaans.org>
Date: Thu, 18 Nov 2021 16:27:15 +0100
Subject: [PATCH 032/371] Make mypy happy, do not reuse variables that much.

---
 src/adventofcode2020/solutions/day16.py | 20 ++++++++++++--------
 1 file changed, 12 insertions(+), 8 deletions(-)

diff --git a/src/adventofcode2020/solutions/day16.py b/src/adventofcode2020/solutions/day16.py
index 1afb688c..b3ba9521 100644
--- a/src/adventofcode2020/solutions/day16.py
+++ b/src/adventofcode2020/solutions/day16.py
@@ -109,7 +109,8 @@ def compute_mapping(self) -> Dict[str, int]:
         In the end we should end up with only one option per group.
         """
 
-        options = {}
+        options: Dict[str, set[int]] = {}
+
         for rule in self.ticket_rules:
             options[rule.rule] = set(range(len(self.my_tickets)))
 
@@ -128,16 +129,19 @@ def compute_mapping(self) -> Dict[str, int]:
         # This ends up as seat 2, class 1, row = 0
         # Loop for as long we have an set that is bigger then one
         while any([len(s) > 1 for s in options.values()]):
-            for rule in options:
-                if len(options[rule]) == 1:
+            for ticket_rule in options:
+                if len(options[ticket_rule]) == 1:
                     # We have only option, remove this option from the rest of the set
                     for remove in options:
-                        if remove != rule:
-                            options[remove].discard(list(options[rule])[0])
+                        if remove != ticket_rule:
+                            options[remove].discard(list(options[ticket_rule])[0])
+
         # Cleanup, remove set
-        for rule in options:
-            options[rule] = list(options[rule])[0]
-        return options
+        cleaned_options: Dict[str, int] = {}
+        for cleanup_rule in options:
+            cleaned_options[cleanup_rule] = list(options[cleanup_rule])[0]
+
+        return cleaned_options
 
     def solve(self, input_data: str) -> int:
         self.parse(input_data)

From ef78eac0eefcaa7ab2a2578ba3a11807969ccc7f Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 30 Nov 2021 01:04:37 +0000
Subject: [PATCH 033/371] Bump actions/setup-python from 2.3.0 to 2.3.1

Bumps [actions/setup-python](https://github.com/actions/setup-python) from 2.3.0 to 2.3.1.
- [Release notes](https://github.com/actions/setup-python/releases)
- [Commits](https://github.com/actions/setup-python/compare/v2.3.0...v2.3.1)

---
updated-dependencies:
- dependency-name: actions/setup-python
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 .github/workflows/tox.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/tox.yml b/.github/workflows/tox.yml
index c68bbe1d..d64d3f00 100644
--- a/.github/workflows/tox.yml
+++ b/.github/workflows/tox.yml
@@ -14,7 +14,7 @@ jobs:
     - uses: actions/checkout@v2
 
     - name: Set up Python ${{ matrix.python-version }}
-      uses: actions/setup-python@v2.3.0
+      uses: actions/setup-python@v2.3.1
       with:
         python-version: ${{ matrix.python-version }}
 

From b568e0d377bef0e99f9f25919a75a588cc682153 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 30 Nov 2021 21:20:50 +0000
Subject: [PATCH 034/371] Bump actions/setup-python from 2.3.0 to 2.3.1

Bumps [actions/setup-python](https://github.com/actions/setup-python) from 2.3.0 to 2.3.1.
- [Release notes](https://github.com/actions/setup-python/releases)
- [Commits](https://github.com/actions/setup-python/compare/v2.3.0...v2.3.1)

---
updated-dependencies:
- dependency-name: actions/setup-python
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 .github/workflows/tox.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/tox.yml b/.github/workflows/tox.yml
index bba76f9f..bea2d520 100644
--- a/.github/workflows/tox.yml
+++ b/.github/workflows/tox.yml
@@ -14,7 +14,7 @@ jobs:
     - uses: actions/checkout@v2
 
     - name: Set up Python ${{ matrix.python-version }}
-      uses: actions/setup-python@v2.3.0
+      uses: actions/setup-python@v2.3.1
       with:
         python-version: ${{ matrix.python-version }}
 

From 1c0c98dcccaa7fdb6acb4652707625c6e8f88f22 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 1 Dec 2021 04:08:31 +0000
Subject: [PATCH 035/371] Bump pre-commit from 2.15.0 to 2.16.0

Bumps [pre-commit](https://github.com/pre-commit/pre-commit) from 2.15.0 to 2.16.0.
- [Release notes](https://github.com/pre-commit/pre-commit/releases)
- [Changelog](https://github.com/pre-commit/pre-commit/blob/master/CHANGELOG.md)
- [Commits](https://github.com/pre-commit/pre-commit/compare/v2.15.0...v2.16.0)

---
updated-dependencies:
- dependency-name: pre-commit
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 poetry.lock    | 129 +++++++++++++++++++++++++++++--------------------
 pyproject.toml |   2 +-
 2 files changed, 78 insertions(+), 53 deletions(-)

diff --git a/poetry.lock b/poetry.lock
index b0113d56..047c8a1c 100644
--- a/poetry.lock
+++ b/poetry.lock
@@ -185,7 +185,7 @@ six = ">=1.10"
 
 [[package]]
 name = "coverage"
-version = "6.1.2"
+version = "6.2"
 description = "Code coverage measurement for Python"
 category = "dev"
 optional = false
@@ -430,7 +430,7 @@ python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*"
 
 [[package]]
 name = "pre-commit"
-version = "2.15.0"
+version = "2.16.0"
 description = "A framework for managing and maintaining multi-language pre-commit hooks."
 category = "dev"
 optional = false
@@ -732,7 +732,7 @@ testing = ["coverage (>=4)", "coverage-enable-subprocess (>=1)", "flaky (>=3)",
 [metadata]
 lock-version = "1.1"
 python-versions = ">=3.9,<3.11"
-content-hash = "2ff255607ba44295aad4a47a860bfc57659312f4a8f7ce48683bddfe77906b03"
+content-hash = "c12c470aa8970fd5b47a024ee17dab62b021686f33a04ccfaae37db0bbbfaf9b"
 
 [metadata.files]
 anytree = [
@@ -796,53 +796,53 @@ cookiecutter = [
     {file = "cookiecutter-1.7.3.tar.gz", hash = "sha256:6b9a4d72882e243be077a7397d0f1f76fe66cf3df91f3115dbb5330e214fa457"},
 ]
 coverage = [
-    {file = "coverage-6.1.2-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:675adb3b3380967806b3cbb9c5b00ceb29b1c472692100a338730c1d3e59c8b9"},
-    {file = "coverage-6.1.2-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:95a58336aa111af54baa451c33266a8774780242cab3704b7698d5e514840758"},
-    {file = "coverage-6.1.2-cp310-cp310-manylinux_2_5_i686.manylinux1_i686.manylinux_2_12_i686.manylinux2010_i686.whl", hash = "sha256:d0a595a781f8e186580ff8e3352dd4953b1944289bec7705377c80c7e36c4d6c"},
-    {file = "coverage-6.1.2-cp310-cp310-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:d3c5f49ce6af61154060640ad3b3281dbc46e2e0ef2fe78414d7f8a324f0b649"},
-    {file = "coverage-6.1.2-cp310-cp310-musllinux_1_1_aarch64.whl", hash = "sha256:310c40bed6b626fd1f463e5a83dba19a61c4eb74e1ac0d07d454ebbdf9047e9d"},
-    {file = "coverage-6.1.2-cp310-cp310-musllinux_1_1_i686.whl", hash = "sha256:a4d48e42e17d3de212f9af44f81ab73b9378a4b2b8413fd708d0d9023f2bbde4"},
-    {file = "coverage-6.1.2-cp310-cp310-musllinux_1_1_x86_64.whl", hash = "sha256:ffa545230ca2ad921ad066bf8fd627e7be43716b6e0fcf8e32af1b8188ccb0ab"},
-    {file = "coverage-6.1.2-cp310-cp310-win32.whl", hash = "sha256:cd2d11a59afa5001ff28073ceca24ae4c506da4355aba30d1e7dd2bd0d2206dc"},
-    {file = "coverage-6.1.2-cp310-cp310-win_amd64.whl", hash = "sha256:96129e41405887a53a9cc564f960d7f853cc63d178f3a182fdd302e4cab2745b"},
-    {file = "coverage-6.1.2-cp311-cp311-macosx_10_14_x86_64.whl", hash = "sha256:1de9c6f5039ee2b1860b7bad2c7bc3651fbeb9368e4c4d93e98a76358cdcb052"},
-    {file = "coverage-6.1.2-cp311-cp311-manylinux_2_5_x86_64.manylinux1_x86_64.whl", hash = "sha256:80cb70264e9a1d04b519cdba3cd0dc42847bf8e982a4d55c769b9b0ee7cdce1e"},
-    {file = "coverage-6.1.2-cp311-cp311-win_amd64.whl", hash = "sha256:ba6125d4e55c0b8e913dad27b22722eac7abdcb1f3eab1bd090eee9105660266"},
-    {file = "coverage-6.1.2-cp36-cp36m-macosx_10_9_x86_64.whl", hash = "sha256:8492d37acdc07a6eac6489f6c1954026f2260a85a4c2bb1e343fe3d35f5ee21a"},
-    {file = "coverage-6.1.2-cp36-cp36m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:66af99c7f7b64d050d37e795baadf515b4561124f25aae6e1baa482438ecc388"},
-    {file = "coverage-6.1.2-cp36-cp36m-manylinux_2_5_i686.manylinux1_i686.manylinux_2_12_i686.manylinux2010_i686.whl", hash = "sha256:ebcc03e1acef4ff44f37f3c61df478d6e469a573aa688e5a162f85d7e4c3860d"},
-    {file = "coverage-6.1.2-cp36-cp36m-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:98d44a8136eebbf544ad91fef5bd2b20ef0c9b459c65a833c923d9aa4546b204"},
-    {file = "coverage-6.1.2-cp36-cp36m-musllinux_1_1_aarch64.whl", hash = "sha256:c18725f3cffe96732ef96f3de1939d81215fd6d7d64900dcc4acfe514ea4fcbf"},
-    {file = "coverage-6.1.2-cp36-cp36m-musllinux_1_1_i686.whl", hash = "sha256:c8e9c4bcaaaa932be581b3d8b88b677489975f845f7714efc8cce77568b6711c"},
-    {file = "coverage-6.1.2-cp36-cp36m-musllinux_1_1_x86_64.whl", hash = "sha256:06d009e8a29483cbc0520665bc46035ffe9ae0e7484a49f9782c2a716e37d0a0"},
-    {file = "coverage-6.1.2-cp36-cp36m-win32.whl", hash = "sha256:e5432d9c329b11c27be45ee5f62cf20a33065d482c8dec1941d6670622a6fb8f"},
-    {file = "coverage-6.1.2-cp36-cp36m-win_amd64.whl", hash = "sha256:82fdcb64bf08aa5db881db061d96db102c77397a570fbc112e21c48a4d9cb31b"},
-    {file = "coverage-6.1.2-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:94f558f8555e79c48c422045f252ef41eb43becdd945e9c775b45ebfc0cbd78f"},
-    {file = "coverage-6.1.2-cp37-cp37m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:046647b96969fda1ae0605f61288635209dd69dcd27ba3ec0bf5148bc157f954"},
-    {file = "coverage-6.1.2-cp37-cp37m-manylinux_2_5_i686.manylinux1_i686.manylinux_2_12_i686.manylinux2010_i686.whl", hash = "sha256:cc799916b618ec9fd00135e576424165691fec4f70d7dc12cfaef09268a2478c"},
-    {file = "coverage-6.1.2-cp37-cp37m-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:62646d98cf0381ffda301a816d6ac6c35fc97aa81b09c4c52d66a15c4bef9d7c"},
-    {file = "coverage-6.1.2-cp37-cp37m-musllinux_1_1_aarch64.whl", hash = "sha256:27a3df08a855522dfef8b8635f58bab81341b2fb5f447819bc252da3aa4cf44c"},
-    {file = "coverage-6.1.2-cp37-cp37m-musllinux_1_1_i686.whl", hash = "sha256:610c0ba11da8de3a753dc4b1f71894f9f9debfdde6559599f303286e70aeb0c2"},
-    {file = "coverage-6.1.2-cp37-cp37m-musllinux_1_1_x86_64.whl", hash = "sha256:35b246ae3a2c042dc8f410c94bcb9754b18179cdb81ff9477a9089dbc9ecc186"},
-    {file = "coverage-6.1.2-cp37-cp37m-win32.whl", hash = "sha256:0cde7d9fe2fb55ff68ebe7fb319ef188e9b88e0a3d1c9c5db7dd829cd93d2193"},
-    {file = "coverage-6.1.2-cp37-cp37m-win_amd64.whl", hash = "sha256:958ac66272ff20e63d818627216e3d7412fdf68a2d25787b89a5c6f1eb7fdd93"},
-    {file = "coverage-6.1.2-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:a300b39c3d5905686c75a369d2a66e68fd01472ea42e16b38c948bd02b29e5bd"},
-    {file = "coverage-6.1.2-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:5d3855d5d26292539861f5ced2ed042fc2aa33a12f80e487053aed3bcb6ced13"},
-    {file = "coverage-6.1.2-cp38-cp38-manylinux_2_5_i686.manylinux1_i686.manylinux_2_12_i686.manylinux2010_i686.whl", hash = "sha256:586d38dfc7da4a87f5816b203ff06dd7c1bb5b16211ccaa0e9788a8da2b93696"},
-    {file = "coverage-6.1.2-cp38-cp38-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:a34fccb45f7b2d890183a263578d60a392a1a218fdc12f5bce1477a6a68d4373"},
-    {file = "coverage-6.1.2-cp38-cp38-musllinux_1_1_aarch64.whl", hash = "sha256:bc1ee1318f703bc6c971da700d74466e9b86e0c443eb85983fb2a1bd20447263"},
-    {file = "coverage-6.1.2-cp38-cp38-musllinux_1_1_i686.whl", hash = "sha256:3f546f48d5d80a90a266769aa613bc0719cb3e9c2ef3529d53f463996dd15a9d"},
-    {file = "coverage-6.1.2-cp38-cp38-musllinux_1_1_x86_64.whl", hash = "sha256:fd92ece726055e80d4e3f01fff3b91f54b18c9c357c48fcf6119e87e2461a091"},
-    {file = "coverage-6.1.2-cp38-cp38-win32.whl", hash = "sha256:24ed38ec86754c4d5a706fbd5b52b057c3df87901a8610d7e5642a08ec07087e"},
-    {file = "coverage-6.1.2-cp38-cp38-win_amd64.whl", hash = "sha256:97ef6e9119bd39d60ef7b9cd5deea2b34869c9f0b9777450a7e3759c1ab09b9b"},
-    {file = "coverage-6.1.2-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:6e5a8c947a2a89c56655ecbb789458a3a8e3b0cbf4c04250331df8f647b3de59"},
-    {file = "coverage-6.1.2-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:7a39590d1e6acf6a3c435c5d233f72f5d43b585f5be834cff1f21fec4afda225"},
-    {file = "coverage-6.1.2-cp39-cp39-manylinux_2_5_i686.manylinux1_i686.manylinux_2_12_i686.manylinux2010_i686.whl", hash = "sha256:9d2c2e3ce7b8cc932a2f918186964bd44de8c84e2f9ef72dc616f5bb8be22e71"},
-    {file = "coverage-6.1.2-cp39-cp39-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:3348865798c077c695cae00da0924136bb5cc501f236cfd6b6d9f7a3c94e0ec4"},
-    {file = "coverage-6.1.2-cp39-cp39-win32.whl", hash = "sha256:fae3fe111670e51f1ebbc475823899524e3459ea2db2cb88279bbfb2a0b8a3de"},
-    {file = "coverage-6.1.2-cp39-cp39-win_amd64.whl", hash = "sha256:af45eea024c0e3a25462fade161afab4f0d9d9e0d5a5d53e86149f74f0a35ecc"},
-    {file = "coverage-6.1.2-pp36.pp37.pp38-none-any.whl", hash = "sha256:eab14fdd410500dae50fd14ccc332e65543e7b39f6fc076fe90603a0e5d2f929"},
-    {file = "coverage-6.1.2.tar.gz", hash = "sha256:d9a635114b88c0ab462e0355472d00a180a5fbfd8511e7f18e4ac32652e7d972"},
+    {file = "coverage-6.2-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:6dbc1536e105adda7a6312c778f15aaabe583b0e9a0b0a324990334fd458c94b"},
+    {file = "coverage-6.2-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:174cf9b4bef0db2e8244f82059a5a72bd47e1d40e71c68ab055425172b16b7d0"},
+    {file = "coverage-6.2-cp310-cp310-manylinux_2_5_i686.manylinux1_i686.manylinux_2_12_i686.manylinux2010_i686.whl", hash = "sha256:92b8c845527eae547a2a6617d336adc56394050c3ed8a6918683646328fbb6da"},
+    {file = "coverage-6.2-cp310-cp310-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:c7912d1526299cb04c88288e148c6c87c0df600eca76efd99d84396cfe00ef1d"},
+    {file = "coverage-6.2-cp310-cp310-musllinux_1_1_aarch64.whl", hash = "sha256:d5d2033d5db1d58ae2d62f095e1aefb6988af65b4b12cb8987af409587cc0739"},
+    {file = "coverage-6.2-cp310-cp310-musllinux_1_1_i686.whl", hash = "sha256:3feac4084291642165c3a0d9eaebedf19ffa505016c4d3db15bfe235718d4971"},
+    {file = "coverage-6.2-cp310-cp310-musllinux_1_1_x86_64.whl", hash = "sha256:276651978c94a8c5672ea60a2656e95a3cce2a3f31e9fb2d5ebd4c215d095840"},
+    {file = "coverage-6.2-cp310-cp310-win32.whl", hash = "sha256:f506af4f27def639ba45789fa6fde45f9a217da0be05f8910458e4557eed020c"},
+    {file = "coverage-6.2-cp310-cp310-win_amd64.whl", hash = "sha256:3f7c17209eef285c86f819ff04a6d4cbee9b33ef05cbcaae4c0b4e8e06b3ec8f"},
+    {file = "coverage-6.2-cp311-cp311-macosx_10_14_x86_64.whl", hash = "sha256:13362889b2d46e8d9f97c421539c97c963e34031ab0cb89e8ca83a10cc71ac76"},
+    {file = "coverage-6.2-cp311-cp311-manylinux_2_5_x86_64.manylinux1_x86_64.whl", hash = "sha256:22e60a3ca5acba37d1d4a2ee66e051f5b0e1b9ac950b5b0cf4aa5366eda41d47"},
+    {file = "coverage-6.2-cp311-cp311-win_amd64.whl", hash = "sha256:b637c57fdb8be84e91fac60d9325a66a5981f8086c954ea2772efe28425eaf64"},
+    {file = "coverage-6.2-cp36-cp36m-macosx_10_9_x86_64.whl", hash = "sha256:f467bbb837691ab5a8ca359199d3429a11a01e6dfb3d9dcc676dc035ca93c0a9"},
+    {file = "coverage-6.2-cp36-cp36m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:2641f803ee9f95b1f387f3e8f3bf28d83d9b69a39e9911e5bfee832bea75240d"},
+    {file = "coverage-6.2-cp36-cp36m-manylinux_2_5_i686.manylinux1_i686.manylinux_2_12_i686.manylinux2010_i686.whl", hash = "sha256:1219d760ccfafc03c0822ae2e06e3b1248a8e6d1a70928966bafc6838d3c9e48"},
+    {file = "coverage-6.2-cp36-cp36m-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:9a2b5b52be0a8626fcbffd7e689781bf8c2ac01613e77feda93d96184949a98e"},
+    {file = "coverage-6.2-cp36-cp36m-musllinux_1_1_aarch64.whl", hash = "sha256:8e2c35a4c1f269704e90888e56f794e2d9c0262fb0c1b1c8c4ee44d9b9e77b5d"},
+    {file = "coverage-6.2-cp36-cp36m-musllinux_1_1_i686.whl", hash = "sha256:5d6b09c972ce9200264c35a1d53d43ca55ef61836d9ec60f0d44273a31aa9f17"},
+    {file = "coverage-6.2-cp36-cp36m-musllinux_1_1_x86_64.whl", hash = "sha256:e3db840a4dee542e37e09f30859f1612da90e1c5239a6a2498c473183a50e781"},
+    {file = "coverage-6.2-cp36-cp36m-win32.whl", hash = "sha256:4e547122ca2d244f7c090fe3f4b5a5861255ff66b7ab6d98f44a0222aaf8671a"},
+    {file = "coverage-6.2-cp36-cp36m-win_amd64.whl", hash = "sha256:01774a2c2c729619760320270e42cd9e797427ecfddd32c2a7b639cdc481f3c0"},
+    {file = "coverage-6.2-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:fb8b8ee99b3fffe4fd86f4c81b35a6bf7e4462cba019997af2fe679365db0c49"},
+    {file = "coverage-6.2-cp37-cp37m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:619346d57c7126ae49ac95b11b0dc8e36c1dd49d148477461bb66c8cf13bb521"},
+    {file = "coverage-6.2-cp37-cp37m-manylinux_2_5_i686.manylinux1_i686.manylinux_2_12_i686.manylinux2010_i686.whl", hash = "sha256:0a7726f74ff63f41e95ed3a89fef002916c828bb5fcae83b505b49d81a066884"},
+    {file = "coverage-6.2-cp37-cp37m-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:cfd9386c1d6f13b37e05a91a8583e802f8059bebfccde61a418c5808dea6bbfa"},
+    {file = "coverage-6.2-cp37-cp37m-musllinux_1_1_aarch64.whl", hash = "sha256:17e6c11038d4ed6e8af1407d9e89a2904d573be29d51515f14262d7f10ef0a64"},
+    {file = "coverage-6.2-cp37-cp37m-musllinux_1_1_i686.whl", hash = "sha256:c254b03032d5a06de049ce8bca8338a5185f07fb76600afff3c161e053d88617"},
+    {file = "coverage-6.2-cp37-cp37m-musllinux_1_1_x86_64.whl", hash = "sha256:dca38a21e4423f3edb821292e97cec7ad38086f84313462098568baedf4331f8"},
+    {file = "coverage-6.2-cp37-cp37m-win32.whl", hash = "sha256:600617008aa82032ddeace2535626d1bc212dfff32b43989539deda63b3f36e4"},
+    {file = "coverage-6.2-cp37-cp37m-win_amd64.whl", hash = "sha256:bf154ba7ee2fd613eb541c2bc03d3d9ac667080a737449d1a3fb342740eb1a74"},
+    {file = "coverage-6.2-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:f9afb5b746781fc2abce26193d1c817b7eb0e11459510fba65d2bd77fe161d9e"},
+    {file = "coverage-6.2-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:edcada2e24ed68f019175c2b2af2a8b481d3d084798b8c20d15d34f5c733fa58"},
+    {file = "coverage-6.2-cp38-cp38-manylinux_2_5_i686.manylinux1_i686.manylinux_2_12_i686.manylinux2010_i686.whl", hash = "sha256:a9c8c4283e17690ff1a7427123ffb428ad6a52ed720d550e299e8291e33184dc"},
+    {file = "coverage-6.2-cp38-cp38-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:f614fc9956d76d8a88a88bb41ddc12709caa755666f580af3a688899721efecd"},
+    {file = "coverage-6.2-cp38-cp38-musllinux_1_1_aarch64.whl", hash = "sha256:9365ed5cce5d0cf2c10afc6add145c5037d3148585b8ae0e77cc1efdd6aa2953"},
+    {file = "coverage-6.2-cp38-cp38-musllinux_1_1_i686.whl", hash = "sha256:8bdfe9ff3a4ea37d17f172ac0dff1e1c383aec17a636b9b35906babc9f0f5475"},
+    {file = "coverage-6.2-cp38-cp38-musllinux_1_1_x86_64.whl", hash = "sha256:63c424e6f5b4ab1cf1e23a43b12f542b0ec2e54f99ec9f11b75382152981df57"},
+    {file = "coverage-6.2-cp38-cp38-win32.whl", hash = "sha256:49dbff64961bc9bdd2289a2bda6a3a5a331964ba5497f694e2cbd540d656dc1c"},
+    {file = "coverage-6.2-cp38-cp38-win_amd64.whl", hash = "sha256:9a29311bd6429be317c1f3fe4bc06c4c5ee45e2fa61b2a19d4d1d6111cb94af2"},
+    {file = "coverage-6.2-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:03b20e52b7d31be571c9c06b74746746d4eb82fc260e594dc662ed48145e9efd"},
+    {file = "coverage-6.2-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:215f8afcc02a24c2d9a10d3790b21054b58d71f4b3c6f055d4bb1b15cecce685"},
+    {file = "coverage-6.2-cp39-cp39-manylinux_2_5_i686.manylinux1_i686.manylinux_2_12_i686.manylinux2010_i686.whl", hash = "sha256:a4bdeb0a52d1d04123b41d90a4390b096f3ef38eee35e11f0b22c2d031222c6c"},
+    {file = "coverage-6.2-cp39-cp39-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:c332d8f8d448ded473b97fefe4a0983265af21917d8b0cdcb8bb06b2afe632c3"},
+    {file = "coverage-6.2-cp39-cp39-win32.whl", hash = "sha256:6e1394d24d5938e561fbeaa0cd3d356207579c28bd1792f25a068743f2d5b282"},
+    {file = "coverage-6.2-cp39-cp39-win_amd64.whl", hash = "sha256:86f2e78b1eff847609b1ca8050c9e1fa3bd44ce755b2ec30e70f2d3ba3844644"},
+    {file = "coverage-6.2-pp36.pp37.pp38-none-any.whl", hash = "sha256:5829192582c0ec8ca4a2532407bc14c2f338d9878a10442f5d03804a95fac9de"},
+    {file = "coverage-6.2.tar.gz", hash = "sha256:e2cad8093172b7d1595b4ad66f24270808658e11acf43a8f95b41276162eb5b8"},
 ]
 cycler = [
     {file = "cycler-0.11.0-py3-none-any.whl", hash = "sha256:3a27e95f763a428a739d2add979fa7494c912a32c17c4c38c4d5f082cad165a3"},
@@ -1142,8 +1142,8 @@ poyo = [
     {file = "poyo-0.5.0.tar.gz", hash = "sha256:e26956aa780c45f011ca9886f044590e2d8fd8b61db7b1c1cf4e0869f48ed4dd"},
 ]
 pre-commit = [
-    {file = "pre_commit-2.15.0-py2.py3-none-any.whl", hash = "sha256:a4ed01000afcb484d9eb8d504272e642c4c4099bbad3a6b27e519bd6a3e928a6"},
-    {file = "pre_commit-2.15.0.tar.gz", hash = "sha256:3c25add78dbdfb6a28a651780d5c311ac40dd17f160eb3954a0c59da40a505a7"},
+    {file = "pre_commit-2.16.0-py2.py3-none-any.whl", hash = "sha256:758d1dc9b62c2ed8881585c254976d66eae0889919ab9b859064fc2fe3c7743e"},
+    {file = "pre_commit-2.16.0.tar.gz", hash = "sha256:fe9897cac830aa7164dbd02a4e7b90cae49630451ce88464bca73db486ba9f65"},
 ]
 py = [
     {file = "py-1.11.0-py2.py3-none-any.whl", hash = "sha256:607c53218732647dff4acdfcd50cb62615cedf612e72d1724fb1a0cc6405b378"},
@@ -1225,6 +1225,11 @@ regex = [
     {file = "regex-2021.11.10-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:30ab804ea73972049b7a2a5c62d97687d69b5a60a67adca07eb73a0ddbc9e29f"},
     {file = "regex-2021.11.10-cp310-cp310-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:68a067c11463de2a37157930d8b153005085e42bcb7ad9ca562d77ba7d1404e0"},
     {file = "regex-2021.11.10-cp310-cp310-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:162abfd74e88001d20cb73ceaffbfe601469923e875caf9118333b1a4aaafdc4"},
+    {file = "regex-2021.11.10-cp310-cp310-musllinux_1_1_aarch64.whl", hash = "sha256:b9ed0b1e5e0759d6b7f8e2f143894b2a7f3edd313f38cf44e1e15d360e11749b"},
+    {file = "regex-2021.11.10-cp310-cp310-musllinux_1_1_i686.whl", hash = "sha256:473e67837f786404570eae33c3b64a4b9635ae9f00145250851a1292f484c063"},
+    {file = "regex-2021.11.10-cp310-cp310-musllinux_1_1_ppc64le.whl", hash = "sha256:2fee3ed82a011184807d2127f1733b4f6b2ff6ec7151d83ef3477f3b96a13d03"},
+    {file = "regex-2021.11.10-cp310-cp310-musllinux_1_1_s390x.whl", hash = "sha256:d5fd67df77bab0d3f4ea1d7afca9ef15c2ee35dfb348c7b57ffb9782a6e4db6e"},
+    {file = "regex-2021.11.10-cp310-cp310-musllinux_1_1_x86_64.whl", hash = "sha256:5d408a642a5484b9b4d11dea15a489ea0928c7e410c7525cd892f4d04f2f617b"},
     {file = "regex-2021.11.10-cp310-cp310-win32.whl", hash = "sha256:98ba568e8ae26beb726aeea2273053c717641933836568c2a0278a84987b2a1a"},
     {file = "regex-2021.11.10-cp310-cp310-win_amd64.whl", hash = "sha256:780b48456a0f0ba4d390e8b5f7c661fdd218934388cde1a974010a965e200e12"},
     {file = "regex-2021.11.10-cp36-cp36m-macosx_10_9_x86_64.whl", hash = "sha256:dba70f30fd81f8ce6d32ddeef37d91c8948e5d5a4c63242d16a2b2df8143aafc"},
@@ -1234,6 +1239,11 @@ regex = [
     {file = "regex-2021.11.10-cp36-cp36m-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:5537f71b6d646f7f5f340562ec4c77b6e1c915f8baae822ea0b7e46c1f09b733"},
     {file = "regex-2021.11.10-cp36-cp36m-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:ed2e07c6a26ed4bea91b897ee2b0835c21716d9a469a96c3e878dc5f8c55bb23"},
     {file = "regex-2021.11.10-cp36-cp36m-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:ca5f18a75e1256ce07494e245cdb146f5a9267d3c702ebf9b65c7f8bd843431e"},
+    {file = "regex-2021.11.10-cp36-cp36m-musllinux_1_1_aarch64.whl", hash = "sha256:74cbeac0451f27d4f50e6e8a8f3a52ca074b5e2da9f7b505c4201a57a8ed6286"},
+    {file = "regex-2021.11.10-cp36-cp36m-musllinux_1_1_i686.whl", hash = "sha256:3598893bde43091ee5ca0a6ad20f08a0435e93a69255eeb5f81b85e81e329264"},
+    {file = "regex-2021.11.10-cp36-cp36m-musllinux_1_1_ppc64le.whl", hash = "sha256:50a7ddf3d131dc5633dccdb51417e2d1910d25cbcf842115a3a5893509140a3a"},
+    {file = "regex-2021.11.10-cp36-cp36m-musllinux_1_1_s390x.whl", hash = "sha256:61600a7ca4bcf78a96a68a27c2ae9389763b5b94b63943d5158f2a377e09d29a"},
+    {file = "regex-2021.11.10-cp36-cp36m-musllinux_1_1_x86_64.whl", hash = "sha256:563d5f9354e15e048465061509403f68424fef37d5add3064038c2511c8f5e00"},
     {file = "regex-2021.11.10-cp36-cp36m-win32.whl", hash = "sha256:93a5051fcf5fad72de73b96f07d30bc29665697fb8ecdfbc474f3452c78adcf4"},
     {file = "regex-2021.11.10-cp36-cp36m-win_amd64.whl", hash = "sha256:b483c9d00a565633c87abd0aaf27eb5016de23fed952e054ecc19ce32f6a9e7e"},
     {file = "regex-2021.11.10-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:fff55f3ce50a3ff63ec8e2a8d3dd924f1941b250b0aac3d3d42b687eeff07a8e"},
@@ -1243,6 +1253,11 @@ regex = [
     {file = "regex-2021.11.10-cp37-cp37m-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:d5ca078bb666c4a9d1287a379fe617a6dccd18c3e8a7e6c7e1eb8974330c626a"},
     {file = "regex-2021.11.10-cp37-cp37m-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:dd33eb9bdcfbabab3459c9ee651d94c842bc8a05fabc95edf4ee0c15a072495e"},
     {file = "regex-2021.11.10-cp37-cp37m-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:05b7d6d7e64efe309972adab77fc2af8907bb93217ec60aa9fe12a0dad35874f"},
+    {file = "regex-2021.11.10-cp37-cp37m-musllinux_1_1_aarch64.whl", hash = "sha256:42b50fa6666b0d50c30a990527127334d6b96dd969011e843e726a64011485da"},
+    {file = "regex-2021.11.10-cp37-cp37m-musllinux_1_1_i686.whl", hash = "sha256:6e1d2cc79e8dae442b3fa4a26c5794428b98f81389af90623ffcc650ce9f6732"},
+    {file = "regex-2021.11.10-cp37-cp37m-musllinux_1_1_ppc64le.whl", hash = "sha256:0416f7399e918c4b0e074a0f66e5191077ee2ca32a0f99d4c187a62beb47aa05"},
+    {file = "regex-2021.11.10-cp37-cp37m-musllinux_1_1_s390x.whl", hash = "sha256:ce298e3d0c65bd03fa65ffcc6db0e2b578e8f626d468db64fdf8457731052942"},
+    {file = "regex-2021.11.10-cp37-cp37m-musllinux_1_1_x86_64.whl", hash = "sha256:dc07f021ee80510f3cd3af2cad5b6a3b3a10b057521d9e6aaeb621730d320c5a"},
     {file = "regex-2021.11.10-cp37-cp37m-win32.whl", hash = "sha256:e71255ba42567d34a13c03968736c5d39bb4a97ce98188fafb27ce981115beec"},
     {file = "regex-2021.11.10-cp37-cp37m-win_amd64.whl", hash = "sha256:07856afef5ffcc052e7eccf3213317fbb94e4a5cd8177a2caa69c980657b3cb4"},
     {file = "regex-2021.11.10-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:ba05430e819e58544e840a68b03b28b6d328aff2e41579037e8bab7653b37d83"},
@@ -1253,6 +1268,11 @@ regex = [
     {file = "regex-2021.11.10-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:85bfa6a5413be0ee6c5c4a663668a2cad2cbecdee367630d097d7823041bdeec"},
     {file = "regex-2021.11.10-cp38-cp38-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:f23222527b307970e383433daec128d769ff778d9b29343fb3496472dc20dabe"},
     {file = "regex-2021.11.10-cp38-cp38-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:da1a90c1ddb7531b1d5ff1e171b4ee61f6345119be7351104b67ff413843fe94"},
+    {file = "regex-2021.11.10-cp38-cp38-musllinux_1_1_aarch64.whl", hash = "sha256:f5be7805e53dafe94d295399cfbe5227f39995a997f4fd8539bf3cbdc8f47ca8"},
+    {file = "regex-2021.11.10-cp38-cp38-musllinux_1_1_i686.whl", hash = "sha256:a955b747d620a50408b7fdf948e04359d6e762ff8a85f5775d907ceced715129"},
+    {file = "regex-2021.11.10-cp38-cp38-musllinux_1_1_ppc64le.whl", hash = "sha256:139a23d1f5d30db2cc6c7fd9c6d6497872a672db22c4ae1910be22d4f4b2068a"},
+    {file = "regex-2021.11.10-cp38-cp38-musllinux_1_1_s390x.whl", hash = "sha256:ca49e1ab99593438b204e00f3970e7a5f70d045267051dfa6b5f4304fcfa1dbf"},
+    {file = "regex-2021.11.10-cp38-cp38-musllinux_1_1_x86_64.whl", hash = "sha256:96fc32c16ea6d60d3ca7f63397bff5c75c5a562f7db6dec7d412f7c4d2e78ec0"},
     {file = "regex-2021.11.10-cp38-cp38-win32.whl", hash = "sha256:0617383e2fe465732af4509e61648b77cbe3aee68b6ac8c0b6fe934db90be5cc"},
     {file = "regex-2021.11.10-cp38-cp38-win_amd64.whl", hash = "sha256:a3feefd5e95871872673b08636f96b61ebef62971eab044f5124fb4dea39919d"},
     {file = "regex-2021.11.10-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:f7f325be2804246a75a4f45c72d4ce80d2443ab815063cdf70ee8fb2ca59ee1b"},
@@ -1263,6 +1283,11 @@ regex = [
     {file = "regex-2021.11.10-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:962b9a917dd7ceacbe5cd424556914cb0d636001e393b43dc886ba31d2a1e449"},
     {file = "regex-2021.11.10-cp39-cp39-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:fa8c626d6441e2d04b6ee703ef2d1e17608ad44c7cb75258c09dd42bacdfc64b"},
     {file = "regex-2021.11.10-cp39-cp39-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:3c5fb32cc6077abad3bbf0323067636d93307c9fa93e072771cf9a64d1c0f3ef"},
+    {file = "regex-2021.11.10-cp39-cp39-musllinux_1_1_aarch64.whl", hash = "sha256:cd410a1cbb2d297c67d8521759ab2ee3f1d66206d2e4328502a487589a2cb21b"},
+    {file = "regex-2021.11.10-cp39-cp39-musllinux_1_1_i686.whl", hash = "sha256:e6096b0688e6e14af6a1b10eaad86b4ff17935c49aa774eac7c95a57a4e8c296"},
+    {file = "regex-2021.11.10-cp39-cp39-musllinux_1_1_ppc64le.whl", hash = "sha256:529801a0d58809b60b3531ee804d3e3be4b412c94b5d267daa3de7fadef00f49"},
+    {file = "regex-2021.11.10-cp39-cp39-musllinux_1_1_s390x.whl", hash = "sha256:0f594b96fe2e0821d026365f72ac7b4f0b487487fb3d4aaf10dd9d97d88a9737"},
+    {file = "regex-2021.11.10-cp39-cp39-musllinux_1_1_x86_64.whl", hash = "sha256:2409b5c9cef7054dde93a9803156b411b677affc84fca69e908b1cb2c540025d"},
     {file = "regex-2021.11.10-cp39-cp39-win32.whl", hash = "sha256:3b5df18db1fccd66de15aa59c41e4f853b5df7550723d26aa6cb7f40e5d9da5a"},
     {file = "regex-2021.11.10-cp39-cp39-win_amd64.whl", hash = "sha256:83ee89483672b11f8952b158640d0c0ff02dc43d9cb1b70c1564b49abe92ce29"},
     {file = "regex-2021.11.10.tar.gz", hash = "sha256:f341ee2df0999bfdf7a95e448075effe0db212a59387de1a70690e4acb03d4c6"},
diff --git a/pyproject.toml b/pyproject.toml
index 1ea6ac24..97d7572c 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -23,7 +23,7 @@ pytest-cov = "^3.0.0"
 pytest-xdist = "^2.4.0"
 python-dotenv = "^0.19.2"
 tox = "^3.24.4"
-pre-commit = "^2.15.0"
+pre-commit = "^2.16.0"
 
 [tool.poetry.scripts]
 adventofcode = "adventofcode2020.main:main"

From 88f3046bb079d4439b18b94e391f826c8354a423 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 1 Dec 2021 04:32:19 +0000
Subject: [PATCH 036/371] Bump pre-commit from 2.15.0 to 2.16.0

Bumps [pre-commit](https://github.com/pre-commit/pre-commit) from 2.15.0 to 2.16.0.
- [Release notes](https://github.com/pre-commit/pre-commit/releases)
- [Changelog](https://github.com/pre-commit/pre-commit/blob/master/CHANGELOG.md)
- [Commits](https://github.com/pre-commit/pre-commit/compare/v2.15.0...v2.16.0)

---
updated-dependencies:
- dependency-name: pre-commit
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 poetry.lock    | 33 +++++++++++++++++++++++++++++----
 pyproject.toml |  2 +-
 2 files changed, 30 insertions(+), 5 deletions(-)

diff --git a/poetry.lock b/poetry.lock
index e2e955f2..e3d1204f 100644
--- a/poetry.lock
+++ b/poetry.lock
@@ -372,7 +372,7 @@ python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*"
 
 [[package]]
 name = "pre-commit"
-version = "2.15.0"
+version = "2.16.0"
 description = "A framework for managing and maintaining multi-language pre-commit hooks."
 category = "dev"
 optional = false
@@ -662,7 +662,7 @@ testing = ["coverage (>=4)", "coverage-enable-subprocess (>=1)", "flaky (>=3)",
 [metadata]
 lock-version = "1.1"
 python-versions = "^3.10"
-content-hash = "fa2471b6574ebcb8d918a2e1dc32aa9993d712e26654225b5fbc48c25edcabb5"
+content-hash = "729be48a4852d3e3657ac596865fbfa0644bc3ff9d6bfdf1963c81a4e4d46ca0"
 
 [metadata.files]
 anytree = [
@@ -910,8 +910,8 @@ poyo = [
     {file = "poyo-0.5.0.tar.gz", hash = "sha256:e26956aa780c45f011ca9886f044590e2d8fd8b61db7b1c1cf4e0869f48ed4dd"},
 ]
 pre-commit = [
-    {file = "pre_commit-2.15.0-py2.py3-none-any.whl", hash = "sha256:a4ed01000afcb484d9eb8d504272e642c4c4099bbad3a6b27e519bd6a3e928a6"},
-    {file = "pre_commit-2.15.0.tar.gz", hash = "sha256:3c25add78dbdfb6a28a651780d5c311ac40dd17f160eb3954a0c59da40a505a7"},
+    {file = "pre_commit-2.16.0-py2.py3-none-any.whl", hash = "sha256:758d1dc9b62c2ed8881585c254976d66eae0889919ab9b859064fc2fe3c7743e"},
+    {file = "pre_commit-2.16.0.tar.gz", hash = "sha256:fe9897cac830aa7164dbd02a4e7b90cae49630451ce88464bca73db486ba9f65"},
 ]
 py = [
     {file = "py-1.11.0-py2.py3-none-any.whl", hash = "sha256:607c53218732647dff4acdfcd50cb62615cedf612e72d1724fb1a0cc6405b378"},
@@ -993,6 +993,11 @@ regex = [
     {file = "regex-2021.11.10-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:30ab804ea73972049b7a2a5c62d97687d69b5a60a67adca07eb73a0ddbc9e29f"},
     {file = "regex-2021.11.10-cp310-cp310-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:68a067c11463de2a37157930d8b153005085e42bcb7ad9ca562d77ba7d1404e0"},
     {file = "regex-2021.11.10-cp310-cp310-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:162abfd74e88001d20cb73ceaffbfe601469923e875caf9118333b1a4aaafdc4"},
+    {file = "regex-2021.11.10-cp310-cp310-musllinux_1_1_aarch64.whl", hash = "sha256:b9ed0b1e5e0759d6b7f8e2f143894b2a7f3edd313f38cf44e1e15d360e11749b"},
+    {file = "regex-2021.11.10-cp310-cp310-musllinux_1_1_i686.whl", hash = "sha256:473e67837f786404570eae33c3b64a4b9635ae9f00145250851a1292f484c063"},
+    {file = "regex-2021.11.10-cp310-cp310-musllinux_1_1_ppc64le.whl", hash = "sha256:2fee3ed82a011184807d2127f1733b4f6b2ff6ec7151d83ef3477f3b96a13d03"},
+    {file = "regex-2021.11.10-cp310-cp310-musllinux_1_1_s390x.whl", hash = "sha256:d5fd67df77bab0d3f4ea1d7afca9ef15c2ee35dfb348c7b57ffb9782a6e4db6e"},
+    {file = "regex-2021.11.10-cp310-cp310-musllinux_1_1_x86_64.whl", hash = "sha256:5d408a642a5484b9b4d11dea15a489ea0928c7e410c7525cd892f4d04f2f617b"},
     {file = "regex-2021.11.10-cp310-cp310-win32.whl", hash = "sha256:98ba568e8ae26beb726aeea2273053c717641933836568c2a0278a84987b2a1a"},
     {file = "regex-2021.11.10-cp310-cp310-win_amd64.whl", hash = "sha256:780b48456a0f0ba4d390e8b5f7c661fdd218934388cde1a974010a965e200e12"},
     {file = "regex-2021.11.10-cp36-cp36m-macosx_10_9_x86_64.whl", hash = "sha256:dba70f30fd81f8ce6d32ddeef37d91c8948e5d5a4c63242d16a2b2df8143aafc"},
@@ -1002,6 +1007,11 @@ regex = [
     {file = "regex-2021.11.10-cp36-cp36m-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:5537f71b6d646f7f5f340562ec4c77b6e1c915f8baae822ea0b7e46c1f09b733"},
     {file = "regex-2021.11.10-cp36-cp36m-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:ed2e07c6a26ed4bea91b897ee2b0835c21716d9a469a96c3e878dc5f8c55bb23"},
     {file = "regex-2021.11.10-cp36-cp36m-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:ca5f18a75e1256ce07494e245cdb146f5a9267d3c702ebf9b65c7f8bd843431e"},
+    {file = "regex-2021.11.10-cp36-cp36m-musllinux_1_1_aarch64.whl", hash = "sha256:74cbeac0451f27d4f50e6e8a8f3a52ca074b5e2da9f7b505c4201a57a8ed6286"},
+    {file = "regex-2021.11.10-cp36-cp36m-musllinux_1_1_i686.whl", hash = "sha256:3598893bde43091ee5ca0a6ad20f08a0435e93a69255eeb5f81b85e81e329264"},
+    {file = "regex-2021.11.10-cp36-cp36m-musllinux_1_1_ppc64le.whl", hash = "sha256:50a7ddf3d131dc5633dccdb51417e2d1910d25cbcf842115a3a5893509140a3a"},
+    {file = "regex-2021.11.10-cp36-cp36m-musllinux_1_1_s390x.whl", hash = "sha256:61600a7ca4bcf78a96a68a27c2ae9389763b5b94b63943d5158f2a377e09d29a"},
+    {file = "regex-2021.11.10-cp36-cp36m-musllinux_1_1_x86_64.whl", hash = "sha256:563d5f9354e15e048465061509403f68424fef37d5add3064038c2511c8f5e00"},
     {file = "regex-2021.11.10-cp36-cp36m-win32.whl", hash = "sha256:93a5051fcf5fad72de73b96f07d30bc29665697fb8ecdfbc474f3452c78adcf4"},
     {file = "regex-2021.11.10-cp36-cp36m-win_amd64.whl", hash = "sha256:b483c9d00a565633c87abd0aaf27eb5016de23fed952e054ecc19ce32f6a9e7e"},
     {file = "regex-2021.11.10-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:fff55f3ce50a3ff63ec8e2a8d3dd924f1941b250b0aac3d3d42b687eeff07a8e"},
@@ -1011,6 +1021,11 @@ regex = [
     {file = "regex-2021.11.10-cp37-cp37m-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:d5ca078bb666c4a9d1287a379fe617a6dccd18c3e8a7e6c7e1eb8974330c626a"},
     {file = "regex-2021.11.10-cp37-cp37m-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:dd33eb9bdcfbabab3459c9ee651d94c842bc8a05fabc95edf4ee0c15a072495e"},
     {file = "regex-2021.11.10-cp37-cp37m-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:05b7d6d7e64efe309972adab77fc2af8907bb93217ec60aa9fe12a0dad35874f"},
+    {file = "regex-2021.11.10-cp37-cp37m-musllinux_1_1_aarch64.whl", hash = "sha256:42b50fa6666b0d50c30a990527127334d6b96dd969011e843e726a64011485da"},
+    {file = "regex-2021.11.10-cp37-cp37m-musllinux_1_1_i686.whl", hash = "sha256:6e1d2cc79e8dae442b3fa4a26c5794428b98f81389af90623ffcc650ce9f6732"},
+    {file = "regex-2021.11.10-cp37-cp37m-musllinux_1_1_ppc64le.whl", hash = "sha256:0416f7399e918c4b0e074a0f66e5191077ee2ca32a0f99d4c187a62beb47aa05"},
+    {file = "regex-2021.11.10-cp37-cp37m-musllinux_1_1_s390x.whl", hash = "sha256:ce298e3d0c65bd03fa65ffcc6db0e2b578e8f626d468db64fdf8457731052942"},
+    {file = "regex-2021.11.10-cp37-cp37m-musllinux_1_1_x86_64.whl", hash = "sha256:dc07f021ee80510f3cd3af2cad5b6a3b3a10b057521d9e6aaeb621730d320c5a"},
     {file = "regex-2021.11.10-cp37-cp37m-win32.whl", hash = "sha256:e71255ba42567d34a13c03968736c5d39bb4a97ce98188fafb27ce981115beec"},
     {file = "regex-2021.11.10-cp37-cp37m-win_amd64.whl", hash = "sha256:07856afef5ffcc052e7eccf3213317fbb94e4a5cd8177a2caa69c980657b3cb4"},
     {file = "regex-2021.11.10-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:ba05430e819e58544e840a68b03b28b6d328aff2e41579037e8bab7653b37d83"},
@@ -1021,6 +1036,11 @@ regex = [
     {file = "regex-2021.11.10-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:85bfa6a5413be0ee6c5c4a663668a2cad2cbecdee367630d097d7823041bdeec"},
     {file = "regex-2021.11.10-cp38-cp38-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:f23222527b307970e383433daec128d769ff778d9b29343fb3496472dc20dabe"},
     {file = "regex-2021.11.10-cp38-cp38-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:da1a90c1ddb7531b1d5ff1e171b4ee61f6345119be7351104b67ff413843fe94"},
+    {file = "regex-2021.11.10-cp38-cp38-musllinux_1_1_aarch64.whl", hash = "sha256:f5be7805e53dafe94d295399cfbe5227f39995a997f4fd8539bf3cbdc8f47ca8"},
+    {file = "regex-2021.11.10-cp38-cp38-musllinux_1_1_i686.whl", hash = "sha256:a955b747d620a50408b7fdf948e04359d6e762ff8a85f5775d907ceced715129"},
+    {file = "regex-2021.11.10-cp38-cp38-musllinux_1_1_ppc64le.whl", hash = "sha256:139a23d1f5d30db2cc6c7fd9c6d6497872a672db22c4ae1910be22d4f4b2068a"},
+    {file = "regex-2021.11.10-cp38-cp38-musllinux_1_1_s390x.whl", hash = "sha256:ca49e1ab99593438b204e00f3970e7a5f70d045267051dfa6b5f4304fcfa1dbf"},
+    {file = "regex-2021.11.10-cp38-cp38-musllinux_1_1_x86_64.whl", hash = "sha256:96fc32c16ea6d60d3ca7f63397bff5c75c5a562f7db6dec7d412f7c4d2e78ec0"},
     {file = "regex-2021.11.10-cp38-cp38-win32.whl", hash = "sha256:0617383e2fe465732af4509e61648b77cbe3aee68b6ac8c0b6fe934db90be5cc"},
     {file = "regex-2021.11.10-cp38-cp38-win_amd64.whl", hash = "sha256:a3feefd5e95871872673b08636f96b61ebef62971eab044f5124fb4dea39919d"},
     {file = "regex-2021.11.10-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:f7f325be2804246a75a4f45c72d4ce80d2443ab815063cdf70ee8fb2ca59ee1b"},
@@ -1031,6 +1051,11 @@ regex = [
     {file = "regex-2021.11.10-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:962b9a917dd7ceacbe5cd424556914cb0d636001e393b43dc886ba31d2a1e449"},
     {file = "regex-2021.11.10-cp39-cp39-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:fa8c626d6441e2d04b6ee703ef2d1e17608ad44c7cb75258c09dd42bacdfc64b"},
     {file = "regex-2021.11.10-cp39-cp39-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:3c5fb32cc6077abad3bbf0323067636d93307c9fa93e072771cf9a64d1c0f3ef"},
+    {file = "regex-2021.11.10-cp39-cp39-musllinux_1_1_aarch64.whl", hash = "sha256:cd410a1cbb2d297c67d8521759ab2ee3f1d66206d2e4328502a487589a2cb21b"},
+    {file = "regex-2021.11.10-cp39-cp39-musllinux_1_1_i686.whl", hash = "sha256:e6096b0688e6e14af6a1b10eaad86b4ff17935c49aa774eac7c95a57a4e8c296"},
+    {file = "regex-2021.11.10-cp39-cp39-musllinux_1_1_ppc64le.whl", hash = "sha256:529801a0d58809b60b3531ee804d3e3be4b412c94b5d267daa3de7fadef00f49"},
+    {file = "regex-2021.11.10-cp39-cp39-musllinux_1_1_s390x.whl", hash = "sha256:0f594b96fe2e0821d026365f72ac7b4f0b487487fb3d4aaf10dd9d97d88a9737"},
+    {file = "regex-2021.11.10-cp39-cp39-musllinux_1_1_x86_64.whl", hash = "sha256:2409b5c9cef7054dde93a9803156b411b677affc84fca69e908b1cb2c540025d"},
     {file = "regex-2021.11.10-cp39-cp39-win32.whl", hash = "sha256:3b5df18db1fccd66de15aa59c41e4f853b5df7550723d26aa6cb7f40e5d9da5a"},
     {file = "regex-2021.11.10-cp39-cp39-win_amd64.whl", hash = "sha256:83ee89483672b11f8952b158640d0c0ff02dc43d9cb1b70c1564b49abe92ce29"},
     {file = "regex-2021.11.10.tar.gz", hash = "sha256:f341ee2df0999bfdf7a95e448075effe0db212a59387de1a70690e4acb03d4c6"},
diff --git a/pyproject.toml b/pyproject.toml
index 3a4d8fcb..51a12935 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -21,7 +21,7 @@ pytest-cov = "^3.0.0"
 pytest-xdist = "^2.4.0"
 python-dotenv = "^0.19.2"
 tox = "^3.24.4"
-pre-commit = "^2.15.0"
+pre-commit = "^2.16.0"
 isort = "^5.10.1"
 
 [tool.poetry.scripts]

From 0f06183f0296cbdfd4d255961d0dc99bcdf15251 Mon Sep 17 00:00:00 2001
From: Roel Adriaans <roel@adriaans.org>
Date: Wed, 1 Dec 2021 08:36:02 +0100
Subject: [PATCH 037/371] Day 1, part 1

---
 .../solutions/data/day_01/day01.txt           | 2000 +++++++++++++++++
 src/adventofcode2021/solutions/day01.py       |   23 +
 tests/solutions/test_day01_a.py               |   28 +
 tests/solutions/test_day01_b.py               |   19 +
 4 files changed, 2070 insertions(+)
 create mode 100644 src/adventofcode2021/solutions/data/day_01/day01.txt
 create mode 100644 src/adventofcode2021/solutions/day01.py
 create mode 100644 tests/solutions/test_day01_a.py
 create mode 100644 tests/solutions/test_day01_b.py

diff --git a/src/adventofcode2021/solutions/data/day_01/day01.txt b/src/adventofcode2021/solutions/data/day_01/day01.txt
new file mode 100644
index 00000000..54e0795d
--- /dev/null
+++ b/src/adventofcode2021/solutions/data/day_01/day01.txt
@@ -0,0 +1,2000 @@
+134
+138
+142
+143
+141
+142
+145
+140
+144
+156
+158
+163
+164
+170
+192
+193
+194
+218
+216
+229
+210
+212
+217
+219
+252
+254
+253
+256
+257
+258
+259
+270
+271
+273
+289
+314
+289
+315
+321
+330
+331
+307
+316
+325
+326
+330
+344
+347
+330
+342
+344
+337
+338
+341
+345
+347
+364
+394
+395
+418
+421
+422
+425
+426
+434
+432
+442
+443
+445
+446
+459
+460
+469
+464
+449
+466
+484
+485
+488
+489
+495
+499
+501
+504
+505
+508
+520
+530
+535
+537
+533
+534
+538
+539
+542
+544
+545
+546
+547
+565
+566
+579
+586
+596
+601
+602
+615
+623
+625
+626
+641
+645
+654
+657
+659
+658
+661
+678
+680
+682
+673
+682
+686
+689
+694
+704
+705
+706
+734
+735
+741
+746
+747
+756
+772
+773
+806
+807
+819
+820
+824
+837
+835
+837
+834
+842
+844
+860
+855
+862
+863
+873
+898
+904
+908
+909
+910
+911
+921
+922
+928
+930
+943
+949
+951
+947
+953
+963
+965
+967
+970
+975
+976
+979
+986
+1009
+1017
+1021
+1022
+1047
+1073
+1075
+1100
+1101
+1136
+1143
+1149
+1148
+1149
+1150
+1154
+1167
+1169
+1175
+1178
+1181
+1191
+1194
+1195
+1196
+1203
+1204
+1188
+1196
+1197
+1198
+1211
+1213
+1221
+1225
+1227
+1232
+1233
+1244
+1245
+1251
+1252
+1253
+1254
+1281
+1292
+1293
+1296
+1306
+1320
+1312
+1313
+1318
+1319
+1322
+1323
+1324
+1344
+1345
+1348
+1354
+1357
+1356
+1359
+1360
+1362
+1363
+1364
+1366
+1384
+1388
+1389
+1388
+1390
+1391
+1412
+1415
+1416
+1415
+1414
+1424
+1429
+1430
+1453
+1459
+1470
+1472
+1491
+1494
+1499
+1497
+1498
+1491
+1496
+1497
+1496
+1523
+1527
+1532
+1525
+1555
+1559
+1576
+1586
+1593
+1609
+1610
+1612
+1619
+1645
+1650
+1657
+1677
+1705
+1706
+1709
+1713
+1722
+1737
+1773
+1783
+1795
+1796
+1807
+1806
+1807
+1808
+1828
+1829
+1835
+1837
+1845
+1848
+1847
+1854
+1862
+1860
+1861
+1862
+1863
+1868
+1882
+1892
+1904
+1876
+1875
+1877
+1907
+1922
+1936
+1932
+1938
+1948
+1950
+1953
+1955
+1957
+1958
+1956
+1961
+1966
+1964
+1968
+1987
+1984
+1988
+1990
+1991
+2009
+2012
+2018
+2022
+2041
+2042
+2057
+2058
+2056
+2064
+2070
+2073
+2077
+2080
+2041
+2044
+2042
+2045
+2053
+2052
+2054
+2055
+2058
+2064
+2068
+2067
+2078
+2086
+2085
+2090
+2093
+2108
+2109
+2110
+2118
+2114
+2121
+2124
+2125
+2111
+2112
+2126
+2127
+2138
+2141
+2153
+2158
+2170
+2161
+2162
+2163
+2164
+2165
+2175
+2196
+2205
+2210
+2209
+2210
+2218
+2234
+2254
+2255
+2266
+2267
+2269
+2270
+2274
+2276
+2263
+2264
+2266
+2267
+2264
+2267
+2276
+2283
+2284
+2287
+2298
+2299
+2309
+2310
+2321
+2322
+2323
+2328
+2330
+2333
+2336
+2366
+2367
+2368
+2365
+2371
+2372
+2373
+2371
+2375
+2376
+2373
+2379
+2380
+2382
+2392
+2394
+2398
+2420
+2427
+2438
+2439
+2440
+2441
+2452
+2453
+2478
+2482
+2484
+2495
+2510
+2514
+2516
+2531
+2536
+2563
+2564
+2559
+2585
+2599
+2608
+2613
+2611
+2619
+2633
+2644
+2645
+2646
+2649
+2632
+2649
+2656
+2651
+2663
+2678
+2684
+2682
+2684
+2685
+2686
+2687
+2708
+2709
+2718
+2720
+2721
+2727
+2733
+2751
+2740
+2742
+2749
+2748
+2750
+2780
+2757
+2762
+2760
+2771
+2758
+2777
+2781
+2785
+2787
+2812
+2825
+2830
+2838
+2840
+2852
+2857
+2862
+2865
+2847
+2846
+2847
+2848
+2849
+2852
+2854
+2859
+2868
+2870
+2872
+2873
+2882
+2889
+2890
+2893
+2890
+2891
+2895
+2901
+2907
+2911
+2912
+2920
+2921
+2925
+2924
+2942
+2952
+2961
+2965
+2964
+2978
+2981
+2992
+3010
+3005
+3019
+3013
+3015
+3019
+3022
+3024
+3027
+3037
+3038
+3041
+3043
+3047
+3065
+3075
+3083
+3092
+3093
+3117
+3118
+3119
+3125
+3126
+3130
+3145
+3137
+3149
+3153
+3154
+3155
+3180
+3182
+3183
+3182
+3200
+3202
+3214
+3197
+3207
+3185
+3203
+3208
+3209
+3208
+3231
+3233
+3234
+3242
+3255
+3256
+3257
+3258
+3265
+3268
+3290
+3291
+3297
+3311
+3301
+3309
+3314
+3317
+3319
+3320
+3337
+3347
+3362
+3376
+3390
+3404
+3412
+3417
+3418
+3421
+3425
+3436
+3438
+3439
+3453
+3467
+3484
+3485
+3486
+3515
+3516
+3521
+3527
+3534
+3551
+3561
+3572
+3573
+3574
+3596
+3612
+3595
+3616
+3617
+3619
+3620
+3624
+3634
+3657
+3663
+3671
+3686
+3687
+3694
+3704
+3695
+3697
+3698
+3699
+3700
+3701
+3702
+3704
+3705
+3707
+3716
+3717
+3732
+3747
+3748
+3745
+3746
+3748
+3756
+3757
+3764
+3765
+3766
+3768
+3784
+3807
+3810
+3805
+3811
+3812
+3813
+3828
+3840
+3847
+3848
+3851
+3850
+3851
+3855
+3861
+3862
+3867
+3864
+3871
+3879
+3884
+3885
+3887
+3888
+3928
+3948
+3949
+3950
+3960
+3959
+3965
+3973
+3970
+3971
+3972
+3974
+3969
+3997
+3998
+4014
+4016
+4017
+4026
+4039
+4043
+4052
+4053
+4051
+4054
+4058
+4066
+4067
+4073
+4077
+4084
+4072
+4078
+4083
+4094
+4101
+4107
+4115
+4138
+4141
+4143
+4166
+4177
+4184
+4194
+4192
+4198
+4203
+4204
+4209
+4215
+4217
+4226
+4231
+4252
+4253
+4260
+4294
+4306
+4307
+4314
+4316
+4317
+4325
+4326
+4334
+4344
+4348
+4344
+4348
+4350
+4358
+4383
+4384
+4390
+4383
+4378
+4374
+4377
+4398
+4399
+4431
+4432
+4433
+4432
+4443
+4441
+4442
+4443
+4439
+4441
+4444
+4445
+4446
+4449
+4452
+4458
+4463
+4469
+4472
+4475
+4478
+4491
+4504
+4507
+4509
+4510
+4511
+4513
+4525
+4532
+4533
+4541
+4552
+4551
+4552
+4573
+4594
+4597
+4601
+4602
+4617
+4621
+4622
+4621
+4601
+4604
+4606
+4607
+4611
+4591
+4604
+4608
+4615
+4613
+4621
+4625
+4642
+4637
+4641
+4659
+4674
+4678
+4680
+4700
+4701
+4702
+4703
+4706
+4712
+4699
+4701
+4704
+4706
+4707
+4714
+4717
+4721
+4722
+4731
+4735
+4748
+4749
+4753
+4757
+4779
+4783
+4788
+4790
+4791
+4794
+4813
+4814
+4815
+4801
+4803
+4806
+4807
+4837
+4838
+4842
+4844
+4854
+4855
+4859
+4856
+4847
+4849
+4850
+4852
+4866
+4868
+4880
+4902
+4901
+4905
+4909
+4921
+4922
+4939
+4920
+4922
+4938
+4944
+4947
+4948
+4960
+4961
+4971
+4986
+4992
+4996
+5004
+5003
+5008
+5002
+5004
+5021
+5023
+5009
+5012
+5014
+5019
+5033
+5047
+5048
+5046
+5047
+5072
+5078
+5080
+5081
+5067
+5097
+5103
+5109
+5114
+5121
+5126
+5127
+5128
+5129
+5150
+5154
+5131
+5113
+5115
+5116
+5118
+5134
+5135
+5152
+5158
+5160
+5171
+5188
+5195
+5196
+5198
+5202
+5204
+5205
+5209
+5225
+5232
+5235
+5242
+5243
+5244
+5234
+5254
+5255
+5272
+5273
+5282
+5288
+5311
+5312
+5302
+5304
+5307
+5316
+5319
+5322
+5323
+5324
+5326
+5327
+5337
+5342
+5346
+5353
+5363
+5376
+5378
+5403
+5405
+5406
+5402
+5412
+5424
+5428
+5430
+5431
+5435
+5436
+5439
+5444
+5446
+5447
+5456
+5470
+5474
+5500
+5513
+5515
+5505
+5508
+5509
+5511
+5512
+5520
+5523
+5526
+5532
+5534
+5564
+5568
+5579
+5598
+5599
+5600
+5608
+5609
+5636
+5648
+5655
+5667
+5668
+5674
+5678
+5679
+5692
+5693
+5694
+5696
+5711
+5703
+5711
+5717
+5716
+5733
+5734
+5735
+5736
+5740
+5757
+5762
+5788
+5797
+5798
+5809
+5814
+5815
+5826
+5827
+5829
+5809
+5815
+5817
+5818
+5819
+5820
+5822
+5831
+5837
+5838
+5844
+5850
+5846
+5851
+5865
+5870
+5882
+5885
+5888
+5892
+5901
+5906
+5908
+5910
+5911
+5909
+5915
+5912
+5914
+5932
+5934
+5940
+5949
+5951
+5952
+5954
+5963
+5962
+5961
+5962
+5964
+5966
+5969
+6009
+6013
+6015
+6024
+6043
+6041
+6047
+6057
+6061
+6062
+6061
+6070
+6074
+6075
+6084
+6113
+6138
+6139
+6146
+6148
+6157
+6191
+6193
+6194
+6200
+6219
+6226
+6228
+6230
+6235
+6236
+6241
+6265
+6267
+6268
+6270
+6271
+6273
+6275
+6274
+6275
+6289
+6290
+6294
+6303
+6306
+6311
+6312
+6313
+6319
+6320
+6332
+6344
+6339
+6350
+6355
+6357
+6359
+6362
+6344
+6345
+6362
+6372
+6376
+6389
+6393
+6395
+6398
+6401
+6420
+6422
+6425
+6433
+6445
+6446
+6464
+6472
+6487
+6498
+6505
+6484
+6496
+6511
+6510
+6501
+6503
+6513
+6542
+6553
+6561
+6575
+6585
+6593
+6612
+6613
+6614
+6619
+6618
+6614
+6615
+6617
+6627
+6634
+6638
+6640
+6642
+6662
+6663
+6664
+6669
+6677
+6689
+6709
+6710
+6711
+6712
+6713
+6721
+6722
+6743
+6740
+6729
+6731
+6728
+6729
+6734
+6739
+6748
+6751
+6752
+6753
+6759
+6738
+6739
+6761
+6765
+6764
+6772
+6773
+6798
+6821
+6828
+6829
+6831
+6837
+6843
+6844
+6845
+6849
+6851
+6854
+6855
+6856
+6863
+6860
+6874
+6881
+6893
+6896
+6901
+6899
+6906
+6915
+6920
+6930
+6942
+6944
+6956
+6977
+6980
+6982
+6984
+6991
+6990
+7006
+7018
+7034
+7036
+7041
+7042
+7043
+7066
+7069
+7062
+7066
+7082
+7087
+7112
+7131
+7132
+7139
+7140
+7145
+7146
+7148
+7146
+7147
+7151
+7152
+7142
+7126
+7127
+7123
+7120
+7131
+7132
+7136
+7139
+7140
+7144
+7148
+7153
+7154
+7158
+7174
+7188
+7190
+7191
+7212
+7216
+7215
+7218
+7237
+7241
+7242
+7247
+7251
+7265
+7289
+7295
+7298
+7302
+7323
+7324
+7333
+7321
+7320
+7328
+7326
+7328
+7349
+7359
+7361
+7362
+7379
+7380
+7381
+7387
+7391
+7404
+7408
+7417
+7418
+7429
+7430
+7451
+7456
+7460
+7466
+7470
+7487
+7514
+7520
+7522
+7523
+7519
+7546
+7557
+7567
+7572
+7573
+7566
+7567
+7568
+7571
+7579
+7548
+7551
+7552
+7555
+7559
+7568
+7570
+7573
+7576
+7568
+7571
+7570
+7573
+7586
+7589
+7590
+7589
+7586
+7587
+7588
+7592
+7611
+7626
+7627
+7633
+7632
+7633
+7634
+7641
+7645
+7644
+7666
+7662
+7658
+7662
+7663
+7669
+7672
+7665
+7674
+7660
+7668
+7673
+7694
+7712
+7715
+7737
+7738
+7740
+7741
+7756
+7764
+7801
+7802
+7804
+7814
+7845
+7885
+7889
+7888
+7886
+7889
+7890
+7894
+7895
+7918
+7919
+7941
+7942
+7943
+7952
+7953
+7954
+7957
+7958
+7959
+7960
+7967
+7968
+7970
+7987
+7988
+7990
+7991
+7993
+8000
+8002
+7990
+7999
+8002
+8001
+8003
+8009
+8023
+8037
+8040
+8041
+8045
+8063
+8061
+8065
+8067
+8072
+8091
+8097
+8116
+8117
+8118
+8102
+8104
+8105
+8142
+8141
+8149
+8168
+8176
+8178
+8183
+8186
+8219
+8221
+8226
+8239
+8244
+8246
+8268
+8293
+8299
+8310
+8312
+8314
+8315
+8310
+8320
+8321
+8322
+8341
+8342
+8369
+8402
+8406
+8407
+8408
+8409
+8412
+8416
+8419
+8420
+8419
+8418
+8415
+8420
+8421
+8442
+8446
+8449
+8452
+8448
+8458
+8459
+8468
+8485
+8488
+8502
+8504
+8505
+8506
+8510
+8526
+8541
+8574
+8575
+8576
+8546
+8557
+8565
+8566
+8567
+8583
+8596
+8606
+8616
+8612
+8607
+8608
+8611
+8612
+8642
+8647
+8651
+8653
+8671
+8686
+8682
+8686
+8688
+8702
+8705
+8704
+8712
+8717
+8718
+8719
+8724
+8727
+8728
+8729
+8746
+8751
+8750
+8757
+8715
+8719
+8720
+8721
+8747
+8748
+8766
+8772
+8792
+8796
+8795
+8800
+8810
+8811
+8822
+8823
+8824
+8830
+8860
+8861
+8867
+8877
+8878
+8885
+8894
+8895
+8903
+8914
+8916
+8919
+8940
+8968
+8969
+8984
+8982
+8984
+8983
+8982
+8988
+8989
+8993
+8994
+9001
+9008
+9026
+9029
+9037
+9038
+9039
+9050
+9053
+9055
+9056
+9059
+9076
+9075
+9081
+9092
+9100
+9101
+9123
+9124
+9147
+9143
+9146
+9180
+9181
+9191
+9200
+9201
+9202
+9210
+9224
+9228
+9229
+9234
+9235
+9237
+9241
+9260
+9261
+9262
+9271
+9272
+9271
+9275
+9289
+9290
+9320
+9322
+9356
+9371
+9372
+9373
+9374
+9386
+9387
+9388
+9414
+9409
+9420
+9422
+9430
+9442
+9443
+9445
+9449
+9467
+9472
+9473
+9487
+9489
+9493
+9498
+9501
+9502
+9507
+9518
+9521
+9522
+9523
+9503
+9509
+9545
+9546
+9562
+9546
+9531
+9535
+9558
+9559
+9561
+9560
+9561
+9562
+9561
+9570
+9564
+9562
+9563
+9568
+9569
+9577
+9606
+9607
+9608
+9602
+9606
+9608
+9622
+9623
+9630
+9652
+9653
+9650
+9651
+9673
+9675
+9676
+9678
+9684
+9685
+9690
+9695
+9706
+9725
+9750
+9762
+9769
+9770
+9772
+9770
+9806
+9828
+9837
+9836
+9844
+9845
+9849
+9875
+9897
+9901
+9916
+9923
+9944
+9945
+9952
+9961
+9973
+9977
+9987
+9986
+9989
+9992
+9993
+9994
+10019
+10023
+10021
+10015
+10016
+10017
+10018
+10026
+10027
+10037
+10039
+10040
+10041
+10042
+10040
+10041
+10044
+10055
+10066
+10059
+10060
+10063
+10062
+10055
+10062
+10068
+10076
+10086
+10101
+10104
+10107
+10100
+10116
+10120
+10121
+10128
+10136
+10139
+10154
+10166
+10167
+10170
+10171
+10172
+10179
+10182
+10184
+10189
+10191
+10204
+10207
+10214
+10213
+10214
+10220
+10222
+10225
+10223
+10220
+10238
+10240
+10243
+10247
+10241
+10273
+10281
+10282
+10286
+10311
+10313
+10318
+10319
+10324
+10331
+10338
+10320
+10322
+10323
+10328
+10336
+10339
+10352
+10366
+10367
+10375
+10385
+10386
+10388
+10389
+10387
+10388
+10392
+10399
+10404
+10405
+10408
+10417
+10413
+10416
+10417
+10427
+10432
+10434
+10433
+10445
+10446
+10448
+10449
+10450
+10451
+10452
+10445
+10446
+10453
+10452
+10461
+10462
+10463
+10470
+10473
+10487
+10491
+10514
+10517
+10518
+10522
+10528
+10540
+10541
+10543
+10561
+10564
+10573
+10544
+10550
+10552
+10562
+10567
+10568
+10567
+10563
+10559
+10566
+10571
+10573
+10577
+10578
+10580
+10596
+10603
+10574
+10575
+10570
+10571
+10579
+10580
+10581
+10600
+10603
+10615
+10617
+10618
+10637
+10639
+10641
+10642
+10652
+10688
+10696
+10702
+10706
+10688
+10689
+10694
+10689
+10704
+10721
+10722
+10725
+10727
+10737
+10739
+10747
+10750
+10751
+10755
+10756
+10753
diff --git a/src/adventofcode2021/solutions/day01.py b/src/adventofcode2021/solutions/day01.py
new file mode 100644
index 00000000..fc502412
--- /dev/null
+++ b/src/adventofcode2021/solutions/day01.py
@@ -0,0 +1,23 @@
+from adventofcode2021.utils.abstract import FileReaderSolution
+
+
+class Day01:
+    pass
+
+
+class Day01PartA(Day01, FileReaderSolution):
+    def solve(self, input_data: str) -> int:
+        num_changes = 0
+        # depths = advent_utils.string_to_list_of_ints(input_data, split_string="\n")
+        depths = [int(n) for n in input_data.split("\n") if n]
+        last_number = depths[0]
+        for depth in depths:
+            if depth > last_number:
+                num_changes += 1
+            last_number = depth
+        return num_changes
+
+
+class Day01PartB(Day01, FileReaderSolution):
+    def solve(self, input_data: str) -> int:
+        raise NotImplementedError
diff --git a/tests/solutions/test_day01_a.py b/tests/solutions/test_day01_a.py
new file mode 100644
index 00000000..26534684
--- /dev/null
+++ b/tests/solutions/test_day01_a.py
@@ -0,0 +1,28 @@
+import pytest
+
+from adventofcode2021.solutions.day01 import Day01PartA
+
+
+class TestDay01PartA:
+    def test_day01a_solve(self):
+        test_data = """199
+200
+208
+210
+200
+207
+240
+269
+260
+263
+"""
+        solution = Day01PartA()
+        result = solution.solve(test_data)
+        assert result == 7
+
+    @pytest.mark.xfail(reason="Not yet implemented", raises=NotImplementedError)
+    def test_day01a_data(self):
+        """Result we got when we did the real solution"""
+        solution = Day01PartA()
+        res = solution("day_01/day01.txt")
+        assert res == 1766
diff --git a/tests/solutions/test_day01_b.py b/tests/solutions/test_day01_b.py
new file mode 100644
index 00000000..42500901
--- /dev/null
+++ b/tests/solutions/test_day01_b.py
@@ -0,0 +1,19 @@
+import pytest
+
+from adventofcode2021.solutions.day01 import Day01PartB
+
+
+class TestDay01PartB:
+    @pytest.mark.xfail(reason="Not yet implemented", raises=NotImplementedError)
+    @pytest.mark.parametrize(("input_data", "expected_result"), [("", ""), ("", "")])
+    def test_day01b_solve(self, input_data, expected_result):
+        solution = Day01PartB()
+        result = solution.solve(input_data)
+        assert result == expected_result
+
+    @pytest.mark.xfail(reason="Not yet implemented", raises=NotImplementedError)
+    def test_day01b_data(self):
+        """Result we got when we did the real solution"""
+        solution = Day01PartB()
+        res = solution("day_01/day01.txt")
+        assert res == 0

From 007051d83d39b2dcb98be27b3c41598d28410754 Mon Sep 17 00:00:00 2001
From: Roel Adriaans <roel.adriaans@asml.com>
Date: Wed, 1 Dec 2021 09:15:27 +0100
Subject: [PATCH 038/371] Day 1, part 2, sliding windows

---
 src/adventofcode2021/solutions/day01.py | 13 +++++++++++--
 tests/solutions/test_day01_b.py         | 24 +++++++++++++++---------
 2 files changed, 26 insertions(+), 11 deletions(-)

diff --git a/src/adventofcode2021/solutions/day01.py b/src/adventofcode2021/solutions/day01.py
index fc502412..211a5a7c 100644
--- a/src/adventofcode2021/solutions/day01.py
+++ b/src/adventofcode2021/solutions/day01.py
@@ -8,7 +8,6 @@ class Day01:
 class Day01PartA(Day01, FileReaderSolution):
     def solve(self, input_data: str) -> int:
         num_changes = 0
-        # depths = advent_utils.string_to_list_of_ints(input_data, split_string="\n")
         depths = [int(n) for n in input_data.split("\n") if n]
         last_number = depths[0]
         for depth in depths:
@@ -20,4 +19,14 @@ def solve(self, input_data: str) -> int:
 
 class Day01PartB(Day01, FileReaderSolution):
     def solve(self, input_data: str) -> int:
-        raise NotImplementedError
+        depths = [int(n) for n in input_data.split("\n") if n]
+
+        total_difference = 0
+
+        for idx in range(len(depths)):
+            a = depths[idx : idx + 3]
+            b = depths[idx + 1 : idx + 4]
+            if sum(a) < sum(b):
+                total_difference += 1
+
+        return total_difference
diff --git a/tests/solutions/test_day01_b.py b/tests/solutions/test_day01_b.py
index 42500901..c5786eeb 100644
--- a/tests/solutions/test_day01_b.py
+++ b/tests/solutions/test_day01_b.py
@@ -1,19 +1,25 @@
-import pytest
-
 from adventofcode2021.solutions.day01 import Day01PartB
 
 
 class TestDay01PartB:
-    @pytest.mark.xfail(reason="Not yet implemented", raises=NotImplementedError)
-    @pytest.mark.parametrize(("input_data", "expected_result"), [("", ""), ("", "")])
-    def test_day01b_solve(self, input_data, expected_result):
+    def test_day01b_solve(self):
+        test_data = """199
+200
+208
+210
+200
+207
+240
+269
+260
+263"""
+
         solution = Day01PartB()
-        result = solution.solve(input_data)
-        assert result == expected_result
+        result = solution.solve(test_data)
+        assert result == 5
 
-    @pytest.mark.xfail(reason="Not yet implemented", raises=NotImplementedError)
     def test_day01b_data(self):
         """Result we got when we did the real solution"""
         solution = Day01PartB()
         res = solution("day_01/day01.txt")
-        assert res == 0
+        assert res == 1797

From e9c81bd359759b2700f3f53235dc764e6f7ffbe0 Mon Sep 17 00:00:00 2001
From: Roel Adriaans <roel@adriaans.org>
Date: Thu, 2 Dec 2021 08:17:39 +0100
Subject: [PATCH 039/371] Implement day 2

---
 .../solutions/data/day_02/day02.txt           | 1000 +++++++++++++++++
 src/adventofcode2021/solutions/day02.py       |   44 +
 tests/solutions/test_day01_a.py               |    3 -
 tests/solutions/test_day02_a.py               |   21 +
 tests/solutions/test_day02_b.py               |   21 +
 5 files changed, 1086 insertions(+), 3 deletions(-)
 create mode 100644 src/adventofcode2021/solutions/data/day_02/day02.txt
 create mode 100644 src/adventofcode2021/solutions/day02.py
 create mode 100644 tests/solutions/test_day02_a.py
 create mode 100644 tests/solutions/test_day02_b.py

diff --git a/src/adventofcode2021/solutions/data/day_02/day02.txt b/src/adventofcode2021/solutions/data/day_02/day02.txt
new file mode 100644
index 00000000..b3a0ece5
--- /dev/null
+++ b/src/adventofcode2021/solutions/data/day_02/day02.txt
@@ -0,0 +1,1000 @@
+forward 9
+down 3
+down 8
+forward 2
+up 3
+forward 5
+up 8
+down 2
+down 5
+up 7
+down 9
+forward 4
+up 5
+down 9
+forward 2
+forward 2
+forward 8
+down 6
+forward 2
+up 9
+up 5
+down 2
+forward 5
+down 8
+forward 3
+up 4
+forward 5
+forward 7
+down 8
+down 6
+up 7
+down 3
+forward 4
+up 8
+down 5
+down 3
+down 6
+down 8
+forward 1
+forward 9
+forward 4
+up 7
+down 4
+forward 7
+forward 3
+forward 9
+down 1
+down 3
+up 9
+down 3
+forward 9
+up 6
+up 9
+down 8
+up 3
+down 1
+up 8
+down 8
+down 2
+down 4
+down 4
+up 3
+down 6
+down 1
+down 3
+forward 1
+up 5
+forward 5
+forward 8
+down 2
+forward 6
+forward 2
+up 7
+forward 6
+down 8
+forward 6
+forward 5
+up 9
+forward 5
+up 5
+forward 9
+down 2
+down 4
+down 3
+down 8
+forward 9
+forward 6
+forward 2
+up 7
+down 7
+up 3
+forward 4
+forward 5
+down 7
+forward 5
+up 9
+forward 6
+forward 6
+forward 1
+down 6
+forward 9
+up 2
+down 7
+down 8
+down 6
+up 5
+down 8
+down 8
+forward 7
+down 6
+up 5
+down 9
+down 3
+forward 2
+down 4
+forward 8
+down 5
+up 5
+forward 7
+up 2
+up 2
+down 4
+forward 4
+down 5
+up 8
+down 2
+forward 4
+down 9
+forward 8
+down 5
+down 6
+down 7
+up 7
+up 5
+up 7
+forward 7
+forward 8
+down 2
+forward 3
+down 2
+down 7
+down 4
+down 2
+forward 3
+forward 5
+down 3
+down 7
+up 7
+down 7
+up 5
+forward 1
+down 8
+down 2
+up 4
+up 5
+down 8
+forward 9
+down 3
+down 9
+forward 8
+forward 1
+forward 1
+down 2
+up 9
+down 2
+up 8
+down 6
+up 8
+forward 7
+down 5
+forward 7
+down 8
+forward 8
+down 7
+up 9
+up 2
+up 6
+down 5
+down 9
+forward 2
+up 3
+down 4
+up 5
+up 4
+down 9
+forward 7
+forward 7
+down 3
+forward 4
+forward 9
+up 8
+forward 3
+down 1
+forward 2
+down 7
+down 3
+down 7
+down 7
+forward 8
+forward 4
+forward 7
+up 1
+down 4
+up 9
+down 2
+down 1
+forward 6
+down 3
+forward 7
+forward 8
+up 9
+up 2
+up 2
+forward 7
+up 2
+up 5
+forward 5
+down 3
+forward 8
+forward 1
+up 4
+down 6
+down 5
+forward 4
+up 9
+forward 8
+up 4
+down 8
+down 3
+down 3
+down 7
+forward 2
+forward 4
+down 9
+down 7
+down 2
+up 3
+up 3
+forward 8
+forward 7
+forward 8
+down 5
+up 5
+forward 3
+forward 6
+up 7
+up 1
+forward 2
+forward 5
+down 5
+forward 8
+down 2
+down 4
+forward 2
+down 7
+down 3
+down 5
+forward 9
+down 7
+down 8
+up 1
+up 2
+down 8
+forward 7
+forward 8
+down 8
+forward 5
+up 7
+forward 3
+up 2
+down 7
+forward 1
+down 2
+up 7
+up 4
+down 2
+forward 1
+up 5
+forward 2
+up 2
+forward 3
+forward 9
+forward 2
+forward 8
+forward 2
+up 7
+down 8
+down 7
+forward 2
+forward 7
+down 1
+forward 2
+up 1
+up 6
+down 3
+down 6
+forward 7
+down 4
+forward 5
+forward 6
+up 3
+forward 3
+down 6
+forward 8
+up 8
+forward 4
+down 3
+forward 3
+down 4
+down 7
+forward 9
+forward 2
+up 2
+forward 8
+down 6
+forward 6
+down 9
+down 9
+forward 8
+down 1
+forward 9
+down 1
+down 6
+down 8
+down 5
+down 5
+forward 3
+forward 3
+down 2
+down 5
+forward 9
+down 2
+down 8
+down 3
+forward 9
+up 2
+down 4
+down 9
+forward 9
+forward 1
+forward 5
+up 9
+down 1
+down 6
+forward 6
+forward 5
+forward 8
+down 2
+forward 8
+down 4
+down 2
+down 6
+down 6
+up 3
+up 8
+forward 1
+down 1
+up 8
+down 3
+down 4
+up 9
+up 1
+down 7
+down 7
+up 1
+up 2
+forward 5
+up 8
+forward 2
+down 3
+forward 1
+up 5
+forward 6
+forward 2
+down 6
+up 2
+forward 2
+forward 1
+down 3
+forward 4
+up 8
+forward 5
+down 4
+forward 2
+down 8
+down 7
+up 7
+down 8
+forward 1
+down 4
+up 9
+down 6
+up 6
+up 6
+down 2
+forward 1
+forward 8
+down 6
+up 3
+down 7
+forward 9
+up 1
+up 4
+forward 7
+down 7
+forward 1
+down 6
+down 4
+down 7
+down 8
+down 8
+forward 4
+down 6
+down 6
+down 5
+forward 6
+up 9
+up 3
+down 4
+forward 8
+down 7
+forward 6
+up 3
+forward 1
+forward 1
+down 8
+forward 7
+forward 4
+forward 6
+up 1
+forward 7
+up 8
+forward 2
+forward 6
+forward 8
+down 9
+down 8
+up 9
+up 4
+up 2
+forward 2
+forward 8
+up 2
+forward 3
+forward 2
+up 2
+up 5
+up 8
+forward 4
+forward 8
+forward 3
+up 5
+down 1
+forward 2
+down 7
+down 8
+forward 3
+up 1
+forward 5
+forward 7
+forward 9
+up 7
+forward 4
+down 4
+up 2
+forward 4
+forward 5
+forward 3
+up 9
+forward 6
+forward 8
+down 9
+down 1
+forward 1
+down 5
+down 2
+forward 9
+down 2
+up 9
+down 1
+forward 5
+forward 8
+up 2
+forward 6
+down 4
+down 9
+forward 4
+forward 1
+down 3
+down 3
+up 5
+forward 5
+down 6
+forward 3
+down 2
+forward 8
+down 7
+down 2
+down 1
+forward 2
+up 5
+forward 9
+forward 3
+forward 5
+down 4
+up 7
+forward 6
+down 3
+forward 1
+forward 7
+forward 1
+up 4
+down 2
+down 7
+up 9
+forward 9
+down 8
+down 1
+up 2
+down 3
+forward 7
+down 8
+down 5
+down 5
+up 8
+forward 1
+down 5
+forward 8
+up 7
+down 1
+forward 9
+down 4
+forward 8
+forward 5
+forward 7
+forward 8
+forward 3
+up 9
+forward 3
+down 7
+down 5
+up 8
+forward 3
+up 6
+forward 8
+up 3
+down 5
+forward 5
+forward 6
+forward 4
+forward 3
+forward 8
+up 9
+forward 2
+down 6
+down 4
+down 5
+forward 7
+down 2
+up 5
+forward 2
+forward 5
+down 9
+forward 8
+down 8
+forward 6
+down 9
+down 7
+up 9
+forward 3
+forward 3
+up 5
+down 2
+forward 5
+down 6
+down 6
+down 2
+down 3
+down 4
+forward 7
+up 1
+down 7
+forward 7
+up 1
+forward 3
+up 6
+down 7
+down 5
+forward 9
+forward 2
+down 5
+forward 9
+down 5
+forward 9
+forward 1
+down 4
+forward 9
+down 5
+forward 8
+down 6
+down 4
+down 5
+forward 9
+down 1
+forward 6
+forward 9
+down 1
+down 1
+up 2
+forward 5
+forward 3
+down 4
+up 8
+forward 8
+down 2
+forward 3
+forward 1
+down 7
+forward 6
+forward 5
+up 7
+up 8
+down 5
+up 3
+down 8
+forward 6
+forward 5
+forward 6
+up 1
+up 8
+up 7
+down 5
+forward 3
+forward 9
+up 9
+up 4
+up 7
+up 8
+forward 7
+forward 3
+forward 9
+down 7
+forward 3
+down 6
+forward 9
+down 1
+forward 3
+down 1
+forward 8
+forward 7
+down 2
+forward 1
+forward 6
+forward 7
+down 3
+down 2
+down 1
+forward 7
+forward 4
+down 6
+up 4
+forward 4
+forward 9
+forward 3
+down 1
+up 2
+down 3
+down 5
+forward 7
+forward 5
+up 1
+down 2
+down 3
+down 8
+forward 1
+down 4
+forward 5
+down 5
+up 6
+down 6
+down 8
+forward 1
+forward 9
+up 5
+forward 2
+down 9
+down 5
+down 1
+down 4
+down 9
+down 8
+forward 2
+forward 4
+up 2
+forward 3
+down 8
+down 5
+up 5
+forward 8
+up 2
+down 8
+up 3
+forward 7
+down 7
+forward 8
+down 7
+down 3
+up 6
+forward 5
+up 4
+up 5
+forward 9
+forward 6
+down 9
+forward 5
+down 5
+down 3
+forward 2
+down 1
+up 9
+up 8
+down 6
+down 1
+forward 9
+forward 4
+forward 2
+up 1
+forward 5
+forward 9
+up 5
+forward 8
+forward 4
+down 4
+down 4
+down 2
+forward 1
+forward 7
+down 9
+forward 4
+down 5
+down 4
+down 7
+down 2
+forward 9
+down 3
+forward 6
+forward 3
+down 9
+down 3
+down 4
+down 9
+down 9
+up 6
+down 5
+up 4
+down 1
+down 1
+forward 9
+forward 7
+down 9
+forward 4
+down 8
+down 7
+forward 7
+forward 4
+up 2
+up 5
+forward 2
+forward 7
+down 1
+forward 6
+forward 6
+forward 3
+forward 8
+down 2
+up 2
+forward 7
+up 5
+down 1
+down 5
+forward 8
+down 6
+forward 8
+down 5
+down 4
+down 6
+forward 5
+down 1
+forward 9
+forward 8
+up 5
+down 6
+forward 5
+up 5
+down 4
+forward 1
+down 2
+down 5
+down 3
+forward 2
+down 9
+forward 1
+forward 1
+forward 1
+forward 8
+forward 2
+down 8
+down 6
+up 1
+forward 6
+down 3
+down 4
+up 9
+down 3
+down 3
+up 7
+down 4
+forward 4
+forward 9
+down 3
+down 8
+forward 5
+down 3
+down 6
+down 7
+forward 1
+up 2
+forward 8
+down 1
+down 4
+up 9
+forward 9
+up 4
+up 2
+forward 3
+forward 4
+down 2
+down 2
+down 6
+forward 6
+forward 8
+down 6
+up 6
+down 5
+forward 1
+down 4
+up 9
+forward 1
+forward 3
+down 1
+down 4
+up 6
+forward 5
+forward 6
+up 9
+up 9
+down 2
+up 6
+forward 1
+forward 2
+forward 3
+forward 3
+forward 6
+up 2
+down 8
+down 9
+forward 7
+up 1
+up 3
+down 2
+forward 3
+down 8
+forward 9
+down 3
+forward 6
+up 2
+forward 7
+down 2
+forward 5
+down 4
+down 2
+up 8
+forward 3
+forward 5
+forward 9
+forward 5
+forward 3
+up 9
+down 7
+forward 4
+forward 2
+forward 7
+down 5
+up 6
+up 6
+forward 8
+down 2
+forward 1
+up 1
+up 9
+up 8
+up 3
+up 4
+down 2
+up 7
+down 4
+up 5
+down 1
+up 9
+down 5
+down 9
+down 4
+up 2
+down 8
+up 2
+up 7
+up 9
+forward 4
+forward 2
+forward 1
+forward 6
+forward 8
+up 5
+forward 5
+forward 5
+down 4
+up 6
+forward 3
+down 9
+down 7
+forward 4
+down 3
+up 1
+forward 4
+down 2
+down 6
+up 3
+up 1
+down 9
+down 7
+down 9
+forward 3
+forward 8
+down 8
+up 7
+up 6
+down 2
+down 9
+down 1
+down 9
+forward 6
+up 4
+down 3
+forward 5
+up 3
+up 9
+up 8
+forward 6
+down 8
+forward 6
+forward 6
+forward 5
+up 4
+down 4
+up 6
+up 4
+forward 2
+down 5
+forward 9
+up 7
+up 6
+down 4
+forward 7
+forward 6
+up 2
+down 8
+down 6
+forward 5
+up 2
+forward 5
+forward 1
+up 9
+down 8
+forward 7
+up 4
+forward 8
+down 4
+forward 3
+forward 3
+down 9
+forward 4
+forward 9
+up 8
+forward 7
+forward 3
+forward 9
+forward 4
+up 3
+forward 2
+forward 7
diff --git a/src/adventofcode2021/solutions/day02.py b/src/adventofcode2021/solutions/day02.py
new file mode 100644
index 00000000..1315df2b
--- /dev/null
+++ b/src/adventofcode2021/solutions/day02.py
@@ -0,0 +1,44 @@
+from adventofcode2021.utils.abstract import FileReaderSolution
+
+
+class Day02:
+    pass
+
+
+class Day02PartA(Day02, FileReaderSolution):
+    MAPPING = {
+        "up": (-1, 0),
+        "down": (1, 0),
+        "forward": (0, 1),
+    }
+
+    def solve(self, input_data: str) -> int:
+        depth = position = 0
+        for line in input_data.split("\n"):
+            if not line:
+                continue
+            direction, movement = line.split(" ")[0], int(line.split(" ")[1])
+            d_depth, d_movement = self.MAPPING[direction]
+            depth += d_depth * movement
+            position += d_movement * movement
+        return depth * position
+
+
+class Day02PartB(Day02, FileReaderSolution):
+    def solve(self, input_data: str) -> int:
+        depth = position = aim = 0
+
+        for line in input_data.split("\n"):
+            if not line:
+                continue
+
+            direction, movement = line.split(" ")[0], int(line.split(" ")[1])
+
+            if direction == "down":
+                aim += movement
+            elif direction == "up":
+                aim -= movement
+            else:
+                position += movement
+                depth += movement * aim
+        return depth * position
diff --git a/tests/solutions/test_day01_a.py b/tests/solutions/test_day01_a.py
index 26534684..f501de43 100644
--- a/tests/solutions/test_day01_a.py
+++ b/tests/solutions/test_day01_a.py
@@ -1,5 +1,3 @@
-import pytest
-
 from adventofcode2021.solutions.day01 import Day01PartA
 
 
@@ -20,7 +18,6 @@ def test_day01a_solve(self):
         result = solution.solve(test_data)
         assert result == 7
 
-    @pytest.mark.xfail(reason="Not yet implemented", raises=NotImplementedError)
     def test_day01a_data(self):
         """Result we got when we did the real solution"""
         solution = Day01PartA()
diff --git a/tests/solutions/test_day02_a.py b/tests/solutions/test_day02_a.py
new file mode 100644
index 00000000..b0582986
--- /dev/null
+++ b/tests/solutions/test_day02_a.py
@@ -0,0 +1,21 @@
+from adventofcode2021.solutions.day02 import Day02PartA
+
+
+class TestDay02PartA:
+    def test_day02a_solve(self):
+        test_data = """forward 5
+down 5
+forward 8
+up 3
+down 8
+forward 2
+"""
+        solution = Day02PartA()
+        result = solution.solve(test_data)
+        assert result == 150
+
+    def test_day02a_data(self):
+        """Result we got when we did the real solution"""
+        solution = Day02PartA()
+        res = solution("day_02/day02.txt")
+        assert res == 1451208
diff --git a/tests/solutions/test_day02_b.py b/tests/solutions/test_day02_b.py
new file mode 100644
index 00000000..f96bad55
--- /dev/null
+++ b/tests/solutions/test_day02_b.py
@@ -0,0 +1,21 @@
+from adventofcode2021.solutions.day02 import Day02PartB
+
+
+class TestDay02PartB:
+    def test_day02b_solve(self):
+        test_data = """forward 5
+down 5
+forward 8
+up 3
+down 8
+forward 2"""
+
+        solution = Day02PartB()
+        result = solution.solve(test_data)
+        assert result == 900
+
+    def test_day02b_data(self):
+        """Result we got when we did the real solution"""
+        solution = Day02PartB()
+        res = solution("day_02/day02.txt")
+        assert res == 1620141160

From 3da2b5ae3a70ce122febab4600744eb4fa8806ba Mon Sep 17 00:00:00 2001
From: Roel Adriaans <roel@adriaans.org>
Date: Fri, 3 Dec 2021 21:51:18 +0100
Subject: [PATCH 040/371] Dirty solution to day 3

---
 .../solutions/data/day_03/day03.txt           | 1000 +++++++++++++++++
 src/adventofcode2021/solutions/day03.py       |   76 ++
 tests/solutions/test_day03_a.py               |   26 +
 tests/solutions/test_day03_b.py               |   26 +
 4 files changed, 1128 insertions(+)
 create mode 100644 src/adventofcode2021/solutions/data/day_03/day03.txt
 create mode 100644 src/adventofcode2021/solutions/day03.py
 create mode 100644 tests/solutions/test_day03_a.py
 create mode 100644 tests/solutions/test_day03_b.py

diff --git a/src/adventofcode2021/solutions/data/day_03/day03.txt b/src/adventofcode2021/solutions/data/day_03/day03.txt
new file mode 100644
index 00000000..4e8cfce6
--- /dev/null
+++ b/src/adventofcode2021/solutions/data/day_03/day03.txt
@@ -0,0 +1,1000 @@
+010000010010
+011001011100
+110011011101
+110100100001
+000110011110
+110101000101
+100110111001
+110000000000
+100101100111
+001001011000
+010010011010
+001110111000
+001011111010
+110010111011
+001001010101
+111111011111
+101001001110
+011001000101
+001001111100
+000101110000
+101000101101
+101000011101
+011011001111
+010100011001
+100010001000
+100010111010
+000110101100
+100101010111
+110111101111
+011101111001
+111001110110
+101101000000
+010010111101
+111101111101
+010000001110
+000111111001
+010111100101
+011101100000
+001011011111
+111010000110
+111010001001
+000000010111
+001110011110
+100011100010
+111110010111
+100111111111
+100000011011
+000110111101
+010100010111
+110000011111
+011011011001
+101110011100
+010110001111
+101010111001
+100010011111
+011110110101
+001001101010
+000001001000
+101101011000
+101100001111
+000110000011
+011011100001
+010011100001
+101111011100
+110110100000
+010100010000
+110111111000
+110000110111
+011000000101
+001100011111
+111000011010
+000110101010
+011000101001
+110010100110
+100011111010
+011111000111
+010001100101
+101000011110
+011110010010
+111001100000
+000011011010
+000011111110
+101001001001
+100110010010
+110101010111
+010011111000
+010111001111
+010101001011
+111001010100
+011001011001
+110011110111
+110001001011
+101101001011
+000110010111
+110110111010
+001001100110
+111010011011
+001101000101
+100110001011
+010000101000
+101111001011
+110011011110
+011110111001
+101100000010
+010101101101
+010100001010
+000111010101
+001100000111
+010001010010
+001110000110
+000001010000
+100010000101
+010010101101
+011000110110
+111111100000
+111111010011
+010100010001
+101011000010
+111010101000
+011010001010
+111001000001
+111010010000
+101010101100
+101011110110
+110010100010
+011001001100
+100100111010
+101011011101
+110000001000
+010011011101
+000011011000
+101100101111
+110001111111
+110010010010
+001011011010
+110101111110
+110000111010
+011100011110
+110110001000
+000101000001
+100000010100
+110000110000
+110000101100
+101101000001
+110011101001
+101110010101
+110101110101
+000110100000
+100111101111
+111101011001
+110001111101
+100010100001
+101011111100
+000011010111
+110100110101
+111100010100
+011001110011
+010000110000
+110110011100
+001000110101
+010001111111
+001000000110
+101001001100
+011000001011
+101101010110
+101100011101
+001111001010
+110011000010
+010110111001
+000011000000
+011110100000
+111001001010
+110010100101
+110001101001
+001100110100
+110100011111
+100010001001
+100101001010
+110001011000
+111110011111
+001001000010
+101011001010
+110111111001
+101000000111
+000110000000
+110011110000
+111001011110
+110000010010
+010000101101
+010010100101
+011110010000
+010011100011
+111011100110
+001001000011
+110000010101
+010010010100
+110100100111
+111111010110
+111001110010
+110100010010
+011111111010
+110000011011
+001011000101
+101010000010
+000111100011
+010000110110
+111111011001
+100001001001
+111010011100
+001111110000
+010111111001
+101101000111
+100110011111
+000000100111
+111001111010
+100001110000
+010110101101
+111111111110
+101101011010
+101101000011
+010011001001
+111111000010
+011110000010
+101110101101
+110010110010
+101111100101
+101011100000
+000001110111
+010011011000
+010011000101
+101101010000
+111011110111
+100111111010
+000001110010
+010011110100
+011100001010
+101101001111
+011101100001
+001111001011
+000000010101
+000100110101
+100111001011
+000111011001
+100010011110
+111100100101
+011010111001
+011011111101
+010100111011
+010100110100
+101111111001
+110001100110
+110001110001
+010110100011
+111111110100
+011101000010
+011111101111
+001101001011
+001010100110
+111001010000
+111111100110
+001101001100
+010110011010
+011101111000
+101000010111
+100110010101
+011000111010
+011100010011
+110011000111
+001101010101
+101110001101
+000001011100
+001011100111
+111111010101
+000110010110
+100110000011
+011000111011
+111001011111
+100001010000
+001000100011
+011011111111
+111001001110
+000001010111
+001001001111
+001001100010
+111100101110
+101101100100
+000111101010
+011101101110
+101111001000
+010101110111
+100001011111
+011110011111
+010111010000
+101100110100
+001110011010
+000110001100
+110100101011
+101010001101
+010100001101
+111101011111
+011110111111
+110100001001
+101010000001
+110100011001
+100011011011
+101001111111
+111101100011
+100101001100
+000010101011
+101111010010
+100001110111
+010000011100
+011101110100
+100000001111
+100010110111
+101011110101
+000001000111
+010011110110
+000001000010
+101010010010
+100111110101
+000010001111
+001110000100
+110100001101
+011001001011
+000100110000
+000000011101
+011011100000
+011000001110
+000011101111
+110111010101
+011000001010
+010001111101
+011111011001
+001010111011
+010000011111
+001100000011
+110110001110
+100000000010
+010101011010
+101001100110
+000110011001
+110101001110
+100111000111
+111101101100
+100101111011
+011111100000
+000000101011
+001111011110
+101100100100
+010010110001
+000110110001
+011100111001
+001011000100
+111100001101
+100010001101
+010101010111
+001011101110
+110111101110
+000010000101
+101111001111
+101110000000
+010000011110
+101111000101
+000101001011
+011101000100
+001001111110
+001001111111
+100111000110
+000101110010
+011001001111
+100000111110
+101000001100
+001110010001
+010101011111
+010110001101
+000001000101
+010100111101
+100000101010
+111111111101
+011111001101
+111000001111
+100100001011
+101111010011
+111111110111
+100101111111
+100111100111
+011000110111
+011010000001
+010010110000
+111000110100
+111100010110
+100010100111
+011010111111
+110101100011
+001111100001
+101001011110
+100011110011
+100111110111
+100000100100
+111010110011
+001011100101
+101101010001
+111010111110
+000100010110
+111101001111
+101001001111
+000001010101
+111011101001
+010101111111
+111110101000
+101101111011
+010100001100
+101011110001
+010011101111
+011001001001
+001000001001
+100100011111
+010111100001
+111101011110
+110011110101
+100101000010
+100011110001
+000111111010
+010001011111
+011110011011
+100100000000
+011010011001
+010001100000
+011111001100
+101011000110
+110100101110
+101000111011
+011011001000
+100111000010
+101110011101
+000110000001
+001101001101
+100110011000
+011110111010
+110101010000
+100100111000
+011111000011
+111101010101
+100011101100
+000101110100
+010110101010
+101001111110
+011100010110
+001100010100
+010101110001
+100101110111
+110110100101
+100011000011
+100101000101
+001111110011
+101100010111
+001011110101
+001010110001
+110000010011
+100111100100
+100110110010
+101101110110
+000100101011
+101111100100
+011010110110
+101110010111
+000010101110
+001000000111
+100000110110
+001000000000
+111011101000
+111011011001
+000011111011
+000010101101
+011100111011
+000111010000
+000010110001
+011100110101
+001111110111
+000110100011
+010010001010
+010100000001
+111101101101
+010010010011
+110101100100
+011001010100
+100101110100
+110111011100
+110001110011
+011011001011
+110011011011
+101110101111
+111011000001
+110010001111
+000001000000
+101101111100
+000111000001
+000001011001
+110100110000
+110101011100
+010110011000
+010110010000
+010110000011
+010010010000
+100001100010
+011110110001
+111100101010
+101111111010
+101010110001
+000110011011
+010110000001
+001110111001
+000111101011
+010110110110
+000000000101
+000100010000
+110000010000
+001011011101
+011111000101
+001110101010
+101110110111
+110101110111
+101111000110
+110110000011
+110001110010
+011111101000
+010111100110
+011100111111
+111101100100
+110111110100
+100010010000
+110101000111
+111000000111
+111111011010
+100001111010
+010011011100
+011011100101
+110100101000
+001101110010
+000010110100
+110001010101
+100000011100
+101101100111
+011100111110
+111110001110
+010011101101
+001001001110
+011001100001
+001010010100
+010011010011
+001111100010
+001110001100
+011011010010
+010100000100
+011010010011
+101110011010
+001111101000
+001110011011
+000001111110
+110110101001
+101000000110
+000010000111
+100111111001
+110111001101
+110101101011
+110101100110
+101010110011
+000110100001
+110011100100
+001011101101
+011001001010
+100101100110
+010001100001
+110110001101
+100111011001
+100100111100
+000001111010
+110000111011
+110101100000
+001111111111
+010010100110
+001011111100
+111011000110
+101011010110
+001100011110
+010010010001
+011001110111
+110110110001
+010110100000
+110010011001
+001111000001
+100100010100
+000001111100
+000011101001
+101001110010
+011100000111
+001000011110
+010001111100
+010010110100
+110000111000
+100100001100
+010111100010
+010010001000
+100110001110
+111101110100
+011111011000
+001000110000
+000010100000
+010111000000
+001111101110
+000111110101
+001000001011
+111100001001
+011010011111
+011101101111
+000101011011
+000100000101
+001000010101
+000011000001
+011011010100
+011101100101
+000010110111
+001101000011
+000111001000
+001010000111
+111010101110
+100001111111
+101101110000
+010111011101
+111010111000
+011111000110
+011100001011
+101011100110
+011011100100
+010010000001
+001100101011
+000110111010
+010110011101
+010100101101
+100001100101
+011011010111
+111010111001
+111000001010
+100101011110
+001000011001
+101001101001
+011111000001
+010010111110
+101110110110
+111110010011
+100111011100
+001100100011
+100010101100
+111100001110
+010101101111
+010001000111
+110101111010
+011100100101
+110001010011
+000011100001
+001010111001
+011100011010
+010101010101
+001011000000
+101011110111
+011001110010
+010000001011
+000011100010
+010010000011
+011001111010
+000101011100
+111010000101
+001011111011
+011011101101
+100100110111
+111000101010
+100001110101
+101110010100
+000001100111
+101001101111
+100000001100
+110000101000
+110111011010
+010001001010
+000100000001
+110110101011
+011111101011
+101001100010
+000111100001
+010010001011
+101001010110
+011011100011
+000111011101
+100000100101
+000010100011
+111010001011
+111110111111
+101000111000
+110100100011
+010001110010
+001000010000
+111101011011
+110100011011
+010101100110
+010001101111
+001111011111
+101111110110
+011011101111
+000010101111
+000000110011
+011011000111
+010001000110
+010111101111
+110101011111
+001001000111
+011011001110
+100111110110
+111100100001
+111010100010
+010010000010
+000111110111
+111101000100
+000011110011
+111000101111
+110010011111
+000001101001
+001110101001
+011111101110
+110111010010
+011100110010
+100011000111
+000000010011
+011011111100
+011110010101
+110111101011
+011001111101
+010101010110
+011110011001
+111100011100
+011001010001
+000110110101
+000111010010
+101011101011
+101010100000
+011101011001
+001110111111
+011011010110
+110111100001
+100011111011
+001010011101
+111001101101
+011100001000
+011010011100
+100111010011
+000010010110
+010110010001
+111010010110
+111111110101
+100011000101
+011010001001
+111010001010
+000100000110
+011010001000
+100110101001
+010111111011
+010111100011
+011101010100
+101000011001
+101001110111
+111001010101
+100110111111
+111010110110
+100000011000
+110010100001
+001110011111
+010001011010
+011100100011
+010111011110
+100110110100
+111000001000
+110110101000
+000000001111
+010111101010
+000100000100
+111000110010
+011111110011
+001100100001
+010100000111
+111010100111
+010001101110
+101111110010
+011111000100
+101100111110
+010111101100
+011110111000
+110001000100
+011101000111
+011011101000
+000100100110
+100110100110
+000000001011
+010101001111
+110001000001
+100011010011
+101000100011
+011011010011
+100010001110
+100111101001
+101111111111
+111010011001
+011000010100
+110101011101
+100110101011
+010000011001
+010011011001
+010101000101
+010100011111
+100111001000
+111110100011
+000110010010
+000000010010
+101110001100
+111010000011
+100001001000
+000011010101
+000100011000
+001111111100
+011110101000
+101111011111
+100000111011
+101001100011
+001001100100
+000100010100
+010111101101
+101001111010
+011000101011
+111011010010
+011001101001
+011101010110
+011011110011
+010010101010
+001111010100
+100000010110
+001101000111
+000010101010
+110010001001
+011001111100
+000100001000
+010111001011
+101111100111
+100111100011
+100001010101
+100111011011
+100101000110
+011010100110
+100011101110
+111010110010
+010000100000
+100100110110
+011001101101
+011111100100
+101100101101
+101010110100
+101001000111
+110100010100
+011101001000
+101110101100
+111100010001
+001101011101
+111111110110
+101110001011
+001100101111
+110000001010
+110011001000
+011100000110
+011001101000
+001100001011
+111000111011
+111100000111
+010000000001
+000101011111
+001000101110
+101101101011
+111111110010
+111000001110
+110101111100
+101100010011
+010011110111
+100100010111
+111001101001
+101000001011
+110001110111
+100011111100
+000101011110
+011000101000
+001010011110
+100111111110
+100000111010
+001111010101
+011111010100
+001101101100
+010011111001
+001010101100
+001110111101
+000101010000
+100101101011
+010100101010
+000000001001
+010011000100
+010001000100
+110101100101
+110011011111
+100001010111
+111111011000
+010111111100
+111000101000
+101011101100
+111111011100
+001110110100
+000010100010
+111101110001
+101011000000
+101101000101
+110000000100
+110111111101
+101110100110
+111011000000
+001011010000
+100100101001
+111110101010
+111011110011
+111000000011
+000101101001
+110100011100
+111101000000
+100000100001
+010110001011
+001100111011
+110000100010
+111001010111
+100100001111
+110111111110
+010111000101
+110000010111
+100011010000
+101010110111
+011100101110
+001110001000
+110011100001
+100101001110
+110110110110
+101110001001
+011011001001
+110000101101
+001000001101
+001000000010
+110110010000
+011110001100
+100001011101
+000001010100
+010100111110
+101110111111
+101010101110
+001100010000
+100000001011
+010011101100
+101011011001
+111100000000
+011011110001
+001110001110
+010100100101
+111011101100
+011110101101
+010110100010
+101010001111
+110110000101
+101000110110
+101101001110
+111111101111
+001001110010
+001001011010
+111100100110
+000101010011
+100100001000
+110111010000
+010010001111
+000000100101
+001101110100
+101010110010
+011110010111
+100011001110
+111011010011
+110011111001
+110100100100
+110101001000
+110001111011
+010110001100
+011110111100
+010100000101
diff --git a/src/adventofcode2021/solutions/day03.py b/src/adventofcode2021/solutions/day03.py
new file mode 100644
index 00000000..5c78db34
--- /dev/null
+++ b/src/adventofcode2021/solutions/day03.py
@@ -0,0 +1,76 @@
+from collections import Counter
+
+from adventofcode2021.utils.abstract import FileReaderSolution
+
+
+class Day03:
+    pass
+
+
+class Day03PartA(Day03, FileReaderSolution):
+    def solve(self, input_data: str) -> int:
+        lines = [line for line in input_data.split("\n") if line]
+
+        new_line = ""
+        for bit in range(len(lines[0])):
+            bone = bzero = 0
+            for line in lines:
+                val = line[bit]
+                if val == "0":
+                    bzero += 1
+                else:
+                    bone += 1
+            if bone > bzero:
+                new_line += "1"
+            else:
+                new_line += "0"
+
+        bin_value = int(new_line, 2)
+        reversed_value = new_line.replace("0", "t").replace("1", "0").replace("t", "1")
+        inverted = int(reversed_value, 2)
+        return bin_value * inverted
+
+
+class Day03PartB(Day03, FileReaderSolution):
+    @staticmethod
+    def find_most_common(input_lines: list[str], n: int) -> Counter:
+        """Find the most common value in the list of inputs, on bit `n`"""
+        cnt = Counter()
+        for line in input_lines:
+            cnt[line[n]] += 1
+        return cnt
+
+    def find_value(self, bitlines, bit, hi_low: bool) -> int:
+        """
+        Find the value, and use bit as a tie breaker when the count is the same
+        """
+        # First copy the bitlines, make sure we don't modify the original value
+        bitlines = bitlines.copy()
+        for i in range(len(bitlines[0])):
+            cnt = self.find_most_common(bitlines, i)
+            if cnt["0"] == cnt["1"]:
+                to_keep = bit
+            else:
+                if hi_low:
+                    # Keep the most common bit.
+                    to_keep = cnt.most_common(1)[0][0]
+                else:
+                    # Keep the most common bit.
+                    to_keep = cnt.most_common(2)[1][0]
+
+            new_bitlines = []
+            for line in bitlines:
+                if line[i] == to_keep:
+                    new_bitlines.append(line)
+            bitlines = new_bitlines
+            if len(bitlines) == 1:
+                return int(bitlines[0], 2)
+        return False
+
+    def solve(self, input_data: str) -> int:
+        lines = [line for line in input_data.split("\n") if line]
+
+        oxygen = self.find_value(lines, "1", True)
+        co2 = self.find_value(lines, "0", False)
+
+        return oxygen * co2
diff --git a/tests/solutions/test_day03_a.py b/tests/solutions/test_day03_a.py
new file mode 100644
index 00000000..71d8489b
--- /dev/null
+++ b/tests/solutions/test_day03_a.py
@@ -0,0 +1,26 @@
+from adventofcode2021.solutions.day03 import Day03PartA
+
+
+class TestDay03PartA:
+    def test_day03a_solve(self):
+        test_data = """00100
+11110
+10110
+10111
+10101
+01111
+00111
+11100
+10000
+11001
+00010
+01010"""
+        solution = Day03PartA()
+        result = solution.solve(test_data)
+        assert result == 198
+
+    def test_day03a_data(self):
+        """Result we got when we did the real solution"""
+        solution = Day03PartA()
+        res = solution("day_03/day03.txt")
+        assert res == 3895776
diff --git a/tests/solutions/test_day03_b.py b/tests/solutions/test_day03_b.py
new file mode 100644
index 00000000..b0ae66ab
--- /dev/null
+++ b/tests/solutions/test_day03_b.py
@@ -0,0 +1,26 @@
+from adventofcode2021.solutions.day03 import Day03PartB
+
+
+class TestDay03PartB:
+    def test_day03b_solve(self):
+        test_data = """00100
+11110
+10110
+10111
+10101
+01111
+00111
+11100
+10000
+11001
+00010
+01010"""
+        solution = Day03PartB()
+        result = solution.solve(test_data)
+        assert result == 230
+
+    def test_day03b_data(self):
+        """Result we got when we did the real solution"""
+        solution = Day03PartB()
+        res = solution("day_03/day03.txt")
+        assert res == 7928162

From a2527668aaa11d741150c4d7eb8d4afbd298484c Mon Sep 17 00:00:00 2001
From: Roel Adriaans <roel@adriaans.org>
Date: Fri, 3 Dec 2021 21:55:04 +0100
Subject: [PATCH 041/371] Make pytest happy

---
 src/adventofcode2021/solutions/day03.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/adventofcode2021/solutions/day03.py b/src/adventofcode2021/solutions/day03.py
index 5c78db34..a4a941f3 100644
--- a/src/adventofcode2021/solutions/day03.py
+++ b/src/adventofcode2021/solutions/day03.py
@@ -35,7 +35,7 @@ class Day03PartB(Day03, FileReaderSolution):
     @staticmethod
     def find_most_common(input_lines: list[str], n: int) -> Counter:
         """Find the most common value in the list of inputs, on bit `n`"""
-        cnt = Counter()
+        cnt: Counter = Counter()
         for line in input_lines:
             cnt[line[n]] += 1
         return cnt

From cb8a216d7196282dc44b82da4a4dc20fb4c6ebaf Mon Sep 17 00:00:00 2001
From: Roel Adriaans <roel@adriaans.org>
Date: Sat, 4 Dec 2021 22:37:57 +0100
Subject: [PATCH 042/371] Implement day 4

---
 .../solutions/data/day_04/day04.txt           | 601 ++++++++++++++++++
 src/adventofcode2021/solutions/day04.py       | 137 ++++
 tests/solutions/test_day04_a.py               |  34 +
 tests/solutions/test_day04_b.py               |  35 +
 4 files changed, 807 insertions(+)
 create mode 100644 src/adventofcode2021/solutions/data/day_04/day04.txt
 create mode 100644 src/adventofcode2021/solutions/day04.py
 create mode 100644 tests/solutions/test_day04_a.py
 create mode 100644 tests/solutions/test_day04_b.py

diff --git a/src/adventofcode2021/solutions/data/day_04/day04.txt b/src/adventofcode2021/solutions/data/day_04/day04.txt
new file mode 100644
index 00000000..2a593328
--- /dev/null
+++ b/src/adventofcode2021/solutions/data/day_04/day04.txt
@@ -0,0 +1,601 @@
+90,4,2,96,46,1,62,97,3,52,7,35,50,28,31,37,74,26,59,53,82,47,83,80,19,40,68,95,34,55,54,73,12,78,30,63,57,93,72,77,56,91,23,67,64,79,85,84,76,10,58,0,29,13,94,20,32,25,11,38,89,21,98,92,42,27,14,99,24,75,86,51,22,48,9,33,49,18,70,8,87,61,39,16,66,71,5,69,15,43,88,45,6,81,60,36,44,17,41,65
+
+76 82  2 92 53
+74 33  8 89  3
+80 27 72 26 91
+30 83  7 16  4
+20 56 48  5 13
+
+67  7 75 66  4
+35 97 21 29 95
+58 98 56 71 65
+55 61 19 64  9
+38 34 42 30  2
+
+79 97 63 98 75
+ 1 13  0 76 46
+56 59 58 55 86
+43 27 73 67 31
+33 81 26 19  3
+
+ 3 37 33  8 19
+34 69 82  9 51
+56 45 15 85 79
+32 55 81 22 12
+42 20 48  7 75
+
+16 68 45 31 54
+57 40 77  5 76
+67 24 84 14 41
+21 23 27 36  7
+56  8 86 50 22
+
+28 53 81 26 40
+59 29 49 89 48
+10 44  3 42  7
+79 87 32 31 54
+15 23 65 69 56
+
+86 20 47  1 94
+ 3 91 77 14 83
+79 93  4 92 65
+ 0 67 30 36  7
+ 6 48 59 35 73
+
+75 87  7 28 25
+31 71 35 52 32
+47 99  0 80 33
+41 59 24 50 17
+93 58 26 81 53
+
+41 77 15 55 86
+20  5 54 79 93
+ 3 61 57 47  7
+85 98 91 39 13
+ 4 81 63 72 24
+
+27 37 57 38 72
+86 99 14  2 15
+94 25 73 13 54
+19 26 56  3  7
+ 1 49 33 24 21
+
+11 79 12 89  1
+23 98 49 66 48
+15 30 90 57 31
+55 47 61  9 74
+76 93 81 63 95
+
+51 92 84 77 26
+85 42 80 89 25
+82 41 73 58 49
+ 6 36 75  4 40
+62 11 56 24 69
+
+19 79 35 75 18
+ 7  4 12 78 70
+44 52 26 94 60
+71 65 61 89 87
+83 95 73 93 13
+
+36 79 62 91 58
+12 46  9 55 93
+98 32 68 87 69
+27 90 51 45  2
+15 43 29 26 40
+
+29 47 78 54 31
+98 65 71  8 72
+75 51 13 80  2
+93 69 20 52 96
+33 91  3 37 62
+
+94 74  2 23 71
+16 95 52 31 80
+ 3  4 28  9 50
+ 6 40 47 62 48
+97 43 85 11 99
+
+20 64 23 36 39
+22 31 75 45 24
+53 19 17 58 51
+66  4 81 72 37
+34 82 42 91 48
+
+22 15 43 97 13
+73 71 88  1 48
+84  4 29 87 95
+90 40 11 67  6
+23 10 12 64 99
+
+29 61  2 34 89
+93 87 10 42 65
+13 45 88 30 69
+71 78  1 20 19
+44 75  9 84 37
+
+48 89 80 68 45
+81 12  1 64 77
+79 87 21 26 40
+44 82 46 78 54
+33 63  8  0 98
+
+ 0 62 13 43 93
+11 66 99 86 55
+27 89 51 98 46
+39 76 73 24 37
+23 68 72 80 64
+
+37 89 58 78 76
+41  9 22 97 82
+40 39 73 96  8
+91  4 84 35 34
+70 12 79 75  7
+
+26 18 12 88 97
+10 51 62 53 79
+24 47 31 89 21
+57 96  1 17 80
+58 92  7 14 60
+
+12 23  6 71 64
+82 40 15 18 29
+53 21 76 52 84
+32 86 89 22 91
+74 58 80  2 63
+
+71 96 10 39 87
+45 68 94 76 33
+59 60 11 62 88
+13 37 63 47  7
+44 79 24 21 16
+
+80 71 39 36  1
+ 9 23 55 58 91
+65 60 19 25 22
+ 0 88 98 83 93
+82 69 43 78  8
+
+67 80 42 49 97
+ 7 18 92 98 89
+21 95 61  8 64
+76 63 52 68 87
+47 34 84 45 96
+
+40  0 45 33 79
+18 56 83  6 58
+66  7  4 25 61
+91 46 60 22 99
+62 65 64 84 17
+
+68 18 96 88 61
+89 55 81 20 70
+60 76 17 69 40
+37 63 41 54 11
+43 94 58 47 31
+
+60 63 64 26 21
+87 99 49 11 16
+70 41 50  1 38
+45 98 94 67 62
+13 34 61 92 40
+
+56 64 37 26 34
+69 16 72 75 77
+19  8 50 38 98
+ 0  2 99 48 20
+68 35 88 57 90
+
+17 41 40 48 54
+67 52 63 25 78
+95 26 12 85 37
+69 93 58 62 11
+47 33 14 35 81
+
+26 51 80 31 64
+ 2  7 59 37 57
+70 78 52 91 50
+86  0 15 20 25
+85 79 41 98 83
+
+91 86 31 63  4
+81 37 77 94 74
+45 95 88 23 40
+29 46 79 18 70
+75 14 20 51 68
+
+30 59 37 56 99
+74 14  4 21 53
+61 49 84 40 33
+20 51 79 66 27
+58 23 88 17 75
+
+46 64 31  6 61
+38 14 77 83 59
+13 81 91 17 24
+11 96 90 10 49
+73 82  1 69 45
+
+21 57 79 10 41
+67 74 96 20 94
+29 40 78  9 85
+23 25 49  0 39
+59 88 58 86 92
+
+ 1 22 49 43 32
+47 56 18 16 25
+42 57 48 53 46
+78 20 89 36 96
+24 28 76 39 29
+
+53 66 38 11 94
+49 27 25  1 82
+12 72 50 61 51
+97 92 96  4 89
+47 44 21 24 81
+
+16 70 78 12 63
+87 32 95 99 64
+68 54 85 53 94
+88 22 52  3 23
+48 27  1 58 31
+
+71 62 41 44 49
+67 98 61 48 46
+47  9 24 30 51
+29 76 57 53 34
+23 96 42  5 73
+
+50 72 56 97  2
+20  5  3 55 93
+24  7 22  9 96
+58 60 38 17 36
+11 54 79 28 53
+
+13 21 35 79 91
+ 8 28 68 54  6
+ 0 25 82 78  1
+29 99 41 46 95
+66 72 17 55 76
+
+43 42  7 85 90
+91 80 79 72  8
+34 77 44 30 92
+48 49 40 70 86
+28 69 27 84 73
+
+17 94 67 26 63
+68 77 71 23 13
+ 6 96 11 21 73
+53 33 80 62 99
+60 36 38 32 75
+
+75 83 50 32 29
+61 94  4 35 51
+52 77 54 69  5
+36 89 76 26 71
+74 19 13 33 18
+
+29 24 28  5 54
+56 86 37 45 83
+34 77 42 58 76
+82  1  4 39 64
+61 26 99 72 89
+
+25 80 23 88  2
+76 93 90 86 52
+17 62 55 83  7
+57 81 24  0 99
+67 44 27  4 94
+
+71 26 62 63 31
+ 4 15 38  0 89
+41 77 34 42 19
+39 90 45 30 73
+ 3 33  8 50 55
+
+65 26 20  8 70
+96 24 88 29 46
+22  6 21  4 72
+59 32 18 49 61
+28 58 66 67 92
+
+68 45 62 77 40
+53  1 21 11 83
+44 88 81 56 89
+29 32 47  0 50
+26 74 78 59  6
+
+52 56 23 84 74
+64 21 45 35 75
+82 86 60 97 83
+69 78 15 20 37
+68 36 17 43 28
+
+92 33 36 48 34
+75 77 79 39 88
+61 28 21  2 94
+84 89 17 22 67
+38 41  7 80 12
+
+27 34 91 21 87
+ 5 65  7 70 36
+31  3 38 49 61
+96 62 50 97 20
+47 37 16 59 76
+
+39 50  3 25 31
+37 36 88 40 14
+26 70 75 30  9
+97 42 86 90 20
+38 66 22  4 69
+
+62 64 72 11 79
+50  0 89 30 70
+83 53 93 39 22
+90 20 80 55 32
+ 6 12 19 27  2
+
+17 85 24 50 13
+12 41 75 74 35
+ 3 88 69 73  1
+77 34 71 32 44
+96 26 37 46  9
+
+84 20 33  4 21
+ 5 22 19 91 51
+23 56 44 43 68
+ 6 50 70 47 46
+75 81 34 32 13
+
+ 6 36 27 32 59
+ 4 75 63 86 48
+81 49 44  7 25
+ 0 69 11 43 91
+87 39 23 47 98
+
+53 16 97 94 69
+ 4 43  9 67 33
+21 83 32 87 35
+55 78 68 28 75
+51 19 82 54 24
+
+50 84 63 21 92
+51 52 97 66  1
+22 44 31 64 49
+83 24  2 35 45
+15 16 71 60 58
+
+54 83 48 63  2
+43 82 65 20 42
+52 86 58 27 75
+ 7 76 64 18 11
+77 93 67  0 25
+
+12 60 93 99 37
+29 44 47  4 89
+30 63 52 66 91
+ 2 38 72 84  6
+ 1 96  5 18 33
+
+76 61 58 41 43
+21 69 55 18 79
+40 59  9  7 36
+77 82 47 84 89
+92 13 49  6 62
+
+33 68 74 92 24
+28  3 15 77 37
+83 72 21 71 29
+88 64 47 35 44
+51 18 31 95 99
+
+71 50 97 18 77
+29 30  0 88 49
+98 99 95 11  1
+46 83 64 55 56
+ 9  6 59 87 19
+
+71 41 13 33  4
+23 22 26 28 82
+95 62  7 34 64
+10 68 14 21 37
+73 53 88 81  1
+
+16 87 61 58 95
+90 27  3 65 38
+35 17 85  6 47
+69 22 54 83 82
+28 67 96 48 88
+
+17 47 81 13 77
+64 86 82 62 24
+40 41 52 50 15
+ 4 71  2 90 22
+61 38 20 78 34
+
+65 51 54 10 16
+52 28 68 75  8
+26 97 96 49 73
+95 17 64 80 34
+ 5 76 25 66 77
+
+30 10 42 72 75
+67 85 36 64 25
+61 48 59 96 98
+81 89  3  4 46
+33 84 32 78 80
+
+93 24  5 21 95
+18  1 66 57 31
+ 2 17 62  8 28
+73 10 38 25 63
+91 71 48 44  4
+
+92 54 34  5 74
+ 8 31 94 24 44
+43  2 64 49 21
+73 19 99 60 78
+ 0 23 16 86 85
+
+25 34  6 67 71
+79 76 39 81 32
+23 36 82 92 50
+10 51 55 40 80
+20 44 30 24 28
+
+74 22 58 26 10
+36 43 76 93 15
+87 55  6 91 37
+81 86  8 99 30
+78 62 50 44 54
+
+16 14 79 80 42
+27 83 26 82 29
+43 76  9 66  5
+75 77 99 45 10
+ 2 61 32 73 91
+
+16 60 83 81 47
+23 27 59 85 24
+75 33 36 86 15
+70 91 55 93 63
+25 32 53 14 82
+
+98 87 40 52  0
+86 58 74  2 84
+24 99 61 41 92
+77 17  1 43 57
+62 70 94 89 19
+
+ 7 18 19 85 98
+40  0 99 45 63
+59 49 37 42  5
+58 82 25 53  4
+ 2  1 62 68 33
+
+21 87 18 29 34
+53 24 26 67 25
+49 77  4 64 59
+52 12 97  2 36
+66 76  9 74 95
+
+92 44 14 18 48
+31 74 79 86 58
+68 12 33 55 56
+97 94 25 41 65
+29 36 53 60 62
+
+23 26 85 88  7
+96  1 75 76  9
+49 44 18 78 59
+64 83 19 30 74
+52 95 66 62 22
+
+43 99 38 73 33
+36 46 24 32 91
+47 68 15  5 81
+37 20  0 97 50
+12 30 53  4 55
+
+26 33 49 91 30
+61 22  7 12 82
+ 4 36  1  6 11
+96 14 35 90 50
+97 25 28 32 58
+
+92 36 56 10 62
+73 35 60 25 34
+96 24 16 53 84
+37 51 30 58  1
+20 80 43 63 45
+
+39 68 53 30 91
+11 97 10 12 55
+ 6 76 57 77 48
+56 51 98 71 82
+46 27 54 33  5
+
+19 38 63 64 61
+48 28 29 60 72
+99 94 55 25 76
+98 37  7  3 80
+10  2 16 35 50
+
+16 68 75 19 58
+28 21 56 11 46
+60 25 32 88 30
+53 62 69  7 91
+73 94 24  6 38
+
+69  4 37 70 54
+67 17  2 57 16
+72 30 43 58  1
+ 6 56 28 86 18
+ 7 94 55 35 77
+
+73 32 57 79  1
+89 17 26 44 29
+11 86 94 38 74
+49 98 54 76  6
+67 45 87 21 51
+
+14 73 22 48 69
+78 89  4 32 18
+96 59 26 43 92
+68 33 97 53 35
+61 52 87 57 31
+
+86  1 22 31 20
+14 84 23 38 18
+57 67  5 90  6
+91 21 52 65 36
+61 56  3 51 25
+
+60  5 98 31 76
+ 3 44 24 16 63
+ 0 96 56 25 84
+88 18 71 93 19
+26 77 86 23 65
+
+62 58 11 34 26
+35 56 97 67 90
+20 65 27 73 77
+ 4 84 19 82 45
+43 92 18 68 55
+
+33 46 21 41 75
+98 73 67 80 81
+84 16 44 93 94
+ 1  9 26 97 52
+88 74 12 95 99
+
+46 83 30 22 79
+72 26 42 74 33
+54 41 94 86 82
+27 81 31 34 12
+77  6 38 56 71
+
+22 80 82 60 24
+20 49 51 58 59
+47 35 67 92 78
+15  8 71 97 63
+37 27 98 16 38
+
+71 94 59 27 83
+81 68 58 61 43
+12 75 93 70 56
+19 28 99 39 20
+18 22 34 78 13
+
+43 70 54 13 60
+17 24 31 47 84
+88 15 40 45 76
+ 7 78 63 75 56
+23 66 96 26 46
+
+ 2 16 13 57 32
+26 70 37 50 68
+58 17  3 96 67
+33 95 72 59 42
+94 43 51 20 60
diff --git a/src/adventofcode2021/solutions/day04.py b/src/adventofcode2021/solutions/day04.py
new file mode 100644
index 00000000..aaef13a3
--- /dev/null
+++ b/src/adventofcode2021/solutions/day04.py
@@ -0,0 +1,137 @@
+from collections import defaultdict
+from typing import Literal, Union
+
+from adventofcode2021.utils.abstract import FileReaderSolution
+
+
+class Number:
+    number: int
+    picked: bool
+
+    def __init__(self, number: int):
+        self.number = number
+        self.picked = False
+
+    def __repr__(self):
+        if self.picked:
+            return f"*{self.number:2}*"
+        else:
+            return f" {self.number:2}"
+
+
+class Board:
+    board: dict[int, dict[int, Number]]
+
+    def __init__(self, string: list[str]):
+        """Create a bingo board"""
+        self.board = defaultdict(dict)
+        for row, line in enumerate(string):
+            for col, value in enumerate(int(s) for s in line.split() if s.isdigit()):
+                self.board[row][col] = Number(value)
+
+    def draw(self, number):
+        for x in self.board.values():
+            for y in x.values():
+                if y.number == number:
+                    y.picked = True
+
+    def is_winner(self) -> bool:
+        # Check horizontal win
+        for x in self.board.values():
+            val = all(n.picked for n in x.values())
+            if val:
+                return True
+        # Check vertital win:
+        for y in range(5):
+            if all([x[y].picked for x in self.board.values()]):
+                return True
+        return False
+
+    def unmarked_numbers(self) -> int:
+        total = 0
+        for x in self.board.values():
+            for y in x.values():
+                if not y.picked:
+                    total += y.number
+        return total
+
+
+class Day04:
+    boards: list[Board]
+    random_numbers: list[int]
+
+    def read_input(self, input_data):
+        lines = input_data.splitlines()
+        self.boards = []
+        self.random_numbers = [int(num) for num in lines[0].split(",")]
+
+        for board_start in range(2, len(lines) - 2, 6):
+            board_text = lines[board_start : board_start + 5]
+            board = Board(board_text)
+            self.boards.append(board)
+
+    def is_winner(self) -> Union[Literal[False], Board]:
+        """Do we have any wining boards?"""
+        for board in self.boards:
+            if board.is_winner():
+                return board
+        return False
+
+    def all_won(self):
+        return all(board.is_winner() for board in self.boards)
+
+    def draw(self, number):
+        for board in self.boards:
+            board.draw(number)
+
+
+class Day04PartA(Day04, FileReaderSolution):
+    def solve(self, input_data: str) -> int:
+        self.read_input(input_data)
+
+        number = -1
+        won_board: Union[Literal[False], Board] = False
+
+        for number in self.random_numbers:
+            self.draw(number)
+            if won_board := self.is_winner():
+                break
+
+        # Winner winner, chicken dinner!
+        # Find the sum of all unmarked numbers
+        if won_board:
+            unmarked = won_board.unmarked_numbers()
+            return unmarked * number
+        else:
+            return -1
+
+
+class Day04PartB(Day04, FileReaderSolution):
+    def solve(self, input_data: str) -> int:
+        self.read_input(input_data)
+
+        last_won: Union[Literal[False], Board] = False
+        number = -1
+        already_won = set()
+        for number in self.random_numbers:
+            self.draw(number)
+            for board in self.boards:
+                if board.is_winner() and board not in already_won:
+                    last_won = board
+
+            if self.all_won():
+                break
+
+            # We're not done yet, to let's add all the boards that have won on this
+            # round to the set
+            for board in self.boards:
+                if board not in already_won and board.is_winner():
+                    already_won.add(board)
+
+        # Winner winner, chicken dinner!
+        # Find the sum of all unmarked numbers
+        if last_won:
+            unmarked = last_won.unmarked_numbers()
+            return unmarked * number
+        else:
+            return -1
diff --git a/tests/solutions/test_day04_a.py b/tests/solutions/test_day04_a.py
new file mode 100644
index 00000000..20d6855b
--- /dev/null
+++ b/tests/solutions/test_day04_a.py
@@ -0,0 +1,34 @@
+from adventofcode2021.solutions.day04 import Day04PartA
+
+
+class TestDay04PartA:
+    def test_day04a_solve(self):
+        test_data = """7,4,9,5,11,17,23,2,0,14,21,24,10,16,13,6,15,25,12,22,18,20,8,19,3,26,1
+
+22 13 17 11  0
+ 8  2 23  4 24
+21  9 14 16  7
+ 6 10  3 18  5
+ 1 12 20 15 19
+
+ 3 15  0  2 22
+ 9 18 13 17  5
+19  8  7 25 23
+20 11 10 24  4
+14 21 16 12  6
+
+14 21 17 24  4
+10 16 15  9 19
+18  8 23 26 20
+22 11 13  6  5
+ 2  0 12  3  7
+ """
+        solution = Day04PartA()
+        result = solution.solve(test_data)
+        assert result == 4512
+
+    def test_day04a_data(self):
+        """Result we got when we did the real solution"""
+        solution = Day04PartA()
+        res = solution("day_04/day04.txt")
+        assert res == 8136
diff --git a/tests/solutions/test_day04_b.py b/tests/solutions/test_day04_b.py
new file mode 100644
index 00000000..1fd8833c
--- /dev/null
+++ b/tests/solutions/test_day04_b.py
@@ -0,0 +1,35 @@
+from adventofcode2021.solutions.day04 import Day04PartB
+
+
+class TestDay04PartB:
+    def test_day04b_solve(self):
+        test_data = """7,4,9,5,11,17,23,2,0,14,21,24,10,16,13,6,15,25,12,22,18,20,8,19,3,26,1
+
+22 13 17 11  0
+ 8  2 23  4 24
+21  9 14 16  7
+ 6 10  3 18  5
+ 1 12 20 15 19
+
+ 3 15  0  2 22
+ 9 18 13 17  5
+19  8  7 25 23
+20 11 10 24  4
+14 21 16 12  6
+
+14 21 17 24  4
+10 16 15  9 19
+18  8 23 26 20
+22 11 13  6  5
+ 2  0 12  3  7
+ """
+
+        solution = Day04PartB()
+        result = solution.solve(test_data)
+        assert result == 1924
+
+    def test_day04b_data(self):
+        """Result we got when we did the real solution"""
+        solution = Day04PartB()
+        res = solution("day_04/day04.txt")
+        assert res == 12738

From bf6f05882e07f30c9ab05bfe30b8d7d5143654c9 Mon Sep 17 00:00:00 2001
From: Roel Adriaans <roel@adriaans.org>
Date: Sun, 5 Dec 2021 21:50:01 +0100
Subject: [PATCH 043/371] Implement day 5, part 1

---
 .../solutions/data/day_05/day05.txt           | 500 ++++++++++++++++++
 src/adventofcode2021/solutions/day05.py       |  59 +++
 tests/solutions/test_day05_a.py               |  25 +
 3 files changed, 584 insertions(+)
 create mode 100644 src/adventofcode2021/solutions/data/day_05/day05.txt
 create mode 100644 src/adventofcode2021/solutions/day05.py
 create mode 100644 tests/solutions/test_day05_a.py

diff --git a/src/adventofcode2021/solutions/data/day_05/day05.txt b/src/adventofcode2021/solutions/data/day_05/day05.txt
new file mode 100644
index 00000000..39de4e8f
--- /dev/null
+++ b/src/adventofcode2021/solutions/data/day_05/day05.txt
@@ -0,0 +1,500 @@
+419,207 -> 419,109
+300,888 -> 803,385
+104,959 -> 457,959
+987,951 -> 987,385
+173,602 -> 919,602
+173,70 -> 305,70
+341,19 -> 486,19
+128,579 -> 128,100
+210,867 -> 969,867
+880,493 -> 880,58
+937,831 -> 131,25
+520,921 -> 476,965
+760,147 -> 461,147
+646,108 -> 646,27
+99,906 -> 99,591
+19,956 -> 19,273
+89,201 -> 326,201
+275,948 -> 962,261
+292,489 -> 689,489
+674,109 -> 20,763
+861,861 -> 529,529
+155,200 -> 273,200
+628,803 -> 209,384
+654,401 -> 578,325
+723,625 -> 828,730
+137,406 -> 862,406
+893,45 -> 41,897
+631,10 -> 941,320
+618,435 -> 537,435
+939,29 -> 30,938
+505,796 -> 505,244
+799,779 -> 77,779
+938,576 -> 427,576
+522,635 -> 405,518
+244,89 -> 946,89
+447,791 -> 316,660
+560,731 -> 687,731
+16,878 -> 835,59
+45,707 -> 45,565
+767,166 -> 404,529
+791,260 -> 791,950
+373,949 -> 373,156
+38,774 -> 38,557
+445,537 -> 445,370
+817,756 -> 959,898
+472,551 -> 952,71
+696,381 -> 657,420
+43,829 -> 43,190
+101,635 -> 728,635
+197,532 -> 140,532
+693,368 -> 299,368
+433,140 -> 433,610
+136,58 -> 136,666
+472,294 -> 886,294
+690,883 -> 671,864
+141,598 -> 141,118
+56,651 -> 56,957
+747,82 -> 747,91
+219,455 -> 55,291
+444,131 -> 444,802
+326,459 -> 528,661
+245,965 -> 143,965
+916,316 -> 630,316
+263,55 -> 977,769
+262,451 -> 587,451
+960,178 -> 960,564
+960,88 -> 476,572
+314,259 -> 314,169
+404,742 -> 429,742
+830,921 -> 409,921
+181,396 -> 463,678
+338,293 -> 23,608
+851,667 -> 851,350
+181,859 -> 718,322
+314,240 -> 870,796
+778,984 -> 77,283
+476,178 -> 440,178
+935,357 -> 841,263
+695,683 -> 414,964
+760,241 -> 306,241
+390,355 -> 791,355
+460,710 -> 851,710
+559,448 -> 870,448
+161,526 -> 301,386
+935,495 -> 633,193
+205,536 -> 383,536
+290,626 -> 290,94
+55,972 -> 946,81
+240,531 -> 631,922
+189,806 -> 573,806
+518,827 -> 866,479
+239,829 -> 260,829
+151,51 -> 849,51
+301,736 -> 532,736
+23,889 -> 336,889
+284,124 -> 284,933
+637,610 -> 67,40
+610,828 -> 610,159
+763,590 -> 763,963
+804,576 -> 804,694
+689,872 -> 82,265
+440,377 -> 190,127
+933,330 -> 310,953
+873,99 -> 873,328
+756,808 -> 860,808
+119,64 -> 928,873
+74,144 -> 489,559
+957,938 -> 838,938
+148,320 -> 932,320
+386,171 -> 386,985
+357,171 -> 494,171
+254,67 -> 254,95
+196,910 -> 827,910
+107,114 -> 758,114
+971,40 -> 801,40
+504,602 -> 215,891
+184,310 -> 720,846
+280,300 -> 955,975
+49,637 -> 49,572
+352,512 -> 739,899
+610,123 -> 585,123
+808,881 -> 758,881
+646,980 -> 818,980
+948,482 -> 384,482
+115,144 -> 852,881
+506,836 -> 547,836
+985,369 -> 374,980
+883,975 -> 48,975
+447,664 -> 312,799
+24,597 -> 24,331
+45,19 -> 979,953
+210,689 -> 210,430
+704,806 -> 704,612
+985,982 -> 124,121
+70,174 -> 550,174
+463,12 -> 637,12
+107,97 -> 716,97
+935,265 -> 390,810
+42,223 -> 42,86
+60,245 -> 60,473
+695,735 -> 208,735
+547,265 -> 802,265
+941,667 -> 941,806
+250,286 -> 611,286
+10,64 -> 630,64
+482,889 -> 482,150
+441,820 -> 776,820
+529,474 -> 529,265
+533,465 -> 217,149
+242,473 -> 242,830
+633,160 -> 476,317
+942,24 -> 942,784
+80,313 -> 92,325
+295,109 -> 295,712
+31,964 -> 857,138
+285,255 -> 955,925
+650,610 -> 650,366
+722,586 -> 625,586
+580,384 -> 580,531
+78,407 -> 896,407
+296,310 -> 730,744
+717,966 -> 924,966
+524,551 -> 524,671
+44,127 -> 784,867
+214,849 -> 238,849
+749,320 -> 749,241
+886,146 -> 336,696
+889,933 -> 455,499
+644,232 -> 79,797
+400,979 -> 626,979
+433,681 -> 433,523
+447,57 -> 676,57
+185,416 -> 659,890
+849,645 -> 257,53
+633,721 -> 633,901
+766,355 -> 766,56
+669,393 -> 669,523
+833,336 -> 833,58
+52,114 -> 52,413
+699,957 -> 109,957
+14,953 -> 945,22
+641,15 -> 929,303
+25,874 -> 866,33
+856,73 -> 28,901
+94,892 -> 592,892
+256,357 -> 256,700
+960,579 -> 31,579
+940,859 -> 940,987
+507,673 -> 820,986
+164,361 -> 133,361
+210,424 -> 876,424
+28,186 -> 28,376
+452,149 -> 531,149
+142,160 -> 142,435
+180,801 -> 180,439
+681,267 -> 42,267
+724,414 -> 786,476
+762,492 -> 762,427
+902,808 -> 227,133
+70,923 -> 821,172
+468,12 -> 457,12
+208,129 -> 986,907
+78,786 -> 78,352
+573,869 -> 820,869
+780,680 -> 520,940
+276,66 -> 276,244
+423,629 -> 592,629
+888,507 -> 888,139
+869,878 -> 869,951
+274,614 -> 625,965
+926,289 -> 982,233
+102,687 -> 102,214
+52,264 -> 52,12
+904,43 -> 657,43
+184,685 -> 184,628
+506,912 -> 601,817
+356,524 -> 87,524
+202,260 -> 202,276
+970,63 -> 83,950
+402,332 -> 950,880
+195,666 -> 843,666
+13,82 -> 892,961
+614,28 -> 614,871
+892,162 -> 892,101
+363,665 -> 59,665
+768,208 -> 410,208
+483,300 -> 295,300
+590,108 -> 881,108
+837,967 -> 837,326
+368,731 -> 368,913
+900,921 -> 873,921
+896,931 -> 848,979
+562,939 -> 857,939
+85,351 -> 598,351
+917,30 -> 624,30
+605,314 -> 605,303
+382,655 -> 340,697
+949,115 -> 653,115
+667,311 -> 370,608
+971,983 -> 39,51
+178,687 -> 178,69
+906,197 -> 296,807
+947,886 -> 383,322
+551,667 -> 551,238
+86,65 -> 916,895
+589,887 -> 865,611
+332,53 -> 84,53
+361,148 -> 55,148
+883,205 -> 661,205
+415,552 -> 52,552
+46,42 -> 46,952
+955,13 -> 39,929
+677,482 -> 208,482
+414,268 -> 927,268
+101,509 -> 101,149
+946,971 -> 139,164
+223,597 -> 223,517
+805,896 -> 796,896
+565,875 -> 878,875
+472,431 -> 472,732
+643,15 -> 643,202
+618,725 -> 618,284
+376,532 -> 376,120
+807,981 -> 415,981
+716,401 -> 61,401
+893,955 -> 743,805
+264,935 -> 264,677
+586,908 -> 638,908
+780,277 -> 780,418
+234,410 -> 428,410
+899,214 -> 899,703
+948,51 -> 948,509
+238,664 -> 879,23
+20,877 -> 638,877
+146,738 -> 109,738
+670,893 -> 524,893
+317,423 -> 27,713
+91,600 -> 477,986
+902,63 -> 902,797
+647,839 -> 647,667
+227,358 -> 236,349
+985,541 -> 660,866
+86,562 -> 86,949
+368,851 -> 863,356
+327,905 -> 57,635
+561,275 -> 781,495
+196,65 -> 626,65
+110,688 -> 720,78
+720,472 -> 115,472
+817,135 -> 817,876
+752,387 -> 752,104
+78,127 -> 635,684
+812,170 -> 155,170
+606,718 -> 804,916
+843,494 -> 979,494
+919,346 -> 454,346
+866,828 -> 818,828
+114,115 -> 114,250
+895,308 -> 370,308
+665,893 -> 690,893
+939,275 -> 741,275
+290,321 -> 290,910
+747,327 -> 107,967
+734,715 -> 391,372
+368,497 -> 506,359
+773,945 -> 391,563
+772,537 -> 733,537
+271,679 -> 488,679
+665,745 -> 665,984
+143,177 -> 685,719
+671,860 -> 147,860
+674,365 -> 857,182
+343,74 -> 985,716
+284,46 -> 180,46
+595,800 -> 20,225
+57,278 -> 792,278
+649,285 -> 165,769
+600,24 -> 600,116
+862,939 -> 862,871
+153,917 -> 682,388
+117,884 -> 257,884
+726,763 -> 531,763
+810,985 -> 899,985
+718,942 -> 718,466
+674,19 -> 674,203
+117,677 -> 117,918
+928,261 -> 928,945
+719,390 -> 719,321
+822,601 -> 484,263
+725,793 -> 725,111
+201,745 -> 588,745
+404,889 -> 908,385
+981,39 -> 610,410
+148,426 -> 711,989
+128,260 -> 319,451
+325,306 -> 325,585
+557,415 -> 557,745
+915,101 -> 648,101
+104,636 -> 104,520
+93,964 -> 641,416
+201,709 -> 201,90
+921,571 -> 798,571
+313,624 -> 313,510
+343,649 -> 28,649
+688,246 -> 24,910
+696,610 -> 353,610
+126,310 -> 126,394
+457,98 -> 457,981
+277,707 -> 277,531
+943,721 -> 37,721
+959,295 -> 702,295
+23,547 -> 891,547
+209,114 -> 931,836
+737,174 -> 737,195
+208,890 -> 115,797
+170,401 -> 726,401
+11,218 -> 11,297
+989,10 -> 10,989
+866,86 -> 487,86
+867,31 -> 867,334
+846,414 -> 861,414
+478,315 -> 478,697
+572,843 -> 731,843
+657,12 -> 161,508
+903,194 -> 142,955
+612,321 -> 147,786
+813,920 -> 259,920
+834,389 -> 651,206
+824,153 -> 824,557
+399,871 -> 115,871
+270,785 -> 270,120
+469,640 -> 753,640
+620,132 -> 620,175
+620,234 -> 666,234
+594,409 -> 948,55
+670,323 -> 670,89
+262,65 -> 262,379
+879,617 -> 284,22
+493,423 -> 761,423
+17,931 -> 906,42
+512,494 -> 473,494
+122,230 -> 122,87
+15,207 -> 533,207
+216,183 -> 50,183
+360,107 -> 280,107
+403,841 -> 941,841
+913,442 -> 500,29
+864,947 -> 864,85
+500,516 -> 634,382
+283,20 -> 669,20
+916,770 -> 176,30
+966,73 -> 252,787
+847,841 -> 171,165
+163,219 -> 766,219
+482,515 -> 275,308
+528,949 -> 240,949
+725,574 -> 847,696
+109,131 -> 109,538
+655,837 -> 476,837
+803,631 -> 803,51
+977,83 -> 149,911
+207,231 -> 171,231
+617,29 -> 617,294
+838,708 -> 446,708
+711,597 -> 612,498
+975,942 -> 279,246
+315,128 -> 315,293
+146,962 -> 873,235
+448,180 -> 54,180
+177,680 -> 866,680
+891,265 -> 741,265
+656,949 -> 414,949
+909,456 -> 196,456
+574,286 -> 58,286
+861,691 -> 861,383
+779,351 -> 779,827
+459,989 -> 459,350
+936,480 -> 936,699
+645,309 -> 348,606
+861,62 -> 621,302
+568,324 -> 568,358
+889,221 -> 889,335
+538,759 -> 538,266
+780,736 -> 780,827
+866,518 -> 983,401
+67,871 -> 840,98
+432,664 -> 664,664
+146,24 -> 755,24
+964,585 -> 964,770
+372,144 -> 809,144
+688,827 -> 867,827
+137,916 -> 137,942
+846,131 -> 846,46
+764,21 -> 457,328
+140,66 -> 799,725
+703,224 -> 83,844
+557,67 -> 557,681
+355,544 -> 764,135
+625,893 -> 126,394
+842,214 -> 842,322
+582,778 -> 582,762
+341,861 -> 341,859
+143,767 -> 52,858
+114,109 -> 114,200
+394,210 -> 396,212
+861,353 -> 861,652
+873,553 -> 62,553
+44,962 -> 984,22
+734,56 -> 734,828
+798,516 -> 950,516
+367,755 -> 367,618
+868,637 -> 868,780
+192,952 -> 192,734
+603,109 -> 705,211
+12,17 -> 984,989
+910,147 -> 910,620
+515,749 -> 515,517
+775,136 -> 761,150
+662,636 -> 662,21
+894,490 -> 310,490
+956,732 -> 297,73
+514,99 -> 140,99
+308,419 -> 691,419
+485,86 -> 485,187
+737,783 -> 979,783
+90,76 -> 869,855
+959,112 -> 84,112
+879,494 -> 879,257
+933,425 -> 933,619
+64,391 -> 64,21
+106,305 -> 253,452
+324,152 -> 853,152
+666,225 -> 39,852
+370,904 -> 257,791
+592,845 -> 592,15
+936,971 -> 267,302
+147,210 -> 62,210
+308,323 -> 495,323
+212,918 -> 110,918
+229,392 -> 685,848
+896,132 -> 326,702
+483,143 -> 605,265
+251,317 -> 130,317
+758,93 -> 445,93
+156,286 -> 458,286
+401,904 -> 383,904
+244,256 -> 851,256
+928,411 -> 612,411
+642,920 -> 642,420
+494,707 -> 494,225
+87,112 -> 87,256
+972,907 -> 83,18
+139,104 -> 139,761
+493,725 -> 493,529
+981,145 -> 459,667
+390,240 -> 702,240
+466,982 -> 807,982
+320,143 -> 692,515
+477,649 -> 477,206
+456,254 -> 456,578
diff --git a/src/adventofcode2021/solutions/day05.py b/src/adventofcode2021/solutions/day05.py
new file mode 100644
index 00000000..33e9efd1
--- /dev/null
+++ b/src/adventofcode2021/solutions/day05.py
@@ -0,0 +1,59 @@
+import re
+from collections import Counter
+from dataclasses import dataclass
+
+from adventofcode2021.utils.abstract import FileReaderSolution
+
+
+@dataclass
+class Point:
+    x: int
+    y: int
+
+
+class Day05:
+    def parse_lines(self, line) -> (Point, Point):
+        """ "
+        Parse 2,2 -> 2,1 or 419,207 -> 419,109
+        As x1,y1 -> x2,y2
+        """
+        regex = r"^(?P<x1>\d*),(?P<y1>\d*) -> (?P<x2>\d*),(?P<y2>\d*)$"
+        matches = re.search(regex, line)
+        assert matches
+        p1 = Point(x=int(matches["x1"]), y=int(matches["y1"]))
+        p2 = Point(x=int(matches["x2"]), y=int(matches["y2"]))
+        return p1, p2
+
+    def find_overlap(self, points: list[(Point, Point)]) -> list[Point]:
+        """Find the overlapping locations in the list of points"""
+        locations = Counter()
+
+        for line in points:
+            # Make sure that the start is lower then the end. range(5, 0) does not work
+            x_start = min(line[0].x, line[1].x)
+            x_stop = max(line[0].x, line[1].x)
+            y_start = min(line[0].y, line[1].y)
+            y_stop = max(line[0].y, line[1].y)
+            for x in range(x_start, x_stop + 1):
+                for y in range(y_start, y_stop + 1):
+                    locations[(x, y)] += 1
+
+        # Filter out locations with at least 2 hits
+        return [location[0] for location in locations.items() if location[1] > 1]
+
+
+class Day05PartA(Day05, FileReaderSolution):
+    def solve(self, input_data: str) -> int:
+        points = []
+        for line in input_data.splitlines():
+            p1, p2 = self.parse_lines(line)
+            if p1.x == p2.x or p1.y == p2.y:
+                points.append((p1, p2))
+
+        res = self.find_overlap(points)
+        return len(res)
+
+
+class Day05PartB(Day05, FileReaderSolution):
+    def solve(self, input_data: str) -> int:
+        raise NotImplementedError
diff --git a/tests/solutions/test_day05_a.py b/tests/solutions/test_day05_a.py
new file mode 100644
index 00000000..c0cc9224
--- /dev/null
+++ b/tests/solutions/test_day05_a.py
@@ -0,0 +1,25 @@
+from adventofcode2021.solutions.day05 import Day05PartA
+
+
+class TestDay05PartA:
+    def test_day05a_solve(self):
+        test_input = """0,9 -> 5,9
+8,0 -> 0,8
+9,4 -> 3,4
+2,2 -> 2,1
+7,0 -> 7,4
+6,4 -> 2,0
+0,9 -> 2,9
+3,4 -> 1,4
+0,0 -> 8,8
+5,5 -> 8,2
+"""
+        solution = Day05PartA()
+        result = solution.solve(test_input)
+        assert result == 5
+
+    def test_day05a_data(self):
+        """Result we got when we did the real solution"""
+        solution = Day05PartA()
+        res = solution("day_05/day05.txt")
+        assert res == 5306

From be9a5abd561a1c2ca365088997da1753310d903c Mon Sep 17 00:00:00 2001
From: Roel Adriaans <roel@adriaans.org>
Date: Sun, 5 Dec 2021 23:20:20 +0100
Subject: [PATCH 044/371] Implement day 5, part 2

---
 src/adventofcode2021/solutions/day05.py | 68 ++++++++++++++++++++-----
 tests/solutions/test_day05_b.py         | 37 ++++++++++++++
 2 files changed, 93 insertions(+), 12 deletions(-)
 create mode 100644 tests/solutions/test_day05_b.py

diff --git a/src/adventofcode2021/solutions/day05.py b/src/adventofcode2021/solutions/day05.py
index 33e9efd1..f94f002f 100644
--- a/src/adventofcode2021/solutions/day05.py
+++ b/src/adventofcode2021/solutions/day05.py
@@ -1,9 +1,14 @@
+import logging
 import re
+import typing
 from collections import Counter
 from dataclasses import dataclass
+from typing import Tuple
 
 from adventofcode2021.utils.abstract import FileReaderSolution
 
+logger = logging.getLogger(__name__)
+
 
 @dataclass
 class Point:
@@ -12,7 +17,7 @@ class Point:
 
 
 class Day05:
-    def parse_lines(self, line) -> (Point, Point):
+    def parse_lines(self, line) -> Tuple[Point, Point]:
         """ "
         Parse 2,2 -> 2,1 or 419,207 -> 419,109
         As x1,y1 -> x2,y2
@@ -24,19 +29,52 @@ def parse_lines(self, line) -> (Point, Point):
         p2 = Point(x=int(matches["x2"]), y=int(matches["y2"]))
         return p1, p2
 
-    def find_overlap(self, points: list[(Point, Point)]) -> list[Point]:
+    def find_overlap(self, points: list[Tuple[Point, Point]]) -> list[Point]:
         """Find the overlapping locations in the list of points"""
-        locations = Counter()
+        locations: typing.Counter = Counter()
 
         for line in points:
-            # Make sure that the start is lower then the end. range(5, 0) does not work
-            x_start = min(line[0].x, line[1].x)
-            x_stop = max(line[0].x, line[1].x)
-            y_start = min(line[0].y, line[1].y)
-            y_stop = max(line[0].y, line[1].y)
-            for x in range(x_start, x_stop + 1):
-                for y in range(y_start, y_stop + 1):
-                    locations[(x, y)] += 1
+            # Make sure that the start is lower than the end. range(5, 0) does not work
+
+            if line[0].x == line[1].x or line[0].y == line[1].y:
+                x_start = min(line[0].x, line[1].x)
+                x_stop = max(line[0].x, line[1].x)
+                y_start = min(line[0].y, line[1].y)
+                y_stop = max(line[0].y, line[1].y)
+
+                # Horizontal or vertical line
+                for x in range(x_start, x_stop + 1):
+                    for y in range(y_start, y_stop + 1):
+                        locations[(x, y)] += 1
+            else:
+                # Vertical line. Find out the length of the vector:
+                # Always 45 degree lines
+                x1 = line[0].x
+                x2 = line[1].x
+                y1 = line[0].y
+                y2 = line[1].y
+
+                if x1 < x2:
+                    length = x2 - x1
+                    x_direction = 1
+                else:
+                    length = x1 - x2
+                    x_direction = -1
+                if y1 < y2:
+                    y_direction = 1
+                else:
+                    y_direction = -1
+
+                for i in range(length + 1):
+                    debug_txt = (
+                        f"For line ({line[0].x}, {line[0].y}) -> "
+                        f"({line[1].x}, {line[1].y}) adding point: "
+                        f"({(x1 + (i * x_direction))}, {(y1 + (i * y_direction))}) : "
+                        f"{i} of {length}"
+                    )
+                    logger.debug(debug_txt)
+
+                    locations[(x1 + (i * x_direction)), (y1 + (i * y_direction))] += 1
 
         # Filter out locations with at least 2 hits
         return [location[0] for location in locations.items() if location[1] > 1]
@@ -56,4 +94,10 @@ def solve(self, input_data: str) -> int:
 
 class Day05PartB(Day05, FileReaderSolution):
     def solve(self, input_data: str) -> int:
-        raise NotImplementedError
+        points = []
+        for line in input_data.splitlines():
+            p1, p2 = self.parse_lines(line)
+            points.append((p1, p2))
+
+        res = self.find_overlap(points)
+        return len(res)
diff --git a/tests/solutions/test_day05_b.py b/tests/solutions/test_day05_b.py
new file mode 100644
index 00000000..9fc13579
--- /dev/null
+++ b/tests/solutions/test_day05_b.py
@@ -0,0 +1,37 @@
+from adventofcode2021.solutions.day05 import Day05PartB, Point
+
+
+class TestDay05PartB:
+    def test_overlap(self):
+        solution = Day05PartB()
+        overlap = solution.find_overlap(
+            [
+                (Point(1, 1), Point(3, 3)),
+                (Point(2, 2), Point(6, 6)),
+                (Point(8, 0), Point(0, 8)),
+                (Point(5, 5), Point(8, 2)),
+            ]
+        )
+        assert len(overlap) == 4
+
+    def test_day05b_solve(self):
+        test_input = """0,9 -> 5,9
+8,0 -> 0,8
+9,4 -> 3,4
+2,2 -> 2,1
+7,0 -> 7,4
+6,4 -> 2,0
+0,9 -> 2,9
+3,4 -> 1,4
+0,0 -> 8,8
+5,5 -> 8,2
+"""
+        solution = Day05PartB()
+        result = solution.solve(test_input)
+        assert result == 12
+
+    def test_day05b_data(self):
+        """Result we got when we did the real solution"""
+        solution = Day05PartB()
+        res = solution("day_05/day05.txt")
+        assert res == 17787

From 509a3ac131e842335110930e991f610e1f141402 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 6 Dec 2021 04:29:05 +0000
Subject: [PATCH 045/371] Bump black from 21.11b1 to 21.12b0

Bumps [black](https://github.com/psf/black) from 21.11b1 to 21.12b0.
- [Release notes](https://github.com/psf/black/releases)
- [Changelog](https://github.com/psf/black/blob/main/CHANGES.md)
- [Commits](https://github.com/psf/black/commits)

---
updated-dependencies:
- dependency-name: black
  dependency-type: direct:development
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 poetry.lock    | 93 +++-----------------------------------------------
 pyproject.toml |  2 +-
 2 files changed, 5 insertions(+), 90 deletions(-)

diff --git a/poetry.lock b/poetry.lock
index e3d1204f..863e50b6 100644
--- a/poetry.lock
+++ b/poetry.lock
@@ -86,7 +86,7 @@ chardet = ">=3.0.2"
 
 [[package]]
 name = "black"
-version = "21.11b1"
+version = "21.12b0"
 description = "The uncompromising code formatter."
 category = "dev"
 optional = false
@@ -97,7 +97,6 @@ click = ">=7.1.2"
 mypy-extensions = ">=0.4.3"
 pathspec = ">=0.9.0,<1"
 platformdirs = ">=2"
-regex = ">=2021.4.4"
 tomli = ">=0.2.6,<2.0.0"
 typing-extensions = [
     {version = ">=3.10.0.0", markers = "python_version < \"3.10\""},
@@ -515,14 +514,6 @@ category = "dev"
 optional = false
 python-versions = ">=3.6"
 
-[[package]]
-name = "regex"
-version = "2021.11.10"
-description = "Alternative regular expression module, to replace re."
-category = "dev"
-optional = false
-python-versions = "*"
-
 [[package]]
 name = "requests"
 version = "2.26.0"
@@ -662,7 +653,7 @@ testing = ["coverage (>=4)", "coverage-enable-subprocess (>=1)", "flaky (>=3)",
 [metadata]
 lock-version = "1.1"
 python-versions = "^3.10"
-content-hash = "729be48a4852d3e3657ac596865fbfa0644bc3ff9d6bfdf1963c81a4e4d46ca0"
+content-hash = "4ba7d52363816f28ee770cbe79b7d8654e27c77cb0c368b9050b2d45cdd97ff3"
 
 [metadata.files]
 anytree = [
@@ -694,8 +685,8 @@ binaryornot = [
     {file = "binaryornot-0.4.4.tar.gz", hash = "sha256:359501dfc9d40632edc9fac890e19542db1a287bbcfa58175b66658392018061"},
 ]
 black = [
-    {file = "black-21.11b1-py3-none-any.whl", hash = "sha256:802c6c30b637b28645b7fde282ed2569c0cd777dbe493a41b6a03c1d903f99ac"},
-    {file = "black-21.11b1.tar.gz", hash = "sha256:a042adbb18b3262faad5aff4e834ff186bb893f95ba3a8013f09de1e5569def2"},
+    {file = "black-21.12b0-py3-none-any.whl", hash = "sha256:a615e69ae185e08fdd73e4715e260e2479c861b5740057fde6e8b4e3b7dd589f"},
+    {file = "black-21.12b0.tar.gz", hash = "sha256:77b80f693a569e2e527958459634f18df9b0ba2625ba4e0c2d5da5be42e6f2b3"},
 ]
 certifi = [
     {file = "certifi-2021.10.8-py2.py3-none-any.whl", hash = "sha256:d62a0163eb4c2344ac042ab2bdf75399a71a2d8c7d47eac2e2ee91b9d6339569"},
@@ -984,82 +975,6 @@ pyyaml = [
     {file = "PyYAML-6.0-cp39-cp39-win_amd64.whl", hash = "sha256:b3d267842bf12586ba6c734f89d1f5b871df0273157918b0ccefa29deb05c21c"},
     {file = "PyYAML-6.0.tar.gz", hash = "sha256:68fb519c14306fec9720a2a5b45bc9f0c8d1b9c72adf45c37baedfcd949c35a2"},
 ]
-regex = [
-    {file = "regex-2021.11.10-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:9345b6f7ee578bad8e475129ed40123d265464c4cfead6c261fd60fc9de00bcf"},
-    {file = "regex-2021.11.10-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:416c5f1a188c91e3eb41e9c8787288e707f7d2ebe66e0a6563af280d9b68478f"},
-    {file = "regex-2021.11.10-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:e0538c43565ee6e703d3a7c3bdfe4037a5209250e8502c98f20fea6f5fdf2965"},
-    {file = "regex-2021.11.10-cp310-cp310-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:7ee1227cf08b6716c85504aebc49ac827eb88fcc6e51564f010f11a406c0a667"},
-    {file = "regex-2021.11.10-cp310-cp310-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:6650f16365f1924d6014d2ea770bde8555b4a39dc9576abb95e3cd1ff0263b36"},
-    {file = "regex-2021.11.10-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:30ab804ea73972049b7a2a5c62d97687d69b5a60a67adca07eb73a0ddbc9e29f"},
-    {file = "regex-2021.11.10-cp310-cp310-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:68a067c11463de2a37157930d8b153005085e42bcb7ad9ca562d77ba7d1404e0"},
-    {file = "regex-2021.11.10-cp310-cp310-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:162abfd74e88001d20cb73ceaffbfe601469923e875caf9118333b1a4aaafdc4"},
-    {file = "regex-2021.11.10-cp310-cp310-musllinux_1_1_aarch64.whl", hash = "sha256:b9ed0b1e5e0759d6b7f8e2f143894b2a7f3edd313f38cf44e1e15d360e11749b"},
-    {file = "regex-2021.11.10-cp310-cp310-musllinux_1_1_i686.whl", hash = "sha256:473e67837f786404570eae33c3b64a4b9635ae9f00145250851a1292f484c063"},
-    {file = "regex-2021.11.10-cp310-cp310-musllinux_1_1_ppc64le.whl", hash = "sha256:2fee3ed82a011184807d2127f1733b4f6b2ff6ec7151d83ef3477f3b96a13d03"},
-    {file = "regex-2021.11.10-cp310-cp310-musllinux_1_1_s390x.whl", hash = "sha256:d5fd67df77bab0d3f4ea1d7afca9ef15c2ee35dfb348c7b57ffb9782a6e4db6e"},
-    {file = "regex-2021.11.10-cp310-cp310-musllinux_1_1_x86_64.whl", hash = "sha256:5d408a642a5484b9b4d11dea15a489ea0928c7e410c7525cd892f4d04f2f617b"},
-    {file = "regex-2021.11.10-cp310-cp310-win32.whl", hash = "sha256:98ba568e8ae26beb726aeea2273053c717641933836568c2a0278a84987b2a1a"},
-    {file = "regex-2021.11.10-cp310-cp310-win_amd64.whl", hash = "sha256:780b48456a0f0ba4d390e8b5f7c661fdd218934388cde1a974010a965e200e12"},
-    {file = "regex-2021.11.10-cp36-cp36m-macosx_10_9_x86_64.whl", hash = "sha256:dba70f30fd81f8ce6d32ddeef37d91c8948e5d5a4c63242d16a2b2df8143aafc"},
-    {file = "regex-2021.11.10-cp36-cp36m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:e1f54b9b4b6c53369f40028d2dd07a8c374583417ee6ec0ea304e710a20f80a0"},
-    {file = "regex-2021.11.10-cp36-cp36m-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:fbb9dc00e39f3e6c0ef48edee202f9520dafb233e8b51b06b8428cfcb92abd30"},
-    {file = "regex-2021.11.10-cp36-cp36m-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:666abff54e474d28ff42756d94544cdfd42e2ee97065857413b72e8a2d6a6345"},
-    {file = "regex-2021.11.10-cp36-cp36m-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:5537f71b6d646f7f5f340562ec4c77b6e1c915f8baae822ea0b7e46c1f09b733"},
-    {file = "regex-2021.11.10-cp36-cp36m-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:ed2e07c6a26ed4bea91b897ee2b0835c21716d9a469a96c3e878dc5f8c55bb23"},
-    {file = "regex-2021.11.10-cp36-cp36m-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:ca5f18a75e1256ce07494e245cdb146f5a9267d3c702ebf9b65c7f8bd843431e"},
-    {file = "regex-2021.11.10-cp36-cp36m-musllinux_1_1_aarch64.whl", hash = "sha256:74cbeac0451f27d4f50e6e8a8f3a52ca074b5e2da9f7b505c4201a57a8ed6286"},
-    {file = "regex-2021.11.10-cp36-cp36m-musllinux_1_1_i686.whl", hash = "sha256:3598893bde43091ee5ca0a6ad20f08a0435e93a69255eeb5f81b85e81e329264"},
-    {file = "regex-2021.11.10-cp36-cp36m-musllinux_1_1_ppc64le.whl", hash = "sha256:50a7ddf3d131dc5633dccdb51417e2d1910d25cbcf842115a3a5893509140a3a"},
-    {file = "regex-2021.11.10-cp36-cp36m-musllinux_1_1_s390x.whl", hash = "sha256:61600a7ca4bcf78a96a68a27c2ae9389763b5b94b63943d5158f2a377e09d29a"},
-    {file = "regex-2021.11.10-cp36-cp36m-musllinux_1_1_x86_64.whl", hash = "sha256:563d5f9354e15e048465061509403f68424fef37d5add3064038c2511c8f5e00"},
-    {file = "regex-2021.11.10-cp36-cp36m-win32.whl", hash = "sha256:93a5051fcf5fad72de73b96f07d30bc29665697fb8ecdfbc474f3452c78adcf4"},
-    {file = "regex-2021.11.10-cp36-cp36m-win_amd64.whl", hash = "sha256:b483c9d00a565633c87abd0aaf27eb5016de23fed952e054ecc19ce32f6a9e7e"},
-    {file = "regex-2021.11.10-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:fff55f3ce50a3ff63ec8e2a8d3dd924f1941b250b0aac3d3d42b687eeff07a8e"},
-    {file = "regex-2021.11.10-cp37-cp37m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:e32d2a2b02ccbef10145df9135751abea1f9f076e67a4e261b05f24b94219e36"},
-    {file = "regex-2021.11.10-cp37-cp37m-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:53db2c6be8a2710b359bfd3d3aa17ba38f8aa72a82309a12ae99d3c0c3dcd74d"},
-    {file = "regex-2021.11.10-cp37-cp37m-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:2207ae4f64ad3af399e2d30dde66f0b36ae5c3129b52885f1bffc2f05ec505c8"},
-    {file = "regex-2021.11.10-cp37-cp37m-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:d5ca078bb666c4a9d1287a379fe617a6dccd18c3e8a7e6c7e1eb8974330c626a"},
-    {file = "regex-2021.11.10-cp37-cp37m-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:dd33eb9bdcfbabab3459c9ee651d94c842bc8a05fabc95edf4ee0c15a072495e"},
-    {file = "regex-2021.11.10-cp37-cp37m-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:05b7d6d7e64efe309972adab77fc2af8907bb93217ec60aa9fe12a0dad35874f"},
-    {file = "regex-2021.11.10-cp37-cp37m-musllinux_1_1_aarch64.whl", hash = "sha256:42b50fa6666b0d50c30a990527127334d6b96dd969011e843e726a64011485da"},
-    {file = "regex-2021.11.10-cp37-cp37m-musllinux_1_1_i686.whl", hash = "sha256:6e1d2cc79e8dae442b3fa4a26c5794428b98f81389af90623ffcc650ce9f6732"},
-    {file = "regex-2021.11.10-cp37-cp37m-musllinux_1_1_ppc64le.whl", hash = "sha256:0416f7399e918c4b0e074a0f66e5191077ee2ca32a0f99d4c187a62beb47aa05"},
-    {file = "regex-2021.11.10-cp37-cp37m-musllinux_1_1_s390x.whl", hash = "sha256:ce298e3d0c65bd03fa65ffcc6db0e2b578e8f626d468db64fdf8457731052942"},
-    {file = "regex-2021.11.10-cp37-cp37m-musllinux_1_1_x86_64.whl", hash = "sha256:dc07f021ee80510f3cd3af2cad5b6a3b3a10b057521d9e6aaeb621730d320c5a"},
-    {file = "regex-2021.11.10-cp37-cp37m-win32.whl", hash = "sha256:e71255ba42567d34a13c03968736c5d39bb4a97ce98188fafb27ce981115beec"},
-    {file = "regex-2021.11.10-cp37-cp37m-win_amd64.whl", hash = "sha256:07856afef5ffcc052e7eccf3213317fbb94e4a5cd8177a2caa69c980657b3cb4"},
-    {file = "regex-2021.11.10-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:ba05430e819e58544e840a68b03b28b6d328aff2e41579037e8bab7653b37d83"},
-    {file = "regex-2021.11.10-cp38-cp38-macosx_11_0_arm64.whl", hash = "sha256:7f301b11b9d214f83ddaf689181051e7f48905568b0c7017c04c06dfd065e244"},
-    {file = "regex-2021.11.10-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:4aaa4e0705ef2b73dd8e36eeb4c868f80f8393f5f4d855e94025ce7ad8525f50"},
-    {file = "regex-2021.11.10-cp38-cp38-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:788aef3549f1924d5c38263104dae7395bf020a42776d5ec5ea2b0d3d85d6646"},
-    {file = "regex-2021.11.10-cp38-cp38-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:f8af619e3be812a2059b212064ea7a640aff0568d972cd1b9e920837469eb3cb"},
-    {file = "regex-2021.11.10-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:85bfa6a5413be0ee6c5c4a663668a2cad2cbecdee367630d097d7823041bdeec"},
-    {file = "regex-2021.11.10-cp38-cp38-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:f23222527b307970e383433daec128d769ff778d9b29343fb3496472dc20dabe"},
-    {file = "regex-2021.11.10-cp38-cp38-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:da1a90c1ddb7531b1d5ff1e171b4ee61f6345119be7351104b67ff413843fe94"},
-    {file = "regex-2021.11.10-cp38-cp38-musllinux_1_1_aarch64.whl", hash = "sha256:f5be7805e53dafe94d295399cfbe5227f39995a997f4fd8539bf3cbdc8f47ca8"},
-    {file = "regex-2021.11.10-cp38-cp38-musllinux_1_1_i686.whl", hash = "sha256:a955b747d620a50408b7fdf948e04359d6e762ff8a85f5775d907ceced715129"},
-    {file = "regex-2021.11.10-cp38-cp38-musllinux_1_1_ppc64le.whl", hash = "sha256:139a23d1f5d30db2cc6c7fd9c6d6497872a672db22c4ae1910be22d4f4b2068a"},
-    {file = "regex-2021.11.10-cp38-cp38-musllinux_1_1_s390x.whl", hash = "sha256:ca49e1ab99593438b204e00f3970e7a5f70d045267051dfa6b5f4304fcfa1dbf"},
-    {file = "regex-2021.11.10-cp38-cp38-musllinux_1_1_x86_64.whl", hash = "sha256:96fc32c16ea6d60d3ca7f63397bff5c75c5a562f7db6dec7d412f7c4d2e78ec0"},
-    {file = "regex-2021.11.10-cp38-cp38-win32.whl", hash = "sha256:0617383e2fe465732af4509e61648b77cbe3aee68b6ac8c0b6fe934db90be5cc"},
-    {file = "regex-2021.11.10-cp38-cp38-win_amd64.whl", hash = "sha256:a3feefd5e95871872673b08636f96b61ebef62971eab044f5124fb4dea39919d"},
-    {file = "regex-2021.11.10-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:f7f325be2804246a75a4f45c72d4ce80d2443ab815063cdf70ee8fb2ca59ee1b"},
-    {file = "regex-2021.11.10-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:537ca6a3586931b16a85ac38c08cc48f10fc870a5b25e51794c74df843e9966d"},
-    {file = "regex-2021.11.10-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:eef2afb0fd1747f33f1ee3e209bce1ed582d1896b240ccc5e2697e3275f037c7"},
-    {file = "regex-2021.11.10-cp39-cp39-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:432bd15d40ed835a51617521d60d0125867f7b88acf653e4ed994a1f8e4995dc"},
-    {file = "regex-2021.11.10-cp39-cp39-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:b43c2b8a330a490daaef5a47ab114935002b13b3f9dc5da56d5322ff218eeadb"},
-    {file = "regex-2021.11.10-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:962b9a917dd7ceacbe5cd424556914cb0d636001e393b43dc886ba31d2a1e449"},
-    {file = "regex-2021.11.10-cp39-cp39-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:fa8c626d6441e2d04b6ee703ef2d1e17608ad44c7cb75258c09dd42bacdfc64b"},
-    {file = "regex-2021.11.10-cp39-cp39-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:3c5fb32cc6077abad3bbf0323067636d93307c9fa93e072771cf9a64d1c0f3ef"},
-    {file = "regex-2021.11.10-cp39-cp39-musllinux_1_1_aarch64.whl", hash = "sha256:cd410a1cbb2d297c67d8521759ab2ee3f1d66206d2e4328502a487589a2cb21b"},
-    {file = "regex-2021.11.10-cp39-cp39-musllinux_1_1_i686.whl", hash = "sha256:e6096b0688e6e14af6a1b10eaad86b4ff17935c49aa774eac7c95a57a4e8c296"},
-    {file = "regex-2021.11.10-cp39-cp39-musllinux_1_1_ppc64le.whl", hash = "sha256:529801a0d58809b60b3531ee804d3e3be4b412c94b5d267daa3de7fadef00f49"},
-    {file = "regex-2021.11.10-cp39-cp39-musllinux_1_1_s390x.whl", hash = "sha256:0f594b96fe2e0821d026365f72ac7b4f0b487487fb3d4aaf10dd9d97d88a9737"},
-    {file = "regex-2021.11.10-cp39-cp39-musllinux_1_1_x86_64.whl", hash = "sha256:2409b5c9cef7054dde93a9803156b411b677affc84fca69e908b1cb2c540025d"},
-    {file = "regex-2021.11.10-cp39-cp39-win32.whl", hash = "sha256:3b5df18db1fccd66de15aa59c41e4f853b5df7550723d26aa6cb7f40e5d9da5a"},
-    {file = "regex-2021.11.10-cp39-cp39-win_amd64.whl", hash = "sha256:83ee89483672b11f8952b158640d0c0ff02dc43d9cb1b70c1564b49abe92ce29"},
-    {file = "regex-2021.11.10.tar.gz", hash = "sha256:f341ee2df0999bfdf7a95e448075effe0db212a59387de1a70690e4acb03d4c6"},
-]
 requests = [
     {file = "requests-2.26.0-py2.py3-none-any.whl", hash = "sha256:6c1246513ecd5ecd4528a0906f910e8f0f9c6b8ec72030dc9fd154dc1a6efd24"},
     {file = "requests-2.26.0.tar.gz", hash = "sha256:b8aa58f8cf793ffd8782d3d8cb19e66ef36f7aba4353eec859e74678b01b07a7"},
diff --git a/pyproject.toml b/pyproject.toml
index 51a12935..d86aa333 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -14,7 +14,7 @@ beautifulsoup4 = "^4.10.0"
 tqdm = "^4.62.3"
 
 [tool.poetry.dev-dependencies]
-black = "^21.11b1"
+black = "^21.12b0"
 cookiecutter = "^1.7.3"
 pytest = "^6.2.5"
 pytest-cov = "^3.0.0"

From b71981277349db9dd2182f9647aa3ba4e4654fb0 Mon Sep 17 00:00:00 2001
From: Roel Adriaans <roel.adriaans@asml.com>
Date: Mon, 6 Dec 2021 20:38:14 +0100
Subject: [PATCH 046/371] Day 6, part 1

---
 .../solutions/data/day_06/day06.txt           |  1 +
 src/adventofcode2021/solutions/day06.py       | 60 +++++++++++++++++++
 tests/solutions/test_day06_a.py               | 15 +++++
 3 files changed, 76 insertions(+)
 create mode 100644 src/adventofcode2021/solutions/data/day_06/day06.txt
 create mode 100644 src/adventofcode2021/solutions/day06.py
 create mode 100644 tests/solutions/test_day06_a.py

diff --git a/src/adventofcode2021/solutions/data/day_06/day06.txt b/src/adventofcode2021/solutions/data/day_06/day06.txt
new file mode 100644
index 00000000..445de957
--- /dev/null
+++ b/src/adventofcode2021/solutions/data/day_06/day06.txt
@@ -0,0 +1 @@
+1,1,3,1,3,2,1,3,1,1,3,1,1,2,1,3,1,1,3,5,1,1,1,3,1,2,1,1,1,1,4,4,1,2,1,2,1,1,1,5,3,2,1,5,2,5,3,3,2,2,5,4,1,1,4,4,1,1,1,1,1,1,5,1,2,4,3,2,2,2,2,1,4,1,1,5,1,3,4,4,1,1,3,3,5,5,3,1,3,3,3,1,4,2,2,1,3,4,1,4,3,3,2,3,1,1,1,5,3,1,4,2,2,3,1,3,1,2,3,3,1,4,2,2,4,1,3,1,1,1,1,1,2,1,3,3,1,2,1,1,3,4,1,1,1,1,5,1,1,5,1,1,1,4,1,5,3,1,1,3,2,1,1,3,1,1,1,5,4,3,3,5,1,3,4,3,3,1,4,4,1,2,1,1,2,1,1,1,2,1,1,1,1,1,5,1,1,2,1,5,2,1,1,2,3,2,3,1,3,1,1,1,5,1,1,2,1,1,1,1,3,4,5,3,1,4,1,1,4,1,4,1,1,1,4,5,1,1,1,4,1,3,2,2,1,1,2,3,1,4,3,5,1,5,1,1,4,5,5,1,1,3,3,1,1,1,1,5,5,3,3,2,4,1,1,1,1,1,5,1,1,2,5,5,4,2,4,4,1,1,3,3,1,5,1,1,1,1,1,1
diff --git a/src/adventofcode2021/solutions/day06.py b/src/adventofcode2021/solutions/day06.py
new file mode 100644
index 00000000..bbe2371f
--- /dev/null
+++ b/src/adventofcode2021/solutions/day06.py
@@ -0,0 +1,60 @@
+import logging
+from typing import Optional
+
+from adventofcode2021.utils.abstract import FileReaderSolution
+
+logger = logging.getLogger(__name__)
+
+
+class Lanternfish:
+    age: int
+
+    def __init__(self, age: int):
+        self.age = age
+
+    def tick(self) -> Optional["Lanternfish"]:
+        if self.age == 0:
+            self.age = 6
+            return Lanternfish(8)
+        else:
+            self.age -= 1
+
+    def __repr__(self):
+        return str(self.age)
+
+
+class Day06:
+    fish: list[Lanternfish]
+    day: int
+
+    def print_ocean(self):
+        fish_ages = ",".join(str(fish) for fish in self.fish)
+        if self.day == 0:
+            res = f"Initial state: {fish_ages}"
+        else:
+            res = f"After {self.day:3} days: {fish_ages}"
+        return res
+
+    def tick(self):
+        new_fish = []
+        for fish in self.fish:
+            if create_new_fish := fish.tick():
+                new_fish.append(create_new_fish)
+
+        # Add the end, add all the new fish in the ocean
+        self.fish.extend(new_fish)
+        self.day += 1
+
+
+class Day06PartA(Day06, FileReaderSolution):
+    def solve(self, input_data: str) -> int:
+        self.day = 0
+        self.fish = [Lanternfish(int(age)) for age in input_data.split(",")]
+        for days in range(80):
+            self.tick()
+        return len(self.fish)
+
+
+class Day06PartB(Day06, FileReaderSolution):
+    def solve(self, input_data: str) -> int:
+        return -1
diff --git a/tests/solutions/test_day06_a.py b/tests/solutions/test_day06_a.py
new file mode 100644
index 00000000..3fd2c253
--- /dev/null
+++ b/tests/solutions/test_day06_a.py
@@ -0,0 +1,15 @@
+from adventofcode2021.solutions.day06 import Day06PartA
+
+
+class TestDay06PartA:
+    def test_day06a_solve(self):
+        test_data = "3,4,3,1,2"
+        solution = Day06PartA()
+        result = solution.solve(test_data)
+        assert result == 5934
+
+    def test_day06a_data(self):
+        """Result we got when we did the real solution"""
+        solution = Day06PartA()
+        res = solution("day_06/day06.txt")
+        assert res == 373378

From 8f22354e6d00cca6f54d9cfc280c6176bdd0774e Mon Sep 17 00:00:00 2001
From: Roel Adriaans <roel@adriaans.org>
Date: Mon, 6 Dec 2021 21:20:15 +0100
Subject: [PATCH 047/371] Rewrite the solution using counters, and finish part
 2

---
 src/adventofcode2021/solutions/day06.py | 70 ++++++++++---------------
 tests/solutions/test_day06_b.py         | 15 ++++++
 2 files changed, 42 insertions(+), 43 deletions(-)
 create mode 100644 tests/solutions/test_day06_b.py

diff --git a/src/adventofcode2021/solutions/day06.py b/src/adventofcode2021/solutions/day06.py
index bbe2371f..c0f65f89 100644
--- a/src/adventofcode2021/solutions/day06.py
+++ b/src/adventofcode2021/solutions/day06.py
@@ -1,60 +1,44 @@
-import logging
-from typing import Optional
+from collections import Counter
 
 from adventofcode2021.utils.abstract import FileReaderSolution
 
-logger = logging.getLogger(__name__)
-
-
-class Lanternfish:
-    age: int
-
-    def __init__(self, age: int):
-        self.age = age
-
-    def tick(self) -> Optional["Lanternfish"]:
-        if self.age == 0:
-            self.age = 6
-            return Lanternfish(8)
-        else:
-            self.age -= 1
-
-    def __repr__(self):
-        return str(self.age)
-
 
 class Day06:
-    fish: list[Lanternfish]
+    fish: Counter
     day: int
 
-    def print_ocean(self):
-        fish_ages = ",".join(str(fish) for fish in self.fish)
-        if self.day == 0:
-            res = f"Initial state: {fish_ages}"
-        else:
-            res = f"After {self.day:3} days: {fish_ages}"
-        return res
-
     def tick(self):
-        new_fish = []
-        for fish in self.fish:
-            if create_new_fish := fish.tick():
-                new_fish.append(create_new_fish)
-
-        # Add the end, add all the new fish in the ocean
-        self.fish.extend(new_fish)
+        """
+        Spawn a new generation of fish!
+        """
         self.day += 1
+        number_spawning = self.fish[0]
 
+        # Decrease the age of the current population
+        new_counter = Counter()
+        for i in range(1, 9):
+            new_counter[i - 1] = self.fish[i]
 
-class Day06PartA(Day06, FileReaderSolution):
-    def solve(self, input_data: str) -> int:
+        # And add the new fish
+        new_counter[8] = number_spawning
+
+        # Reset the old fish to 6, and add them to the current total
+        new_counter[6] += number_spawning
+        self.fish = new_counter
+
+    def run(self, input_data: str, num_days: int) -> int:
         self.day = 0
-        self.fish = [Lanternfish(int(age)) for age in input_data.split(",")]
-        for days in range(80):
+        self.fish = Counter(int(age) for age in input_data.split(","))
+        for _ in range(num_days):
             self.tick()
-        return len(self.fish)
+        return sum(self.fish.values())
+
+
+class Day06PartA(Day06, FileReaderSolution):
+    def solve(self, input_data: str) -> int:
+        return self.run(input_data, 80)
 
 
 class Day06PartB(Day06, FileReaderSolution):
     def solve(self, input_data: str) -> int:
-        return -1
+        return self.run(input_data, 256)
diff --git a/tests/solutions/test_day06_b.py b/tests/solutions/test_day06_b.py
new file mode 100644
index 00000000..b96adf84
--- /dev/null
+++ b/tests/solutions/test_day06_b.py
@@ -0,0 +1,15 @@
+from adventofcode2021.solutions.day06 import Day06PartB
+
+
+class TestDay06PartB:
+    def test_day06b_solve(self):
+        test_data = "3,4,3,1,2"
+        solution = Day06PartB()
+        result = solution.solve(test_data)
+        assert result == 26984457539
+
+    def test_day06b_data(self):
+        """Result we got when we did the real solution"""
+        solution = Day06PartB()
+        res = solution("day_06/day06.txt")
+        assert res == 1682576647495

From f16d32fff825cd74ae60a4d5032f5611b02318aa Mon Sep 17 00:00:00 2001
From: Roel Adriaans <roel@adriaans.org>
Date: Mon, 6 Dec 2021 21:36:16 +0100
Subject: [PATCH 048/371] Mypy strikes again

---
 src/adventofcode2021/solutions/day06.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/adventofcode2021/solutions/day06.py b/src/adventofcode2021/solutions/day06.py
index c0f65f89..748786ea 100644
--- a/src/adventofcode2021/solutions/day06.py
+++ b/src/adventofcode2021/solutions/day06.py
@@ -15,7 +15,7 @@ def tick(self):
         number_spawning = self.fish[0]
 
         # Decrease the age of the current population
-        new_counter = Counter()
+        new_counter: Counter[int] = Counter()
         for i in range(1, 9):
             new_counter[i - 1] = self.fish[i]
 

From 03e148c2326b23a58457f02c40b4d5dabe0f3d01 Mon Sep 17 00:00:00 2001
From: Roel Adriaans <roel@adriaans.org>
Date: Mon, 6 Dec 2021 22:07:26 +0100
Subject: [PATCH 049/371] Do not create a new Counter, and remove the useless
 day integer

---
 src/adventofcode2021/solutions/day06.py | 11 +++--------
 1 file changed, 3 insertions(+), 8 deletions(-)

diff --git a/src/adventofcode2021/solutions/day06.py b/src/adventofcode2021/solutions/day06.py
index 748786ea..a48cad2d 100644
--- a/src/adventofcode2021/solutions/day06.py
+++ b/src/adventofcode2021/solutions/day06.py
@@ -5,29 +5,24 @@
 
 class Day06:
     fish: Counter
-    day: int
 
     def tick(self):
         """
         Spawn a new generation of fish!
         """
-        self.day += 1
         number_spawning = self.fish[0]
 
         # Decrease the age of the current population
-        new_counter: Counter[int] = Counter()
         for i in range(1, 9):
-            new_counter[i - 1] = self.fish[i]
+            self.fish[i - 1] = self.fish[i]
 
         # And add the new fish
-        new_counter[8] = number_spawning
+        self.fish[8] = number_spawning
 
         # Reset the old fish to 6, and add them to the current total
-        new_counter[6] += number_spawning
-        self.fish = new_counter
+        self.fish[6] += number_spawning
 
     def run(self, input_data: str, num_days: int) -> int:
-        self.day = 0
         self.fish = Counter(int(age) for age in input_data.split(","))
         for _ in range(num_days):
             self.tick()

From aa08104053fd1d14981942ae38f901bdfc68c611 Mon Sep 17 00:00:00 2001
From: Roel Adriaans <roel.adriaans@asml.com>
Date: Tue, 7 Dec 2021 09:03:14 +0100
Subject: [PATCH 050/371] Implement day 7, brute force a bit

---
 .../solutions/data/day_07/day07.txt           |  1 +
 src/adventofcode2021/solutions/day07.py       | 42 +++++++++++++++++++
 tests/solutions/test_day07_a.py               | 19 +++++++++
 tests/solutions/test_day07_b.py               | 39 +++++++++++++++++
 4 files changed, 101 insertions(+)
 create mode 100644 src/adventofcode2021/solutions/data/day_07/day07.txt
 create mode 100644 src/adventofcode2021/solutions/day07.py
 create mode 100644 tests/solutions/test_day07_a.py
 create mode 100644 tests/solutions/test_day07_b.py

diff --git a/src/adventofcode2021/solutions/data/day_07/day07.txt b/src/adventofcode2021/solutions/data/day_07/day07.txt
new file mode 100644
index 00000000..23b9031b
--- /dev/null
+++ b/src/adventofcode2021/solutions/data/day_07/day07.txt
@@ -0,0 +1 @@
+1101,1,29,67,1102,0,1,65,1008,65,35,66,1005,66,28,1,67,65,20,4,0,1001,65,1,65,1106,0,8,99,35,67,101,99,105,32,110,39,101,115,116,32,112,97,115,32,117,110,101,32,105,110,116,99,111,100,101,32,112,114,111,103,114,97,109,10,51,812,37,278,203,12,1699,10,24,482,200,197,433,141,1854,148,529,748,46,1366,41,329,300,29,159,767,661,238,586,940,139,1606,273,1093,1687,694,232,1069,264,162,752,250,138,471,828,72,285,136,817,258,586,308,191,478,43,750,570,38,207,1221,434,124,1410,125,743,7,827,963,873,263,478,938,686,250,1022,7,917,717,1354,618,639,24,113,417,550,279,919,736,75,117,1173,32,172,88,1435,15,442,232,272,102,253,113,173,86,57,536,1282,111,18,197,117,738,427,910,740,861,90,706,520,8,1,129,80,79,36,788,1545,119,971,1435,945,808,821,1080,227,1257,973,39,303,818,669,7,197,819,1683,50,2,1248,1459,669,210,653,978,76,509,173,304,183,228,45,1032,672,792,12,540,839,135,153,55,29,1190,42,395,626,487,54,831,956,1,1012,1461,929,561,34,733,629,49,146,469,220,1368,89,265,128,521,402,557,1121,853,240,655,100,341,137,525,371,288,1389,430,1148,398,130,174,176,982,74,923,1438,469,572,33,261,126,456,300,174,27,60,1052,428,196,403,394,392,40,474,27,351,194,619,657,722,181,300,448,1037,525,1388,854,1459,967,211,46,1708,1175,1225,613,1315,479,973,573,324,887,2,116,752,447,3,1074,1135,72,595,601,632,511,1349,267,164,6,1300,172,412,3,298,1120,93,161,176,141,150,67,37,144,421,45,1451,781,1120,205,487,344,372,150,136,614,265,536,1740,265,1367,0,322,204,76,97,1112,717,444,418,279,943,597,309,322,205,1167,292,18,383,367,621,770,13,243,1641,500,313,785,106,184,310,615,248,664,98,221,740,450,460,7,23,1226,183,75,449,806,721,1057,266,254,1083,0,125,27,151,16,664,73,94,44,1347,73,325,958,475,862,1096,1523,114,307,1418,46,113,188,462,194,535,282,1144,26,1106,1465,39,133,445,177,481,233,696,181,72,1466,747,266,44,311,1061,505,140,956,360,716,98,844,1059,305,162,1679,817,873,969,793,1079,320,318,70,417,1170,628,1628,1515,894,482,1757,423,1024,267,1280,10,474,806,684,378,425,816,243,388,27,116,569,777,946,593,646,91,639,508,63,405,1310,639,380,323,75,860,67,42,58,198,35,58,180,75,530,25,194,1743,476,1092,795,243,121,1326,409,1300,218,1393,371,64,412,209,255,648,480,71,125,1398,45,1035,1245,1426,1765,596,187,353,0,261,774,958,1303,397,1024,1076,1225,307,69,789,307,450,143,203,259,21,2,297,963,1236,1292,595,784,100,1194,1246,1820,534,58,244,12,194,1316,211,368,192,741,1232,23,87,551,291,12,512,6,42,1513,619,62,1339,375,743,137,1486,254,53,274,299,1443,844,899,753,414,241,161,52,163,66,86,503,823,528,150,376,403,1346,125,363,412,774,374,1090,1001,177,1379,74,193,49,92,294,679,108,228,199,1203,324,64,321,89,601,32,46,1274,519,1089,1107,63,379,1062,1034,129,736,716,156,526,445,1,299,388,444,1080,1016,101,735,315,517,13,390,537,155,140,1119,975,259,254,402,277,1160,372,55,392,1022,1119,4,735,266,260,1550,389,824,1426,23,65,480,151,176,1761,0,16,139,152,383,358,1155,95,1138,310,232,71,1073,22,1,335,1168,792,136,902,33,204,59,146,1063,1012,103,1083,160,885,445,499,473,278,451,191,1940,249,37,722,325,495,615,70,85,50,107,560,597,75,206,767,990,113,530,94,1343,250,116,67,417,390,500,633,736,132,473,646,1502,249,119,228,3,64,212,19,1005,324,14,418,619,847,20,878,533,204,49,820,216,34,60,62,119,680,88,359,8,473,882,138,387,297,419,664,693,420,101,53,829,3,101,272,726,639,368,363,0,33,70,0,626,525,364,784,271,73,536,318,598,794,34,314,1248,1596,764,34,202,1383,635,158,1095,76,0,119,176,1158,301,409,796,242,1765,808,59,0,278,4,8,359,1111,818,931,220,109,292,353,532,750,333,223,725,1476,199,1,201,55,72,117,37,210,400,108,619,863,187,372,15,574,380,635,332,1,1210,64,897,501,12,822,508,250,263,1044,72,15,210,901,219,471,292,179,572,733,422,1354,1197,202,538,662,261,973,0,465,522,412,9,166,325,237,757,115,1046,273,549,174,30,96,215,113,7,1032,671,262,202,332,1078,629,555,26,8,29,349,206,123,1093,673,1356,513,1454,518,1240,337,96,115,1160,17,331,1450,114,107,782,995,168
diff --git a/src/adventofcode2021/solutions/day07.py b/src/adventofcode2021/solutions/day07.py
new file mode 100644
index 00000000..4416921f
--- /dev/null
+++ b/src/adventofcode2021/solutions/day07.py
@@ -0,0 +1,42 @@
+import logging
+from abc import ABC, abstractmethod
+
+from adventofcode2021.utils.abstract import FileReaderSolution
+
+logger = logging.getLogger(__name__)
+
+
+class Day07(ABC):
+    @staticmethod
+    @abstractmethod
+    def find_fuel_cost(positions: list[int], target: int) -> int:
+        raise NotImplementedError
+
+    def solve(self, input_data: str) -> int:
+        positions = [int(x) for x in input_data.split(",")]
+        # @TODO: Define a better way to find this range. We're now brute-forcing.
+        #   It works, but takes ~16 seconds to find a solution
+        min_pos = min(positions)
+        max_pos = max(positions)
+        lowest_cost = min(
+            self.find_fuel_cost(positions, n) for n in range(min_pos, max_pos)
+        )
+        return lowest_cost
+
+
+class Day07PartA(Day07, FileReaderSolution):
+    @staticmethod
+    def find_fuel_cost(positions: list[int], target: int) -> int:
+        total_cost = 0
+        for pos in positions:
+            total_cost += abs(pos - target)
+        return total_cost
+
+
+class Day07PartB(Day07, FileReaderSolution):
+    @staticmethod
+    def find_fuel_cost(positions: list[int], target: int) -> int:
+        total_cost = 0
+        for pos in positions:
+            total_cost += sum(range(1, abs(pos - target) + 1))
+        return total_cost
diff --git a/tests/solutions/test_day07_a.py b/tests/solutions/test_day07_a.py
new file mode 100644
index 00000000..43c2e991
--- /dev/null
+++ b/tests/solutions/test_day07_a.py
@@ -0,0 +1,19 @@
+import pytest
+
+from adventofcode2021.solutions.day07 import Day07PartA
+
+
+class TestDay07PartA:
+    @pytest.mark.parametrize(
+        ("input_data", "expected_result"), [("16,1,2,0,4,2,7,1,2,14", 37)]
+    )
+    def test_day07a_solve(self, input_data, expected_result):
+        solution = Day07PartA()
+        result = solution.solve(input_data)
+        assert result == expected_result
+
+    def test_day07a_data(self):
+        """Result we got when we did the real solution"""
+        solution = Day07PartA()
+        res = solution("day_07/day07.txt")
+        assert res == 344535
diff --git a/tests/solutions/test_day07_b.py b/tests/solutions/test_day07_b.py
new file mode 100644
index 00000000..724cfca5
--- /dev/null
+++ b/tests/solutions/test_day07_b.py
@@ -0,0 +1,39 @@
+import pytest
+
+from adventofcode2021.solutions.day07 import Day07PartB
+
+
+class TestDay07PartB:
+    @pytest.mark.parametrize(
+        ("positions", "target", "expected_result"),
+        [
+            ([16], 5, 66),
+            ([1], 5, 10),
+            ([2], 5, 6),
+            ([0], 5, 15),
+            ([4], 5, 1),
+            ([2], 5, 6),
+            ([7], 5, 3),
+            ([1], 5, 10),
+            ([2], 5, 6),
+            ([14], 5, 45),
+        ],
+    )
+    def test_day07b_fuel_cost(self, positions, target, expected_result):
+        solution = Day07PartB()
+        result = solution.find_fuel_cost(positions=positions, target=target)
+        assert result == expected_result
+
+    @pytest.mark.parametrize(
+        ("input_data", "expected_result"), [("16,1,2,0,4,2,7,1,2,14", 168)]
+    )
+    def test_day07b_solve(self, input_data, expected_result):
+        solution = Day07PartB()
+        result = solution.solve(input_data)
+        assert result == expected_result
+
+    def test_day07b_data(self):
+        """Result we got when we did the real solution"""
+        solution = Day07PartB()
+        res = solution("day_07/day07.txt")
+        assert res == 95581659

From 9d6f3878d2930eebc0ed8b7003d881fd8fc6446b Mon Sep 17 00:00:00 2001
From: Roel Adriaans <roel.adriaans@asml.com>
Date: Tue, 7 Dec 2021 09:59:18 +0100
Subject: [PATCH 051/371] Improve solutions:

For part 1 do not bruce force, but we need to diverge on a minumum
For part 2, we check al the numbers, but we optimize the cost function,
speeding up from 16 seconds to 0.26 seconds
---
 src/adventofcode2021/solutions/day07.py | 40 +++++++++++++------------
 1 file changed, 21 insertions(+), 19 deletions(-)

diff --git a/src/adventofcode2021/solutions/day07.py b/src/adventofcode2021/solutions/day07.py
index 4416921f..e70df9b0 100644
--- a/src/adventofcode2021/solutions/day07.py
+++ b/src/adventofcode2021/solutions/day07.py
@@ -1,30 +1,22 @@
 import logging
-from abc import ABC, abstractmethod
 
 from adventofcode2021.utils.abstract import FileReaderSolution
 
 logger = logging.getLogger(__name__)
 
 
-class Day07(ABC):
-    @staticmethod
-    @abstractmethod
-    def find_fuel_cost(positions: list[int], target: int) -> int:
-        raise NotImplementedError
+class Day07:
+    ...
+
 
+class Day07PartA(Day07, FileReaderSolution):
     def solve(self, input_data: str) -> int:
-        positions = [int(x) for x in input_data.split(",")]
-        # @TODO: Define a better way to find this range. We're now brute-forcing.
-        #   It works, but takes ~16 seconds to find a solution
-        min_pos = min(positions)
-        max_pos = max(positions)
-        lowest_cost = min(
-            self.find_fuel_cost(positions, n) for n in range(min_pos, max_pos)
-        )
+        positions = sorted([int(x) for x in input_data.split(",")])
+        # We need to converge on the middle position, so, that's our target
+        target = positions[len(positions) // 2]
+        lowest_cost = self.find_fuel_cost(positions, target)
         return lowest_cost
 
-
-class Day07PartA(Day07, FileReaderSolution):
     @staticmethod
     def find_fuel_cost(positions: list[int], target: int) -> int:
         total_cost = 0
@@ -34,9 +26,19 @@ def find_fuel_cost(positions: list[int], target: int) -> int:
 
 
 class Day07PartB(Day07, FileReaderSolution):
+    def solve(self, input_data: str) -> int:
+        positions = [int(x) for x in input_data.split(",")]
+        min_pos = min(positions)
+        max_pos = max(positions)
+        lowest_cost = min(
+            self.find_fuel_cost(positions, n) for n in range(min_pos, max_pos)
+        )
+        return lowest_cost
+
     @staticmethod
     def find_fuel_cost(positions: list[int], target: int) -> int:
-        total_cost = 0
+        total_cost = 0.0
         for pos in positions:
-            total_cost += sum(range(1, abs(pos - target) + 1))
-        return total_cost
+            delta = abs(pos - target)
+            total_cost += delta * (delta + 1) / 2
+        return int(total_cost)

From ffbd70f524632800b156c6269d59a431e5f3aa3a Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 13 Dec 2021 04:29:38 +0000
Subject: [PATCH 052/371] Bump pytest-xdist from 2.4.0 to 2.5.0

Bumps [pytest-xdist](https://github.com/pytest-dev/pytest-xdist) from 2.4.0 to 2.5.0.
- [Release notes](https://github.com/pytest-dev/pytest-xdist/releases)
- [Changelog](https://github.com/pytest-dev/pytest-xdist/blob/master/CHANGELOG.rst)
- [Commits](https://github.com/pytest-dev/pytest-xdist/compare/v2.4.0...v2.5.0)

---
updated-dependencies:
- dependency-name: pytest-xdist
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 poetry.lock    | 10 +++++-----
 pyproject.toml |  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/poetry.lock b/poetry.lock
index 863e50b6..a7ce2751 100644
--- a/poetry.lock
+++ b/poetry.lock
@@ -454,7 +454,7 @@ pytest = ">=3.10"
 
 [[package]]
 name = "pytest-xdist"
-version = "2.4.0"
+version = "2.5.0"
 description = "pytest xdist plugin for distributed testing and loop-on-failing modes"
 category = "dev"
 optional = false
@@ -462,7 +462,7 @@ python-versions = ">=3.6"
 
 [package.dependencies]
 execnet = ">=1.1"
-pytest = ">=6.0.0"
+pytest = ">=6.2.0"
 pytest-forked = "*"
 
 [package.extras]
@@ -653,7 +653,7 @@ testing = ["coverage (>=4)", "coverage-enable-subprocess (>=1)", "flaky (>=3)",
 [metadata]
 lock-version = "1.1"
 python-versions = "^3.10"
-content-hash = "4ba7d52363816f28ee770cbe79b7d8654e27c77cb0c368b9050b2d45cdd97ff3"
+content-hash = "751c1d9e88a9f2f3e89aa263d4b23f1c3cee5d9aec773ed04c623fa5b8e66339"
 
 [metadata.files]
 anytree = [
@@ -925,8 +925,8 @@ pytest-forked = [
     {file = "pytest_forked-1.3.0-py2.py3-none-any.whl", hash = "sha256:dc4147784048e70ef5d437951728825a131b81714b398d5d52f17c7c144d8815"},
 ]
 pytest-xdist = [
-    {file = "pytest-xdist-2.4.0.tar.gz", hash = "sha256:89b330316f7fc475f999c81b577c2b926c9569f3d397ae432c0c2e2496d61ff9"},
-    {file = "pytest_xdist-2.4.0-py3-none-any.whl", hash = "sha256:7b61ebb46997a0820a263553179d6d1e25a8c50d8a8620cd1aa1e20e3be99168"},
+    {file = "pytest-xdist-2.5.0.tar.gz", hash = "sha256:4580deca3ff04ddb2ac53eba39d76cb5dd5edeac050cb6fbc768b0dd712b4edf"},
+    {file = "pytest_xdist-2.5.0-py3-none-any.whl", hash = "sha256:6fe5c74fec98906deb8f2d2b616b5c782022744978e7bd4695d39c8f42d0ce65"},
 ]
 python-dateutil = [
     {file = "python-dateutil-2.8.2.tar.gz", hash = "sha256:0123cacc1627ae19ddf3c27a5de5bd67ee4586fbdd6440d9748f8abb483d3e86"},
diff --git a/pyproject.toml b/pyproject.toml
index d86aa333..23fe95ec 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -18,7 +18,7 @@ black = "^21.12b0"
 cookiecutter = "^1.7.3"
 pytest = "^6.2.5"
 pytest-cov = "^3.0.0"
-pytest-xdist = "^2.4.0"
+pytest-xdist = "^2.5.0"
 python-dotenv = "^0.19.2"
 tox = "^3.24.4"
 pre-commit = "^2.16.0"

From 57a5b298124853fe1f20a8436caa87d1b41ed7cf Mon Sep 17 00:00:00 2001
From: Roel Adriaans <roel.adriaans@asml.com>
Date: Fri, 24 Dec 2021 16:52:01 +0100
Subject: [PATCH 053/371] Day 8, part 1

---
 .../solutions/data/day_08/day08.txt           | 200 ++++++++++++++++++
 src/adventofcode2021/solutions/day08.py       |  34 +++
 tests/solutions/test_day08_a.py               |  54 +++++
 3 files changed, 288 insertions(+)
 create mode 100644 src/adventofcode2021/solutions/data/day_08/day08.txt
 create mode 100644 src/adventofcode2021/solutions/day08.py
 create mode 100644 tests/solutions/test_day08_a.py

diff --git a/src/adventofcode2021/solutions/data/day_08/day08.txt b/src/adventofcode2021/solutions/data/day_08/day08.txt
new file mode 100644
index 00000000..9c4aa3cd
--- /dev/null
+++ b/src/adventofcode2021/solutions/data/day_08/day08.txt
@@ -0,0 +1,200 @@
+fdceba bafdgc abeg afbdgec gbeacd abced bgc fcdge bg bedgc | bafdec cgefd gcebd ebcgd
+gbfac fegbda fcedagb bea ea abcdef dgbfe gfabe dgea gbdfec | gdea bgefdc bea efdbg
+eg dagef gbcfeda ageb cegbfd gfe dbefa facdg abfged cedbaf | befda daefb egf gcdfa
+edgacfb gcfd dgb degfab bcega bdagc cgafbd fbacd gd fceabd | fbdac gd gdbcaf dgb
+eaf bedgaf dbafc bfceag fedcbg eafdcgb debfa ae adge gdebf | abcdfeg febdg ae daebf
+afbdc aefg ea edbacfg dbefg eab gcbfde abecgd bgefad bfdae | gfea bfdea gbdef fcdebg
+deagf daegc dcgabe abcgdfe gc cabg fedgbc cdg dcafeb ecabd | ebfcdg gcade cfegdb dcg
+agecd bdegca cfea af abdgef fbcaedg gaf dgcfb fadgce afdcg | fadgcbe ecadg bgefad fag
+degcba cfbge cdgaefb gbecfd ae gafdc gfcaeb beaf cae cefag | feba abdcge becagdf bagefdc
+bfcga ecgdbaf facedg cdfae abecf eb dbae ebf ebcdfg cefabd | bafec ebf afdce egadfc
+cfaegbd adbecg ebgca debafg cdfge fa afg cafb fgaec afbcge | gcbaef cdfeg efgacb gaecb
+efacdg egdbfca bcdagf ceadg dface daf bafec dfeg fd cdgabe | efbca cdgae daebcg geafdc
+beg dgfab geaf gdeab fbcagd efdbcag cbdefg edbgfa ge baced | gdfab ge gcbdfa badfg
+gdab bfdeca bgfeac becagd abegdcf edcgf dcb edbcg bgcae bd | dbegc dfbeac cafgbe db
+cefga dc fedcgb dcf fdabe ecbfda dcfea dabc debgaf bfgadec | gafec aebdcgf agdbfe cfega
+bfdec gbac bda dagfeb becdag cagebfd agecd feacgd ab cdaeb | ab bacde ba decgaf
+dbg ecabg gacefd dbaf agefd gebdcf fdacegb bedga fgbade db | dgb gbcefad dbg bdagef
+fbge gaedb eg dbeacf dgcafe gedabfc cdgab aegfdb dbfae ged | dgcba abegd bdacg begda
+abefg ad gcebd dae dfbgce bdeag dgacfe dcab cgafebd geacbd | agfbe ebcgd dagcbe egbda
+gdcfab cdeafb fg dbeacfg gcafe cbeafg gdcea ebcfa gaf fgbe | acfeb fag dcgae acfbgd
+cegfad fedb fbgadce bacdfg acbeg bad fcdabe debac db cefad | fdgcae cfgdea edfcab cefad
+fbg bgec efbac fbgca gb fbcdea bfdgea bdcagef fgadc cbeagf | fgb fegdba fbaedc aefcdb
+aecfd agcdfe bdegcaf efbad bfeadc eb aegbfc dcbe bef dbagf | bcfead fgbcea eb aefdb
+gedab cfdbg egca dfegab gedcb fdebcag acfebd ce cbe decgab | acdbge bfacde bgade cedabf
+edfg fbgdae bagec feagb fbg abgdcf dbefa bdeafc agfdbec fg | dfeg daebf dcbfga gf
+bcgaefd cfbeg cdefgb fcde adgbec acgbf efb gebdc fe dabfeg | abgcf aegbfdc bedacgf edgabc
+dgfbc bfaegc fad dcea adcfg edagbf da eadfgc cdafegb geafc | da fcgad gdbfc afgbce
+cdea bafdgec gcbeaf bcafd fdbga bcd cd ecfba fcebdg efdbac | dfgebc cbd fcbad cdae
+afcegdb edagf ab gbfce ceab gdfbec fdgcba gbeaf gab cgbaef | ecbgaf bgafecd cbea gacbdf
+efgcab ecb bedf be cbfgaed bcdea cdefab ecgad fdacb gafbdc | adfegbc gcafbe fcbgae adecb
+gfecad gc egcf afcbgd ebadcf cag eagcd acefd bagefdc dgeba | gc acg dcafe begad
+dacgb cbadge dcf cf cdbaf afgc bfeda dgfebc bdafgc feabcdg | cgfa dbagcf fcag fagc
+fgb fcabd fdage bafegc bg dgface afgcedb adbgef dfbga bged | abfdc ebfagc agbdf dcfegba
+afd cdfega cdbgfe bgefad dfegc becfa feadc bcfdega da agcd | deafgc fabce da gbcdef
+fcdgb baefgcd fe dgeabc ceabd fde eafc febcad defbag cbedf | bfedca gdcbf daceb ebgdfa
+cbgf bg decafgb ecadgf dcagf gfabd bgcafd gbd cbadge dfeab | cgfb edbfa dbagf gbd
+bda dfgbec efdga cagb bgead egcbad ba dfceba degcb egabcfd | gfead ba gbac egbdc
+bd dab cbgdea dbge bcdga gdcaf fbdgeca abgce abdfec cbegaf | abd bd gebcadf dafcg
+faegcbd bdagcf cdgbfe cb efbdg gdafbe bdc aegcd becf degbc | bc cb fgdabc bc
+cfbae bcfged cafdeg fa acf febcg fegcdba bagf afcgeb dabec | cfgbe egdafc fbgdec cbfea
+dabfgc gdcfbea cedaf gebda dagfec ecbf beacd bac bc cafedb | begda bc decab defcga
+ecd decgf gebc ec dcgaf cfaebd efdbga afebdcg bfedcg dbfge | dgfecba cgeb bfdecg aedbfg
+efb afbgdce fdceg aebg afcbg gdfbca efcgb be dcbfea fagebc | bgfaedc afbcg efdgc cgfeb
+eb adcfeb eab dacbg gebcfad gaedb cgbe gafde gedcba gcfbda | abgde bgdae daefg cfbagd
+cdfeab cgfead bfgdca bfgcead dfcea bdeaf aedgb bf becf bfd | cefb dafce dcebaf edgcafb
+acfbegd bf gfb cbaeg gaefd fegab cafb agebdc bfgdce bcfega | fdbgec faegd eafgd gbf
+eadfg gdc fegbcd ebdfc debcga bceafdg eadcbf bgfc gecdf gc | dcfbea debcf gdefc gdc
+gdb afbdgce gb gfdce dacefg edbfcg bdaecg fegb bdafc gbcdf | cfdbg dbfgc fcdegb debcga
+bfcdg befcd efgb cgdbea ceb eb fdeca efgcbda dcbfag dcebgf | gfbcd ebagdc dabfgc dfbgc
+acefdb afbgd cda ac adcgfb bdgeafc gcaf gabedf bgdac ecbgd | gfbdac dbgca edacfb dfeagb
+cfadb dfcgea aebdgf ba edfacb eafbdgc baec cdbfg abf cadfe | dgcfabe aceb edgcaf afdgeb
+cgfda ec cgdbea gedcabf dfgcab egcf beadf dfeac ecgadf eca | gfcbad feadc fcead gcafd
+edgfa gfbd bg adfcbge agfbde edcgfa abfec abecgd eabfg agb | fcaeb dgcefa facedg bdgf
+db eabcdfg gefcda cbegdf dcbg bdf gedfb edcfg fdecab beagf | ecfadg cgdb bcdg gcfead
+dbeca cdbafg gcdaeb ec feagcbd fdbea cbe gdce bdgac abefcg | cadbg dacbg cbadg bagcef
+cagbfde gbaec cfbage fa bfcadg efacb ecbadg cbfed bfa afeg | gefa abcef dbfcga fbeca
+cdefg degacf dbfca dfcga cedgbf fdgaceb gaed gca ga gcefab | ecgdbf gedcfa gdcef gcdef
+abcdgf acdge eac ea dabefc aegdfbc edcfg cebdag abgdc agbe | aegdc bcgad dcgfe fedacb
+egbcdfa becaf ecbdaf dcaf edabc cbf fc ebgfa bgdaec bdefgc | ebdcfa ecbfa fcb cbagde
+bacfed ecagf ad gadfe aed bdga fdgbe dfaegb gdbefc dbcafeg | gafec gfdeb fadbcge dcegbf
+fcdgbae bgcadf bged eabdc ed bcadg baefc acgdfe eda cdgbae | fbgcda bgcad faceb eagdcf
+fbcd ecfba aegdc dab bceagfd fbdeac db afecbg decab fagbed | cegda bd cgeda bd
+gcdeab gbedcaf gefc defba ced faedc cbgdfa dgcaef ce cgdfa | abgcfd cfgbad cgeabfd dfcga
+ba gfdbac bdgecaf eafcb gface bfa eagb cgefad dfbec bfegca | ebacf ab gdafbc cgfeab
+feadcbg fbg decbag ebgdfc faebdg dabeg feab fb dacfg fgbad | agfdc gefcadb gdfba gfcdbea
+bcgfead adecfg dcfb dbg agfdc egcab fdgbac bd gdbca gfabed | bagedcf gebca fcadg gbd
+adbfec afgecb edf cbefd fegcda deab cfbgd ed cebaf cefbgad | efbcd fegcda bfdacge fgcbd
+bf gcabdfe adefg fdgab adbgc bcgade efagbc cfdb bfa bcgdaf | abf fba bdgaf fagbdc
+fgeadbc bfcgd dcga cd bfedca abcgdf badgf fcegb daegfb cdf | cfd dc bdgcf gcebf
+bgecdf geab abd begdc defcba agcbd ab becagd dcgaf abfcedg | agfdc bda dab dbacfe
+egca gcf aedgf gc dbfgae gebdfc fecdga adbfegc dcbfa afgcd | gfeda deacgf ecgfda deagbf
+cdfbg dafb gcbde bfc aecfbg fagdc agdcfb bf bgcdeaf cagdfe | ceafbg adgcf gdecb bf
+geabfc ecgfa fgebd dgeabc aedgf facd fcedga ead da fbecgad | degfa cdaf aed bacdeg
+dcg cbde abfgcd fcgeab gaceb dc dacbgef cgaed degfa degbca | dcfabg dacgeb debc dcfbga
+agc fcgdaeb gdba dfabc fgced gecbaf efdcba agdcf gcadbf ga | cdefg fcebag ebdfca fcbega
+feabdgc badef fg acfbdg gfed afbge afg dbeafg begac bfcead | fedcab fabge agbefd fcdbae
+bfcead cfe bdgafe cadefg fbdc bacef cgeab fc dbagcfe fbdea | adgfce cfbd cdfage fgacde
+cedg ebcda ebfcga efdbag dcfba cgeba de badcge eda fbcagde | cgaebf beagfd cbgae efagbd
+cfead acegd cedbgf cdafgeb dcebg dabcgf acg aegb ga eacbgd | dcefa agdce ga abge
+ac bdcgf acbefgd cgdaf fdgbca dbcefg bgecaf cbad cfa gfade | gaecfbd adbc fdcgeb adcb
+dcgebfa fcdbg adcgbe bdfcae dec abcfe ed fcebag ebfdc defa | aecgbd dgcfb gcbaef bdfgc
+becdg ag dbcfge fadegb dga ecgbda dgbaefc cafde gbca gaecd | agdebc bfegdc dcafe debfgca
+debgfc dcbaegf dbg afgcd fecgb acbdeg bfgace gcbdf db bfed | fbed bgd db dfcbge
+dcegba gebac adfcg egd debc debagf agdec ecbfga ed fbecdga | dfbage deg efbadg fagceb
+cf dbfgec bfedac bcf egfc bdceg dbaceg fabcdge gbdfc gdabf | cfgdeba dgbcf cedfab cbf
+gaedbfc bdfae gfe fdgeab dbefg gcdeb fdbeca fg efgacd agbf | feabd fdegb dbafe bfead
+fgbce cgdfa ab gdbfea cafbdge cagfb cdgfbe ebgfac bace bfa | ceba afcdg ecfbagd efbgac
+cedgf gc gedaf faecbd dbfceg dcbg cge efbgca bfcde fcbdgae | eafgd cbgd fagde edafg
+dbgfc dbfce de dbe cbgefd dafbcg cabfe debafg fceadgb edgc | abefc cbfadg bcdfe cdeg
+fabde db fbeac dbf dfega ebcfdag cefdba cdbfge dcab gfbace | dgefbc bfd db dacb
+fgaedb ecd dcbfe edafgc dc bgefc edfcab dcba afedbcg fabde | bgcfe fgaedc cd dfgaeb
+adcfe dbcga eb dbe bceda cafgebd aefgdc bedcaf fagdeb fbec | abgdc bde deb bcadgef
+dacgf gafdeb ag cabfdeg bfdac dbfcge gdeacf geca afg cdgef | fcgbde cegfdb fdecga degfc
+fc cbf gfbadec dabef cbfda acebgf gdcf bfgcda bagdc gdebac | gecabf dcgf fbc cdgf
+cbdafe fdabe gdafcbe bcgade adcf dfegb abd agfbec da febca | acgebf bdfaec adb agecbd
+ebgfd fdgcbea dc gfdecb edgc dgabcf afceb dbc bgdfae cfbed | dcebf afebdg adcfbeg gbefdc
+faecbgd gd gabd cdebg dbecf deg cagfed bcaeg fcgabe abdceg | cedgb gebdc cefgad aegcb
+de gbedf dgcebfa gbfae cbde cbadgf dcfgb fedcbg edg cgafed | fgadce daegfc de eagbf
+gadfbc ec bagcf edfacg begfc ecab gdbef cgedafb ecf bgfeca | fbcga dgecaf fce cbea
+afe abdfgc egfcbda gabcf edcafg gcfeba acefb abeg ae ecbfd | degcfab dfaecg gdafbc ecafdg
+acgdb fbgd decfa fg bcegad gfa debfagc gfcbae cabfgd acfgd | bdcga dfgca dagcb cfabgd
+gefac ecfdb acdfbe adfegb gabefcd gd dbcg gdefc cfdebg egd | gdbcfe decgf efdgc gd
+adgfe gfcdeab fgdbea aefcd dfbgec abgf eag egfbd cdbage ga | fgdcbae dbgfae bgdaef edgaf
+bgfae degb cadbef cbagfe dba db gcabdfe fgbad dbegfa gdacf | adgfb dbgaf fcedab dba
+fb cabdgf becgda bgaf gbdfce dagbc cabdf bdf bfagced edcfa | dbcfga badcf aedcf bagdfc
+bdaegf ebgd gdfeacb gd gafbc agd bafgd ecgadf fdbeac dbfae | degacf egdb ebadf dfbeagc
+dfecg bdceg dcbafg cafgedb begdca gcf afedg gdbfce cbef fc | dcfgbe egdabfc cfg fdega
+dgfcab cdefga fcebdag cb bcd abcg dfagc bgfcde cadbf dbfea | bcd fdcbeg gedcfab gcdabf
+edgcbaf gcaf dcbfeg edfcg adcge dceafb cfdage dbeag ace ca | dcbfge fadceb cdegf befacdg
+gacde bgdac gdcbaf fdagb bdc cfbeagd bc gcbf abcfde fbedag | dabfg eafbcd bgcda aefcbd
+ebdcaf cegbd afdbceg faeb cgdefa bfced ef cbfda cef bagdcf | dfebc cfdbag ebcfd aebf
+becgaf adceb decg cad dcafgbe efdba fdbcga bdcaeg cd gebac | bagce dac gbcfad adfbe
+dcaeb geb dgcfb gbafec ge eadg daecfbg ebdacg deacbf ebcgd | dgcbe beg adbec bfadce
+bcfega gcdba gfcab cebgd bdcgafe agd afcd geafdb ad dcagbf | fdca agfbc fadbeg gefbca
+cbdea ecbfd gecafbd def ef efcg fabgcd agedfb bdfcg egbcdf | ecbad fbgced bcfdg fde
+ebgacfd gbfeac gcbde degac ace gbadce gfdac fgbdce ea abde | fdgeabc bedgca ebdgca bdegc
+ca gaedfbc cfa dgfabc bcdgf fbdgec geadf agcfd cbag bedafc | fdcgb bcefdg gdbcf acf
+fcg bcadf cg cfgbde gfbca ebdfacg geca defabg befga acbgef | gfaecdb gbfca fgc gebfa
+cafegb dc gcd dfacg cefga dfagb cade bcedgaf dfcgae bfecdg | cbedfg ecad cd cgaef
+dfcba ad gbdafce bfgdc fgebac dacebf dab dcae gebfad bacfe | bcdfg caed ad cbgfd
+abfegc dbfea aedfgc fdcag cdbg bc fcb fgcdba cfegabd cfbad | fdcab fegcab bdeaf bc
+bcedf abdec ae daegcf gabe bdcga facbdg daecgfb dae edagcb | dea cbdfe bage ea
+eagdfcb adceb dc fecagb cedgab cbeag daebf dgbc adc acdegf | dbgfcea cbead gbfcea geadcfb
+ebadg cdb afbgced badgef bgacf dbcag daec cbedag cd gfcbde | baecgd acfgb adebgc fbdcega
+ceagf egdac aegdcf bgeadfc edc afbecg cfbdae ed gedf bgacd | cgebaf fegacb efcagb ebafcg
+adfgbce acgef adbgef egcfad cafdb cafgb fgbeca gfb gb bgce | bedcafg eacgf gfdace gbf
+baefgdc deacfb egfb gdace bcaefg bg gba aegbc eabfc cdgfba | caged dfaecb gbef ecgbfad
+ca edgacf abdgf gcefba dace gca ebgfcad bdfegc agcdf dcfeg | adefcg fgcbde afgdb ac
+cdafg gdf agcfe fgaebc df dcabg dcfbge acgdef fead gfeadbc | gdfac gcdab fd fagec
+bedag dbfca gdfe gedfba baecgf fe efa dcgaeb defba efgbadc | dgbea bagde aefdb abedf
+cabegf ecbagfd aebcgd dg cbgad gaecb dcge cadfb bgd ebfagd | cegd abgcde gdb afcbd
+abfcd agdef efc bdafgce ce acge gdfcae efgadb efdgcb edcfa | acbdf cfabd cafde gfdeba
+egca bcg dfbaec gefdb ebdac cfbgad cg egcdba becdg bfgecda | ebgacfd becdg ebfgd edgabc
+bfaegdc gfeda ecg ec bacfg cdae aedgcf efgac egdcbf begfad | gabfc adfge afbcgde fbgca
+gacbf adgfbe gdcbfea bcgfea bdf agcfdb cdegb df fbdgc cadf | cedbg gdcbaf gecbd cgdafb
+fgbac fbgad gefcba dbeaf abcfgd dg fdg bfdagce gadc fcebdg | fbdea dbegcf abfgced acfdbg
+gae cfabg dbceg fabgced ea fcbdag ecfa aecbg bfcgae faegbd | aebgc eafc acgbe bcfadg
+fbcad gcbefa acbfdge ecgd cegabd ec dbage aefbgd ecb cbaed | ecadb agebd bgdaec decg
+begac eg ebcfa fgbdca eag gcabd gdcbefa adebgc cged dagbfe | eg eagcb gfacbed cgeba
+gfcdea dbeac ebc bdfceg gfecbad bega agdec bcadf eadbcg eb | cegad cdaeg ecgad gedac
+efbag egfdba agbd fdage gaebdfc daf gceafb cdegf da afcbde | abfge abdg begafc ad
+ceda gfedac ad aegfd egfcba edfgb agfec agd gafbcd gbcdafe | gfdeb ebdgf fcbgea aedbgcf
+fagb cdeag bgfde af afe dgfaceb feagd cabfde bfdgec adbfeg | fcbegd gfaed fea fea
+efcbdg fdagcb de cefba fdcgb dfcagbe fed cegd gdfeab ebdcf | ed gced cdeg ebfgda
+cbdeg bdgac bca aecbdf bdgfec cafgd acdebg ceabgdf ab gaeb | gaebdc geba cbgade ebag
+gedac afcgdeb begc bgaecd fabdcg cga efdac eagdb cg daefgb | dafgebc eacdg gc cbeg
+gaceb bgefca eg bfeg age aebfgdc ebafc abcgd badcef gafdce | bfcage bfeg fcdbgae gabec
+ebgdcf aedf gcfda gefdca eabcfg dgf fd agcdb ecfag fgbeacd | cgdaf gdcba feagcb fdg
+efbag efg ge fdgab befca dfbaeg gdae afbdgc gedfbc fgdbcae | ebgaf edfcgb fbage fge
+gaefbd bf agfecd efadg agfb dbgef ebdcg acefdb feb aegcbfd | egfda gafde gbfa bfe
+dafebgc bfdecg cdaebg da gcdbe dab bfceda adge bdcga bfgca | dcgbae da cagbfed daeg
+ba gcfad adbfg fabdeg dbfegc dbcgfae acdebg aebf bdgef abg | faeb bdefag cgeabd egcabd
+gafb ga fdcgba ebcad gbfcd deacfg dcbga cfegbd agd agebcfd | gecfbd cfbegd cbafdg cegfbd
+fa fab cfbea gbeac cefdb cebagd cdegabf cgfa dabgef faebcg | abf efcab bgaedf gcaf
+cdafeb bg aedcg gab acbfedg gbfd bfaecg bcfda gabdc gdfbac | bg gcdae bgdcfa fbgd
+afdgc gefbda ebfc dgfec dbfge cbdfeg gadceb ced ce dbfcgae | ce edfcg bcef dcgbef
+egbafc fdag ad dcbfaeg cgfba dfacb baecdg dac gcabdf edbcf | fgabecd bacefg agdf befcd
+dcefgba edaf ebafc gbecaf de cedfgb bdace cbfead agdcb dec | gfaceb ed gcbad begfac
+dcea aefdb eaf badcfg ebfdg beafcg ae befdca ceafgdb bacfd | aef dfbea fdgabc afe
+ag bgac dgfebca gea gdace bceda gedcab bcafed egcdf ebdfga | cabed bdeac dcfeg eadcb
+eacbf ecabgd abcegfd cbage agdcef dbge bgc bg dgfacb dagce | cagbe cebdgfa edacfg bg
+abd db cdbefa dagfeb dceaf fcaedg cbade fcbd egbca abfcdge | decab aebcd cafbed cadbe
+gdefb deg bfgaed ebgaf afed fgbcd fbedgca adecgb ed gabfec | fdbcg faegdb fgbae egcfbda
+decf dbfgce ecdfabg acbfge dbe dfbeg fgabd fcegb bdagce de | cegbf bedgf de fadbg
+abgedf cbag fecgd ebcfg fcb bc cebfad abfcge egabf bcegdfa | egfdc abcdef fegcd cgefadb
+cadf feabc da cbgafe bfcdea adb bdagec bfdae bdcegaf gfbed | bcafe adbegc cbfae defcgba
+bdfe db gcdbfe bfcag edbgcfa abegcd fbcgd dfgec gbd adfgce | dgabecf dcgfe db gcfdb
+acf afbceg dbfae cf ecfba abdecgf cgbea gcef fgabcd dbaegc | cfge afedb aebcg gdbcafe
+dgabce fbcea eafdbcg fdcg cd fgdecb fedgb afdegb dbc dfecb | cd dbc aedfbgc cdegba
+fagdbce abd fgbedc decfb bfdace baedc ebfdag agdec bcaf ba | daecb acfdbe cadeb dba
+dfceb bcfedag gbecdf dgfe ebdcaf fg fcg cafdgb ebgca gfbec | bedcf dcefb bfcaed abdefcg
+gcfba badegc bga afbdcge ag fgebc bfacd dfcegb bafegc faeg | gedcfb cadbf fbacg bcgefd
+cbg aedbcf ecbgfda cg fgcdbe ecfbd bcegda afegb bfcge dcfg | fbdce gc bcefd gcedfb
+dgbcf ebgd fgdbca agdfec bdfec ed efcgbd cdgaebf fde fabce | fedacg cdbgf ed efabdgc
+eafgbcd afcgb gbfcda gecabd efgcd acgfeb gecfa ea gae feab | edbgcaf dbgeac gacbf beafgc
+acgfdeb cegabf beacg bacfd dbcea gacbed gcdbef de edb eagd | de dgcbfe ed daeg
+defa cdbagf bfa agbfced cfbegd efdgba egbaf egfbd bcgea af | fa fbadcg gadfebc cafbdg
+dgebcf degab afed gafbd gabfed df gdf bafgc bdcega daecfgb | cebfadg debga abgfd abgfecd
+gdeca dcegba dcagfe ageb acefbgd egdcbf bgd adcgb bg bcadf | fgedbc gbdcef ebag gfbced
+dc edbgcaf cbadf fdc bfdgac bgadf cbgdef fdageb ebafc adcg | dgbaef dfc bfeac bacfe
+eagcbdf caefdb fceda egfab bdca gbdfec efcdga bc ceb eabcf | bface bc bfdeca faecb
+gadec becgdf aedcb gfcdae edagfbc dg gefca acegfb fgad egd | cdeab fagec gd dcgafe
+abdc cedag cd fabdcge agebcd gdeab feagdb gaefc ced gdbcfe | baged fbceagd ecd edc
+gcadeb gabed gfab bdfec abfged fa ecgafd fad gfedcba dbfae | fbced gbaf aegcdb acdgef
+df bcgfe fdb beacgd gefdcab fead aefdbg fbcgda edabg dgbef | efbdg gdefb eafd baefdgc
+daec bfgde gedabcf bgcad ae dbgaec age afcdbg dgeab cafbeg | eag beagd edfbg degbac
+fgbcad agbcd aecbd febcgd fdagceb gdc gc gfdba cafg gaedbf | geafdcb dgefab ecabd dcaeb
+bfgca febag dgefba egda efcbda eab fdbge ae egfcbd gacdbfe | aedg efgba dcagefb efdacb
+bdagec ecbfa daebc gafcb cgdfea efa fdeb dceafb ef gcfdabe | efcba cabged gfabc fbacde
+fe gfabe dbaceg aegcbdf dfcbea fcabg deagb gfde edagbf efa | aedcfb efa afe fe
+adfceb eb gdeb fegbda bcfagd fbe agbdf fgeac gafeb defbacg | ebafg feb agfbe bgde
+cgdaeb ade agbcefd adfecb febad aecfb efgabc fadgb ed fecd | acbgef facbe cgbafe deabf
+bfc fabdgc agcbe dfeac fdabceg ecabf fb bdfe edfcag bdfeca | fb cadebf gdabfc cfbdga
+cfbdge adegfbc cdgeab fbg gedf baecgf bcfda fg cdbge cdgbf | fdge gbecd egfbca cfadb
+dbcfeag gecda bed eb dfcab abeg agfced dcebfg adgceb abecd | be gabe bed fbdac
+fbagec ecfga fgdac ec cbfe agbef gce aefgbd fcgbdae gdaceb | fbadge cfgda gfbace egcaf
+bdcfge cbaefgd cagbde fecab fdecga gafd dfe fd gdace edafc | efd daecf cdaefg eacbf
+cefgda daefc agecfb fce cgdbefa dfcga dbaef ce badgcf gced | fbdgcea ebafd gdefacb fdcag
+ebagd fb fbgd cefda ebcagf cgfbade afegdb bdagce bef badfe | ebafgd bfdgea ecdfa bfdcega
+gcedb fdcb aebgcd bf fcgabe cfbaedg fdbceg bfegd aedgf gbf | bfg cdgeb fdebg cebdg
diff --git a/src/adventofcode2021/solutions/day08.py b/src/adventofcode2021/solutions/day08.py
new file mode 100644
index 00000000..2f2d3963
--- /dev/null
+++ b/src/adventofcode2021/solutions/day08.py
@@ -0,0 +1,34 @@
+from typing import Tuple
+
+from adventofcode2021.utils.abstract import FileReaderSolution
+
+
+class Day08:
+    @staticmethod
+    def parse(input_string: str) -> Tuple[list[str], list[str]]:
+        """
+        Parse the input string into two components:
+        - The 10 patterns we see
+        - Four digit of output Value
+        """
+        patterns, output_value = input_string.split(" | ")
+        return patterns.split(), output_value.split()
+
+
+class Day08PartA(Day08, FileReaderSolution):
+    def solve(self, input_data: str) -> int:
+        # Map a signal to the number of lines. Eg, number 7 uses 3 segments
+        patterns = [self.parse(line) for line in input_data.splitlines() if line]
+
+        sum = 0
+        for pattern in patterns:
+            # Measure how many times we have a thing with 1, 4, 7, 8:
+            for value in pattern[1]:
+                if len(value) in (2, 4, 3, 7):
+                    sum += 1
+        return sum
+
+
+class Day08PartB(Day08, FileReaderSolution):
+    def solve(self, input_data: str) -> int:
+        raise NotImplementedError
diff --git a/tests/solutions/test_day08_a.py b/tests/solutions/test_day08_a.py
new file mode 100644
index 00000000..9aaad879
--- /dev/null
+++ b/tests/solutions/test_day08_a.py
@@ -0,0 +1,54 @@
+import pytest
+
+from adventofcode2021.solutions.day08 import Day08PartA
+
+
+class TestDay08PartA:
+    test_input = (
+        "acedgfb cdfbe gcdfa fbcad dab cefabd cdfgeb eafb cagedb ab "
+        "| cdfeb fcadb cdfeb cdbaf"
+    )
+    test_easy_digits = """
+be cfbegad cbdgef fgaecd cgeb fdcge agebfd fecdb fabcd edb | fdgacbe cefdb cefbgd gcbe
+edbfga begcd cbg gc gcadebf fbgde acbgfd abcde gfcbed gfec | fcgedb cgb dgebacf gc
+fgaebd cg bdaec gdafb agbcfd gdcbef bgcad gfac gcb cdgabef | cg cg fdcagb cbg
+fbegcd cbd adcefb dageb afcb bc aefdc ecdab fgdeca fcdbega | efabcd cedba gadfec cb
+aecbfdg fbg gf bafeg dbefa fcge gcbea fcaegb dgceab fcbdga | gecf egdcabf bgf bfgea
+fgeab ca afcebg bdacfeg cfaedg gcfdb baec bfadeg bafgc acf | gebdcfa ecba ca fadegcb
+dbcfg fgd bdegcaf fgec aegbdf ecdfab fbedc dacgb gdcebf gf | cefg dcbef fcge gbcadfe
+bdfegc cbegaf gecbf dfcage bdacg ed bedf ced adcbefg gebcd | ed bcgafe cdgba cbgef
+egadfb cdbfeg cegd fecab cgb gbdefca cg fgcdab egfdb bfceg | gbdfcae bgc cg cgb
+gcafb gcf dcaebfg ecagb gf abcdeg gaef cafbge fdbac fegbdc | fgae cfgab fg bagce
+"""
+
+    def test_day08a_simple(self):
+        solution = Day08PartA()
+        parsed = solution.parse(self.test_input)
+        assert parsed == (
+            [
+                "acedgfb",
+                "cdfbe",
+                "gcdfa",
+                "fbcad",
+                "dab",
+                "cefabd",
+                "cdfgeb",
+                "eafb",
+                "cagedb",
+                "ab",
+            ],
+            ["cdfeb", "fcadb", "cdfeb", "cdbaf"],
+        )
+
+    def test_day08a_solve(self):
+        solution = Day08PartA()
+        result = solution.solve(self.test_easy_digits)
+
+        assert result == 26
+
+    @pytest.mark.xfail(reason="Not yet implemented", raises=NotImplementedError)
+    def test_day08a_data(self):
+        """Result we got when we did the real solution"""
+        solution = Day08PartA()
+        res = solution("day_08/day08.txt")
+        assert res == 255

From 629fd6abd7e5b02bf705a2c20b0a0243fe97ee21 Mon Sep 17 00:00:00 2001
From: Roel Adriaans <roel.adriaans@asml.com>
Date: Tue, 28 Dec 2021 13:42:28 +0100
Subject: [PATCH 054/371] We can also use a single list comprehension \o/

---
 src/adventofcode2021/solutions/day08.py | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/src/adventofcode2021/solutions/day08.py b/src/adventofcode2021/solutions/day08.py
index 2f2d3963..83ba74a7 100644
--- a/src/adventofcode2021/solutions/day08.py
+++ b/src/adventofcode2021/solutions/day08.py
@@ -20,13 +20,14 @@ def solve(self, input_data: str) -> int:
         # Map a signal to the number of lines. Eg, number 7 uses 3 segments
         patterns = [self.parse(line) for line in input_data.splitlines() if line]
 
-        sum = 0
-        for pattern in patterns:
-            # Measure how many times we have a thing with 1, 4, 7, 8:
-            for value in pattern[1]:
-                if len(value) in (2, 4, 3, 7):
-                    sum += 1
-        return sum
+        accepted_values = (2, 4, 3, 7)
+
+        result = [
+            len(value) in accepted_values
+            for pattern in patterns
+            for value in pattern[1]
+        ]
+        return sum(result)
 
 
 class Day08PartB(Day08, FileReaderSolution):

From 92828b32f053ebec0a65f4f1098e5de36091bd22 Mon Sep 17 00:00:00 2001
From: Roel Adriaans <roel@adriaans.org>
Date: Tue, 28 Dec 2021 21:49:12 +0100
Subject: [PATCH 055/371] Day 8, part 2. Took some time..

---
 src/adventofcode2021/solutions/day08.py | 103 +++++++++++++++++++++++-
 tests/solutions/test_day08_a.py         |   3 -
 tests/solutions/test_day08_b.py         |  59 ++++++++++++++
 3 files changed, 161 insertions(+), 4 deletions(-)
 create mode 100644 tests/solutions/test_day08_b.py

diff --git a/src/adventofcode2021/solutions/day08.py b/src/adventofcode2021/solutions/day08.py
index 2f2d3963..6019af7c 100644
--- a/src/adventofcode2021/solutions/day08.py
+++ b/src/adventofcode2021/solutions/day08.py
@@ -30,5 +30,106 @@ def solve(self, input_data: str) -> int:
 
 
 class Day08PartB(Day08, FileReaderSolution):
+    def compute_sum(self, input_line) -> int:
+        return int("".join([str(x) for x in self.compute_digits(input_line)]))
+
+    def compute_digits(self, input_line) -> list[int]:
+        patterns, values = self.parse(input_line)
+        mapping = self.map(patterns)
+
+        total = []
+        for value in values:
+            value = "".join(sorted(value))
+            total.append(mapping[value])
+        return total
+
+    def map(self, patterns) -> dict[str, int]:
+        """
+        Try to reverse engineer the mapping on this line, and return the sum
+        of the digits
+        """
+        # Store every unique pattern we see, and remove them after we matched
+        pattern_set = set(["".join(sorted(v)) for v in patterns])
+
+        # Store the total mapping, this will contain letters -> Digit, eg:
+        # {"bcdf": 4, acdfg": 3}
+        mapping = {}
+
+        # First pick the easy values
+        # Map the length of the pattern to the digit, eg map "ba", length 2 to 1.
+        easy_map = {
+            2: 1,
+            4: 4,
+            3: 7,
+            7: 8,
+        }
+        for pattern in pattern_set.copy():
+            if digit := easy_map.get(len(pattern)):
+                mapping[pattern] = digit
+                pattern_set.discard(pattern)
+
+        # I know that 6 is everything EXCEPT one of 1's numbers.
+        # That can only be one:
+        # Mapping for 1 is:
+        mapping_one = self.find_mapping_for_digit(mapping, 1)
+        mapping_four = self.find_mapping_for_digit(mapping, 4)
+        for pattern in pattern_set.copy():
+            if len(pattern) == 6:
+                left_over = (set("abcdefg") - set(pattern)).pop()
+                if left_over in mapping_one:
+                    mapping[pattern] = 6
+                    pattern_set.discard(pattern)
+
+                # Mapping for 9 is length(6) with pattern with 4:
+                if all([letter in list(pattern) for letter in list(mapping_four)]):
+                    mapping[pattern] = 9
+                    pattern_set.discard(pattern)
+
+        # After this, the only item left with 6 characters is 0
+        for pattern in pattern_set.copy():
+            if len(pattern) == 6:
+                mapping[pattern] = 0
+                pattern_set.discard(pattern)
+
+        # Mapping for 3 is length(5) with pattern for one enabled
+        for pattern in pattern_set.copy():
+            if len(pattern) == 5:
+                # if mapping_one in pattern:
+                if all([letter in list(pattern) for letter in list(mapping_one)]):
+                    mapping[pattern] = 3
+                    pattern_set.discard(pattern)
+                    break
+
+        # Only 5 and 2 left.
+        # The digit that is OFF in the 6, must be ON in the 2.
+        mapping_six = self.find_mapping_for_digit(mapping, 6)
+        six_off = (set("abcdefg") - set(mapping_six)).pop()
+
+        for pattern in pattern_set.copy():
+            if six_off in pattern:
+                mapping[pattern] = 2
+                pattern_set.discard(pattern)
+                break
+
+        # Only 5 left
+        mapping[pattern_set.pop()] = 5
+        if len(pattern_set) != 0:
+            raise ValueError(f"Unmapped patterns left: {pattern_set}")
+
+        return mapping
+
+    @staticmethod
+    def find_mapping_for_digit(mapping: dict, needle: int) -> str:
+        """In the dict `mapping`, find the key for `needle`"""
+
+        for key, value in mapping.items():
+            if needle == value:
+                return key
+        else:
+            raise ValueError(f"Key {needle} not found")
+
     def solve(self, input_data: str) -> int:
-        raise NotImplementedError
+        """Where we really have to map, and stop counting :)"""
+
+        totals = [self.compute_sum(line) for line in input_data.splitlines() if line]
+        return sum(totals)
diff --git a/tests/solutions/test_day08_a.py b/tests/solutions/test_day08_a.py
index 9aaad879..a8d1a7dc 100644
--- a/tests/solutions/test_day08_a.py
+++ b/tests/solutions/test_day08_a.py
@@ -1,5 +1,3 @@
-import pytest
-
 from adventofcode2021.solutions.day08 import Day08PartA
 
 
@@ -46,7 +44,6 @@ def test_day08a_solve(self):
 
         assert result == 26
 
-    @pytest.mark.xfail(reason="Not yet implemented", raises=NotImplementedError)
     def test_day08a_data(self):
         """Result we got when we did the real solution"""
         solution = Day08PartA()
diff --git a/tests/solutions/test_day08_b.py b/tests/solutions/test_day08_b.py
new file mode 100644
index 00000000..f1121c79
--- /dev/null
+++ b/tests/solutions/test_day08_b.py
@@ -0,0 +1,59 @@
+from adventofcode2021.solutions.day08 import Day08PartB
+
+
+class TestDay08PartB:
+    test_input = (
+        "acedgfb cdfbe gcdfa fbcad dab cefabd cdfgeb eafb cagedb ab "
+        "| cdfeb fcadb cdfeb cdbaf"
+    )
+
+    def test_day08b_test_input(self):
+        solution = Day08PartB()
+        assert solution.solve(self.test_input) == 5353
+
+    test_easy_digits = """
+be cfbegad cbdgef fgaecd cgeb fdcge agebfd fecdb fabcd edb | fdgacbe cefdb cefbgd gcbe
+edbfga begcd cbg gc gcadebf fbgde acbgfd abcde gfcbed gfec | fcgedb cgb dgebacf gc
+fgaebd cg bdaec gdafb agbcfd gdcbef bgcad gfac gcb cdgabef | cg cg fdcagb cbg
+fbegcd cbd adcefb dageb afcb bc aefdc ecdab fgdeca fcdbega | efabcd cedba gadfec cb
+aecbfdg fbg gf bafeg dbefa fcge gcbea fcaegb dgceab fcbdga | gecf egdcabf bgf bfgea
+fgeab ca afcebg bdacfeg cfaedg gcfdb baec bfadeg bafgc acf | gebdcfa ecba ca fadegcb
+dbcfg fgd bdegcaf fgec aegbdf ecdfab fbedc dacgb gdcebf gf | cefg dcbef fcge gbcadfe
+bdfegc cbegaf gecbf dfcage bdacg ed bedf ced adcbefg gebcd | ed bcgafe cdgba cbgef
+egadfb cdbfeg cegd fecab cgb gbdefca cg fgcdab egfdb bfceg | gbdfcae bgc cg cgb
+gcafb gcf dcaebfg ecagb gf abcdeg gaef cafbge fdbac fegbdc | fgae cfgab fg bagce
+"""
+    test_easy_digit_summed = [
+        8394,
+        9781,
+        1197,
+        9361,
+        4873,
+        8418,
+        4548,
+        1625,
+        8717,
+        4315,
+    ]
+
+    def test_day08b_forline(self):
+        test_easy_digits = self.test_easy_digits[1:].splitlines()
+        # Test that our lists are equal in length
+        assert len(test_easy_digits) == len(self.test_easy_digit_summed)
+        for line, excpected_sum in zip(test_easy_digits, self.test_easy_digit_summed):
+            expected_sum_list = list(map(int, str(excpected_sum)))
+            solution = Day08PartB()
+            calculated_sum = solution.compute_digits(line)
+            assert expected_sum_list == calculated_sum
+
+    def test_day08b_solve(self):
+        solution = Day08PartB()
+        result = solution.solve(self.test_easy_digits)
+
+        assert result == 61229
+
+    def test_day08b_data(self):
+        """Result we got when we did the real solution"""
+        solution = Day08PartB()
+        res = solution("day_08/day08.txt")
+        assert res == 982158

From 4902bbb520bd4fe72279aed3249957e0b77445ab Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 29 Dec 2021 04:31:51 +0000
Subject: [PATCH 056/371] Bump tox from 3.24.4 to 3.24.5

Bumps [tox](https://github.com/tox-dev/tox) from 3.24.4 to 3.24.5.
- [Release notes](https://github.com/tox-dev/tox/releases)
- [Changelog](https://github.com/tox-dev/tox/blob/master/docs/changelog.rst)
- [Commits](https://github.com/tox-dev/tox/compare/3.24.4...3.24.5)

---
updated-dependencies:
- dependency-name: tox
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 poetry.lock    | 10 +++++-----
 pyproject.toml |  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/poetry.lock b/poetry.lock
index a7ce2751..d47bb9f9 100644
--- a/poetry.lock
+++ b/poetry.lock
@@ -574,7 +574,7 @@ python-versions = ">=3.6"
 
 [[package]]
 name = "tox"
-version = "3.24.4"
+version = "3.24.5"
 description = "tox is a generic virtualenv management and test command line tool"
 category = "dev"
 optional = false
@@ -592,7 +592,7 @@ virtualenv = ">=16.0.0,<20.0.0 || >20.0.0,<20.0.1 || >20.0.1,<20.0.2 || >20.0.2,
 
 [package.extras]
 docs = ["pygments-github-lexers (>=0.0.5)", "sphinx (>=2.0.0)", "sphinxcontrib-autoprogram (>=0.1.5)", "towncrier (>=18.5.0)"]
-testing = ["flaky (>=3.4.0)", "freezegun (>=0.3.11)", "psutil (>=5.6.1)", "pytest (>=4.0.0)", "pytest-cov (>=2.5.1)", "pytest-mock (>=1.10.0)", "pytest-randomly (>=1.0.0)", "pytest-xdist (>=1.22.2)", "pathlib2 (>=2.3.3)"]
+testing = ["flaky (>=3.4.0)", "freezegun (>=0.3.11)", "pytest (>=4.0.0)", "pytest-cov (>=2.5.1)", "pytest-mock (>=1.10.0)", "pytest-randomly (>=1.0.0)", "psutil (>=5.6.1)", "pathlib2 (>=2.3.3)"]
 
 [[package]]
 name = "tqdm"
@@ -653,7 +653,7 @@ testing = ["coverage (>=4)", "coverage-enable-subprocess (>=1)", "flaky (>=3)",
 [metadata]
 lock-version = "1.1"
 python-versions = "^3.10"
-content-hash = "751c1d9e88a9f2f3e89aa263d4b23f1c3cee5d9aec773ed04c623fa5b8e66339"
+content-hash = "912a268f8fd6f03b0e6cf46cd73b34af732de39d8b2b2da8e9a1f5c2ac1cd4cb"
 
 [metadata.files]
 anytree = [
@@ -1000,8 +1000,8 @@ tomli = [
     {file = "tomli-1.2.2.tar.gz", hash = "sha256:c6ce0015eb38820eaf32b5db832dbc26deb3dd427bd5f6556cf0acac2c214fee"},
 ]
 tox = [
-    {file = "tox-3.24.4-py2.py3-none-any.whl", hash = "sha256:5e274227a53dc9ef856767c21867377ba395992549f02ce55eb549f9fb9a8d10"},
-    {file = "tox-3.24.4.tar.gz", hash = "sha256:c30b57fa2477f1fb7c36aa1d83292d5c2336cd0018119e1b1c17340e2c2708ca"},
+    {file = "tox-3.24.5-py2.py3-none-any.whl", hash = "sha256:be3362472a33094bce26727f5f771ca0facf6dafa217f65875314e9a6600c95c"},
+    {file = "tox-3.24.5.tar.gz", hash = "sha256:67e0e32c90e278251fea45b696d0fef3879089ccbe979b0c556d35d5a70e2993"},
 ]
 tqdm = [
     {file = "tqdm-4.62.3-py2.py3-none-any.whl", hash = "sha256:8dd278a422499cd6b727e6ae4061c40b48fce8b76d1ccbf5d34fca9b7f925b0c"},
diff --git a/pyproject.toml b/pyproject.toml
index 23fe95ec..dc1b6cc8 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -20,7 +20,7 @@ pytest = "^6.2.5"
 pytest-cov = "^3.0.0"
 pytest-xdist = "^2.5.0"
 python-dotenv = "^0.19.2"
-tox = "^3.24.4"
+tox = "^3.24.5"
 pre-commit = "^2.16.0"
 isort = "^5.10.1"
 

From 673b5163ccdd4f0d1aa76d0f0dd26e60e9a11e15 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 6 Jan 2022 04:07:00 +0000
Subject: [PATCH 057/371] Bump requests from 2.26.0 to 2.27.1

Bumps [requests](https://github.com/psf/requests) from 2.26.0 to 2.27.1.
- [Release notes](https://github.com/psf/requests/releases)
- [Changelog](https://github.com/psf/requests/blob/main/HISTORY.md)
- [Commits](https://github.com/psf/requests/compare/v2.26.0...v2.27.1)

---
updated-dependencies:
- dependency-name: requests
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 poetry.lock    | 8 ++++----
 pyproject.toml | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/poetry.lock b/poetry.lock
index 047c8a1c..fcf09b5f 100644
--- a/poetry.lock
+++ b/poetry.lock
@@ -580,7 +580,7 @@ python-versions = "*"
 
 [[package]]
 name = "requests"
-version = "2.26.0"
+version = "2.27.1"
 description = "Python HTTP for Humans."
 category = "main"
 optional = false
@@ -732,7 +732,7 @@ testing = ["coverage (>=4)", "coverage-enable-subprocess (>=1)", "flaky (>=3)",
 [metadata]
 lock-version = "1.1"
 python-versions = ">=3.9,<3.11"
-content-hash = "c12c470aa8970fd5b47a024ee17dab62b021686f33a04ccfaae37db0bbbfaf9b"
+content-hash = "1d8b7f8bc882fd4b654a4b78374d701f49f7caa50098390ad26b456ad3b75282"
 
 [metadata.files]
 anytree = [
@@ -1293,8 +1293,8 @@ regex = [
     {file = "regex-2021.11.10.tar.gz", hash = "sha256:f341ee2df0999bfdf7a95e448075effe0db212a59387de1a70690e4acb03d4c6"},
 ]
 requests = [
-    {file = "requests-2.26.0-py2.py3-none-any.whl", hash = "sha256:6c1246513ecd5ecd4528a0906f910e8f0f9c6b8ec72030dc9fd154dc1a6efd24"},
-    {file = "requests-2.26.0.tar.gz", hash = "sha256:b8aa58f8cf793ffd8782d3d8cb19e66ef36f7aba4353eec859e74678b01b07a7"},
+    {file = "requests-2.27.1-py2.py3-none-any.whl", hash = "sha256:f22fa1e554c9ddfd16e6e41ac79759e17be9e492b3587efa038054674760e72d"},
+    {file = "requests-2.27.1.tar.gz", hash = "sha256:68d7c56fd5a8999887728ef304a6d12edc7be74f1cfa47714fc8b414525c9a61"},
 ]
 setuptools-scm = [
     {file = "setuptools_scm-6.3.2-py3-none-any.whl", hash = "sha256:4c64444b1d49c4063ae60bfe1680f611c8b13833d556fd1d6050c0023162a119"},
diff --git a/pyproject.toml b/pyproject.toml
index 97d7572c..c71f2050 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -12,7 +12,7 @@ click = "^8.0.3"
 matplotlib = "3.5.0"
 numpy = "^1.21.4"
 tqdm = "^4.62.3"
-requests = "^2.26.0"
+requests = "^2.27.1"
 beautifulsoup4 = "^4.10.0"
 
 [tool.poetry.dev-dependencies]

From 4100eabc039a98825d1bc61ce1c994d1d6406d9e Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 6 Jan 2022 04:32:35 +0000
Subject: [PATCH 058/371] Bump requests from 2.26.0 to 2.27.1

Bumps [requests](https://github.com/psf/requests) from 2.26.0 to 2.27.1.
- [Release notes](https://github.com/psf/requests/releases)
- [Changelog](https://github.com/psf/requests/blob/main/HISTORY.md)
- [Commits](https://github.com/psf/requests/compare/v2.26.0...v2.27.1)

---
updated-dependencies:
- dependency-name: requests
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 poetry.lock    | 8 ++++----
 pyproject.toml | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/poetry.lock b/poetry.lock
index d47bb9f9..9b126477 100644
--- a/poetry.lock
+++ b/poetry.lock
@@ -516,7 +516,7 @@ python-versions = ">=3.6"
 
 [[package]]
 name = "requests"
-version = "2.26.0"
+version = "2.27.1"
 description = "Python HTTP for Humans."
 category = "main"
 optional = false
@@ -653,7 +653,7 @@ testing = ["coverage (>=4)", "coverage-enable-subprocess (>=1)", "flaky (>=3)",
 [metadata]
 lock-version = "1.1"
 python-versions = "^3.10"
-content-hash = "912a268f8fd6f03b0e6cf46cd73b34af732de39d8b2b2da8e9a1f5c2ac1cd4cb"
+content-hash = "843c1226e8b4549e69109cc80b4ddb02b34c4ce78d21a98b7348dec4c56f96ab"
 
 [metadata.files]
 anytree = [
@@ -976,8 +976,8 @@ pyyaml = [
     {file = "PyYAML-6.0.tar.gz", hash = "sha256:68fb519c14306fec9720a2a5b45bc9f0c8d1b9c72adf45c37baedfcd949c35a2"},
 ]
 requests = [
-    {file = "requests-2.26.0-py2.py3-none-any.whl", hash = "sha256:6c1246513ecd5ecd4528a0906f910e8f0f9c6b8ec72030dc9fd154dc1a6efd24"},
-    {file = "requests-2.26.0.tar.gz", hash = "sha256:b8aa58f8cf793ffd8782d3d8cb19e66ef36f7aba4353eec859e74678b01b07a7"},
+    {file = "requests-2.27.1-py2.py3-none-any.whl", hash = "sha256:f22fa1e554c9ddfd16e6e41ac79759e17be9e492b3587efa038054674760e72d"},
+    {file = "requests-2.27.1.tar.gz", hash = "sha256:68d7c56fd5a8999887728ef304a6d12edc7be74f1cfa47714fc8b414525c9a61"},
 ]
 six = [
     {file = "six-1.16.0-py2.py3-none-any.whl", hash = "sha256:8abb2f1d86890a2dfb989f9a77cfcfd3e47c2a354b01111771326f8aa26e0254"},
diff --git a/pyproject.toml b/pyproject.toml
index dc1b6cc8..9d4b9869 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -9,7 +9,7 @@ license = "MIT"
 python = "^3.10"
 anytree = "^2.8.0"
 click = "^8.0.3"
-requests = "^2.26.0"
+requests = "^2.27.1"
 beautifulsoup4 = "^4.10.0"
 tqdm = "^4.62.3"
 

From 66c598c8d9877e2529c47cdd4b9566ed7cbbe84b Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 10 Jan 2022 14:45:34 +0000
Subject: [PATCH 059/371] Bump black from 21.11b1 to 21.12b0

Bumps [black](https://github.com/psf/black) from 21.11b1 to 21.12b0.
- [Release notes](https://github.com/psf/black/releases)
- [Changelog](https://github.com/psf/black/blob/main/CHANGES.md)
- [Commits](https://github.com/psf/black/commits)

---
updated-dependencies:
- dependency-name: black
  dependency-type: direct:development
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 poetry.lock    | 93 +++-----------------------------------------------
 pyproject.toml |  2 +-
 2 files changed, 5 insertions(+), 90 deletions(-)

diff --git a/poetry.lock b/poetry.lock
index fcf09b5f..74d167e3 100644
--- a/poetry.lock
+++ b/poetry.lock
@@ -86,7 +86,7 @@ chardet = ">=3.0.2"
 
 [[package]]
 name = "black"
-version = "21.11b1"
+version = "21.12b0"
 description = "The uncompromising code formatter."
 category = "dev"
 optional = false
@@ -97,7 +97,6 @@ click = ">=7.1.2"
 mypy-extensions = ">=0.4.3"
 pathspec = ">=0.9.0,<1"
 platformdirs = ">=2"
-regex = ">=2021.4.4"
 tomli = ">=0.2.6,<2.0.0"
 typing-extensions = [
     {version = ">=3.10.0.0", markers = "python_version < \"3.10\""},
@@ -570,14 +569,6 @@ category = "dev"
 optional = false
 python-versions = ">=3.6"
 
-[[package]]
-name = "regex"
-version = "2021.11.10"
-description = "Alternative regular expression module, to replace re."
-category = "dev"
-optional = false
-python-versions = "*"
-
 [[package]]
 name = "requests"
 version = "2.27.1"
@@ -732,7 +723,7 @@ testing = ["coverage (>=4)", "coverage-enable-subprocess (>=1)", "flaky (>=3)",
 [metadata]
 lock-version = "1.1"
 python-versions = ">=3.9,<3.11"
-content-hash = "1d8b7f8bc882fd4b654a4b78374d701f49f7caa50098390ad26b456ad3b75282"
+content-hash = "24885ee52c6c5613b0572d890e514a843bd3bb5f7d38b7fb90a629f00a95b919"
 
 [metadata.files]
 anytree = [
@@ -764,8 +755,8 @@ binaryornot = [
     {file = "binaryornot-0.4.4.tar.gz", hash = "sha256:359501dfc9d40632edc9fac890e19542db1a287bbcfa58175b66658392018061"},
 ]
 black = [
-    {file = "black-21.11b1-py3-none-any.whl", hash = "sha256:802c6c30b637b28645b7fde282ed2569c0cd777dbe493a41b6a03c1d903f99ac"},
-    {file = "black-21.11b1.tar.gz", hash = "sha256:a042adbb18b3262faad5aff4e834ff186bb893f95ba3a8013f09de1e5569def2"},
+    {file = "black-21.12b0-py3-none-any.whl", hash = "sha256:a615e69ae185e08fdd73e4715e260e2479c861b5740057fde6e8b4e3b7dd589f"},
+    {file = "black-21.12b0.tar.gz", hash = "sha256:77b80f693a569e2e527958459634f18df9b0ba2625ba4e0c2d5da5be42e6f2b3"},
 ]
 certifi = [
     {file = "certifi-2021.10.8-py2.py3-none-any.whl", hash = "sha256:d62a0163eb4c2344ac042ab2bdf75399a71a2d8c7d47eac2e2ee91b9d6339569"},
@@ -1216,82 +1207,6 @@ pyyaml = [
     {file = "PyYAML-6.0-cp39-cp39-win_amd64.whl", hash = "sha256:b3d267842bf12586ba6c734f89d1f5b871df0273157918b0ccefa29deb05c21c"},
     {file = "PyYAML-6.0.tar.gz", hash = "sha256:68fb519c14306fec9720a2a5b45bc9f0c8d1b9c72adf45c37baedfcd949c35a2"},
 ]
-regex = [
-    {file = "regex-2021.11.10-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:9345b6f7ee578bad8e475129ed40123d265464c4cfead6c261fd60fc9de00bcf"},
-    {file = "regex-2021.11.10-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:416c5f1a188c91e3eb41e9c8787288e707f7d2ebe66e0a6563af280d9b68478f"},
-    {file = "regex-2021.11.10-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:e0538c43565ee6e703d3a7c3bdfe4037a5209250e8502c98f20fea6f5fdf2965"},
-    {file = "regex-2021.11.10-cp310-cp310-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:7ee1227cf08b6716c85504aebc49ac827eb88fcc6e51564f010f11a406c0a667"},
-    {file = "regex-2021.11.10-cp310-cp310-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:6650f16365f1924d6014d2ea770bde8555b4a39dc9576abb95e3cd1ff0263b36"},
-    {file = "regex-2021.11.10-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:30ab804ea73972049b7a2a5c62d97687d69b5a60a67adca07eb73a0ddbc9e29f"},
-    {file = "regex-2021.11.10-cp310-cp310-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:68a067c11463de2a37157930d8b153005085e42bcb7ad9ca562d77ba7d1404e0"},
-    {file = "regex-2021.11.10-cp310-cp310-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:162abfd74e88001d20cb73ceaffbfe601469923e875caf9118333b1a4aaafdc4"},
-    {file = "regex-2021.11.10-cp310-cp310-musllinux_1_1_aarch64.whl", hash = "sha256:b9ed0b1e5e0759d6b7f8e2f143894b2a7f3edd313f38cf44e1e15d360e11749b"},
-    {file = "regex-2021.11.10-cp310-cp310-musllinux_1_1_i686.whl", hash = "sha256:473e67837f786404570eae33c3b64a4b9635ae9f00145250851a1292f484c063"},
-    {file = "regex-2021.11.10-cp310-cp310-musllinux_1_1_ppc64le.whl", hash = "sha256:2fee3ed82a011184807d2127f1733b4f6b2ff6ec7151d83ef3477f3b96a13d03"},
-    {file = "regex-2021.11.10-cp310-cp310-musllinux_1_1_s390x.whl", hash = "sha256:d5fd67df77bab0d3f4ea1d7afca9ef15c2ee35dfb348c7b57ffb9782a6e4db6e"},
-    {file = "regex-2021.11.10-cp310-cp310-musllinux_1_1_x86_64.whl", hash = "sha256:5d408a642a5484b9b4d11dea15a489ea0928c7e410c7525cd892f4d04f2f617b"},
-    {file = "regex-2021.11.10-cp310-cp310-win32.whl", hash = "sha256:98ba568e8ae26beb726aeea2273053c717641933836568c2a0278a84987b2a1a"},
-    {file = "regex-2021.11.10-cp310-cp310-win_amd64.whl", hash = "sha256:780b48456a0f0ba4d390e8b5f7c661fdd218934388cde1a974010a965e200e12"},
-    {file = "regex-2021.11.10-cp36-cp36m-macosx_10_9_x86_64.whl", hash = "sha256:dba70f30fd81f8ce6d32ddeef37d91c8948e5d5a4c63242d16a2b2df8143aafc"},
-    {file = "regex-2021.11.10-cp36-cp36m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:e1f54b9b4b6c53369f40028d2dd07a8c374583417ee6ec0ea304e710a20f80a0"},
-    {file = "regex-2021.11.10-cp36-cp36m-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:fbb9dc00e39f3e6c0ef48edee202f9520dafb233e8b51b06b8428cfcb92abd30"},
-    {file = "regex-2021.11.10-cp36-cp36m-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:666abff54e474d28ff42756d94544cdfd42e2ee97065857413b72e8a2d6a6345"},
-    {file = "regex-2021.11.10-cp36-cp36m-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:5537f71b6d646f7f5f340562ec4c77b6e1c915f8baae822ea0b7e46c1f09b733"},
-    {file = "regex-2021.11.10-cp36-cp36m-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:ed2e07c6a26ed4bea91b897ee2b0835c21716d9a469a96c3e878dc5f8c55bb23"},
-    {file = "regex-2021.11.10-cp36-cp36m-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:ca5f18a75e1256ce07494e245cdb146f5a9267d3c702ebf9b65c7f8bd843431e"},
-    {file = "regex-2021.11.10-cp36-cp36m-musllinux_1_1_aarch64.whl", hash = "sha256:74cbeac0451f27d4f50e6e8a8f3a52ca074b5e2da9f7b505c4201a57a8ed6286"},
-    {file = "regex-2021.11.10-cp36-cp36m-musllinux_1_1_i686.whl", hash = "sha256:3598893bde43091ee5ca0a6ad20f08a0435e93a69255eeb5f81b85e81e329264"},
-    {file = "regex-2021.11.10-cp36-cp36m-musllinux_1_1_ppc64le.whl", hash = "sha256:50a7ddf3d131dc5633dccdb51417e2d1910d25cbcf842115a3a5893509140a3a"},
-    {file = "regex-2021.11.10-cp36-cp36m-musllinux_1_1_s390x.whl", hash = "sha256:61600a7ca4bcf78a96a68a27c2ae9389763b5b94b63943d5158f2a377e09d29a"},
-    {file = "regex-2021.11.10-cp36-cp36m-musllinux_1_1_x86_64.whl", hash = "sha256:563d5f9354e15e048465061509403f68424fef37d5add3064038c2511c8f5e00"},
-    {file = "regex-2021.11.10-cp36-cp36m-win32.whl", hash = "sha256:93a5051fcf5fad72de73b96f07d30bc29665697fb8ecdfbc474f3452c78adcf4"},
-    {file = "regex-2021.11.10-cp36-cp36m-win_amd64.whl", hash = "sha256:b483c9d00a565633c87abd0aaf27eb5016de23fed952e054ecc19ce32f6a9e7e"},
-    {file = "regex-2021.11.10-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:fff55f3ce50a3ff63ec8e2a8d3dd924f1941b250b0aac3d3d42b687eeff07a8e"},
-    {file = "regex-2021.11.10-cp37-cp37m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:e32d2a2b02ccbef10145df9135751abea1f9f076e67a4e261b05f24b94219e36"},
-    {file = "regex-2021.11.10-cp37-cp37m-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:53db2c6be8a2710b359bfd3d3aa17ba38f8aa72a82309a12ae99d3c0c3dcd74d"},
-    {file = "regex-2021.11.10-cp37-cp37m-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:2207ae4f64ad3af399e2d30dde66f0b36ae5c3129b52885f1bffc2f05ec505c8"},
-    {file = "regex-2021.11.10-cp37-cp37m-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:d5ca078bb666c4a9d1287a379fe617a6dccd18c3e8a7e6c7e1eb8974330c626a"},
-    {file = "regex-2021.11.10-cp37-cp37m-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:dd33eb9bdcfbabab3459c9ee651d94c842bc8a05fabc95edf4ee0c15a072495e"},
-    {file = "regex-2021.11.10-cp37-cp37m-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:05b7d6d7e64efe309972adab77fc2af8907bb93217ec60aa9fe12a0dad35874f"},
-    {file = "regex-2021.11.10-cp37-cp37m-musllinux_1_1_aarch64.whl", hash = "sha256:42b50fa6666b0d50c30a990527127334d6b96dd969011e843e726a64011485da"},
-    {file = "regex-2021.11.10-cp37-cp37m-musllinux_1_1_i686.whl", hash = "sha256:6e1d2cc79e8dae442b3fa4a26c5794428b98f81389af90623ffcc650ce9f6732"},
-    {file = "regex-2021.11.10-cp37-cp37m-musllinux_1_1_ppc64le.whl", hash = "sha256:0416f7399e918c4b0e074a0f66e5191077ee2ca32a0f99d4c187a62beb47aa05"},
-    {file = "regex-2021.11.10-cp37-cp37m-musllinux_1_1_s390x.whl", hash = "sha256:ce298e3d0c65bd03fa65ffcc6db0e2b578e8f626d468db64fdf8457731052942"},
-    {file = "regex-2021.11.10-cp37-cp37m-musllinux_1_1_x86_64.whl", hash = "sha256:dc07f021ee80510f3cd3af2cad5b6a3b3a10b057521d9e6aaeb621730d320c5a"},
-    {file = "regex-2021.11.10-cp37-cp37m-win32.whl", hash = "sha256:e71255ba42567d34a13c03968736c5d39bb4a97ce98188fafb27ce981115beec"},
-    {file = "regex-2021.11.10-cp37-cp37m-win_amd64.whl", hash = "sha256:07856afef5ffcc052e7eccf3213317fbb94e4a5cd8177a2caa69c980657b3cb4"},
-    {file = "regex-2021.11.10-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:ba05430e819e58544e840a68b03b28b6d328aff2e41579037e8bab7653b37d83"},
-    {file = "regex-2021.11.10-cp38-cp38-macosx_11_0_arm64.whl", hash = "sha256:7f301b11b9d214f83ddaf689181051e7f48905568b0c7017c04c06dfd065e244"},
-    {file = "regex-2021.11.10-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:4aaa4e0705ef2b73dd8e36eeb4c868f80f8393f5f4d855e94025ce7ad8525f50"},
-    {file = "regex-2021.11.10-cp38-cp38-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:788aef3549f1924d5c38263104dae7395bf020a42776d5ec5ea2b0d3d85d6646"},
-    {file = "regex-2021.11.10-cp38-cp38-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:f8af619e3be812a2059b212064ea7a640aff0568d972cd1b9e920837469eb3cb"},
-    {file = "regex-2021.11.10-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:85bfa6a5413be0ee6c5c4a663668a2cad2cbecdee367630d097d7823041bdeec"},
-    {file = "regex-2021.11.10-cp38-cp38-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:f23222527b307970e383433daec128d769ff778d9b29343fb3496472dc20dabe"},
-    {file = "regex-2021.11.10-cp38-cp38-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:da1a90c1ddb7531b1d5ff1e171b4ee61f6345119be7351104b67ff413843fe94"},
-    {file = "regex-2021.11.10-cp38-cp38-musllinux_1_1_aarch64.whl", hash = "sha256:f5be7805e53dafe94d295399cfbe5227f39995a997f4fd8539bf3cbdc8f47ca8"},
-    {file = "regex-2021.11.10-cp38-cp38-musllinux_1_1_i686.whl", hash = "sha256:a955b747d620a50408b7fdf948e04359d6e762ff8a85f5775d907ceced715129"},
-    {file = "regex-2021.11.10-cp38-cp38-musllinux_1_1_ppc64le.whl", hash = "sha256:139a23d1f5d30db2cc6c7fd9c6d6497872a672db22c4ae1910be22d4f4b2068a"},
-    {file = "regex-2021.11.10-cp38-cp38-musllinux_1_1_s390x.whl", hash = "sha256:ca49e1ab99593438b204e00f3970e7a5f70d045267051dfa6b5f4304fcfa1dbf"},
-    {file = "regex-2021.11.10-cp38-cp38-musllinux_1_1_x86_64.whl", hash = "sha256:96fc32c16ea6d60d3ca7f63397bff5c75c5a562f7db6dec7d412f7c4d2e78ec0"},
-    {file = "regex-2021.11.10-cp38-cp38-win32.whl", hash = "sha256:0617383e2fe465732af4509e61648b77cbe3aee68b6ac8c0b6fe934db90be5cc"},
-    {file = "regex-2021.11.10-cp38-cp38-win_amd64.whl", hash = "sha256:a3feefd5e95871872673b08636f96b61ebef62971eab044f5124fb4dea39919d"},
-    {file = "regex-2021.11.10-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:f7f325be2804246a75a4f45c72d4ce80d2443ab815063cdf70ee8fb2ca59ee1b"},
-    {file = "regex-2021.11.10-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:537ca6a3586931b16a85ac38c08cc48f10fc870a5b25e51794c74df843e9966d"},
-    {file = "regex-2021.11.10-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:eef2afb0fd1747f33f1ee3e209bce1ed582d1896b240ccc5e2697e3275f037c7"},
-    {file = "regex-2021.11.10-cp39-cp39-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:432bd15d40ed835a51617521d60d0125867f7b88acf653e4ed994a1f8e4995dc"},
-    {file = "regex-2021.11.10-cp39-cp39-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:b43c2b8a330a490daaef5a47ab114935002b13b3f9dc5da56d5322ff218eeadb"},
-    {file = "regex-2021.11.10-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:962b9a917dd7ceacbe5cd424556914cb0d636001e393b43dc886ba31d2a1e449"},
-    {file = "regex-2021.11.10-cp39-cp39-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:fa8c626d6441e2d04b6ee703ef2d1e17608ad44c7cb75258c09dd42bacdfc64b"},
-    {file = "regex-2021.11.10-cp39-cp39-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:3c5fb32cc6077abad3bbf0323067636d93307c9fa93e072771cf9a64d1c0f3ef"},
-    {file = "regex-2021.11.10-cp39-cp39-musllinux_1_1_aarch64.whl", hash = "sha256:cd410a1cbb2d297c67d8521759ab2ee3f1d66206d2e4328502a487589a2cb21b"},
-    {file = "regex-2021.11.10-cp39-cp39-musllinux_1_1_i686.whl", hash = "sha256:e6096b0688e6e14af6a1b10eaad86b4ff17935c49aa774eac7c95a57a4e8c296"},
-    {file = "regex-2021.11.10-cp39-cp39-musllinux_1_1_ppc64le.whl", hash = "sha256:529801a0d58809b60b3531ee804d3e3be4b412c94b5d267daa3de7fadef00f49"},
-    {file = "regex-2021.11.10-cp39-cp39-musllinux_1_1_s390x.whl", hash = "sha256:0f594b96fe2e0821d026365f72ac7b4f0b487487fb3d4aaf10dd9d97d88a9737"},
-    {file = "regex-2021.11.10-cp39-cp39-musllinux_1_1_x86_64.whl", hash = "sha256:2409b5c9cef7054dde93a9803156b411b677affc84fca69e908b1cb2c540025d"},
-    {file = "regex-2021.11.10-cp39-cp39-win32.whl", hash = "sha256:3b5df18db1fccd66de15aa59c41e4f853b5df7550723d26aa6cb7f40e5d9da5a"},
-    {file = "regex-2021.11.10-cp39-cp39-win_amd64.whl", hash = "sha256:83ee89483672b11f8952b158640d0c0ff02dc43d9cb1b70c1564b49abe92ce29"},
-    {file = "regex-2021.11.10.tar.gz", hash = "sha256:f341ee2df0999bfdf7a95e448075effe0db212a59387de1a70690e4acb03d4c6"},
-]
 requests = [
     {file = "requests-2.27.1-py2.py3-none-any.whl", hash = "sha256:f22fa1e554c9ddfd16e6e41ac79759e17be9e492b3587efa038054674760e72d"},
     {file = "requests-2.27.1.tar.gz", hash = "sha256:68d7c56fd5a8999887728ef304a6d12edc7be74f1cfa47714fc8b414525c9a61"},
diff --git a/pyproject.toml b/pyproject.toml
index c71f2050..fd5c78e2 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -16,7 +16,7 @@ requests = "^2.27.1"
 beautifulsoup4 = "^4.10.0"
 
 [tool.poetry.dev-dependencies]
-black = "^21.11b1"
+black = "^21.12b0"
 cookiecutter = "^1.7.3"
 pytest = "^6.2.5"
 pytest-cov = "^3.0.0"

From c9196f3b9100c2e35d652530d57097ab998aafa8 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 11 Jan 2022 14:21:38 +0000
Subject: [PATCH 060/371] Bump numpy from 1.21.4 to 1.22.0

Bumps [numpy](https://github.com/numpy/numpy) from 1.21.4 to 1.22.0.
- [Release notes](https://github.com/numpy/numpy/releases)
- [Changelog](https://github.com/numpy/numpy/blob/main/doc/HOWTO_RELEASE.rst.txt)
- [Commits](https://github.com/numpy/numpy/compare/v1.21.4...v1.22.0)

---
updated-dependencies:
- dependency-name: numpy
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 poetry.lock    | 58 ++++++++++++++++++++++----------------------------
 pyproject.toml |  2 +-
 2 files changed, 26 insertions(+), 34 deletions(-)

diff --git a/poetry.lock b/poetry.lock
index 74d167e3..5c7c6ad2 100644
--- a/poetry.lock
+++ b/poetry.lock
@@ -362,11 +362,11 @@ python-versions = "*"
 
 [[package]]
 name = "numpy"
-version = "1.21.4"
+version = "1.22.0"
 description = "NumPy is the fundamental package for array computing with Python."
 category = "main"
 optional = false
-python-versions = ">=3.7,<3.11"
+python-versions = ">=3.8"
 
 [[package]]
 name = "packaging"
@@ -723,7 +723,7 @@ testing = ["coverage (>=4)", "coverage-enable-subprocess (>=1)", "flaky (>=3)",
 [metadata]
 lock-version = "1.1"
 python-versions = ">=3.9,<3.11"
-content-hash = "24885ee52c6c5613b0572d890e514a843bd3bb5f7d38b7fb90a629f00a95b919"
+content-hash = "c7bb467415e4190fb807df64d912b9cbb2dc644836744463c39f76bace210464"
 
 [metadata.files]
 anytree = [
@@ -1038,36 +1038,28 @@ nodeenv = [
     {file = "nodeenv-1.6.0.tar.gz", hash = "sha256:3ef13ff90291ba2a4a7a4ff9a979b63ffdd00a464dbe04acf0ea6471517a4c2b"},
 ]
 numpy = [
-    {file = "numpy-1.21.4-cp310-cp310-macosx_10_9_universal2.whl", hash = "sha256:8890b3360f345e8360133bc078d2dacc2843b6ee6059b568781b15b97acbe39f"},
-    {file = "numpy-1.21.4-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:69077388c5a4b997442b843dbdc3a85b420fb693ec8e33020bb24d647c164fa5"},
-    {file = "numpy-1.21.4-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:e89717274b41ebd568cd7943fc9418eeb49b1785b66031bc8a7f6300463c5898"},
-    {file = "numpy-1.21.4-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:0b78ecfa070460104934e2caf51694ccd00f37d5e5dbe76f021b1b0b0d221823"},
-    {file = "numpy-1.21.4-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:615d4e328af7204c13ae3d4df7615a13ff60a49cb0d9106fde07f541207883ca"},
-    {file = "numpy-1.21.4-cp310-cp310-win_amd64.whl", hash = "sha256:1403b4e2181fc72664737d848b60e65150f272fe5a1c1cbc16145ed43884065a"},
-    {file = "numpy-1.21.4-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:74b85a17528ca60cf98381a5e779fc0264b4a88b46025e6bcbe9621f46bb3e63"},
-    {file = "numpy-1.21.4-cp37-cp37m-manylinux_2_12_i686.manylinux2010_i686.whl", hash = "sha256:92aafa03da8658609f59f18722b88f0a73a249101169e28415b4fa148caf7e41"},
-    {file = "numpy-1.21.4-cp37-cp37m-manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:5d95668e727c75b3f5088ec7700e260f90ec83f488e4c0aaccb941148b2cd377"},
-    {file = "numpy-1.21.4-cp37-cp37m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:f5162ec777ba7138906c9c274353ece5603646c6965570d82905546579573f73"},
-    {file = "numpy-1.21.4-cp37-cp37m-win32.whl", hash = "sha256:81225e58ef5fce7f1d80399575576fc5febec79a8a2742e8ef86d7b03beef49f"},
-    {file = "numpy-1.21.4-cp37-cp37m-win_amd64.whl", hash = "sha256:32fe5b12061f6446adcbb32cf4060a14741f9c21e15aaee59a207b6ce6423469"},
-    {file = "numpy-1.21.4-cp38-cp38-macosx_10_9_universal2.whl", hash = "sha256:c449eb870616a7b62e097982c622d2577b3dbc800aaf8689254ec6e0197cbf1e"},
-    {file = "numpy-1.21.4-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:2e4ed57f45f0aa38beca2a03b6532e70e548faf2debbeb3291cfc9b315d9be8f"},
-    {file = "numpy-1.21.4-cp38-cp38-macosx_11_0_arm64.whl", hash = "sha256:1247ef28387b7bb7f21caf2dbe4767f4f4175df44d30604d42ad9bd701ebb31f"},
-    {file = "numpy-1.21.4-cp38-cp38-manylinux_2_12_i686.manylinux2010_i686.whl", hash = "sha256:34f3456f530ae8b44231c63082c8899fe9c983fd9b108c997c4b1c8c2d435333"},
-    {file = "numpy-1.21.4-cp38-cp38-manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:4c9c23158b87ed0e70d9a50c67e5c0b3f75bcf2581a8e34668d4e9d7474d76c6"},
-    {file = "numpy-1.21.4-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:e4799be6a2d7d3c33699a6f77201836ac975b2e1b98c2a07f66a38f499cb50ce"},
-    {file = "numpy-1.21.4-cp38-cp38-win32.whl", hash = "sha256:bc988afcea53e6156546e5b2885b7efab089570783d9d82caf1cfd323b0bb3dd"},
-    {file = "numpy-1.21.4-cp38-cp38-win_amd64.whl", hash = "sha256:170b2a0805c6891ca78c1d96ee72e4c3ed1ae0a992c75444b6ab20ff038ba2cd"},
-    {file = "numpy-1.21.4-cp39-cp39-macosx_10_9_universal2.whl", hash = "sha256:fde96af889262e85aa033f8ee1d3241e32bf36228318a61f1ace579df4e8170d"},
-    {file = "numpy-1.21.4-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:c885bfc07f77e8fee3dc879152ba993732601f1f11de248d4f357f0ffea6a6d4"},
-    {file = "numpy-1.21.4-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:9e6f5f50d1eff2f2f752b3089a118aee1ea0da63d56c44f3865681009b0af162"},
-    {file = "numpy-1.21.4-cp39-cp39-manylinux_2_12_i686.manylinux2010_i686.whl", hash = "sha256:ad010846cdffe7ec27e3f933397f8a8d6c801a48634f419e3d075db27acf5880"},
-    {file = "numpy-1.21.4-cp39-cp39-manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:c74c699b122918a6c4611285cc2cad4a3aafdb135c22a16ec483340ef97d573c"},
-    {file = "numpy-1.21.4-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:9864424631775b0c052f3bd98bc2712d131b3e2cd95d1c0c68b91709170890b0"},
-    {file = "numpy-1.21.4-cp39-cp39-win32.whl", hash = "sha256:b1e2312f5b8843a3e4e8224b2b48fe16119617b8fc0a54df8f50098721b5bed2"},
-    {file = "numpy-1.21.4-cp39-cp39-win_amd64.whl", hash = "sha256:e3c3e990274444031482a31280bf48674441e0a5b55ddb168f3a6db3e0c38ec8"},
-    {file = "numpy-1.21.4-pp37-pypy37_pp73-manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:a3deb31bc84f2b42584b8c4001c85d1934dbfb4030827110bc36bfd11509b7bf"},
-    {file = "numpy-1.21.4.zip", hash = "sha256:e6c76a87633aa3fa16614b61ccedfae45b91df2767cf097aa9c933932a7ed1e0"},
+    {file = "numpy-1.22.0-cp310-cp310-macosx_10_9_universal2.whl", hash = "sha256:3d22662b4b10112c545c91a0741f2436f8ca979ab3d69d03d19322aa970f9695"},
+    {file = "numpy-1.22.0-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:11a1f3816ea82eed4178102c56281782690ab5993251fdfd75039aad4d20385f"},
+    {file = "numpy-1.22.0-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:5dc65644f75a4c2970f21394ad8bea1a844104f0fe01f278631be1c7eae27226"},
+    {file = "numpy-1.22.0-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:42c16cec1c8cf2728f1d539bd55aaa9d6bb48a7de2f41eb944697293ef65a559"},
+    {file = "numpy-1.22.0-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:a97e82c39d9856fe7d4f9b86d8a1e66eff99cf3a8b7ba48202f659703d27c46f"},
+    {file = "numpy-1.22.0-cp310-cp310-win_amd64.whl", hash = "sha256:e41e8951749c4b5c9a2dc5fdbc1a4eec6ab2a140fdae9b460b0f557eed870f4d"},
+    {file = "numpy-1.22.0-cp38-cp38-macosx_10_9_universal2.whl", hash = "sha256:bece0a4a49e60e472a6d1f70ac6cdea00f9ab80ff01132f96bd970cdd8a9e5a9"},
+    {file = "numpy-1.22.0-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:818b9be7900e8dc23e013a92779135623476f44a0de58b40c32a15368c01d471"},
+    {file = "numpy-1.22.0-cp38-cp38-macosx_11_0_arm64.whl", hash = "sha256:47ee7a839f5885bc0c63a74aabb91f6f40d7d7b639253768c4199b37aede7982"},
+    {file = "numpy-1.22.0-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:a024181d7aef0004d76fb3bce2a4c9f2e67a609a9e2a6ff2571d30e9976aa383"},
+    {file = "numpy-1.22.0-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:f71d57cc8645f14816ae249407d309be250ad8de93ef61d9709b45a0ddf4050c"},
+    {file = "numpy-1.22.0-cp38-cp38-win32.whl", hash = "sha256:283d9de87c0133ef98f93dfc09fad3fb382f2a15580de75c02b5bb36a5a159a5"},
+    {file = "numpy-1.22.0-cp38-cp38-win_amd64.whl", hash = "sha256:2762331de395739c91f1abb88041f94a080cb1143aeec791b3b223976228af3f"},
+    {file = "numpy-1.22.0-cp39-cp39-macosx_10_9_universal2.whl", hash = "sha256:76ba7c40e80f9dc815c5e896330700fd6e20814e69da9c1267d65a4d051080f1"},
+    {file = "numpy-1.22.0-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:0cfe07133fd00b27edee5e6385e333e9eeb010607e8a46e1cd673f05f8596595"},
+    {file = "numpy-1.22.0-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:6ed0d073a9c54ac40c41a9c2d53fcc3d4d4ed607670b9e7b0de1ba13b4cbfe6f"},
+    {file = "numpy-1.22.0-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:41388e32e40b41dd56eb37fcaa7488b2b47b0adf77c66154d6b89622c110dfe9"},
+    {file = "numpy-1.22.0-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:b55b953a1bdb465f4dc181758570d321db4ac23005f90ffd2b434cc6609a63dd"},
+    {file = "numpy-1.22.0-cp39-cp39-win32.whl", hash = "sha256:5a311ee4d983c487a0ab546708edbdd759393a3dc9cd30305170149fedd23c88"},
+    {file = "numpy-1.22.0-cp39-cp39-win_amd64.whl", hash = "sha256:a97a954a8c2f046d3817c2bce16e3c7e9a9c2afffaf0400f5c16df5172a67c9c"},
+    {file = "numpy-1.22.0-pp38-pypy38_pp73-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:bb02929b0d6bfab4c48a79bd805bd7419114606947ec8284476167415171f55b"},
+    {file = "numpy-1.22.0.zip", hash = "sha256:a955e4128ac36797aaffd49ab44ec74a71c11d6938df83b1285492d277db5397"},
 ]
 packaging = [
     {file = "packaging-21.2-py3-none-any.whl", hash = "sha256:14317396d1e8cdb122989b916fa2c7e9ca8e2be9e8060a6eff75b6b7b4d8a7e0"},
diff --git a/pyproject.toml b/pyproject.toml
index fd5c78e2..bc3e74e1 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -10,7 +10,7 @@ python = ">=3.9,<3.11"
 anytree = "^2.8.0"
 click = "^8.0.3"
 matplotlib = "3.5.0"
-numpy = "^1.21.4"
+numpy = "^1.22.0"
 tqdm = "^4.62.3"
 requests = "^2.27.1"
 beautifulsoup4 = "^4.10.0"

From 69144cecb774b6338354cbe3673270cf56e8b49d Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 11 Jan 2022 14:23:33 +0000
Subject: [PATCH 061/371] Bump matplotlib from 3.5.0 to 3.5.1

Bumps [matplotlib](https://github.com/matplotlib/matplotlib) from 3.5.0 to 3.5.1.
- [Release notes](https://github.com/matplotlib/matplotlib/releases)
- [Commits](https://github.com/matplotlib/matplotlib/compare/v3.5.0...v3.5.1)

---
updated-dependencies:
- dependency-name: matplotlib
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 poetry.lock    | 74 +++++++++++++++++++++++++-------------------------
 pyproject.toml |  2 +-
 2 files changed, 38 insertions(+), 38 deletions(-)

diff --git a/poetry.lock b/poetry.lock
index 5c7c6ad2..9e313c71 100644
--- a/poetry.lock
+++ b/poetry.lock
@@ -327,7 +327,7 @@ python-versions = ">=3.6"
 
 [[package]]
 name = "matplotlib"
-version = "3.5.0"
+version = "3.5.1"
 description = "Python plotting package"
 category = "main"
 optional = false
@@ -723,7 +723,7 @@ testing = ["coverage (>=4)", "coverage-enable-subprocess (>=1)", "flaky (>=3)",
 [metadata]
 lock-version = "1.1"
 python-versions = ">=3.9,<3.11"
-content-hash = "c7bb467415e4190fb807df64d912b9cbb2dc644836744463c39f76bace210464"
+content-hash = "a82307a9f039b23d9b3c921562429b341bc643e33fa29d60f539f5b4efc6f04c"
 
 [metadata.files]
 anytree = [
@@ -993,41 +993,41 @@ markupsafe = [
     {file = "MarkupSafe-2.0.1.tar.gz", hash = "sha256:594c67807fb16238b30c44bdf74f36c02cdf22d1c8cda91ef8a0ed8dabf5620a"},
 ]
 matplotlib = [
-    {file = "matplotlib-3.5.0-cp310-cp310-macosx_10_9_universal2.whl", hash = "sha256:4b018ea6f26424a0852eb60eb406420d9f0d34f65736ea7bbfbb104946a66d86"},
-    {file = "matplotlib-3.5.0-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:a07ff2565da72a7b384a9e000b15b6b8270d81370af8a3531a16f6fbcee023cc"},
-    {file = "matplotlib-3.5.0-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:2eea16883aa7724c95eea0eb473ab585c6cf66f0e28f7f13e63deb38f4fd6d0f"},
-    {file = "matplotlib-3.5.0-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:0e020a42f3338823a393dd2f80e39a2c07b9f941dfe2c778eb104eeb33d60bb5"},
-    {file = "matplotlib-3.5.0-cp310-cp310-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:9bac8eb1eccef540d7f4e844b6313d9f7722efd48c07e1b4bfec1056132127fd"},
-    {file = "matplotlib-3.5.0-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:7a7cb59ebd63a8ac4542ec1c61dd08724f82ec3aa7bb6b4b9e212d43c611ce3d"},
-    {file = "matplotlib-3.5.0-cp310-cp310-win32.whl", hash = "sha256:6e0e6b2111165522ad336705499b1f968c34a9e84d05d498ee5af0b5697d1efe"},
-    {file = "matplotlib-3.5.0-cp310-cp310-win_amd64.whl", hash = "sha256:ff5d9fe518ad2de14ce82ab906b6ab5c2b0c7f4f984400ff8a7a905daa580a0a"},
-    {file = "matplotlib-3.5.0-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:66b172610db0ececebebb09d146f54205f87c7b841454e408fba854764f91bdd"},
-    {file = "matplotlib-3.5.0-cp37-cp37m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:ee3d9ff16d749a9aa521bd7d86f0dbf256b2d2ac8ce31b19e4d2c86d2f2ff0b6"},
-    {file = "matplotlib-3.5.0-cp37-cp37m-manylinux_2_5_i686.manylinux1_i686.whl", hash = "sha256:970aa97297537540369d05fe0fd1bb952593f9ab696c9b427c06990a83e2418b"},
-    {file = "matplotlib-3.5.0-cp37-cp37m-manylinux_2_5_x86_64.manylinux1_x86_64.whl", hash = "sha256:153a0cf6a6ff4f406a0600d2034710c49988bacc6313d193b32716f98a697580"},
-    {file = "matplotlib-3.5.0-cp37-cp37m-win32.whl", hash = "sha256:6db02c5605f063b67780f4d5753476b6a4944343284aa4e93c5e8ff6e9ec7f76"},
-    {file = "matplotlib-3.5.0-cp37-cp37m-win_amd64.whl", hash = "sha256:df0042cab69f4d246f4cb8fc297770ac4ae6ec2983f61836b04a117722037dcd"},
-    {file = "matplotlib-3.5.0-cp38-cp38-macosx_10_9_universal2.whl", hash = "sha256:a7bf8b05c214d32fb7ca7c001fde70b9b426378e897b0adbf77b85ea3569d56a"},
-    {file = "matplotlib-3.5.0-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:0abf8b51cc6d3ba34d1b15b26e329f23879848a0cf1216954c1f432ffc7e1af7"},
-    {file = "matplotlib-3.5.0-cp38-cp38-macosx_11_0_arm64.whl", hash = "sha256:13930a0c9bec0fd25f43c448b047a21af1353328b946f044a8fc3be077c6b1a8"},
-    {file = "matplotlib-3.5.0-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:18f6e52386300db5cc4d1e9019ad9da2e80658bab018834d963ebb0aa5355095"},
-    {file = "matplotlib-3.5.0-cp38-cp38-manylinux_2_5_i686.manylinux1_i686.whl", hash = "sha256:ba107add08e12600b072cf3c47aaa1ab85dd4d3c48107a5d3377d1bf80f8b235"},
-    {file = "matplotlib-3.5.0-cp38-cp38-manylinux_2_5_x86_64.manylinux1_x86_64.whl", hash = "sha256:2089b9014792dcc87bb1d620cde847913338abf7d957ef05587382b0cb76d44e"},
-    {file = "matplotlib-3.5.0-cp38-cp38-win32.whl", hash = "sha256:f23fbf70d2e80f4e03a83fc1206a8306d9bc50482fee4239f10676ce7e470c83"},
-    {file = "matplotlib-3.5.0-cp38-cp38-win_amd64.whl", hash = "sha256:71a1851111f23f82fc43d2b6b2bfdd3f760579a664ebc939576fe21cc6133d01"},
-    {file = "matplotlib-3.5.0-cp39-cp39-macosx_10_9_universal2.whl", hash = "sha256:d092b7ba63182d2dd427904e3eb58dd5c46ec67c5968de14a4b5007010a3a4cc"},
-    {file = "matplotlib-3.5.0-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:ac17a7e7b06ee426a4989f0b7f24ab1a592e39cdf56353a90f4e998bc0bf44d6"},
-    {file = "matplotlib-3.5.0-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:a5b62d1805cc83d755972033c05cea78a1e177a159fc84da5c9c4ab6303ccbd9"},
-    {file = "matplotlib-3.5.0-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:666d717a4798eb9c5d3ae83fe80c7bc6ed696b93e879cb01cb24a74155c73612"},
-    {file = "matplotlib-3.5.0-cp39-cp39-manylinux_2_5_i686.manylinux1_i686.whl", hash = "sha256:65f877882b7ddede7090c7d87be27a0f4720fe7fc6fddd4409c06e1aa0f1ae8d"},
-    {file = "matplotlib-3.5.0-cp39-cp39-manylinux_2_5_x86_64.manylinux1_x86_64.whl", hash = "sha256:7baf23adb698d8c6ca7339c9dde00931bc47b2dd82fa912827fef9f93db77f5e"},
-    {file = "matplotlib-3.5.0-cp39-cp39-win32.whl", hash = "sha256:b3b687e905da32e5f2e5f16efa713f5d1fcd9fb8b8c697895de35c91fedeb086"},
-    {file = "matplotlib-3.5.0-cp39-cp39-win_amd64.whl", hash = "sha256:a6cef5b31e27c31253c0f852b629a38d550ae66ec6850129c49d872f9ee428cb"},
-    {file = "matplotlib-3.5.0-pp37-pypy37_pp73-macosx_10_9_x86_64.whl", hash = "sha256:a0dcaf5648cecddc328e81a0421821a1f65a1d517b20746c94a1f0f5c36fb51a"},
-    {file = "matplotlib-3.5.0-pp37-pypy37_pp73-manylinux_2_12_i686.manylinux2010_i686.whl", hash = "sha256:b5e439d9e55d645f2a4dca63e2f66d68fe974c405053b132d61c7e98c25dfeb2"},
-    {file = "matplotlib-3.5.0-pp37-pypy37_pp73-manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:dc8c5c23e7056e126275dbf29efba817b3d94196690930d0968873ac3a94ab82"},
-    {file = "matplotlib-3.5.0-pp37-pypy37_pp73-win_amd64.whl", hash = "sha256:a0ea10faa3bab0714d3a19c7e0921279a68d57552414d6eceaea99f97d7735db"},
-    {file = "matplotlib-3.5.0.tar.gz", hash = "sha256:38892a254420d95594285077276162a5e9e9c30b6da08bdc2a4d53331ad9a6fa"},
+    {file = "matplotlib-3.5.1-cp310-cp310-macosx_10_9_universal2.whl", hash = "sha256:456cc8334f6d1124e8ff856b42d2cc1c84335375a16448189999496549f7182b"},
+    {file = "matplotlib-3.5.1-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:8a77906dc2ef9b67407cec0bdbf08e3971141e535db888974a915be5e1e3efc6"},
+    {file = "matplotlib-3.5.1-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:8e70ae6475cfd0fad3816dcbf6cac536dc6f100f7474be58d59fa306e6e768a4"},
+    {file = "matplotlib-3.5.1-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:53273c5487d1c19c3bc03b9eb82adaf8456f243b97ed79d09dded747abaf1235"},
+    {file = "matplotlib-3.5.1-cp310-cp310-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:e3b6f3fd0d8ca37861c31e9a7cab71a0ef14c639b4c95654ea1dd153158bf0df"},
+    {file = "matplotlib-3.5.1-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:e8c87cdaf06fd7b2477f68909838ff4176f105064a72ca9d24d3f2a29f73d393"},
+    {file = "matplotlib-3.5.1-cp310-cp310-win32.whl", hash = "sha256:e2f28a07b4f82abb40267864ad7b3a4ed76f1b1663e81c7efc84a9b9248f672f"},
+    {file = "matplotlib-3.5.1-cp310-cp310-win_amd64.whl", hash = "sha256:d70a32ee1f8b55eed3fd4e892f0286df8cccc7e0475c11d33b5d0a148f5c7599"},
+    {file = "matplotlib-3.5.1-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:68fa30cec89b6139dc559ed6ef226c53fd80396da1919a1b5ef672c911aaa767"},
+    {file = "matplotlib-3.5.1-cp37-cp37m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:2e3484d8455af3fdb0424eae1789af61f6a79da0c80079125112fd5c1b604218"},
+    {file = "matplotlib-3.5.1-cp37-cp37m-manylinux_2_5_i686.manylinux1_i686.whl", hash = "sha256:e293b16cf303fe82995e41700d172a58a15efc5331125d08246b520843ef21ee"},
+    {file = "matplotlib-3.5.1-cp37-cp37m-manylinux_2_5_x86_64.manylinux1_x86_64.whl", hash = "sha256:e3520a274a0e054e919f5b3279ee5dbccf5311833819ccf3399dab7c83e90a25"},
+    {file = "matplotlib-3.5.1-cp37-cp37m-win32.whl", hash = "sha256:2252bfac85cec7af4a67e494bfccf9080bcba8a0299701eab075f48847cca907"},
+    {file = "matplotlib-3.5.1-cp37-cp37m-win_amd64.whl", hash = "sha256:abf67e05a1b7f86583f6ebd01f69b693b9c535276f4e943292e444855870a1b8"},
+    {file = "matplotlib-3.5.1-cp38-cp38-macosx_10_9_universal2.whl", hash = "sha256:6c094e4bfecd2fa7f9adffd03d8abceed7157c928c2976899de282f3600f0a3d"},
+    {file = "matplotlib-3.5.1-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:506b210cc6e66a0d1c2bb765d055f4f6bc2745070fb1129203b67e85bbfa5c18"},
+    {file = "matplotlib-3.5.1-cp38-cp38-macosx_11_0_arm64.whl", hash = "sha256:b04fc29bcef04d4e2d626af28d9d892be6aba94856cb46ed52bcb219ceac8943"},
+    {file = "matplotlib-3.5.1-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:577ed20ec9a18d6bdedb4616f5e9e957b4c08563a9f985563a31fd5b10564d2a"},
+    {file = "matplotlib-3.5.1-cp38-cp38-manylinux_2_5_i686.manylinux1_i686.whl", hash = "sha256:e486f60db0cd1c8d68464d9484fd2a94011c1ac8593d765d0211f9daba2bd535"},
+    {file = "matplotlib-3.5.1-cp38-cp38-manylinux_2_5_x86_64.manylinux1_x86_64.whl", hash = "sha256:b71f3a7ca935fc759f2aed7cec06cfe10bc3100fadb5dbd9c435b04e557971e1"},
+    {file = "matplotlib-3.5.1-cp38-cp38-win32.whl", hash = "sha256:d24e5bb8028541ce25e59390122f5e48c8506b7e35587e5135efcb6471b4ac6c"},
+    {file = "matplotlib-3.5.1-cp38-cp38-win_amd64.whl", hash = "sha256:778d398c4866d8e36ee3bf833779c940b5f57192fa0a549b3ad67bc4c822771b"},
+    {file = "matplotlib-3.5.1-cp39-cp39-macosx_10_9_universal2.whl", hash = "sha256:bb1c613908f11bac270bc7494d68b1ef6e7c224b7a4204d5dacf3522a41e2bc3"},
+    {file = "matplotlib-3.5.1-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:edf5e4e1d5fb22c18820e8586fb867455de3b109c309cb4fce3aaed85d9468d1"},
+    {file = "matplotlib-3.5.1-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:40e0d7df05e8efe60397c69b467fc8f87a2affeb4d562fe92b72ff8937a2b511"},
+    {file = "matplotlib-3.5.1-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:7a350ca685d9f594123f652ba796ee37219bf72c8e0fc4b471473d87121d6d34"},
+    {file = "matplotlib-3.5.1-cp39-cp39-manylinux_2_5_i686.manylinux1_i686.whl", hash = "sha256:3e66497cd990b1a130e21919b004da2f1dc112132c01ac78011a90a0f9229778"},
+    {file = "matplotlib-3.5.1-cp39-cp39-manylinux_2_5_x86_64.manylinux1_x86_64.whl", hash = "sha256:87900c67c0f1728e6db17c6809ec05c025c6624dcf96a8020326ea15378fe8e7"},
+    {file = "matplotlib-3.5.1-cp39-cp39-win32.whl", hash = "sha256:b8a4fb2a0c5afbe9604f8a91d7d0f27b1832c3e0b5e365f95a13015822b4cd65"},
+    {file = "matplotlib-3.5.1-cp39-cp39-win_amd64.whl", hash = "sha256:fe8d40c434a8e2c68d64c6d6a04e77f21791a93ff6afe0dce169597c110d3079"},
+    {file = "matplotlib-3.5.1-pp37-pypy37_pp73-macosx_10_9_x86_64.whl", hash = "sha256:34a1fc29f8f96e78ec57a5eff5e8d8b53d3298c3be6df61e7aa9efba26929522"},
+    {file = "matplotlib-3.5.1-pp37-pypy37_pp73-manylinux_2_12_i686.manylinux2010_i686.whl", hash = "sha256:b19a761b948e939a9e20173aaae76070025f0024fc8f7ba08bef22a5c8573afc"},
+    {file = "matplotlib-3.5.1-pp37-pypy37_pp73-manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:6803299cbf4665eca14428d9e886de62e24f4223ac31ab9c5d6d5339a39782c7"},
+    {file = "matplotlib-3.5.1-pp37-pypy37_pp73-win_amd64.whl", hash = "sha256:14334b9902ec776461c4b8c6516e26b450f7ebe0b3ef8703bf5cdfbbaecf774a"},
+    {file = "matplotlib-3.5.1.tar.gz", hash = "sha256:b2e9810e09c3a47b73ce9cab5a72243a1258f61e7900969097a817232246ce1c"},
 ]
 mypy-extensions = [
     {file = "mypy_extensions-0.4.3-py2.py3-none-any.whl", hash = "sha256:090fedd75945a69ae91ce1303b5824f428daf5a028d2f6ab8a299250a846f15d"},
diff --git a/pyproject.toml b/pyproject.toml
index bc3e74e1..cef9075d 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -9,7 +9,7 @@ license = "MIT License"
 python = ">=3.9,<3.11"
 anytree = "^2.8.0"
 click = "^8.0.3"
-matplotlib = "3.5.0"
+matplotlib = "3.5.1"
 numpy = "^1.22.0"
 tqdm = "^4.62.3"
 requests = "^2.27.1"

From 5e6775275bb645fd9055b33ab699fc00d074b74a Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 11 Jan 2022 14:26:07 +0000
Subject: [PATCH 062/371] Bump tox from 3.24.4 to 3.24.5

Bumps [tox](https://github.com/tox-dev/tox) from 3.24.4 to 3.24.5.
- [Release notes](https://github.com/tox-dev/tox/releases)
- [Changelog](https://github.com/tox-dev/tox/blob/master/docs/changelog.rst)
- [Commits](https://github.com/tox-dev/tox/compare/3.24.4...3.24.5)

---
updated-dependencies:
- dependency-name: tox
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 poetry.lock    | 10 +++++-----
 pyproject.toml |  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/poetry.lock b/poetry.lock
index 9e313c71..a278d9db 100644
--- a/poetry.lock
+++ b/poetry.lock
@@ -644,7 +644,7 @@ python-versions = ">=3.6"
 
 [[package]]
 name = "tox"
-version = "3.24.4"
+version = "3.24.5"
 description = "tox is a generic virtualenv management and test command line tool"
 category = "dev"
 optional = false
@@ -662,7 +662,7 @@ virtualenv = ">=16.0.0,<20.0.0 || >20.0.0,<20.0.1 || >20.0.1,<20.0.2 || >20.0.2,
 
 [package.extras]
 docs = ["pygments-github-lexers (>=0.0.5)", "sphinx (>=2.0.0)", "sphinxcontrib-autoprogram (>=0.1.5)", "towncrier (>=18.5.0)"]
-testing = ["flaky (>=3.4.0)", "freezegun (>=0.3.11)", "psutil (>=5.6.1)", "pytest (>=4.0.0)", "pytest-cov (>=2.5.1)", "pytest-mock (>=1.10.0)", "pytest-randomly (>=1.0.0)", "pytest-xdist (>=1.22.2)", "pathlib2 (>=2.3.3)"]
+testing = ["flaky (>=3.4.0)", "freezegun (>=0.3.11)", "pytest (>=4.0.0)", "pytest-cov (>=2.5.1)", "pytest-mock (>=1.10.0)", "pytest-randomly (>=1.0.0)", "psutil (>=5.6.1)", "pathlib2 (>=2.3.3)"]
 
 [[package]]
 name = "tqdm"
@@ -723,7 +723,7 @@ testing = ["coverage (>=4)", "coverage-enable-subprocess (>=1)", "flaky (>=3)",
 [metadata]
 lock-version = "1.1"
 python-versions = ">=3.9,<3.11"
-content-hash = "a82307a9f039b23d9b3c921562429b341bc643e33fa29d60f539f5b4efc6f04c"
+content-hash = "96c93854fae4e9b5b0ecad38b6737c5e7cc2d1db38b9439ceeb3823a71e85f1a"
 
 [metadata.files]
 anytree = [
@@ -1228,8 +1228,8 @@ tomli = [
     {file = "tomli-1.2.2.tar.gz", hash = "sha256:c6ce0015eb38820eaf32b5db832dbc26deb3dd427bd5f6556cf0acac2c214fee"},
 ]
 tox = [
-    {file = "tox-3.24.4-py2.py3-none-any.whl", hash = "sha256:5e274227a53dc9ef856767c21867377ba395992549f02ce55eb549f9fb9a8d10"},
-    {file = "tox-3.24.4.tar.gz", hash = "sha256:c30b57fa2477f1fb7c36aa1d83292d5c2336cd0018119e1b1c17340e2c2708ca"},
+    {file = "tox-3.24.5-py2.py3-none-any.whl", hash = "sha256:be3362472a33094bce26727f5f771ca0facf6dafa217f65875314e9a6600c95c"},
+    {file = "tox-3.24.5.tar.gz", hash = "sha256:67e0e32c90e278251fea45b696d0fef3879089ccbe979b0c556d35d5a70e2993"},
 ]
 tqdm = [
     {file = "tqdm-4.62.3-py2.py3-none-any.whl", hash = "sha256:8dd278a422499cd6b727e6ae4061c40b48fce8b76d1ccbf5d34fca9b7f925b0c"},
diff --git a/pyproject.toml b/pyproject.toml
index cef9075d..f0f8c7ba 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -22,7 +22,7 @@ pytest = "^6.2.5"
 pytest-cov = "^3.0.0"
 pytest-xdist = "^2.4.0"
 python-dotenv = "^0.19.2"
-tox = "^3.24.4"
+tox = "^3.24.5"
 pre-commit = "^2.16.0"
 
 [tool.poetry.scripts]

From 35fd34d54deb117e2e0dcaf38f177a623b6f8774 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 11 Jan 2022 14:29:22 +0000
Subject: [PATCH 063/371] Bump pytest-xdist from 2.4.0 to 2.5.0

Bumps [pytest-xdist](https://github.com/pytest-dev/pytest-xdist) from 2.4.0 to 2.5.0.
- [Release notes](https://github.com/pytest-dev/pytest-xdist/releases)
- [Changelog](https://github.com/pytest-dev/pytest-xdist/blob/master/CHANGELOG.rst)
- [Commits](https://github.com/pytest-dev/pytest-xdist/compare/v2.4.0...v2.5.0)

---
updated-dependencies:
- dependency-name: pytest-xdist
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 poetry.lock    | 10 +++++-----
 pyproject.toml |  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/poetry.lock b/poetry.lock
index a278d9db..2efb2352 100644
--- a/poetry.lock
+++ b/poetry.lock
@@ -509,7 +509,7 @@ pytest = ">=3.10"
 
 [[package]]
 name = "pytest-xdist"
-version = "2.4.0"
+version = "2.5.0"
 description = "pytest xdist plugin for distributed testing and loop-on-failing modes"
 category = "dev"
 optional = false
@@ -517,7 +517,7 @@ python-versions = ">=3.6"
 
 [package.dependencies]
 execnet = ">=1.1"
-pytest = ">=6.0.0"
+pytest = ">=6.2.0"
 pytest-forked = "*"
 
 [package.extras]
@@ -723,7 +723,7 @@ testing = ["coverage (>=4)", "coverage-enable-subprocess (>=1)", "flaky (>=3)",
 [metadata]
 lock-version = "1.1"
 python-versions = ">=3.9,<3.11"
-content-hash = "96c93854fae4e9b5b0ecad38b6737c5e7cc2d1db38b9439ceeb3823a71e85f1a"
+content-hash = "868c0759e20c61903e6177572c58548e3de71ab1509e3e3f59c57ab20fe28aaa"
 
 [metadata.files]
 anytree = [
@@ -1149,8 +1149,8 @@ pytest-forked = [
     {file = "pytest_forked-1.3.0-py2.py3-none-any.whl", hash = "sha256:dc4147784048e70ef5d437951728825a131b81714b398d5d52f17c7c144d8815"},
 ]
 pytest-xdist = [
-    {file = "pytest-xdist-2.4.0.tar.gz", hash = "sha256:89b330316f7fc475f999c81b577c2b926c9569f3d397ae432c0c2e2496d61ff9"},
-    {file = "pytest_xdist-2.4.0-py3-none-any.whl", hash = "sha256:7b61ebb46997a0820a263553179d6d1e25a8c50d8a8620cd1aa1e20e3be99168"},
+    {file = "pytest-xdist-2.5.0.tar.gz", hash = "sha256:4580deca3ff04ddb2ac53eba39d76cb5dd5edeac050cb6fbc768b0dd712b4edf"},
+    {file = "pytest_xdist-2.5.0-py3-none-any.whl", hash = "sha256:6fe5c74fec98906deb8f2d2b616b5c782022744978e7bd4695d39c8f42d0ce65"},
 ]
 python-dateutil = [
     {file = "python-dateutil-2.8.2.tar.gz", hash = "sha256:0123cacc1627ae19ddf3c27a5de5bd67ee4586fbdd6440d9748f8abb483d3e86"},
diff --git a/pyproject.toml b/pyproject.toml
index f0f8c7ba..bbd656a1 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -20,7 +20,7 @@ black = "^21.12b0"
 cookiecutter = "^1.7.3"
 pytest = "^6.2.5"
 pytest-cov = "^3.0.0"
-pytest-xdist = "^2.4.0"
+pytest-xdist = "^2.5.0"
 python-dotenv = "^0.19.2"
 tox = "^3.24.5"
 pre-commit = "^2.16.0"

From 245df46676d6f9d78e7cdfdea8db5e55318e435b Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 17 Jan 2022 04:06:40 +0000
Subject: [PATCH 064/371] Bump numpy from 1.22.0 to 1.22.1

Bumps [numpy](https://github.com/numpy/numpy) from 1.22.0 to 1.22.1.
- [Release notes](https://github.com/numpy/numpy/releases)
- [Changelog](https://github.com/numpy/numpy/blob/main/doc/HOWTO_RELEASE.rst.txt)
- [Commits](https://github.com/numpy/numpy/compare/v1.22.0...v1.22.1)

---
updated-dependencies:
- dependency-name: numpy
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 poetry.lock    | 48 ++++++++++++++++++++++++------------------------
 pyproject.toml |  2 +-
 2 files changed, 25 insertions(+), 25 deletions(-)

diff --git a/poetry.lock b/poetry.lock
index 2efb2352..f61c78e8 100644
--- a/poetry.lock
+++ b/poetry.lock
@@ -362,7 +362,7 @@ python-versions = "*"
 
 [[package]]
 name = "numpy"
-version = "1.22.0"
+version = "1.22.1"
 description = "NumPy is the fundamental package for array computing with Python."
 category = "main"
 optional = false
@@ -723,7 +723,7 @@ testing = ["coverage (>=4)", "coverage-enable-subprocess (>=1)", "flaky (>=3)",
 [metadata]
 lock-version = "1.1"
 python-versions = ">=3.9,<3.11"
-content-hash = "868c0759e20c61903e6177572c58548e3de71ab1509e3e3f59c57ab20fe28aaa"
+content-hash = "f7649b8fade28ad7fb93fc296b60a0aafeeff18bc054a927a5119199aeb85647"
 
 [metadata.files]
 anytree = [
@@ -1038,28 +1038,28 @@ nodeenv = [
     {file = "nodeenv-1.6.0.tar.gz", hash = "sha256:3ef13ff90291ba2a4a7a4ff9a979b63ffdd00a464dbe04acf0ea6471517a4c2b"},
 ]
 numpy = [
-    {file = "numpy-1.22.0-cp310-cp310-macosx_10_9_universal2.whl", hash = "sha256:3d22662b4b10112c545c91a0741f2436f8ca979ab3d69d03d19322aa970f9695"},
-    {file = "numpy-1.22.0-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:11a1f3816ea82eed4178102c56281782690ab5993251fdfd75039aad4d20385f"},
-    {file = "numpy-1.22.0-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:5dc65644f75a4c2970f21394ad8bea1a844104f0fe01f278631be1c7eae27226"},
-    {file = "numpy-1.22.0-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:42c16cec1c8cf2728f1d539bd55aaa9d6bb48a7de2f41eb944697293ef65a559"},
-    {file = "numpy-1.22.0-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:a97e82c39d9856fe7d4f9b86d8a1e66eff99cf3a8b7ba48202f659703d27c46f"},
-    {file = "numpy-1.22.0-cp310-cp310-win_amd64.whl", hash = "sha256:e41e8951749c4b5c9a2dc5fdbc1a4eec6ab2a140fdae9b460b0f557eed870f4d"},
-    {file = "numpy-1.22.0-cp38-cp38-macosx_10_9_universal2.whl", hash = "sha256:bece0a4a49e60e472a6d1f70ac6cdea00f9ab80ff01132f96bd970cdd8a9e5a9"},
-    {file = "numpy-1.22.0-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:818b9be7900e8dc23e013a92779135623476f44a0de58b40c32a15368c01d471"},
-    {file = "numpy-1.22.0-cp38-cp38-macosx_11_0_arm64.whl", hash = "sha256:47ee7a839f5885bc0c63a74aabb91f6f40d7d7b639253768c4199b37aede7982"},
-    {file = "numpy-1.22.0-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:a024181d7aef0004d76fb3bce2a4c9f2e67a609a9e2a6ff2571d30e9976aa383"},
-    {file = "numpy-1.22.0-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:f71d57cc8645f14816ae249407d309be250ad8de93ef61d9709b45a0ddf4050c"},
-    {file = "numpy-1.22.0-cp38-cp38-win32.whl", hash = "sha256:283d9de87c0133ef98f93dfc09fad3fb382f2a15580de75c02b5bb36a5a159a5"},
-    {file = "numpy-1.22.0-cp38-cp38-win_amd64.whl", hash = "sha256:2762331de395739c91f1abb88041f94a080cb1143aeec791b3b223976228af3f"},
-    {file = "numpy-1.22.0-cp39-cp39-macosx_10_9_universal2.whl", hash = "sha256:76ba7c40e80f9dc815c5e896330700fd6e20814e69da9c1267d65a4d051080f1"},
-    {file = "numpy-1.22.0-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:0cfe07133fd00b27edee5e6385e333e9eeb010607e8a46e1cd673f05f8596595"},
-    {file = "numpy-1.22.0-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:6ed0d073a9c54ac40c41a9c2d53fcc3d4d4ed607670b9e7b0de1ba13b4cbfe6f"},
-    {file = "numpy-1.22.0-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:41388e32e40b41dd56eb37fcaa7488b2b47b0adf77c66154d6b89622c110dfe9"},
-    {file = "numpy-1.22.0-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:b55b953a1bdb465f4dc181758570d321db4ac23005f90ffd2b434cc6609a63dd"},
-    {file = "numpy-1.22.0-cp39-cp39-win32.whl", hash = "sha256:5a311ee4d983c487a0ab546708edbdd759393a3dc9cd30305170149fedd23c88"},
-    {file = "numpy-1.22.0-cp39-cp39-win_amd64.whl", hash = "sha256:a97a954a8c2f046d3817c2bce16e3c7e9a9c2afffaf0400f5c16df5172a67c9c"},
-    {file = "numpy-1.22.0-pp38-pypy38_pp73-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:bb02929b0d6bfab4c48a79bd805bd7419114606947ec8284476167415171f55b"},
-    {file = "numpy-1.22.0.zip", hash = "sha256:a955e4128ac36797aaffd49ab44ec74a71c11d6938df83b1285492d277db5397"},
+    {file = "numpy-1.22.1-cp310-cp310-macosx_10_9_universal2.whl", hash = "sha256:3d62d6b0870b53799204515145935608cdeb4cebb95a26800b6750e48884cc5b"},
+    {file = "numpy-1.22.1-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:831f2df87bd3afdfc77829bc94bd997a7c212663889d56518359c827d7113b1f"},
+    {file = "numpy-1.22.1-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:8d1563060e77096367952fb44fca595f2b2f477156de389ce7c0ade3aef29e21"},
+    {file = "numpy-1.22.1-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:69958735d5e01f7b38226a6c6e7187d72b7e4d42b6b496aca5860b611ca0c193"},
+    {file = "numpy-1.22.1-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:45a7dfbf9ed8d68fd39763940591db7637cf8817c5bce1a44f7b56c97cbe211e"},
+    {file = "numpy-1.22.1-cp310-cp310-win_amd64.whl", hash = "sha256:7e957ca8112c689b728037cea9c9567c27cf912741fabda9efc2c7d33d29dfa1"},
+    {file = "numpy-1.22.1-cp38-cp38-macosx_10_9_universal2.whl", hash = "sha256:800dfeaffb2219d49377da1371d710d7952c9533b57f3d51b15e61c4269a1b5b"},
+    {file = "numpy-1.22.1-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:65f5e257987601fdfc63f1d02fca4d1c44a2b85b802f03bd6abc2b0b14648dd2"},
+    {file = "numpy-1.22.1-cp38-cp38-macosx_11_0_arm64.whl", hash = "sha256:632e062569b0fe05654b15ef0e91a53c0a95d08ffe698b66f6ba0f927ad267c2"},
+    {file = "numpy-1.22.1-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:0d245a2bf79188d3f361137608c3cd12ed79076badd743dc660750a9f3074f7c"},
+    {file = "numpy-1.22.1-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:26b4018a19d2ad9606ce9089f3d52206a41b23de5dfe8dc947d2ec49ce45d015"},
+    {file = "numpy-1.22.1-cp38-cp38-win32.whl", hash = "sha256:f8ad59e6e341f38266f1549c7c2ec70ea0e3d1effb62a44e5c3dba41c55f0187"},
+    {file = "numpy-1.22.1-cp38-cp38-win_amd64.whl", hash = "sha256:60f19c61b589d44fbbab8ff126640ae712e163299c2dd422bfe4edc7ec51aa9b"},
+    {file = "numpy-1.22.1-cp39-cp39-macosx_10_9_universal2.whl", hash = "sha256:2db01d9838a497ba2aa9a87515aeaf458f42351d72d4e7f3b8ddbd1eba9479f2"},
+    {file = "numpy-1.22.1-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:bcd19dab43b852b03868796f533b5f5561e6c0e3048415e675bec8d2e9d286c1"},
+    {file = "numpy-1.22.1-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:78bfbdf809fc236490e7e65715bbd98377b122f329457fffde206299e163e7f3"},
+    {file = "numpy-1.22.1-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:c51124df17f012c3b757380782ae46eee85213a3215e51477e559739f57d9bf6"},
+    {file = "numpy-1.22.1-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:88d54b7b516f0ca38a69590557814de2dd638d7d4ed04864826acaac5ebb8f01"},
+    {file = "numpy-1.22.1-cp39-cp39-win32.whl", hash = "sha256:b5ec9a5eaf391761c61fd873363ef3560a3614e9b4ead17347e4deda4358bca4"},
+    {file = "numpy-1.22.1-cp39-cp39-win_amd64.whl", hash = "sha256:4ac4d7c9f8ea2a79d721ebfcce81705fc3cd61a10b731354f1049eb8c99521e8"},
+    {file = "numpy-1.22.1-pp38-pypy38_pp73-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:e60ef82c358ded965fdd3132b5738eade055f48067ac8a5a8ac75acc00cad31f"},
+    {file = "numpy-1.22.1.zip", hash = "sha256:e348ccf5bc5235fc405ab19d53bec215bb373300e5523c7b476cc0da8a5e9973"},
 ]
 packaging = [
     {file = "packaging-21.2-py3-none-any.whl", hash = "sha256:14317396d1e8cdb122989b916fa2c7e9ca8e2be9e8060a6eff75b6b7b4d8a7e0"},
diff --git a/pyproject.toml b/pyproject.toml
index bbd656a1..73be01ab 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -10,7 +10,7 @@ python = ">=3.9,<3.11"
 anytree = "^2.8.0"
 click = "^8.0.3"
 matplotlib = "3.5.1"
-numpy = "^1.22.0"
+numpy = "^1.22.1"
 tqdm = "^4.62.3"
 requests = "^2.27.1"
 beautifulsoup4 = "^4.10.0"

From cd918051e9b18e471bdcf9c048aa036b5a96e49d Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 19 Jan 2022 04:07:43 +0000
Subject: [PATCH 065/371] Bump pre-commit from 2.16.0 to 2.17.0

Bumps [pre-commit](https://github.com/pre-commit/pre-commit) from 2.16.0 to 2.17.0.
- [Release notes](https://github.com/pre-commit/pre-commit/releases)
- [Changelog](https://github.com/pre-commit/pre-commit/blob/master/CHANGELOG.md)
- [Commits](https://github.com/pre-commit/pre-commit/compare/v2.16.0...v2.17.0)

---
updated-dependencies:
- dependency-name: pre-commit
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 poetry.lock    | 8 ++++----
 pyproject.toml | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/poetry.lock b/poetry.lock
index f61c78e8..64b21001 100644
--- a/poetry.lock
+++ b/poetry.lock
@@ -429,7 +429,7 @@ python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*"
 
 [[package]]
 name = "pre-commit"
-version = "2.16.0"
+version = "2.17.0"
 description = "A framework for managing and maintaining multi-language pre-commit hooks."
 category = "dev"
 optional = false
@@ -723,7 +723,7 @@ testing = ["coverage (>=4)", "coverage-enable-subprocess (>=1)", "flaky (>=3)",
 [metadata]
 lock-version = "1.1"
 python-versions = ">=3.9,<3.11"
-content-hash = "f7649b8fade28ad7fb93fc296b60a0aafeeff18bc054a927a5119199aeb85647"
+content-hash = "017711b25c0f9be343bd6ff4b829a5be5c2729db71e3fe5c7c4bc053c815cacc"
 
 [metadata.files]
 anytree = [
@@ -1125,8 +1125,8 @@ poyo = [
     {file = "poyo-0.5.0.tar.gz", hash = "sha256:e26956aa780c45f011ca9886f044590e2d8fd8b61db7b1c1cf4e0869f48ed4dd"},
 ]
 pre-commit = [
-    {file = "pre_commit-2.16.0-py2.py3-none-any.whl", hash = "sha256:758d1dc9b62c2ed8881585c254976d66eae0889919ab9b859064fc2fe3c7743e"},
-    {file = "pre_commit-2.16.0.tar.gz", hash = "sha256:fe9897cac830aa7164dbd02a4e7b90cae49630451ce88464bca73db486ba9f65"},
+    {file = "pre_commit-2.17.0-py2.py3-none-any.whl", hash = "sha256:725fa7459782d7bec5ead072810e47351de01709be838c2ce1726b9591dad616"},
+    {file = "pre_commit-2.17.0.tar.gz", hash = "sha256:c1a8040ff15ad3d648c70cc3e55b93e4d2d5b687320955505587fd79bbaed06a"},
 ]
 py = [
     {file = "py-1.11.0-py2.py3-none-any.whl", hash = "sha256:607c53218732647dff4acdfcd50cb62615cedf612e72d1724fb1a0cc6405b378"},
diff --git a/pyproject.toml b/pyproject.toml
index 73be01ab..e4d5c12c 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -23,7 +23,7 @@ pytest-cov = "^3.0.0"
 pytest-xdist = "^2.5.0"
 python-dotenv = "^0.19.2"
 tox = "^3.24.5"
-pre-commit = "^2.16.0"
+pre-commit = "^2.17.0"
 
 [tool.poetry.scripts]
 adventofcode = "adventofcode2020.main:main"

From 7820e4d90f65dc935524ba2095b83926ece2e7ac Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 19 Jan 2022 04:30:31 +0000
Subject: [PATCH 066/371] Bump pre-commit from 2.16.0 to 2.17.0

Bumps [pre-commit](https://github.com/pre-commit/pre-commit) from 2.16.0 to 2.17.0.
- [Release notes](https://github.com/pre-commit/pre-commit/releases)
- [Changelog](https://github.com/pre-commit/pre-commit/blob/master/CHANGELOG.md)
- [Commits](https://github.com/pre-commit/pre-commit/compare/v2.16.0...v2.17.0)

---
updated-dependencies:
- dependency-name: pre-commit
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 poetry.lock    | 8 ++++----
 pyproject.toml | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/poetry.lock b/poetry.lock
index 9b126477..e4ef9d68 100644
--- a/poetry.lock
+++ b/poetry.lock
@@ -371,7 +371,7 @@ python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*"
 
 [[package]]
 name = "pre-commit"
-version = "2.16.0"
+version = "2.17.0"
 description = "A framework for managing and maintaining multi-language pre-commit hooks."
 category = "dev"
 optional = false
@@ -653,7 +653,7 @@ testing = ["coverage (>=4)", "coverage-enable-subprocess (>=1)", "flaky (>=3)",
 [metadata]
 lock-version = "1.1"
 python-versions = "^3.10"
-content-hash = "843c1226e8b4549e69109cc80b4ddb02b34c4ce78d21a98b7348dec4c56f96ab"
+content-hash = "f9206ab1b1eb3e6a65ab7de59972a0c424ce201c54e2f3641842e980b9e6a0a6"
 
 [metadata.files]
 anytree = [
@@ -901,8 +901,8 @@ poyo = [
     {file = "poyo-0.5.0.tar.gz", hash = "sha256:e26956aa780c45f011ca9886f044590e2d8fd8b61db7b1c1cf4e0869f48ed4dd"},
 ]
 pre-commit = [
-    {file = "pre_commit-2.16.0-py2.py3-none-any.whl", hash = "sha256:758d1dc9b62c2ed8881585c254976d66eae0889919ab9b859064fc2fe3c7743e"},
-    {file = "pre_commit-2.16.0.tar.gz", hash = "sha256:fe9897cac830aa7164dbd02a4e7b90cae49630451ce88464bca73db486ba9f65"},
+    {file = "pre_commit-2.17.0-py2.py3-none-any.whl", hash = "sha256:725fa7459782d7bec5ead072810e47351de01709be838c2ce1726b9591dad616"},
+    {file = "pre_commit-2.17.0.tar.gz", hash = "sha256:c1a8040ff15ad3d648c70cc3e55b93e4d2d5b687320955505587fd79bbaed06a"},
 ]
 py = [
     {file = "py-1.11.0-py2.py3-none-any.whl", hash = "sha256:607c53218732647dff4acdfcd50cb62615cedf612e72d1724fb1a0cc6405b378"},
diff --git a/pyproject.toml b/pyproject.toml
index 9d4b9869..665fe9d4 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -21,7 +21,7 @@ pytest-cov = "^3.0.0"
 pytest-xdist = "^2.5.0"
 python-dotenv = "^0.19.2"
 tox = "^3.24.5"
-pre-commit = "^2.16.0"
+pre-commit = "^2.17.0"
 isort = "^5.10.1"
 
 [tool.poetry.scripts]

From 6264deff7bef36a3b019179dd698b68f67c3ed83 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 31 Jan 2022 04:06:44 +0000
Subject: [PATCH 067/371] Bump black from 21.12b0 to 22.1.0

Bumps [black](https://github.com/psf/black) from 21.12b0 to 22.1.0.
- [Release notes](https://github.com/psf/black/releases)
- [Changelog](https://github.com/psf/black/blob/main/CHANGES.md)
- [Commits](https://github.com/psf/black/commits/22.1.0)

---
updated-dependencies:
- dependency-name: black
  dependency-type: direct:development
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 poetry.lock    | 136 +++++++++++++++++++++++++++----------------------
 pyproject.toml |   2 +-
 2 files changed, 76 insertions(+), 62 deletions(-)

diff --git a/poetry.lock b/poetry.lock
index 64b21001..8e296b02 100644
--- a/poetry.lock
+++ b/poetry.lock
@@ -86,28 +86,24 @@ chardet = ">=3.0.2"
 
 [[package]]
 name = "black"
-version = "21.12b0"
+version = "22.1.0"
 description = "The uncompromising code formatter."
 category = "dev"
 optional = false
 python-versions = ">=3.6.2"
 
 [package.dependencies]
-click = ">=7.1.2"
+click = ">=8.0.0"
 mypy-extensions = ">=0.4.3"
-pathspec = ">=0.9.0,<1"
+pathspec = ">=0.9.0"
 platformdirs = ">=2"
-tomli = ">=0.2.6,<2.0.0"
-typing-extensions = [
-    {version = ">=3.10.0.0", markers = "python_version < \"3.10\""},
-    {version = "!=3.10.0.1", markers = "python_version >= \"3.10\""},
-]
+tomli = ">=1.1.0"
+typing-extensions = {version = ">=3.10.0.0", markers = "python_version < \"3.10\""}
 
 [package.extras]
 colorama = ["colorama (>=0.4.3)"]
 d = ["aiohttp (>=3.7.4)"]
 jupyter = ["ipython (>=7.8.0)", "tokenize-rt (>=3.2.0)"]
-python2 = ["typed-ast (>=1.4.3)"]
 uvloop = ["uvloop (>=0.15.2)"]
 
 [[package]]
@@ -184,11 +180,11 @@ six = ">=1.10"
 
 [[package]]
 name = "coverage"
-version = "6.2"
+version = "6.3"
 description = "Code coverage measurement for Python"
 category = "dev"
 optional = false
-python-versions = ">=3.6"
+python-versions = ">=3.7"
 
 [package.dependencies]
 tomli = {version = "*", optional = true, markers = "extra == \"toml\""}
@@ -723,7 +719,7 @@ testing = ["coverage (>=4)", "coverage-enable-subprocess (>=1)", "flaky (>=3)",
 [metadata]
 lock-version = "1.1"
 python-versions = ">=3.9,<3.11"
-content-hash = "017711b25c0f9be343bd6ff4b829a5be5c2729db71e3fe5c7c4bc053c815cacc"
+content-hash = "37ec67a245cf62a7bf243f1ef1d42c8dfe6e2109154651a55e3f0a7a5889c903"
 
 [metadata.files]
 anytree = [
@@ -755,8 +751,29 @@ binaryornot = [
     {file = "binaryornot-0.4.4.tar.gz", hash = "sha256:359501dfc9d40632edc9fac890e19542db1a287bbcfa58175b66658392018061"},
 ]
 black = [
-    {file = "black-21.12b0-py3-none-any.whl", hash = "sha256:a615e69ae185e08fdd73e4715e260e2479c861b5740057fde6e8b4e3b7dd589f"},
-    {file = "black-21.12b0.tar.gz", hash = "sha256:77b80f693a569e2e527958459634f18df9b0ba2625ba4e0c2d5da5be42e6f2b3"},
+    {file = "black-22.1.0-cp310-cp310-macosx_10_9_universal2.whl", hash = "sha256:1297c63b9e1b96a3d0da2d85d11cd9bf8664251fd69ddac068b98dc4f34f73b6"},
+    {file = "black-22.1.0-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:2ff96450d3ad9ea499fc4c60e425a1439c2120cbbc1ab959ff20f7c76ec7e866"},
+    {file = "black-22.1.0-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:0e21e1f1efa65a50e3960edd068b6ae6d64ad6235bd8bfea116a03b21836af71"},
+    {file = "black-22.1.0-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:e2f69158a7d120fd641d1fa9a921d898e20d52e44a74a6fbbcc570a62a6bc8ab"},
+    {file = "black-22.1.0-cp310-cp310-win_amd64.whl", hash = "sha256:228b5ae2c8e3d6227e4bde5920d2fc66cc3400fde7bcc74f480cb07ef0b570d5"},
+    {file = "black-22.1.0-cp36-cp36m-macosx_10_9_x86_64.whl", hash = "sha256:b1a5ed73ab4c482208d20434f700d514f66ffe2840f63a6252ecc43a9bc77e8a"},
+    {file = "black-22.1.0-cp36-cp36m-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:35944b7100af4a985abfcaa860b06af15590deb1f392f06c8683b4381e8eeaf0"},
+    {file = "black-22.1.0-cp36-cp36m-win_amd64.whl", hash = "sha256:7835fee5238fc0a0baf6c9268fb816b5f5cd9b8793423a75e8cd663c48d073ba"},
+    {file = "black-22.1.0-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:dae63f2dbf82882fa3b2a3c49c32bffe144970a573cd68d247af6560fc493ae1"},
+    {file = "black-22.1.0-cp37-cp37m-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:5fa1db02410b1924b6749c245ab38d30621564e658297484952f3d8a39fce7e8"},
+    {file = "black-22.1.0-cp37-cp37m-win_amd64.whl", hash = "sha256:c8226f50b8c34a14608b848dc23a46e5d08397d009446353dad45e04af0c8e28"},
+    {file = "black-22.1.0-cp38-cp38-macosx_10_9_universal2.whl", hash = "sha256:2d6f331c02f0f40aa51a22e479c8209d37fcd520c77721c034517d44eecf5912"},
+    {file = "black-22.1.0-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:742ce9af3086e5bd07e58c8feb09dbb2b047b7f566eb5f5bc63fd455814979f3"},
+    {file = "black-22.1.0-cp38-cp38-macosx_11_0_arm64.whl", hash = "sha256:fdb8754b453fb15fad3f72cd9cad3e16776f0964d67cf30ebcbf10327a3777a3"},
+    {file = "black-22.1.0-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:f5660feab44c2e3cb24b2419b998846cbb01c23c7fe645fee45087efa3da2d61"},
+    {file = "black-22.1.0-cp38-cp38-win_amd64.whl", hash = "sha256:6f2f01381f91c1efb1451998bd65a129b3ed6f64f79663a55fe0e9b74a5f81fd"},
+    {file = "black-22.1.0-cp39-cp39-macosx_10_9_universal2.whl", hash = "sha256:efbadd9b52c060a8fc3b9658744091cb33c31f830b3f074422ed27bad2b18e8f"},
+    {file = "black-22.1.0-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:8871fcb4b447206904932b54b567923e5be802b9b19b744fdff092bd2f3118d0"},
+    {file = "black-22.1.0-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:ccad888050f5393f0d6029deea2a33e5ae371fd182a697313bdbd835d3edaf9c"},
+    {file = "black-22.1.0-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:07e5c049442d7ca1a2fc273c79d1aecbbf1bc858f62e8184abe1ad175c4f7cc2"},
+    {file = "black-22.1.0-cp39-cp39-win_amd64.whl", hash = "sha256:373922fc66676133ddc3e754e4509196a8c392fec3f5ca4486673e685a421321"},
+    {file = "black-22.1.0-py3-none-any.whl", hash = "sha256:3524739d76b6b3ed1132422bf9d82123cd1705086723bc3e235ca39fd21c667d"},
+    {file = "black-22.1.0.tar.gz", hash = "sha256:a7c0192d35635f6fc1174be575cb7915e92e5dd629ee79fdaf0dcfa41a80afb5"},
 ]
 certifi = [
     {file = "certifi-2021.10.8-py2.py3-none-any.whl", hash = "sha256:d62a0163eb4c2344ac042ab2bdf75399a71a2d8c7d47eac2e2ee91b9d6339569"},
@@ -787,53 +804,50 @@ cookiecutter = [
     {file = "cookiecutter-1.7.3.tar.gz", hash = "sha256:6b9a4d72882e243be077a7397d0f1f76fe66cf3df91f3115dbb5330e214fa457"},
 ]
 coverage = [
-    {file = "coverage-6.2-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:6dbc1536e105adda7a6312c778f15aaabe583b0e9a0b0a324990334fd458c94b"},
-    {file = "coverage-6.2-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:174cf9b4bef0db2e8244f82059a5a72bd47e1d40e71c68ab055425172b16b7d0"},
-    {file = "coverage-6.2-cp310-cp310-manylinux_2_5_i686.manylinux1_i686.manylinux_2_12_i686.manylinux2010_i686.whl", hash = "sha256:92b8c845527eae547a2a6617d336adc56394050c3ed8a6918683646328fbb6da"},
-    {file = "coverage-6.2-cp310-cp310-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:c7912d1526299cb04c88288e148c6c87c0df600eca76efd99d84396cfe00ef1d"},
-    {file = "coverage-6.2-cp310-cp310-musllinux_1_1_aarch64.whl", hash = "sha256:d5d2033d5db1d58ae2d62f095e1aefb6988af65b4b12cb8987af409587cc0739"},
-    {file = "coverage-6.2-cp310-cp310-musllinux_1_1_i686.whl", hash = "sha256:3feac4084291642165c3a0d9eaebedf19ffa505016c4d3db15bfe235718d4971"},
-    {file = "coverage-6.2-cp310-cp310-musllinux_1_1_x86_64.whl", hash = "sha256:276651978c94a8c5672ea60a2656e95a3cce2a3f31e9fb2d5ebd4c215d095840"},
-    {file = "coverage-6.2-cp310-cp310-win32.whl", hash = "sha256:f506af4f27def639ba45789fa6fde45f9a217da0be05f8910458e4557eed020c"},
-    {file = "coverage-6.2-cp310-cp310-win_amd64.whl", hash = "sha256:3f7c17209eef285c86f819ff04a6d4cbee9b33ef05cbcaae4c0b4e8e06b3ec8f"},
-    {file = "coverage-6.2-cp311-cp311-macosx_10_14_x86_64.whl", hash = "sha256:13362889b2d46e8d9f97c421539c97c963e34031ab0cb89e8ca83a10cc71ac76"},
-    {file = "coverage-6.2-cp311-cp311-manylinux_2_5_x86_64.manylinux1_x86_64.whl", hash = "sha256:22e60a3ca5acba37d1d4a2ee66e051f5b0e1b9ac950b5b0cf4aa5366eda41d47"},
-    {file = "coverage-6.2-cp311-cp311-win_amd64.whl", hash = "sha256:b637c57fdb8be84e91fac60d9325a66a5981f8086c954ea2772efe28425eaf64"},
-    {file = "coverage-6.2-cp36-cp36m-macosx_10_9_x86_64.whl", hash = "sha256:f467bbb837691ab5a8ca359199d3429a11a01e6dfb3d9dcc676dc035ca93c0a9"},
-    {file = "coverage-6.2-cp36-cp36m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:2641f803ee9f95b1f387f3e8f3bf28d83d9b69a39e9911e5bfee832bea75240d"},
-    {file = "coverage-6.2-cp36-cp36m-manylinux_2_5_i686.manylinux1_i686.manylinux_2_12_i686.manylinux2010_i686.whl", hash = "sha256:1219d760ccfafc03c0822ae2e06e3b1248a8e6d1a70928966bafc6838d3c9e48"},
-    {file = "coverage-6.2-cp36-cp36m-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:9a2b5b52be0a8626fcbffd7e689781bf8c2ac01613e77feda93d96184949a98e"},
-    {file = "coverage-6.2-cp36-cp36m-musllinux_1_1_aarch64.whl", hash = "sha256:8e2c35a4c1f269704e90888e56f794e2d9c0262fb0c1b1c8c4ee44d9b9e77b5d"},
-    {file = "coverage-6.2-cp36-cp36m-musllinux_1_1_i686.whl", hash = "sha256:5d6b09c972ce9200264c35a1d53d43ca55ef61836d9ec60f0d44273a31aa9f17"},
-    {file = "coverage-6.2-cp36-cp36m-musllinux_1_1_x86_64.whl", hash = "sha256:e3db840a4dee542e37e09f30859f1612da90e1c5239a6a2498c473183a50e781"},
-    {file = "coverage-6.2-cp36-cp36m-win32.whl", hash = "sha256:4e547122ca2d244f7c090fe3f4b5a5861255ff66b7ab6d98f44a0222aaf8671a"},
-    {file = "coverage-6.2-cp36-cp36m-win_amd64.whl", hash = "sha256:01774a2c2c729619760320270e42cd9e797427ecfddd32c2a7b639cdc481f3c0"},
-    {file = "coverage-6.2-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:fb8b8ee99b3fffe4fd86f4c81b35a6bf7e4462cba019997af2fe679365db0c49"},
-    {file = "coverage-6.2-cp37-cp37m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:619346d57c7126ae49ac95b11b0dc8e36c1dd49d148477461bb66c8cf13bb521"},
-    {file = "coverage-6.2-cp37-cp37m-manylinux_2_5_i686.manylinux1_i686.manylinux_2_12_i686.manylinux2010_i686.whl", hash = "sha256:0a7726f74ff63f41e95ed3a89fef002916c828bb5fcae83b505b49d81a066884"},
-    {file = "coverage-6.2-cp37-cp37m-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:cfd9386c1d6f13b37e05a91a8583e802f8059bebfccde61a418c5808dea6bbfa"},
-    {file = "coverage-6.2-cp37-cp37m-musllinux_1_1_aarch64.whl", hash = "sha256:17e6c11038d4ed6e8af1407d9e89a2904d573be29d51515f14262d7f10ef0a64"},
-    {file = "coverage-6.2-cp37-cp37m-musllinux_1_1_i686.whl", hash = "sha256:c254b03032d5a06de049ce8bca8338a5185f07fb76600afff3c161e053d88617"},
-    {file = "coverage-6.2-cp37-cp37m-musllinux_1_1_x86_64.whl", hash = "sha256:dca38a21e4423f3edb821292e97cec7ad38086f84313462098568baedf4331f8"},
-    {file = "coverage-6.2-cp37-cp37m-win32.whl", hash = "sha256:600617008aa82032ddeace2535626d1bc212dfff32b43989539deda63b3f36e4"},
-    {file = "coverage-6.2-cp37-cp37m-win_amd64.whl", hash = "sha256:bf154ba7ee2fd613eb541c2bc03d3d9ac667080a737449d1a3fb342740eb1a74"},
-    {file = "coverage-6.2-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:f9afb5b746781fc2abce26193d1c817b7eb0e11459510fba65d2bd77fe161d9e"},
-    {file = "coverage-6.2-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:edcada2e24ed68f019175c2b2af2a8b481d3d084798b8c20d15d34f5c733fa58"},
-    {file = "coverage-6.2-cp38-cp38-manylinux_2_5_i686.manylinux1_i686.manylinux_2_12_i686.manylinux2010_i686.whl", hash = "sha256:a9c8c4283e17690ff1a7427123ffb428ad6a52ed720d550e299e8291e33184dc"},
-    {file = "coverage-6.2-cp38-cp38-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:f614fc9956d76d8a88a88bb41ddc12709caa755666f580af3a688899721efecd"},
-    {file = "coverage-6.2-cp38-cp38-musllinux_1_1_aarch64.whl", hash = "sha256:9365ed5cce5d0cf2c10afc6add145c5037d3148585b8ae0e77cc1efdd6aa2953"},
-    {file = "coverage-6.2-cp38-cp38-musllinux_1_1_i686.whl", hash = "sha256:8bdfe9ff3a4ea37d17f172ac0dff1e1c383aec17a636b9b35906babc9f0f5475"},
-    {file = "coverage-6.2-cp38-cp38-musllinux_1_1_x86_64.whl", hash = "sha256:63c424e6f5b4ab1cf1e23a43b12f542b0ec2e54f99ec9f11b75382152981df57"},
-    {file = "coverage-6.2-cp38-cp38-win32.whl", hash = "sha256:49dbff64961bc9bdd2289a2bda6a3a5a331964ba5497f694e2cbd540d656dc1c"},
-    {file = "coverage-6.2-cp38-cp38-win_amd64.whl", hash = "sha256:9a29311bd6429be317c1f3fe4bc06c4c5ee45e2fa61b2a19d4d1d6111cb94af2"},
-    {file = "coverage-6.2-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:03b20e52b7d31be571c9c06b74746746d4eb82fc260e594dc662ed48145e9efd"},
-    {file = "coverage-6.2-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:215f8afcc02a24c2d9a10d3790b21054b58d71f4b3c6f055d4bb1b15cecce685"},
-    {file = "coverage-6.2-cp39-cp39-manylinux_2_5_i686.manylinux1_i686.manylinux_2_12_i686.manylinux2010_i686.whl", hash = "sha256:a4bdeb0a52d1d04123b41d90a4390b096f3ef38eee35e11f0b22c2d031222c6c"},
-    {file = "coverage-6.2-cp39-cp39-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:c332d8f8d448ded473b97fefe4a0983265af21917d8b0cdcb8bb06b2afe632c3"},
-    {file = "coverage-6.2-cp39-cp39-win32.whl", hash = "sha256:6e1394d24d5938e561fbeaa0cd3d356207579c28bd1792f25a068743f2d5b282"},
-    {file = "coverage-6.2-cp39-cp39-win_amd64.whl", hash = "sha256:86f2e78b1eff847609b1ca8050c9e1fa3bd44ce755b2ec30e70f2d3ba3844644"},
-    {file = "coverage-6.2-pp36.pp37.pp38-none-any.whl", hash = "sha256:5829192582c0ec8ca4a2532407bc14c2f338d9878a10442f5d03804a95fac9de"},
-    {file = "coverage-6.2.tar.gz", hash = "sha256:e2cad8093172b7d1595b4ad66f24270808658e11acf43a8f95b41276162eb5b8"},
+    {file = "coverage-6.3-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:e8071e7d9ba9f457fc674afc3de054450be2c9b195c470147fbbc082468d8ff7"},
+    {file = "coverage-6.3-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:86c91c511853dfda81c2cf2360502cb72783f4b7cebabef27869f00cbe1db07d"},
+    {file = "coverage-6.3-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:3c4ce3b647bd1792d4394f5690d9df6dc035b00bcdbc5595099c01282a59ae01"},
+    {file = "coverage-6.3-cp310-cp310-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:2a491e159294d756e7fc8462f98175e2d2225e4dbe062cca7d3e0d5a75ba6260"},
+    {file = "coverage-6.3-cp310-cp310-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:5d008e0f67ac800b0ca04d7914b8501312c8c6c00ad8c7ba17754609fae1231a"},
+    {file = "coverage-6.3-cp310-cp310-musllinux_1_1_aarch64.whl", hash = "sha256:4578728c36de2801c1deb1c6b760d31883e62e33f33c7ba8f982e609dc95167d"},
+    {file = "coverage-6.3-cp310-cp310-musllinux_1_1_i686.whl", hash = "sha256:7ee317486593193e066fc5e98ac0ce712178c21529a85c07b7cb978171f25d53"},
+    {file = "coverage-6.3-cp310-cp310-musllinux_1_1_x86_64.whl", hash = "sha256:2bc85664b06ba42d14bb74d6ddf19d8bfc520cb660561d2d9ce5786ae72f71b5"},
+    {file = "coverage-6.3-cp310-cp310-win32.whl", hash = "sha256:27a94db5dc098c25048b0aca155f5fac674f2cf1b1736c5272ba28ead2fc267e"},
+    {file = "coverage-6.3-cp310-cp310-win_amd64.whl", hash = "sha256:bde4aeabc0d1b2e52c4036c54440b1ad05beeca8113f47aceb4998bb7471e2c2"},
+    {file = "coverage-6.3-cp311-cp311-macosx_10_14_x86_64.whl", hash = "sha256:509c68c3e2015022aeda03b003dd68fa19987cdcf64e9d4edc98db41cfc45d30"},
+    {file = "coverage-6.3-cp311-cp311-manylinux_2_5_x86_64.manylinux1_x86_64.whl", hash = "sha256:e4ff163602c5c77e7bb4ea81ba5d3b793b4419f8acd296aae149370902cf4e92"},
+    {file = "coverage-6.3-cp311-cp311-win_amd64.whl", hash = "sha256:d1675db48490e5fa0b300f6329ecb8a9a37c29b9ab64fa9c964d34111788ca2d"},
+    {file = "coverage-6.3-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:7eed8459a2b81848cafb3280b39d7d49950d5f98e403677941c752e7e7ee47cb"},
+    {file = "coverage-6.3-cp37-cp37m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:1b4285fde5286b946835a1a53bba3ad41ef74285ba9e8013e14b5ea93deaeafc"},
+    {file = "coverage-6.3-cp37-cp37m-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:a4748349734110fd32d46ff8897b561e6300d8989a494ad5a0a2e4f0ca974fc7"},
+    {file = "coverage-6.3-cp37-cp37m-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:823f9325283dc9565ba0aa2d240471a93ca8999861779b2b6c7aded45b58ee0f"},
+    {file = "coverage-6.3-cp37-cp37m-musllinux_1_1_aarch64.whl", hash = "sha256:fff16a30fdf57b214778eff86391301c4509e327a65b877862f7c929f10a4253"},
+    {file = "coverage-6.3-cp37-cp37m-musllinux_1_1_i686.whl", hash = "sha256:da1a428bdbe71f9a8c270c7baab29e9552ac9d0e0cba5e7e9a4c9ee6465d258d"},
+    {file = "coverage-6.3-cp37-cp37m-musllinux_1_1_x86_64.whl", hash = "sha256:7d82c610a2e10372e128023c5baf9ce3d270f3029fe7274ff5bc2897c68f1318"},
+    {file = "coverage-6.3-cp37-cp37m-win32.whl", hash = "sha256:11e61c5548ecf74ea1f8b059730b049871f0e32b74f88bd0d670c20c819ad749"},
+    {file = "coverage-6.3-cp37-cp37m-win_amd64.whl", hash = "sha256:8e0c3525b1a182c8ffc9bca7e56b521e0c2b8b3e82f033c8e16d6d721f1b54d6"},
+    {file = "coverage-6.3-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:a189036c50dcd56100746139a459f0d27540fef95b09aba03e786540b8feaa5f"},
+    {file = "coverage-6.3-cp38-cp38-macosx_11_0_arm64.whl", hash = "sha256:32168001f33025fd756884d56d01adebb34e6c8c0b3395ca8584cdcee9c7c9d2"},
+    {file = "coverage-6.3-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:a5d79c9af3f410a2b5acad91258b4ae179ee9c83897eb9de69151b179b0227f5"},
+    {file = "coverage-6.3-cp38-cp38-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:85c5fc9029043cf8b07f73fbb0a7ab6d3b717510c3b5642b77058ea55d7cacde"},
+    {file = "coverage-6.3-cp38-cp38-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:a7596aa2f2b8fa5604129cfc9a27ad9beec0a96f18078cb424d029fdd707468d"},
+    {file = "coverage-6.3-cp38-cp38-musllinux_1_1_aarch64.whl", hash = "sha256:ce443a3e6df90d692c38762f108fc4c88314bf477689f04de76b3f252e7a351c"},
+    {file = "coverage-6.3-cp38-cp38-musllinux_1_1_i686.whl", hash = "sha256:012157499ec4f135fc36cd2177e3d1a1840af9b236cbe80e9a5ccfc83d912a69"},
+    {file = "coverage-6.3-cp38-cp38-musllinux_1_1_x86_64.whl", hash = "sha256:0a34d313105cdd0d3644c56df2d743fe467270d6ab93b5d4a347eb9fec8924d6"},
+    {file = "coverage-6.3-cp38-cp38-win32.whl", hash = "sha256:6e78b1e25e5c5695dea012be473e442f7094d066925604be20b30713dbd47f89"},
+    {file = "coverage-6.3-cp38-cp38-win_amd64.whl", hash = "sha256:433b99f7b0613bdcdc0b00cc3d39ed6d756797e3b078d2c43f8a38288520aec6"},
+    {file = "coverage-6.3-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:9ed3244b415725f08ca3bdf02ed681089fd95e9465099a21c8e2d9c5d6ca2606"},
+    {file = "coverage-6.3-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:ab4fc4b866b279740e0d917402f0e9a08683e002f43fa408e9655818ed392196"},
+    {file = "coverage-6.3-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:c8582e9280f8d0f38114fe95a92ae8d0790b56b099d728cc4f8a2e14b1c4a18c"},
+    {file = "coverage-6.3-cp39-cp39-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:c72bb4679283c6737f452eeb9b2a0e570acaef2197ad255fb20162adc80bea76"},
+    {file = "coverage-6.3-cp39-cp39-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:ca29c352389ea27a24c79acd117abdd8a865c6eb01576b6f0990cd9a4e9c9f48"},
+    {file = "coverage-6.3-cp39-cp39-musllinux_1_1_aarch64.whl", hash = "sha256:152cc2624381df4e4e604e21bd8e95eb8059535f7b768c1fb8b8ae0b26f47ab0"},
+    {file = "coverage-6.3-cp39-cp39-musllinux_1_1_i686.whl", hash = "sha256:51372e24b1f7143ee2df6b45cff6a721f3abe93b1e506196f3ffa4155c2497f7"},
+    {file = "coverage-6.3-cp39-cp39-musllinux_1_1_x86_64.whl", hash = "sha256:72d9d186508325a456475dd05b1756f9a204c7086b07fffb227ef8cee03b1dc2"},
+    {file = "coverage-6.3-cp39-cp39-win32.whl", hash = "sha256:649df3641eb351cdfd0d5533c92fc9df507b6b2bf48a7ef8c71ab63cbc7b5c3c"},
+    {file = "coverage-6.3-cp39-cp39-win_amd64.whl", hash = "sha256:e67ccd53da5958ea1ec833a160b96357f90859c220a00150de011b787c27b98d"},
+    {file = "coverage-6.3-pp36.pp37.pp38-none-any.whl", hash = "sha256:27ac7cb84538e278e07569ceaaa6f807a029dc194b1c819a9820b9bb5dbf63ab"},
+    {file = "coverage-6.3.tar.gz", hash = "sha256:987a84ff98a309994ca77ed3cc4b92424f824278e48e4bf7d1bb79a63cfe2099"},
 ]
 cycler = [
     {file = "cycler-0.11.0-py3-none-any.whl", hash = "sha256:3a27e95f763a428a739d2add979fa7494c912a32c17c4c38c4d5f082cad165a3"},
diff --git a/pyproject.toml b/pyproject.toml
index e4d5c12c..11323d29 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -16,7 +16,7 @@ requests = "^2.27.1"
 beautifulsoup4 = "^4.10.0"
 
 [tool.poetry.dev-dependencies]
-black = "^21.12b0"
+black = "^22.1"
 cookiecutter = "^1.7.3"
 pytest = "^6.2.5"
 pytest-cov = "^3.0.0"

From 075dfba25ba2d7e3d96a2b0a6e6055487e5dc3fc Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 31 Jan 2022 04:30:15 +0000
Subject: [PATCH 068/371] Bump black from 21.12b0 to 22.1.0

Bumps [black](https://github.com/psf/black) from 21.12b0 to 22.1.0.
- [Release notes](https://github.com/psf/black/releases)
- [Changelog](https://github.com/psf/black/blob/main/CHANGES.md)
- [Commits](https://github.com/psf/black/commits/22.1.0)

---
updated-dependencies:
- dependency-name: black
  dependency-type: direct:development
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 poetry.lock    | 147 +++++++++++++++++++++++++------------------------
 pyproject.toml |   2 +-
 2 files changed, 75 insertions(+), 74 deletions(-)

diff --git a/poetry.lock b/poetry.lock
index e4ef9d68..cdfe5603 100644
--- a/poetry.lock
+++ b/poetry.lock
@@ -86,28 +86,23 @@ chardet = ">=3.0.2"
 
 [[package]]
 name = "black"
-version = "21.12b0"
+version = "22.1.0"
 description = "The uncompromising code formatter."
 category = "dev"
 optional = false
 python-versions = ">=3.6.2"
 
 [package.dependencies]
-click = ">=7.1.2"
+click = ">=8.0.0"
 mypy-extensions = ">=0.4.3"
-pathspec = ">=0.9.0,<1"
+pathspec = ">=0.9.0"
 platformdirs = ">=2"
-tomli = ">=0.2.6,<2.0.0"
-typing-extensions = [
-    {version = ">=3.10.0.0", markers = "python_version < \"3.10\""},
-    {version = "!=3.10.0.1", markers = "python_version >= \"3.10\""},
-]
+tomli = ">=1.1.0"
 
 [package.extras]
 colorama = ["colorama (>=0.4.3)"]
 d = ["aiohttp (>=3.7.4)"]
 jupyter = ["ipython (>=7.8.0)", "tokenize-rt (>=3.2.0)"]
-python2 = ["typed-ast (>=1.4.3)"]
 uvloop = ["uvloop (>=0.15.2)"]
 
 [[package]]
@@ -184,11 +179,11 @@ six = ">=1.10"
 
 [[package]]
 name = "coverage"
-version = "6.2"
+version = "6.3"
 description = "Code coverage measurement for Python"
 category = "dev"
 optional = false
-python-versions = ">=3.6"
+python-versions = ">=3.7"
 
 [package.dependencies]
 tomli = {version = "*", optional = true, markers = "extra == \"toml\""}
@@ -610,14 +605,6 @@ dev = ["py-make (>=0.1.0)", "twine", "wheel"]
 notebook = ["ipywidgets (>=6)"]
 telegram = ["requests"]
 
-[[package]]
-name = "typing-extensions"
-version = "4.0.0"
-description = "Backported and Experimental Type Hints for Python 3.6+"
-category = "dev"
-optional = false
-python-versions = ">=3.6"
-
 [[package]]
 name = "urllib3"
 version = "1.26.7"
@@ -653,7 +640,7 @@ testing = ["coverage (>=4)", "coverage-enable-subprocess (>=1)", "flaky (>=3)",
 [metadata]
 lock-version = "1.1"
 python-versions = "^3.10"
-content-hash = "f9206ab1b1eb3e6a65ab7de59972a0c424ce201c54e2f3641842e980b9e6a0a6"
+content-hash = "551b0b02772f7ec0e5165b7f50c1563f774d6834e41f22fc62065c520db6acba"
 
 [metadata.files]
 anytree = [
@@ -685,8 +672,29 @@ binaryornot = [
     {file = "binaryornot-0.4.4.tar.gz", hash = "sha256:359501dfc9d40632edc9fac890e19542db1a287bbcfa58175b66658392018061"},
 ]
 black = [
-    {file = "black-21.12b0-py3-none-any.whl", hash = "sha256:a615e69ae185e08fdd73e4715e260e2479c861b5740057fde6e8b4e3b7dd589f"},
-    {file = "black-21.12b0.tar.gz", hash = "sha256:77b80f693a569e2e527958459634f18df9b0ba2625ba4e0c2d5da5be42e6f2b3"},
+    {file = "black-22.1.0-cp310-cp310-macosx_10_9_universal2.whl", hash = "sha256:1297c63b9e1b96a3d0da2d85d11cd9bf8664251fd69ddac068b98dc4f34f73b6"},
+    {file = "black-22.1.0-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:2ff96450d3ad9ea499fc4c60e425a1439c2120cbbc1ab959ff20f7c76ec7e866"},
+    {file = "black-22.1.0-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:0e21e1f1efa65a50e3960edd068b6ae6d64ad6235bd8bfea116a03b21836af71"},
+    {file = "black-22.1.0-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:e2f69158a7d120fd641d1fa9a921d898e20d52e44a74a6fbbcc570a62a6bc8ab"},
+    {file = "black-22.1.0-cp310-cp310-win_amd64.whl", hash = "sha256:228b5ae2c8e3d6227e4bde5920d2fc66cc3400fde7bcc74f480cb07ef0b570d5"},
+    {file = "black-22.1.0-cp36-cp36m-macosx_10_9_x86_64.whl", hash = "sha256:b1a5ed73ab4c482208d20434f700d514f66ffe2840f63a6252ecc43a9bc77e8a"},
+    {file = "black-22.1.0-cp36-cp36m-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:35944b7100af4a985abfcaa860b06af15590deb1f392f06c8683b4381e8eeaf0"},
+    {file = "black-22.1.0-cp36-cp36m-win_amd64.whl", hash = "sha256:7835fee5238fc0a0baf6c9268fb816b5f5cd9b8793423a75e8cd663c48d073ba"},
+    {file = "black-22.1.0-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:dae63f2dbf82882fa3b2a3c49c32bffe144970a573cd68d247af6560fc493ae1"},
+    {file = "black-22.1.0-cp37-cp37m-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:5fa1db02410b1924b6749c245ab38d30621564e658297484952f3d8a39fce7e8"},
+    {file = "black-22.1.0-cp37-cp37m-win_amd64.whl", hash = "sha256:c8226f50b8c34a14608b848dc23a46e5d08397d009446353dad45e04af0c8e28"},
+    {file = "black-22.1.0-cp38-cp38-macosx_10_9_universal2.whl", hash = "sha256:2d6f331c02f0f40aa51a22e479c8209d37fcd520c77721c034517d44eecf5912"},
+    {file = "black-22.1.0-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:742ce9af3086e5bd07e58c8feb09dbb2b047b7f566eb5f5bc63fd455814979f3"},
+    {file = "black-22.1.0-cp38-cp38-macosx_11_0_arm64.whl", hash = "sha256:fdb8754b453fb15fad3f72cd9cad3e16776f0964d67cf30ebcbf10327a3777a3"},
+    {file = "black-22.1.0-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:f5660feab44c2e3cb24b2419b998846cbb01c23c7fe645fee45087efa3da2d61"},
+    {file = "black-22.1.0-cp38-cp38-win_amd64.whl", hash = "sha256:6f2f01381f91c1efb1451998bd65a129b3ed6f64f79663a55fe0e9b74a5f81fd"},
+    {file = "black-22.1.0-cp39-cp39-macosx_10_9_universal2.whl", hash = "sha256:efbadd9b52c060a8fc3b9658744091cb33c31f830b3f074422ed27bad2b18e8f"},
+    {file = "black-22.1.0-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:8871fcb4b447206904932b54b567923e5be802b9b19b744fdff092bd2f3118d0"},
+    {file = "black-22.1.0-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:ccad888050f5393f0d6029deea2a33e5ae371fd182a697313bdbd835d3edaf9c"},
+    {file = "black-22.1.0-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:07e5c049442d7ca1a2fc273c79d1aecbbf1bc858f62e8184abe1ad175c4f7cc2"},
+    {file = "black-22.1.0-cp39-cp39-win_amd64.whl", hash = "sha256:373922fc66676133ddc3e754e4509196a8c392fec3f5ca4486673e685a421321"},
+    {file = "black-22.1.0-py3-none-any.whl", hash = "sha256:3524739d76b6b3ed1132422bf9d82123cd1705086723bc3e235ca39fd21c667d"},
+    {file = "black-22.1.0.tar.gz", hash = "sha256:a7c0192d35635f6fc1174be575cb7915e92e5dd629ee79fdaf0dcfa41a80afb5"},
 ]
 certifi = [
     {file = "certifi-2021.10.8-py2.py3-none-any.whl", hash = "sha256:d62a0163eb4c2344ac042ab2bdf75399a71a2d8c7d47eac2e2ee91b9d6339569"},
@@ -717,53 +725,50 @@ cookiecutter = [
     {file = "cookiecutter-1.7.3.tar.gz", hash = "sha256:6b9a4d72882e243be077a7397d0f1f76fe66cf3df91f3115dbb5330e214fa457"},
 ]
 coverage = [
-    {file = "coverage-6.2-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:6dbc1536e105adda7a6312c778f15aaabe583b0e9a0b0a324990334fd458c94b"},
-    {file = "coverage-6.2-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:174cf9b4bef0db2e8244f82059a5a72bd47e1d40e71c68ab055425172b16b7d0"},
-    {file = "coverage-6.2-cp310-cp310-manylinux_2_5_i686.manylinux1_i686.manylinux_2_12_i686.manylinux2010_i686.whl", hash = "sha256:92b8c845527eae547a2a6617d336adc56394050c3ed8a6918683646328fbb6da"},
-    {file = "coverage-6.2-cp310-cp310-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:c7912d1526299cb04c88288e148c6c87c0df600eca76efd99d84396cfe00ef1d"},
-    {file = "coverage-6.2-cp310-cp310-musllinux_1_1_aarch64.whl", hash = "sha256:d5d2033d5db1d58ae2d62f095e1aefb6988af65b4b12cb8987af409587cc0739"},
-    {file = "coverage-6.2-cp310-cp310-musllinux_1_1_i686.whl", hash = "sha256:3feac4084291642165c3a0d9eaebedf19ffa505016c4d3db15bfe235718d4971"},
-    {file = "coverage-6.2-cp310-cp310-musllinux_1_1_x86_64.whl", hash = "sha256:276651978c94a8c5672ea60a2656e95a3cce2a3f31e9fb2d5ebd4c215d095840"},
-    {file = "coverage-6.2-cp310-cp310-win32.whl", hash = "sha256:f506af4f27def639ba45789fa6fde45f9a217da0be05f8910458e4557eed020c"},
-    {file = "coverage-6.2-cp310-cp310-win_amd64.whl", hash = "sha256:3f7c17209eef285c86f819ff04a6d4cbee9b33ef05cbcaae4c0b4e8e06b3ec8f"},
-    {file = "coverage-6.2-cp311-cp311-macosx_10_14_x86_64.whl", hash = "sha256:13362889b2d46e8d9f97c421539c97c963e34031ab0cb89e8ca83a10cc71ac76"},
-    {file = "coverage-6.2-cp311-cp311-manylinux_2_5_x86_64.manylinux1_x86_64.whl", hash = "sha256:22e60a3ca5acba37d1d4a2ee66e051f5b0e1b9ac950b5b0cf4aa5366eda41d47"},
-    {file = "coverage-6.2-cp311-cp311-win_amd64.whl", hash = "sha256:b637c57fdb8be84e91fac60d9325a66a5981f8086c954ea2772efe28425eaf64"},
-    {file = "coverage-6.2-cp36-cp36m-macosx_10_9_x86_64.whl", hash = "sha256:f467bbb837691ab5a8ca359199d3429a11a01e6dfb3d9dcc676dc035ca93c0a9"},
-    {file = "coverage-6.2-cp36-cp36m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:2641f803ee9f95b1f387f3e8f3bf28d83d9b69a39e9911e5bfee832bea75240d"},
-    {file = "coverage-6.2-cp36-cp36m-manylinux_2_5_i686.manylinux1_i686.manylinux_2_12_i686.manylinux2010_i686.whl", hash = "sha256:1219d760ccfafc03c0822ae2e06e3b1248a8e6d1a70928966bafc6838d3c9e48"},
-    {file = "coverage-6.2-cp36-cp36m-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:9a2b5b52be0a8626fcbffd7e689781bf8c2ac01613e77feda93d96184949a98e"},
-    {file = "coverage-6.2-cp36-cp36m-musllinux_1_1_aarch64.whl", hash = "sha256:8e2c35a4c1f269704e90888e56f794e2d9c0262fb0c1b1c8c4ee44d9b9e77b5d"},
-    {file = "coverage-6.2-cp36-cp36m-musllinux_1_1_i686.whl", hash = "sha256:5d6b09c972ce9200264c35a1d53d43ca55ef61836d9ec60f0d44273a31aa9f17"},
-    {file = "coverage-6.2-cp36-cp36m-musllinux_1_1_x86_64.whl", hash = "sha256:e3db840a4dee542e37e09f30859f1612da90e1c5239a6a2498c473183a50e781"},
-    {file = "coverage-6.2-cp36-cp36m-win32.whl", hash = "sha256:4e547122ca2d244f7c090fe3f4b5a5861255ff66b7ab6d98f44a0222aaf8671a"},
-    {file = "coverage-6.2-cp36-cp36m-win_amd64.whl", hash = "sha256:01774a2c2c729619760320270e42cd9e797427ecfddd32c2a7b639cdc481f3c0"},
-    {file = "coverage-6.2-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:fb8b8ee99b3fffe4fd86f4c81b35a6bf7e4462cba019997af2fe679365db0c49"},
-    {file = "coverage-6.2-cp37-cp37m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:619346d57c7126ae49ac95b11b0dc8e36c1dd49d148477461bb66c8cf13bb521"},
-    {file = "coverage-6.2-cp37-cp37m-manylinux_2_5_i686.manylinux1_i686.manylinux_2_12_i686.manylinux2010_i686.whl", hash = "sha256:0a7726f74ff63f41e95ed3a89fef002916c828bb5fcae83b505b49d81a066884"},
-    {file = "coverage-6.2-cp37-cp37m-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:cfd9386c1d6f13b37e05a91a8583e802f8059bebfccde61a418c5808dea6bbfa"},
-    {file = "coverage-6.2-cp37-cp37m-musllinux_1_1_aarch64.whl", hash = "sha256:17e6c11038d4ed6e8af1407d9e89a2904d573be29d51515f14262d7f10ef0a64"},
-    {file = "coverage-6.2-cp37-cp37m-musllinux_1_1_i686.whl", hash = "sha256:c254b03032d5a06de049ce8bca8338a5185f07fb76600afff3c161e053d88617"},
-    {file = "coverage-6.2-cp37-cp37m-musllinux_1_1_x86_64.whl", hash = "sha256:dca38a21e4423f3edb821292e97cec7ad38086f84313462098568baedf4331f8"},
-    {file = "coverage-6.2-cp37-cp37m-win32.whl", hash = "sha256:600617008aa82032ddeace2535626d1bc212dfff32b43989539deda63b3f36e4"},
-    {file = "coverage-6.2-cp37-cp37m-win_amd64.whl", hash = "sha256:bf154ba7ee2fd613eb541c2bc03d3d9ac667080a737449d1a3fb342740eb1a74"},
-    {file = "coverage-6.2-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:f9afb5b746781fc2abce26193d1c817b7eb0e11459510fba65d2bd77fe161d9e"},
-    {file = "coverage-6.2-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:edcada2e24ed68f019175c2b2af2a8b481d3d084798b8c20d15d34f5c733fa58"},
-    {file = "coverage-6.2-cp38-cp38-manylinux_2_5_i686.manylinux1_i686.manylinux_2_12_i686.manylinux2010_i686.whl", hash = "sha256:a9c8c4283e17690ff1a7427123ffb428ad6a52ed720d550e299e8291e33184dc"},
-    {file = "coverage-6.2-cp38-cp38-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:f614fc9956d76d8a88a88bb41ddc12709caa755666f580af3a688899721efecd"},
-    {file = "coverage-6.2-cp38-cp38-musllinux_1_1_aarch64.whl", hash = "sha256:9365ed5cce5d0cf2c10afc6add145c5037d3148585b8ae0e77cc1efdd6aa2953"},
-    {file = "coverage-6.2-cp38-cp38-musllinux_1_1_i686.whl", hash = "sha256:8bdfe9ff3a4ea37d17f172ac0dff1e1c383aec17a636b9b35906babc9f0f5475"},
-    {file = "coverage-6.2-cp38-cp38-musllinux_1_1_x86_64.whl", hash = "sha256:63c424e6f5b4ab1cf1e23a43b12f542b0ec2e54f99ec9f11b75382152981df57"},
-    {file = "coverage-6.2-cp38-cp38-win32.whl", hash = "sha256:49dbff64961bc9bdd2289a2bda6a3a5a331964ba5497f694e2cbd540d656dc1c"},
-    {file = "coverage-6.2-cp38-cp38-win_amd64.whl", hash = "sha256:9a29311bd6429be317c1f3fe4bc06c4c5ee45e2fa61b2a19d4d1d6111cb94af2"},
-    {file = "coverage-6.2-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:03b20e52b7d31be571c9c06b74746746d4eb82fc260e594dc662ed48145e9efd"},
-    {file = "coverage-6.2-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:215f8afcc02a24c2d9a10d3790b21054b58d71f4b3c6f055d4bb1b15cecce685"},
-    {file = "coverage-6.2-cp39-cp39-manylinux_2_5_i686.manylinux1_i686.manylinux_2_12_i686.manylinux2010_i686.whl", hash = "sha256:a4bdeb0a52d1d04123b41d90a4390b096f3ef38eee35e11f0b22c2d031222c6c"},
-    {file = "coverage-6.2-cp39-cp39-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:c332d8f8d448ded473b97fefe4a0983265af21917d8b0cdcb8bb06b2afe632c3"},
-    {file = "coverage-6.2-cp39-cp39-win32.whl", hash = "sha256:6e1394d24d5938e561fbeaa0cd3d356207579c28bd1792f25a068743f2d5b282"},
-    {file = "coverage-6.2-cp39-cp39-win_amd64.whl", hash = "sha256:86f2e78b1eff847609b1ca8050c9e1fa3bd44ce755b2ec30e70f2d3ba3844644"},
-    {file = "coverage-6.2-pp36.pp37.pp38-none-any.whl", hash = "sha256:5829192582c0ec8ca4a2532407bc14c2f338d9878a10442f5d03804a95fac9de"},
-    {file = "coverage-6.2.tar.gz", hash = "sha256:e2cad8093172b7d1595b4ad66f24270808658e11acf43a8f95b41276162eb5b8"},
+    {file = "coverage-6.3-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:e8071e7d9ba9f457fc674afc3de054450be2c9b195c470147fbbc082468d8ff7"},
+    {file = "coverage-6.3-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:86c91c511853dfda81c2cf2360502cb72783f4b7cebabef27869f00cbe1db07d"},
+    {file = "coverage-6.3-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:3c4ce3b647bd1792d4394f5690d9df6dc035b00bcdbc5595099c01282a59ae01"},
+    {file = "coverage-6.3-cp310-cp310-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:2a491e159294d756e7fc8462f98175e2d2225e4dbe062cca7d3e0d5a75ba6260"},
+    {file = "coverage-6.3-cp310-cp310-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:5d008e0f67ac800b0ca04d7914b8501312c8c6c00ad8c7ba17754609fae1231a"},
+    {file = "coverage-6.3-cp310-cp310-musllinux_1_1_aarch64.whl", hash = "sha256:4578728c36de2801c1deb1c6b760d31883e62e33f33c7ba8f982e609dc95167d"},
+    {file = "coverage-6.3-cp310-cp310-musllinux_1_1_i686.whl", hash = "sha256:7ee317486593193e066fc5e98ac0ce712178c21529a85c07b7cb978171f25d53"},
+    {file = "coverage-6.3-cp310-cp310-musllinux_1_1_x86_64.whl", hash = "sha256:2bc85664b06ba42d14bb74d6ddf19d8bfc520cb660561d2d9ce5786ae72f71b5"},
+    {file = "coverage-6.3-cp310-cp310-win32.whl", hash = "sha256:27a94db5dc098c25048b0aca155f5fac674f2cf1b1736c5272ba28ead2fc267e"},
+    {file = "coverage-6.3-cp310-cp310-win_amd64.whl", hash = "sha256:bde4aeabc0d1b2e52c4036c54440b1ad05beeca8113f47aceb4998bb7471e2c2"},
+    {file = "coverage-6.3-cp311-cp311-macosx_10_14_x86_64.whl", hash = "sha256:509c68c3e2015022aeda03b003dd68fa19987cdcf64e9d4edc98db41cfc45d30"},
+    {file = "coverage-6.3-cp311-cp311-manylinux_2_5_x86_64.manylinux1_x86_64.whl", hash = "sha256:e4ff163602c5c77e7bb4ea81ba5d3b793b4419f8acd296aae149370902cf4e92"},
+    {file = "coverage-6.3-cp311-cp311-win_amd64.whl", hash = "sha256:d1675db48490e5fa0b300f6329ecb8a9a37c29b9ab64fa9c964d34111788ca2d"},
+    {file = "coverage-6.3-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:7eed8459a2b81848cafb3280b39d7d49950d5f98e403677941c752e7e7ee47cb"},
+    {file = "coverage-6.3-cp37-cp37m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:1b4285fde5286b946835a1a53bba3ad41ef74285ba9e8013e14b5ea93deaeafc"},
+    {file = "coverage-6.3-cp37-cp37m-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:a4748349734110fd32d46ff8897b561e6300d8989a494ad5a0a2e4f0ca974fc7"},
+    {file = "coverage-6.3-cp37-cp37m-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:823f9325283dc9565ba0aa2d240471a93ca8999861779b2b6c7aded45b58ee0f"},
+    {file = "coverage-6.3-cp37-cp37m-musllinux_1_1_aarch64.whl", hash = "sha256:fff16a30fdf57b214778eff86391301c4509e327a65b877862f7c929f10a4253"},
+    {file = "coverage-6.3-cp37-cp37m-musllinux_1_1_i686.whl", hash = "sha256:da1a428bdbe71f9a8c270c7baab29e9552ac9d0e0cba5e7e9a4c9ee6465d258d"},
+    {file = "coverage-6.3-cp37-cp37m-musllinux_1_1_x86_64.whl", hash = "sha256:7d82c610a2e10372e128023c5baf9ce3d270f3029fe7274ff5bc2897c68f1318"},
+    {file = "coverage-6.3-cp37-cp37m-win32.whl", hash = "sha256:11e61c5548ecf74ea1f8b059730b049871f0e32b74f88bd0d670c20c819ad749"},
+    {file = "coverage-6.3-cp37-cp37m-win_amd64.whl", hash = "sha256:8e0c3525b1a182c8ffc9bca7e56b521e0c2b8b3e82f033c8e16d6d721f1b54d6"},
+    {file = "coverage-6.3-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:a189036c50dcd56100746139a459f0d27540fef95b09aba03e786540b8feaa5f"},
+    {file = "coverage-6.3-cp38-cp38-macosx_11_0_arm64.whl", hash = "sha256:32168001f33025fd756884d56d01adebb34e6c8c0b3395ca8584cdcee9c7c9d2"},
+    {file = "coverage-6.3-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:a5d79c9af3f410a2b5acad91258b4ae179ee9c83897eb9de69151b179b0227f5"},
+    {file = "coverage-6.3-cp38-cp38-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:85c5fc9029043cf8b07f73fbb0a7ab6d3b717510c3b5642b77058ea55d7cacde"},
+    {file = "coverage-6.3-cp38-cp38-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:a7596aa2f2b8fa5604129cfc9a27ad9beec0a96f18078cb424d029fdd707468d"},
+    {file = "coverage-6.3-cp38-cp38-musllinux_1_1_aarch64.whl", hash = "sha256:ce443a3e6df90d692c38762f108fc4c88314bf477689f04de76b3f252e7a351c"},
+    {file = "coverage-6.3-cp38-cp38-musllinux_1_1_i686.whl", hash = "sha256:012157499ec4f135fc36cd2177e3d1a1840af9b236cbe80e9a5ccfc83d912a69"},
+    {file = "coverage-6.3-cp38-cp38-musllinux_1_1_x86_64.whl", hash = "sha256:0a34d313105cdd0d3644c56df2d743fe467270d6ab93b5d4a347eb9fec8924d6"},
+    {file = "coverage-6.3-cp38-cp38-win32.whl", hash = "sha256:6e78b1e25e5c5695dea012be473e442f7094d066925604be20b30713dbd47f89"},
+    {file = "coverage-6.3-cp38-cp38-win_amd64.whl", hash = "sha256:433b99f7b0613bdcdc0b00cc3d39ed6d756797e3b078d2c43f8a38288520aec6"},
+    {file = "coverage-6.3-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:9ed3244b415725f08ca3bdf02ed681089fd95e9465099a21c8e2d9c5d6ca2606"},
+    {file = "coverage-6.3-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:ab4fc4b866b279740e0d917402f0e9a08683e002f43fa408e9655818ed392196"},
+    {file = "coverage-6.3-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:c8582e9280f8d0f38114fe95a92ae8d0790b56b099d728cc4f8a2e14b1c4a18c"},
+    {file = "coverage-6.3-cp39-cp39-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:c72bb4679283c6737f452eeb9b2a0e570acaef2197ad255fb20162adc80bea76"},
+    {file = "coverage-6.3-cp39-cp39-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:ca29c352389ea27a24c79acd117abdd8a865c6eb01576b6f0990cd9a4e9c9f48"},
+    {file = "coverage-6.3-cp39-cp39-musllinux_1_1_aarch64.whl", hash = "sha256:152cc2624381df4e4e604e21bd8e95eb8059535f7b768c1fb8b8ae0b26f47ab0"},
+    {file = "coverage-6.3-cp39-cp39-musllinux_1_1_i686.whl", hash = "sha256:51372e24b1f7143ee2df6b45cff6a721f3abe93b1e506196f3ffa4155c2497f7"},
+    {file = "coverage-6.3-cp39-cp39-musllinux_1_1_x86_64.whl", hash = "sha256:72d9d186508325a456475dd05b1756f9a204c7086b07fffb227ef8cee03b1dc2"},
+    {file = "coverage-6.3-cp39-cp39-win32.whl", hash = "sha256:649df3641eb351cdfd0d5533c92fc9df507b6b2bf48a7ef8c71ab63cbc7b5c3c"},
+    {file = "coverage-6.3-cp39-cp39-win_amd64.whl", hash = "sha256:e67ccd53da5958ea1ec833a160b96357f90859c220a00150de011b787c27b98d"},
+    {file = "coverage-6.3-pp36.pp37.pp38-none-any.whl", hash = "sha256:27ac7cb84538e278e07569ceaaa6f807a029dc194b1c819a9820b9bb5dbf63ab"},
+    {file = "coverage-6.3.tar.gz", hash = "sha256:987a84ff98a309994ca77ed3cc4b92424f824278e48e4bf7d1bb79a63cfe2099"},
 ]
 distlib = [
     {file = "distlib-0.3.3-py2.py3-none-any.whl", hash = "sha256:c8b54e8454e5bf6237cc84c20e8264c3e991e824ef27e8f1e81049867d861e31"},
@@ -1007,10 +1012,6 @@ tqdm = [
     {file = "tqdm-4.62.3-py2.py3-none-any.whl", hash = "sha256:8dd278a422499cd6b727e6ae4061c40b48fce8b76d1ccbf5d34fca9b7f925b0c"},
     {file = "tqdm-4.62.3.tar.gz", hash = "sha256:d359de7217506c9851b7869f3708d8ee53ed70a1b8edbba4dbcb47442592920d"},
 ]
-typing-extensions = [
-    {file = "typing_extensions-4.0.0-py3-none-any.whl", hash = "sha256:829704698b22e13ec9eaf959122315eabb370b0884400e9818334d8b677023d9"},
-    {file = "typing_extensions-4.0.0.tar.gz", hash = "sha256:2cdf80e4e04866a9b3689a51869016d36db0814d84b8d8a568d22781d45d27ed"},
-]
 urllib3 = [
     {file = "urllib3-1.26.7-py2.py3-none-any.whl", hash = "sha256:c4fdf4019605b6e5423637e01bc9fe4daef873709a7973e195ceba0a62bbc844"},
     {file = "urllib3-1.26.7.tar.gz", hash = "sha256:4987c65554f7a2dbf30c18fd48778ef124af6fab771a377103da0585e2336ece"},
diff --git a/pyproject.toml b/pyproject.toml
index 665fe9d4..01e0bcd0 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -14,7 +14,7 @@ beautifulsoup4 = "^4.10.0"
 tqdm = "^4.62.3"
 
 [tool.poetry.dev-dependencies]
-black = "^21.12b0"
+black = "^22.1"
 cookiecutter = "^1.7.3"
 pytest = "^6.2.5"
 pytest-cov = "^3.0.0"

From c33e2cd26e906881ab99a08723c1fd2981c8ac8d Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 7 Feb 2022 03:32:20 +0000
Subject: [PATCH 069/371] Bump actions/setup-python from 2.3.1 to 2.3.2

Bumps [actions/setup-python](https://github.com/actions/setup-python) from 2.3.1 to 2.3.2.
- [Release notes](https://github.com/actions/setup-python/releases)
- [Commits](https://github.com/actions/setup-python/compare/v2.3.1...v2.3.2)

---
updated-dependencies:
- dependency-name: actions/setup-python
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 .github/workflows/tox.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/tox.yml b/.github/workflows/tox.yml
index bea2d520..e2ae87e7 100644
--- a/.github/workflows/tox.yml
+++ b/.github/workflows/tox.yml
@@ -14,7 +14,7 @@ jobs:
     - uses: actions/checkout@v2
 
     - name: Set up Python ${{ matrix.python-version }}
-      uses: actions/setup-python@v2.3.1
+      uses: actions/setup-python@v2.3.2
       with:
         python-version: ${{ matrix.python-version }}
 

From 5fcd814ec015fb5cad8f31908e3d4f0ec4e9edbc Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 14 Feb 2022 04:28:39 +0000
Subject: [PATCH 070/371] Bump pytest from 6.2.5 to 7.0.1

Bumps [pytest](https://github.com/pytest-dev/pytest) from 6.2.5 to 7.0.1.
- [Release notes](https://github.com/pytest-dev/pytest/releases)
- [Changelog](https://github.com/pytest-dev/pytest/blob/main/CHANGELOG.rst)
- [Commits](https://github.com/pytest-dev/pytest/compare/6.2.5...7.0.1)

---
updated-dependencies:
- dependency-name: pytest
  dependency-type: direct:development
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 poetry.lock    | 99 ++++++++++++++++++++++++--------------------------
 pyproject.toml |  2 +-
 2 files changed, 49 insertions(+), 52 deletions(-)

diff --git a/poetry.lock b/poetry.lock
index cdfe5603..a8c291c4 100644
--- a/poetry.lock
+++ b/poetry.lock
@@ -179,7 +179,7 @@ six = ">=1.10"
 
 [[package]]
 name = "coverage"
-version = "6.3"
+version = "6.3.1"
 description = "Code coverage measurement for Python"
 category = "dev"
 optional = false
@@ -401,7 +401,7 @@ diagrams = ["jinja2", "railroad-diagrams"]
 
 [[package]]
 name = "pytest"
-version = "6.2.5"
+version = "7.0.1"
 description = "pytest: simple powerful testing with Python"
 category = "dev"
 optional = false
@@ -415,10 +415,10 @@ iniconfig = "*"
 packaging = "*"
 pluggy = ">=0.12,<2.0"
 py = ">=1.8.2"
-toml = "*"
+tomli = ">=1.0.0"
 
 [package.extras]
-testing = ["argcomplete", "hypothesis (>=3.56)", "mock", "nose", "requests", "xmlschema"]
+testing = ["argcomplete", "hypothesis (>=3.56)", "mock", "nose", "pygments (>=2.7.2)", "requests", "xmlschema"]
 
 [[package]]
 name = "pytest-cov"
@@ -640,7 +640,7 @@ testing = ["coverage (>=4)", "coverage-enable-subprocess (>=1)", "flaky (>=3)",
 [metadata]
 lock-version = "1.1"
 python-versions = "^3.10"
-content-hash = "551b0b02772f7ec0e5165b7f50c1563f774d6834e41f22fc62065c520db6acba"
+content-hash = "7b574867956485adc0d21847bb7cafe723737907d368c0130d61e95980223f30"
 
 [metadata.files]
 anytree = [
@@ -725,50 +725,47 @@ cookiecutter = [
     {file = "cookiecutter-1.7.3.tar.gz", hash = "sha256:6b9a4d72882e243be077a7397d0f1f76fe66cf3df91f3115dbb5330e214fa457"},
 ]
 coverage = [
-    {file = "coverage-6.3-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:e8071e7d9ba9f457fc674afc3de054450be2c9b195c470147fbbc082468d8ff7"},
-    {file = "coverage-6.3-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:86c91c511853dfda81c2cf2360502cb72783f4b7cebabef27869f00cbe1db07d"},
-    {file = "coverage-6.3-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:3c4ce3b647bd1792d4394f5690d9df6dc035b00bcdbc5595099c01282a59ae01"},
-    {file = "coverage-6.3-cp310-cp310-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:2a491e159294d756e7fc8462f98175e2d2225e4dbe062cca7d3e0d5a75ba6260"},
-    {file = "coverage-6.3-cp310-cp310-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:5d008e0f67ac800b0ca04d7914b8501312c8c6c00ad8c7ba17754609fae1231a"},
-    {file = "coverage-6.3-cp310-cp310-musllinux_1_1_aarch64.whl", hash = "sha256:4578728c36de2801c1deb1c6b760d31883e62e33f33c7ba8f982e609dc95167d"},
-    {file = "coverage-6.3-cp310-cp310-musllinux_1_1_i686.whl", hash = "sha256:7ee317486593193e066fc5e98ac0ce712178c21529a85c07b7cb978171f25d53"},
-    {file = "coverage-6.3-cp310-cp310-musllinux_1_1_x86_64.whl", hash = "sha256:2bc85664b06ba42d14bb74d6ddf19d8bfc520cb660561d2d9ce5786ae72f71b5"},
-    {file = "coverage-6.3-cp310-cp310-win32.whl", hash = "sha256:27a94db5dc098c25048b0aca155f5fac674f2cf1b1736c5272ba28ead2fc267e"},
-    {file = "coverage-6.3-cp310-cp310-win_amd64.whl", hash = "sha256:bde4aeabc0d1b2e52c4036c54440b1ad05beeca8113f47aceb4998bb7471e2c2"},
-    {file = "coverage-6.3-cp311-cp311-macosx_10_14_x86_64.whl", hash = "sha256:509c68c3e2015022aeda03b003dd68fa19987cdcf64e9d4edc98db41cfc45d30"},
-    {file = "coverage-6.3-cp311-cp311-manylinux_2_5_x86_64.manylinux1_x86_64.whl", hash = "sha256:e4ff163602c5c77e7bb4ea81ba5d3b793b4419f8acd296aae149370902cf4e92"},
-    {file = "coverage-6.3-cp311-cp311-win_amd64.whl", hash = "sha256:d1675db48490e5fa0b300f6329ecb8a9a37c29b9ab64fa9c964d34111788ca2d"},
-    {file = "coverage-6.3-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:7eed8459a2b81848cafb3280b39d7d49950d5f98e403677941c752e7e7ee47cb"},
-    {file = "coverage-6.3-cp37-cp37m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:1b4285fde5286b946835a1a53bba3ad41ef74285ba9e8013e14b5ea93deaeafc"},
-    {file = "coverage-6.3-cp37-cp37m-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:a4748349734110fd32d46ff8897b561e6300d8989a494ad5a0a2e4f0ca974fc7"},
-    {file = "coverage-6.3-cp37-cp37m-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:823f9325283dc9565ba0aa2d240471a93ca8999861779b2b6c7aded45b58ee0f"},
-    {file = "coverage-6.3-cp37-cp37m-musllinux_1_1_aarch64.whl", hash = "sha256:fff16a30fdf57b214778eff86391301c4509e327a65b877862f7c929f10a4253"},
-    {file = "coverage-6.3-cp37-cp37m-musllinux_1_1_i686.whl", hash = "sha256:da1a428bdbe71f9a8c270c7baab29e9552ac9d0e0cba5e7e9a4c9ee6465d258d"},
-    {file = "coverage-6.3-cp37-cp37m-musllinux_1_1_x86_64.whl", hash = "sha256:7d82c610a2e10372e128023c5baf9ce3d270f3029fe7274ff5bc2897c68f1318"},
-    {file = "coverage-6.3-cp37-cp37m-win32.whl", hash = "sha256:11e61c5548ecf74ea1f8b059730b049871f0e32b74f88bd0d670c20c819ad749"},
-    {file = "coverage-6.3-cp37-cp37m-win_amd64.whl", hash = "sha256:8e0c3525b1a182c8ffc9bca7e56b521e0c2b8b3e82f033c8e16d6d721f1b54d6"},
-    {file = "coverage-6.3-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:a189036c50dcd56100746139a459f0d27540fef95b09aba03e786540b8feaa5f"},
-    {file = "coverage-6.3-cp38-cp38-macosx_11_0_arm64.whl", hash = "sha256:32168001f33025fd756884d56d01adebb34e6c8c0b3395ca8584cdcee9c7c9d2"},
-    {file = "coverage-6.3-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:a5d79c9af3f410a2b5acad91258b4ae179ee9c83897eb9de69151b179b0227f5"},
-    {file = "coverage-6.3-cp38-cp38-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:85c5fc9029043cf8b07f73fbb0a7ab6d3b717510c3b5642b77058ea55d7cacde"},
-    {file = "coverage-6.3-cp38-cp38-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:a7596aa2f2b8fa5604129cfc9a27ad9beec0a96f18078cb424d029fdd707468d"},
-    {file = "coverage-6.3-cp38-cp38-musllinux_1_1_aarch64.whl", hash = "sha256:ce443a3e6df90d692c38762f108fc4c88314bf477689f04de76b3f252e7a351c"},
-    {file = "coverage-6.3-cp38-cp38-musllinux_1_1_i686.whl", hash = "sha256:012157499ec4f135fc36cd2177e3d1a1840af9b236cbe80e9a5ccfc83d912a69"},
-    {file = "coverage-6.3-cp38-cp38-musllinux_1_1_x86_64.whl", hash = "sha256:0a34d313105cdd0d3644c56df2d743fe467270d6ab93b5d4a347eb9fec8924d6"},
-    {file = "coverage-6.3-cp38-cp38-win32.whl", hash = "sha256:6e78b1e25e5c5695dea012be473e442f7094d066925604be20b30713dbd47f89"},
-    {file = "coverage-6.3-cp38-cp38-win_amd64.whl", hash = "sha256:433b99f7b0613bdcdc0b00cc3d39ed6d756797e3b078d2c43f8a38288520aec6"},
-    {file = "coverage-6.3-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:9ed3244b415725f08ca3bdf02ed681089fd95e9465099a21c8e2d9c5d6ca2606"},
-    {file = "coverage-6.3-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:ab4fc4b866b279740e0d917402f0e9a08683e002f43fa408e9655818ed392196"},
-    {file = "coverage-6.3-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:c8582e9280f8d0f38114fe95a92ae8d0790b56b099d728cc4f8a2e14b1c4a18c"},
-    {file = "coverage-6.3-cp39-cp39-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:c72bb4679283c6737f452eeb9b2a0e570acaef2197ad255fb20162adc80bea76"},
-    {file = "coverage-6.3-cp39-cp39-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:ca29c352389ea27a24c79acd117abdd8a865c6eb01576b6f0990cd9a4e9c9f48"},
-    {file = "coverage-6.3-cp39-cp39-musllinux_1_1_aarch64.whl", hash = "sha256:152cc2624381df4e4e604e21bd8e95eb8059535f7b768c1fb8b8ae0b26f47ab0"},
-    {file = "coverage-6.3-cp39-cp39-musllinux_1_1_i686.whl", hash = "sha256:51372e24b1f7143ee2df6b45cff6a721f3abe93b1e506196f3ffa4155c2497f7"},
-    {file = "coverage-6.3-cp39-cp39-musllinux_1_1_x86_64.whl", hash = "sha256:72d9d186508325a456475dd05b1756f9a204c7086b07fffb227ef8cee03b1dc2"},
-    {file = "coverage-6.3-cp39-cp39-win32.whl", hash = "sha256:649df3641eb351cdfd0d5533c92fc9df507b6b2bf48a7ef8c71ab63cbc7b5c3c"},
-    {file = "coverage-6.3-cp39-cp39-win_amd64.whl", hash = "sha256:e67ccd53da5958ea1ec833a160b96357f90859c220a00150de011b787c27b98d"},
-    {file = "coverage-6.3-pp36.pp37.pp38-none-any.whl", hash = "sha256:27ac7cb84538e278e07569ceaaa6f807a029dc194b1c819a9820b9bb5dbf63ab"},
-    {file = "coverage-6.3.tar.gz", hash = "sha256:987a84ff98a309994ca77ed3cc4b92424f824278e48e4bf7d1bb79a63cfe2099"},
+    {file = "coverage-6.3.1-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:eeffd96882d8c06d31b65dddcf51db7c612547babc1c4c5db6a011abe9798525"},
+    {file = "coverage-6.3.1-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:621f6ea7260ea2ffdaec64fe5cb521669984f567b66f62f81445221d4754df4c"},
+    {file = "coverage-6.3.1-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:84f2436d6742c01136dd940ee158bfc7cf5ced3da7e4c949662b8703b5cd8145"},
+    {file = "coverage-6.3.1-cp310-cp310-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:de73fca6fb403dd72d4da517cfc49fcf791f74eee697d3219f6be29adf5af6ce"},
+    {file = "coverage-6.3.1-cp310-cp310-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:78fbb2be068a13a5d99dce9e1e7d168db880870f7bc73f876152130575bd6167"},
+    {file = "coverage-6.3.1-cp310-cp310-musllinux_1_1_aarch64.whl", hash = "sha256:f5a4551dfd09c3bd12fca8144d47fe7745275adf3229b7223c2f9e29a975ebda"},
+    {file = "coverage-6.3.1-cp310-cp310-musllinux_1_1_i686.whl", hash = "sha256:7bff3a98f63b47464480de1b5bdd80c8fade0ba2832c9381253c9b74c4153c27"},
+    {file = "coverage-6.3.1-cp310-cp310-musllinux_1_1_x86_64.whl", hash = "sha256:a06c358f4aed05fa1099c39decc8022261bb07dfadc127c08cfbd1391b09689e"},
+    {file = "coverage-6.3.1-cp310-cp310-win32.whl", hash = "sha256:9fff3ff052922cb99f9e52f63f985d4f7a54f6b94287463bc66b7cdf3eb41217"},
+    {file = "coverage-6.3.1-cp310-cp310-win_amd64.whl", hash = "sha256:276b13cc085474e482566c477c25ed66a097b44c6e77132f3304ac0b039f83eb"},
+    {file = "coverage-6.3.1-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:56c4a409381ddd7bbff134e9756077860d4e8a583d310a6f38a2315b9ce301d0"},
+    {file = "coverage-6.3.1-cp37-cp37m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:9eb494070aa060ceba6e4bbf44c1bc5fa97bfb883a0d9b0c9049415f9e944793"},
+    {file = "coverage-6.3.1-cp37-cp37m-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:5e15d424b8153756b7c903bde6d4610be0c3daca3986173c18dd5c1a1625e4cd"},
+    {file = "coverage-6.3.1-cp37-cp37m-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:61d47a897c1e91f33f177c21de897267b38fbb45f2cd8e22a710bcef1df09ac1"},
+    {file = "coverage-6.3.1-cp37-cp37m-musllinux_1_1_aarch64.whl", hash = "sha256:25e73d4c81efa8ea3785274a2f7f3bfbbeccb6fcba2a0bdd3be9223371c37554"},
+    {file = "coverage-6.3.1-cp37-cp37m-musllinux_1_1_i686.whl", hash = "sha256:fac0bcc5b7e8169bffa87f0dcc24435446d329cbc2b5486d155c2e0f3b493ae1"},
+    {file = "coverage-6.3.1-cp37-cp37m-musllinux_1_1_x86_64.whl", hash = "sha256:72128176fea72012063200b7b395ed8a57849282b207321124d7ff14e26988e8"},
+    {file = "coverage-6.3.1-cp37-cp37m-win32.whl", hash = "sha256:1bc6d709939ff262fd1432f03f080c5042dc6508b6e0d3d20e61dd045456a1a0"},
+    {file = "coverage-6.3.1-cp37-cp37m-win_amd64.whl", hash = "sha256:618eeba986cea7f621d8607ee378ecc8c2504b98b3fdc4952b30fe3578304687"},
+    {file = "coverage-6.3.1-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:d5ed164af5c9078596cfc40b078c3b337911190d3faeac830c3f1274f26b8320"},
+    {file = "coverage-6.3.1-cp38-cp38-macosx_11_0_arm64.whl", hash = "sha256:352c68e233409c31048a3725c446a9e48bbff36e39db92774d4f2380d630d8f8"},
+    {file = "coverage-6.3.1-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:448d7bde7ceb6c69e08474c2ddbc5b4cd13c9e4aa4a717467f716b5fc938a734"},
+    {file = "coverage-6.3.1-cp38-cp38-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:9fde6b90889522c220dd56a670102ceef24955d994ff7af2cb786b4ba8fe11e4"},
+    {file = "coverage-6.3.1-cp38-cp38-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:e647a0be741edbb529a72644e999acb09f2ad60465f80757da183528941ff975"},
+    {file = "coverage-6.3.1-cp38-cp38-musllinux_1_1_aarch64.whl", hash = "sha256:6a5cdc3adb4f8bb8d8f5e64c2e9e282bc12980ef055ec6da59db562ee9bdfefa"},
+    {file = "coverage-6.3.1-cp38-cp38-musllinux_1_1_i686.whl", hash = "sha256:2dd70a167843b4b4b2630c0c56f1b586fe965b4f8ac5da05b6690344fd065c6b"},
+    {file = "coverage-6.3.1-cp38-cp38-musllinux_1_1_x86_64.whl", hash = "sha256:9ad0a117b8dc2061ce9461ea4c1b4799e55edceb236522c5b8f958ce9ed8fa9a"},
+    {file = "coverage-6.3.1-cp38-cp38-win32.whl", hash = "sha256:e92c7a5f7d62edff50f60a045dc9542bf939758c95b2fcd686175dd10ce0ed10"},
+    {file = "coverage-6.3.1-cp38-cp38-win_amd64.whl", hash = "sha256:482fb42eea6164894ff82abbcf33d526362de5d1a7ed25af7ecbdddd28fc124f"},
+    {file = "coverage-6.3.1-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:c5b81fb37db76ebea79aa963b76d96ff854e7662921ce742293463635a87a78d"},
+    {file = "coverage-6.3.1-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:a4f923b9ab265136e57cc14794a15b9dcea07a9c578609cd5dbbfff28a0d15e6"},
+    {file = "coverage-6.3.1-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:56d296cbc8254a7dffdd7bcc2eb70be5a233aae7c01856d2d936f5ac4e8ac1f1"},
+    {file = "coverage-6.3.1-cp39-cp39-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:1245ab82e8554fa88c4b2ab1e098ae051faac5af829efdcf2ce6b34dccd5567c"},
+    {file = "coverage-6.3.1-cp39-cp39-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:3f2b05757c92ad96b33dbf8e8ec8d4ccb9af6ae3c9e9bd141c7cc44d20c6bcba"},
+    {file = "coverage-6.3.1-cp39-cp39-musllinux_1_1_aarch64.whl", hash = "sha256:9e3dd806f34de38d4c01416344e98eab2437ac450b3ae39c62a0ede2f8b5e4ed"},
+    {file = "coverage-6.3.1-cp39-cp39-musllinux_1_1_i686.whl", hash = "sha256:d651fde74a4d3122e5562705824507e2f5b2d3d57557f1916c4b27635f8fbe3f"},
+    {file = "coverage-6.3.1-cp39-cp39-musllinux_1_1_x86_64.whl", hash = "sha256:704f89b87c4f4737da2860695a18c852b78ec7279b24eedacab10b29067d3a38"},
+    {file = "coverage-6.3.1-cp39-cp39-win32.whl", hash = "sha256:2aed4761809640f02e44e16b8b32c1a5dee5e80ea30a0ff0912158bde9c501f2"},
+    {file = "coverage-6.3.1-cp39-cp39-win_amd64.whl", hash = "sha256:9976fb0a5709988778ac9bc44f3d50fccd989987876dfd7716dee28beed0a9fa"},
+    {file = "coverage-6.3.1-pp36.pp37.pp38-none-any.whl", hash = "sha256:463e52616ea687fd323888e86bf25e864a3cc6335a043fad6bbb037dbf49bbe2"},
+    {file = "coverage-6.3.1.tar.gz", hash = "sha256:6c3f6158b02ac403868eea390930ae64e9a9a2a5bbfafefbb920d29258d9f2f8"},
 ]
 distlib = [
     {file = "distlib-0.3.3-py2.py3-none-any.whl", hash = "sha256:c8b54e8454e5bf6237cc84c20e8264c3e991e824ef27e8f1e81049867d861e31"},
@@ -918,8 +915,8 @@ pyparsing = [
     {file = "pyparsing-3.0.6.tar.gz", hash = "sha256:d9bdec0013ef1eb5a84ab39a3b3868911598afa494f5faa038647101504e2b81"},
 ]
 pytest = [
-    {file = "pytest-6.2.5-py3-none-any.whl", hash = "sha256:7310f8d27bc79ced999e760ca304d69f6ba6c6649c0b60fb0e04a4a77cacc134"},
-    {file = "pytest-6.2.5.tar.gz", hash = "sha256:131b36680866a76e6781d13f101efb86cf674ebb9762eb70d3082b6f29889e89"},
+    {file = "pytest-7.0.1-py3-none-any.whl", hash = "sha256:9ce3ff477af913ecf6321fe337b93a2c0dcf2a0a1439c43f5452112c1e4280db"},
+    {file = "pytest-7.0.1.tar.gz", hash = "sha256:e30905a0c131d3d94b89624a1cc5afec3e0ba2fbdb151867d8e0ebd49850f171"},
 ]
 pytest-cov = [
     {file = "pytest-cov-3.0.0.tar.gz", hash = "sha256:e7f0f5b1617d2210a2cabc266dfe2f4c75a8d32fb89eafb7ad9d06f6d076d470"},
diff --git a/pyproject.toml b/pyproject.toml
index 01e0bcd0..c094675f 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -16,7 +16,7 @@ tqdm = "^4.62.3"
 [tool.poetry.dev-dependencies]
 black = "^22.1"
 cookiecutter = "^1.7.3"
-pytest = "^6.2.5"
+pytest = "^7.0.1"
 pytest-cov = "^3.0.0"
 pytest-xdist = "^2.5.0"
 python-dotenv = "^0.19.2"

From c1c7173c592cae7b9d0cd8702bfe2c3ce84fe132 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 21 Feb 2022 04:07:48 +0000
Subject: [PATCH 071/371] Bump click from 8.0.3 to 8.0.4

Bumps [click](https://github.com/pallets/click) from 8.0.3 to 8.0.4.
- [Release notes](https://github.com/pallets/click/releases)
- [Changelog](https://github.com/pallets/click/blob/main/CHANGES.rst)
- [Commits](https://github.com/pallets/click/compare/8.0.3...8.0.4)

---
updated-dependencies:
- dependency-name: click
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 poetry.lock    | 95 ++++++++++++++++++++++++--------------------------
 pyproject.toml |  2 +-
 2 files changed, 47 insertions(+), 50 deletions(-)

diff --git a/poetry.lock b/poetry.lock
index 8e296b02..efc06e22 100644
--- a/poetry.lock
+++ b/poetry.lock
@@ -143,7 +143,7 @@ unicode_backport = ["unicodedata2"]
 
 [[package]]
 name = "click"
-version = "8.0.3"
+version = "8.0.4"
 description = "Composable command line interface toolkit"
 category = "main"
 optional = false
@@ -180,7 +180,7 @@ six = ">=1.10"
 
 [[package]]
 name = "coverage"
-version = "6.3"
+version = "6.3.2"
 description = "Code coverage measurement for Python"
 category = "dev"
 optional = false
@@ -719,7 +719,7 @@ testing = ["coverage (>=4)", "coverage-enable-subprocess (>=1)", "flaky (>=3)",
 [metadata]
 lock-version = "1.1"
 python-versions = ">=3.9,<3.11"
-content-hash = "37ec67a245cf62a7bf243f1ef1d42c8dfe6e2109154651a55e3f0a7a5889c903"
+content-hash = "22df48de126fcb9496bbcd11419617fb76cc063edbd17dbad77650026f5c4152"
 
 [metadata.files]
 anytree = [
@@ -792,8 +792,8 @@ charset-normalizer = [
     {file = "charset_normalizer-2.0.7-py3-none-any.whl", hash = "sha256:f7af805c321bfa1ce6714c51f254e0d5bb5e5834039bc17db7ebe3a4cec9492b"},
 ]
 click = [
-    {file = "click-8.0.3-py3-none-any.whl", hash = "sha256:353f466495adaeb40b6b5f592f9f91cb22372351c84caeb068132442a4518ef3"},
-    {file = "click-8.0.3.tar.gz", hash = "sha256:410e932b050f5eed773c4cda94de75971c89cdb3155a72a0831139a79e5ecb5b"},
+    {file = "click-8.0.4-py3-none-any.whl", hash = "sha256:6a7a62563bbfabfda3a38f3023a1db4a35978c0abd76f6c9605ecd6554d6d9b1"},
+    {file = "click-8.0.4.tar.gz", hash = "sha256:8458d7b1287c5fb128c90e23381cf99dcde74beaf6c7ff6384ce84d6fe090adb"},
 ]
 colorama = [
     {file = "colorama-0.4.4-py2.py3-none-any.whl", hash = "sha256:9f47eda37229f68eee03b24b9748937c7dc3868f906e8ba69fbcbdd3bc5dc3e2"},
@@ -804,50 +804,47 @@ cookiecutter = [
     {file = "cookiecutter-1.7.3.tar.gz", hash = "sha256:6b9a4d72882e243be077a7397d0f1f76fe66cf3df91f3115dbb5330e214fa457"},
 ]
 coverage = [
-    {file = "coverage-6.3-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:e8071e7d9ba9f457fc674afc3de054450be2c9b195c470147fbbc082468d8ff7"},
-    {file = "coverage-6.3-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:86c91c511853dfda81c2cf2360502cb72783f4b7cebabef27869f00cbe1db07d"},
-    {file = "coverage-6.3-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:3c4ce3b647bd1792d4394f5690d9df6dc035b00bcdbc5595099c01282a59ae01"},
-    {file = "coverage-6.3-cp310-cp310-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:2a491e159294d756e7fc8462f98175e2d2225e4dbe062cca7d3e0d5a75ba6260"},
-    {file = "coverage-6.3-cp310-cp310-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:5d008e0f67ac800b0ca04d7914b8501312c8c6c00ad8c7ba17754609fae1231a"},
-    {file = "coverage-6.3-cp310-cp310-musllinux_1_1_aarch64.whl", hash = "sha256:4578728c36de2801c1deb1c6b760d31883e62e33f33c7ba8f982e609dc95167d"},
-    {file = "coverage-6.3-cp310-cp310-musllinux_1_1_i686.whl", hash = "sha256:7ee317486593193e066fc5e98ac0ce712178c21529a85c07b7cb978171f25d53"},
-    {file = "coverage-6.3-cp310-cp310-musllinux_1_1_x86_64.whl", hash = "sha256:2bc85664b06ba42d14bb74d6ddf19d8bfc520cb660561d2d9ce5786ae72f71b5"},
-    {file = "coverage-6.3-cp310-cp310-win32.whl", hash = "sha256:27a94db5dc098c25048b0aca155f5fac674f2cf1b1736c5272ba28ead2fc267e"},
-    {file = "coverage-6.3-cp310-cp310-win_amd64.whl", hash = "sha256:bde4aeabc0d1b2e52c4036c54440b1ad05beeca8113f47aceb4998bb7471e2c2"},
-    {file = "coverage-6.3-cp311-cp311-macosx_10_14_x86_64.whl", hash = "sha256:509c68c3e2015022aeda03b003dd68fa19987cdcf64e9d4edc98db41cfc45d30"},
-    {file = "coverage-6.3-cp311-cp311-manylinux_2_5_x86_64.manylinux1_x86_64.whl", hash = "sha256:e4ff163602c5c77e7bb4ea81ba5d3b793b4419f8acd296aae149370902cf4e92"},
-    {file = "coverage-6.3-cp311-cp311-win_amd64.whl", hash = "sha256:d1675db48490e5fa0b300f6329ecb8a9a37c29b9ab64fa9c964d34111788ca2d"},
-    {file = "coverage-6.3-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:7eed8459a2b81848cafb3280b39d7d49950d5f98e403677941c752e7e7ee47cb"},
-    {file = "coverage-6.3-cp37-cp37m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:1b4285fde5286b946835a1a53bba3ad41ef74285ba9e8013e14b5ea93deaeafc"},
-    {file = "coverage-6.3-cp37-cp37m-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:a4748349734110fd32d46ff8897b561e6300d8989a494ad5a0a2e4f0ca974fc7"},
-    {file = "coverage-6.3-cp37-cp37m-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:823f9325283dc9565ba0aa2d240471a93ca8999861779b2b6c7aded45b58ee0f"},
-    {file = "coverage-6.3-cp37-cp37m-musllinux_1_1_aarch64.whl", hash = "sha256:fff16a30fdf57b214778eff86391301c4509e327a65b877862f7c929f10a4253"},
-    {file = "coverage-6.3-cp37-cp37m-musllinux_1_1_i686.whl", hash = "sha256:da1a428bdbe71f9a8c270c7baab29e9552ac9d0e0cba5e7e9a4c9ee6465d258d"},
-    {file = "coverage-6.3-cp37-cp37m-musllinux_1_1_x86_64.whl", hash = "sha256:7d82c610a2e10372e128023c5baf9ce3d270f3029fe7274ff5bc2897c68f1318"},
-    {file = "coverage-6.3-cp37-cp37m-win32.whl", hash = "sha256:11e61c5548ecf74ea1f8b059730b049871f0e32b74f88bd0d670c20c819ad749"},
-    {file = "coverage-6.3-cp37-cp37m-win_amd64.whl", hash = "sha256:8e0c3525b1a182c8ffc9bca7e56b521e0c2b8b3e82f033c8e16d6d721f1b54d6"},
-    {file = "coverage-6.3-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:a189036c50dcd56100746139a459f0d27540fef95b09aba03e786540b8feaa5f"},
-    {file = "coverage-6.3-cp38-cp38-macosx_11_0_arm64.whl", hash = "sha256:32168001f33025fd756884d56d01adebb34e6c8c0b3395ca8584cdcee9c7c9d2"},
-    {file = "coverage-6.3-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:a5d79c9af3f410a2b5acad91258b4ae179ee9c83897eb9de69151b179b0227f5"},
-    {file = "coverage-6.3-cp38-cp38-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:85c5fc9029043cf8b07f73fbb0a7ab6d3b717510c3b5642b77058ea55d7cacde"},
-    {file = "coverage-6.3-cp38-cp38-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:a7596aa2f2b8fa5604129cfc9a27ad9beec0a96f18078cb424d029fdd707468d"},
-    {file = "coverage-6.3-cp38-cp38-musllinux_1_1_aarch64.whl", hash = "sha256:ce443a3e6df90d692c38762f108fc4c88314bf477689f04de76b3f252e7a351c"},
-    {file = "coverage-6.3-cp38-cp38-musllinux_1_1_i686.whl", hash = "sha256:012157499ec4f135fc36cd2177e3d1a1840af9b236cbe80e9a5ccfc83d912a69"},
-    {file = "coverage-6.3-cp38-cp38-musllinux_1_1_x86_64.whl", hash = "sha256:0a34d313105cdd0d3644c56df2d743fe467270d6ab93b5d4a347eb9fec8924d6"},
-    {file = "coverage-6.3-cp38-cp38-win32.whl", hash = "sha256:6e78b1e25e5c5695dea012be473e442f7094d066925604be20b30713dbd47f89"},
-    {file = "coverage-6.3-cp38-cp38-win_amd64.whl", hash = "sha256:433b99f7b0613bdcdc0b00cc3d39ed6d756797e3b078d2c43f8a38288520aec6"},
-    {file = "coverage-6.3-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:9ed3244b415725f08ca3bdf02ed681089fd95e9465099a21c8e2d9c5d6ca2606"},
-    {file = "coverage-6.3-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:ab4fc4b866b279740e0d917402f0e9a08683e002f43fa408e9655818ed392196"},
-    {file = "coverage-6.3-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:c8582e9280f8d0f38114fe95a92ae8d0790b56b099d728cc4f8a2e14b1c4a18c"},
-    {file = "coverage-6.3-cp39-cp39-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:c72bb4679283c6737f452eeb9b2a0e570acaef2197ad255fb20162adc80bea76"},
-    {file = "coverage-6.3-cp39-cp39-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:ca29c352389ea27a24c79acd117abdd8a865c6eb01576b6f0990cd9a4e9c9f48"},
-    {file = "coverage-6.3-cp39-cp39-musllinux_1_1_aarch64.whl", hash = "sha256:152cc2624381df4e4e604e21bd8e95eb8059535f7b768c1fb8b8ae0b26f47ab0"},
-    {file = "coverage-6.3-cp39-cp39-musllinux_1_1_i686.whl", hash = "sha256:51372e24b1f7143ee2df6b45cff6a721f3abe93b1e506196f3ffa4155c2497f7"},
-    {file = "coverage-6.3-cp39-cp39-musllinux_1_1_x86_64.whl", hash = "sha256:72d9d186508325a456475dd05b1756f9a204c7086b07fffb227ef8cee03b1dc2"},
-    {file = "coverage-6.3-cp39-cp39-win32.whl", hash = "sha256:649df3641eb351cdfd0d5533c92fc9df507b6b2bf48a7ef8c71ab63cbc7b5c3c"},
-    {file = "coverage-6.3-cp39-cp39-win_amd64.whl", hash = "sha256:e67ccd53da5958ea1ec833a160b96357f90859c220a00150de011b787c27b98d"},
-    {file = "coverage-6.3-pp36.pp37.pp38-none-any.whl", hash = "sha256:27ac7cb84538e278e07569ceaaa6f807a029dc194b1c819a9820b9bb5dbf63ab"},
-    {file = "coverage-6.3.tar.gz", hash = "sha256:987a84ff98a309994ca77ed3cc4b92424f824278e48e4bf7d1bb79a63cfe2099"},
+    {file = "coverage-6.3.2-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:9b27d894748475fa858f9597c0ee1d4829f44683f3813633aaf94b19cb5453cf"},
+    {file = "coverage-6.3.2-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:37d1141ad6b2466a7b53a22e08fe76994c2d35a5b6b469590424a9953155afac"},
+    {file = "coverage-6.3.2-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:f9987b0354b06d4df0f4d3e0ec1ae76d7ce7cbca9a2f98c25041eb79eec766f1"},
+    {file = "coverage-6.3.2-cp310-cp310-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:26e2deacd414fc2f97dd9f7676ee3eaecd299ca751412d89f40bc01557a6b1b4"},
+    {file = "coverage-6.3.2-cp310-cp310-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:4dd8bafa458b5c7d061540f1ee9f18025a68e2d8471b3e858a9dad47c8d41903"},
+    {file = "coverage-6.3.2-cp310-cp310-musllinux_1_1_aarch64.whl", hash = "sha256:46191097ebc381fbf89bdce207a6c107ac4ec0890d8d20f3360345ff5976155c"},
+    {file = "coverage-6.3.2-cp310-cp310-musllinux_1_1_i686.whl", hash = "sha256:6f89d05e028d274ce4fa1a86887b071ae1755082ef94a6740238cd7a8178804f"},
+    {file = "coverage-6.3.2-cp310-cp310-musllinux_1_1_x86_64.whl", hash = "sha256:58303469e9a272b4abdb9e302a780072c0633cdcc0165db7eec0f9e32f901e05"},
+    {file = "coverage-6.3.2-cp310-cp310-win32.whl", hash = "sha256:2fea046bfb455510e05be95e879f0e768d45c10c11509e20e06d8fcaa31d9e39"},
+    {file = "coverage-6.3.2-cp310-cp310-win_amd64.whl", hash = "sha256:a2a8b8bcc399edb4347a5ca8b9b87e7524c0967b335fbb08a83c8421489ddee1"},
+    {file = "coverage-6.3.2-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:f1555ea6d6da108e1999b2463ea1003fe03f29213e459145e70edbaf3e004aaa"},
+    {file = "coverage-6.3.2-cp37-cp37m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:e5f4e1edcf57ce94e5475fe09e5afa3e3145081318e5fd1a43a6b4539a97e518"},
+    {file = "coverage-6.3.2-cp37-cp37m-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:7a15dc0a14008f1da3d1ebd44bdda3e357dbabdf5a0b5034d38fcde0b5c234b7"},
+    {file = "coverage-6.3.2-cp37-cp37m-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:21b7745788866028adeb1e0eca3bf1101109e2dc58456cb49d2d9b99a8c516e6"},
+    {file = "coverage-6.3.2-cp37-cp37m-musllinux_1_1_aarch64.whl", hash = "sha256:8ce257cac556cb03be4a248d92ed36904a59a4a5ff55a994e92214cde15c5bad"},
+    {file = "coverage-6.3.2-cp37-cp37m-musllinux_1_1_i686.whl", hash = "sha256:b0be84e5a6209858a1d3e8d1806c46214e867ce1b0fd32e4ea03f4bd8b2e3359"},
+    {file = "coverage-6.3.2-cp37-cp37m-musllinux_1_1_x86_64.whl", hash = "sha256:acf53bc2cf7282ab9b8ba346746afe703474004d9e566ad164c91a7a59f188a4"},
+    {file = "coverage-6.3.2-cp37-cp37m-win32.whl", hash = "sha256:8bdde1177f2311ee552f47ae6e5aa7750c0e3291ca6b75f71f7ffe1f1dab3dca"},
+    {file = "coverage-6.3.2-cp37-cp37m-win_amd64.whl", hash = "sha256:b31651d018b23ec463e95cf10070d0b2c548aa950a03d0b559eaa11c7e5a6fa3"},
+    {file = "coverage-6.3.2-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:07e6db90cd9686c767dcc593dff16c8c09f9814f5e9c51034066cad3373b914d"},
+    {file = "coverage-6.3.2-cp38-cp38-macosx_11_0_arm64.whl", hash = "sha256:2c6dbb42f3ad25760010c45191e9757e7dce981cbfb90e42feef301d71540059"},
+    {file = "coverage-6.3.2-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:c76aeef1b95aff3905fb2ae2d96e319caca5b76fa41d3470b19d4e4a3a313512"},
+    {file = "coverage-6.3.2-cp38-cp38-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:8cf5cfcb1521dc3255d845d9dca3ff204b3229401994ef8d1984b32746bb45ca"},
+    {file = "coverage-6.3.2-cp38-cp38-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:8fbbdc8d55990eac1b0919ca69eb5a988a802b854488c34b8f37f3e2025fa90d"},
+    {file = "coverage-6.3.2-cp38-cp38-musllinux_1_1_aarch64.whl", hash = "sha256:ec6bc7fe73a938933d4178c9b23c4e0568e43e220aef9472c4f6044bfc6dd0f0"},
+    {file = "coverage-6.3.2-cp38-cp38-musllinux_1_1_i686.whl", hash = "sha256:9baff2a45ae1f17c8078452e9e5962e518eab705e50a0aa8083733ea7d45f3a6"},
+    {file = "coverage-6.3.2-cp38-cp38-musllinux_1_1_x86_64.whl", hash = "sha256:fd9e830e9d8d89b20ab1e5af09b32d33e1a08ef4c4e14411e559556fd788e6b2"},
+    {file = "coverage-6.3.2-cp38-cp38-win32.whl", hash = "sha256:f7331dbf301b7289013175087636bbaf5b2405e57259dd2c42fdcc9fcc47325e"},
+    {file = "coverage-6.3.2-cp38-cp38-win_amd64.whl", hash = "sha256:68353fe7cdf91f109fc7d474461b46e7f1f14e533e911a2a2cbb8b0fc8613cf1"},
+    {file = "coverage-6.3.2-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:b78e5afb39941572209f71866aa0b206c12f0109835aa0d601e41552f9b3e620"},
+    {file = "coverage-6.3.2-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:4e21876082ed887baed0146fe222f861b5815455ada3b33b890f4105d806128d"},
+    {file = "coverage-6.3.2-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:34626a7eee2a3da12af0507780bb51eb52dca0e1751fd1471d0810539cefb536"},
+    {file = "coverage-6.3.2-cp39-cp39-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:1ebf730d2381158ecf3dfd4453fbca0613e16eaa547b4170e2450c9707665ce7"},
+    {file = "coverage-6.3.2-cp39-cp39-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:dd6fe30bd519694b356cbfcaca9bd5c1737cddd20778c6a581ae20dc8c04def2"},
+    {file = "coverage-6.3.2-cp39-cp39-musllinux_1_1_aarch64.whl", hash = "sha256:96f8a1cb43ca1422f36492bebe63312d396491a9165ed3b9231e778d43a7fca4"},
+    {file = "coverage-6.3.2-cp39-cp39-musllinux_1_1_i686.whl", hash = "sha256:dd035edafefee4d573140a76fdc785dc38829fe5a455c4bb12bac8c20cfc3d69"},
+    {file = "coverage-6.3.2-cp39-cp39-musllinux_1_1_x86_64.whl", hash = "sha256:5ca5aeb4344b30d0bec47481536b8ba1181d50dbe783b0e4ad03c95dc1296684"},
+    {file = "coverage-6.3.2-cp39-cp39-win32.whl", hash = "sha256:f5fa5803f47e095d7ad8443d28b01d48c0359484fec1b9d8606d0e3282084bc4"},
+    {file = "coverage-6.3.2-cp39-cp39-win_amd64.whl", hash = "sha256:9548f10d8be799551eb3a9c74bbf2b4934ddb330e08a73320123c07f95cc2d92"},
+    {file = "coverage-6.3.2-pp36.pp37.pp38-none-any.whl", hash = "sha256:18d520c6860515a771708937d2f78f63cc47ab3b80cb78e86573b0a760161faf"},
+    {file = "coverage-6.3.2.tar.gz", hash = "sha256:03e2a7826086b91ef345ff18742ee9fc47a6839ccd517061ef8fa1976e652ce9"},
 ]
 cycler = [
     {file = "cycler-0.11.0-py3-none-any.whl", hash = "sha256:3a27e95f763a428a739d2add979fa7494c912a32c17c4c38c4d5f082cad165a3"},
diff --git a/pyproject.toml b/pyproject.toml
index 11323d29..61a66985 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -8,7 +8,7 @@ license = "MIT License"
 [tool.poetry.dependencies]
 python = ">=3.9,<3.11"
 anytree = "^2.8.0"
-click = "^8.0.3"
+click = "^8.0.4"
 matplotlib = "3.5.1"
 numpy = "^1.22.1"
 tqdm = "^4.62.3"

From 383f97f556df387e8b2749aae3a24b323f7520ad Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 21 Feb 2022 04:29:18 +0000
Subject: [PATCH 072/371] Bump click from 8.0.3 to 8.0.4

Bumps [click](https://github.com/pallets/click) from 8.0.3 to 8.0.4.
- [Release notes](https://github.com/pallets/click/releases)
- [Changelog](https://github.com/pallets/click/blob/main/CHANGES.rst)
- [Commits](https://github.com/pallets/click/compare/8.0.3...8.0.4)

---
updated-dependencies:
- dependency-name: click
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 poetry.lock    | 92 +++++++++++++++++++++++++-------------------------
 pyproject.toml |  2 +-
 2 files changed, 47 insertions(+), 47 deletions(-)

diff --git a/poetry.lock b/poetry.lock
index a8c291c4..2719ed8e 100644
--- a/poetry.lock
+++ b/poetry.lock
@@ -142,7 +142,7 @@ unicode_backport = ["unicodedata2"]
 
 [[package]]
 name = "click"
-version = "8.0.3"
+version = "8.0.4"
 description = "Composable command line interface toolkit"
 category = "main"
 optional = false
@@ -179,7 +179,7 @@ six = ">=1.10"
 
 [[package]]
 name = "coverage"
-version = "6.3.1"
+version = "6.3.2"
 description = "Code coverage measurement for Python"
 category = "dev"
 optional = false
@@ -640,7 +640,7 @@ testing = ["coverage (>=4)", "coverage-enable-subprocess (>=1)", "flaky (>=3)",
 [metadata]
 lock-version = "1.1"
 python-versions = "^3.10"
-content-hash = "7b574867956485adc0d21847bb7cafe723737907d368c0130d61e95980223f30"
+content-hash = "bcd311a11494251d56d24fbded3fe6f6dfe5905e68cd18aa926f9fda008c7905"
 
 [metadata.files]
 anytree = [
@@ -713,8 +713,8 @@ charset-normalizer = [
     {file = "charset_normalizer-2.0.8-py3-none-any.whl", hash = "sha256:83fcdeb225499d6344c8f7f34684c2981270beacc32ede2e669e94f7fa544405"},
 ]
 click = [
-    {file = "click-8.0.3-py3-none-any.whl", hash = "sha256:353f466495adaeb40b6b5f592f9f91cb22372351c84caeb068132442a4518ef3"},
-    {file = "click-8.0.3.tar.gz", hash = "sha256:410e932b050f5eed773c4cda94de75971c89cdb3155a72a0831139a79e5ecb5b"},
+    {file = "click-8.0.4-py3-none-any.whl", hash = "sha256:6a7a62563bbfabfda3a38f3023a1db4a35978c0abd76f6c9605ecd6554d6d9b1"},
+    {file = "click-8.0.4.tar.gz", hash = "sha256:8458d7b1287c5fb128c90e23381cf99dcde74beaf6c7ff6384ce84d6fe090adb"},
 ]
 colorama = [
     {file = "colorama-0.4.4-py2.py3-none-any.whl", hash = "sha256:9f47eda37229f68eee03b24b9748937c7dc3868f906e8ba69fbcbdd3bc5dc3e2"},
@@ -725,47 +725,47 @@ cookiecutter = [
     {file = "cookiecutter-1.7.3.tar.gz", hash = "sha256:6b9a4d72882e243be077a7397d0f1f76fe66cf3df91f3115dbb5330e214fa457"},
 ]
 coverage = [
-    {file = "coverage-6.3.1-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:eeffd96882d8c06d31b65dddcf51db7c612547babc1c4c5db6a011abe9798525"},
-    {file = "coverage-6.3.1-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:621f6ea7260ea2ffdaec64fe5cb521669984f567b66f62f81445221d4754df4c"},
-    {file = "coverage-6.3.1-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:84f2436d6742c01136dd940ee158bfc7cf5ced3da7e4c949662b8703b5cd8145"},
-    {file = "coverage-6.3.1-cp310-cp310-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:de73fca6fb403dd72d4da517cfc49fcf791f74eee697d3219f6be29adf5af6ce"},
-    {file = "coverage-6.3.1-cp310-cp310-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:78fbb2be068a13a5d99dce9e1e7d168db880870f7bc73f876152130575bd6167"},
-    {file = "coverage-6.3.1-cp310-cp310-musllinux_1_1_aarch64.whl", hash = "sha256:f5a4551dfd09c3bd12fca8144d47fe7745275adf3229b7223c2f9e29a975ebda"},
-    {file = "coverage-6.3.1-cp310-cp310-musllinux_1_1_i686.whl", hash = "sha256:7bff3a98f63b47464480de1b5bdd80c8fade0ba2832c9381253c9b74c4153c27"},
-    {file = "coverage-6.3.1-cp310-cp310-musllinux_1_1_x86_64.whl", hash = "sha256:a06c358f4aed05fa1099c39decc8022261bb07dfadc127c08cfbd1391b09689e"},
-    {file = "coverage-6.3.1-cp310-cp310-win32.whl", hash = "sha256:9fff3ff052922cb99f9e52f63f985d4f7a54f6b94287463bc66b7cdf3eb41217"},
-    {file = "coverage-6.3.1-cp310-cp310-win_amd64.whl", hash = "sha256:276b13cc085474e482566c477c25ed66a097b44c6e77132f3304ac0b039f83eb"},
-    {file = "coverage-6.3.1-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:56c4a409381ddd7bbff134e9756077860d4e8a583d310a6f38a2315b9ce301d0"},
-    {file = "coverage-6.3.1-cp37-cp37m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:9eb494070aa060ceba6e4bbf44c1bc5fa97bfb883a0d9b0c9049415f9e944793"},
-    {file = "coverage-6.3.1-cp37-cp37m-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:5e15d424b8153756b7c903bde6d4610be0c3daca3986173c18dd5c1a1625e4cd"},
-    {file = "coverage-6.3.1-cp37-cp37m-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:61d47a897c1e91f33f177c21de897267b38fbb45f2cd8e22a710bcef1df09ac1"},
-    {file = "coverage-6.3.1-cp37-cp37m-musllinux_1_1_aarch64.whl", hash = "sha256:25e73d4c81efa8ea3785274a2f7f3bfbbeccb6fcba2a0bdd3be9223371c37554"},
-    {file = "coverage-6.3.1-cp37-cp37m-musllinux_1_1_i686.whl", hash = "sha256:fac0bcc5b7e8169bffa87f0dcc24435446d329cbc2b5486d155c2e0f3b493ae1"},
-    {file = "coverage-6.3.1-cp37-cp37m-musllinux_1_1_x86_64.whl", hash = "sha256:72128176fea72012063200b7b395ed8a57849282b207321124d7ff14e26988e8"},
-    {file = "coverage-6.3.1-cp37-cp37m-win32.whl", hash = "sha256:1bc6d709939ff262fd1432f03f080c5042dc6508b6e0d3d20e61dd045456a1a0"},
-    {file = "coverage-6.3.1-cp37-cp37m-win_amd64.whl", hash = "sha256:618eeba986cea7f621d8607ee378ecc8c2504b98b3fdc4952b30fe3578304687"},
-    {file = "coverage-6.3.1-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:d5ed164af5c9078596cfc40b078c3b337911190d3faeac830c3f1274f26b8320"},
-    {file = "coverage-6.3.1-cp38-cp38-macosx_11_0_arm64.whl", hash = "sha256:352c68e233409c31048a3725c446a9e48bbff36e39db92774d4f2380d630d8f8"},
-    {file = "coverage-6.3.1-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:448d7bde7ceb6c69e08474c2ddbc5b4cd13c9e4aa4a717467f716b5fc938a734"},
-    {file = "coverage-6.3.1-cp38-cp38-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:9fde6b90889522c220dd56a670102ceef24955d994ff7af2cb786b4ba8fe11e4"},
-    {file = "coverage-6.3.1-cp38-cp38-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:e647a0be741edbb529a72644e999acb09f2ad60465f80757da183528941ff975"},
-    {file = "coverage-6.3.1-cp38-cp38-musllinux_1_1_aarch64.whl", hash = "sha256:6a5cdc3adb4f8bb8d8f5e64c2e9e282bc12980ef055ec6da59db562ee9bdfefa"},
-    {file = "coverage-6.3.1-cp38-cp38-musllinux_1_1_i686.whl", hash = "sha256:2dd70a167843b4b4b2630c0c56f1b586fe965b4f8ac5da05b6690344fd065c6b"},
-    {file = "coverage-6.3.1-cp38-cp38-musllinux_1_1_x86_64.whl", hash = "sha256:9ad0a117b8dc2061ce9461ea4c1b4799e55edceb236522c5b8f958ce9ed8fa9a"},
-    {file = "coverage-6.3.1-cp38-cp38-win32.whl", hash = "sha256:e92c7a5f7d62edff50f60a045dc9542bf939758c95b2fcd686175dd10ce0ed10"},
-    {file = "coverage-6.3.1-cp38-cp38-win_amd64.whl", hash = "sha256:482fb42eea6164894ff82abbcf33d526362de5d1a7ed25af7ecbdddd28fc124f"},
-    {file = "coverage-6.3.1-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:c5b81fb37db76ebea79aa963b76d96ff854e7662921ce742293463635a87a78d"},
-    {file = "coverage-6.3.1-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:a4f923b9ab265136e57cc14794a15b9dcea07a9c578609cd5dbbfff28a0d15e6"},
-    {file = "coverage-6.3.1-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:56d296cbc8254a7dffdd7bcc2eb70be5a233aae7c01856d2d936f5ac4e8ac1f1"},
-    {file = "coverage-6.3.1-cp39-cp39-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:1245ab82e8554fa88c4b2ab1e098ae051faac5af829efdcf2ce6b34dccd5567c"},
-    {file = "coverage-6.3.1-cp39-cp39-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:3f2b05757c92ad96b33dbf8e8ec8d4ccb9af6ae3c9e9bd141c7cc44d20c6bcba"},
-    {file = "coverage-6.3.1-cp39-cp39-musllinux_1_1_aarch64.whl", hash = "sha256:9e3dd806f34de38d4c01416344e98eab2437ac450b3ae39c62a0ede2f8b5e4ed"},
-    {file = "coverage-6.3.1-cp39-cp39-musllinux_1_1_i686.whl", hash = "sha256:d651fde74a4d3122e5562705824507e2f5b2d3d57557f1916c4b27635f8fbe3f"},
-    {file = "coverage-6.3.1-cp39-cp39-musllinux_1_1_x86_64.whl", hash = "sha256:704f89b87c4f4737da2860695a18c852b78ec7279b24eedacab10b29067d3a38"},
-    {file = "coverage-6.3.1-cp39-cp39-win32.whl", hash = "sha256:2aed4761809640f02e44e16b8b32c1a5dee5e80ea30a0ff0912158bde9c501f2"},
-    {file = "coverage-6.3.1-cp39-cp39-win_amd64.whl", hash = "sha256:9976fb0a5709988778ac9bc44f3d50fccd989987876dfd7716dee28beed0a9fa"},
-    {file = "coverage-6.3.1-pp36.pp37.pp38-none-any.whl", hash = "sha256:463e52616ea687fd323888e86bf25e864a3cc6335a043fad6bbb037dbf49bbe2"},
-    {file = "coverage-6.3.1.tar.gz", hash = "sha256:6c3f6158b02ac403868eea390930ae64e9a9a2a5bbfafefbb920d29258d9f2f8"},
+    {file = "coverage-6.3.2-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:9b27d894748475fa858f9597c0ee1d4829f44683f3813633aaf94b19cb5453cf"},
+    {file = "coverage-6.3.2-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:37d1141ad6b2466a7b53a22e08fe76994c2d35a5b6b469590424a9953155afac"},
+    {file = "coverage-6.3.2-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:f9987b0354b06d4df0f4d3e0ec1ae76d7ce7cbca9a2f98c25041eb79eec766f1"},
+    {file = "coverage-6.3.2-cp310-cp310-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:26e2deacd414fc2f97dd9f7676ee3eaecd299ca751412d89f40bc01557a6b1b4"},
+    {file = "coverage-6.3.2-cp310-cp310-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:4dd8bafa458b5c7d061540f1ee9f18025a68e2d8471b3e858a9dad47c8d41903"},
+    {file = "coverage-6.3.2-cp310-cp310-musllinux_1_1_aarch64.whl", hash = "sha256:46191097ebc381fbf89bdce207a6c107ac4ec0890d8d20f3360345ff5976155c"},
+    {file = "coverage-6.3.2-cp310-cp310-musllinux_1_1_i686.whl", hash = "sha256:6f89d05e028d274ce4fa1a86887b071ae1755082ef94a6740238cd7a8178804f"},
+    {file = "coverage-6.3.2-cp310-cp310-musllinux_1_1_x86_64.whl", hash = "sha256:58303469e9a272b4abdb9e302a780072c0633cdcc0165db7eec0f9e32f901e05"},
+    {file = "coverage-6.3.2-cp310-cp310-win32.whl", hash = "sha256:2fea046bfb455510e05be95e879f0e768d45c10c11509e20e06d8fcaa31d9e39"},
+    {file = "coverage-6.3.2-cp310-cp310-win_amd64.whl", hash = "sha256:a2a8b8bcc399edb4347a5ca8b9b87e7524c0967b335fbb08a83c8421489ddee1"},
+    {file = "coverage-6.3.2-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:f1555ea6d6da108e1999b2463ea1003fe03f29213e459145e70edbaf3e004aaa"},
+    {file = "coverage-6.3.2-cp37-cp37m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:e5f4e1edcf57ce94e5475fe09e5afa3e3145081318e5fd1a43a6b4539a97e518"},
+    {file = "coverage-6.3.2-cp37-cp37m-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:7a15dc0a14008f1da3d1ebd44bdda3e357dbabdf5a0b5034d38fcde0b5c234b7"},
+    {file = "coverage-6.3.2-cp37-cp37m-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:21b7745788866028adeb1e0eca3bf1101109e2dc58456cb49d2d9b99a8c516e6"},
+    {file = "coverage-6.3.2-cp37-cp37m-musllinux_1_1_aarch64.whl", hash = "sha256:8ce257cac556cb03be4a248d92ed36904a59a4a5ff55a994e92214cde15c5bad"},
+    {file = "coverage-6.3.2-cp37-cp37m-musllinux_1_1_i686.whl", hash = "sha256:b0be84e5a6209858a1d3e8d1806c46214e867ce1b0fd32e4ea03f4bd8b2e3359"},
+    {file = "coverage-6.3.2-cp37-cp37m-musllinux_1_1_x86_64.whl", hash = "sha256:acf53bc2cf7282ab9b8ba346746afe703474004d9e566ad164c91a7a59f188a4"},
+    {file = "coverage-6.3.2-cp37-cp37m-win32.whl", hash = "sha256:8bdde1177f2311ee552f47ae6e5aa7750c0e3291ca6b75f71f7ffe1f1dab3dca"},
+    {file = "coverage-6.3.2-cp37-cp37m-win_amd64.whl", hash = "sha256:b31651d018b23ec463e95cf10070d0b2c548aa950a03d0b559eaa11c7e5a6fa3"},
+    {file = "coverage-6.3.2-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:07e6db90cd9686c767dcc593dff16c8c09f9814f5e9c51034066cad3373b914d"},
+    {file = "coverage-6.3.2-cp38-cp38-macosx_11_0_arm64.whl", hash = "sha256:2c6dbb42f3ad25760010c45191e9757e7dce981cbfb90e42feef301d71540059"},
+    {file = "coverage-6.3.2-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:c76aeef1b95aff3905fb2ae2d96e319caca5b76fa41d3470b19d4e4a3a313512"},
+    {file = "coverage-6.3.2-cp38-cp38-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:8cf5cfcb1521dc3255d845d9dca3ff204b3229401994ef8d1984b32746bb45ca"},
+    {file = "coverage-6.3.2-cp38-cp38-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:8fbbdc8d55990eac1b0919ca69eb5a988a802b854488c34b8f37f3e2025fa90d"},
+    {file = "coverage-6.3.2-cp38-cp38-musllinux_1_1_aarch64.whl", hash = "sha256:ec6bc7fe73a938933d4178c9b23c4e0568e43e220aef9472c4f6044bfc6dd0f0"},
+    {file = "coverage-6.3.2-cp38-cp38-musllinux_1_1_i686.whl", hash = "sha256:9baff2a45ae1f17c8078452e9e5962e518eab705e50a0aa8083733ea7d45f3a6"},
+    {file = "coverage-6.3.2-cp38-cp38-musllinux_1_1_x86_64.whl", hash = "sha256:fd9e830e9d8d89b20ab1e5af09b32d33e1a08ef4c4e14411e559556fd788e6b2"},
+    {file = "coverage-6.3.2-cp38-cp38-win32.whl", hash = "sha256:f7331dbf301b7289013175087636bbaf5b2405e57259dd2c42fdcc9fcc47325e"},
+    {file = "coverage-6.3.2-cp38-cp38-win_amd64.whl", hash = "sha256:68353fe7cdf91f109fc7d474461b46e7f1f14e533e911a2a2cbb8b0fc8613cf1"},
+    {file = "coverage-6.3.2-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:b78e5afb39941572209f71866aa0b206c12f0109835aa0d601e41552f9b3e620"},
+    {file = "coverage-6.3.2-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:4e21876082ed887baed0146fe222f861b5815455ada3b33b890f4105d806128d"},
+    {file = "coverage-6.3.2-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:34626a7eee2a3da12af0507780bb51eb52dca0e1751fd1471d0810539cefb536"},
+    {file = "coverage-6.3.2-cp39-cp39-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:1ebf730d2381158ecf3dfd4453fbca0613e16eaa547b4170e2450c9707665ce7"},
+    {file = "coverage-6.3.2-cp39-cp39-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:dd6fe30bd519694b356cbfcaca9bd5c1737cddd20778c6a581ae20dc8c04def2"},
+    {file = "coverage-6.3.2-cp39-cp39-musllinux_1_1_aarch64.whl", hash = "sha256:96f8a1cb43ca1422f36492bebe63312d396491a9165ed3b9231e778d43a7fca4"},
+    {file = "coverage-6.3.2-cp39-cp39-musllinux_1_1_i686.whl", hash = "sha256:dd035edafefee4d573140a76fdc785dc38829fe5a455c4bb12bac8c20cfc3d69"},
+    {file = "coverage-6.3.2-cp39-cp39-musllinux_1_1_x86_64.whl", hash = "sha256:5ca5aeb4344b30d0bec47481536b8ba1181d50dbe783b0e4ad03c95dc1296684"},
+    {file = "coverage-6.3.2-cp39-cp39-win32.whl", hash = "sha256:f5fa5803f47e095d7ad8443d28b01d48c0359484fec1b9d8606d0e3282084bc4"},
+    {file = "coverage-6.3.2-cp39-cp39-win_amd64.whl", hash = "sha256:9548f10d8be799551eb3a9c74bbf2b4934ddb330e08a73320123c07f95cc2d92"},
+    {file = "coverage-6.3.2-pp36.pp37.pp38-none-any.whl", hash = "sha256:18d520c6860515a771708937d2f78f63cc47ab3b80cb78e86573b0a760161faf"},
+    {file = "coverage-6.3.2.tar.gz", hash = "sha256:03e2a7826086b91ef345ff18742ee9fc47a6839ccd517061ef8fa1976e652ce9"},
 ]
 distlib = [
     {file = "distlib-0.3.3-py2.py3-none-any.whl", hash = "sha256:c8b54e8454e5bf6237cc84c20e8264c3e991e824ef27e8f1e81049867d861e31"},
diff --git a/pyproject.toml b/pyproject.toml
index c094675f..11afcfff 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -8,7 +8,7 @@ license = "MIT"
 [tool.poetry.dependencies]
 python = "^3.10"
 anytree = "^2.8.0"
-click = "^8.0.3"
+click = "^8.0.4"
 requests = "^2.27.1"
 beautifulsoup4 = "^4.10.0"
 tqdm = "^4.62.3"

From 99ea717cf44b9b5e8e42284d1b8e0096bb0fe3d5 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 1 Mar 2022 01:13:47 +0000
Subject: [PATCH 073/371] Bump actions/setup-python from 2.3.1 to 3

Bumps [actions/setup-python](https://github.com/actions/setup-python) from 2.3.1 to 3.
- [Release notes](https://github.com/actions/setup-python/releases)
- [Commits](https://github.com/actions/setup-python/compare/v2.3.1...v3)

---
updated-dependencies:
- dependency-name: actions/setup-python
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 .github/workflows/tox.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/tox.yml b/.github/workflows/tox.yml
index d64d3f00..2b43b12e 100644
--- a/.github/workflows/tox.yml
+++ b/.github/workflows/tox.yml
@@ -14,7 +14,7 @@ jobs:
     - uses: actions/checkout@v2
 
     - name: Set up Python ${{ matrix.python-version }}
-      uses: actions/setup-python@v2.3.1
+      uses: actions/setup-python@v3
       with:
         python-version: ${{ matrix.python-version }}
 

From d8328cb30b8cd81112f69bcaeca82d88d1c7ed14 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 1 Mar 2022 03:35:32 +0000
Subject: [PATCH 074/371] Bump actions/setup-python from 2.3.2 to 3

Bumps [actions/setup-python](https://github.com/actions/setup-python) from 2.3.2 to 3.
- [Release notes](https://github.com/actions/setup-python/releases)
- [Commits](https://github.com/actions/setup-python/compare/v2.3.2...v3)

---
updated-dependencies:
- dependency-name: actions/setup-python
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 .github/workflows/tox.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/tox.yml b/.github/workflows/tox.yml
index e2ae87e7..e09a3855 100644
--- a/.github/workflows/tox.yml
+++ b/.github/workflows/tox.yml
@@ -14,7 +14,7 @@ jobs:
     - uses: actions/checkout@v2
 
     - name: Set up Python ${{ matrix.python-version }}
-      uses: actions/setup-python@v2.3.2
+      uses: actions/setup-python@v3
       with:
         python-version: ${{ matrix.python-version }}
 

From 33a99e0958e554b81e316bcf1f48948eca9d2d1c Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 2 Mar 2022 01:06:51 +0000
Subject: [PATCH 075/371] Bump actions/checkout from 2 to 3

Bumps [actions/checkout](https://github.com/actions/checkout) from 2 to 3.
- [Release notes](https://github.com/actions/checkout/releases)
- [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md)
- [Commits](https://github.com/actions/checkout/compare/v2...v3)

---
updated-dependencies:
- dependency-name: actions/checkout
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 .github/workflows/tox.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/tox.yml b/.github/workflows/tox.yml
index d64d3f00..ddebf258 100644
--- a/.github/workflows/tox.yml
+++ b/.github/workflows/tox.yml
@@ -11,7 +11,7 @@ jobs:
         python-version: ['3.9', '3.10']
 
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v3
 
     - name: Set up Python ${{ matrix.python-version }}
       uses: actions/setup-python@v2.3.1

From b47c46ea241b6ea143873292e3119565a3cae0dd Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 2 Mar 2022 03:32:15 +0000
Subject: [PATCH 076/371] Bump actions/checkout from 2 to 3

Bumps [actions/checkout](https://github.com/actions/checkout) from 2 to 3.
- [Release notes](https://github.com/actions/checkout/releases)
- [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md)
- [Commits](https://github.com/actions/checkout/compare/v2...v3)

---
updated-dependencies:
- dependency-name: actions/checkout
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 .github/workflows/tox.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/tox.yml b/.github/workflows/tox.yml
index e2ae87e7..2133d15d 100644
--- a/.github/workflows/tox.yml
+++ b/.github/workflows/tox.yml
@@ -11,7 +11,7 @@ jobs:
         python-version: ['3.10']
 
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v3
 
     - name: Set up Python ${{ matrix.python-version }}
       uses: actions/setup-python@v2.3.2

From 5dff755ea3f2b863cf8290faa7437decadb26592 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 10 Mar 2022 09:56:11 +0000
Subject: [PATCH 077/371] Bump tqdm from 4.62.3 to 4.63.0

Bumps [tqdm](https://github.com/tqdm/tqdm) from 4.62.3 to 4.63.0.
- [Release notes](https://github.com/tqdm/tqdm/releases)
- [Commits](https://github.com/tqdm/tqdm/compare/v4.62.3...v4.63.0)

---
updated-dependencies:
- dependency-name: tqdm
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 poetry.lock    | 8 ++++----
 pyproject.toml | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/poetry.lock b/poetry.lock
index 2719ed8e..55879dee 100644
--- a/poetry.lock
+++ b/poetry.lock
@@ -591,7 +591,7 @@ testing = ["flaky (>=3.4.0)", "freezegun (>=0.3.11)", "pytest (>=4.0.0)", "pytes
 
 [[package]]
 name = "tqdm"
-version = "4.62.3"
+version = "4.63.0"
 description = "Fast, Extensible Progress Meter"
 category = "main"
 optional = false
@@ -640,7 +640,7 @@ testing = ["coverage (>=4)", "coverage-enable-subprocess (>=1)", "flaky (>=3)",
 [metadata]
 lock-version = "1.1"
 python-versions = "^3.10"
-content-hash = "bcd311a11494251d56d24fbded3fe6f6dfe5905e68cd18aa926f9fda008c7905"
+content-hash = "3fb8433d8c4d2ebb568eb5fc9948d81ebd61482e512c07b9074904bc1792fe15"
 
 [metadata.files]
 anytree = [
@@ -1006,8 +1006,8 @@ tox = [
     {file = "tox-3.24.5.tar.gz", hash = "sha256:67e0e32c90e278251fea45b696d0fef3879089ccbe979b0c556d35d5a70e2993"},
 ]
 tqdm = [
-    {file = "tqdm-4.62.3-py2.py3-none-any.whl", hash = "sha256:8dd278a422499cd6b727e6ae4061c40b48fce8b76d1ccbf5d34fca9b7f925b0c"},
-    {file = "tqdm-4.62.3.tar.gz", hash = "sha256:d359de7217506c9851b7869f3708d8ee53ed70a1b8edbba4dbcb47442592920d"},
+    {file = "tqdm-4.63.0-py2.py3-none-any.whl", hash = "sha256:e643e071046f17139dea55b880dc9b33822ce21613b4a4f5ea57f202833dbc29"},
+    {file = "tqdm-4.63.0.tar.gz", hash = "sha256:1d9835ede8e394bb8c9dcbffbca02d717217113adc679236873eeaac5bc0b3cd"},
 ]
 urllib3 = [
     {file = "urllib3-1.26.7-py2.py3-none-any.whl", hash = "sha256:c4fdf4019605b6e5423637e01bc9fe4daef873709a7973e195ceba0a62bbc844"},
diff --git a/pyproject.toml b/pyproject.toml
index 11afcfff..c6cd8937 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -11,7 +11,7 @@ anytree = "^2.8.0"
 click = "^8.0.4"
 requests = "^2.27.1"
 beautifulsoup4 = "^4.10.0"
-tqdm = "^4.62.3"
+tqdm = "^4.63.0"
 
 [tool.poetry.dev-dependencies]
 black = "^22.1"

From 6b72c764e1a8e96a25d07aa34d4746f96ec96542 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 14 Mar 2022 15:52:58 +0000
Subject: [PATCH 078/371] Bump tqdm from 4.62.3 to 4.63.0

Bumps [tqdm](https://github.com/tqdm/tqdm) from 4.62.3 to 4.63.0.
- [Release notes](https://github.com/tqdm/tqdm/releases)
- [Commits](https://github.com/tqdm/tqdm/compare/v4.62.3...v4.63.0)

---
updated-dependencies:
- dependency-name: tqdm
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 poetry.lock    | 8 ++++----
 pyproject.toml | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/poetry.lock b/poetry.lock
index efc06e22..419ca46f 100644
--- a/poetry.lock
+++ b/poetry.lock
@@ -662,7 +662,7 @@ testing = ["flaky (>=3.4.0)", "freezegun (>=0.3.11)", "pytest (>=4.0.0)", "pytes
 
 [[package]]
 name = "tqdm"
-version = "4.62.3"
+version = "4.63.0"
 description = "Fast, Extensible Progress Meter"
 category = "main"
 optional = false
@@ -719,7 +719,7 @@ testing = ["coverage (>=4)", "coverage-enable-subprocess (>=1)", "flaky (>=3)",
 [metadata]
 lock-version = "1.1"
 python-versions = ">=3.9,<3.11"
-content-hash = "22df48de126fcb9496bbcd11419617fb76cc063edbd17dbad77650026f5c4152"
+content-hash = "3e1f0d9ad21a5ca52a745f0745d94d8fd49f6cb31838dd328eb9d100a7c91cd8"
 
 [metadata.files]
 anytree = [
@@ -1243,8 +1243,8 @@ tox = [
     {file = "tox-3.24.5.tar.gz", hash = "sha256:67e0e32c90e278251fea45b696d0fef3879089ccbe979b0c556d35d5a70e2993"},
 ]
 tqdm = [
-    {file = "tqdm-4.62.3-py2.py3-none-any.whl", hash = "sha256:8dd278a422499cd6b727e6ae4061c40b48fce8b76d1ccbf5d34fca9b7f925b0c"},
-    {file = "tqdm-4.62.3.tar.gz", hash = "sha256:d359de7217506c9851b7869f3708d8ee53ed70a1b8edbba4dbcb47442592920d"},
+    {file = "tqdm-4.63.0-py2.py3-none-any.whl", hash = "sha256:e643e071046f17139dea55b880dc9b33822ce21613b4a4f5ea57f202833dbc29"},
+    {file = "tqdm-4.63.0.tar.gz", hash = "sha256:1d9835ede8e394bb8c9dcbffbca02d717217113adc679236873eeaac5bc0b3cd"},
 ]
 typing-extensions = [
     {file = "typing_extensions-4.0.0-py3-none-any.whl", hash = "sha256:829704698b22e13ec9eaf959122315eabb370b0884400e9818334d8b677023d9"},
diff --git a/pyproject.toml b/pyproject.toml
index 61a66985..380b55a9 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -11,7 +11,7 @@ anytree = "^2.8.0"
 click = "^8.0.4"
 matplotlib = "3.5.1"
 numpy = "^1.22.1"
-tqdm = "^4.62.3"
+tqdm = "^4.63.0"
 requests = "^2.27.1"
 beautifulsoup4 = "^4.10.0"
 

From 8c5188ad1fc5616ac2ed864f1d4e9829c8530563 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 14 Mar 2022 15:56:26 +0000
Subject: [PATCH 079/371] Bump numpy from 1.22.1 to 1.22.3

Bumps [numpy](https://github.com/numpy/numpy) from 1.22.1 to 1.22.3.
- [Release notes](https://github.com/numpy/numpy/releases)
- [Changelog](https://github.com/numpy/numpy/blob/main/doc/HOWTO_RELEASE.rst.txt)
- [Commits](https://github.com/numpy/numpy/compare/v1.22.1...v1.22.3)

---
updated-dependencies:
- dependency-name: numpy
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 poetry.lock    | 46 ++++++++++++++++++++++------------------------
 pyproject.toml |  2 +-
 2 files changed, 23 insertions(+), 25 deletions(-)

diff --git a/poetry.lock b/poetry.lock
index 419ca46f..1d714d52 100644
--- a/poetry.lock
+++ b/poetry.lock
@@ -358,7 +358,7 @@ python-versions = "*"
 
 [[package]]
 name = "numpy"
-version = "1.22.1"
+version = "1.22.3"
 description = "NumPy is the fundamental package for array computing with Python."
 category = "main"
 optional = false
@@ -719,7 +719,7 @@ testing = ["coverage (>=4)", "coverage-enable-subprocess (>=1)", "flaky (>=3)",
 [metadata]
 lock-version = "1.1"
 python-versions = ">=3.9,<3.11"
-content-hash = "3e1f0d9ad21a5ca52a745f0745d94d8fd49f6cb31838dd328eb9d100a7c91cd8"
+content-hash = "310f41c89151b95da72b2e6a777dde9f9e2cc87c650e6f4c269429788b8592bb"
 
 [metadata.files]
 anytree = [
@@ -1049,28 +1049,26 @@ nodeenv = [
     {file = "nodeenv-1.6.0.tar.gz", hash = "sha256:3ef13ff90291ba2a4a7a4ff9a979b63ffdd00a464dbe04acf0ea6471517a4c2b"},
 ]
 numpy = [
-    {file = "numpy-1.22.1-cp310-cp310-macosx_10_9_universal2.whl", hash = "sha256:3d62d6b0870b53799204515145935608cdeb4cebb95a26800b6750e48884cc5b"},
-    {file = "numpy-1.22.1-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:831f2df87bd3afdfc77829bc94bd997a7c212663889d56518359c827d7113b1f"},
-    {file = "numpy-1.22.1-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:8d1563060e77096367952fb44fca595f2b2f477156de389ce7c0ade3aef29e21"},
-    {file = "numpy-1.22.1-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:69958735d5e01f7b38226a6c6e7187d72b7e4d42b6b496aca5860b611ca0c193"},
-    {file = "numpy-1.22.1-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:45a7dfbf9ed8d68fd39763940591db7637cf8817c5bce1a44f7b56c97cbe211e"},
-    {file = "numpy-1.22.1-cp310-cp310-win_amd64.whl", hash = "sha256:7e957ca8112c689b728037cea9c9567c27cf912741fabda9efc2c7d33d29dfa1"},
-    {file = "numpy-1.22.1-cp38-cp38-macosx_10_9_universal2.whl", hash = "sha256:800dfeaffb2219d49377da1371d710d7952c9533b57f3d51b15e61c4269a1b5b"},
-    {file = "numpy-1.22.1-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:65f5e257987601fdfc63f1d02fca4d1c44a2b85b802f03bd6abc2b0b14648dd2"},
-    {file = "numpy-1.22.1-cp38-cp38-macosx_11_0_arm64.whl", hash = "sha256:632e062569b0fe05654b15ef0e91a53c0a95d08ffe698b66f6ba0f927ad267c2"},
-    {file = "numpy-1.22.1-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:0d245a2bf79188d3f361137608c3cd12ed79076badd743dc660750a9f3074f7c"},
-    {file = "numpy-1.22.1-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:26b4018a19d2ad9606ce9089f3d52206a41b23de5dfe8dc947d2ec49ce45d015"},
-    {file = "numpy-1.22.1-cp38-cp38-win32.whl", hash = "sha256:f8ad59e6e341f38266f1549c7c2ec70ea0e3d1effb62a44e5c3dba41c55f0187"},
-    {file = "numpy-1.22.1-cp38-cp38-win_amd64.whl", hash = "sha256:60f19c61b589d44fbbab8ff126640ae712e163299c2dd422bfe4edc7ec51aa9b"},
-    {file = "numpy-1.22.1-cp39-cp39-macosx_10_9_universal2.whl", hash = "sha256:2db01d9838a497ba2aa9a87515aeaf458f42351d72d4e7f3b8ddbd1eba9479f2"},
-    {file = "numpy-1.22.1-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:bcd19dab43b852b03868796f533b5f5561e6c0e3048415e675bec8d2e9d286c1"},
-    {file = "numpy-1.22.1-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:78bfbdf809fc236490e7e65715bbd98377b122f329457fffde206299e163e7f3"},
-    {file = "numpy-1.22.1-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:c51124df17f012c3b757380782ae46eee85213a3215e51477e559739f57d9bf6"},
-    {file = "numpy-1.22.1-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:88d54b7b516f0ca38a69590557814de2dd638d7d4ed04864826acaac5ebb8f01"},
-    {file = "numpy-1.22.1-cp39-cp39-win32.whl", hash = "sha256:b5ec9a5eaf391761c61fd873363ef3560a3614e9b4ead17347e4deda4358bca4"},
-    {file = "numpy-1.22.1-cp39-cp39-win_amd64.whl", hash = "sha256:4ac4d7c9f8ea2a79d721ebfcce81705fc3cd61a10b731354f1049eb8c99521e8"},
-    {file = "numpy-1.22.1-pp38-pypy38_pp73-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:e60ef82c358ded965fdd3132b5738eade055f48067ac8a5a8ac75acc00cad31f"},
-    {file = "numpy-1.22.1.zip", hash = "sha256:e348ccf5bc5235fc405ab19d53bec215bb373300e5523c7b476cc0da8a5e9973"},
+    {file = "numpy-1.22.3-cp310-cp310-macosx_10_14_x86_64.whl", hash = "sha256:92bfa69cfbdf7dfc3040978ad09a48091143cffb778ec3b03fa170c494118d75"},
+    {file = "numpy-1.22.3-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:8251ed96f38b47b4295b1ae51631de7ffa8260b5b087808ef09a39a9d66c97ab"},
+    {file = "numpy-1.22.3-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:48a3aecd3b997bf452a2dedb11f4e79bc5bfd21a1d4cc760e703c31d57c84b3e"},
+    {file = "numpy-1.22.3-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:a3bae1a2ed00e90b3ba5f7bd0a7c7999b55d609e0c54ceb2b076a25e345fa9f4"},
+    {file = "numpy-1.22.3-cp310-cp310-win32.whl", hash = "sha256:f950f8845b480cffe522913d35567e29dd381b0dc7e4ce6a4a9f9156417d2430"},
+    {file = "numpy-1.22.3-cp310-cp310-win_amd64.whl", hash = "sha256:08d9b008d0156c70dc392bb3ab3abb6e7a711383c3247b410b39962263576cd4"},
+    {file = "numpy-1.22.3-cp38-cp38-macosx_10_14_x86_64.whl", hash = "sha256:201b4d0552831f7250a08d3b38de0d989d6f6e4658b709a02a73c524ccc6ffce"},
+    {file = "numpy-1.22.3-cp38-cp38-macosx_11_0_arm64.whl", hash = "sha256:f8c1f39caad2c896bc0018f699882b345b2a63708008be29b1f355ebf6f933fe"},
+    {file = "numpy-1.22.3-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:568dfd16224abddafb1cbcce2ff14f522abe037268514dd7e42c6776a1c3f8e5"},
+    {file = "numpy-1.22.3-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:3ca688e1b9b95d80250bca34b11a05e389b1420d00e87a0d12dc45f131f704a1"},
+    {file = "numpy-1.22.3-cp38-cp38-win32.whl", hash = "sha256:e7927a589df200c5e23c57970bafbd0cd322459aa7b1ff73b7c2e84d6e3eae62"},
+    {file = "numpy-1.22.3-cp38-cp38-win_amd64.whl", hash = "sha256:07a8c89a04997625236c5ecb7afe35a02af3896c8aa01890a849913a2309c676"},
+    {file = "numpy-1.22.3-cp39-cp39-macosx_10_14_x86_64.whl", hash = "sha256:2c10a93606e0b4b95c9b04b77dc349b398fdfbda382d2a39ba5a822f669a0123"},
+    {file = "numpy-1.22.3-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:fade0d4f4d292b6f39951b6836d7a3c7ef5b2347f3c420cd9820a1d90d794802"},
+    {file = "numpy-1.22.3-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:5bfb1bb598e8229c2d5d48db1860bcf4311337864ea3efdbe1171fb0c5da515d"},
+    {file = "numpy-1.22.3-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:97098b95aa4e418529099c26558eeb8486e66bd1e53a6b606d684d0c3616b168"},
+    {file = "numpy-1.22.3-cp39-cp39-win32.whl", hash = "sha256:fdf3c08bce27132395d3c3ba1503cac12e17282358cb4bddc25cc46b0aca07aa"},
+    {file = "numpy-1.22.3-cp39-cp39-win_amd64.whl", hash = "sha256:639b54cdf6aa4f82fe37ebf70401bbb74b8508fddcf4797f9fe59615b8c5813a"},
+    {file = "numpy-1.22.3-pp38-pypy38_pp73-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:c34ea7e9d13a70bf2ab64a2532fe149a9aced424cd05a2c4ba662fd989e3e45f"},
+    {file = "numpy-1.22.3.zip", hash = "sha256:dbc7601a3b7472d559dc7b933b18b4b66f9aa7452c120e87dfb33d02008c8a18"},
 ]
 packaging = [
     {file = "packaging-21.2-py3-none-any.whl", hash = "sha256:14317396d1e8cdb122989b916fa2c7e9ca8e2be9e8060a6eff75b6b7b4d8a7e0"},
diff --git a/pyproject.toml b/pyproject.toml
index 380b55a9..5a44868f 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -10,7 +10,7 @@ python = ">=3.9,<3.11"
 anytree = "^2.8.0"
 click = "^8.0.4"
 matplotlib = "3.5.1"
-numpy = "^1.22.1"
+numpy = "^1.22.3"
 tqdm = "^4.63.0"
 requests = "^2.27.1"
 beautifulsoup4 = "^4.10.0"

From c52ac6e26423c6db2534a834c149c0ec60e7273a Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 14 Mar 2022 15:59:33 +0000
Subject: [PATCH 080/371] Bump pytest from 6.2.5 to 7.1.0

Bumps [pytest](https://github.com/pytest-dev/pytest) from 6.2.5 to 7.1.0.
- [Release notes](https://github.com/pytest-dev/pytest/releases)
- [Changelog](https://github.com/pytest-dev/pytest/blob/main/CHANGELOG.rst)
- [Commits](https://github.com/pytest-dev/pytest/compare/6.2.5...7.1.0)

---
updated-dependencies:
- dependency-name: pytest
  dependency-type: direct:development
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 poetry.lock    | 14 +++++++-------
 pyproject.toml |  2 +-
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/poetry.lock b/poetry.lock
index 1d714d52..766571cb 100644
--- a/poetry.lock
+++ b/poetry.lock
@@ -457,11 +457,11 @@ python-versions = ">=2.6, !=3.0.*, !=3.1.*, !=3.2.*"
 
 [[package]]
 name = "pytest"
-version = "6.2.5"
+version = "7.1.0"
 description = "pytest: simple powerful testing with Python"
 category = "dev"
 optional = false
-python-versions = ">=3.6"
+python-versions = ">=3.7"
 
 [package.dependencies]
 atomicwrites = {version = ">=1.0", markers = "sys_platform == \"win32\""}
@@ -471,10 +471,10 @@ iniconfig = "*"
 packaging = "*"
 pluggy = ">=0.12,<2.0"
 py = ">=1.8.2"
-toml = "*"
+tomli = ">=1.0.0"
 
 [package.extras]
-testing = ["argcomplete", "hypothesis (>=3.56)", "mock", "nose", "requests", "xmlschema"]
+testing = ["argcomplete", "hypothesis (>=3.56)", "mock", "nose", "pygments (>=2.7.2)", "requests", "xmlschema"]
 
 [[package]]
 name = "pytest-cov"
@@ -719,7 +719,7 @@ testing = ["coverage (>=4)", "coverage-enable-subprocess (>=1)", "flaky (>=3)",
 [metadata]
 lock-version = "1.1"
 python-versions = ">=3.9,<3.11"
-content-hash = "310f41c89151b95da72b2e6a777dde9f9e2cc87c650e6f4c269429788b8592bb"
+content-hash = "0f7227d75eb94d05ed4e1b67c452635be81e81b0c0add08a121d59743b4b52e7"
 
 [metadata.files]
 anytree = [
@@ -1146,8 +1146,8 @@ pyparsing = [
     {file = "pyparsing-2.4.7.tar.gz", hash = "sha256:c203ec8783bf771a155b207279b9bccb8dea02d8f0c9e5f8ead507bc3246ecc1"},
 ]
 pytest = [
-    {file = "pytest-6.2.5-py3-none-any.whl", hash = "sha256:7310f8d27bc79ced999e760ca304d69f6ba6c6649c0b60fb0e04a4a77cacc134"},
-    {file = "pytest-6.2.5.tar.gz", hash = "sha256:131b36680866a76e6781d13f101efb86cf674ebb9762eb70d3082b6f29889e89"},
+    {file = "pytest-7.1.0-py3-none-any.whl", hash = "sha256:b555252a95bbb2a37a97b5ac2eb050c436f7989993565f5e0c9128fcaacadd0e"},
+    {file = "pytest-7.1.0.tar.gz", hash = "sha256:f1089d218cfcc63a212c42896f1b7fbf096874d045e1988186861a1a87d27b47"},
 ]
 pytest-cov = [
     {file = "pytest-cov-3.0.0.tar.gz", hash = "sha256:e7f0f5b1617d2210a2cabc266dfe2f4c75a8d32fb89eafb7ad9d06f6d076d470"},
diff --git a/pyproject.toml b/pyproject.toml
index 5a44868f..d0b565b4 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -18,7 +18,7 @@ beautifulsoup4 = "^4.10.0"
 [tool.poetry.dev-dependencies]
 black = "^22.1"
 cookiecutter = "^1.7.3"
-pytest = "^6.2.5"
+pytest = "^7.1.0"
 pytest-cov = "^3.0.0"
 pytest-xdist = "^2.5.0"
 python-dotenv = "^0.19.2"

From a750edd130a303e6cc9856dbd49ec3ea1af08032 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 25 Mar 2022 01:05:38 +0000
Subject: [PATCH 081/371] Bump pascalgn/automerge-action from 0.14.3 to 0.15.2

Bumps [pascalgn/automerge-action](https://github.com/pascalgn/automerge-action) from 0.14.3 to 0.15.2.
- [Release notes](https://github.com/pascalgn/automerge-action/releases)
- [Commits](https://github.com/pascalgn/automerge-action/compare/v0.14.3...v0.15.2)

---
updated-dependencies:
- dependency-name: pascalgn/automerge-action
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 .github/workflows/automerge.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/automerge.yml b/.github/workflows/automerge.yml
index 68203f88..2b145cc4 100644
--- a/.github/workflows/automerge.yml
+++ b/.github/workflows/automerge.yml
@@ -22,7 +22,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: automerge
-        uses: "pascalgn/automerge-action@v0.14.3"
+        uses: "pascalgn/automerge-action@v0.15.2"
         env:
           GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN }}"
           MERGE_LABELS: automerge

From f43a5c4d8dc9dcd933766a076b3b4f8b61656fd0 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 25 Mar 2022 03:22:58 +0000
Subject: [PATCH 082/371] Bump pascalgn/automerge-action from 0.14.3 to 0.15.2

Bumps [pascalgn/automerge-action](https://github.com/pascalgn/automerge-action) from 0.14.3 to 0.15.2.
- [Release notes](https://github.com/pascalgn/automerge-action/releases)
- [Commits](https://github.com/pascalgn/automerge-action/compare/v0.14.3...v0.15.2)

---
updated-dependencies:
- dependency-name: pascalgn/automerge-action
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 .github/workflows/automerge.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/automerge.yml b/.github/workflows/automerge.yml
index 68203f88..2b145cc4 100644
--- a/.github/workflows/automerge.yml
+++ b/.github/workflows/automerge.yml
@@ -22,7 +22,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: automerge
-        uses: "pascalgn/automerge-action@v0.14.3"
+        uses: "pascalgn/automerge-action@v0.15.2"
         env:
           GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN }}"
           MERGE_LABELS: automerge

From ca46196f367fdb6025747201e89d242507ef8356 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 25 Mar 2022 04:32:29 +0000
Subject: [PATCH 083/371] Bump python-dotenv from 0.19.2 to 0.20.0

Bumps [python-dotenv](https://github.com/theskumar/python-dotenv) from 0.19.2 to 0.20.0.
- [Release notes](https://github.com/theskumar/python-dotenv/releases)
- [Changelog](https://github.com/theskumar/python-dotenv/blob/master/CHANGELOG.md)
- [Commits](https://github.com/theskumar/python-dotenv/compare/v0.19.2...v0.20.0)

---
updated-dependencies:
- dependency-name: python-dotenv
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 poetry.lock    | 8 ++++----
 pyproject.toml | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/poetry.lock b/poetry.lock
index 55879dee..4c28000d 100644
--- a/poetry.lock
+++ b/poetry.lock
@@ -478,7 +478,7 @@ six = ">=1.5"
 
 [[package]]
 name = "python-dotenv"
-version = "0.19.2"
+version = "0.20.0"
 description = "Read key-value pairs from a .env file and set them as environment variables"
 category = "dev"
 optional = false
@@ -640,7 +640,7 @@ testing = ["coverage (>=4)", "coverage-enable-subprocess (>=1)", "flaky (>=3)",
 [metadata]
 lock-version = "1.1"
 python-versions = "^3.10"
-content-hash = "3fb8433d8c4d2ebb568eb5fc9948d81ebd61482e512c07b9074904bc1792fe15"
+content-hash = "0e8cf5a27d8719bf5135894c07de69eb5e2306b96ed1d4af1821932e4c0b662f"
 
 [metadata.files]
 anytree = [
@@ -935,8 +935,8 @@ python-dateutil = [
     {file = "python_dateutil-2.8.2-py2.py3-none-any.whl", hash = "sha256:961d03dc3453ebbc59dbdea9e4e11c5651520a876d0f4db161e8674aae935da9"},
 ]
 python-dotenv = [
-    {file = "python-dotenv-0.19.2.tar.gz", hash = "sha256:a5de49a31e953b45ff2d2fd434bbc2670e8db5273606c1e737cc6b93eff3655f"},
-    {file = "python_dotenv-0.19.2-py2.py3-none-any.whl", hash = "sha256:32b2bdc1873fd3a3c346da1c6db83d0053c3c62f28f1f38516070c4c8971b1d3"},
+    {file = "python-dotenv-0.20.0.tar.gz", hash = "sha256:b7e3b04a59693c42c36f9ab1cc2acc46fa5df8c78e178fc33a8d4cd05c8d498f"},
+    {file = "python_dotenv-0.20.0-py3-none-any.whl", hash = "sha256:d92a187be61fe482e4fd675b6d52200e7be63a12b724abbf931a40ce4fa92938"},
 ]
 python-slugify = [
     {file = "python-slugify-5.0.2.tar.gz", hash = "sha256:f13383a0b9fcbe649a1892b9c8eb4f8eab1d6d84b84bb7a624317afa98159cab"},
diff --git a/pyproject.toml b/pyproject.toml
index c6cd8937..d10286b3 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -19,7 +19,7 @@ cookiecutter = "^1.7.3"
 pytest = "^7.0.1"
 pytest-cov = "^3.0.0"
 pytest-xdist = "^2.5.0"
-python-dotenv = "^0.19.2"
+python-dotenv = "^0.20.0"
 tox = "^3.24.5"
 pre-commit = "^2.17.0"
 isort = "^5.10.1"

From bc04babe72d02f2b64c2d2124c02c63d18dc667b Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 28 Mar 2022 09:05:06 +0000
Subject: [PATCH 084/371] Bump pytest from 7.0.1 to 7.1.1

Bumps [pytest](https://github.com/pytest-dev/pytest) from 7.0.1 to 7.1.1.
- [Release notes](https://github.com/pytest-dev/pytest/releases)
- [Changelog](https://github.com/pytest-dev/pytest/blob/main/CHANGELOG.rst)
- [Commits](https://github.com/pytest-dev/pytest/compare/7.0.1...7.1.1)

---
updated-dependencies:
- dependency-name: pytest
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 poetry.lock    | 10 +++++-----
 pyproject.toml |  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/poetry.lock b/poetry.lock
index 4c28000d..0cd5ce1a 100644
--- a/poetry.lock
+++ b/poetry.lock
@@ -401,11 +401,11 @@ diagrams = ["jinja2", "railroad-diagrams"]
 
 [[package]]
 name = "pytest"
-version = "7.0.1"
+version = "7.1.1"
 description = "pytest: simple powerful testing with Python"
 category = "dev"
 optional = false
-python-versions = ">=3.6"
+python-versions = ">=3.7"
 
 [package.dependencies]
 atomicwrites = {version = ">=1.0", markers = "sys_platform == \"win32\""}
@@ -640,7 +640,7 @@ testing = ["coverage (>=4)", "coverage-enable-subprocess (>=1)", "flaky (>=3)",
 [metadata]
 lock-version = "1.1"
 python-versions = "^3.10"
-content-hash = "0e8cf5a27d8719bf5135894c07de69eb5e2306b96ed1d4af1821932e4c0b662f"
+content-hash = "f68be567fe4a2ccd07df1a9937303ae47d83781420629df59f24ca1e60278a39"
 
 [metadata.files]
 anytree = [
@@ -915,8 +915,8 @@ pyparsing = [
     {file = "pyparsing-3.0.6.tar.gz", hash = "sha256:d9bdec0013ef1eb5a84ab39a3b3868911598afa494f5faa038647101504e2b81"},
 ]
 pytest = [
-    {file = "pytest-7.0.1-py3-none-any.whl", hash = "sha256:9ce3ff477af913ecf6321fe337b93a2c0dcf2a0a1439c43f5452112c1e4280db"},
-    {file = "pytest-7.0.1.tar.gz", hash = "sha256:e30905a0c131d3d94b89624a1cc5afec3e0ba2fbdb151867d8e0ebd49850f171"},
+    {file = "pytest-7.1.1-py3-none-any.whl", hash = "sha256:92f723789a8fdd7180b6b06483874feca4c48a5c76968e03bb3e7f806a1869ea"},
+    {file = "pytest-7.1.1.tar.gz", hash = "sha256:841132caef6b1ad17a9afde46dc4f6cfa59a05f9555aae5151f73bdf2820ca63"},
 ]
 pytest-cov = [
     {file = "pytest-cov-3.0.0.tar.gz", hash = "sha256:e7f0f5b1617d2210a2cabc266dfe2f4c75a8d32fb89eafb7ad9d06f6d076d470"},
diff --git a/pyproject.toml b/pyproject.toml
index d10286b3..d4f748b5 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -16,7 +16,7 @@ tqdm = "^4.63.0"
 [tool.poetry.dev-dependencies]
 black = "^22.1"
 cookiecutter = "^1.7.3"
-pytest = "^7.0.1"
+pytest = "^7.1.1"
 pytest-cov = "^3.0.0"
 pytest-xdist = "^2.5.0"
 python-dotenv = "^0.20.0"

From 9ff92e86b8d7fc9b92842916883224a6ca6d21f5 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 28 Mar 2022 09:07:20 +0000
Subject: [PATCH 085/371] Bump tqdm from 4.63.0 to 4.63.1

Bumps [tqdm](https://github.com/tqdm/tqdm) from 4.63.0 to 4.63.1.
- [Release notes](https://github.com/tqdm/tqdm/releases)
- [Commits](https://github.com/tqdm/tqdm/compare/v4.63.0...v4.63.1)

---
updated-dependencies:
- dependency-name: tqdm
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 poetry.lock    | 8 ++++----
 pyproject.toml | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/poetry.lock b/poetry.lock
index 0cd5ce1a..18a90c7b 100644
--- a/poetry.lock
+++ b/poetry.lock
@@ -591,7 +591,7 @@ testing = ["flaky (>=3.4.0)", "freezegun (>=0.3.11)", "pytest (>=4.0.0)", "pytes
 
 [[package]]
 name = "tqdm"
-version = "4.63.0"
+version = "4.63.1"
 description = "Fast, Extensible Progress Meter"
 category = "main"
 optional = false
@@ -640,7 +640,7 @@ testing = ["coverage (>=4)", "coverage-enable-subprocess (>=1)", "flaky (>=3)",
 [metadata]
 lock-version = "1.1"
 python-versions = "^3.10"
-content-hash = "f68be567fe4a2ccd07df1a9937303ae47d83781420629df59f24ca1e60278a39"
+content-hash = "254f8defd8831573733f1d7cef8664acbd0a0df531afe4eb4aa3131f48962de6"
 
 [metadata.files]
 anytree = [
@@ -1006,8 +1006,8 @@ tox = [
     {file = "tox-3.24.5.tar.gz", hash = "sha256:67e0e32c90e278251fea45b696d0fef3879089ccbe979b0c556d35d5a70e2993"},
 ]
 tqdm = [
-    {file = "tqdm-4.63.0-py2.py3-none-any.whl", hash = "sha256:e643e071046f17139dea55b880dc9b33822ce21613b4a4f5ea57f202833dbc29"},
-    {file = "tqdm-4.63.0.tar.gz", hash = "sha256:1d9835ede8e394bb8c9dcbffbca02d717217113adc679236873eeaac5bc0b3cd"},
+    {file = "tqdm-4.63.1-py2.py3-none-any.whl", hash = "sha256:6461b009d6792008d0000e1b0c7ca50195ec78c0e808a3a6b668a56a3236c3a5"},
+    {file = "tqdm-4.63.1.tar.gz", hash = "sha256:4230a49119a416c88cc47d0d2d32d5d90f1a282d5e497d49801950704e49863d"},
 ]
 urllib3 = [
     {file = "urllib3-1.26.7-py2.py3-none-any.whl", hash = "sha256:c4fdf4019605b6e5423637e01bc9fe4daef873709a7973e195ceba0a62bbc844"},
diff --git a/pyproject.toml b/pyproject.toml
index d4f748b5..6867c0ea 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -11,7 +11,7 @@ anytree = "^2.8.0"
 click = "^8.0.4"
 requests = "^2.27.1"
 beautifulsoup4 = "^4.10.0"
-tqdm = "^4.63.0"
+tqdm = "^4.63.1"
 
 [tool.poetry.dev-dependencies]
 black = "^22.1"

From 07a634fcee03622e4db2b901167cb41fb586f866 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 29 Mar 2022 04:29:34 +0000
Subject: [PATCH 086/371] Bump black from 22.1.0 to 22.3.0

Bumps [black](https://github.com/psf/black) from 22.1.0 to 22.3.0.
- [Release notes](https://github.com/psf/black/releases)
- [Changelog](https://github.com/psf/black/blob/main/CHANGES.md)
- [Commits](https://github.com/psf/black/compare/22.1.0...22.3.0)

---
updated-dependencies:
- dependency-name: black
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 poetry.lock    | 52 +++++++++++++++++++++++++-------------------------
 pyproject.toml |  2 +-
 2 files changed, 27 insertions(+), 27 deletions(-)

diff --git a/poetry.lock b/poetry.lock
index 18a90c7b..baba0622 100644
--- a/poetry.lock
+++ b/poetry.lock
@@ -86,7 +86,7 @@ chardet = ">=3.0.2"
 
 [[package]]
 name = "black"
-version = "22.1.0"
+version = "22.3.0"
 description = "The uncompromising code formatter."
 category = "dev"
 optional = false
@@ -97,7 +97,7 @@ click = ">=8.0.0"
 mypy-extensions = ">=0.4.3"
 pathspec = ">=0.9.0"
 platformdirs = ">=2"
-tomli = ">=1.1.0"
+tomli = {version = ">=1.1.0", markers = "python_version < \"3.11\""}
 
 [package.extras]
 colorama = ["colorama (>=0.4.3)"]
@@ -640,7 +640,7 @@ testing = ["coverage (>=4)", "coverage-enable-subprocess (>=1)", "flaky (>=3)",
 [metadata]
 lock-version = "1.1"
 python-versions = "^3.10"
-content-hash = "254f8defd8831573733f1d7cef8664acbd0a0df531afe4eb4aa3131f48962de6"
+content-hash = "782ead95ef90d5f18d250d7d6ee2ca1d93a9998293f9ecaa97dff54e9160bcb5"
 
 [metadata.files]
 anytree = [
@@ -672,29 +672,29 @@ binaryornot = [
     {file = "binaryornot-0.4.4.tar.gz", hash = "sha256:359501dfc9d40632edc9fac890e19542db1a287bbcfa58175b66658392018061"},
 ]
 black = [
-    {file = "black-22.1.0-cp310-cp310-macosx_10_9_universal2.whl", hash = "sha256:1297c63b9e1b96a3d0da2d85d11cd9bf8664251fd69ddac068b98dc4f34f73b6"},
-    {file = "black-22.1.0-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:2ff96450d3ad9ea499fc4c60e425a1439c2120cbbc1ab959ff20f7c76ec7e866"},
-    {file = "black-22.1.0-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:0e21e1f1efa65a50e3960edd068b6ae6d64ad6235bd8bfea116a03b21836af71"},
-    {file = "black-22.1.0-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:e2f69158a7d120fd641d1fa9a921d898e20d52e44a74a6fbbcc570a62a6bc8ab"},
-    {file = "black-22.1.0-cp310-cp310-win_amd64.whl", hash = "sha256:228b5ae2c8e3d6227e4bde5920d2fc66cc3400fde7bcc74f480cb07ef0b570d5"},
-    {file = "black-22.1.0-cp36-cp36m-macosx_10_9_x86_64.whl", hash = "sha256:b1a5ed73ab4c482208d20434f700d514f66ffe2840f63a6252ecc43a9bc77e8a"},
-    {file = "black-22.1.0-cp36-cp36m-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:35944b7100af4a985abfcaa860b06af15590deb1f392f06c8683b4381e8eeaf0"},
-    {file = "black-22.1.0-cp36-cp36m-win_amd64.whl", hash = "sha256:7835fee5238fc0a0baf6c9268fb816b5f5cd9b8793423a75e8cd663c48d073ba"},
-    {file = "black-22.1.0-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:dae63f2dbf82882fa3b2a3c49c32bffe144970a573cd68d247af6560fc493ae1"},
-    {file = "black-22.1.0-cp37-cp37m-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:5fa1db02410b1924b6749c245ab38d30621564e658297484952f3d8a39fce7e8"},
-    {file = "black-22.1.0-cp37-cp37m-win_amd64.whl", hash = "sha256:c8226f50b8c34a14608b848dc23a46e5d08397d009446353dad45e04af0c8e28"},
-    {file = "black-22.1.0-cp38-cp38-macosx_10_9_universal2.whl", hash = "sha256:2d6f331c02f0f40aa51a22e479c8209d37fcd520c77721c034517d44eecf5912"},
-    {file = "black-22.1.0-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:742ce9af3086e5bd07e58c8feb09dbb2b047b7f566eb5f5bc63fd455814979f3"},
-    {file = "black-22.1.0-cp38-cp38-macosx_11_0_arm64.whl", hash = "sha256:fdb8754b453fb15fad3f72cd9cad3e16776f0964d67cf30ebcbf10327a3777a3"},
-    {file = "black-22.1.0-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:f5660feab44c2e3cb24b2419b998846cbb01c23c7fe645fee45087efa3da2d61"},
-    {file = "black-22.1.0-cp38-cp38-win_amd64.whl", hash = "sha256:6f2f01381f91c1efb1451998bd65a129b3ed6f64f79663a55fe0e9b74a5f81fd"},
-    {file = "black-22.1.0-cp39-cp39-macosx_10_9_universal2.whl", hash = "sha256:efbadd9b52c060a8fc3b9658744091cb33c31f830b3f074422ed27bad2b18e8f"},
-    {file = "black-22.1.0-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:8871fcb4b447206904932b54b567923e5be802b9b19b744fdff092bd2f3118d0"},
-    {file = "black-22.1.0-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:ccad888050f5393f0d6029deea2a33e5ae371fd182a697313bdbd835d3edaf9c"},
-    {file = "black-22.1.0-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:07e5c049442d7ca1a2fc273c79d1aecbbf1bc858f62e8184abe1ad175c4f7cc2"},
-    {file = "black-22.1.0-cp39-cp39-win_amd64.whl", hash = "sha256:373922fc66676133ddc3e754e4509196a8c392fec3f5ca4486673e685a421321"},
-    {file = "black-22.1.0-py3-none-any.whl", hash = "sha256:3524739d76b6b3ed1132422bf9d82123cd1705086723bc3e235ca39fd21c667d"},
-    {file = "black-22.1.0.tar.gz", hash = "sha256:a7c0192d35635f6fc1174be575cb7915e92e5dd629ee79fdaf0dcfa41a80afb5"},
+    {file = "black-22.3.0-cp310-cp310-macosx_10_9_universal2.whl", hash = "sha256:2497f9c2386572e28921fa8bec7be3e51de6801f7459dffd6e62492531c47e09"},
+    {file = "black-22.3.0-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:5795a0375eb87bfe902e80e0c8cfaedf8af4d49694d69161e5bd3206c18618bb"},
+    {file = "black-22.3.0-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:e3556168e2e5c49629f7b0f377070240bd5511e45e25a4497bb0073d9dda776a"},
+    {file = "black-22.3.0-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:67c8301ec94e3bcc8906740fe071391bce40a862b7be0b86fb5382beefecd968"},
+    {file = "black-22.3.0-cp310-cp310-win_amd64.whl", hash = "sha256:fd57160949179ec517d32ac2ac898b5f20d68ed1a9c977346efbac9c2f1e779d"},
+    {file = "black-22.3.0-cp36-cp36m-macosx_10_9_x86_64.whl", hash = "sha256:cc1e1de68c8e5444e8f94c3670bb48a2beef0e91dddfd4fcc29595ebd90bb9ce"},
+    {file = "black-22.3.0-cp36-cp36m-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:6d2fc92002d44746d3e7db7cf9313cf4452f43e9ea77a2c939defce3b10b5c82"},
+    {file = "black-22.3.0-cp36-cp36m-win_amd64.whl", hash = "sha256:a6342964b43a99dbc72f72812bf88cad8f0217ae9acb47c0d4f141a6416d2d7b"},
+    {file = "black-22.3.0-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:328efc0cc70ccb23429d6be184a15ce613f676bdfc85e5fe8ea2a9354b4e9015"},
+    {file = "black-22.3.0-cp37-cp37m-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:06f9d8846f2340dfac80ceb20200ea5d1b3f181dd0556b47af4e8e0b24fa0a6b"},
+    {file = "black-22.3.0-cp37-cp37m-win_amd64.whl", hash = "sha256:ad4efa5fad66b903b4a5f96d91461d90b9507a812b3c5de657d544215bb7877a"},
+    {file = "black-22.3.0-cp38-cp38-macosx_10_9_universal2.whl", hash = "sha256:e8477ec6bbfe0312c128e74644ac8a02ca06bcdb8982d4ee06f209be28cdf163"},
+    {file = "black-22.3.0-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:637a4014c63fbf42a692d22b55d8ad6968a946b4a6ebc385c5505d9625b6a464"},
+    {file = "black-22.3.0-cp38-cp38-macosx_11_0_arm64.whl", hash = "sha256:863714200ada56cbc366dc9ae5291ceb936573155f8bf8e9de92aef51f3ad0f0"},
+    {file = "black-22.3.0-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:10dbe6e6d2988049b4655b2b739f98785a884d4d6b85bc35133a8fb9a2233176"},
+    {file = "black-22.3.0-cp38-cp38-win_amd64.whl", hash = "sha256:cee3e11161dde1b2a33a904b850b0899e0424cc331b7295f2a9698e79f9a69a0"},
+    {file = "black-22.3.0-cp39-cp39-macosx_10_9_universal2.whl", hash = "sha256:5891ef8abc06576985de8fa88e95ab70641de6c1fca97e2a15820a9b69e51b20"},
+    {file = "black-22.3.0-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:30d78ba6bf080eeaf0b7b875d924b15cd46fec5fd044ddfbad38c8ea9171043a"},
+    {file = "black-22.3.0-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:ee8f1f7228cce7dffc2b464f07ce769f478968bfb3dd1254a4c2eeed84928aad"},
+    {file = "black-22.3.0-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:6ee227b696ca60dd1c507be80a6bc849a5a6ab57ac7352aad1ffec9e8b805f21"},
+    {file = "black-22.3.0-cp39-cp39-win_amd64.whl", hash = "sha256:9b542ced1ec0ceeff5b37d69838106a6348e60db7b8fdd245294dc1d26136265"},
+    {file = "black-22.3.0-py3-none-any.whl", hash = "sha256:bc58025940a896d7e5356952228b68f793cf5fcb342be703c3a2669a1488cb72"},
+    {file = "black-22.3.0.tar.gz", hash = "sha256:35020b8886c022ced9282b51b5a875b6d1ab0c387b31a065b84db7c33085ca79"},
 ]
 certifi = [
     {file = "certifi-2021.10.8-py2.py3-none-any.whl", hash = "sha256:d62a0163eb4c2344ac042ab2bdf75399a71a2d8c7d47eac2e2ee91b9d6339569"},
diff --git a/pyproject.toml b/pyproject.toml
index 6867c0ea..4ba87724 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -14,7 +14,7 @@ beautifulsoup4 = "^4.10.0"
 tqdm = "^4.63.1"
 
 [tool.poetry.dev-dependencies]
-black = "^22.1"
+black = "^22.3"
 cookiecutter = "^1.7.3"
 pytest = "^7.1.1"
 pytest-cov = "^3.0.0"

From fa95d4c3884349a487cbead7c21e51826154680a Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 1 Apr 2022 04:09:35 +0000
Subject: [PATCH 087/371] Bump click from 8.0.4 to 8.1.2

Bumps [click](https://github.com/pallets/click) from 8.0.4 to 8.1.2.
- [Release notes](https://github.com/pallets/click/releases)
- [Changelog](https://github.com/pallets/click/blob/main/CHANGES.rst)
- [Commits](https://github.com/pallets/click/compare/8.0.4...8.1.2)

---
updated-dependencies:
- dependency-name: click
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 poetry.lock    | 10 +++++-----
 pyproject.toml |  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/poetry.lock b/poetry.lock
index 766571cb..7e0edc5c 100644
--- a/poetry.lock
+++ b/poetry.lock
@@ -143,11 +143,11 @@ unicode_backport = ["unicodedata2"]
 
 [[package]]
 name = "click"
-version = "8.0.4"
+version = "8.1.2"
 description = "Composable command line interface toolkit"
 category = "main"
 optional = false
-python-versions = ">=3.6"
+python-versions = ">=3.7"
 
 [package.dependencies]
 colorama = {version = "*", markers = "platform_system == \"Windows\""}
@@ -719,7 +719,7 @@ testing = ["coverage (>=4)", "coverage-enable-subprocess (>=1)", "flaky (>=3)",
 [metadata]
 lock-version = "1.1"
 python-versions = ">=3.9,<3.11"
-content-hash = "0f7227d75eb94d05ed4e1b67c452635be81e81b0c0add08a121d59743b4b52e7"
+content-hash = "518feb7e72084f5cdd3820a3ea8764d0922a20909cd7267c7ceaef09aa8a6edf"
 
 [metadata.files]
 anytree = [
@@ -792,8 +792,8 @@ charset-normalizer = [
     {file = "charset_normalizer-2.0.7-py3-none-any.whl", hash = "sha256:f7af805c321bfa1ce6714c51f254e0d5bb5e5834039bc17db7ebe3a4cec9492b"},
 ]
 click = [
-    {file = "click-8.0.4-py3-none-any.whl", hash = "sha256:6a7a62563bbfabfda3a38f3023a1db4a35978c0abd76f6c9605ecd6554d6d9b1"},
-    {file = "click-8.0.4.tar.gz", hash = "sha256:8458d7b1287c5fb128c90e23381cf99dcde74beaf6c7ff6384ce84d6fe090adb"},
+    {file = "click-8.1.2-py3-none-any.whl", hash = "sha256:24e1a4a9ec5bf6299411369b208c1df2188d9eb8d916302fe6bf03faed227f1e"},
+    {file = "click-8.1.2.tar.gz", hash = "sha256:479707fe14d9ec9a0757618b7a100a0ae4c4e236fac5b7f80ca68028141a1a72"},
 ]
 colorama = [
     {file = "colorama-0.4.4-py2.py3-none-any.whl", hash = "sha256:9f47eda37229f68eee03b24b9748937c7dc3868f906e8ba69fbcbdd3bc5dc3e2"},
diff --git a/pyproject.toml b/pyproject.toml
index d0b565b4..7a9b8043 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -8,7 +8,7 @@ license = "MIT License"
 [tool.poetry.dependencies]
 python = ">=3.9,<3.11"
 anytree = "^2.8.0"
-click = "^8.0.4"
+click = "^8.1.2"
 matplotlib = "3.5.1"
 numpy = "^1.22.3"
 tqdm = "^4.63.0"

From dbe528ececff355a3bdb6c3faf9b9dad930251e8 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 6 Apr 2022 01:05:15 +0000
Subject: [PATCH 088/371] Bump codecov/codecov-action from 2.1.0 to 3

Bumps [codecov/codecov-action](https://github.com/codecov/codecov-action) from 2.1.0 to 3.
- [Release notes](https://github.com/codecov/codecov-action/releases)
- [Changelog](https://github.com/codecov/codecov-action/blob/master/CHANGELOG.md)
- [Commits](https://github.com/codecov/codecov-action/compare/v2.1.0...v3)

---
updated-dependencies:
- dependency-name: codecov/codecov-action
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 .github/workflows/tox.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/tox.yml b/.github/workflows/tox.yml
index e03b0d4c..185a47bd 100644
--- a/.github/workflows/tox.yml
+++ b/.github/workflows/tox.yml
@@ -33,7 +33,7 @@ jobs:
       run: tox -e py
 
     - name: Upload coverage to Codecov
-      uses: codecov/codecov-action@v2.1.0
+      uses: codecov/codecov-action@v3
       with:
         file: ./coverage.xml
         fail_ci_if_error: true

From 5d035d3616edb99bb3c59a445ab7d0bb2191aadb Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 6 Apr 2022 03:21:41 +0000
Subject: [PATCH 089/371] Bump codecov/codecov-action from 2.1.0 to 3

Bumps [codecov/codecov-action](https://github.com/codecov/codecov-action) from 2.1.0 to 3.
- [Release notes](https://github.com/codecov/codecov-action/releases)
- [Changelog](https://github.com/codecov/codecov-action/blob/master/CHANGELOG.md)
- [Commits](https://github.com/codecov/codecov-action/compare/v2.1.0...v3)

---
updated-dependencies:
- dependency-name: codecov/codecov-action
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 .github/workflows/tox.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/tox.yml b/.github/workflows/tox.yml
index 07c1795b..b583c3a5 100644
--- a/.github/workflows/tox.yml
+++ b/.github/workflows/tox.yml
@@ -33,7 +33,7 @@ jobs:
       run: tox -e py
 
     - name: Upload coverage to Codecov
-      uses: codecov/codecov-action@v2.1.0
+      uses: codecov/codecov-action@v3
       with:
         file: ./coverage.xml
         fail_ci_if_error: true

From de4e03f1e7bf4338b74f0110fb451fad44aebb51 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 6 Apr 2022 04:56:26 +0000
Subject: [PATCH 090/371] Bump pre-commit from 2.17.0 to 2.18.1

Bumps [pre-commit](https://github.com/pre-commit/pre-commit) from 2.17.0 to 2.18.1.
- [Release notes](https://github.com/pre-commit/pre-commit/releases)
- [Changelog](https://github.com/pre-commit/pre-commit/blob/main/CHANGELOG.md)
- [Commits](https://github.com/pre-commit/pre-commit/compare/v2.17.0...v2.18.1)

---
updated-dependencies:
- dependency-name: pre-commit
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 poetry.lock    | 10 +++++-----
 pyproject.toml |  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/poetry.lock b/poetry.lock
index baba0622..992620c5 100644
--- a/poetry.lock
+++ b/poetry.lock
@@ -366,11 +366,11 @@ python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*"
 
 [[package]]
 name = "pre-commit"
-version = "2.17.0"
+version = "2.18.1"
 description = "A framework for managing and maintaining multi-language pre-commit hooks."
 category = "dev"
 optional = false
-python-versions = ">=3.6.1"
+python-versions = ">=3.7"
 
 [package.dependencies]
 cfgv = ">=2.0.0"
@@ -640,7 +640,7 @@ testing = ["coverage (>=4)", "coverage-enable-subprocess (>=1)", "flaky (>=3)",
 [metadata]
 lock-version = "1.1"
 python-versions = "^3.10"
-content-hash = "782ead95ef90d5f18d250d7d6ee2ca1d93a9998293f9ecaa97dff54e9160bcb5"
+content-hash = "0aa3a0011f3fa2e9c8a75d5df5eff1a36cc723f897027efb3367cc6e509196d9"
 
 [metadata.files]
 anytree = [
@@ -903,8 +903,8 @@ poyo = [
     {file = "poyo-0.5.0.tar.gz", hash = "sha256:e26956aa780c45f011ca9886f044590e2d8fd8b61db7b1c1cf4e0869f48ed4dd"},
 ]
 pre-commit = [
-    {file = "pre_commit-2.17.0-py2.py3-none-any.whl", hash = "sha256:725fa7459782d7bec5ead072810e47351de01709be838c2ce1726b9591dad616"},
-    {file = "pre_commit-2.17.0.tar.gz", hash = "sha256:c1a8040ff15ad3d648c70cc3e55b93e4d2d5b687320955505587fd79bbaed06a"},
+    {file = "pre_commit-2.18.1-py2.py3-none-any.whl", hash = "sha256:02226e69564ebca1a070bd1f046af866aa1c318dbc430027c50ab832ed2b73f2"},
+    {file = "pre_commit-2.18.1.tar.gz", hash = "sha256:5d445ee1fa8738d506881c5d84f83c62bb5be6b2838e32207433647e8e5ebe10"},
 ]
 py = [
     {file = "py-1.11.0-py2.py3-none-any.whl", hash = "sha256:607c53218732647dff4acdfcd50cb62615cedf612e72d1724fb1a0cc6405b378"},
diff --git a/pyproject.toml b/pyproject.toml
index 4ba87724..3f2227ec 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -21,7 +21,7 @@ pytest-cov = "^3.0.0"
 pytest-xdist = "^2.5.0"
 python-dotenv = "^0.20.0"
 tox = "^3.24.5"
-pre-commit = "^2.17.0"
+pre-commit = "^2.18.1"
 isort = "^5.10.1"
 
 [tool.poetry.scripts]

From 1ae7594f1b986b6ebbf1a7109050a7f357c64dba Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 6 Apr 2022 04:59:57 +0000
Subject: [PATCH 091/371] Bump tqdm from 4.63.1 to 4.64.0

Bumps [tqdm](https://github.com/tqdm/tqdm) from 4.63.1 to 4.64.0.
- [Release notes](https://github.com/tqdm/tqdm/releases)
- [Commits](https://github.com/tqdm/tqdm/compare/v4.63.1...v4.64.0)

---
updated-dependencies:
- dependency-name: tqdm
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 poetry.lock    | 9 +++++----
 pyproject.toml | 2 +-
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/poetry.lock b/poetry.lock
index 992620c5..aa7e26c4 100644
--- a/poetry.lock
+++ b/poetry.lock
@@ -591,7 +591,7 @@ testing = ["flaky (>=3.4.0)", "freezegun (>=0.3.11)", "pytest (>=4.0.0)", "pytes
 
 [[package]]
 name = "tqdm"
-version = "4.63.1"
+version = "4.64.0"
 description = "Fast, Extensible Progress Meter"
 category = "main"
 optional = false
@@ -603,6 +603,7 @@ colorama = {version = "*", markers = "platform_system == \"Windows\""}
 [package.extras]
 dev = ["py-make (>=0.1.0)", "twine", "wheel"]
 notebook = ["ipywidgets (>=6)"]
+slack = ["slack-sdk"]
 telegram = ["requests"]
 
 [[package]]
@@ -640,7 +641,7 @@ testing = ["coverage (>=4)", "coverage-enable-subprocess (>=1)", "flaky (>=3)",
 [metadata]
 lock-version = "1.1"
 python-versions = "^3.10"
-content-hash = "0aa3a0011f3fa2e9c8a75d5df5eff1a36cc723f897027efb3367cc6e509196d9"
+content-hash = "bef923884e75a823780934dc355053dcb6b5e363cc2a2cc2322551fd2be3e75c"
 
 [metadata.files]
 anytree = [
@@ -1006,8 +1007,8 @@ tox = [
     {file = "tox-3.24.5.tar.gz", hash = "sha256:67e0e32c90e278251fea45b696d0fef3879089ccbe979b0c556d35d5a70e2993"},
 ]
 tqdm = [
-    {file = "tqdm-4.63.1-py2.py3-none-any.whl", hash = "sha256:6461b009d6792008d0000e1b0c7ca50195ec78c0e808a3a6b668a56a3236c3a5"},
-    {file = "tqdm-4.63.1.tar.gz", hash = "sha256:4230a49119a416c88cc47d0d2d32d5d90f1a282d5e497d49801950704e49863d"},
+    {file = "tqdm-4.64.0-py2.py3-none-any.whl", hash = "sha256:74a2cdefe14d11442cedf3ba4e21a3b84ff9a2dbdc6cfae2c34addb2a14a5ea6"},
+    {file = "tqdm-4.64.0.tar.gz", hash = "sha256:40be55d30e200777a307a7585aee69e4eabb46b4ec6a4b4a5f2d9f11e7d5408d"},
 ]
 urllib3 = [
     {file = "urllib3-1.26.7-py2.py3-none-any.whl", hash = "sha256:c4fdf4019605b6e5423637e01bc9fe4daef873709a7973e195ceba0a62bbc844"},
diff --git a/pyproject.toml b/pyproject.toml
index 3f2227ec..1a2dbe4d 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -11,7 +11,7 @@ anytree = "^2.8.0"
 click = "^8.0.4"
 requests = "^2.27.1"
 beautifulsoup4 = "^4.10.0"
-tqdm = "^4.63.1"
+tqdm = "^4.64.0"
 
 [tool.poetry.dev-dependencies]
 black = "^22.3"

From 2ebd55b3540682493ef97cd900935095ebc4a195 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 6 Apr 2022 05:01:56 +0000
Subject: [PATCH 092/371] Bump click from 8.0.4 to 8.1.2

Bumps [click](https://github.com/pallets/click) from 8.0.4 to 8.1.2.
- [Release notes](https://github.com/pallets/click/releases)
- [Changelog](https://github.com/pallets/click/blob/main/CHANGES.rst)
- [Commits](https://github.com/pallets/click/compare/8.0.4...8.1.2)

---
updated-dependencies:
- dependency-name: click
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 poetry.lock    | 10 +++++-----
 pyproject.toml |  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/poetry.lock b/poetry.lock
index aa7e26c4..ffc4ee3e 100644
--- a/poetry.lock
+++ b/poetry.lock
@@ -142,11 +142,11 @@ unicode_backport = ["unicodedata2"]
 
 [[package]]
 name = "click"
-version = "8.0.4"
+version = "8.1.2"
 description = "Composable command line interface toolkit"
 category = "main"
 optional = false
-python-versions = ">=3.6"
+python-versions = ">=3.7"
 
 [package.dependencies]
 colorama = {version = "*", markers = "platform_system == \"Windows\""}
@@ -641,7 +641,7 @@ testing = ["coverage (>=4)", "coverage-enable-subprocess (>=1)", "flaky (>=3)",
 [metadata]
 lock-version = "1.1"
 python-versions = "^3.10"
-content-hash = "bef923884e75a823780934dc355053dcb6b5e363cc2a2cc2322551fd2be3e75c"
+content-hash = "24b31627d91ff4ae6d8ee91c0b8ec41d8e05af7daa75f84a181ead0febcad8df"
 
 [metadata.files]
 anytree = [
@@ -714,8 +714,8 @@ charset-normalizer = [
     {file = "charset_normalizer-2.0.8-py3-none-any.whl", hash = "sha256:83fcdeb225499d6344c8f7f34684c2981270beacc32ede2e669e94f7fa544405"},
 ]
 click = [
-    {file = "click-8.0.4-py3-none-any.whl", hash = "sha256:6a7a62563bbfabfda3a38f3023a1db4a35978c0abd76f6c9605ecd6554d6d9b1"},
-    {file = "click-8.0.4.tar.gz", hash = "sha256:8458d7b1287c5fb128c90e23381cf99dcde74beaf6c7ff6384ce84d6fe090adb"},
+    {file = "click-8.1.2-py3-none-any.whl", hash = "sha256:24e1a4a9ec5bf6299411369b208c1df2188d9eb8d916302fe6bf03faed227f1e"},
+    {file = "click-8.1.2.tar.gz", hash = "sha256:479707fe14d9ec9a0757618b7a100a0ae4c4e236fac5b7f80ca68028141a1a72"},
 ]
 colorama = [
     {file = "colorama-0.4.4-py2.py3-none-any.whl", hash = "sha256:9f47eda37229f68eee03b24b9748937c7dc3868f906e8ba69fbcbdd3bc5dc3e2"},
diff --git a/pyproject.toml b/pyproject.toml
index 1a2dbe4d..723ebe4a 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -8,7 +8,7 @@ license = "MIT"
 [tool.poetry.dependencies]
 python = "^3.10"
 anytree = "^2.8.0"
-click = "^8.0.4"
+click = "^8.1.2"
 requests = "^2.27.1"
 beautifulsoup4 = "^4.10.0"
 tqdm = "^4.64.0"

From 75639359f43870d34bfc0d3544c5253bf4c13f39 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 8 Apr 2022 04:23:15 +0000
Subject: [PATCH 093/371] Bump beautifulsoup4 from 4.10.0 to 4.11.0

Bumps [beautifulsoup4](https://www.crummy.com/software/BeautifulSoup/bs4/) from 4.10.0 to 4.11.0.

---
updated-dependencies:
- dependency-name: beautifulsoup4
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 poetry.lock    | 10 +++++-----
 pyproject.toml |  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/poetry.lock b/poetry.lock
index ffc4ee3e..5491e936 100644
--- a/poetry.lock
+++ b/poetry.lock
@@ -60,11 +60,11 @@ testing = ["pytest", "pytest-flake8", "pytest-cov", "pytest-black (>=0.3.7)", "p
 
 [[package]]
 name = "beautifulsoup4"
-version = "4.10.0"
+version = "4.11.0"
 description = "Screen-scraping library"
 category = "main"
 optional = false
-python-versions = ">3.0.0"
+python-versions = ">=3.6.0"
 
 [package.dependencies]
 soupsieve = ">1.2"
@@ -641,7 +641,7 @@ testing = ["coverage (>=4)", "coverage-enable-subprocess (>=1)", "flaky (>=3)",
 [metadata]
 lock-version = "1.1"
 python-versions = "^3.10"
-content-hash = "24b31627d91ff4ae6d8ee91c0b8ec41d8e05af7daa75f84a181ead0febcad8df"
+content-hash = "7011e0ed9cd6910f7c9a6ac9a4d7120feebb1cea3535d4542294960ccbe0abe9"
 
 [metadata.files]
 anytree = [
@@ -665,8 +665,8 @@ attrs = [
     {file = "backports.entry_points_selectable-1.1.1.tar.gz", hash = "sha256:914b21a479fde881635f7af5adc7f6e38d6b274be32269070c53b698c60d5386"},
 ]
 beautifulsoup4 = [
-    {file = "beautifulsoup4-4.10.0-py3-none-any.whl", hash = "sha256:9a315ce70049920ea4572a4055bc4bd700c940521d36fc858205ad4fcde149bf"},
-    {file = "beautifulsoup4-4.10.0.tar.gz", hash = "sha256:c23ad23c521d818955a4151a67d81580319d4bf548d3d49f4223ae041ff98891"},
+    {file = "beautifulsoup4-4.11.0-py3-none-any.whl", hash = "sha256:577b9e1c36d2ada780d807c5622e889d43172466658c2eb239e97296965cdddb"},
+    {file = "beautifulsoup4-4.11.0.tar.gz", hash = "sha256:ac98f868e1cb8eb9932a61be75b4f7018a118a490e7fdb424a74a982430cfcbd"},
 ]
 binaryornot = [
     {file = "binaryornot-0.4.4-py2.py3-none-any.whl", hash = "sha256:b8b71173c917bddcd2c16070412e369c3ed7f0528926f70cac18a6c97fd563e4"},
diff --git a/pyproject.toml b/pyproject.toml
index 723ebe4a..efc92f6b 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -10,7 +10,7 @@ python = "^3.10"
 anytree = "^2.8.0"
 click = "^8.1.2"
 requests = "^2.27.1"
-beautifulsoup4 = "^4.10.0"
+beautifulsoup4 = "^4.11.0"
 tqdm = "^4.64.0"
 
 [tool.poetry.dev-dependencies]

From 871276d8e31a4edf2cc6bbfd3ef2e593f990c794 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sat, 9 Apr 2022 18:32:05 +0000
Subject: [PATCH 094/371] Bump pre-commit from 2.17.0 to 2.18.1

Bumps [pre-commit](https://github.com/pre-commit/pre-commit) from 2.17.0 to 2.18.1.
- [Release notes](https://github.com/pre-commit/pre-commit/releases)
- [Changelog](https://github.com/pre-commit/pre-commit/blob/main/CHANGELOG.md)
- [Commits](https://github.com/pre-commit/pre-commit/compare/v2.17.0...v2.18.1)

---
updated-dependencies:
- dependency-name: pre-commit
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 poetry.lock    | 10 +++++-----
 pyproject.toml |  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/poetry.lock b/poetry.lock
index 7e0edc5c..4498c2cc 100644
--- a/poetry.lock
+++ b/poetry.lock
@@ -425,11 +425,11 @@ python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*"
 
 [[package]]
 name = "pre-commit"
-version = "2.17.0"
+version = "2.18.1"
 description = "A framework for managing and maintaining multi-language pre-commit hooks."
 category = "dev"
 optional = false
-python-versions = ">=3.6.1"
+python-versions = ">=3.7"
 
 [package.dependencies]
 cfgv = ">=2.0.0"
@@ -719,7 +719,7 @@ testing = ["coverage (>=4)", "coverage-enable-subprocess (>=1)", "flaky (>=3)",
 [metadata]
 lock-version = "1.1"
 python-versions = ">=3.9,<3.11"
-content-hash = "518feb7e72084f5cdd3820a3ea8764d0922a20909cd7267c7ceaef09aa8a6edf"
+content-hash = "f36228374dab392fad85ee4385b535a2ec9d0fb2964a5176dbfe027a270d5961"
 
 [metadata.files]
 anytree = [
@@ -1134,8 +1134,8 @@ poyo = [
     {file = "poyo-0.5.0.tar.gz", hash = "sha256:e26956aa780c45f011ca9886f044590e2d8fd8b61db7b1c1cf4e0869f48ed4dd"},
 ]
 pre-commit = [
-    {file = "pre_commit-2.17.0-py2.py3-none-any.whl", hash = "sha256:725fa7459782d7bec5ead072810e47351de01709be838c2ce1726b9591dad616"},
-    {file = "pre_commit-2.17.0.tar.gz", hash = "sha256:c1a8040ff15ad3d648c70cc3e55b93e4d2d5b687320955505587fd79bbaed06a"},
+    {file = "pre_commit-2.18.1-py2.py3-none-any.whl", hash = "sha256:02226e69564ebca1a070bd1f046af866aa1c318dbc430027c50ab832ed2b73f2"},
+    {file = "pre_commit-2.18.1.tar.gz", hash = "sha256:5d445ee1fa8738d506881c5d84f83c62bb5be6b2838e32207433647e8e5ebe10"},
 ]
 py = [
     {file = "py-1.11.0-py2.py3-none-any.whl", hash = "sha256:607c53218732647dff4acdfcd50cb62615cedf612e72d1724fb1a0cc6405b378"},
diff --git a/pyproject.toml b/pyproject.toml
index 7a9b8043..0a18016e 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -23,7 +23,7 @@ pytest-cov = "^3.0.0"
 pytest-xdist = "^2.5.0"
 python-dotenv = "^0.19.2"
 tox = "^3.24.5"
-pre-commit = "^2.17.0"
+pre-commit = "^2.18.1"
 
 [tool.poetry.scripts]
 adventofcode = "adventofcode2020.main:main"

From 863fa9e572712bd9c22ba1f923569581c3d182a8 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sat, 9 Apr 2022 18:36:41 +0000
Subject: [PATCH 095/371] Bump pytest from 7.1.0 to 7.1.1

Bumps [pytest](https://github.com/pytest-dev/pytest) from 7.1.0 to 7.1.1.
- [Release notes](https://github.com/pytest-dev/pytest/releases)
- [Changelog](https://github.com/pytest-dev/pytest/blob/main/CHANGELOG.rst)
- [Commits](https://github.com/pytest-dev/pytest/compare/7.1.0...7.1.1)

---
updated-dependencies:
- dependency-name: pytest
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 poetry.lock    | 8 ++++----
 pyproject.toml | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/poetry.lock b/poetry.lock
index 4498c2cc..dab882b7 100644
--- a/poetry.lock
+++ b/poetry.lock
@@ -457,7 +457,7 @@ python-versions = ">=2.6, !=3.0.*, !=3.1.*, !=3.2.*"
 
 [[package]]
 name = "pytest"
-version = "7.1.0"
+version = "7.1.1"
 description = "pytest: simple powerful testing with Python"
 category = "dev"
 optional = false
@@ -719,7 +719,7 @@ testing = ["coverage (>=4)", "coverage-enable-subprocess (>=1)", "flaky (>=3)",
 [metadata]
 lock-version = "1.1"
 python-versions = ">=3.9,<3.11"
-content-hash = "f36228374dab392fad85ee4385b535a2ec9d0fb2964a5176dbfe027a270d5961"
+content-hash = "a4fc19017a1492f0da94664b7ed5fb08ef0c76b89c796ee8d9074eb731395143"
 
 [metadata.files]
 anytree = [
@@ -1146,8 +1146,8 @@ pyparsing = [
     {file = "pyparsing-2.4.7.tar.gz", hash = "sha256:c203ec8783bf771a155b207279b9bccb8dea02d8f0c9e5f8ead507bc3246ecc1"},
 ]
 pytest = [
-    {file = "pytest-7.1.0-py3-none-any.whl", hash = "sha256:b555252a95bbb2a37a97b5ac2eb050c436f7989993565f5e0c9128fcaacadd0e"},
-    {file = "pytest-7.1.0.tar.gz", hash = "sha256:f1089d218cfcc63a212c42896f1b7fbf096874d045e1988186861a1a87d27b47"},
+    {file = "pytest-7.1.1-py3-none-any.whl", hash = "sha256:92f723789a8fdd7180b6b06483874feca4c48a5c76968e03bb3e7f806a1869ea"},
+    {file = "pytest-7.1.1.tar.gz", hash = "sha256:841132caef6b1ad17a9afde46dc4f6cfa59a05f9555aae5151f73bdf2820ca63"},
 ]
 pytest-cov = [
     {file = "pytest-cov-3.0.0.tar.gz", hash = "sha256:e7f0f5b1617d2210a2cabc266dfe2f4c75a8d32fb89eafb7ad9d06f6d076d470"},
diff --git a/pyproject.toml b/pyproject.toml
index 0a18016e..dca9822f 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -18,7 +18,7 @@ beautifulsoup4 = "^4.10.0"
 [tool.poetry.dev-dependencies]
 black = "^22.1"
 cookiecutter = "^1.7.3"
-pytest = "^7.1.0"
+pytest = "^7.1.1"
 pytest-cov = "^3.0.0"
 pytest-xdist = "^2.5.0"
 python-dotenv = "^0.19.2"

From 332a610783b9251ae8165e8ccdf047c92f255272 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sat, 9 Apr 2022 18:53:53 +0000
Subject: [PATCH 096/371] Bump python-dotenv from 0.19.2 to 0.20.0

Bumps [python-dotenv](https://github.com/theskumar/python-dotenv) from 0.19.2 to 0.20.0.
- [Release notes](https://github.com/theskumar/python-dotenv/releases)
- [Changelog](https://github.com/theskumar/python-dotenv/blob/master/CHANGELOG.md)
- [Commits](https://github.com/theskumar/python-dotenv/compare/v0.19.2...v0.20.0)

---
updated-dependencies:
- dependency-name: python-dotenv
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 poetry.lock    | 8 ++++----
 pyproject.toml | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/poetry.lock b/poetry.lock
index dab882b7..73fe9d06 100644
--- a/poetry.lock
+++ b/poetry.lock
@@ -534,7 +534,7 @@ six = ">=1.5"
 
 [[package]]
 name = "python-dotenv"
-version = "0.19.2"
+version = "0.20.0"
 description = "Read key-value pairs from a .env file and set them as environment variables"
 category = "dev"
 optional = false
@@ -719,7 +719,7 @@ testing = ["coverage (>=4)", "coverage-enable-subprocess (>=1)", "flaky (>=3)",
 [metadata]
 lock-version = "1.1"
 python-versions = ">=3.9,<3.11"
-content-hash = "a4fc19017a1492f0da94664b7ed5fb08ef0c76b89c796ee8d9074eb731395143"
+content-hash = "7f10e98e9517d3eba606011c0c41be9f6782490c9cacbcceeb9376d3d86aba68"
 
 [metadata.files]
 anytree = [
@@ -1166,8 +1166,8 @@ python-dateutil = [
     {file = "python_dateutil-2.8.2-py2.py3-none-any.whl", hash = "sha256:961d03dc3453ebbc59dbdea9e4e11c5651520a876d0f4db161e8674aae935da9"},
 ]
 python-dotenv = [
-    {file = "python-dotenv-0.19.2.tar.gz", hash = "sha256:a5de49a31e953b45ff2d2fd434bbc2670e8db5273606c1e737cc6b93eff3655f"},
-    {file = "python_dotenv-0.19.2-py2.py3-none-any.whl", hash = "sha256:32b2bdc1873fd3a3c346da1c6db83d0053c3c62f28f1f38516070c4c8971b1d3"},
+    {file = "python-dotenv-0.20.0.tar.gz", hash = "sha256:b7e3b04a59693c42c36f9ab1cc2acc46fa5df8c78e178fc33a8d4cd05c8d498f"},
+    {file = "python_dotenv-0.20.0-py3-none-any.whl", hash = "sha256:d92a187be61fe482e4fd675b6d52200e7be63a12b724abbf931a40ce4fa92938"},
 ]
 python-slugify = [
     {file = "python-slugify-5.0.2.tar.gz", hash = "sha256:f13383a0b9fcbe649a1892b9c8eb4f8eab1d6d84b84bb7a624317afa98159cab"},
diff --git a/pyproject.toml b/pyproject.toml
index dca9822f..4991d1dd 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -21,7 +21,7 @@ cookiecutter = "^1.7.3"
 pytest = "^7.1.1"
 pytest-cov = "^3.0.0"
 pytest-xdist = "^2.5.0"
-python-dotenv = "^0.19.2"
+python-dotenv = "^0.20.0"
 tox = "^3.24.5"
 pre-commit = "^2.18.1"
 

From 1942f0dd102620e54a83be01cd3657beeeee253a Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sun, 10 Apr 2022 08:59:56 +0000
Subject: [PATCH 097/371] Bump black from 22.1.0 to 22.3.0

Bumps [black](https://github.com/psf/black) from 22.1.0 to 22.3.0.
- [Release notes](https://github.com/psf/black/releases)
- [Changelog](https://github.com/psf/black/blob/main/CHANGES.md)
- [Commits](https://github.com/psf/black/compare/22.1.0...22.3.0)

---
updated-dependencies:
- dependency-name: black
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 poetry.lock    | 52 +++++++++++++++++++++++++-------------------------
 pyproject.toml |  2 +-
 2 files changed, 27 insertions(+), 27 deletions(-)

diff --git a/poetry.lock b/poetry.lock
index 73fe9d06..2dcdd690 100644
--- a/poetry.lock
+++ b/poetry.lock
@@ -86,7 +86,7 @@ chardet = ">=3.0.2"
 
 [[package]]
 name = "black"
-version = "22.1.0"
+version = "22.3.0"
 description = "The uncompromising code formatter."
 category = "dev"
 optional = false
@@ -97,7 +97,7 @@ click = ">=8.0.0"
 mypy-extensions = ">=0.4.3"
 pathspec = ">=0.9.0"
 platformdirs = ">=2"
-tomli = ">=1.1.0"
+tomli = {version = ">=1.1.0", markers = "python_version < \"3.11\""}
 typing-extensions = {version = ">=3.10.0.0", markers = "python_version < \"3.10\""}
 
 [package.extras]
@@ -719,7 +719,7 @@ testing = ["coverage (>=4)", "coverage-enable-subprocess (>=1)", "flaky (>=3)",
 [metadata]
 lock-version = "1.1"
 python-versions = ">=3.9,<3.11"
-content-hash = "7f10e98e9517d3eba606011c0c41be9f6782490c9cacbcceeb9376d3d86aba68"
+content-hash = "32b0c6f0612cf2f2104283479dc919fc608acafba1386417042508f7a8917159"
 
 [metadata.files]
 anytree = [
@@ -751,29 +751,29 @@ binaryornot = [
     {file = "binaryornot-0.4.4.tar.gz", hash = "sha256:359501dfc9d40632edc9fac890e19542db1a287bbcfa58175b66658392018061"},
 ]
 black = [
-    {file = "black-22.1.0-cp310-cp310-macosx_10_9_universal2.whl", hash = "sha256:1297c63b9e1b96a3d0da2d85d11cd9bf8664251fd69ddac068b98dc4f34f73b6"},
-    {file = "black-22.1.0-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:2ff96450d3ad9ea499fc4c60e425a1439c2120cbbc1ab959ff20f7c76ec7e866"},
-    {file = "black-22.1.0-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:0e21e1f1efa65a50e3960edd068b6ae6d64ad6235bd8bfea116a03b21836af71"},
-    {file = "black-22.1.0-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:e2f69158a7d120fd641d1fa9a921d898e20d52e44a74a6fbbcc570a62a6bc8ab"},
-    {file = "black-22.1.0-cp310-cp310-win_amd64.whl", hash = "sha256:228b5ae2c8e3d6227e4bde5920d2fc66cc3400fde7bcc74f480cb07ef0b570d5"},
-    {file = "black-22.1.0-cp36-cp36m-macosx_10_9_x86_64.whl", hash = "sha256:b1a5ed73ab4c482208d20434f700d514f66ffe2840f63a6252ecc43a9bc77e8a"},
-    {file = "black-22.1.0-cp36-cp36m-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:35944b7100af4a985abfcaa860b06af15590deb1f392f06c8683b4381e8eeaf0"},
-    {file = "black-22.1.0-cp36-cp36m-win_amd64.whl", hash = "sha256:7835fee5238fc0a0baf6c9268fb816b5f5cd9b8793423a75e8cd663c48d073ba"},
-    {file = "black-22.1.0-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:dae63f2dbf82882fa3b2a3c49c32bffe144970a573cd68d247af6560fc493ae1"},
-    {file = "black-22.1.0-cp37-cp37m-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:5fa1db02410b1924b6749c245ab38d30621564e658297484952f3d8a39fce7e8"},
-    {file = "black-22.1.0-cp37-cp37m-win_amd64.whl", hash = "sha256:c8226f50b8c34a14608b848dc23a46e5d08397d009446353dad45e04af0c8e28"},
-    {file = "black-22.1.0-cp38-cp38-macosx_10_9_universal2.whl", hash = "sha256:2d6f331c02f0f40aa51a22e479c8209d37fcd520c77721c034517d44eecf5912"},
-    {file = "black-22.1.0-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:742ce9af3086e5bd07e58c8feb09dbb2b047b7f566eb5f5bc63fd455814979f3"},
-    {file = "black-22.1.0-cp38-cp38-macosx_11_0_arm64.whl", hash = "sha256:fdb8754b453fb15fad3f72cd9cad3e16776f0964d67cf30ebcbf10327a3777a3"},
-    {file = "black-22.1.0-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:f5660feab44c2e3cb24b2419b998846cbb01c23c7fe645fee45087efa3da2d61"},
-    {file = "black-22.1.0-cp38-cp38-win_amd64.whl", hash = "sha256:6f2f01381f91c1efb1451998bd65a129b3ed6f64f79663a55fe0e9b74a5f81fd"},
-    {file = "black-22.1.0-cp39-cp39-macosx_10_9_universal2.whl", hash = "sha256:efbadd9b52c060a8fc3b9658744091cb33c31f830b3f074422ed27bad2b18e8f"},
-    {file = "black-22.1.0-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:8871fcb4b447206904932b54b567923e5be802b9b19b744fdff092bd2f3118d0"},
-    {file = "black-22.1.0-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:ccad888050f5393f0d6029deea2a33e5ae371fd182a697313bdbd835d3edaf9c"},
-    {file = "black-22.1.0-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:07e5c049442d7ca1a2fc273c79d1aecbbf1bc858f62e8184abe1ad175c4f7cc2"},
-    {file = "black-22.1.0-cp39-cp39-win_amd64.whl", hash = "sha256:373922fc66676133ddc3e754e4509196a8c392fec3f5ca4486673e685a421321"},
-    {file = "black-22.1.0-py3-none-any.whl", hash = "sha256:3524739d76b6b3ed1132422bf9d82123cd1705086723bc3e235ca39fd21c667d"},
-    {file = "black-22.1.0.tar.gz", hash = "sha256:a7c0192d35635f6fc1174be575cb7915e92e5dd629ee79fdaf0dcfa41a80afb5"},
+    {file = "black-22.3.0-cp310-cp310-macosx_10_9_universal2.whl", hash = "sha256:2497f9c2386572e28921fa8bec7be3e51de6801f7459dffd6e62492531c47e09"},
+    {file = "black-22.3.0-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:5795a0375eb87bfe902e80e0c8cfaedf8af4d49694d69161e5bd3206c18618bb"},
+    {file = "black-22.3.0-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:e3556168e2e5c49629f7b0f377070240bd5511e45e25a4497bb0073d9dda776a"},
+    {file = "black-22.3.0-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:67c8301ec94e3bcc8906740fe071391bce40a862b7be0b86fb5382beefecd968"},
+    {file = "black-22.3.0-cp310-cp310-win_amd64.whl", hash = "sha256:fd57160949179ec517d32ac2ac898b5f20d68ed1a9c977346efbac9c2f1e779d"},
+    {file = "black-22.3.0-cp36-cp36m-macosx_10_9_x86_64.whl", hash = "sha256:cc1e1de68c8e5444e8f94c3670bb48a2beef0e91dddfd4fcc29595ebd90bb9ce"},
+    {file = "black-22.3.0-cp36-cp36m-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:6d2fc92002d44746d3e7db7cf9313cf4452f43e9ea77a2c939defce3b10b5c82"},
+    {file = "black-22.3.0-cp36-cp36m-win_amd64.whl", hash = "sha256:a6342964b43a99dbc72f72812bf88cad8f0217ae9acb47c0d4f141a6416d2d7b"},
+    {file = "black-22.3.0-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:328efc0cc70ccb23429d6be184a15ce613f676bdfc85e5fe8ea2a9354b4e9015"},
+    {file = "black-22.3.0-cp37-cp37m-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:06f9d8846f2340dfac80ceb20200ea5d1b3f181dd0556b47af4e8e0b24fa0a6b"},
+    {file = "black-22.3.0-cp37-cp37m-win_amd64.whl", hash = "sha256:ad4efa5fad66b903b4a5f96d91461d90b9507a812b3c5de657d544215bb7877a"},
+    {file = "black-22.3.0-cp38-cp38-macosx_10_9_universal2.whl", hash = "sha256:e8477ec6bbfe0312c128e74644ac8a02ca06bcdb8982d4ee06f209be28cdf163"},
+    {file = "black-22.3.0-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:637a4014c63fbf42a692d22b55d8ad6968a946b4a6ebc385c5505d9625b6a464"},
+    {file = "black-22.3.0-cp38-cp38-macosx_11_0_arm64.whl", hash = "sha256:863714200ada56cbc366dc9ae5291ceb936573155f8bf8e9de92aef51f3ad0f0"},
+    {file = "black-22.3.0-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:10dbe6e6d2988049b4655b2b739f98785a884d4d6b85bc35133a8fb9a2233176"},
+    {file = "black-22.3.0-cp38-cp38-win_amd64.whl", hash = "sha256:cee3e11161dde1b2a33a904b850b0899e0424cc331b7295f2a9698e79f9a69a0"},
+    {file = "black-22.3.0-cp39-cp39-macosx_10_9_universal2.whl", hash = "sha256:5891ef8abc06576985de8fa88e95ab70641de6c1fca97e2a15820a9b69e51b20"},
+    {file = "black-22.3.0-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:30d78ba6bf080eeaf0b7b875d924b15cd46fec5fd044ddfbad38c8ea9171043a"},
+    {file = "black-22.3.0-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:ee8f1f7228cce7dffc2b464f07ce769f478968bfb3dd1254a4c2eeed84928aad"},
+    {file = "black-22.3.0-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:6ee227b696ca60dd1c507be80a6bc849a5a6ab57ac7352aad1ffec9e8b805f21"},
+    {file = "black-22.3.0-cp39-cp39-win_amd64.whl", hash = "sha256:9b542ced1ec0ceeff5b37d69838106a6348e60db7b8fdd245294dc1d26136265"},
+    {file = "black-22.3.0-py3-none-any.whl", hash = "sha256:bc58025940a896d7e5356952228b68f793cf5fcb342be703c3a2669a1488cb72"},
+    {file = "black-22.3.0.tar.gz", hash = "sha256:35020b8886c022ced9282b51b5a875b6d1ab0c387b31a065b84db7c33085ca79"},
 ]
 certifi = [
     {file = "certifi-2021.10.8-py2.py3-none-any.whl", hash = "sha256:d62a0163eb4c2344ac042ab2bdf75399a71a2d8c7d47eac2e2ee91b9d6339569"},
diff --git a/pyproject.toml b/pyproject.toml
index 4991d1dd..18b2ee67 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -16,7 +16,7 @@ requests = "^2.27.1"
 beautifulsoup4 = "^4.10.0"
 
 [tool.poetry.dev-dependencies]
-black = "^22.1"
+black = "^22.3"
 cookiecutter = "^1.7.3"
 pytest = "^7.1.1"
 pytest-cov = "^3.0.0"

From ba780a7067db81199d7d06a00a4fe6f945680685 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sun, 10 Apr 2022 09:03:15 +0000
Subject: [PATCH 098/371] Bump tqdm from 4.63.0 to 4.64.0

Bumps [tqdm](https://github.com/tqdm/tqdm) from 4.63.0 to 4.64.0.
- [Release notes](https://github.com/tqdm/tqdm/releases)
- [Commits](https://github.com/tqdm/tqdm/compare/v4.63.0...v4.64.0)

---
updated-dependencies:
- dependency-name: tqdm
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 poetry.lock    | 9 +++++----
 pyproject.toml | 2 +-
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/poetry.lock b/poetry.lock
index 2dcdd690..4b9c21c9 100644
--- a/poetry.lock
+++ b/poetry.lock
@@ -662,7 +662,7 @@ testing = ["flaky (>=3.4.0)", "freezegun (>=0.3.11)", "pytest (>=4.0.0)", "pytes
 
 [[package]]
 name = "tqdm"
-version = "4.63.0"
+version = "4.64.0"
 description = "Fast, Extensible Progress Meter"
 category = "main"
 optional = false
@@ -674,6 +674,7 @@ colorama = {version = "*", markers = "platform_system == \"Windows\""}
 [package.extras]
 dev = ["py-make (>=0.1.0)", "twine", "wheel"]
 notebook = ["ipywidgets (>=6)"]
+slack = ["slack-sdk"]
 telegram = ["requests"]
 
 [[package]]
@@ -719,7 +720,7 @@ testing = ["coverage (>=4)", "coverage-enable-subprocess (>=1)", "flaky (>=3)",
 [metadata]
 lock-version = "1.1"
 python-versions = ">=3.9,<3.11"
-content-hash = "32b0c6f0612cf2f2104283479dc919fc608acafba1386417042508f7a8917159"
+content-hash = "8be41ac85688101859b8fb11774266d52097189c61688862cca6ad1435ab1bf6"
 
 [metadata.files]
 anytree = [
@@ -1241,8 +1242,8 @@ tox = [
     {file = "tox-3.24.5.tar.gz", hash = "sha256:67e0e32c90e278251fea45b696d0fef3879089ccbe979b0c556d35d5a70e2993"},
 ]
 tqdm = [
-    {file = "tqdm-4.63.0-py2.py3-none-any.whl", hash = "sha256:e643e071046f17139dea55b880dc9b33822ce21613b4a4f5ea57f202833dbc29"},
-    {file = "tqdm-4.63.0.tar.gz", hash = "sha256:1d9835ede8e394bb8c9dcbffbca02d717217113adc679236873eeaac5bc0b3cd"},
+    {file = "tqdm-4.64.0-py2.py3-none-any.whl", hash = "sha256:74a2cdefe14d11442cedf3ba4e21a3b84ff9a2dbdc6cfae2c34addb2a14a5ea6"},
+    {file = "tqdm-4.64.0.tar.gz", hash = "sha256:40be55d30e200777a307a7585aee69e4eabb46b4ec6a4b4a5f2d9f11e7d5408d"},
 ]
 typing-extensions = [
     {file = "typing_extensions-4.0.0-py3-none-any.whl", hash = "sha256:829704698b22e13ec9eaf959122315eabb370b0884400e9818334d8b677023d9"},
diff --git a/pyproject.toml b/pyproject.toml
index 18b2ee67..20d16b37 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -11,7 +11,7 @@ anytree = "^2.8.0"
 click = "^8.1.2"
 matplotlib = "3.5.1"
 numpy = "^1.22.3"
-tqdm = "^4.63.0"
+tqdm = "^4.64.0"
 requests = "^2.27.1"
 beautifulsoup4 = "^4.10.0"
 

From b596f8a78149ca131bb76cd9a62afa016d43e589 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sun, 10 Apr 2022 09:07:29 +0000
Subject: [PATCH 099/371] Bump beautifulsoup4 from 4.10.0 to 4.11.1

Bumps [beautifulsoup4](https://www.crummy.com/software/BeautifulSoup/bs4/) from 4.10.0 to 4.11.1.

---
updated-dependencies:
- dependency-name: beautifulsoup4
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 poetry.lock    | 10 +++++-----
 pyproject.toml |  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/poetry.lock b/poetry.lock
index 4b9c21c9..a26b4411 100644
--- a/poetry.lock
+++ b/poetry.lock
@@ -60,11 +60,11 @@ testing = ["pytest", "pytest-flake8", "pytest-cov", "pytest-black (>=0.3.7)", "p
 
 [[package]]
 name = "beautifulsoup4"
-version = "4.10.0"
+version = "4.11.1"
 description = "Screen-scraping library"
 category = "main"
 optional = false
-python-versions = ">3.0.0"
+python-versions = ">=3.6.0"
 
 [package.dependencies]
 soupsieve = ">1.2"
@@ -720,7 +720,7 @@ testing = ["coverage (>=4)", "coverage-enable-subprocess (>=1)", "flaky (>=3)",
 [metadata]
 lock-version = "1.1"
 python-versions = ">=3.9,<3.11"
-content-hash = "8be41ac85688101859b8fb11774266d52097189c61688862cca6ad1435ab1bf6"
+content-hash = "26ac5cc8ac395502d1d722623a6ac095e202ede647d97d9f5b011f293c2b0729"
 
 [metadata.files]
 anytree = [
@@ -744,8 +744,8 @@ attrs = [
     {file = "backports.entry_points_selectable-1.1.1.tar.gz", hash = "sha256:914b21a479fde881635f7af5adc7f6e38d6b274be32269070c53b698c60d5386"},
 ]
 beautifulsoup4 = [
-    {file = "beautifulsoup4-4.10.0-py3-none-any.whl", hash = "sha256:9a315ce70049920ea4572a4055bc4bd700c940521d36fc858205ad4fcde149bf"},
-    {file = "beautifulsoup4-4.10.0.tar.gz", hash = "sha256:c23ad23c521d818955a4151a67d81580319d4bf548d3d49f4223ae041ff98891"},
+    {file = "beautifulsoup4-4.11.1-py3-none-any.whl", hash = "sha256:58d5c3d29f5a36ffeb94f02f0d786cd53014cf9b3b3951d42e0080d8a9498d30"},
+    {file = "beautifulsoup4-4.11.1.tar.gz", hash = "sha256:ad9aa55b65ef2808eb405f46cf74df7fcb7044d5cbc26487f96eb2ef2e436693"},
 ]
 binaryornot = [
     {file = "binaryornot-0.4.4-py2.py3-none-any.whl", hash = "sha256:b8b71173c917bddcd2c16070412e369c3ed7f0528926f70cac18a6c97fd563e4"},
diff --git a/pyproject.toml b/pyproject.toml
index 20d16b37..0bd7dfdb 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -13,7 +13,7 @@ matplotlib = "3.5.1"
 numpy = "^1.22.3"
 tqdm = "^4.64.0"
 requests = "^2.27.1"
-beautifulsoup4 = "^4.10.0"
+beautifulsoup4 = "^4.11.1"
 
 [tool.poetry.dev-dependencies]
 black = "^22.3"

From 898f3f6d0f20563403799b28aa742205bee84fb9 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 11 Apr 2022 04:30:00 +0000
Subject: [PATCH 100/371] Bump beautifulsoup4 from 4.11.0 to 4.11.1

Bumps [beautifulsoup4](https://www.crummy.com/software/BeautifulSoup/bs4/) from 4.11.0 to 4.11.1.

---
updated-dependencies:
- dependency-name: beautifulsoup4
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 poetry.lock    | 8 ++++----
 pyproject.toml | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/poetry.lock b/poetry.lock
index 5491e936..30cdad89 100644
--- a/poetry.lock
+++ b/poetry.lock
@@ -60,7 +60,7 @@ testing = ["pytest", "pytest-flake8", "pytest-cov", "pytest-black (>=0.3.7)", "p
 
 [[package]]
 name = "beautifulsoup4"
-version = "4.11.0"
+version = "4.11.1"
 description = "Screen-scraping library"
 category = "main"
 optional = false
@@ -641,7 +641,7 @@ testing = ["coverage (>=4)", "coverage-enable-subprocess (>=1)", "flaky (>=3)",
 [metadata]
 lock-version = "1.1"
 python-versions = "^3.10"
-content-hash = "7011e0ed9cd6910f7c9a6ac9a4d7120feebb1cea3535d4542294960ccbe0abe9"
+content-hash = "7ceed7de127c4fb43d0dc576beed24feb0b1801b1a99535237a7ebb02f07218a"
 
 [metadata.files]
 anytree = [
@@ -665,8 +665,8 @@ attrs = [
     {file = "backports.entry_points_selectable-1.1.1.tar.gz", hash = "sha256:914b21a479fde881635f7af5adc7f6e38d6b274be32269070c53b698c60d5386"},
 ]
 beautifulsoup4 = [
-    {file = "beautifulsoup4-4.11.0-py3-none-any.whl", hash = "sha256:577b9e1c36d2ada780d807c5622e889d43172466658c2eb239e97296965cdddb"},
-    {file = "beautifulsoup4-4.11.0.tar.gz", hash = "sha256:ac98f868e1cb8eb9932a61be75b4f7018a118a490e7fdb424a74a982430cfcbd"},
+    {file = "beautifulsoup4-4.11.1-py3-none-any.whl", hash = "sha256:58d5c3d29f5a36ffeb94f02f0d786cd53014cf9b3b3951d42e0080d8a9498d30"},
+    {file = "beautifulsoup4-4.11.1.tar.gz", hash = "sha256:ad9aa55b65ef2808eb405f46cf74df7fcb7044d5cbc26487f96eb2ef2e436693"},
 ]
 binaryornot = [
     {file = "binaryornot-0.4.4-py2.py3-none-any.whl", hash = "sha256:b8b71173c917bddcd2c16070412e369c3ed7f0528926f70cac18a6c97fd563e4"},
diff --git a/pyproject.toml b/pyproject.toml
index efc92f6b..a77e6b72 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -10,7 +10,7 @@ python = "^3.10"
 anytree = "^2.8.0"
 click = "^8.1.2"
 requests = "^2.27.1"
-beautifulsoup4 = "^4.11.0"
+beautifulsoup4 = "^4.11.1"
 tqdm = "^4.64.0"
 
 [tool.poetry.dev-dependencies]

From ffcbcddac8a8f57dca3c21d4dc314e87f1da0c03 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 12 Apr 2022 05:49:19 +0000
Subject: [PATCH 101/371] Bump tox from 3.24.5 to 3.25.0

Bumps [tox](https://github.com/tox-dev/tox) from 3.24.5 to 3.25.0.
- [Release notes](https://github.com/tox-dev/tox/releases)
- [Changelog](https://github.com/tox-dev/tox/blob/master/docs/changelog.rst)
- [Commits](https://github.com/tox-dev/tox/compare/3.24.5...3.25.0)

---
updated-dependencies:
- dependency-name: tox
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 poetry.lock    | 8 ++++----
 pyproject.toml | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/poetry.lock b/poetry.lock
index a26b4411..f24bb5a0 100644
--- a/poetry.lock
+++ b/poetry.lock
@@ -640,7 +640,7 @@ python-versions = ">=3.6"
 
 [[package]]
 name = "tox"
-version = "3.24.5"
+version = "3.25.0"
 description = "tox is a generic virtualenv management and test command line tool"
 category = "dev"
 optional = false
@@ -720,7 +720,7 @@ testing = ["coverage (>=4)", "coverage-enable-subprocess (>=1)", "flaky (>=3)",
 [metadata]
 lock-version = "1.1"
 python-versions = ">=3.9,<3.11"
-content-hash = "26ac5cc8ac395502d1d722623a6ac095e202ede647d97d9f5b011f293c2b0729"
+content-hash = "27cc6eacb98defc432a464870cc0e34563f63fd4865f0f83f57d818a37a3b209"
 
 [metadata.files]
 anytree = [
@@ -1238,8 +1238,8 @@ tomli = [
     {file = "tomli-1.2.2.tar.gz", hash = "sha256:c6ce0015eb38820eaf32b5db832dbc26deb3dd427bd5f6556cf0acac2c214fee"},
 ]
 tox = [
-    {file = "tox-3.24.5-py2.py3-none-any.whl", hash = "sha256:be3362472a33094bce26727f5f771ca0facf6dafa217f65875314e9a6600c95c"},
-    {file = "tox-3.24.5.tar.gz", hash = "sha256:67e0e32c90e278251fea45b696d0fef3879089ccbe979b0c556d35d5a70e2993"},
+    {file = "tox-3.25.0-py2.py3-none-any.whl", hash = "sha256:0805727eb4d6b049de304977dfc9ce315a1938e6619c3ab9f38682bb04662a5a"},
+    {file = "tox-3.25.0.tar.gz", hash = "sha256:37888f3092aa4e9f835fc8cc6dadbaaa0782651c41ef359e3a5743fcb0308160"},
 ]
 tqdm = [
     {file = "tqdm-4.64.0-py2.py3-none-any.whl", hash = "sha256:74a2cdefe14d11442cedf3ba4e21a3b84ff9a2dbdc6cfae2c34addb2a14a5ea6"},
diff --git a/pyproject.toml b/pyproject.toml
index 0bd7dfdb..3740b93e 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -22,7 +22,7 @@ pytest = "^7.1.1"
 pytest-cov = "^3.0.0"
 pytest-xdist = "^2.5.0"
 python-dotenv = "^0.20.0"
-tox = "^3.24.5"
+tox = "^3.25.0"
 pre-commit = "^2.18.1"
 
 [tool.poetry.scripts]

From 77ee6450333365141390c8b0bc534615e12bddb4 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 22 Apr 2022 13:56:11 +0000
Subject: [PATCH 102/371] Bump tox from 3.24.5 to 3.25.0

Bumps [tox](https://github.com/tox-dev/tox) from 3.24.5 to 3.25.0.
- [Release notes](https://github.com/tox-dev/tox/releases)
- [Changelog](https://github.com/tox-dev/tox/blob/master/docs/changelog.rst)
- [Commits](https://github.com/tox-dev/tox/compare/3.24.5...3.25.0)

---
updated-dependencies:
- dependency-name: tox
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 poetry.lock    | 8 ++++----
 pyproject.toml | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/poetry.lock b/poetry.lock
index 30cdad89..c3ec626e 100644
--- a/poetry.lock
+++ b/poetry.lock
@@ -569,7 +569,7 @@ python-versions = ">=3.6"
 
 [[package]]
 name = "tox"
-version = "3.24.5"
+version = "3.25.0"
 description = "tox is a generic virtualenv management and test command line tool"
 category = "dev"
 optional = false
@@ -641,7 +641,7 @@ testing = ["coverage (>=4)", "coverage-enable-subprocess (>=1)", "flaky (>=3)",
 [metadata]
 lock-version = "1.1"
 python-versions = "^3.10"
-content-hash = "7ceed7de127c4fb43d0dc576beed24feb0b1801b1a99535237a7ebb02f07218a"
+content-hash = "7f57e8c2d4f3ad6ddc57744ae6a1600d1f773c8c459b88ce9f2b0c553dbd0c47"
 
 [metadata.files]
 anytree = [
@@ -1003,8 +1003,8 @@ tomli = [
     {file = "tomli-1.2.2.tar.gz", hash = "sha256:c6ce0015eb38820eaf32b5db832dbc26deb3dd427bd5f6556cf0acac2c214fee"},
 ]
 tox = [
-    {file = "tox-3.24.5-py2.py3-none-any.whl", hash = "sha256:be3362472a33094bce26727f5f771ca0facf6dafa217f65875314e9a6600c95c"},
-    {file = "tox-3.24.5.tar.gz", hash = "sha256:67e0e32c90e278251fea45b696d0fef3879089ccbe979b0c556d35d5a70e2993"},
+    {file = "tox-3.25.0-py2.py3-none-any.whl", hash = "sha256:0805727eb4d6b049de304977dfc9ce315a1938e6619c3ab9f38682bb04662a5a"},
+    {file = "tox-3.25.0.tar.gz", hash = "sha256:37888f3092aa4e9f835fc8cc6dadbaaa0782651c41ef359e3a5743fcb0308160"},
 ]
 tqdm = [
     {file = "tqdm-4.64.0-py2.py3-none-any.whl", hash = "sha256:74a2cdefe14d11442cedf3ba4e21a3b84ff9a2dbdc6cfae2c34addb2a14a5ea6"},
diff --git a/pyproject.toml b/pyproject.toml
index a77e6b72..69e7cd26 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -20,7 +20,7 @@ pytest = "^7.1.1"
 pytest-cov = "^3.0.0"
 pytest-xdist = "^2.5.0"
 python-dotenv = "^0.20.0"
-tox = "^3.24.5"
+tox = "^3.25.0"
 pre-commit = "^2.18.1"
 isort = "^5.10.1"
 

From 0476d58f3b3df3caa55834010ea2bc54ac74481a Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 25 Apr 2022 04:07:23 +0000
Subject: [PATCH 103/371] Bump pytest from 7.1.1 to 7.1.2

Bumps [pytest](https://github.com/pytest-dev/pytest) from 7.1.1 to 7.1.2.
- [Release notes](https://github.com/pytest-dev/pytest/releases)
- [Changelog](https://github.com/pytest-dev/pytest/blob/main/CHANGELOG.rst)
- [Commits](https://github.com/pytest-dev/pytest/compare/7.1.1...7.1.2)

---
updated-dependencies:
- dependency-name: pytest
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 poetry.lock    | 8 ++++----
 pyproject.toml | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/poetry.lock b/poetry.lock
index f24bb5a0..45c8c844 100644
--- a/poetry.lock
+++ b/poetry.lock
@@ -457,7 +457,7 @@ python-versions = ">=2.6, !=3.0.*, !=3.1.*, !=3.2.*"
 
 [[package]]
 name = "pytest"
-version = "7.1.1"
+version = "7.1.2"
 description = "pytest: simple powerful testing with Python"
 category = "dev"
 optional = false
@@ -720,7 +720,7 @@ testing = ["coverage (>=4)", "coverage-enable-subprocess (>=1)", "flaky (>=3)",
 [metadata]
 lock-version = "1.1"
 python-versions = ">=3.9,<3.11"
-content-hash = "27cc6eacb98defc432a464870cc0e34563f63fd4865f0f83f57d818a37a3b209"
+content-hash = "e94fcc9b4603a84f7c6e114d19002f94de779edee5a57378a5ee6a69b6858d9e"
 
 [metadata.files]
 anytree = [
@@ -1147,8 +1147,8 @@ pyparsing = [
     {file = "pyparsing-2.4.7.tar.gz", hash = "sha256:c203ec8783bf771a155b207279b9bccb8dea02d8f0c9e5f8ead507bc3246ecc1"},
 ]
 pytest = [
-    {file = "pytest-7.1.1-py3-none-any.whl", hash = "sha256:92f723789a8fdd7180b6b06483874feca4c48a5c76968e03bb3e7f806a1869ea"},
-    {file = "pytest-7.1.1.tar.gz", hash = "sha256:841132caef6b1ad17a9afde46dc4f6cfa59a05f9555aae5151f73bdf2820ca63"},
+    {file = "pytest-7.1.2-py3-none-any.whl", hash = "sha256:13d0e3ccfc2b6e26be000cb6568c832ba67ba32e719443bfe725814d3c42433c"},
+    {file = "pytest-7.1.2.tar.gz", hash = "sha256:a06a0425453864a270bc45e71f783330a7428defb4230fb5e6a731fde06ecd45"},
 ]
 pytest-cov = [
     {file = "pytest-cov-3.0.0.tar.gz", hash = "sha256:e7f0f5b1617d2210a2cabc266dfe2f4c75a8d32fb89eafb7ad9d06f6d076d470"},
diff --git a/pyproject.toml b/pyproject.toml
index 3740b93e..9b3225ca 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -18,7 +18,7 @@ beautifulsoup4 = "^4.11.1"
 [tool.poetry.dev-dependencies]
 black = "^22.3"
 cookiecutter = "^1.7.3"
-pytest = "^7.1.1"
+pytest = "^7.1.2"
 pytest-cov = "^3.0.0"
 pytest-xdist = "^2.5.0"
 python-dotenv = "^0.20.0"

From db002b357bccc15b71e49ab4b56caba61c483ebe Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 25 Apr 2022 04:30:59 +0000
Subject: [PATCH 104/371] Bump pytest from 7.1.1 to 7.1.2

Bumps [pytest](https://github.com/pytest-dev/pytest) from 7.1.1 to 7.1.2.
- [Release notes](https://github.com/pytest-dev/pytest/releases)
- [Changelog](https://github.com/pytest-dev/pytest/blob/main/CHANGELOG.rst)
- [Commits](https://github.com/pytest-dev/pytest/compare/7.1.1...7.1.2)

---
updated-dependencies:
- dependency-name: pytest
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 poetry.lock    | 8 ++++----
 pyproject.toml | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/poetry.lock b/poetry.lock
index c3ec626e..4047290b 100644
--- a/poetry.lock
+++ b/poetry.lock
@@ -401,7 +401,7 @@ diagrams = ["jinja2", "railroad-diagrams"]
 
 [[package]]
 name = "pytest"
-version = "7.1.1"
+version = "7.1.2"
 description = "pytest: simple powerful testing with Python"
 category = "dev"
 optional = false
@@ -641,7 +641,7 @@ testing = ["coverage (>=4)", "coverage-enable-subprocess (>=1)", "flaky (>=3)",
 [metadata]
 lock-version = "1.1"
 python-versions = "^3.10"
-content-hash = "7f57e8c2d4f3ad6ddc57744ae6a1600d1f773c8c459b88ce9f2b0c553dbd0c47"
+content-hash = "55357f4440022296d7a690252b5894c2a0ff62668d28d7ccf650d351d74ae570"
 
 [metadata.files]
 anytree = [
@@ -916,8 +916,8 @@ pyparsing = [
     {file = "pyparsing-3.0.6.tar.gz", hash = "sha256:d9bdec0013ef1eb5a84ab39a3b3868911598afa494f5faa038647101504e2b81"},
 ]
 pytest = [
-    {file = "pytest-7.1.1-py3-none-any.whl", hash = "sha256:92f723789a8fdd7180b6b06483874feca4c48a5c76968e03bb3e7f806a1869ea"},
-    {file = "pytest-7.1.1.tar.gz", hash = "sha256:841132caef6b1ad17a9afde46dc4f6cfa59a05f9555aae5151f73bdf2820ca63"},
+    {file = "pytest-7.1.2-py3-none-any.whl", hash = "sha256:13d0e3ccfc2b6e26be000cb6568c832ba67ba32e719443bfe725814d3c42433c"},
+    {file = "pytest-7.1.2.tar.gz", hash = "sha256:a06a0425453864a270bc45e71f783330a7428defb4230fb5e6a731fde06ecd45"},
 ]
 pytest-cov = [
     {file = "pytest-cov-3.0.0.tar.gz", hash = "sha256:e7f0f5b1617d2210a2cabc266dfe2f4c75a8d32fb89eafb7ad9d06f6d076d470"},
diff --git a/pyproject.toml b/pyproject.toml
index 69e7cd26..31e68526 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -16,7 +16,7 @@ tqdm = "^4.64.0"
 [tool.poetry.dev-dependencies]
 black = "^22.3"
 cookiecutter = "^1.7.3"
-pytest = "^7.1.1"
+pytest = "^7.1.2"
 pytest-cov = "^3.0.0"
 pytest-xdist = "^2.5.0"
 python-dotenv = "^0.20.0"

From 911906ba6bae3afdc1ca581ce2256a6f32d1b2ff Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 29 Apr 2022 04:35:35 +0000
Subject: [PATCH 105/371] Bump click from 8.1.2 to 8.1.3

Bumps [click](https://github.com/pallets/click) from 8.1.2 to 8.1.3.
- [Release notes](https://github.com/pallets/click/releases)
- [Changelog](https://github.com/pallets/click/blob/main/CHANGES.rst)
- [Commits](https://github.com/pallets/click/compare/8.1.2...8.1.3)

---
updated-dependencies:
- dependency-name: click
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 poetry.lock    | 8 ++++----
 pyproject.toml | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/poetry.lock b/poetry.lock
index 45c8c844..af6a36a3 100644
--- a/poetry.lock
+++ b/poetry.lock
@@ -143,7 +143,7 @@ unicode_backport = ["unicodedata2"]
 
 [[package]]
 name = "click"
-version = "8.1.2"
+version = "8.1.3"
 description = "Composable command line interface toolkit"
 category = "main"
 optional = false
@@ -720,7 +720,7 @@ testing = ["coverage (>=4)", "coverage-enable-subprocess (>=1)", "flaky (>=3)",
 [metadata]
 lock-version = "1.1"
 python-versions = ">=3.9,<3.11"
-content-hash = "e94fcc9b4603a84f7c6e114d19002f94de779edee5a57378a5ee6a69b6858d9e"
+content-hash = "b003e94473ec282dad2d2d81cfdc9ff511228aacd114845953a3c94c60f64796"
 
 [metadata.files]
 anytree = [
@@ -793,8 +793,8 @@ charset-normalizer = [
     {file = "charset_normalizer-2.0.7-py3-none-any.whl", hash = "sha256:f7af805c321bfa1ce6714c51f254e0d5bb5e5834039bc17db7ebe3a4cec9492b"},
 ]
 click = [
-    {file = "click-8.1.2-py3-none-any.whl", hash = "sha256:24e1a4a9ec5bf6299411369b208c1df2188d9eb8d916302fe6bf03faed227f1e"},
-    {file = "click-8.1.2.tar.gz", hash = "sha256:479707fe14d9ec9a0757618b7a100a0ae4c4e236fac5b7f80ca68028141a1a72"},
+    {file = "click-8.1.3-py3-none-any.whl", hash = "sha256:bb4d8133cb15a609f44e8213d9b391b0809795062913b383c62be0ee95b1db48"},
+    {file = "click-8.1.3.tar.gz", hash = "sha256:7682dc8afb30297001674575ea00d1814d808d6a36af415a82bd481d37ba7b8e"},
 ]
 colorama = [
     {file = "colorama-0.4.4-py2.py3-none-any.whl", hash = "sha256:9f47eda37229f68eee03b24b9748937c7dc3868f906e8ba69fbcbdd3bc5dc3e2"},
diff --git a/pyproject.toml b/pyproject.toml
index 9b3225ca..1d6c056b 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -8,7 +8,7 @@ license = "MIT License"
 [tool.poetry.dependencies]
 python = ">=3.9,<3.11"
 anytree = "^2.8.0"
-click = "^8.1.2"
+click = "^8.1.3"
 matplotlib = "3.5.1"
 numpy = "^1.22.3"
 tqdm = "^4.64.0"

From 85b14c6910ba0fdc47689c1ca10f7bbd85dab73a Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 29 Apr 2022 05:22:42 +0000
Subject: [PATCH 106/371] Bump click from 8.1.2 to 8.1.3

Bumps [click](https://github.com/pallets/click) from 8.1.2 to 8.1.3.
- [Release notes](https://github.com/pallets/click/releases)
- [Changelog](https://github.com/pallets/click/blob/main/CHANGES.rst)
- [Commits](https://github.com/pallets/click/compare/8.1.2...8.1.3)

---
updated-dependencies:
- dependency-name: click
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 poetry.lock    | 8 ++++----
 pyproject.toml | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/poetry.lock b/poetry.lock
index 4047290b..2c3cf0cc 100644
--- a/poetry.lock
+++ b/poetry.lock
@@ -142,7 +142,7 @@ unicode_backport = ["unicodedata2"]
 
 [[package]]
 name = "click"
-version = "8.1.2"
+version = "8.1.3"
 description = "Composable command line interface toolkit"
 category = "main"
 optional = false
@@ -641,7 +641,7 @@ testing = ["coverage (>=4)", "coverage-enable-subprocess (>=1)", "flaky (>=3)",
 [metadata]
 lock-version = "1.1"
 python-versions = "^3.10"
-content-hash = "55357f4440022296d7a690252b5894c2a0ff62668d28d7ccf650d351d74ae570"
+content-hash = "974b87bd1fb9e76edaadd551593815c094d950416d9386981dc14b2739142310"
 
 [metadata.files]
 anytree = [
@@ -714,8 +714,8 @@ charset-normalizer = [
     {file = "charset_normalizer-2.0.8-py3-none-any.whl", hash = "sha256:83fcdeb225499d6344c8f7f34684c2981270beacc32ede2e669e94f7fa544405"},
 ]
 click = [
-    {file = "click-8.1.2-py3-none-any.whl", hash = "sha256:24e1a4a9ec5bf6299411369b208c1df2188d9eb8d916302fe6bf03faed227f1e"},
-    {file = "click-8.1.2.tar.gz", hash = "sha256:479707fe14d9ec9a0757618b7a100a0ae4c4e236fac5b7f80ca68028141a1a72"},
+    {file = "click-8.1.3-py3-none-any.whl", hash = "sha256:bb4d8133cb15a609f44e8213d9b391b0809795062913b383c62be0ee95b1db48"},
+    {file = "click-8.1.3.tar.gz", hash = "sha256:7682dc8afb30297001674575ea00d1814d808d6a36af415a82bd481d37ba7b8e"},
 ]
 colorama = [
     {file = "colorama-0.4.4-py2.py3-none-any.whl", hash = "sha256:9f47eda37229f68eee03b24b9748937c7dc3868f906e8ba69fbcbdd3bc5dc3e2"},
diff --git a/pyproject.toml b/pyproject.toml
index 31e68526..ca5b5055 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -8,7 +8,7 @@ license = "MIT"
 [tool.poetry.dependencies]
 python = "^3.10"
 anytree = "^2.8.0"
-click = "^8.1.2"
+click = "^8.1.3"
 requests = "^2.27.1"
 beautifulsoup4 = "^4.11.1"
 tqdm = "^4.64.0"

From 75d17cbb1a616cc097882c5633bf24453a1f1fae Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 13 May 2022 01:03:39 +0000
Subject: [PATCH 107/371] Bump pascalgn/automerge-action from 0.15.2 to 0.15.3

Bumps [pascalgn/automerge-action](https://github.com/pascalgn/automerge-action) from 0.15.2 to 0.15.3.
- [Release notes](https://github.com/pascalgn/automerge-action/releases)
- [Commits](https://github.com/pascalgn/automerge-action/compare/v0.15.2...v0.15.3)

---
updated-dependencies:
- dependency-name: pascalgn/automerge-action
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 .github/workflows/automerge.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/automerge.yml b/.github/workflows/automerge.yml
index 2b145cc4..c53ed1b9 100644
--- a/.github/workflows/automerge.yml
+++ b/.github/workflows/automerge.yml
@@ -22,7 +22,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: automerge
-        uses: "pascalgn/automerge-action@v0.15.2"
+        uses: "pascalgn/automerge-action@v0.15.3"
         env:
           GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN }}"
           MERGE_LABELS: automerge

From 830b31bb23581db28fff5d9f66bf8bb5d03b27e6 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 13 May 2022 03:23:38 +0000
Subject: [PATCH 108/371] Bump pascalgn/automerge-action from 0.15.2 to 0.15.3

Bumps [pascalgn/automerge-action](https://github.com/pascalgn/automerge-action) from 0.15.2 to 0.15.3.
- [Release notes](https://github.com/pascalgn/automerge-action/releases)
- [Commits](https://github.com/pascalgn/automerge-action/compare/v0.15.2...v0.15.3)

---
updated-dependencies:
- dependency-name: pascalgn/automerge-action
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 .github/workflows/automerge.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/automerge.yml b/.github/workflows/automerge.yml
index 2b145cc4..c53ed1b9 100644
--- a/.github/workflows/automerge.yml
+++ b/.github/workflows/automerge.yml
@@ -22,7 +22,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: automerge
-        uses: "pascalgn/automerge-action@v0.15.2"
+        uses: "pascalgn/automerge-action@v0.15.3"
         env:
           GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN }}"
           MERGE_LABELS: automerge

From 043ed352870c807fe4466688c0e4391f3d4e85a5 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 24 May 2022 12:10:31 +0000
Subject: [PATCH 109/371] Bump pre-commit from 2.18.1 to 2.19.0

Bumps [pre-commit](https://github.com/pre-commit/pre-commit) from 2.18.1 to 2.19.0.
- [Release notes](https://github.com/pre-commit/pre-commit/releases)
- [Changelog](https://github.com/pre-commit/pre-commit/blob/main/CHANGELOG.md)
- [Commits](https://github.com/pre-commit/pre-commit/compare/v2.18.1...v2.19.0)

---
updated-dependencies:
- dependency-name: pre-commit
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 poetry.lock    | 94 +++++++++++++++++++++++++-------------------------
 pyproject.toml |  2 +-
 2 files changed, 48 insertions(+), 48 deletions(-)

diff --git a/poetry.lock b/poetry.lock
index af6a36a3..a9e26d08 100644
--- a/poetry.lock
+++ b/poetry.lock
@@ -180,14 +180,14 @@ six = ">=1.10"
 
 [[package]]
 name = "coverage"
-version = "6.3.2"
+version = "6.4"
 description = "Code coverage measurement for Python"
 category = "dev"
 optional = false
 python-versions = ">=3.7"
 
 [package.dependencies]
-tomli = {version = "*", optional = true, markers = "extra == \"toml\""}
+tomli = {version = "*", optional = true, markers = "python_version < \"3.11\" and extra == \"toml\""}
 
 [package.extras]
 toml = ["tomli"]
@@ -425,7 +425,7 @@ python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*"
 
 [[package]]
 name = "pre-commit"
-version = "2.18.1"
+version = "2.19.0"
 description = "A framework for managing and maintaining multi-language pre-commit hooks."
 category = "dev"
 optional = false
@@ -720,7 +720,7 @@ testing = ["coverage (>=4)", "coverage-enable-subprocess (>=1)", "flaky (>=3)",
 [metadata]
 lock-version = "1.1"
 python-versions = ">=3.9,<3.11"
-content-hash = "b003e94473ec282dad2d2d81cfdc9ff511228aacd114845953a3c94c60f64796"
+content-hash = "2dd759360430c017b32231bd9749f23da5ae6c88c011abc09da36e19442464ce"
 
 [metadata.files]
 anytree = [
@@ -805,47 +805,47 @@ cookiecutter = [
     {file = "cookiecutter-1.7.3.tar.gz", hash = "sha256:6b9a4d72882e243be077a7397d0f1f76fe66cf3df91f3115dbb5330e214fa457"},
 ]
 coverage = [
-    {file = "coverage-6.3.2-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:9b27d894748475fa858f9597c0ee1d4829f44683f3813633aaf94b19cb5453cf"},
-    {file = "coverage-6.3.2-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:37d1141ad6b2466a7b53a22e08fe76994c2d35a5b6b469590424a9953155afac"},
-    {file = "coverage-6.3.2-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:f9987b0354b06d4df0f4d3e0ec1ae76d7ce7cbca9a2f98c25041eb79eec766f1"},
-    {file = "coverage-6.3.2-cp310-cp310-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:26e2deacd414fc2f97dd9f7676ee3eaecd299ca751412d89f40bc01557a6b1b4"},
-    {file = "coverage-6.3.2-cp310-cp310-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:4dd8bafa458b5c7d061540f1ee9f18025a68e2d8471b3e858a9dad47c8d41903"},
-    {file = "coverage-6.3.2-cp310-cp310-musllinux_1_1_aarch64.whl", hash = "sha256:46191097ebc381fbf89bdce207a6c107ac4ec0890d8d20f3360345ff5976155c"},
-    {file = "coverage-6.3.2-cp310-cp310-musllinux_1_1_i686.whl", hash = "sha256:6f89d05e028d274ce4fa1a86887b071ae1755082ef94a6740238cd7a8178804f"},
-    {file = "coverage-6.3.2-cp310-cp310-musllinux_1_1_x86_64.whl", hash = "sha256:58303469e9a272b4abdb9e302a780072c0633cdcc0165db7eec0f9e32f901e05"},
-    {file = "coverage-6.3.2-cp310-cp310-win32.whl", hash = "sha256:2fea046bfb455510e05be95e879f0e768d45c10c11509e20e06d8fcaa31d9e39"},
-    {file = "coverage-6.3.2-cp310-cp310-win_amd64.whl", hash = "sha256:a2a8b8bcc399edb4347a5ca8b9b87e7524c0967b335fbb08a83c8421489ddee1"},
-    {file = "coverage-6.3.2-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:f1555ea6d6da108e1999b2463ea1003fe03f29213e459145e70edbaf3e004aaa"},
-    {file = "coverage-6.3.2-cp37-cp37m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:e5f4e1edcf57ce94e5475fe09e5afa3e3145081318e5fd1a43a6b4539a97e518"},
-    {file = "coverage-6.3.2-cp37-cp37m-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:7a15dc0a14008f1da3d1ebd44bdda3e357dbabdf5a0b5034d38fcde0b5c234b7"},
-    {file = "coverage-6.3.2-cp37-cp37m-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:21b7745788866028adeb1e0eca3bf1101109e2dc58456cb49d2d9b99a8c516e6"},
-    {file = "coverage-6.3.2-cp37-cp37m-musllinux_1_1_aarch64.whl", hash = "sha256:8ce257cac556cb03be4a248d92ed36904a59a4a5ff55a994e92214cde15c5bad"},
-    {file = "coverage-6.3.2-cp37-cp37m-musllinux_1_1_i686.whl", hash = "sha256:b0be84e5a6209858a1d3e8d1806c46214e867ce1b0fd32e4ea03f4bd8b2e3359"},
-    {file = "coverage-6.3.2-cp37-cp37m-musllinux_1_1_x86_64.whl", hash = "sha256:acf53bc2cf7282ab9b8ba346746afe703474004d9e566ad164c91a7a59f188a4"},
-    {file = "coverage-6.3.2-cp37-cp37m-win32.whl", hash = "sha256:8bdde1177f2311ee552f47ae6e5aa7750c0e3291ca6b75f71f7ffe1f1dab3dca"},
-    {file = "coverage-6.3.2-cp37-cp37m-win_amd64.whl", hash = "sha256:b31651d018b23ec463e95cf10070d0b2c548aa950a03d0b559eaa11c7e5a6fa3"},
-    {file = "coverage-6.3.2-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:07e6db90cd9686c767dcc593dff16c8c09f9814f5e9c51034066cad3373b914d"},
-    {file = "coverage-6.3.2-cp38-cp38-macosx_11_0_arm64.whl", hash = "sha256:2c6dbb42f3ad25760010c45191e9757e7dce981cbfb90e42feef301d71540059"},
-    {file = "coverage-6.3.2-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:c76aeef1b95aff3905fb2ae2d96e319caca5b76fa41d3470b19d4e4a3a313512"},
-    {file = "coverage-6.3.2-cp38-cp38-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:8cf5cfcb1521dc3255d845d9dca3ff204b3229401994ef8d1984b32746bb45ca"},
-    {file = "coverage-6.3.2-cp38-cp38-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:8fbbdc8d55990eac1b0919ca69eb5a988a802b854488c34b8f37f3e2025fa90d"},
-    {file = "coverage-6.3.2-cp38-cp38-musllinux_1_1_aarch64.whl", hash = "sha256:ec6bc7fe73a938933d4178c9b23c4e0568e43e220aef9472c4f6044bfc6dd0f0"},
-    {file = "coverage-6.3.2-cp38-cp38-musllinux_1_1_i686.whl", hash = "sha256:9baff2a45ae1f17c8078452e9e5962e518eab705e50a0aa8083733ea7d45f3a6"},
-    {file = "coverage-6.3.2-cp38-cp38-musllinux_1_1_x86_64.whl", hash = "sha256:fd9e830e9d8d89b20ab1e5af09b32d33e1a08ef4c4e14411e559556fd788e6b2"},
-    {file = "coverage-6.3.2-cp38-cp38-win32.whl", hash = "sha256:f7331dbf301b7289013175087636bbaf5b2405e57259dd2c42fdcc9fcc47325e"},
-    {file = "coverage-6.3.2-cp38-cp38-win_amd64.whl", hash = "sha256:68353fe7cdf91f109fc7d474461b46e7f1f14e533e911a2a2cbb8b0fc8613cf1"},
-    {file = "coverage-6.3.2-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:b78e5afb39941572209f71866aa0b206c12f0109835aa0d601e41552f9b3e620"},
-    {file = "coverage-6.3.2-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:4e21876082ed887baed0146fe222f861b5815455ada3b33b890f4105d806128d"},
-    {file = "coverage-6.3.2-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:34626a7eee2a3da12af0507780bb51eb52dca0e1751fd1471d0810539cefb536"},
-    {file = "coverage-6.3.2-cp39-cp39-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:1ebf730d2381158ecf3dfd4453fbca0613e16eaa547b4170e2450c9707665ce7"},
-    {file = "coverage-6.3.2-cp39-cp39-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:dd6fe30bd519694b356cbfcaca9bd5c1737cddd20778c6a581ae20dc8c04def2"},
-    {file = "coverage-6.3.2-cp39-cp39-musllinux_1_1_aarch64.whl", hash = "sha256:96f8a1cb43ca1422f36492bebe63312d396491a9165ed3b9231e778d43a7fca4"},
-    {file = "coverage-6.3.2-cp39-cp39-musllinux_1_1_i686.whl", hash = "sha256:dd035edafefee4d573140a76fdc785dc38829fe5a455c4bb12bac8c20cfc3d69"},
-    {file = "coverage-6.3.2-cp39-cp39-musllinux_1_1_x86_64.whl", hash = "sha256:5ca5aeb4344b30d0bec47481536b8ba1181d50dbe783b0e4ad03c95dc1296684"},
-    {file = "coverage-6.3.2-cp39-cp39-win32.whl", hash = "sha256:f5fa5803f47e095d7ad8443d28b01d48c0359484fec1b9d8606d0e3282084bc4"},
-    {file = "coverage-6.3.2-cp39-cp39-win_amd64.whl", hash = "sha256:9548f10d8be799551eb3a9c74bbf2b4934ddb330e08a73320123c07f95cc2d92"},
-    {file = "coverage-6.3.2-pp36.pp37.pp38-none-any.whl", hash = "sha256:18d520c6860515a771708937d2f78f63cc47ab3b80cb78e86573b0a760161faf"},
-    {file = "coverage-6.3.2.tar.gz", hash = "sha256:03e2a7826086b91ef345ff18742ee9fc47a6839ccd517061ef8fa1976e652ce9"},
+    {file = "coverage-6.4-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:50ed480b798febce113709846b11f5d5ed1e529c88d8ae92f707806c50297abf"},
+    {file = "coverage-6.4-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:26f8f92699756cb7af2b30720de0c5bb8d028e923a95b6d0c891088025a1ac8f"},
+    {file = "coverage-6.4-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:60c2147921da7f4d2d04f570e1838db32b95c5509d248f3fe6417e91437eaf41"},
+    {file = "coverage-6.4-cp310-cp310-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:750e13834b597eeb8ae6e72aa58d1d831b96beec5ad1d04479ae3772373a8088"},
+    {file = "coverage-6.4-cp310-cp310-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:af5b9ee0fc146e907aa0f5fb858c3b3da9199d78b7bb2c9973d95550bd40f701"},
+    {file = "coverage-6.4-cp310-cp310-musllinux_1_1_aarch64.whl", hash = "sha256:a022394996419142b33a0cf7274cb444c01d2bb123727c4bb0b9acabcb515dea"},
+    {file = "coverage-6.4-cp310-cp310-musllinux_1_1_i686.whl", hash = "sha256:5a78cf2c43b13aa6b56003707c5203f28585944c277c1f3f109c7b041b16bd39"},
+    {file = "coverage-6.4-cp310-cp310-musllinux_1_1_x86_64.whl", hash = "sha256:9229d074e097f21dfe0643d9d0140ee7433814b3f0fc3706b4abffd1e3038632"},
+    {file = "coverage-6.4-cp310-cp310-win32.whl", hash = "sha256:fb45fe08e1abc64eb836d187b20a59172053999823f7f6ef4f18a819c44ba16f"},
+    {file = "coverage-6.4-cp310-cp310-win_amd64.whl", hash = "sha256:3cfd07c5889ddb96a401449109a8b97a165be9d67077df6802f59708bfb07720"},
+    {file = "coverage-6.4-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:03014a74023abaf5a591eeeaf1ac66a73d54eba178ff4cb1fa0c0a44aae70383"},
+    {file = "coverage-6.4-cp37-cp37m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:9c82f2cd69c71698152e943f4a5a6b83a3ab1db73b88f6e769fabc86074c3b08"},
+    {file = "coverage-6.4-cp37-cp37m-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:7b546cf2b1974ddc2cb222a109b37c6ed1778b9be7e6b0c0bc0cf0438d9e45a6"},
+    {file = "coverage-6.4-cp37-cp37m-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:cc173f1ce9ffb16b299f51c9ce53f66a62f4d975abe5640e976904066f3c835d"},
+    {file = "coverage-6.4-cp37-cp37m-musllinux_1_1_aarch64.whl", hash = "sha256:c53ad261dfc8695062fc8811ac7c162bd6096a05a19f26097f411bdf5747aee7"},
+    {file = "coverage-6.4-cp37-cp37m-musllinux_1_1_i686.whl", hash = "sha256:eef5292b60b6de753d6e7f2d128d5841c7915fb1e3321c3a1fe6acfe76c38052"},
+    {file = "coverage-6.4-cp37-cp37m-musllinux_1_1_x86_64.whl", hash = "sha256:543e172ce4c0de533fa892034cce260467b213c0ea8e39da2f65f9a477425211"},
+    {file = "coverage-6.4-cp37-cp37m-win32.whl", hash = "sha256:00c8544510f3c98476bbd58201ac2b150ffbcce46a8c3e4fb89ebf01998f806a"},
+    {file = "coverage-6.4-cp37-cp37m-win_amd64.whl", hash = "sha256:b84ab65444dcc68d761e95d4d70f3cfd347ceca5a029f2ffec37d4f124f61311"},
+    {file = "coverage-6.4-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:d548edacbf16a8276af13063a2b0669d58bbcfca7c55a255f84aac2870786a61"},
+    {file = "coverage-6.4-cp38-cp38-macosx_11_0_arm64.whl", hash = "sha256:033ebec282793bd9eb988d0271c211e58442c31077976c19c442e24d827d356f"},
+    {file = "coverage-6.4-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:742fb8b43835078dd7496c3c25a1ec8d15351df49fb0037bffb4754291ef30ce"},
+    {file = "coverage-6.4-cp38-cp38-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:d55fae115ef9f67934e9f1103c9ba826b4c690e4c5bcf94482b8b2398311bf9c"},
+    {file = "coverage-6.4-cp38-cp38-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:5cd698341626f3c77784858427bad0cdd54a713115b423d22ac83a28303d1d95"},
+    {file = "coverage-6.4-cp38-cp38-musllinux_1_1_aarch64.whl", hash = "sha256:62d382f7d77eeeaff14b30516b17bcbe80f645f5cf02bb755baac376591c653c"},
+    {file = "coverage-6.4-cp38-cp38-musllinux_1_1_i686.whl", hash = "sha256:016d7f5cf1c8c84f533a3c1f8f36126fbe00b2ec0ccca47cc5731c3723d327c6"},
+    {file = "coverage-6.4-cp38-cp38-musllinux_1_1_x86_64.whl", hash = "sha256:69432946f154c6add0e9ede03cc43b96e2ef2733110a77444823c053b1ff5166"},
+    {file = "coverage-6.4-cp38-cp38-win32.whl", hash = "sha256:83bd142cdec5e4a5c4ca1d4ff6fa807d28460f9db919f9f6a31babaaa8b88426"},
+    {file = "coverage-6.4-cp38-cp38-win_amd64.whl", hash = "sha256:4002f9e8c1f286e986fe96ec58742b93484195defc01d5cc7809b8f7acb5ece3"},
+    {file = "coverage-6.4-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:e4f52c272fdc82e7c65ff3f17a7179bc5f710ebc8ce8a5cadac81215e8326740"},
+    {file = "coverage-6.4-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:b5578efe4038be02d76c344007b13119b2b20acd009a88dde8adec2de4f630b5"},
+    {file = "coverage-6.4-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:d8099ea680201c2221f8468c372198ceba9338a5fec0e940111962b03b3f716a"},
+    {file = "coverage-6.4-cp39-cp39-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:a00441f5ea4504f5abbc047589d09e0dc33eb447dc45a1a527c8b74bfdd32c65"},
+    {file = "coverage-6.4-cp39-cp39-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:2e76bd16f0e31bc2b07e0fb1379551fcd40daf8cdf7e24f31a29e442878a827c"},
+    {file = "coverage-6.4-cp39-cp39-musllinux_1_1_aarch64.whl", hash = "sha256:8d2e80dd3438e93b19e1223a9850fa65425e77f2607a364b6fd134fcd52dc9df"},
+    {file = "coverage-6.4-cp39-cp39-musllinux_1_1_i686.whl", hash = "sha256:341e9c2008c481c5c72d0e0dbf64980a4b2238631a7f9780b0fe2e95755fb018"},
+    {file = "coverage-6.4-cp39-cp39-musllinux_1_1_x86_64.whl", hash = "sha256:21e6686a95025927775ac501e74f5940cdf6fe052292f3a3f7349b0abae6d00f"},
+    {file = "coverage-6.4-cp39-cp39-win32.whl", hash = "sha256:968ed5407f9460bd5a591cefd1388cc00a8f5099de9e76234655ae48cfdbe2c3"},
+    {file = "coverage-6.4-cp39-cp39-win_amd64.whl", hash = "sha256:e35217031e4b534b09f9b9a5841b9344a30a6357627761d4218818b865d45055"},
+    {file = "coverage-6.4-pp36.pp37.pp38-none-any.whl", hash = "sha256:e637ae0b7b481905358624ef2e81d7fb0b1af55f5ff99f9ba05442a444b11e45"},
+    {file = "coverage-6.4.tar.gz", hash = "sha256:727dafd7f67a6e1cad808dc884bd9c5a2f6ef1f8f6d2f22b37b96cb0080d4f49"},
 ]
 cycler = [
     {file = "cycler-0.11.0-py3-none-any.whl", hash = "sha256:3a27e95f763a428a739d2add979fa7494c912a32c17c4c38c4d5f082cad165a3"},
@@ -1135,8 +1135,8 @@ poyo = [
     {file = "poyo-0.5.0.tar.gz", hash = "sha256:e26956aa780c45f011ca9886f044590e2d8fd8b61db7b1c1cf4e0869f48ed4dd"},
 ]
 pre-commit = [
-    {file = "pre_commit-2.18.1-py2.py3-none-any.whl", hash = "sha256:02226e69564ebca1a070bd1f046af866aa1c318dbc430027c50ab832ed2b73f2"},
-    {file = "pre_commit-2.18.1.tar.gz", hash = "sha256:5d445ee1fa8738d506881c5d84f83c62bb5be6b2838e32207433647e8e5ebe10"},
+    {file = "pre_commit-2.19.0-py2.py3-none-any.whl", hash = "sha256:10c62741aa5704faea2ad69cb550ca78082efe5697d6f04e5710c3c229afdd10"},
+    {file = "pre_commit-2.19.0.tar.gz", hash = "sha256:4233a1e38621c87d9dda9808c6606d7e7ba0e087cd56d3fe03202a01d2919615"},
 ]
 py = [
     {file = "py-1.11.0-py2.py3-none-any.whl", hash = "sha256:607c53218732647dff4acdfcd50cb62615cedf612e72d1724fb1a0cc6405b378"},
diff --git a/pyproject.toml b/pyproject.toml
index 1d6c056b..f5c32e03 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -23,7 +23,7 @@ pytest-cov = "^3.0.0"
 pytest-xdist = "^2.5.0"
 python-dotenv = "^0.20.0"
 tox = "^3.25.0"
-pre-commit = "^2.18.1"
+pre-commit = "^2.19.0"
 
 [tool.poetry.scripts]
 adventofcode = "adventofcode2020.main:main"

From faf3637a644c32a0c2ebc315dfee57b63b4196e0 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 24 May 2022 12:14:21 +0000
Subject: [PATCH 110/371] Bump matplotlib from 3.5.1 to 3.5.2

Bumps [matplotlib](https://github.com/matplotlib/matplotlib) from 3.5.1 to 3.5.2.
- [Release notes](https://github.com/matplotlib/matplotlib/releases)
- [Commits](https://github.com/matplotlib/matplotlib/compare/v3.5.1...v3.5.2)

---
updated-dependencies:
- dependency-name: matplotlib
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 poetry.lock    | 74 +++++++++++++++++++++++++-------------------------
 pyproject.toml |  2 +-
 2 files changed, 38 insertions(+), 38 deletions(-)

diff --git a/poetry.lock b/poetry.lock
index a9e26d08..2ae78de6 100644
--- a/poetry.lock
+++ b/poetry.lock
@@ -323,7 +323,7 @@ python-versions = ">=3.6"
 
 [[package]]
 name = "matplotlib"
-version = "3.5.1"
+version = "3.5.2"
 description = "Python plotting package"
 category = "main"
 optional = false
@@ -720,7 +720,7 @@ testing = ["coverage (>=4)", "coverage-enable-subprocess (>=1)", "flaky (>=3)",
 [metadata]
 lock-version = "1.1"
 python-versions = ">=3.9,<3.11"
-content-hash = "2dd759360430c017b32231bd9749f23da5ae6c88c011abc09da36e19442464ce"
+content-hash = "a84f48d9ebe109161c285e987aa3b8651acdce1fda26b2b4a610fc7b974f1bee"
 
 [metadata.files]
 anytree = [
@@ -1005,41 +1005,41 @@ markupsafe = [
     {file = "MarkupSafe-2.0.1.tar.gz", hash = "sha256:594c67807fb16238b30c44bdf74f36c02cdf22d1c8cda91ef8a0ed8dabf5620a"},
 ]
 matplotlib = [
-    {file = "matplotlib-3.5.1-cp310-cp310-macosx_10_9_universal2.whl", hash = "sha256:456cc8334f6d1124e8ff856b42d2cc1c84335375a16448189999496549f7182b"},
-    {file = "matplotlib-3.5.1-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:8a77906dc2ef9b67407cec0bdbf08e3971141e535db888974a915be5e1e3efc6"},
-    {file = "matplotlib-3.5.1-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:8e70ae6475cfd0fad3816dcbf6cac536dc6f100f7474be58d59fa306e6e768a4"},
-    {file = "matplotlib-3.5.1-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:53273c5487d1c19c3bc03b9eb82adaf8456f243b97ed79d09dded747abaf1235"},
-    {file = "matplotlib-3.5.1-cp310-cp310-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:e3b6f3fd0d8ca37861c31e9a7cab71a0ef14c639b4c95654ea1dd153158bf0df"},
-    {file = "matplotlib-3.5.1-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:e8c87cdaf06fd7b2477f68909838ff4176f105064a72ca9d24d3f2a29f73d393"},
-    {file = "matplotlib-3.5.1-cp310-cp310-win32.whl", hash = "sha256:e2f28a07b4f82abb40267864ad7b3a4ed76f1b1663e81c7efc84a9b9248f672f"},
-    {file = "matplotlib-3.5.1-cp310-cp310-win_amd64.whl", hash = "sha256:d70a32ee1f8b55eed3fd4e892f0286df8cccc7e0475c11d33b5d0a148f5c7599"},
-    {file = "matplotlib-3.5.1-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:68fa30cec89b6139dc559ed6ef226c53fd80396da1919a1b5ef672c911aaa767"},
-    {file = "matplotlib-3.5.1-cp37-cp37m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:2e3484d8455af3fdb0424eae1789af61f6a79da0c80079125112fd5c1b604218"},
-    {file = "matplotlib-3.5.1-cp37-cp37m-manylinux_2_5_i686.manylinux1_i686.whl", hash = "sha256:e293b16cf303fe82995e41700d172a58a15efc5331125d08246b520843ef21ee"},
-    {file = "matplotlib-3.5.1-cp37-cp37m-manylinux_2_5_x86_64.manylinux1_x86_64.whl", hash = "sha256:e3520a274a0e054e919f5b3279ee5dbccf5311833819ccf3399dab7c83e90a25"},
-    {file = "matplotlib-3.5.1-cp37-cp37m-win32.whl", hash = "sha256:2252bfac85cec7af4a67e494bfccf9080bcba8a0299701eab075f48847cca907"},
-    {file = "matplotlib-3.5.1-cp37-cp37m-win_amd64.whl", hash = "sha256:abf67e05a1b7f86583f6ebd01f69b693b9c535276f4e943292e444855870a1b8"},
-    {file = "matplotlib-3.5.1-cp38-cp38-macosx_10_9_universal2.whl", hash = "sha256:6c094e4bfecd2fa7f9adffd03d8abceed7157c928c2976899de282f3600f0a3d"},
-    {file = "matplotlib-3.5.1-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:506b210cc6e66a0d1c2bb765d055f4f6bc2745070fb1129203b67e85bbfa5c18"},
-    {file = "matplotlib-3.5.1-cp38-cp38-macosx_11_0_arm64.whl", hash = "sha256:b04fc29bcef04d4e2d626af28d9d892be6aba94856cb46ed52bcb219ceac8943"},
-    {file = "matplotlib-3.5.1-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:577ed20ec9a18d6bdedb4616f5e9e957b4c08563a9f985563a31fd5b10564d2a"},
-    {file = "matplotlib-3.5.1-cp38-cp38-manylinux_2_5_i686.manylinux1_i686.whl", hash = "sha256:e486f60db0cd1c8d68464d9484fd2a94011c1ac8593d765d0211f9daba2bd535"},
-    {file = "matplotlib-3.5.1-cp38-cp38-manylinux_2_5_x86_64.manylinux1_x86_64.whl", hash = "sha256:b71f3a7ca935fc759f2aed7cec06cfe10bc3100fadb5dbd9c435b04e557971e1"},
-    {file = "matplotlib-3.5.1-cp38-cp38-win32.whl", hash = "sha256:d24e5bb8028541ce25e59390122f5e48c8506b7e35587e5135efcb6471b4ac6c"},
-    {file = "matplotlib-3.5.1-cp38-cp38-win_amd64.whl", hash = "sha256:778d398c4866d8e36ee3bf833779c940b5f57192fa0a549b3ad67bc4c822771b"},
-    {file = "matplotlib-3.5.1-cp39-cp39-macosx_10_9_universal2.whl", hash = "sha256:bb1c613908f11bac270bc7494d68b1ef6e7c224b7a4204d5dacf3522a41e2bc3"},
-    {file = "matplotlib-3.5.1-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:edf5e4e1d5fb22c18820e8586fb867455de3b109c309cb4fce3aaed85d9468d1"},
-    {file = "matplotlib-3.5.1-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:40e0d7df05e8efe60397c69b467fc8f87a2affeb4d562fe92b72ff8937a2b511"},
-    {file = "matplotlib-3.5.1-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:7a350ca685d9f594123f652ba796ee37219bf72c8e0fc4b471473d87121d6d34"},
-    {file = "matplotlib-3.5.1-cp39-cp39-manylinux_2_5_i686.manylinux1_i686.whl", hash = "sha256:3e66497cd990b1a130e21919b004da2f1dc112132c01ac78011a90a0f9229778"},
-    {file = "matplotlib-3.5.1-cp39-cp39-manylinux_2_5_x86_64.manylinux1_x86_64.whl", hash = "sha256:87900c67c0f1728e6db17c6809ec05c025c6624dcf96a8020326ea15378fe8e7"},
-    {file = "matplotlib-3.5.1-cp39-cp39-win32.whl", hash = "sha256:b8a4fb2a0c5afbe9604f8a91d7d0f27b1832c3e0b5e365f95a13015822b4cd65"},
-    {file = "matplotlib-3.5.1-cp39-cp39-win_amd64.whl", hash = "sha256:fe8d40c434a8e2c68d64c6d6a04e77f21791a93ff6afe0dce169597c110d3079"},
-    {file = "matplotlib-3.5.1-pp37-pypy37_pp73-macosx_10_9_x86_64.whl", hash = "sha256:34a1fc29f8f96e78ec57a5eff5e8d8b53d3298c3be6df61e7aa9efba26929522"},
-    {file = "matplotlib-3.5.1-pp37-pypy37_pp73-manylinux_2_12_i686.manylinux2010_i686.whl", hash = "sha256:b19a761b948e939a9e20173aaae76070025f0024fc8f7ba08bef22a5c8573afc"},
-    {file = "matplotlib-3.5.1-pp37-pypy37_pp73-manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:6803299cbf4665eca14428d9e886de62e24f4223ac31ab9c5d6d5339a39782c7"},
-    {file = "matplotlib-3.5.1-pp37-pypy37_pp73-win_amd64.whl", hash = "sha256:14334b9902ec776461c4b8c6516e26b450f7ebe0b3ef8703bf5cdfbbaecf774a"},
-    {file = "matplotlib-3.5.1.tar.gz", hash = "sha256:b2e9810e09c3a47b73ce9cab5a72243a1258f61e7900969097a817232246ce1c"},
+    {file = "matplotlib-3.5.2-cp310-cp310-macosx_10_9_universal2.whl", hash = "sha256:03bbb3f5f78836855e127b5dab228d99551ad0642918ccbf3067fcd52ac7ac5e"},
+    {file = "matplotlib-3.5.2-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:49a5938ed6ef9dda560f26ea930a2baae11ea99e1c2080c8714341ecfda72a89"},
+    {file = "matplotlib-3.5.2-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:77157be0fc4469cbfb901270c205e7d8adb3607af23cef8bd11419600647ceed"},
+    {file = "matplotlib-3.5.2-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:5844cea45d804174bf0fac219b4ab50774e504bef477fc10f8f730ce2d623441"},
+    {file = "matplotlib-3.5.2-cp310-cp310-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:c87973ddec10812bddc6c286b88fdd654a666080fbe846a1f7a3b4ba7b11ab78"},
+    {file = "matplotlib-3.5.2-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:4a05f2b37222319753a5d43c0a4fd97ed4ff15ab502113e3f2625c26728040cf"},
+    {file = "matplotlib-3.5.2-cp310-cp310-win32.whl", hash = "sha256:9776e1a10636ee5f06ca8efe0122c6de57ffe7e8c843e0fb6e001e9d9256ec95"},
+    {file = "matplotlib-3.5.2-cp310-cp310-win_amd64.whl", hash = "sha256:b4fedaa5a9aa9ce14001541812849ed1713112651295fdddd640ea6620e6cf98"},
+    {file = "matplotlib-3.5.2-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:ee175a571e692fc8ae8e41ac353c0e07259113f4cb063b0ec769eff9717e84bb"},
+    {file = "matplotlib-3.5.2-cp37-cp37m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:2e8bda1088b941ead50caabd682601bece983cadb2283cafff56e8fcddbf7d7f"},
+    {file = "matplotlib-3.5.2-cp37-cp37m-manylinux_2_5_i686.manylinux1_i686.whl", hash = "sha256:9480842d5aadb6e754f0b8f4ebeb73065ac8be1855baa93cd082e46e770591e9"},
+    {file = "matplotlib-3.5.2-cp37-cp37m-manylinux_2_5_x86_64.manylinux1_x86_64.whl", hash = "sha256:6c623b355d605a81c661546af7f24414165a8a2022cddbe7380a31a4170fa2e9"},
+    {file = "matplotlib-3.5.2-cp37-cp37m-win32.whl", hash = "sha256:a91426ae910819383d337ba0dc7971c7cefdaa38599868476d94389a329e599b"},
+    {file = "matplotlib-3.5.2-cp37-cp37m-win_amd64.whl", hash = "sha256:c4b82c2ae6d305fcbeb0eb9c93df2602ebd2f174f6e8c8a5d92f9445baa0c1d3"},
+    {file = "matplotlib-3.5.2-cp38-cp38-macosx_10_9_universal2.whl", hash = "sha256:ebc27ad11df3c1661f4677a7762e57a8a91dd41b466c3605e90717c9a5f90c82"},
+    {file = "matplotlib-3.5.2-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:5a32ea6e12e80dedaca2d4795d9ed40f97bfa56e6011e14f31502fdd528b9c89"},
+    {file = "matplotlib-3.5.2-cp38-cp38-macosx_11_0_arm64.whl", hash = "sha256:2a0967d4156adbd0d46db06bc1a877f0370bce28d10206a5071f9ecd6dc60b79"},
+    {file = "matplotlib-3.5.2-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:e2b696699386766ef171a259d72b203a3c75d99d03ec383b97fc2054f52e15cf"},
+    {file = "matplotlib-3.5.2-cp38-cp38-manylinux_2_5_i686.manylinux1_i686.whl", hash = "sha256:7f409716119fa39b03da3d9602bd9b41142fab7a0568758cd136cd80b1bf36c8"},
+    {file = "matplotlib-3.5.2-cp38-cp38-manylinux_2_5_x86_64.manylinux1_x86_64.whl", hash = "sha256:b8d3f4e71e26307e8c120b72c16671d70c5cd08ae412355c11254aa8254fb87f"},
+    {file = "matplotlib-3.5.2-cp38-cp38-win32.whl", hash = "sha256:b6c63cd01cad0ea8704f1fd586e9dc5777ccedcd42f63cbbaa3eae8dd41172a1"},
+    {file = "matplotlib-3.5.2-cp38-cp38-win_amd64.whl", hash = "sha256:75c406c527a3aa07638689586343f4b344fcc7ab1f79c396699eb550cd2b91f7"},
+    {file = "matplotlib-3.5.2-cp39-cp39-macosx_10_9_universal2.whl", hash = "sha256:4a44cdfdb9d1b2f18b1e7d315eb3843abb097869cd1ef89cfce6a488cd1b5182"},
+    {file = "matplotlib-3.5.2-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:3d8e129af95b156b41cb3be0d9a7512cc6d73e2b2109f82108f566dbabdbf377"},
+    {file = "matplotlib-3.5.2-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:364e6bca34edc10a96aa3b1d7cd76eb2eea19a4097198c1b19e89bee47ed5781"},
+    {file = "matplotlib-3.5.2-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:ea75df8e567743207e2b479ba3d8843537be1c146d4b1e3e395319a4e1a77fe9"},
+    {file = "matplotlib-3.5.2-cp39-cp39-manylinux_2_5_i686.manylinux1_i686.whl", hash = "sha256:44c6436868186564450df8fd2fc20ed9daaef5caad699aa04069e87099f9b5a8"},
+    {file = "matplotlib-3.5.2-cp39-cp39-manylinux_2_5_x86_64.manylinux1_x86_64.whl", hash = "sha256:7d7705022df2c42bb02937a2a824f4ec3cca915700dd80dc23916af47ff05f1a"},
+    {file = "matplotlib-3.5.2-cp39-cp39-win32.whl", hash = "sha256:ee0b8e586ac07f83bb2950717e66cb305e2859baf6f00a9c39cc576e0ce9629c"},
+    {file = "matplotlib-3.5.2-cp39-cp39-win_amd64.whl", hash = "sha256:c772264631e5ae61f0bd41313bbe48e1b9bcc95b974033e1118c9caa1a84d5c6"},
+    {file = "matplotlib-3.5.2-pp37-pypy37_pp73-macosx_10_9_x86_64.whl", hash = "sha256:751d3815b555dcd6187ad35b21736dc12ce6925fc3fa363bbc6dc0f86f16484f"},
+    {file = "matplotlib-3.5.2-pp37-pypy37_pp73-manylinux_2_12_i686.manylinux2010_i686.whl", hash = "sha256:31fbc2af27ebb820763f077ec7adc79b5a031c2f3f7af446bd7909674cd59460"},
+    {file = "matplotlib-3.5.2-pp37-pypy37_pp73-manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:4fa28ca76ac5c2b2d54bc058b3dad8e22ee85d26d1ee1b116a6fd4d2277b6a04"},
+    {file = "matplotlib-3.5.2-pp37-pypy37_pp73-win_amd64.whl", hash = "sha256:24173c23d1bcbaed5bf47b8785d27933a1ac26a5d772200a0f3e0e38f471b001"},
+    {file = "matplotlib-3.5.2.tar.gz", hash = "sha256:48cf850ce14fa18067f2d9e0d646763681948487a8080ec0af2686468b4607a2"},
 ]
 mypy-extensions = [
     {file = "mypy_extensions-0.4.3-py2.py3-none-any.whl", hash = "sha256:090fedd75945a69ae91ce1303b5824f428daf5a028d2f6ab8a299250a846f15d"},
diff --git a/pyproject.toml b/pyproject.toml
index f5c32e03..2437c3f3 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -9,7 +9,7 @@ license = "MIT License"
 python = ">=3.9,<3.11"
 anytree = "^2.8.0"
 click = "^8.1.3"
-matplotlib = "3.5.1"
+matplotlib = "3.5.2"
 numpy = "^1.22.3"
 tqdm = "^4.64.0"
 requests = "^2.27.1"

From 355a33fbf1225d29a24c300a0749c0667108629c Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 24 May 2022 12:19:03 +0000
Subject: [PATCH 111/371] Bump numpy from 1.22.3 to 1.22.4

Bumps [numpy](https://github.com/numpy/numpy) from 1.22.3 to 1.22.4.
- [Release notes](https://github.com/numpy/numpy/releases)
- [Changelog](https://github.com/numpy/numpy/blob/main/doc/HOWTO_RELEASE.rst.txt)
- [Commits](https://github.com/numpy/numpy/compare/v1.22.3...v1.22.4)

---
updated-dependencies:
- dependency-name: numpy
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 poetry.lock    | 46 ++++++++++++++++++++++++----------------------
 pyproject.toml |  2 +-
 2 files changed, 25 insertions(+), 23 deletions(-)

diff --git a/poetry.lock b/poetry.lock
index 2ae78de6..70c84fe5 100644
--- a/poetry.lock
+++ b/poetry.lock
@@ -358,7 +358,7 @@ python-versions = "*"
 
 [[package]]
 name = "numpy"
-version = "1.22.3"
+version = "1.22.4"
 description = "NumPy is the fundamental package for array computing with Python."
 category = "main"
 optional = false
@@ -720,7 +720,7 @@ testing = ["coverage (>=4)", "coverage-enable-subprocess (>=1)", "flaky (>=3)",
 [metadata]
 lock-version = "1.1"
 python-versions = ">=3.9,<3.11"
-content-hash = "a84f48d9ebe109161c285e987aa3b8651acdce1fda26b2b4a610fc7b974f1bee"
+content-hash = "23df5d437c0258040cc9f5a54fbbbcab8d69f8e9dd873fe99aa386c1d3a5fcfb"
 
 [metadata.files]
 anytree = [
@@ -1050,26 +1050,28 @@ nodeenv = [
     {file = "nodeenv-1.6.0.tar.gz", hash = "sha256:3ef13ff90291ba2a4a7a4ff9a979b63ffdd00a464dbe04acf0ea6471517a4c2b"},
 ]
 numpy = [
-    {file = "numpy-1.22.3-cp310-cp310-macosx_10_14_x86_64.whl", hash = "sha256:92bfa69cfbdf7dfc3040978ad09a48091143cffb778ec3b03fa170c494118d75"},
-    {file = "numpy-1.22.3-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:8251ed96f38b47b4295b1ae51631de7ffa8260b5b087808ef09a39a9d66c97ab"},
-    {file = "numpy-1.22.3-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:48a3aecd3b997bf452a2dedb11f4e79bc5bfd21a1d4cc760e703c31d57c84b3e"},
-    {file = "numpy-1.22.3-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:a3bae1a2ed00e90b3ba5f7bd0a7c7999b55d609e0c54ceb2b076a25e345fa9f4"},
-    {file = "numpy-1.22.3-cp310-cp310-win32.whl", hash = "sha256:f950f8845b480cffe522913d35567e29dd381b0dc7e4ce6a4a9f9156417d2430"},
-    {file = "numpy-1.22.3-cp310-cp310-win_amd64.whl", hash = "sha256:08d9b008d0156c70dc392bb3ab3abb6e7a711383c3247b410b39962263576cd4"},
-    {file = "numpy-1.22.3-cp38-cp38-macosx_10_14_x86_64.whl", hash = "sha256:201b4d0552831f7250a08d3b38de0d989d6f6e4658b709a02a73c524ccc6ffce"},
-    {file = "numpy-1.22.3-cp38-cp38-macosx_11_0_arm64.whl", hash = "sha256:f8c1f39caad2c896bc0018f699882b345b2a63708008be29b1f355ebf6f933fe"},
-    {file = "numpy-1.22.3-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:568dfd16224abddafb1cbcce2ff14f522abe037268514dd7e42c6776a1c3f8e5"},
-    {file = "numpy-1.22.3-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:3ca688e1b9b95d80250bca34b11a05e389b1420d00e87a0d12dc45f131f704a1"},
-    {file = "numpy-1.22.3-cp38-cp38-win32.whl", hash = "sha256:e7927a589df200c5e23c57970bafbd0cd322459aa7b1ff73b7c2e84d6e3eae62"},
-    {file = "numpy-1.22.3-cp38-cp38-win_amd64.whl", hash = "sha256:07a8c89a04997625236c5ecb7afe35a02af3896c8aa01890a849913a2309c676"},
-    {file = "numpy-1.22.3-cp39-cp39-macosx_10_14_x86_64.whl", hash = "sha256:2c10a93606e0b4b95c9b04b77dc349b398fdfbda382d2a39ba5a822f669a0123"},
-    {file = "numpy-1.22.3-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:fade0d4f4d292b6f39951b6836d7a3c7ef5b2347f3c420cd9820a1d90d794802"},
-    {file = "numpy-1.22.3-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:5bfb1bb598e8229c2d5d48db1860bcf4311337864ea3efdbe1171fb0c5da515d"},
-    {file = "numpy-1.22.3-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:97098b95aa4e418529099c26558eeb8486e66bd1e53a6b606d684d0c3616b168"},
-    {file = "numpy-1.22.3-cp39-cp39-win32.whl", hash = "sha256:fdf3c08bce27132395d3c3ba1503cac12e17282358cb4bddc25cc46b0aca07aa"},
-    {file = "numpy-1.22.3-cp39-cp39-win_amd64.whl", hash = "sha256:639b54cdf6aa4f82fe37ebf70401bbb74b8508fddcf4797f9fe59615b8c5813a"},
-    {file = "numpy-1.22.3-pp38-pypy38_pp73-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:c34ea7e9d13a70bf2ab64a2532fe149a9aced424cd05a2c4ba662fd989e3e45f"},
-    {file = "numpy-1.22.3.zip", hash = "sha256:dbc7601a3b7472d559dc7b933b18b4b66f9aa7452c120e87dfb33d02008c8a18"},
+    {file = "numpy-1.22.4-cp310-cp310-macosx_10_14_x86_64.whl", hash = "sha256:ba9ead61dfb5d971d77b6c131a9dbee62294a932bf6a356e48c75ae684e635b3"},
+    {file = "numpy-1.22.4-cp310-cp310-macosx_10_15_x86_64.whl", hash = "sha256:1ce7ab2053e36c0a71e7a13a7475bd3b1f54750b4b433adc96313e127b870887"},
+    {file = "numpy-1.22.4-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:7228ad13744f63575b3a972d7ee4fd61815b2879998e70930d4ccf9ec721dce0"},
+    {file = "numpy-1.22.4-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:43a8ca7391b626b4c4fe20aefe79fec683279e31e7c79716863b4b25021e0e74"},
+    {file = "numpy-1.22.4-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:a911e317e8c826ea632205e63ed8507e0dc877dcdc49744584dfc363df9ca08c"},
+    {file = "numpy-1.22.4-cp310-cp310-win32.whl", hash = "sha256:9ce7df0abeabe7fbd8ccbf343dc0db72f68549856b863ae3dd580255d009648e"},
+    {file = "numpy-1.22.4-cp310-cp310-win_amd64.whl", hash = "sha256:3e1ffa4748168e1cc8d3cde93f006fe92b5421396221a02f2274aab6ac83b077"},
+    {file = "numpy-1.22.4-cp38-cp38-macosx_10_15_x86_64.whl", hash = "sha256:59d55e634968b8f77d3fd674a3cf0b96e85147cd6556ec64ade018f27e9479e1"},
+    {file = "numpy-1.22.4-cp38-cp38-macosx_11_0_arm64.whl", hash = "sha256:c1d937820db6e43bec43e8d016b9b3165dcb42892ea9f106c70fb13d430ffe72"},
+    {file = "numpy-1.22.4-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:d4c5d5eb2ec8da0b4f50c9a843393971f31f1d60be87e0fb0917a49133d257d6"},
+    {file = "numpy-1.22.4-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:64f56fc53a2d18b1924abd15745e30d82a5782b2cab3429aceecc6875bd5add0"},
+    {file = "numpy-1.22.4-cp38-cp38-win32.whl", hash = "sha256:fb7a980c81dd932381f8228a426df8aeb70d59bbcda2af075b627bbc50207cba"},
+    {file = "numpy-1.22.4-cp38-cp38-win_amd64.whl", hash = "sha256:e96d7f3096a36c8754207ab89d4b3282ba7b49ea140e4973591852c77d09eb76"},
+    {file = "numpy-1.22.4-cp39-cp39-macosx_10_14_x86_64.whl", hash = "sha256:4c6036521f11a731ce0648f10c18ae66d7143865f19f7299943c985cdc95afb5"},
+    {file = "numpy-1.22.4-cp39-cp39-macosx_10_15_x86_64.whl", hash = "sha256:b89bf9b94b3d624e7bb480344e91f68c1c6c75f026ed6755955117de00917a7c"},
+    {file = "numpy-1.22.4-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:2d487e06ecbf1dc2f18e7efce82ded4f705f4bd0cd02677ffccfb39e5c284c7e"},
+    {file = "numpy-1.22.4-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:f3eb268dbd5cfaffd9448113539e44e2dd1c5ca9ce25576f7c04a5453edc26fa"},
+    {file = "numpy-1.22.4-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:37431a77ceb9307c28382c9773da9f306435135fae6b80b62a11c53cfedd8802"},
+    {file = "numpy-1.22.4-cp39-cp39-win32.whl", hash = "sha256:cc7f00008eb7d3f2489fca6f334ec19ca63e31371be28fd5dad955b16ec285bd"},
+    {file = "numpy-1.22.4-cp39-cp39-win_amd64.whl", hash = "sha256:f0725df166cf4785c0bc4cbfb320203182b1ecd30fee6e541c8752a92df6aa32"},
+    {file = "numpy-1.22.4-pp38-pypy38_pp73-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:0791fbd1e43bf74b3502133207e378901272f3c156c4df4954cad833b1380207"},
+    {file = "numpy-1.22.4.zip", hash = "sha256:425b390e4619f58d8526b3dcf656dde069133ae5c240229821f01b5f44ea07af"},
 ]
 packaging = [
     {file = "packaging-21.2-py3-none-any.whl", hash = "sha256:14317396d1e8cdb122989b916fa2c7e9ca8e2be9e8060a6eff75b6b7b4d8a7e0"},
diff --git a/pyproject.toml b/pyproject.toml
index 2437c3f3..911dcc45 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -10,7 +10,7 @@ python = ">=3.9,<3.11"
 anytree = "^2.8.0"
 click = "^8.1.3"
 matplotlib = "3.5.2"
-numpy = "^1.22.3"
+numpy = "^1.22.4"
 tqdm = "^4.64.0"
 requests = "^2.27.1"
 beautifulsoup4 = "^4.11.1"

From 6d56d1da80fbb691e9b49b3fb2ba446155a40ed8 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 9 Jun 2022 03:22:16 +0000
Subject: [PATCH 112/371] Bump actions/setup-python from 3 to 4

Bumps [actions/setup-python](https://github.com/actions/setup-python) from 3 to 4.
- [Release notes](https://github.com/actions/setup-python/releases)
- [Commits](https://github.com/actions/setup-python/compare/v3...v4)

---
updated-dependencies:
- dependency-name: actions/setup-python
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 .github/workflows/tox.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/tox.yml b/.github/workflows/tox.yml
index b583c3a5..a2b9c184 100644
--- a/.github/workflows/tox.yml
+++ b/.github/workflows/tox.yml
@@ -14,7 +14,7 @@ jobs:
     - uses: actions/checkout@v3
 
     - name: Set up Python ${{ matrix.python-version }}
-      uses: actions/setup-python@v3
+      uses: actions/setup-python@v4
       with:
         python-version: ${{ matrix.python-version }}
 

From dfcc135460a629a7d715f595ed235876b73a5ea1 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sun, 3 Jul 2022 14:37:33 +0000
Subject: [PATCH 113/371] Bump tox from 3.25.0 to 3.25.1

Bumps [tox](https://github.com/tox-dev/tox) from 3.25.0 to 3.25.1.
- [Release notes](https://github.com/tox-dev/tox/releases)
- [Changelog](https://github.com/tox-dev/tox/blob/master/docs/changelog.rst)
- [Commits](https://github.com/tox-dev/tox/compare/3.25.0...3.25.1)

---
updated-dependencies:
- dependency-name: tox
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 poetry.lock    | 94 +++++++++++++++++++++++++-------------------------
 pyproject.toml |  2 +-
 2 files changed, 48 insertions(+), 48 deletions(-)

diff --git a/poetry.lock b/poetry.lock
index 2c3cf0cc..e7819b8a 100644
--- a/poetry.lock
+++ b/poetry.lock
@@ -179,14 +179,14 @@ six = ">=1.10"
 
 [[package]]
 name = "coverage"
-version = "6.3.2"
+version = "6.4.1"
 description = "Code coverage measurement for Python"
 category = "dev"
 optional = false
 python-versions = ">=3.7"
 
 [package.dependencies]
-tomli = {version = "*", optional = true, markers = "extra == \"toml\""}
+tomli = {version = "*", optional = true, markers = "python_full_version <= \"3.11.0a6\" and extra == \"toml\""}
 
 [package.extras]
 toml = ["tomli"]
@@ -569,7 +569,7 @@ python-versions = ">=3.6"
 
 [[package]]
 name = "tox"
-version = "3.25.0"
+version = "3.25.1"
 description = "tox is a generic virtualenv management and test command line tool"
 category = "dev"
 optional = false
@@ -641,7 +641,7 @@ testing = ["coverage (>=4)", "coverage-enable-subprocess (>=1)", "flaky (>=3)",
 [metadata]
 lock-version = "1.1"
 python-versions = "^3.10"
-content-hash = "974b87bd1fb9e76edaadd551593815c094d950416d9386981dc14b2739142310"
+content-hash = "1b7b2953360a103db7fa3e9593d50f18c9ba5e95c8c8321dcf41f61c53dfbc91"
 
 [metadata.files]
 anytree = [
@@ -726,47 +726,47 @@ cookiecutter = [
     {file = "cookiecutter-1.7.3.tar.gz", hash = "sha256:6b9a4d72882e243be077a7397d0f1f76fe66cf3df91f3115dbb5330e214fa457"},
 ]
 coverage = [
-    {file = "coverage-6.3.2-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:9b27d894748475fa858f9597c0ee1d4829f44683f3813633aaf94b19cb5453cf"},
-    {file = "coverage-6.3.2-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:37d1141ad6b2466a7b53a22e08fe76994c2d35a5b6b469590424a9953155afac"},
-    {file = "coverage-6.3.2-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:f9987b0354b06d4df0f4d3e0ec1ae76d7ce7cbca9a2f98c25041eb79eec766f1"},
-    {file = "coverage-6.3.2-cp310-cp310-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:26e2deacd414fc2f97dd9f7676ee3eaecd299ca751412d89f40bc01557a6b1b4"},
-    {file = "coverage-6.3.2-cp310-cp310-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:4dd8bafa458b5c7d061540f1ee9f18025a68e2d8471b3e858a9dad47c8d41903"},
-    {file = "coverage-6.3.2-cp310-cp310-musllinux_1_1_aarch64.whl", hash = "sha256:46191097ebc381fbf89bdce207a6c107ac4ec0890d8d20f3360345ff5976155c"},
-    {file = "coverage-6.3.2-cp310-cp310-musllinux_1_1_i686.whl", hash = "sha256:6f89d05e028d274ce4fa1a86887b071ae1755082ef94a6740238cd7a8178804f"},
-    {file = "coverage-6.3.2-cp310-cp310-musllinux_1_1_x86_64.whl", hash = "sha256:58303469e9a272b4abdb9e302a780072c0633cdcc0165db7eec0f9e32f901e05"},
-    {file = "coverage-6.3.2-cp310-cp310-win32.whl", hash = "sha256:2fea046bfb455510e05be95e879f0e768d45c10c11509e20e06d8fcaa31d9e39"},
-    {file = "coverage-6.3.2-cp310-cp310-win_amd64.whl", hash = "sha256:a2a8b8bcc399edb4347a5ca8b9b87e7524c0967b335fbb08a83c8421489ddee1"},
-    {file = "coverage-6.3.2-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:f1555ea6d6da108e1999b2463ea1003fe03f29213e459145e70edbaf3e004aaa"},
-    {file = "coverage-6.3.2-cp37-cp37m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:e5f4e1edcf57ce94e5475fe09e5afa3e3145081318e5fd1a43a6b4539a97e518"},
-    {file = "coverage-6.3.2-cp37-cp37m-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:7a15dc0a14008f1da3d1ebd44bdda3e357dbabdf5a0b5034d38fcde0b5c234b7"},
-    {file = "coverage-6.3.2-cp37-cp37m-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:21b7745788866028adeb1e0eca3bf1101109e2dc58456cb49d2d9b99a8c516e6"},
-    {file = "coverage-6.3.2-cp37-cp37m-musllinux_1_1_aarch64.whl", hash = "sha256:8ce257cac556cb03be4a248d92ed36904a59a4a5ff55a994e92214cde15c5bad"},
-    {file = "coverage-6.3.2-cp37-cp37m-musllinux_1_1_i686.whl", hash = "sha256:b0be84e5a6209858a1d3e8d1806c46214e867ce1b0fd32e4ea03f4bd8b2e3359"},
-    {file = "coverage-6.3.2-cp37-cp37m-musllinux_1_1_x86_64.whl", hash = "sha256:acf53bc2cf7282ab9b8ba346746afe703474004d9e566ad164c91a7a59f188a4"},
-    {file = "coverage-6.3.2-cp37-cp37m-win32.whl", hash = "sha256:8bdde1177f2311ee552f47ae6e5aa7750c0e3291ca6b75f71f7ffe1f1dab3dca"},
-    {file = "coverage-6.3.2-cp37-cp37m-win_amd64.whl", hash = "sha256:b31651d018b23ec463e95cf10070d0b2c548aa950a03d0b559eaa11c7e5a6fa3"},
-    {file = "coverage-6.3.2-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:07e6db90cd9686c767dcc593dff16c8c09f9814f5e9c51034066cad3373b914d"},
-    {file = "coverage-6.3.2-cp38-cp38-macosx_11_0_arm64.whl", hash = "sha256:2c6dbb42f3ad25760010c45191e9757e7dce981cbfb90e42feef301d71540059"},
-    {file = "coverage-6.3.2-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:c76aeef1b95aff3905fb2ae2d96e319caca5b76fa41d3470b19d4e4a3a313512"},
-    {file = "coverage-6.3.2-cp38-cp38-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:8cf5cfcb1521dc3255d845d9dca3ff204b3229401994ef8d1984b32746bb45ca"},
-    {file = "coverage-6.3.2-cp38-cp38-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:8fbbdc8d55990eac1b0919ca69eb5a988a802b854488c34b8f37f3e2025fa90d"},
-    {file = "coverage-6.3.2-cp38-cp38-musllinux_1_1_aarch64.whl", hash = "sha256:ec6bc7fe73a938933d4178c9b23c4e0568e43e220aef9472c4f6044bfc6dd0f0"},
-    {file = "coverage-6.3.2-cp38-cp38-musllinux_1_1_i686.whl", hash = "sha256:9baff2a45ae1f17c8078452e9e5962e518eab705e50a0aa8083733ea7d45f3a6"},
-    {file = "coverage-6.3.2-cp38-cp38-musllinux_1_1_x86_64.whl", hash = "sha256:fd9e830e9d8d89b20ab1e5af09b32d33e1a08ef4c4e14411e559556fd788e6b2"},
-    {file = "coverage-6.3.2-cp38-cp38-win32.whl", hash = "sha256:f7331dbf301b7289013175087636bbaf5b2405e57259dd2c42fdcc9fcc47325e"},
-    {file = "coverage-6.3.2-cp38-cp38-win_amd64.whl", hash = "sha256:68353fe7cdf91f109fc7d474461b46e7f1f14e533e911a2a2cbb8b0fc8613cf1"},
-    {file = "coverage-6.3.2-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:b78e5afb39941572209f71866aa0b206c12f0109835aa0d601e41552f9b3e620"},
-    {file = "coverage-6.3.2-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:4e21876082ed887baed0146fe222f861b5815455ada3b33b890f4105d806128d"},
-    {file = "coverage-6.3.2-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:34626a7eee2a3da12af0507780bb51eb52dca0e1751fd1471d0810539cefb536"},
-    {file = "coverage-6.3.2-cp39-cp39-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:1ebf730d2381158ecf3dfd4453fbca0613e16eaa547b4170e2450c9707665ce7"},
-    {file = "coverage-6.3.2-cp39-cp39-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:dd6fe30bd519694b356cbfcaca9bd5c1737cddd20778c6a581ae20dc8c04def2"},
-    {file = "coverage-6.3.2-cp39-cp39-musllinux_1_1_aarch64.whl", hash = "sha256:96f8a1cb43ca1422f36492bebe63312d396491a9165ed3b9231e778d43a7fca4"},
-    {file = "coverage-6.3.2-cp39-cp39-musllinux_1_1_i686.whl", hash = "sha256:dd035edafefee4d573140a76fdc785dc38829fe5a455c4bb12bac8c20cfc3d69"},
-    {file = "coverage-6.3.2-cp39-cp39-musllinux_1_1_x86_64.whl", hash = "sha256:5ca5aeb4344b30d0bec47481536b8ba1181d50dbe783b0e4ad03c95dc1296684"},
-    {file = "coverage-6.3.2-cp39-cp39-win32.whl", hash = "sha256:f5fa5803f47e095d7ad8443d28b01d48c0359484fec1b9d8606d0e3282084bc4"},
-    {file = "coverage-6.3.2-cp39-cp39-win_amd64.whl", hash = "sha256:9548f10d8be799551eb3a9c74bbf2b4934ddb330e08a73320123c07f95cc2d92"},
-    {file = "coverage-6.3.2-pp36.pp37.pp38-none-any.whl", hash = "sha256:18d520c6860515a771708937d2f78f63cc47ab3b80cb78e86573b0a760161faf"},
-    {file = "coverage-6.3.2.tar.gz", hash = "sha256:03e2a7826086b91ef345ff18742ee9fc47a6839ccd517061ef8fa1976e652ce9"},
+    {file = "coverage-6.4.1-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:f1d5aa2703e1dab4ae6cf416eb0095304f49d004c39e9db1d86f57924f43006b"},
+    {file = "coverage-6.4.1-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:4ce1b258493cbf8aec43e9b50d89982346b98e9ffdfaae8ae5793bc112fb0068"},
+    {file = "coverage-6.4.1-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:83c4e737f60c6936460c5be330d296dd5b48b3963f48634c53b3f7deb0f34ec4"},
+    {file = "coverage-6.4.1-cp310-cp310-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:84e65ef149028516c6d64461b95a8dbcfce95cfd5b9eb634320596173332ea84"},
+    {file = "coverage-6.4.1-cp310-cp310-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:f69718750eaae75efe506406c490d6fc5a6161d047206cc63ce25527e8a3adad"},
+    {file = "coverage-6.4.1-cp310-cp310-musllinux_1_1_aarch64.whl", hash = "sha256:e57816f8ffe46b1df8f12e1b348f06d164fd5219beba7d9433ba79608ef011cc"},
+    {file = "coverage-6.4.1-cp310-cp310-musllinux_1_1_i686.whl", hash = "sha256:01c5615d13f3dd3aa8543afc069e5319cfa0c7d712f6e04b920431e5c564a749"},
+    {file = "coverage-6.4.1-cp310-cp310-musllinux_1_1_x86_64.whl", hash = "sha256:75ab269400706fab15981fd4bd5080c56bd5cc07c3bccb86aab5e1d5a88dc8f4"},
+    {file = "coverage-6.4.1-cp310-cp310-win32.whl", hash = "sha256:a7f3049243783df2e6cc6deafc49ea123522b59f464831476d3d1448e30d72df"},
+    {file = "coverage-6.4.1-cp310-cp310-win_amd64.whl", hash = "sha256:ee2ddcac99b2d2aec413e36d7a429ae9ebcadf912946b13ffa88e7d4c9b712d6"},
+    {file = "coverage-6.4.1-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:fb73e0011b8793c053bfa85e53129ba5f0250fdc0392c1591fd35d915ec75c46"},
+    {file = "coverage-6.4.1-cp37-cp37m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:106c16dfe494de3193ec55cac9640dd039b66e196e4641fa8ac396181578b982"},
+    {file = "coverage-6.4.1-cp37-cp37m-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:87f4f3df85aa39da00fd3ec4b5abeb7407e82b68c7c5ad181308b0e2526da5d4"},
+    {file = "coverage-6.4.1-cp37-cp37m-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:961e2fb0680b4f5ad63234e0bf55dfb90d302740ae9c7ed0120677a94a1590cb"},
+    {file = "coverage-6.4.1-cp37-cp37m-musllinux_1_1_aarch64.whl", hash = "sha256:cec3a0f75c8f1031825e19cd86ee787e87cf03e4fd2865c79c057092e69e3a3b"},
+    {file = "coverage-6.4.1-cp37-cp37m-musllinux_1_1_i686.whl", hash = "sha256:129cd05ba6f0d08a766d942a9ed4b29283aff7b2cccf5b7ce279d50796860bb3"},
+    {file = "coverage-6.4.1-cp37-cp37m-musllinux_1_1_x86_64.whl", hash = "sha256:bf5601c33213d3cb19d17a796f8a14a9eaa5e87629a53979a5981e3e3ae166f6"},
+    {file = "coverage-6.4.1-cp37-cp37m-win32.whl", hash = "sha256:269eaa2c20a13a5bf17558d4dc91a8d078c4fa1872f25303dddcbba3a813085e"},
+    {file = "coverage-6.4.1-cp37-cp37m-win_amd64.whl", hash = "sha256:f02cbbf8119db68455b9d763f2f8737bb7db7e43720afa07d8eb1604e5c5ae28"},
+    {file = "coverage-6.4.1-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:ffa9297c3a453fba4717d06df579af42ab9a28022444cae7fa605af4df612d54"},
+    {file = "coverage-6.4.1-cp38-cp38-macosx_11_0_arm64.whl", hash = "sha256:145f296d00441ca703a659e8f3eb48ae39fb083baba2d7ce4482fb2723e050d9"},
+    {file = "coverage-6.4.1-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:d67d44996140af8b84284e5e7d398e589574b376fb4de8ccd28d82ad8e3bea13"},
+    {file = "coverage-6.4.1-cp38-cp38-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:2bd9a6fc18aab8d2e18f89b7ff91c0f34ff4d5e0ba0b33e989b3cd4194c81fd9"},
+    {file = "coverage-6.4.1-cp38-cp38-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:3384f2a3652cef289e38100f2d037956194a837221edd520a7ee5b42d00cc605"},
+    {file = "coverage-6.4.1-cp38-cp38-musllinux_1_1_aarch64.whl", hash = "sha256:9b3e07152b4563722be523e8cd0b209e0d1a373022cfbde395ebb6575bf6790d"},
+    {file = "coverage-6.4.1-cp38-cp38-musllinux_1_1_i686.whl", hash = "sha256:1480ff858b4113db2718848d7b2d1b75bc79895a9c22e76a221b9d8d62496428"},
+    {file = "coverage-6.4.1-cp38-cp38-musllinux_1_1_x86_64.whl", hash = "sha256:865d69ae811a392f4d06bde506d531f6a28a00af36f5c8649684a9e5e4a85c83"},
+    {file = "coverage-6.4.1-cp38-cp38-win32.whl", hash = "sha256:664a47ce62fe4bef9e2d2c430306e1428ecea207ffd68649e3b942fa8ea83b0b"},
+    {file = "coverage-6.4.1-cp38-cp38-win_amd64.whl", hash = "sha256:26dff09fb0d82693ba9e6231248641d60ba606150d02ed45110f9ec26404ed1c"},
+    {file = "coverage-6.4.1-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:d9c80df769f5ec05ad21ea34be7458d1dc51ff1fb4b2219e77fe24edf462d6df"},
+    {file = "coverage-6.4.1-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:39ee53946bf009788108b4dd2894bf1349b4e0ca18c2016ffa7d26ce46b8f10d"},
+    {file = "coverage-6.4.1-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:f5b66caa62922531059bc5ac04f836860412f7f88d38a476eda0a6f11d4724f4"},
+    {file = "coverage-6.4.1-cp39-cp39-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:fd180ed867e289964404051a958f7cccabdeed423f91a899829264bb7974d3d3"},
+    {file = "coverage-6.4.1-cp39-cp39-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:84631e81dd053e8a0d4967cedab6db94345f1c36107c71698f746cb2636c63e3"},
+    {file = "coverage-6.4.1-cp39-cp39-musllinux_1_1_aarch64.whl", hash = "sha256:8c08da0bd238f2970230c2a0d28ff0e99961598cb2e810245d7fc5afcf1254e8"},
+    {file = "coverage-6.4.1-cp39-cp39-musllinux_1_1_i686.whl", hash = "sha256:d42c549a8f41dc103a8004b9f0c433e2086add8a719da00e246e17cbe4056f72"},
+    {file = "coverage-6.4.1-cp39-cp39-musllinux_1_1_x86_64.whl", hash = "sha256:309ce4a522ed5fca432af4ebe0f32b21d6d7ccbb0f5fcc99290e71feba67c264"},
+    {file = "coverage-6.4.1-cp39-cp39-win32.whl", hash = "sha256:fdb6f7bd51c2d1714cea40718f6149ad9be6a2ee7d93b19e9f00934c0f2a74d9"},
+    {file = "coverage-6.4.1-cp39-cp39-win_amd64.whl", hash = "sha256:342d4aefd1c3e7f620a13f4fe563154d808b69cccef415415aece4c786665397"},
+    {file = "coverage-6.4.1-pp36.pp37.pp38-none-any.whl", hash = "sha256:4803e7ccf93230accb928f3a68f00ffa80a88213af98ed338a57ad021ef06815"},
+    {file = "coverage-6.4.1.tar.gz", hash = "sha256:4321f075095a096e70aff1d002030ee612b65a205a0a0f5b815280d5dc58100c"},
 ]
 distlib = [
     {file = "distlib-0.3.3-py2.py3-none-any.whl", hash = "sha256:c8b54e8454e5bf6237cc84c20e8264c3e991e824ef27e8f1e81049867d861e31"},
@@ -1003,8 +1003,8 @@ tomli = [
     {file = "tomli-1.2.2.tar.gz", hash = "sha256:c6ce0015eb38820eaf32b5db832dbc26deb3dd427bd5f6556cf0acac2c214fee"},
 ]
 tox = [
-    {file = "tox-3.25.0-py2.py3-none-any.whl", hash = "sha256:0805727eb4d6b049de304977dfc9ce315a1938e6619c3ab9f38682bb04662a5a"},
-    {file = "tox-3.25.0.tar.gz", hash = "sha256:37888f3092aa4e9f835fc8cc6dadbaaa0782651c41ef359e3a5743fcb0308160"},
+    {file = "tox-3.25.1-py2.py3-none-any.whl", hash = "sha256:c38e15f4733683a9cc0129fba078633e07eb0961f550a010ada879e95fb32632"},
+    {file = "tox-3.25.1.tar.gz", hash = "sha256:c138327815f53bc6da4fe56baec5f25f00622ae69ef3fe4e1e385720e22486f9"},
 ]
 tqdm = [
     {file = "tqdm-4.64.0-py2.py3-none-any.whl", hash = "sha256:74a2cdefe14d11442cedf3ba4e21a3b84ff9a2dbdc6cfae2c34addb2a14a5ea6"},
diff --git a/pyproject.toml b/pyproject.toml
index ca5b5055..58dfc69a 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -20,7 +20,7 @@ pytest = "^7.1.2"
 pytest-cov = "^3.0.0"
 pytest-xdist = "^2.5.0"
 python-dotenv = "^0.20.0"
-tox = "^3.25.0"
+tox = "^3.25.1"
 pre-commit = "^2.18.1"
 isort = "^5.10.1"
 

From cfa680e33efa4ce3313ed45456a89bafd4d77bc0 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sun, 3 Jul 2022 14:38:39 +0000
Subject: [PATCH 114/371] Bump pre-commit from 2.18.1 to 2.19.0

Bumps [pre-commit](https://github.com/pre-commit/pre-commit) from 2.18.1 to 2.19.0.
- [Release notes](https://github.com/pre-commit/pre-commit/releases)
- [Changelog](https://github.com/pre-commit/pre-commit/blob/main/CHANGELOG.md)
- [Commits](https://github.com/pre-commit/pre-commit/compare/v2.18.1...v2.19.0)

---
updated-dependencies:
- dependency-name: pre-commit
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 poetry.lock    | 8 ++++----
 pyproject.toml | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/poetry.lock b/poetry.lock
index e7819b8a..f02b6308 100644
--- a/poetry.lock
+++ b/poetry.lock
@@ -366,7 +366,7 @@ python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*"
 
 [[package]]
 name = "pre-commit"
-version = "2.18.1"
+version = "2.19.0"
 description = "A framework for managing and maintaining multi-language pre-commit hooks."
 category = "dev"
 optional = false
@@ -641,7 +641,7 @@ testing = ["coverage (>=4)", "coverage-enable-subprocess (>=1)", "flaky (>=3)",
 [metadata]
 lock-version = "1.1"
 python-versions = "^3.10"
-content-hash = "1b7b2953360a103db7fa3e9593d50f18c9ba5e95c8c8321dcf41f61c53dfbc91"
+content-hash = "bb07d375736e43e958c312b3f461b7cf88c264e61c5e9446f600ca7d35975981"
 
 [metadata.files]
 anytree = [
@@ -904,8 +904,8 @@ poyo = [
     {file = "poyo-0.5.0.tar.gz", hash = "sha256:e26956aa780c45f011ca9886f044590e2d8fd8b61db7b1c1cf4e0869f48ed4dd"},
 ]
 pre-commit = [
-    {file = "pre_commit-2.18.1-py2.py3-none-any.whl", hash = "sha256:02226e69564ebca1a070bd1f046af866aa1c318dbc430027c50ab832ed2b73f2"},
-    {file = "pre_commit-2.18.1.tar.gz", hash = "sha256:5d445ee1fa8738d506881c5d84f83c62bb5be6b2838e32207433647e8e5ebe10"},
+    {file = "pre_commit-2.19.0-py2.py3-none-any.whl", hash = "sha256:10c62741aa5704faea2ad69cb550ca78082efe5697d6f04e5710c3c229afdd10"},
+    {file = "pre_commit-2.19.0.tar.gz", hash = "sha256:4233a1e38621c87d9dda9808c6606d7e7ba0e087cd56d3fe03202a01d2919615"},
 ]
 py = [
     {file = "py-1.11.0-py2.py3-none-any.whl", hash = "sha256:607c53218732647dff4acdfcd50cb62615cedf612e72d1724fb1a0cc6405b378"},
diff --git a/pyproject.toml b/pyproject.toml
index 58dfc69a..14ace123 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -21,7 +21,7 @@ pytest-cov = "^3.0.0"
 pytest-xdist = "^2.5.0"
 python-dotenv = "^0.20.0"
 tox = "^3.25.1"
-pre-commit = "^2.18.1"
+pre-commit = "^2.19.0"
 isort = "^5.10.1"
 
 [tool.poetry.scripts]

From 468dca7ed16bac18ffdd442d72fec6f29e56a009 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sun, 3 Jul 2022 14:40:51 +0000
Subject: [PATCH 115/371] Bump black from 22.3.0 to 22.6.0

Bumps [black](https://github.com/psf/black) from 22.3.0 to 22.6.0.
- [Release notes](https://github.com/psf/black/releases)
- [Changelog](https://github.com/psf/black/blob/main/CHANGES.md)
- [Commits](https://github.com/psf/black/compare/22.3.0...22.6.0)

---
updated-dependencies:
- dependency-name: black
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 poetry.lock    | 52 +++++++++++++++++++++++++-------------------------
 pyproject.toml |  2 +-
 2 files changed, 27 insertions(+), 27 deletions(-)

diff --git a/poetry.lock b/poetry.lock
index f02b6308..778b1154 100644
--- a/poetry.lock
+++ b/poetry.lock
@@ -86,7 +86,7 @@ chardet = ">=3.0.2"
 
 [[package]]
 name = "black"
-version = "22.3.0"
+version = "22.6.0"
 description = "The uncompromising code formatter."
 category = "dev"
 optional = false
@@ -97,7 +97,7 @@ click = ">=8.0.0"
 mypy-extensions = ">=0.4.3"
 pathspec = ">=0.9.0"
 platformdirs = ">=2"
-tomli = {version = ">=1.1.0", markers = "python_version < \"3.11\""}
+tomli = {version = ">=1.1.0", markers = "python_full_version < \"3.11.0a7\""}
 
 [package.extras]
 colorama = ["colorama (>=0.4.3)"]
@@ -641,7 +641,7 @@ testing = ["coverage (>=4)", "coverage-enable-subprocess (>=1)", "flaky (>=3)",
 [metadata]
 lock-version = "1.1"
 python-versions = "^3.10"
-content-hash = "bb07d375736e43e958c312b3f461b7cf88c264e61c5e9446f600ca7d35975981"
+content-hash = "1128c8909ec981ce43464ed8c6ec5f4529226ca498464d3aa31e3b00d577eef3"
 
 [metadata.files]
 anytree = [
@@ -673,29 +673,29 @@ binaryornot = [
     {file = "binaryornot-0.4.4.tar.gz", hash = "sha256:359501dfc9d40632edc9fac890e19542db1a287bbcfa58175b66658392018061"},
 ]
 black = [
-    {file = "black-22.3.0-cp310-cp310-macosx_10_9_universal2.whl", hash = "sha256:2497f9c2386572e28921fa8bec7be3e51de6801f7459dffd6e62492531c47e09"},
-    {file = "black-22.3.0-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:5795a0375eb87bfe902e80e0c8cfaedf8af4d49694d69161e5bd3206c18618bb"},
-    {file = "black-22.3.0-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:e3556168e2e5c49629f7b0f377070240bd5511e45e25a4497bb0073d9dda776a"},
-    {file = "black-22.3.0-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:67c8301ec94e3bcc8906740fe071391bce40a862b7be0b86fb5382beefecd968"},
-    {file = "black-22.3.0-cp310-cp310-win_amd64.whl", hash = "sha256:fd57160949179ec517d32ac2ac898b5f20d68ed1a9c977346efbac9c2f1e779d"},
-    {file = "black-22.3.0-cp36-cp36m-macosx_10_9_x86_64.whl", hash = "sha256:cc1e1de68c8e5444e8f94c3670bb48a2beef0e91dddfd4fcc29595ebd90bb9ce"},
-    {file = "black-22.3.0-cp36-cp36m-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:6d2fc92002d44746d3e7db7cf9313cf4452f43e9ea77a2c939defce3b10b5c82"},
-    {file = "black-22.3.0-cp36-cp36m-win_amd64.whl", hash = "sha256:a6342964b43a99dbc72f72812bf88cad8f0217ae9acb47c0d4f141a6416d2d7b"},
-    {file = "black-22.3.0-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:328efc0cc70ccb23429d6be184a15ce613f676bdfc85e5fe8ea2a9354b4e9015"},
-    {file = "black-22.3.0-cp37-cp37m-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:06f9d8846f2340dfac80ceb20200ea5d1b3f181dd0556b47af4e8e0b24fa0a6b"},
-    {file = "black-22.3.0-cp37-cp37m-win_amd64.whl", hash = "sha256:ad4efa5fad66b903b4a5f96d91461d90b9507a812b3c5de657d544215bb7877a"},
-    {file = "black-22.3.0-cp38-cp38-macosx_10_9_universal2.whl", hash = "sha256:e8477ec6bbfe0312c128e74644ac8a02ca06bcdb8982d4ee06f209be28cdf163"},
-    {file = "black-22.3.0-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:637a4014c63fbf42a692d22b55d8ad6968a946b4a6ebc385c5505d9625b6a464"},
-    {file = "black-22.3.0-cp38-cp38-macosx_11_0_arm64.whl", hash = "sha256:863714200ada56cbc366dc9ae5291ceb936573155f8bf8e9de92aef51f3ad0f0"},
-    {file = "black-22.3.0-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:10dbe6e6d2988049b4655b2b739f98785a884d4d6b85bc35133a8fb9a2233176"},
-    {file = "black-22.3.0-cp38-cp38-win_amd64.whl", hash = "sha256:cee3e11161dde1b2a33a904b850b0899e0424cc331b7295f2a9698e79f9a69a0"},
-    {file = "black-22.3.0-cp39-cp39-macosx_10_9_universal2.whl", hash = "sha256:5891ef8abc06576985de8fa88e95ab70641de6c1fca97e2a15820a9b69e51b20"},
-    {file = "black-22.3.0-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:30d78ba6bf080eeaf0b7b875d924b15cd46fec5fd044ddfbad38c8ea9171043a"},
-    {file = "black-22.3.0-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:ee8f1f7228cce7dffc2b464f07ce769f478968bfb3dd1254a4c2eeed84928aad"},
-    {file = "black-22.3.0-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:6ee227b696ca60dd1c507be80a6bc849a5a6ab57ac7352aad1ffec9e8b805f21"},
-    {file = "black-22.3.0-cp39-cp39-win_amd64.whl", hash = "sha256:9b542ced1ec0ceeff5b37d69838106a6348e60db7b8fdd245294dc1d26136265"},
-    {file = "black-22.3.0-py3-none-any.whl", hash = "sha256:bc58025940a896d7e5356952228b68f793cf5fcb342be703c3a2669a1488cb72"},
-    {file = "black-22.3.0.tar.gz", hash = "sha256:35020b8886c022ced9282b51b5a875b6d1ab0c387b31a065b84db7c33085ca79"},
+    {file = "black-22.6.0-cp310-cp310-macosx_10_9_universal2.whl", hash = "sha256:f586c26118bc6e714ec58c09df0157fe2d9ee195c764f630eb0d8e7ccce72e69"},
+    {file = "black-22.6.0-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:b270a168d69edb8b7ed32c193ef10fd27844e5c60852039599f9184460ce0807"},
+    {file = "black-22.6.0-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:6797f58943fceb1c461fb572edbe828d811e719c24e03375fd25170ada53825e"},
+    {file = "black-22.6.0-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:c85928b9d5f83b23cee7d0efcb310172412fbf7cb9d9ce963bd67fd141781def"},
+    {file = "black-22.6.0-cp310-cp310-win_amd64.whl", hash = "sha256:f6fe02afde060bbeef044af7996f335fbe90b039ccf3f5eb8f16df8b20f77666"},
+    {file = "black-22.6.0-cp36-cp36m-macosx_10_9_x86_64.whl", hash = "sha256:cfaf3895a9634e882bf9d2363fed5af8888802d670f58b279b0bece00e9a872d"},
+    {file = "black-22.6.0-cp36-cp36m-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:94783f636bca89f11eb5d50437e8e17fbc6a929a628d82304c80fa9cd945f256"},
+    {file = "black-22.6.0-cp36-cp36m-win_amd64.whl", hash = "sha256:2ea29072e954a4d55a2ff58971b83365eba5d3d357352a07a7a4df0d95f51c78"},
+    {file = "black-22.6.0-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:e439798f819d49ba1c0bd9664427a05aab79bfba777a6db94fd4e56fae0cb849"},
+    {file = "black-22.6.0-cp37-cp37m-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:187d96c5e713f441a5829e77120c269b6514418f4513a390b0499b0987f2ff1c"},
+    {file = "black-22.6.0-cp37-cp37m-win_amd64.whl", hash = "sha256:074458dc2f6e0d3dab7928d4417bb6957bb834434516f21514138437accdbe90"},
+    {file = "black-22.6.0-cp38-cp38-macosx_10_9_universal2.whl", hash = "sha256:a218d7e5856f91d20f04e931b6f16d15356db1c846ee55f01bac297a705ca24f"},
+    {file = "black-22.6.0-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:568ac3c465b1c8b34b61cd7a4e349e93f91abf0f9371eda1cf87194663ab684e"},
+    {file = "black-22.6.0-cp38-cp38-macosx_11_0_arm64.whl", hash = "sha256:6c1734ab264b8f7929cef8ae5f900b85d579e6cbfde09d7387da8f04771b51c6"},
+    {file = "black-22.6.0-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:c9a3ac16efe9ec7d7381ddebcc022119794872abce99475345c5a61aa18c45ad"},
+    {file = "black-22.6.0-cp38-cp38-win_amd64.whl", hash = "sha256:b9fd45787ba8aa3f5e0a0a98920c1012c884622c6c920dbe98dbd05bc7c70fbf"},
+    {file = "black-22.6.0-cp39-cp39-macosx_10_9_universal2.whl", hash = "sha256:7ba9be198ecca5031cd78745780d65a3f75a34b2ff9be5837045dce55db83d1c"},
+    {file = "black-22.6.0-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:a3db5b6409b96d9bd543323b23ef32a1a2b06416d525d27e0f67e74f1446c8f2"},
+    {file = "black-22.6.0-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:560558527e52ce8afba936fcce93a7411ab40c7d5fe8c2463e279e843c0328ee"},
+    {file = "black-22.6.0-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:b154e6bbde1e79ea3260c4b40c0b7b3109ffcdf7bc4ebf8859169a6af72cd70b"},
+    {file = "black-22.6.0-cp39-cp39-win_amd64.whl", hash = "sha256:4af5bc0e1f96be5ae9bd7aaec219c901a94d6caa2484c21983d043371c733fc4"},
+    {file = "black-22.6.0-py3-none-any.whl", hash = "sha256:ac609cf8ef5e7115ddd07d85d988d074ed00e10fbc3445aee393e70164a2219c"},
+    {file = "black-22.6.0.tar.gz", hash = "sha256:6c6d39e28aed379aec40da1c65434c77d75e65bb59a1e1c283de545fb4e7c6c9"},
 ]
 certifi = [
     {file = "certifi-2021.10.8-py2.py3-none-any.whl", hash = "sha256:d62a0163eb4c2344ac042ab2bdf75399a71a2d8c7d47eac2e2ee91b9d6339569"},
diff --git a/pyproject.toml b/pyproject.toml
index 14ace123..84b4c74b 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -14,7 +14,7 @@ beautifulsoup4 = "^4.11.1"
 tqdm = "^4.64.0"
 
 [tool.poetry.dev-dependencies]
-black = "^22.3"
+black = "^22.6"
 cookiecutter = "^1.7.3"
 pytest = "^7.1.2"
 pytest-cov = "^3.0.0"

From c34c07f062a8170bd66eeef741dc907e3eaab831 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sun, 3 Jul 2022 14:42:12 +0000
Subject: [PATCH 116/371] Bump requests from 2.27.1 to 2.28.1

Bumps [requests](https://github.com/psf/requests) from 2.27.1 to 2.28.1.
- [Release notes](https://github.com/psf/requests/releases)
- [Changelog](https://github.com/psf/requests/blob/main/HISTORY.md)
- [Commits](https://github.com/psf/requests/compare/v2.27.1...v2.28.1)

---
updated-dependencies:
- dependency-name: requests
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 poetry.lock    | 18 +++++++++---------
 pyproject.toml |  2 +-
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/poetry.lock b/poetry.lock
index 778b1154..0746df6c 100644
--- a/poetry.lock
+++ b/poetry.lock
@@ -511,21 +511,21 @@ python-versions = ">=3.6"
 
 [[package]]
 name = "requests"
-version = "2.27.1"
+version = "2.28.1"
 description = "Python HTTP for Humans."
 category = "main"
 optional = false
-python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*, !=3.5.*"
+python-versions = ">=3.7, <4"
 
 [package.dependencies]
 certifi = ">=2017.4.17"
-charset-normalizer = {version = ">=2.0.0,<2.1.0", markers = "python_version >= \"3\""}
-idna = {version = ">=2.5,<4", markers = "python_version >= \"3\""}
+charset-normalizer = ">=2,<3"
+idna = ">=2.5,<4"
 urllib3 = ">=1.21.1,<1.27"
 
 [package.extras]
-socks = ["PySocks (>=1.5.6,!=1.5.7)", "win-inet-pton"]
-use_chardet_on_py3 = ["chardet (>=3.0.2,<5)"]
+socks = ["PySocks (>=1.5.6,!=1.5.7)"]
+use_chardet_on_py3 = ["chardet (>=3.0.2,<6)"]
 
 [[package]]
 name = "six"
@@ -641,7 +641,7 @@ testing = ["coverage (>=4)", "coverage-enable-subprocess (>=1)", "flaky (>=3)",
 [metadata]
 lock-version = "1.1"
 python-versions = "^3.10"
-content-hash = "1128c8909ec981ce43464ed8c6ec5f4529226ca498464d3aa31e3b00d577eef3"
+content-hash = "470275cfab4116efe29c50ec0980722477c81c814f44723c3ed17b7ecded3c57"
 
 [metadata.files]
 anytree = [
@@ -979,8 +979,8 @@ pyyaml = [
     {file = "PyYAML-6.0.tar.gz", hash = "sha256:68fb519c14306fec9720a2a5b45bc9f0c8d1b9c72adf45c37baedfcd949c35a2"},
 ]
 requests = [
-    {file = "requests-2.27.1-py2.py3-none-any.whl", hash = "sha256:f22fa1e554c9ddfd16e6e41ac79759e17be9e492b3587efa038054674760e72d"},
-    {file = "requests-2.27.1.tar.gz", hash = "sha256:68d7c56fd5a8999887728ef304a6d12edc7be74f1cfa47714fc8b414525c9a61"},
+    {file = "requests-2.28.1-py3-none-any.whl", hash = "sha256:8fefa2a1a1365bf5520aac41836fbee479da67864514bdb821f31ce07ce65349"},
+    {file = "requests-2.28.1.tar.gz", hash = "sha256:7c5599b102feddaa661c826c56ab4fee28bfd17f5abca1ebbe3e7f19d7c97983"},
 ]
 six = [
     {file = "six-1.16.0-py2.py3-none-any.whl", hash = "sha256:8abb2f1d86890a2dfb989f9a77cfcfd3e47c2a354b01111771326f8aa26e0254"},
diff --git a/pyproject.toml b/pyproject.toml
index 84b4c74b..8ebac655 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -9,7 +9,7 @@ license = "MIT"
 python = "^3.10"
 anytree = "^2.8.0"
 click = "^8.1.3"
-requests = "^2.27.1"
+requests = "^2.28.1"
 beautifulsoup4 = "^4.11.1"
 tqdm = "^4.64.0"
 

From 25629dd4a3f53b78d231f056d5cf23b6f53a0c52 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sun, 3 Jul 2022 14:44:13 +0000
Subject: [PATCH 117/371] Bump cookiecutter from 1.7.3 to 2.1.1

Bumps [cookiecutter](https://github.com/cookiecutter/cookiecutter) from 1.7.3 to 2.1.1.
- [Release notes](https://github.com/cookiecutter/cookiecutter/releases)
- [Changelog](https://github.com/cookiecutter/cookiecutter/blob/master/HISTORY.md)
- [Commits](https://github.com/cookiecutter/cookiecutter/compare/1.7.3...2.1.1)

---
updated-dependencies:
- dependency-name: cookiecutter
  dependency-type: direct:development
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 poetry.lock    | 27 +++++++--------------------
 pyproject.toml |  2 +-
 2 files changed, 8 insertions(+), 21 deletions(-)

diff --git a/poetry.lock b/poetry.lock
index 0746df6c..8d1c231f 100644
--- a/poetry.lock
+++ b/poetry.lock
@@ -161,21 +161,20 @@ python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*"
 
 [[package]]
 name = "cookiecutter"
-version = "1.7.3"
+version = "2.1.1"
 description = "A command-line utility that creates projects from project templates, e.g. creating a Python package project from a Python package project template."
 category = "dev"
 optional = false
-python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*"
+python-versions = ">=3.7"
 
 [package.dependencies]
 binaryornot = ">=0.4.4"
-click = ">=7.0"
+click = ">=7.0,<9.0.0"
 Jinja2 = ">=2.7,<4.0.0"
 jinja2-time = ">=0.2.0"
-poyo = ">=0.5.0"
 python-slugify = ">=4.0.0"
+pyyaml = ">=5.3.1"
 requests = ">=2.23.0"
-six = ">=1.10"
 
 [[package]]
 name = "coverage"
@@ -356,14 +355,6 @@ python-versions = ">=3.6"
 dev = ["pre-commit", "tox"]
 testing = ["pytest", "pytest-benchmark"]
 
-[[package]]
-name = "poyo"
-version = "0.5.0"
-description = "A lightweight YAML Parser for Python. 🐓"
-category = "dev"
-optional = false
-python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*"
-
 [[package]]
 name = "pre-commit"
 version = "2.19.0"
@@ -641,7 +632,7 @@ testing = ["coverage (>=4)", "coverage-enable-subprocess (>=1)", "flaky (>=3)",
 [metadata]
 lock-version = "1.1"
 python-versions = "^3.10"
-content-hash = "470275cfab4116efe29c50ec0980722477c81c814f44723c3ed17b7ecded3c57"
+content-hash = "53c00716cb3de9c6e496b72920cd9e6f9d0fe2d79dd807496feb735da40b99ef"
 
 [metadata.files]
 anytree = [
@@ -722,8 +713,8 @@ colorama = [
     {file = "colorama-0.4.4.tar.gz", hash = "sha256:5941b2b48a20143d2267e95b1c2a7603ce057ee39fd88e7329b0c292aa16869b"},
 ]
 cookiecutter = [
-    {file = "cookiecutter-1.7.3-py2.py3-none-any.whl", hash = "sha256:f8671531fa96ab14339d0c59b4f662a4f12a2ecacd94a0f70a3500843da588e2"},
-    {file = "cookiecutter-1.7.3.tar.gz", hash = "sha256:6b9a4d72882e243be077a7397d0f1f76fe66cf3df91f3115dbb5330e214fa457"},
+    {file = "cookiecutter-2.1.1-py2.py3-none-any.whl", hash = "sha256:9f3ab027cec4f70916e28f03470bdb41e637a3ad354b4d65c765d93aad160022"},
+    {file = "cookiecutter-2.1.1.tar.gz", hash = "sha256:f3982be8d9c53dac1261864013fdec7f83afd2e42ede6f6dd069c5e149c540d5"},
 ]
 coverage = [
     {file = "coverage-6.4.1-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:f1d5aa2703e1dab4ae6cf416eb0095304f49d004c39e9db1d86f57924f43006b"},
@@ -899,10 +890,6 @@ pluggy = [
     {file = "pluggy-1.0.0-py2.py3-none-any.whl", hash = "sha256:74134bbf457f031a36d68416e1509f34bd5ccc019f0bcc952c7b909d06b37bd3"},
     {file = "pluggy-1.0.0.tar.gz", hash = "sha256:4224373bacce55f955a878bf9cfa763c1e360858e330072059e10bad68531159"},
 ]
-poyo = [
-    {file = "poyo-0.5.0-py2.py3-none-any.whl", hash = "sha256:3e2ca8e33fdc3c411cd101ca395668395dd5dc7ac775b8e809e3def9f9fe041a"},
-    {file = "poyo-0.5.0.tar.gz", hash = "sha256:e26956aa780c45f011ca9886f044590e2d8fd8b61db7b1c1cf4e0869f48ed4dd"},
-]
 pre-commit = [
     {file = "pre_commit-2.19.0-py2.py3-none-any.whl", hash = "sha256:10c62741aa5704faea2ad69cb550ca78082efe5697d6f04e5710c3c229afdd10"},
     {file = "pre_commit-2.19.0.tar.gz", hash = "sha256:4233a1e38621c87d9dda9808c6606d7e7ba0e087cd56d3fe03202a01d2919615"},
diff --git a/pyproject.toml b/pyproject.toml
index 8ebac655..397f1c2c 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -15,7 +15,7 @@ tqdm = "^4.64.0"
 
 [tool.poetry.dev-dependencies]
 black = "^22.6"
-cookiecutter = "^1.7.3"
+cookiecutter = "^2.1.1"
 pytest = "^7.1.2"
 pytest-cov = "^3.0.0"
 pytest-xdist = "^2.5.0"

From 2b570a4223181d35a8f6232b321c3fbbd03ad071 Mon Sep 17 00:00:00 2001
From: Roel Adriaans <roel@adriaans.org>
Date: Tue, 27 Sep 2022 18:34:32 +0200
Subject: [PATCH 118/371] Update deps

---
 .pre-commit-config.yaml |   6 +-
 poetry.lock             | 454 +++++++++-------------------------------
 2 files changed, 103 insertions(+), 357 deletions(-)

diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index d385a0a7..b69053e7 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -2,13 +2,13 @@
 
 repos:
   - repo: https://github.com/ambv/black
-    rev: 21.11b1
+    rev: 22.8.0
     hooks:
     - id: black
       language_version: 'python3.10'
 
   - repo: https://github.com/pycqa/flake8
-    rev: 4.0.1
+    rev: 5.0.4
     hooks:
     - id: flake8
       args: ["--ignore", "E203,W503"]
@@ -19,7 +19,7 @@ repos:
     - id: isort
 
   - repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: v4.0.1
+    rev: v4.3.0
     hooks:
     - id: check-yaml
     - id: end-of-file-fixer
diff --git a/poetry.lock b/poetry.lock
index 8d1c231f..9000d5e9 100644
--- a/poetry.lock
+++ b/poetry.lock
@@ -15,7 +15,7 @@ test = ["coverage"]
 
 [[package]]
 name = "arrow"
-version = "1.2.1"
+version = "1.2.3"
 description = "Better dates & times for Python"
 category = "dev"
 optional = false
@@ -24,39 +24,19 @@ python-versions = ">=3.6"
 [package.dependencies]
 python-dateutil = ">=2.7.0"
 
-[[package]]
-name = "atomicwrites"
-version = "1.4.0"
-description = "Atomic file writes."
-category = "dev"
-optional = false
-python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*"
-
 [[package]]
 name = "attrs"
-version = "21.2.0"
+version = "22.1.0"
 description = "Classes Without Boilerplate"
 category = "dev"
 optional = false
-python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*"
+python-versions = ">=3.5"
 
 [package.extras]
-dev = ["coverage[toml] (>=5.0.2)", "hypothesis", "pympler", "pytest (>=4.3.0)", "six", "mypy", "pytest-mypy-plugins", "zope.interface", "furo", "sphinx", "sphinx-notfound-page", "pre-commit"]
+dev = ["coverage[toml] (>=5.0.2)", "hypothesis", "pympler", "pytest (>=4.3.0)", "mypy (>=0.900,!=0.940)", "pytest-mypy-plugins", "zope.interface", "furo", "sphinx", "sphinx-notfound-page", "pre-commit", "cloudpickle"]
 docs = ["furo", "sphinx", "zope.interface", "sphinx-notfound-page"]
-tests = ["coverage[toml] (>=5.0.2)", "hypothesis", "pympler", "pytest (>=4.3.0)", "six", "mypy", "pytest-mypy-plugins", "zope.interface"]
-tests_no_zope = ["coverage[toml] (>=5.0.2)", "hypothesis", "pympler", "pytest (>=4.3.0)", "six", "mypy", "pytest-mypy-plugins"]
-
-[[package]]
-name = "backports.entry-points-selectable"
-version = "1.1.1"
-description = "Compatibility shim providing selectable entry points for older implementations"
-category = "dev"
-optional = false
-python-versions = ">=2.7"
-
-[package.extras]
-docs = ["sphinx", "jaraco.packaging (>=8.2)", "rst.linker (>=1.9)"]
-testing = ["pytest", "pytest-flake8", "pytest-cov", "pytest-black (>=0.3.7)", "pytest-mypy", "pytest-checkdocs (>=2.4)", "pytest-enabler (>=1.0.1)"]
+tests = ["coverage[toml] (>=5.0.2)", "hypothesis", "pympler", "pytest (>=4.3.0)", "mypy (>=0.900,!=0.940)", "pytest-mypy-plugins", "zope.interface", "cloudpickle"]
+tests_no_zope = ["coverage[toml] (>=5.0.2)", "hypothesis", "pympler", "pytest (>=4.3.0)", "mypy (>=0.900,!=0.940)", "pytest-mypy-plugins", "cloudpickle"]
 
 [[package]]
 name = "beautifulsoup4"
@@ -86,7 +66,7 @@ chardet = ">=3.0.2"
 
 [[package]]
 name = "black"
-version = "22.6.0"
+version = "22.8.0"
 description = "The uncompromising code formatter."
 category = "dev"
 optional = false
@@ -107,11 +87,11 @@ uvloop = ["uvloop (>=0.15.2)"]
 
 [[package]]
 name = "certifi"
-version = "2021.10.8"
+version = "2022.9.24"
 description = "Python package for providing Mozilla's CA Bundle."
 category = "main"
 optional = false
-python-versions = "*"
+python-versions = ">=3.6"
 
 [[package]]
 name = "cfgv"
@@ -123,19 +103,19 @@ python-versions = ">=3.6.1"
 
 [[package]]
 name = "chardet"
-version = "4.0.0"
-description = "Universal encoding detector for Python 2 and 3"
+version = "5.0.0"
+description = "Universal encoding detector for Python 3"
 category = "dev"
 optional = false
-python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*"
+python-versions = ">=3.6"
 
 [[package]]
 name = "charset-normalizer"
-version = "2.0.8"
+version = "2.1.1"
 description = "The Real First Universal Charset Detector. Open, modern and actively maintained alternative to Chardet."
 category = "main"
 optional = false
-python-versions = ">=3.5.0"
+python-versions = ">=3.6.0"
 
 [package.extras]
 unicode_backport = ["unicodedata2"]
@@ -153,7 +133,7 @@ colorama = {version = "*", markers = "platform_system == \"Windows\""}
 
 [[package]]
 name = "colorama"
-version = "0.4.4"
+version = "0.4.5"
 description = "Cross-platform colored terminal text."
 category = "main"
 optional = false
@@ -178,7 +158,7 @@ requests = ">=2.23.0"
 
 [[package]]
 name = "coverage"
-version = "6.4.1"
+version = "6.4.4"
 description = "Code coverage measurement for Python"
 category = "dev"
 optional = false
@@ -192,7 +172,7 @@ toml = ["tomli"]
 
 [[package]]
 name = "distlib"
-version = "0.3.3"
+version = "0.3.6"
 description = "Distribution utilities"
 category = "dev"
 optional = false
@@ -211,30 +191,30 @@ testing = ["pre-commit"]
 
 [[package]]
 name = "filelock"
-version = "3.4.0"
+version = "3.8.0"
 description = "A platform independent file lock."
 category = "dev"
 optional = false
-python-versions = ">=3.6"
+python-versions = ">=3.7"
 
 [package.extras]
-docs = ["furo (>=2021.8.17b43)", "sphinx (>=4.1)", "sphinx-autodoc-typehints (>=1.12)"]
-testing = ["covdefaults (>=1.2.0)", "coverage (>=4)", "pytest (>=4)", "pytest-cov", "pytest-timeout (>=1.4.2)"]
+docs = ["furo (>=2022.6.21)", "sphinx (>=5.1.1)", "sphinx-autodoc-typehints (>=1.19.1)"]
+testing = ["covdefaults (>=2.2)", "coverage (>=6.4.2)", "pytest (>=7.1.2)", "pytest-cov (>=3)", "pytest-timeout (>=2.1)"]
 
 [[package]]
 name = "identify"
-version = "2.4.0"
+version = "2.5.5"
 description = "File identification library for Python"
 category = "dev"
 optional = false
-python-versions = ">=3.6.1"
+python-versions = ">=3.7"
 
 [package.extras]
 license = ["ukkonen"]
 
 [[package]]
 name = "idna"
-version = "3.3"
+version = "3.4"
 description = "Internationalized Domain Names in Applications (IDNA)"
 category = "main"
 optional = false
@@ -264,11 +244,11 @@ plugins = ["setuptools"]
 
 [[package]]
 name = "jinja2"
-version = "3.0.3"
+version = "3.1.2"
 description = "A very fast and expressive template engine."
 category = "dev"
 optional = false
-python-versions = ">=3.6"
+python-versions = ">=3.7"
 
 [package.dependencies]
 MarkupSafe = ">=2.0"
@@ -290,11 +270,11 @@ jinja2 = "*"
 
 [[package]]
 name = "markupsafe"
-version = "2.0.1"
+version = "2.1.1"
 description = "Safely add untrusted strings to HTML/XML markup."
 category = "dev"
 optional = false
-python-versions = ">=3.6"
+python-versions = ">=3.7"
 
 [[package]]
 name = "mypy-extensions"
@@ -306,11 +286,11 @@ python-versions = "*"
 
 [[package]]
 name = "nodeenv"
-version = "1.6.0"
+version = "1.7.0"
 description = "Node.js virtual environment builder"
 category = "dev"
 optional = false
-python-versions = "*"
+python-versions = ">=2.7,!=3.0.*,!=3.1.*,!=3.2.*,!=3.3.*,!=3.4.*,!=3.5.*,!=3.6.*"
 
 [[package]]
 name = "packaging"
@@ -325,23 +305,23 @@ pyparsing = ">=2.0.2,<3.0.5 || >3.0.5"
 
 [[package]]
 name = "pathspec"
-version = "0.9.0"
+version = "0.10.1"
 description = "Utility library for gitignore style pattern matching of file paths."
 category = "dev"
 optional = false
-python-versions = "!=3.0.*,!=3.1.*,!=3.2.*,!=3.3.*,!=3.4.*,>=2.7"
+python-versions = ">=3.7"
 
 [[package]]
 name = "platformdirs"
-version = "2.4.0"
+version = "2.5.2"
 description = "A small Python module for determining appropriate platform-specific dirs, e.g. a \"user data dir\"."
 category = "dev"
 optional = false
-python-versions = ">=3.6"
+python-versions = ">=3.7"
 
 [package.extras]
-docs = ["Sphinx (>=4)", "furo (>=2021.7.5b38)", "proselint (>=0.10.2)", "sphinx-autodoc-typehints (>=1.12)"]
-test = ["appdirs (==1.4.4)", "pytest (>=6)", "pytest-cov (>=2.7)", "pytest-mock (>=3.6)"]
+docs = ["furo (>=2021.7.5b38)", "proselint (>=0.10.2)", "sphinx-autodoc-typehints (>=1.12)", "sphinx (>=4)"]
+test = ["appdirs (==1.4.4)", "pytest-cov (>=2.7)", "pytest-mock (>=3.6)", "pytest (>=6)"]
 
 [[package]]
 name = "pluggy"
@@ -357,7 +337,7 @@ testing = ["pytest", "pytest-benchmark"]
 
 [[package]]
 name = "pre-commit"
-version = "2.19.0"
+version = "2.20.0"
 description = "A framework for managing and maintaining multi-language pre-commit hooks."
 category = "dev"
 optional = false
@@ -381,25 +361,24 @@ python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*"
 
 [[package]]
 name = "pyparsing"
-version = "3.0.6"
-description = "Python parsing module"
+version = "3.0.9"
+description = "pyparsing module - Classes and methods to define and execute parsing grammars"
 category = "dev"
 optional = false
-python-versions = ">=3.6"
+python-versions = ">=3.6.8"
 
 [package.extras]
-diagrams = ["jinja2", "railroad-diagrams"]
+diagrams = ["railroad-diagrams", "jinja2"]
 
 [[package]]
 name = "pytest"
-version = "7.1.2"
+version = "7.1.3"
 description = "pytest: simple powerful testing with Python"
 category = "dev"
 optional = false
 python-versions = ">=3.7"
 
 [package.dependencies]
-atomicwrites = {version = ">=1.0", markers = "sys_platform == \"win32\""}
 attrs = ">=19.2.0"
 colorama = {version = "*", markers = "sys_platform == \"win32\""}
 iniconfig = "*"
@@ -428,11 +407,11 @@ testing = ["fields", "hunter", "process-tests", "six", "pytest-xdist", "virtuale
 
 [[package]]
 name = "pytest-forked"
-version = "1.3.0"
+version = "1.4.0"
 description = "run tests in isolated forked subprocesses"
 category = "dev"
 optional = false
-python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*"
+python-versions = ">=3.6"
 
 [package.dependencies]
 py = "*"
@@ -480,11 +459,11 @@ cli = ["click (>=5.0)"]
 
 [[package]]
 name = "python-slugify"
-version = "5.0.2"
-description = "A Python Slugify application that handles Unicode"
+version = "6.1.2"
+description = "A Python slugify application that also handles Unicode"
 category = "dev"
 optional = false
-python-versions = ">=3.6"
+python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*, !=3.5.*"
 
 [package.dependencies]
 text-unidecode = ">=1.3"
@@ -528,7 +507,7 @@ python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*"
 
 [[package]]
 name = "soupsieve"
-version = "2.3.1"
+version = "2.3.2.post1"
 description = "A modern CSS selector implementation for Beautiful Soup."
 category = "main"
 optional = false
@@ -552,15 +531,15 @@ python-versions = ">=2.6, !=3.0.*, !=3.1.*, !=3.2.*"
 
 [[package]]
 name = "tomli"
-version = "1.2.2"
+version = "2.0.1"
 description = "A lil' TOML parser"
 category = "dev"
 optional = false
-python-versions = ">=3.6"
+python-versions = ">=3.7"
 
 [[package]]
 name = "tox"
-version = "3.25.1"
+version = "3.26.0"
 description = "tox is a generic virtualenv management and test command line tool"
 category = "dev"
 optional = false
@@ -573,7 +552,7 @@ packaging = ">=14"
 pluggy = ">=0.12.0"
 py = ">=1.4.17"
 six = ">=1.14.0"
-toml = ">=0.9.4"
+tomli = {version = ">=2.0.1", markers = "python_version >= \"3.7\" and python_version < \"3.11\""}
 virtualenv = ">=16.0.0,<20.0.0 || >20.0.0,<20.0.1 || >20.0.1,<20.0.2 || >20.0.2,<20.0.3 || >20.0.3,<20.0.4 || >20.0.4,<20.0.5 || >20.0.5,<20.0.6 || >20.0.6,<20.0.7 || >20.0.7"
 
 [package.extras]
@@ -582,7 +561,7 @@ testing = ["flaky (>=3.4.0)", "freezegun (>=0.3.11)", "pytest (>=4.0.0)", "pytes
 
 [[package]]
 name = "tqdm"
-version = "4.64.0"
+version = "4.64.1"
 description = "Fast, Extensible Progress Meter"
 category = "main"
 optional = false
@@ -599,35 +578,33 @@ telegram = ["requests"]
 
 [[package]]
 name = "urllib3"
-version = "1.26.7"
+version = "1.26.12"
 description = "HTTP library with thread-safe connection pooling, file post, and more."
 category = "main"
 optional = false
-python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*, <4"
+python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*, !=3.5.*, <4"
 
 [package.extras]
-brotli = ["brotlipy (>=0.6.0)"]
-secure = ["pyOpenSSL (>=0.14)", "cryptography (>=1.3.4)", "idna (>=2.0.0)", "certifi", "ipaddress"]
+brotli = ["brotlicffi (>=0.8.0)", "brotli (>=1.0.9)", "brotlipy (>=0.6.0)"]
+secure = ["pyOpenSSL (>=0.14)", "cryptography (>=1.3.4)", "idna (>=2.0.0)", "certifi", "urllib3-secure-extra", "ipaddress"]
 socks = ["PySocks (>=1.5.6,!=1.5.7,<2.0)"]
 
 [[package]]
 name = "virtualenv"
-version = "20.10.0"
+version = "20.16.5"
 description = "Virtual Python Environment builder"
 category = "dev"
 optional = false
-python-versions = "!=3.0.*,!=3.1.*,!=3.2.*,!=3.3.*,!=3.4.*,>=2.7"
+python-versions = ">=3.6"
 
 [package.dependencies]
-"backports.entry-points-selectable" = ">=1.0.4"
-distlib = ">=0.3.1,<1"
-filelock = ">=3.2,<4"
-platformdirs = ">=2,<3"
-six = ">=1.9.0,<2"
+distlib = ">=0.3.5,<1"
+filelock = ">=3.4.1,<4"
+platformdirs = ">=2.4,<3"
 
 [package.extras]
-docs = ["proselint (>=0.10.2)", "sphinx (>=3)", "sphinx-argparse (>=0.2.5)", "sphinx-rtd-theme (>=0.4.3)", "towncrier (>=21.3)"]
-testing = ["coverage (>=4)", "coverage-enable-subprocess (>=1)", "flaky (>=3)", "pytest (>=4)", "pytest-env (>=0.6.2)", "pytest-freezegun (>=0.4.1)", "pytest-mock (>=2)", "pytest-randomly (>=1)", "pytest-timeout (>=1)", "packaging (>=20.0)"]
+docs = ["proselint (>=0.13)", "sphinx (>=5.1.1)", "sphinx-argparse (>=0.3.1)", "sphinx-rtd-theme (>=1)", "towncrier (>=21.9)"]
+testing = ["coverage (>=6.2)", "coverage-enable-subprocess (>=1)", "flaky (>=3.7)", "packaging (>=21.3)", "pytest (>=7.0.1)", "pytest-env (>=0.6.2)", "pytest-freezegun (>=0.4.2)", "pytest-mock (>=3.6.1)", "pytest-randomly (>=3.10.3)", "pytest-timeout (>=2.1)"]
 
 [metadata]
 lock-version = "1.1"
@@ -639,146 +616,33 @@ anytree = [
     {file = "anytree-2.8.0-py2.py3-none-any.whl", hash = "sha256:14c55ac77492b11532395049a03b773d14c7e30b22aa012e337b1e983de31521"},
     {file = "anytree-2.8.0.tar.gz", hash = "sha256:3f0f93f355a91bc3e6245319bf4c1d50e3416cc7a35cc1133c1ff38306bbccab"},
 ]
-arrow = [
-    {file = "arrow-1.2.1-py3-none-any.whl", hash = "sha256:6b2914ef3997d1fd7b37a71ce9dd61a6e329d09e1c7b44f4d3099ca4a5c0933e"},
-    {file = "arrow-1.2.1.tar.gz", hash = "sha256:c2dde3c382d9f7e6922ce636bf0b318a7a853df40ecb383b29192e6c5cc82840"},
-]
-atomicwrites = [
-    {file = "atomicwrites-1.4.0-py2.py3-none-any.whl", hash = "sha256:6d1784dea7c0c8d4a5172b6c620f40b6e4cbfdf96d783691f2e1302a7b88e197"},
-    {file = "atomicwrites-1.4.0.tar.gz", hash = "sha256:ae70396ad1a434f9c7046fd2dd196fc04b12f9e91ffb859164193be8b6168a7a"},
-]
-attrs = [
-    {file = "attrs-21.2.0-py2.py3-none-any.whl", hash = "sha256:149e90d6d8ac20db7a955ad60cf0e6881a3f20d37096140088356da6c716b0b1"},
-    {file = "attrs-21.2.0.tar.gz", hash = "sha256:ef6aaac3ca6cd92904cdd0d83f629a15f18053ec84e6432106f7a4d04ae4f5fb"},
-]
-"backports.entry-points-selectable" = [
-    {file = "backports.entry_points_selectable-1.1.1-py2.py3-none-any.whl", hash = "sha256:7fceed9532a7aa2bd888654a7314f864a3c16a4e710b34a58cfc0f08114c663b"},
-    {file = "backports.entry_points_selectable-1.1.1.tar.gz", hash = "sha256:914b21a479fde881635f7af5adc7f6e38d6b274be32269070c53b698c60d5386"},
-]
-beautifulsoup4 = [
-    {file = "beautifulsoup4-4.11.1-py3-none-any.whl", hash = "sha256:58d5c3d29f5a36ffeb94f02f0d786cd53014cf9b3b3951d42e0080d8a9498d30"},
-    {file = "beautifulsoup4-4.11.1.tar.gz", hash = "sha256:ad9aa55b65ef2808eb405f46cf74df7fcb7044d5cbc26487f96eb2ef2e436693"},
-]
+arrow = []
+attrs = []
+beautifulsoup4 = []
 binaryornot = [
     {file = "binaryornot-0.4.4-py2.py3-none-any.whl", hash = "sha256:b8b71173c917bddcd2c16070412e369c3ed7f0528926f70cac18a6c97fd563e4"},
     {file = "binaryornot-0.4.4.tar.gz", hash = "sha256:359501dfc9d40632edc9fac890e19542db1a287bbcfa58175b66658392018061"},
 ]
-black = [
-    {file = "black-22.6.0-cp310-cp310-macosx_10_9_universal2.whl", hash = "sha256:f586c26118bc6e714ec58c09df0157fe2d9ee195c764f630eb0d8e7ccce72e69"},
-    {file = "black-22.6.0-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:b270a168d69edb8b7ed32c193ef10fd27844e5c60852039599f9184460ce0807"},
-    {file = "black-22.6.0-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:6797f58943fceb1c461fb572edbe828d811e719c24e03375fd25170ada53825e"},
-    {file = "black-22.6.0-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:c85928b9d5f83b23cee7d0efcb310172412fbf7cb9d9ce963bd67fd141781def"},
-    {file = "black-22.6.0-cp310-cp310-win_amd64.whl", hash = "sha256:f6fe02afde060bbeef044af7996f335fbe90b039ccf3f5eb8f16df8b20f77666"},
-    {file = "black-22.6.0-cp36-cp36m-macosx_10_9_x86_64.whl", hash = "sha256:cfaf3895a9634e882bf9d2363fed5af8888802d670f58b279b0bece00e9a872d"},
-    {file = "black-22.6.0-cp36-cp36m-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:94783f636bca89f11eb5d50437e8e17fbc6a929a628d82304c80fa9cd945f256"},
-    {file = "black-22.6.0-cp36-cp36m-win_amd64.whl", hash = "sha256:2ea29072e954a4d55a2ff58971b83365eba5d3d357352a07a7a4df0d95f51c78"},
-    {file = "black-22.6.0-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:e439798f819d49ba1c0bd9664427a05aab79bfba777a6db94fd4e56fae0cb849"},
-    {file = "black-22.6.0-cp37-cp37m-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:187d96c5e713f441a5829e77120c269b6514418f4513a390b0499b0987f2ff1c"},
-    {file = "black-22.6.0-cp37-cp37m-win_amd64.whl", hash = "sha256:074458dc2f6e0d3dab7928d4417bb6957bb834434516f21514138437accdbe90"},
-    {file = "black-22.6.0-cp38-cp38-macosx_10_9_universal2.whl", hash = "sha256:a218d7e5856f91d20f04e931b6f16d15356db1c846ee55f01bac297a705ca24f"},
-    {file = "black-22.6.0-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:568ac3c465b1c8b34b61cd7a4e349e93f91abf0f9371eda1cf87194663ab684e"},
-    {file = "black-22.6.0-cp38-cp38-macosx_11_0_arm64.whl", hash = "sha256:6c1734ab264b8f7929cef8ae5f900b85d579e6cbfde09d7387da8f04771b51c6"},
-    {file = "black-22.6.0-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:c9a3ac16efe9ec7d7381ddebcc022119794872abce99475345c5a61aa18c45ad"},
-    {file = "black-22.6.0-cp38-cp38-win_amd64.whl", hash = "sha256:b9fd45787ba8aa3f5e0a0a98920c1012c884622c6c920dbe98dbd05bc7c70fbf"},
-    {file = "black-22.6.0-cp39-cp39-macosx_10_9_universal2.whl", hash = "sha256:7ba9be198ecca5031cd78745780d65a3f75a34b2ff9be5837045dce55db83d1c"},
-    {file = "black-22.6.0-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:a3db5b6409b96d9bd543323b23ef32a1a2b06416d525d27e0f67e74f1446c8f2"},
-    {file = "black-22.6.0-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:560558527e52ce8afba936fcce93a7411ab40c7d5fe8c2463e279e843c0328ee"},
-    {file = "black-22.6.0-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:b154e6bbde1e79ea3260c4b40c0b7b3109ffcdf7bc4ebf8859169a6af72cd70b"},
-    {file = "black-22.6.0-cp39-cp39-win_amd64.whl", hash = "sha256:4af5bc0e1f96be5ae9bd7aaec219c901a94d6caa2484c21983d043371c733fc4"},
-    {file = "black-22.6.0-py3-none-any.whl", hash = "sha256:ac609cf8ef5e7115ddd07d85d988d074ed00e10fbc3445aee393e70164a2219c"},
-    {file = "black-22.6.0.tar.gz", hash = "sha256:6c6d39e28aed379aec40da1c65434c77d75e65bb59a1e1c283de545fb4e7c6c9"},
-]
-certifi = [
-    {file = "certifi-2021.10.8-py2.py3-none-any.whl", hash = "sha256:d62a0163eb4c2344ac042ab2bdf75399a71a2d8c7d47eac2e2ee91b9d6339569"},
-    {file = "certifi-2021.10.8.tar.gz", hash = "sha256:78884e7c1d4b00ce3cea67b44566851c4343c120abd683433ce934a68ea58872"},
-]
+black = []
+certifi = []
 cfgv = [
     {file = "cfgv-3.3.1-py2.py3-none-any.whl", hash = "sha256:c6a0883f3917a037485059700b9e75da2464e6c27051014ad85ba6aaa5884426"},
     {file = "cfgv-3.3.1.tar.gz", hash = "sha256:f5a830efb9ce7a445376bb66ec94c638a9787422f96264c98edc6bdeed8ab736"},
 ]
-chardet = [
-    {file = "chardet-4.0.0-py2.py3-none-any.whl", hash = "sha256:f864054d66fd9118f2e67044ac8981a54775ec5b67aed0441892edb553d21da5"},
-    {file = "chardet-4.0.0.tar.gz", hash = "sha256:0d6f53a15db4120f2b08c94f11e7d93d2c911ee118b6b30a04ec3ee8310179fa"},
-]
-charset-normalizer = [
-    {file = "charset-normalizer-2.0.8.tar.gz", hash = "sha256:735e240d9a8506778cd7a453d97e817e536bb1fc29f4f6961ce297b9c7a917b0"},
-    {file = "charset_normalizer-2.0.8-py3-none-any.whl", hash = "sha256:83fcdeb225499d6344c8f7f34684c2981270beacc32ede2e669e94f7fa544405"},
-]
-click = [
-    {file = "click-8.1.3-py3-none-any.whl", hash = "sha256:bb4d8133cb15a609f44e8213d9b391b0809795062913b383c62be0ee95b1db48"},
-    {file = "click-8.1.3.tar.gz", hash = "sha256:7682dc8afb30297001674575ea00d1814d808d6a36af415a82bd481d37ba7b8e"},
-]
-colorama = [
-    {file = "colorama-0.4.4-py2.py3-none-any.whl", hash = "sha256:9f47eda37229f68eee03b24b9748937c7dc3868f906e8ba69fbcbdd3bc5dc3e2"},
-    {file = "colorama-0.4.4.tar.gz", hash = "sha256:5941b2b48a20143d2267e95b1c2a7603ce057ee39fd88e7329b0c292aa16869b"},
-]
-cookiecutter = [
-    {file = "cookiecutter-2.1.1-py2.py3-none-any.whl", hash = "sha256:9f3ab027cec4f70916e28f03470bdb41e637a3ad354b4d65c765d93aad160022"},
-    {file = "cookiecutter-2.1.1.tar.gz", hash = "sha256:f3982be8d9c53dac1261864013fdec7f83afd2e42ede6f6dd069c5e149c540d5"},
-]
-coverage = [
-    {file = "coverage-6.4.1-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:f1d5aa2703e1dab4ae6cf416eb0095304f49d004c39e9db1d86f57924f43006b"},
-    {file = "coverage-6.4.1-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:4ce1b258493cbf8aec43e9b50d89982346b98e9ffdfaae8ae5793bc112fb0068"},
-    {file = "coverage-6.4.1-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:83c4e737f60c6936460c5be330d296dd5b48b3963f48634c53b3f7deb0f34ec4"},
-    {file = "coverage-6.4.1-cp310-cp310-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:84e65ef149028516c6d64461b95a8dbcfce95cfd5b9eb634320596173332ea84"},
-    {file = "coverage-6.4.1-cp310-cp310-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:f69718750eaae75efe506406c490d6fc5a6161d047206cc63ce25527e8a3adad"},
-    {file = "coverage-6.4.1-cp310-cp310-musllinux_1_1_aarch64.whl", hash = "sha256:e57816f8ffe46b1df8f12e1b348f06d164fd5219beba7d9433ba79608ef011cc"},
-    {file = "coverage-6.4.1-cp310-cp310-musllinux_1_1_i686.whl", hash = "sha256:01c5615d13f3dd3aa8543afc069e5319cfa0c7d712f6e04b920431e5c564a749"},
-    {file = "coverage-6.4.1-cp310-cp310-musllinux_1_1_x86_64.whl", hash = "sha256:75ab269400706fab15981fd4bd5080c56bd5cc07c3bccb86aab5e1d5a88dc8f4"},
-    {file = "coverage-6.4.1-cp310-cp310-win32.whl", hash = "sha256:a7f3049243783df2e6cc6deafc49ea123522b59f464831476d3d1448e30d72df"},
-    {file = "coverage-6.4.1-cp310-cp310-win_amd64.whl", hash = "sha256:ee2ddcac99b2d2aec413e36d7a429ae9ebcadf912946b13ffa88e7d4c9b712d6"},
-    {file = "coverage-6.4.1-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:fb73e0011b8793c053bfa85e53129ba5f0250fdc0392c1591fd35d915ec75c46"},
-    {file = "coverage-6.4.1-cp37-cp37m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:106c16dfe494de3193ec55cac9640dd039b66e196e4641fa8ac396181578b982"},
-    {file = "coverage-6.4.1-cp37-cp37m-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:87f4f3df85aa39da00fd3ec4b5abeb7407e82b68c7c5ad181308b0e2526da5d4"},
-    {file = "coverage-6.4.1-cp37-cp37m-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:961e2fb0680b4f5ad63234e0bf55dfb90d302740ae9c7ed0120677a94a1590cb"},
-    {file = "coverage-6.4.1-cp37-cp37m-musllinux_1_1_aarch64.whl", hash = "sha256:cec3a0f75c8f1031825e19cd86ee787e87cf03e4fd2865c79c057092e69e3a3b"},
-    {file = "coverage-6.4.1-cp37-cp37m-musllinux_1_1_i686.whl", hash = "sha256:129cd05ba6f0d08a766d942a9ed4b29283aff7b2cccf5b7ce279d50796860bb3"},
-    {file = "coverage-6.4.1-cp37-cp37m-musllinux_1_1_x86_64.whl", hash = "sha256:bf5601c33213d3cb19d17a796f8a14a9eaa5e87629a53979a5981e3e3ae166f6"},
-    {file = "coverage-6.4.1-cp37-cp37m-win32.whl", hash = "sha256:269eaa2c20a13a5bf17558d4dc91a8d078c4fa1872f25303dddcbba3a813085e"},
-    {file = "coverage-6.4.1-cp37-cp37m-win_amd64.whl", hash = "sha256:f02cbbf8119db68455b9d763f2f8737bb7db7e43720afa07d8eb1604e5c5ae28"},
-    {file = "coverage-6.4.1-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:ffa9297c3a453fba4717d06df579af42ab9a28022444cae7fa605af4df612d54"},
-    {file = "coverage-6.4.1-cp38-cp38-macosx_11_0_arm64.whl", hash = "sha256:145f296d00441ca703a659e8f3eb48ae39fb083baba2d7ce4482fb2723e050d9"},
-    {file = "coverage-6.4.1-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:d67d44996140af8b84284e5e7d398e589574b376fb4de8ccd28d82ad8e3bea13"},
-    {file = "coverage-6.4.1-cp38-cp38-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:2bd9a6fc18aab8d2e18f89b7ff91c0f34ff4d5e0ba0b33e989b3cd4194c81fd9"},
-    {file = "coverage-6.4.1-cp38-cp38-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:3384f2a3652cef289e38100f2d037956194a837221edd520a7ee5b42d00cc605"},
-    {file = "coverage-6.4.1-cp38-cp38-musllinux_1_1_aarch64.whl", hash = "sha256:9b3e07152b4563722be523e8cd0b209e0d1a373022cfbde395ebb6575bf6790d"},
-    {file = "coverage-6.4.1-cp38-cp38-musllinux_1_1_i686.whl", hash = "sha256:1480ff858b4113db2718848d7b2d1b75bc79895a9c22e76a221b9d8d62496428"},
-    {file = "coverage-6.4.1-cp38-cp38-musllinux_1_1_x86_64.whl", hash = "sha256:865d69ae811a392f4d06bde506d531f6a28a00af36f5c8649684a9e5e4a85c83"},
-    {file = "coverage-6.4.1-cp38-cp38-win32.whl", hash = "sha256:664a47ce62fe4bef9e2d2c430306e1428ecea207ffd68649e3b942fa8ea83b0b"},
-    {file = "coverage-6.4.1-cp38-cp38-win_amd64.whl", hash = "sha256:26dff09fb0d82693ba9e6231248641d60ba606150d02ed45110f9ec26404ed1c"},
-    {file = "coverage-6.4.1-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:d9c80df769f5ec05ad21ea34be7458d1dc51ff1fb4b2219e77fe24edf462d6df"},
-    {file = "coverage-6.4.1-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:39ee53946bf009788108b4dd2894bf1349b4e0ca18c2016ffa7d26ce46b8f10d"},
-    {file = "coverage-6.4.1-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:f5b66caa62922531059bc5ac04f836860412f7f88d38a476eda0a6f11d4724f4"},
-    {file = "coverage-6.4.1-cp39-cp39-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:fd180ed867e289964404051a958f7cccabdeed423f91a899829264bb7974d3d3"},
-    {file = "coverage-6.4.1-cp39-cp39-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:84631e81dd053e8a0d4967cedab6db94345f1c36107c71698f746cb2636c63e3"},
-    {file = "coverage-6.4.1-cp39-cp39-musllinux_1_1_aarch64.whl", hash = "sha256:8c08da0bd238f2970230c2a0d28ff0e99961598cb2e810245d7fc5afcf1254e8"},
-    {file = "coverage-6.4.1-cp39-cp39-musllinux_1_1_i686.whl", hash = "sha256:d42c549a8f41dc103a8004b9f0c433e2086add8a719da00e246e17cbe4056f72"},
-    {file = "coverage-6.4.1-cp39-cp39-musllinux_1_1_x86_64.whl", hash = "sha256:309ce4a522ed5fca432af4ebe0f32b21d6d7ccbb0f5fcc99290e71feba67c264"},
-    {file = "coverage-6.4.1-cp39-cp39-win32.whl", hash = "sha256:fdb6f7bd51c2d1714cea40718f6149ad9be6a2ee7d93b19e9f00934c0f2a74d9"},
-    {file = "coverage-6.4.1-cp39-cp39-win_amd64.whl", hash = "sha256:342d4aefd1c3e7f620a13f4fe563154d808b69cccef415415aece4c786665397"},
-    {file = "coverage-6.4.1-pp36.pp37.pp38-none-any.whl", hash = "sha256:4803e7ccf93230accb928f3a68f00ffa80a88213af98ed338a57ad021ef06815"},
-    {file = "coverage-6.4.1.tar.gz", hash = "sha256:4321f075095a096e70aff1d002030ee612b65a205a0a0f5b815280d5dc58100c"},
-]
-distlib = [
-    {file = "distlib-0.3.3-py2.py3-none-any.whl", hash = "sha256:c8b54e8454e5bf6237cc84c20e8264c3e991e824ef27e8f1e81049867d861e31"},
-    {file = "distlib-0.3.3.zip", hash = "sha256:d982d0751ff6eaaab5e2ec8e691d949ee80eddf01a62eaa96ddb11531fe16b05"},
-]
+chardet = []
+charset-normalizer = []
+click = []
+colorama = []
+cookiecutter = []
+coverage = []
+distlib = []
 execnet = [
     {file = "execnet-1.9.0-py2.py3-none-any.whl", hash = "sha256:a295f7cc774947aac58dde7fdc85f4aa00c42adf5d8f5468fc630c1acf30a142"},
     {file = "execnet-1.9.0.tar.gz", hash = "sha256:8f694f3ba9cc92cab508b152dcfe322153975c29bda272e2fd7f3f00f36e47c5"},
 ]
-filelock = [
-    {file = "filelock-3.4.0-py3-none-any.whl", hash = "sha256:2e139a228bcf56dd8b2274a65174d005c4a6b68540ee0bdbb92c76f43f29f7e8"},
-    {file = "filelock-3.4.0.tar.gz", hash = "sha256:93d512b32a23baf4cac44ffd72ccf70732aeff7b8050fcaf6d3ec406d954baf4"},
-]
-identify = [
-    {file = "identify-2.4.0-py2.py3-none-any.whl", hash = "sha256:eba31ca80258de6bb51453084bff4a923187cd2193b9c13710f2516ab30732cc"},
-    {file = "identify-2.4.0.tar.gz", hash = "sha256:a33ae873287e81651c7800ca309dc1f84679b763c9c8b30680e16fbfa82f0107"},
-]
-idna = [
-    {file = "idna-3.3-py3-none-any.whl", hash = "sha256:84d9dd047ffa80596e0f246e2eab0b391788b0503584e8945f2368256d2735ff"},
-    {file = "idna-3.3.tar.gz", hash = "sha256:9d643ff0a55b762d5cdb124b8eaa99c66322e2157b69160bc32796e824360e6d"},
-]
+filelock = []
+identify = []
+idna = []
 iniconfig = [
     {file = "iniconfig-1.1.1-py2.py3-none-any.whl", hash = "sha256:011e24c64b7f47f6ebd835bb12a743f2fbe9a26d4cecaa7f53bc4f35ee9da8b3"},
     {file = "iniconfig-1.1.1.tar.gz", hash = "sha256:bc3af051d7d14b2ee5ef9969666def0cd1a000e121eaea580d4a313df4b37f32"},
@@ -787,149 +651,49 @@ isort = [
     {file = "isort-5.10.1-py3-none-any.whl", hash = "sha256:6f62d78e2f89b4500b080fe3a81690850cd254227f27f75c3a0c491a1f351ba7"},
     {file = "isort-5.10.1.tar.gz", hash = "sha256:e8443a5e7a020e9d7f97f1d7d9cd17c88bcb3bc7e218bf9cf5095fe550be2951"},
 ]
-jinja2 = [
-    {file = "Jinja2-3.0.3-py3-none-any.whl", hash = "sha256:077ce6014f7b40d03b47d1f1ca4b0fc8328a692bd284016f806ed0eaca390ad8"},
-    {file = "Jinja2-3.0.3.tar.gz", hash = "sha256:611bb273cd68f3b993fabdc4064fc858c5b47a973cb5aa7999ec1ba405c87cd7"},
-]
+jinja2 = []
 jinja2-time = [
     {file = "jinja2-time-0.2.0.tar.gz", hash = "sha256:d14eaa4d315e7688daa4969f616f226614350c48730bfa1692d2caebd8c90d40"},
     {file = "jinja2_time-0.2.0-py2.py3-none-any.whl", hash = "sha256:d3eab6605e3ec8b7a0863df09cc1d23714908fa61aa6986a845c20ba488b4efa"},
 ]
-markupsafe = [
-    {file = "MarkupSafe-2.0.1-cp310-cp310-macosx_10_9_universal2.whl", hash = "sha256:d8446c54dc28c01e5a2dbac5a25f071f6653e6e40f3a8818e8b45d790fe6ef53"},
-    {file = "MarkupSafe-2.0.1-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:36bc903cbb393720fad60fc28c10de6acf10dc6cc883f3e24ee4012371399a38"},
-    {file = "MarkupSafe-2.0.1-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:2d7d807855b419fc2ed3e631034685db6079889a1f01d5d9dac950f764da3dad"},
-    {file = "MarkupSafe-2.0.1-cp310-cp310-manylinux_2_5_i686.manylinux1_i686.manylinux_2_12_i686.manylinux2010_i686.whl", hash = "sha256:add36cb2dbb8b736611303cd3bfcee00afd96471b09cda130da3581cbdc56a6d"},
-    {file = "MarkupSafe-2.0.1-cp310-cp310-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:168cd0a3642de83558a5153c8bd34f175a9a6e7f6dc6384b9655d2697312a646"},
-    {file = "MarkupSafe-2.0.1-cp310-cp310-musllinux_1_1_aarch64.whl", hash = "sha256:4dc8f9fb58f7364b63fd9f85013b780ef83c11857ae79f2feda41e270468dd9b"},
-    {file = "MarkupSafe-2.0.1-cp310-cp310-musllinux_1_1_i686.whl", hash = "sha256:20dca64a3ef2d6e4d5d615a3fd418ad3bde77a47ec8a23d984a12b5b4c74491a"},
-    {file = "MarkupSafe-2.0.1-cp310-cp310-musllinux_1_1_x86_64.whl", hash = "sha256:cdfba22ea2f0029c9261a4bd07e830a8da012291fbe44dc794e488b6c9bb353a"},
-    {file = "MarkupSafe-2.0.1-cp310-cp310-win32.whl", hash = "sha256:99df47edb6bda1249d3e80fdabb1dab8c08ef3975f69aed437cb69d0a5de1e28"},
-    {file = "MarkupSafe-2.0.1-cp310-cp310-win_amd64.whl", hash = "sha256:e0f138900af21926a02425cf736db95be9f4af72ba1bb21453432a07f6082134"},
-    {file = "MarkupSafe-2.0.1-cp36-cp36m-macosx_10_9_x86_64.whl", hash = "sha256:f9081981fe268bd86831e5c75f7de206ef275defcb82bc70740ae6dc507aee51"},
-    {file = "MarkupSafe-2.0.1-cp36-cp36m-manylinux1_i686.whl", hash = "sha256:0955295dd5eec6cb6cc2fe1698f4c6d84af2e92de33fbcac4111913cd100a6ff"},
-    {file = "MarkupSafe-2.0.1-cp36-cp36m-manylinux1_x86_64.whl", hash = "sha256:0446679737af14f45767963a1a9ef7620189912317d095f2d9ffa183a4d25d2b"},
-    {file = "MarkupSafe-2.0.1-cp36-cp36m-manylinux2010_i686.whl", hash = "sha256:f826e31d18b516f653fe296d967d700fddad5901ae07c622bb3705955e1faa94"},
-    {file = "MarkupSafe-2.0.1-cp36-cp36m-manylinux2010_x86_64.whl", hash = "sha256:fa130dd50c57d53368c9d59395cb5526eda596d3ffe36666cd81a44d56e48872"},
-    {file = "MarkupSafe-2.0.1-cp36-cp36m-manylinux2014_aarch64.whl", hash = "sha256:905fec760bd2fa1388bb5b489ee8ee5f7291d692638ea5f67982d968366bef9f"},
-    {file = "MarkupSafe-2.0.1-cp36-cp36m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:bf5d821ffabf0ef3533c39c518f3357b171a1651c1ff6827325e4489b0e46c3c"},
-    {file = "MarkupSafe-2.0.1-cp36-cp36m-manylinux_2_5_i686.manylinux1_i686.manylinux_2_12_i686.manylinux2010_i686.whl", hash = "sha256:0d4b31cc67ab36e3392bbf3862cfbadac3db12bdd8b02a2731f509ed5b829724"},
-    {file = "MarkupSafe-2.0.1-cp36-cp36m-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:baa1a4e8f868845af802979fcdbf0bb11f94f1cb7ced4c4b8a351bb60d108145"},
-    {file = "MarkupSafe-2.0.1-cp36-cp36m-musllinux_1_1_aarch64.whl", hash = "sha256:deb993cacb280823246a026e3b2d81c493c53de6acfd5e6bfe31ab3402bb37dd"},
-    {file = "MarkupSafe-2.0.1-cp36-cp36m-musllinux_1_1_i686.whl", hash = "sha256:63f3268ba69ace99cab4e3e3b5840b03340efed0948ab8f78d2fd87ee5442a4f"},
-    {file = "MarkupSafe-2.0.1-cp36-cp36m-musllinux_1_1_x86_64.whl", hash = "sha256:8d206346619592c6200148b01a2142798c989edcb9c896f9ac9722a99d4e77e6"},
-    {file = "MarkupSafe-2.0.1-cp36-cp36m-win32.whl", hash = "sha256:6c4ca60fa24e85fe25b912b01e62cb969d69a23a5d5867682dd3e80b5b02581d"},
-    {file = "MarkupSafe-2.0.1-cp36-cp36m-win_amd64.whl", hash = "sha256:b2f4bf27480f5e5e8ce285a8c8fd176c0b03e93dcc6646477d4630e83440c6a9"},
-    {file = "MarkupSafe-2.0.1-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:0717a7390a68be14b8c793ba258e075c6f4ca819f15edfc2a3a027c823718567"},
-    {file = "MarkupSafe-2.0.1-cp37-cp37m-manylinux1_i686.whl", hash = "sha256:6557b31b5e2c9ddf0de32a691f2312a32f77cd7681d8af66c2692efdbef84c18"},
-    {file = "MarkupSafe-2.0.1-cp37-cp37m-manylinux1_x86_64.whl", hash = "sha256:49e3ceeabbfb9d66c3aef5af3a60cc43b85c33df25ce03d0031a608b0a8b2e3f"},
-    {file = "MarkupSafe-2.0.1-cp37-cp37m-manylinux2010_i686.whl", hash = "sha256:d7f9850398e85aba693bb640262d3611788b1f29a79f0c93c565694658f4071f"},
-    {file = "MarkupSafe-2.0.1-cp37-cp37m-manylinux2010_x86_64.whl", hash = "sha256:6a7fae0dd14cf60ad5ff42baa2e95727c3d81ded453457771d02b7d2b3f9c0c2"},
-    {file = "MarkupSafe-2.0.1-cp37-cp37m-manylinux2014_aarch64.whl", hash = "sha256:b7f2d075102dc8c794cbde1947378051c4e5180d52d276987b8d28a3bd58c17d"},
-    {file = "MarkupSafe-2.0.1-cp37-cp37m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:e9936f0b261d4df76ad22f8fee3ae83b60d7c3e871292cd42f40b81b70afae85"},
-    {file = "MarkupSafe-2.0.1-cp37-cp37m-manylinux_2_5_i686.manylinux1_i686.manylinux_2_12_i686.manylinux2010_i686.whl", hash = "sha256:2a7d351cbd8cfeb19ca00de495e224dea7e7d919659c2841bbb7f420ad03e2d6"},
-    {file = "MarkupSafe-2.0.1-cp37-cp37m-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:60bf42e36abfaf9aff1f50f52644b336d4f0a3fd6d8a60ca0d054ac9f713a864"},
-    {file = "MarkupSafe-2.0.1-cp37-cp37m-musllinux_1_1_aarch64.whl", hash = "sha256:d6c7ebd4e944c85e2c3421e612a7057a2f48d478d79e61800d81468a8d842207"},
-    {file = "MarkupSafe-2.0.1-cp37-cp37m-musllinux_1_1_i686.whl", hash = "sha256:f0567c4dc99f264f49fe27da5f735f414c4e7e7dd850cfd8e69f0862d7c74ea9"},
-    {file = "MarkupSafe-2.0.1-cp37-cp37m-musllinux_1_1_x86_64.whl", hash = "sha256:89c687013cb1cd489a0f0ac24febe8c7a666e6e221b783e53ac50ebf68e45d86"},
-    {file = "MarkupSafe-2.0.1-cp37-cp37m-win32.whl", hash = "sha256:a30e67a65b53ea0a5e62fe23682cfe22712e01f453b95233b25502f7c61cb415"},
-    {file = "MarkupSafe-2.0.1-cp37-cp37m-win_amd64.whl", hash = "sha256:611d1ad9a4288cf3e3c16014564df047fe08410e628f89805e475368bd304914"},
-    {file = "MarkupSafe-2.0.1-cp38-cp38-macosx_10_9_universal2.whl", hash = "sha256:5bb28c636d87e840583ee3adeb78172efc47c8b26127267f54a9c0ec251d41a9"},
-    {file = "MarkupSafe-2.0.1-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:be98f628055368795d818ebf93da628541e10b75b41c559fdf36d104c5787066"},
-    {file = "MarkupSafe-2.0.1-cp38-cp38-manylinux1_i686.whl", hash = "sha256:1d609f577dc6e1aa17d746f8bd3c31aa4d258f4070d61b2aa5c4166c1539de35"},
-    {file = "MarkupSafe-2.0.1-cp38-cp38-manylinux1_x86_64.whl", hash = "sha256:7d91275b0245b1da4d4cfa07e0faedd5b0812efc15b702576d103293e252af1b"},
-    {file = "MarkupSafe-2.0.1-cp38-cp38-manylinux2010_i686.whl", hash = "sha256:01a9b8ea66f1658938f65b93a85ebe8bc016e6769611be228d797c9d998dd298"},
-    {file = "MarkupSafe-2.0.1-cp38-cp38-manylinux2010_x86_64.whl", hash = "sha256:47ab1e7b91c098ab893b828deafa1203de86d0bc6ab587b160f78fe6c4011f75"},
-    {file = "MarkupSafe-2.0.1-cp38-cp38-manylinux2014_aarch64.whl", hash = "sha256:97383d78eb34da7e1fa37dd273c20ad4320929af65d156e35a5e2d89566d9dfb"},
-    {file = "MarkupSafe-2.0.1-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:6fcf051089389abe060c9cd7caa212c707e58153afa2c649f00346ce6d260f1b"},
-    {file = "MarkupSafe-2.0.1-cp38-cp38-manylinux_2_5_i686.manylinux1_i686.manylinux_2_12_i686.manylinux2010_i686.whl", hash = "sha256:5855f8438a7d1d458206a2466bf82b0f104a3724bf96a1c781ab731e4201731a"},
-    {file = "MarkupSafe-2.0.1-cp38-cp38-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:3dd007d54ee88b46be476e293f48c85048603f5f516008bee124ddd891398ed6"},
-    {file = "MarkupSafe-2.0.1-cp38-cp38-musllinux_1_1_aarch64.whl", hash = "sha256:aca6377c0cb8a8253e493c6b451565ac77e98c2951c45f913e0b52facdcff83f"},
-    {file = "MarkupSafe-2.0.1-cp38-cp38-musllinux_1_1_i686.whl", hash = "sha256:04635854b943835a6ea959e948d19dcd311762c5c0c6e1f0e16ee57022669194"},
-    {file = "MarkupSafe-2.0.1-cp38-cp38-musllinux_1_1_x86_64.whl", hash = "sha256:6300b8454aa6930a24b9618fbb54b5a68135092bc666f7b06901f897fa5c2fee"},
-    {file = "MarkupSafe-2.0.1-cp38-cp38-win32.whl", hash = "sha256:023cb26ec21ece8dc3907c0e8320058b2e0cb3c55cf9564da612bc325bed5e64"},
-    {file = "MarkupSafe-2.0.1-cp38-cp38-win_amd64.whl", hash = "sha256:984d76483eb32f1bcb536dc27e4ad56bba4baa70be32fa87152832cdd9db0833"},
-    {file = "MarkupSafe-2.0.1-cp39-cp39-macosx_10_9_universal2.whl", hash = "sha256:2ef54abee730b502252bcdf31b10dacb0a416229b72c18b19e24a4509f273d26"},
-    {file = "MarkupSafe-2.0.1-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:3c112550557578c26af18a1ccc9e090bfe03832ae994343cfdacd287db6a6ae7"},
-    {file = "MarkupSafe-2.0.1-cp39-cp39-manylinux1_i686.whl", hash = "sha256:53edb4da6925ad13c07b6d26c2a852bd81e364f95301c66e930ab2aef5b5ddd8"},
-    {file = "MarkupSafe-2.0.1-cp39-cp39-manylinux1_x86_64.whl", hash = "sha256:f5653a225f31e113b152e56f154ccbe59eeb1c7487b39b9d9f9cdb58e6c79dc5"},
-    {file = "MarkupSafe-2.0.1-cp39-cp39-manylinux2010_i686.whl", hash = "sha256:4efca8f86c54b22348a5467704e3fec767b2db12fc39c6d963168ab1d3fc9135"},
-    {file = "MarkupSafe-2.0.1-cp39-cp39-manylinux2010_x86_64.whl", hash = "sha256:ab3ef638ace319fa26553db0624c4699e31a28bb2a835c5faca8f8acf6a5a902"},
-    {file = "MarkupSafe-2.0.1-cp39-cp39-manylinux2014_aarch64.whl", hash = "sha256:f8ba0e8349a38d3001fae7eadded3f6606f0da5d748ee53cc1dab1d6527b9509"},
-    {file = "MarkupSafe-2.0.1-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:c47adbc92fc1bb2b3274c4b3a43ae0e4573d9fbff4f54cd484555edbf030baf1"},
-    {file = "MarkupSafe-2.0.1-cp39-cp39-manylinux_2_5_i686.manylinux1_i686.manylinux_2_12_i686.manylinux2010_i686.whl", hash = "sha256:37205cac2a79194e3750b0af2a5720d95f786a55ce7df90c3af697bfa100eaac"},
-    {file = "MarkupSafe-2.0.1-cp39-cp39-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:1f2ade76b9903f39aa442b4aadd2177decb66525062db244b35d71d0ee8599b6"},
-    {file = "MarkupSafe-2.0.1-cp39-cp39-musllinux_1_1_aarch64.whl", hash = "sha256:4296f2b1ce8c86a6aea78613c34bb1a672ea0e3de9c6ba08a960efe0b0a09047"},
-    {file = "MarkupSafe-2.0.1-cp39-cp39-musllinux_1_1_i686.whl", hash = "sha256:9f02365d4e99430a12647f09b6cc8bab61a6564363f313126f775eb4f6ef798e"},
-    {file = "MarkupSafe-2.0.1-cp39-cp39-musllinux_1_1_x86_64.whl", hash = "sha256:5b6d930f030f8ed98e3e6c98ffa0652bdb82601e7a016ec2ab5d7ff23baa78d1"},
-    {file = "MarkupSafe-2.0.1-cp39-cp39-win32.whl", hash = "sha256:10f82115e21dc0dfec9ab5c0223652f7197feb168c940f3ef61563fc2d6beb74"},
-    {file = "MarkupSafe-2.0.1-cp39-cp39-win_amd64.whl", hash = "sha256:693ce3f9e70a6cf7d2fb9e6c9d8b204b6b39897a2c4a1aa65728d5ac97dcc1d8"},
-    {file = "MarkupSafe-2.0.1.tar.gz", hash = "sha256:594c67807fb16238b30c44bdf74f36c02cdf22d1c8cda91ef8a0ed8dabf5620a"},
-]
+markupsafe = []
 mypy-extensions = [
     {file = "mypy_extensions-0.4.3-py2.py3-none-any.whl", hash = "sha256:090fedd75945a69ae91ce1303b5824f428daf5a028d2f6ab8a299250a846f15d"},
     {file = "mypy_extensions-0.4.3.tar.gz", hash = "sha256:2d82818f5bb3e369420cb3c4060a7970edba416647068eb4c5343488a6c604a8"},
 ]
-nodeenv = [
-    {file = "nodeenv-1.6.0-py2.py3-none-any.whl", hash = "sha256:621e6b7076565ddcacd2db0294c0381e01fd28945ab36bcf00f41c5daf63bef7"},
-    {file = "nodeenv-1.6.0.tar.gz", hash = "sha256:3ef13ff90291ba2a4a7a4ff9a979b63ffdd00a464dbe04acf0ea6471517a4c2b"},
-]
+nodeenv = []
 packaging = [
     {file = "packaging-21.3-py3-none-any.whl", hash = "sha256:ef103e05f519cdc783ae24ea4e2e0f508a9c99b2d4969652eed6a2e1ea5bd522"},
     {file = "packaging-21.3.tar.gz", hash = "sha256:dd47c42927d89ab911e606518907cc2d3a1f38bbd026385970643f9c5b8ecfeb"},
 ]
-pathspec = [
-    {file = "pathspec-0.9.0-py2.py3-none-any.whl", hash = "sha256:7d15c4ddb0b5c802d161efc417ec1a2558ea2653c2e8ad9c19098201dc1c993a"},
-    {file = "pathspec-0.9.0.tar.gz", hash = "sha256:e564499435a2673d586f6b2130bb5b95f04a3ba06f81b8f895b651a3c76aabb1"},
-]
-platformdirs = [
-    {file = "platformdirs-2.4.0-py3-none-any.whl", hash = "sha256:8868bbe3c3c80d42f20156f22e7131d2fb321f5bc86a2a345375c6481a67021d"},
-    {file = "platformdirs-2.4.0.tar.gz", hash = "sha256:367a5e80b3d04d2428ffa76d33f124cf11e8fff2acdaa9b43d545f5c7d661ef2"},
-]
+pathspec = []
+platformdirs = []
 pluggy = [
     {file = "pluggy-1.0.0-py2.py3-none-any.whl", hash = "sha256:74134bbf457f031a36d68416e1509f34bd5ccc019f0bcc952c7b909d06b37bd3"},
     {file = "pluggy-1.0.0.tar.gz", hash = "sha256:4224373bacce55f955a878bf9cfa763c1e360858e330072059e10bad68531159"},
 ]
-pre-commit = [
-    {file = "pre_commit-2.19.0-py2.py3-none-any.whl", hash = "sha256:10c62741aa5704faea2ad69cb550ca78082efe5697d6f04e5710c3c229afdd10"},
-    {file = "pre_commit-2.19.0.tar.gz", hash = "sha256:4233a1e38621c87d9dda9808c6606d7e7ba0e087cd56d3fe03202a01d2919615"},
-]
+pre-commit = []
 py = [
     {file = "py-1.11.0-py2.py3-none-any.whl", hash = "sha256:607c53218732647dff4acdfcd50cb62615cedf612e72d1724fb1a0cc6405b378"},
     {file = "py-1.11.0.tar.gz", hash = "sha256:51c75c4126074b472f746a24399ad32f6053d1b34b68d2fa41e558e6f4a98719"},
 ]
 pyparsing = [
-    {file = "pyparsing-3.0.6-py3-none-any.whl", hash = "sha256:04ff808a5b90911829c55c4e26f75fa5ca8a2f5f36aa3a51f68e27033341d3e4"},
-    {file = "pyparsing-3.0.6.tar.gz", hash = "sha256:d9bdec0013ef1eb5a84ab39a3b3868911598afa494f5faa038647101504e2b81"},
-]
-pytest = [
-    {file = "pytest-7.1.2-py3-none-any.whl", hash = "sha256:13d0e3ccfc2b6e26be000cb6568c832ba67ba32e719443bfe725814d3c42433c"},
-    {file = "pytest-7.1.2.tar.gz", hash = "sha256:a06a0425453864a270bc45e71f783330a7428defb4230fb5e6a731fde06ecd45"},
+    {file = "pyparsing-3.0.9-py3-none-any.whl", hash = "sha256:5026bae9a10eeaefb61dab2f09052b9f4307d44aee4eda64b309723d8d206bbc"},
+    {file = "pyparsing-3.0.9.tar.gz", hash = "sha256:2b020ecf7d21b687f219b71ecad3631f644a47f01403fa1d1036b0c6416d70fb"},
 ]
+pytest = []
 pytest-cov = [
     {file = "pytest-cov-3.0.0.tar.gz", hash = "sha256:e7f0f5b1617d2210a2cabc266dfe2f4c75a8d32fb89eafb7ad9d06f6d076d470"},
     {file = "pytest_cov-3.0.0-py3-none-any.whl", hash = "sha256:578d5d15ac4a25e5f961c938b85a05b09fdaae9deef3bb6de9a6e766622ca7a6"},
 ]
-pytest-forked = [
-    {file = "pytest-forked-1.3.0.tar.gz", hash = "sha256:6aa9ac7e00ad1a539c41bec6d21011332de671e938c7637378ec9710204e37ca"},
-    {file = "pytest_forked-1.3.0-py2.py3-none-any.whl", hash = "sha256:dc4147784048e70ef5d437951728825a131b81714b398d5d52f17c7c144d8815"},
-]
-pytest-xdist = [
-    {file = "pytest-xdist-2.5.0.tar.gz", hash = "sha256:4580deca3ff04ddb2ac53eba39d76cb5dd5edeac050cb6fbc768b0dd712b4edf"},
-    {file = "pytest_xdist-2.5.0-py3-none-any.whl", hash = "sha256:6fe5c74fec98906deb8f2d2b616b5c782022744978e7bd4695d39c8f42d0ce65"},
-]
+pytest-forked = []
+pytest-xdist = []
 python-dateutil = [
     {file = "python-dateutil-2.8.2.tar.gz", hash = "sha256:0123cacc1627ae19ddf3c27a5de5bd67ee4586fbdd6440d9748f8abb483d3e86"},
     {file = "python_dateutil-2.8.2-py2.py3-none-any.whl", hash = "sha256:961d03dc3453ebbc59dbdea9e4e11c5651520a876d0f4db161e8674aae935da9"},
 ]
-python-dotenv = [
-    {file = "python-dotenv-0.20.0.tar.gz", hash = "sha256:b7e3b04a59693c42c36f9ab1cc2acc46fa5df8c78e178fc33a8d4cd05c8d498f"},
-    {file = "python_dotenv-0.20.0-py3-none-any.whl", hash = "sha256:d92a187be61fe482e4fd675b6d52200e7be63a12b724abbf931a40ce4fa92938"},
-]
-python-slugify = [
-    {file = "python-slugify-5.0.2.tar.gz", hash = "sha256:f13383a0b9fcbe649a1892b9c8eb4f8eab1d6d84b84bb7a624317afa98159cab"},
-    {file = "python_slugify-5.0.2-py2.py3-none-any.whl", hash = "sha256:6d8c5df75cd4a7c3a2d21e257633de53f52ab0265cd2d1dc62a730e8194a7380"},
-]
+python-dotenv = []
+python-slugify = []
 pyyaml = [
     {file = "PyYAML-6.0-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:d4db7c7aef085872ef65a8fd7d6d09a14ae91f691dec3e87ee5ee0539d516f53"},
     {file = "PyYAML-6.0-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:9df7ed3b3d2e0ecfe09e14741b857df43adb5a3ddadc919a2d94fbdf78fea53c"},
@@ -965,18 +729,12 @@ pyyaml = [
     {file = "PyYAML-6.0-cp39-cp39-win_amd64.whl", hash = "sha256:b3d267842bf12586ba6c734f89d1f5b871df0273157918b0ccefa29deb05c21c"},
     {file = "PyYAML-6.0.tar.gz", hash = "sha256:68fb519c14306fec9720a2a5b45bc9f0c8d1b9c72adf45c37baedfcd949c35a2"},
 ]
-requests = [
-    {file = "requests-2.28.1-py3-none-any.whl", hash = "sha256:8fefa2a1a1365bf5520aac41836fbee479da67864514bdb821f31ce07ce65349"},
-    {file = "requests-2.28.1.tar.gz", hash = "sha256:7c5599b102feddaa661c826c56ab4fee28bfd17f5abca1ebbe3e7f19d7c97983"},
-]
+requests = []
 six = [
     {file = "six-1.16.0-py2.py3-none-any.whl", hash = "sha256:8abb2f1d86890a2dfb989f9a77cfcfd3e47c2a354b01111771326f8aa26e0254"},
     {file = "six-1.16.0.tar.gz", hash = "sha256:1e61c37477a1626458e36f7b1d82aa5c9b094fa4802892072e49de9c60c4c926"},
 ]
-soupsieve = [
-    {file = "soupsieve-2.3.1-py3-none-any.whl", hash = "sha256:1a3cca2617c6b38c0343ed661b1fa5de5637f257d4fe22bd9f1338010a1efefb"},
-    {file = "soupsieve-2.3.1.tar.gz", hash = "sha256:b8d49b1cd4f037c7082a9683dfa1801aa2597fb11c3a1155b7a5b94829b4f1f9"},
-]
+soupsieve = []
 text-unidecode = [
     {file = "text-unidecode-1.3.tar.gz", hash = "sha256:bad6603bb14d279193107714b288be206cac565dfa49aa5b105294dd5c4aab93"},
     {file = "text_unidecode-1.3-py2.py3-none-any.whl", hash = "sha256:1311f10e8b895935241623731c2ba64f4c455287888b18189350b67134a822e8"},
@@ -986,22 +744,10 @@ toml = [
     {file = "toml-0.10.2.tar.gz", hash = "sha256:b3bda1d108d5dd99f4a20d24d9c348e91c4db7ab1b749200bded2f839ccbe68f"},
 ]
 tomli = [
-    {file = "tomli-1.2.2-py3-none-any.whl", hash = "sha256:f04066f68f5554911363063a30b108d2b5a5b1a010aa8b6132af78489fe3aade"},
-    {file = "tomli-1.2.2.tar.gz", hash = "sha256:c6ce0015eb38820eaf32b5db832dbc26deb3dd427bd5f6556cf0acac2c214fee"},
-]
-tox = [
-    {file = "tox-3.25.1-py2.py3-none-any.whl", hash = "sha256:c38e15f4733683a9cc0129fba078633e07eb0961f550a010ada879e95fb32632"},
-    {file = "tox-3.25.1.tar.gz", hash = "sha256:c138327815f53bc6da4fe56baec5f25f00622ae69ef3fe4e1e385720e22486f9"},
-]
-tqdm = [
-    {file = "tqdm-4.64.0-py2.py3-none-any.whl", hash = "sha256:74a2cdefe14d11442cedf3ba4e21a3b84ff9a2dbdc6cfae2c34addb2a14a5ea6"},
-    {file = "tqdm-4.64.0.tar.gz", hash = "sha256:40be55d30e200777a307a7585aee69e4eabb46b4ec6a4b4a5f2d9f11e7d5408d"},
-]
-urllib3 = [
-    {file = "urllib3-1.26.7-py2.py3-none-any.whl", hash = "sha256:c4fdf4019605b6e5423637e01bc9fe4daef873709a7973e195ceba0a62bbc844"},
-    {file = "urllib3-1.26.7.tar.gz", hash = "sha256:4987c65554f7a2dbf30c18fd48778ef124af6fab771a377103da0585e2336ece"},
-]
-virtualenv = [
-    {file = "virtualenv-20.10.0-py2.py3-none-any.whl", hash = "sha256:4b02e52a624336eece99c96e3ab7111f469c24ba226a53ec474e8e787b365814"},
-    {file = "virtualenv-20.10.0.tar.gz", hash = "sha256:576d05b46eace16a9c348085f7d0dc8ef28713a2cabaa1cf0aea41e8f12c9218"},
+    {file = "tomli-2.0.1-py3-none-any.whl", hash = "sha256:939de3e7a6161af0c887ef91b7d41a53e7c5a1ca976325f429cb46ea9bc30ecc"},
+    {file = "tomli-2.0.1.tar.gz", hash = "sha256:de526c12914f0c550d15924c62d72abc48d6fe7364aa87328337a31007fe8a4f"},
 ]
+tox = []
+tqdm = []
+urllib3 = []
+virtualenv = []

From 1003a00b8d41d9213c525e86f81efd51f2f38434 Mon Sep 17 00:00:00 2001
From: Roel Adriaans <roel@adriaans.org>
Date: Tue, 27 Sep 2022 18:43:42 +0200
Subject: [PATCH 119/371] Fix flake8 warning, remove duplicate test data

---
 tests/solutions/test_day04_a.py |  9 +++++----
 tests/solutions/test_day04_b.py | 23 ++---------------------
 2 files changed, 7 insertions(+), 25 deletions(-)

diff --git a/tests/solutions/test_day04_a.py b/tests/solutions/test_day04_a.py
index 20d6855b..e42d437f 100644
--- a/tests/solutions/test_day04_a.py
+++ b/tests/solutions/test_day04_a.py
@@ -1,9 +1,6 @@
 from adventofcode2021.solutions.day04 import Day04PartA
 
-
-class TestDay04PartA:
-    def test_day04a_solve(self):
-        test_data = """7,4,9,5,11,17,23,2,0,14,21,24,10,16,13,6,15,25,12,22,18,20,8,19,3,26,1
+test_data = """7,4,9,5,11,17,23,2,0,14,21,24,10,16,13,6,15,25,12,22,18,20,8,19,3,26,1
 
 22 13 17 11  0
  8  2 23  4 24
@@ -23,6 +20,10 @@ def test_day04a_solve(self):
 22 11 13  6  5
  2  0 12  3  7
  """
+
+
+class TestDay04PartA:
+    def test_day04a_solve(self):  # noqa: E501
         solution = Day04PartA()
         result = solution.solve(test_data)
         assert result == 4512
diff --git a/tests/solutions/test_day04_b.py b/tests/solutions/test_day04_b.py
index 1fd8833c..ffeebe02 100644
--- a/tests/solutions/test_day04_b.py
+++ b/tests/solutions/test_day04_b.py
@@ -1,29 +1,10 @@
+from test_day04_a import test_data
+
 from adventofcode2021.solutions.day04 import Day04PartB
 
 
 class TestDay04PartB:
     def test_day04b_solve(self):
-        test_data = """7,4,9,5,11,17,23,2,0,14,21,24,10,16,13,6,15,25,12,22,18,20,8,19,3,26,1
-
-22 13 17 11  0
- 8  2 23  4 24
-21  9 14 16  7
- 6 10  3 18  5
- 1 12 20 15 19
-
- 3 15  0  2 22
- 9 18 13 17  5
-19  8  7 25 23
-20 11 10 24  4
-14 21 16 12  6
-
-14 21 17 24  4
-10 16 15  9 19
-18  8 23 26 20
-22 11 13  6  5
- 2  0 12  3  7
- """
-
         solution = Day04PartB()
         result = solution.solve(test_data)
         assert result == 1924

From 775cf0e719a1697c61186f7514e53cbe4d7ba322 Mon Sep 17 00:00:00 2001
From: Roel Adriaans <roel@adriaans.org>
Date: Tue, 27 Sep 2022 18:49:37 +0200
Subject: [PATCH 120/371] Fix workflow: https://stackoverflow.com/a/68613319

---
 .github/workflows/tox.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/workflows/tox.yml b/.github/workflows/tox.yml
index a2b9c184..e387fbce 100644
--- a/.github/workflows/tox.yml
+++ b/.github/workflows/tox.yml
@@ -4,6 +4,7 @@ on: [push, pull_request]
 
 jobs:
   build:
+    name: Python Tests
     runs-on: ubuntu-20.04
     strategy:
       max-parallel: 4

From 8fd079adea209b4e00e26ef7821cf8984865ff19 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 27 Sep 2022 16:53:42 +0000
Subject: [PATCH 121/371] Bump python-dotenv from 0.20.0 to 0.21.0

Bumps [python-dotenv](https://github.com/theskumar/python-dotenv) from 0.20.0 to 0.21.0.
- [Release notes](https://github.com/theskumar/python-dotenv/releases)
- [Changelog](https://github.com/theskumar/python-dotenv/blob/main/CHANGELOG.md)
- [Commits](https://github.com/theskumar/python-dotenv/compare/v0.20.0...v0.21.0)

---
updated-dependencies:
- dependency-name: python-dotenv
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 poetry.lock    | 326 +++++++++++++++++++++++++++++++++++++++++--------
 pyproject.toml |   2 +-
 2 files changed, 279 insertions(+), 49 deletions(-)

diff --git a/poetry.lock b/poetry.lock
index 9000d5e9..e19f4bd8 100644
--- a/poetry.lock
+++ b/poetry.lock
@@ -33,10 +33,10 @@ optional = false
 python-versions = ">=3.5"
 
 [package.extras]
-dev = ["coverage[toml] (>=5.0.2)", "hypothesis", "pympler", "pytest (>=4.3.0)", "mypy (>=0.900,!=0.940)", "pytest-mypy-plugins", "zope.interface", "furo", "sphinx", "sphinx-notfound-page", "pre-commit", "cloudpickle"]
-docs = ["furo", "sphinx", "zope.interface", "sphinx-notfound-page"]
-tests = ["coverage[toml] (>=5.0.2)", "hypothesis", "pympler", "pytest (>=4.3.0)", "mypy (>=0.900,!=0.940)", "pytest-mypy-plugins", "zope.interface", "cloudpickle"]
-tests_no_zope = ["coverage[toml] (>=5.0.2)", "hypothesis", "pympler", "pytest (>=4.3.0)", "mypy (>=0.900,!=0.940)", "pytest-mypy-plugins", "cloudpickle"]
+dev = ["cloudpickle", "coverage[toml] (>=5.0.2)", "furo", "hypothesis", "mypy (>=0.900,!=0.940)", "pre-commit", "pympler", "pytest (>=4.3.0)", "pytest-mypy-plugins", "sphinx", "sphinx-notfound-page", "zope.interface"]
+docs = ["furo", "sphinx", "sphinx-notfound-page", "zope.interface"]
+tests = ["cloudpickle", "coverage[toml] (>=5.0.2)", "hypothesis", "mypy (>=0.900,!=0.940)", "pympler", "pytest (>=4.3.0)", "pytest-mypy-plugins", "zope.interface"]
+tests_no_zope = ["cloudpickle", "coverage[toml] (>=5.0.2)", "hypothesis", "mypy (>=0.900,!=0.940)", "pympler", "pytest (>=4.3.0)", "pytest-mypy-plugins"]
 
 [[package]]
 name = "beautifulsoup4"
@@ -237,10 +237,10 @@ optional = false
 python-versions = ">=3.6.1,<4.0"
 
 [package.extras]
-pipfile_deprecated_finder = ["pipreqs", "requirementslib"]
-requirements_deprecated_finder = ["pipreqs", "pip-api"]
 colors = ["colorama (>=0.4.3,<0.5.0)"]
+pipfile_deprecated_finder = ["pipreqs", "requirementslib"]
 plugins = ["setuptools"]
+requirements_deprecated_finder = ["pip-api", "pipreqs"]
 
 [[package]]
 name = "jinja2"
@@ -292,6 +292,9 @@ category = "dev"
 optional = false
 python-versions = ">=2.7,!=3.0.*,!=3.1.*,!=3.2.*,!=3.3.*,!=3.4.*,!=3.5.*,!=3.6.*"
 
+[package.dependencies]
+setuptools = "*"
+
 [[package]]
 name = "packaging"
 version = "21.3"
@@ -320,8 +323,8 @@ optional = false
 python-versions = ">=3.7"
 
 [package.extras]
-docs = ["furo (>=2021.7.5b38)", "proselint (>=0.10.2)", "sphinx-autodoc-typehints (>=1.12)", "sphinx (>=4)"]
-test = ["appdirs (==1.4.4)", "pytest-cov (>=2.7)", "pytest-mock (>=3.6)", "pytest (>=6)"]
+docs = ["furo (>=2021.7.5b38)", "proselint (>=0.10.2)", "sphinx (>=4)", "sphinx-autodoc-typehints (>=1.12)"]
+test = ["appdirs (==1.4.4)", "pytest (>=6)", "pytest-cov (>=2.7)", "pytest-mock (>=3.6)"]
 
 [[package]]
 name = "pluggy"
@@ -368,7 +371,7 @@ optional = false
 python-versions = ">=3.6.8"
 
 [package.extras]
-diagrams = ["railroad-diagrams", "jinja2"]
+diagrams = ["jinja2", "railroad-diagrams"]
 
 [[package]]
 name = "pytest"
@@ -403,7 +406,7 @@ coverage = {version = ">=5.2.1", extras = ["toml"]}
 pytest = ">=4.6"
 
 [package.extras]
-testing = ["fields", "hunter", "process-tests", "six", "pytest-xdist", "virtualenv"]
+testing = ["fields", "hunter", "process-tests", "pytest-xdist", "six", "virtualenv"]
 
 [[package]]
 name = "pytest-forked"
@@ -448,11 +451,11 @@ six = ">=1.5"
 
 [[package]]
 name = "python-dotenv"
-version = "0.20.0"
+version = "0.21.0"
 description = "Read key-value pairs from a .env file and set them as environment variables"
 category = "dev"
 optional = false
-python-versions = ">=3.5"
+python-versions = ">=3.7"
 
 [package.extras]
 cli = ["click (>=5.0)"]
@@ -497,6 +500,19 @@ urllib3 = ">=1.21.1,<1.27"
 socks = ["PySocks (>=1.5.6,!=1.5.7)"]
 use_chardet_on_py3 = ["chardet (>=3.0.2,<6)"]
 
+[[package]]
+name = "setuptools"
+version = "65.4.0"
+description = "Easily download, build, install, upgrade, and uninstall Python packages"
+category = "dev"
+optional = false
+python-versions = ">=3.7"
+
+[package.extras]
+docs = ["furo", "jaraco.packaging (>=9)", "jaraco.tidelift (>=1.4)", "pygments-github-lexers (==0.0.5)", "rst.linker (>=1.9)", "sphinx", "sphinx-favicon", "sphinx-hoverxref (<2)", "sphinx-inline-tabs", "sphinx-notfound-page (==0.8.3)", "sphinx-reredirects", "sphinxcontrib-towncrier"]
+testing = ["build[virtualenv]", "filelock (>=3.4.0)", "flake8 (<5)", "flake8-2020", "ini2toml[lite] (>=0.9)", "jaraco.envs (>=2.2)", "jaraco.path (>=3.2.0)", "mock", "pip (>=19.1)", "pip-run (>=8.8)", "pytest (>=6)", "pytest-black (>=0.3.7)", "pytest-checkdocs (>=2.4)", "pytest-cov", "pytest-enabler (>=1.3)", "pytest-flake8", "pytest-mypy (>=0.9.1)", "pytest-perf", "pytest-xdist", "tomli-w (>=1.0.0)", "virtualenv (>=13.0.0)", "wheel"]
+testing-integration = ["build[virtualenv]", "filelock (>=3.4.0)", "jaraco.envs (>=2.2)", "jaraco.path (>=3.2.0)", "pytest", "pytest-enabler", "pytest-xdist", "tomli", "virtualenv (>=13.0.0)", "wheel"]
+
 [[package]]
 name = "six"
 version = "1.16.0"
@@ -557,7 +573,7 @@ virtualenv = ">=16.0.0,<20.0.0 || >20.0.0,<20.0.1 || >20.0.1,<20.0.2 || >20.0.2,
 
 [package.extras]
 docs = ["pygments-github-lexers (>=0.0.5)", "sphinx (>=2.0.0)", "sphinxcontrib-autoprogram (>=0.1.5)", "towncrier (>=18.5.0)"]
-testing = ["flaky (>=3.4.0)", "freezegun (>=0.3.11)", "pytest (>=4.0.0)", "pytest-cov (>=2.5.1)", "pytest-mock (>=1.10.0)", "pytest-randomly (>=1.0.0)", "psutil (>=5.6.1)", "pathlib2 (>=2.3.3)"]
+testing = ["flaky (>=3.4.0)", "freezegun (>=0.3.11)", "pathlib2 (>=2.3.3)", "psutil (>=5.6.1)", "pytest (>=4.0.0)", "pytest-cov (>=2.5.1)", "pytest-mock (>=1.10.0)", "pytest-randomly (>=1.0.0)"]
 
 [[package]]
 name = "tqdm"
@@ -585,8 +601,8 @@ optional = false
 python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*, !=3.5.*, <4"
 
 [package.extras]
-brotli = ["brotlicffi (>=0.8.0)", "brotli (>=1.0.9)", "brotlipy (>=0.6.0)"]
-secure = ["pyOpenSSL (>=0.14)", "cryptography (>=1.3.4)", "idna (>=2.0.0)", "certifi", "urllib3-secure-extra", "ipaddress"]
+brotli = ["brotli (>=1.0.9)", "brotlicffi (>=0.8.0)", "brotlipy (>=0.6.0)"]
+secure = ["certifi", "cryptography (>=1.3.4)", "idna (>=2.0.0)", "ipaddress", "pyOpenSSL (>=0.14)", "urllib3-secure-extra"]
 socks = ["PySocks (>=1.5.6,!=1.5.7,<2.0)"]
 
 [[package]]
@@ -609,40 +625,154 @@ testing = ["coverage (>=6.2)", "coverage-enable-subprocess (>=1)", "flaky (>=3.7
 [metadata]
 lock-version = "1.1"
 python-versions = "^3.10"
-content-hash = "53c00716cb3de9c6e496b72920cd9e6f9d0fe2d79dd807496feb735da40b99ef"
+content-hash = "9fab8d1755b2431ac6a365285f76ae7b0553d3644ac000f14c94634d78d89cbd"
 
 [metadata.files]
 anytree = [
     {file = "anytree-2.8.0-py2.py3-none-any.whl", hash = "sha256:14c55ac77492b11532395049a03b773d14c7e30b22aa012e337b1e983de31521"},
     {file = "anytree-2.8.0.tar.gz", hash = "sha256:3f0f93f355a91bc3e6245319bf4c1d50e3416cc7a35cc1133c1ff38306bbccab"},
 ]
-arrow = []
-attrs = []
-beautifulsoup4 = []
+arrow = [
+    {file = "arrow-1.2.3-py3-none-any.whl", hash = "sha256:5a49ab92e3b7b71d96cd6bfcc4df14efefc9dfa96ea19045815914a6ab6b1fe2"},
+    {file = "arrow-1.2.3.tar.gz", hash = "sha256:3934b30ca1b9f292376d9db15b19446088d12ec58629bc3f0da28fd55fb633a1"},
+]
+attrs = [
+    {file = "attrs-22.1.0-py2.py3-none-any.whl", hash = "sha256:86efa402f67bf2df34f51a335487cf46b1ec130d02b8d39fd248abfd30da551c"},
+    {file = "attrs-22.1.0.tar.gz", hash = "sha256:29adc2665447e5191d0e7c568fde78b21f9672d344281d0c6e1ab085429b22b6"},
+]
+beautifulsoup4 = [
+    {file = "beautifulsoup4-4.11.1-py3-none-any.whl", hash = "sha256:58d5c3d29f5a36ffeb94f02f0d786cd53014cf9b3b3951d42e0080d8a9498d30"},
+    {file = "beautifulsoup4-4.11.1.tar.gz", hash = "sha256:ad9aa55b65ef2808eb405f46cf74df7fcb7044d5cbc26487f96eb2ef2e436693"},
+]
 binaryornot = [
     {file = "binaryornot-0.4.4-py2.py3-none-any.whl", hash = "sha256:b8b71173c917bddcd2c16070412e369c3ed7f0528926f70cac18a6c97fd563e4"},
     {file = "binaryornot-0.4.4.tar.gz", hash = "sha256:359501dfc9d40632edc9fac890e19542db1a287bbcfa58175b66658392018061"},
 ]
-black = []
-certifi = []
+black = [
+    {file = "black-22.8.0-cp310-cp310-macosx_10_9_universal2.whl", hash = "sha256:ce957f1d6b78a8a231b18e0dd2d94a33d2ba738cd88a7fe64f53f659eea49fdd"},
+    {file = "black-22.8.0-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:5107ea36b2b61917956d018bd25129baf9ad1125e39324a9b18248d362156a27"},
+    {file = "black-22.8.0-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:e8166b7bfe5dcb56d325385bd1d1e0f635f24aae14b3ae437102dedc0c186747"},
+    {file = "black-22.8.0-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:dd82842bb272297503cbec1a2600b6bfb338dae017186f8f215c8958f8acf869"},
+    {file = "black-22.8.0-cp310-cp310-win_amd64.whl", hash = "sha256:d839150f61d09e7217f52917259831fe2b689f5c8e5e32611736351b89bb2a90"},
+    {file = "black-22.8.0-cp36-cp36m-macosx_10_9_x86_64.whl", hash = "sha256:a05da0430bd5ced89176db098567973be52ce175a55677436a271102d7eaa3fe"},
+    {file = "black-22.8.0-cp36-cp36m-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:4a098a69a02596e1f2a58a2a1c8d5a05d5a74461af552b371e82f9fa4ada8342"},
+    {file = "black-22.8.0-cp36-cp36m-win_amd64.whl", hash = "sha256:5594efbdc35426e35a7defa1ea1a1cb97c7dbd34c0e49af7fb593a36bd45edab"},
+    {file = "black-22.8.0-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:a983526af1bea1e4cf6768e649990f28ee4f4137266921c2c3cee8116ae42ec3"},
+    {file = "black-22.8.0-cp37-cp37m-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:3b2c25f8dea5e8444bdc6788a2f543e1fb01494e144480bc17f806178378005e"},
+    {file = "black-22.8.0-cp37-cp37m-win_amd64.whl", hash = "sha256:78dd85caaab7c3153054756b9fe8c611efa63d9e7aecfa33e533060cb14b6d16"},
+    {file = "black-22.8.0-cp38-cp38-macosx_10_9_universal2.whl", hash = "sha256:cea1b2542d4e2c02c332e83150e41e3ca80dc0fb8de20df3c5e98e242156222c"},
+    {file = "black-22.8.0-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:5b879eb439094751185d1cfdca43023bc6786bd3c60372462b6f051efa6281a5"},
+    {file = "black-22.8.0-cp38-cp38-macosx_11_0_arm64.whl", hash = "sha256:0a12e4e1353819af41df998b02c6742643cfef58282915f781d0e4dd7a200411"},
+    {file = "black-22.8.0-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:c3a73f66b6d5ba7288cd5d6dad9b4c9b43f4e8a4b789a94bf5abfb878c663eb3"},
+    {file = "black-22.8.0-cp38-cp38-win_amd64.whl", hash = "sha256:e981e20ec152dfb3e77418fb616077937378b322d7b26aa1ff87717fb18b4875"},
+    {file = "black-22.8.0-cp39-cp39-macosx_10_9_universal2.whl", hash = "sha256:8ce13ffed7e66dda0da3e0b2eb1bdfc83f5812f66e09aca2b0978593ed636b6c"},
+    {file = "black-22.8.0-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:32a4b17f644fc288c6ee2bafdf5e3b045f4eff84693ac069d87b1a347d861497"},
+    {file = "black-22.8.0-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:0ad827325a3a634bae88ae7747db1a395d5ee02cf05d9aa7a9bd77dfb10e940c"},
+    {file = "black-22.8.0-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:53198e28a1fb865e9fe97f88220da2e44df6da82b18833b588b1883b16bb5d41"},
+    {file = "black-22.8.0-cp39-cp39-win_amd64.whl", hash = "sha256:bc4d4123830a2d190e9cc42a2e43570f82ace35c3aeb26a512a2102bce5af7ec"},
+    {file = "black-22.8.0-py3-none-any.whl", hash = "sha256:d2c21d439b2baf7aa80d6dd4e3659259be64c6f49dfd0f32091063db0e006db4"},
+    {file = "black-22.8.0.tar.gz", hash = "sha256:792f7eb540ba9a17e8656538701d3eb1afcb134e3b45b71f20b25c77a8db7e6e"},
+]
+certifi = [
+    {file = "certifi-2022.9.24-py3-none-any.whl", hash = "sha256:90c1a32f1d68f940488354e36370f6cca89f0f106db09518524c88d6ed83f382"},
+    {file = "certifi-2022.9.24.tar.gz", hash = "sha256:0d9c601124e5a6ba9712dbc60d9c53c21e34f5f641fe83002317394311bdce14"},
+]
 cfgv = [
     {file = "cfgv-3.3.1-py2.py3-none-any.whl", hash = "sha256:c6a0883f3917a037485059700b9e75da2464e6c27051014ad85ba6aaa5884426"},
     {file = "cfgv-3.3.1.tar.gz", hash = "sha256:f5a830efb9ce7a445376bb66ec94c638a9787422f96264c98edc6bdeed8ab736"},
 ]
-chardet = []
-charset-normalizer = []
-click = []
-colorama = []
-cookiecutter = []
-coverage = []
-distlib = []
+chardet = [
+    {file = "chardet-5.0.0-py3-none-any.whl", hash = "sha256:d3e64f022d254183001eccc5db4040520c0f23b1a3f33d6413e099eb7f126557"},
+    {file = "chardet-5.0.0.tar.gz", hash = "sha256:0368df2bfd78b5fc20572bb4e9bb7fb53e2c094f60ae9993339e8671d0afb8aa"},
+]
+charset-normalizer = [
+    {file = "charset-normalizer-2.1.1.tar.gz", hash = "sha256:5a3d016c7c547f69d6f81fb0db9449ce888b418b5b9952cc5e6e66843e9dd845"},
+    {file = "charset_normalizer-2.1.1-py3-none-any.whl", hash = "sha256:83e9a75d1911279afd89352c68b45348559d1fc0506b054b346651b5e7fee29f"},
+]
+click = [
+    {file = "click-8.1.3-py3-none-any.whl", hash = "sha256:bb4d8133cb15a609f44e8213d9b391b0809795062913b383c62be0ee95b1db48"},
+    {file = "click-8.1.3.tar.gz", hash = "sha256:7682dc8afb30297001674575ea00d1814d808d6a36af415a82bd481d37ba7b8e"},
+]
+colorama = [
+    {file = "colorama-0.4.5-py2.py3-none-any.whl", hash = "sha256:854bf444933e37f5824ae7bfc1e98d5bce2ebe4160d46b5edf346a89358e99da"},
+    {file = "colorama-0.4.5.tar.gz", hash = "sha256:e6c6b4334fc50988a639d9b98aa429a0b57da6e17b9a44f0451f930b6967b7a4"},
+]
+cookiecutter = [
+    {file = "cookiecutter-2.1.1-py2.py3-none-any.whl", hash = "sha256:9f3ab027cec4f70916e28f03470bdb41e637a3ad354b4d65c765d93aad160022"},
+    {file = "cookiecutter-2.1.1.tar.gz", hash = "sha256:f3982be8d9c53dac1261864013fdec7f83afd2e42ede6f6dd069c5e149c540d5"},
+]
+coverage = [
+    {file = "coverage-6.4.4-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:e7b4da9bafad21ea45a714d3ea6f3e1679099e420c8741c74905b92ee9bfa7cc"},
+    {file = "coverage-6.4.4-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:fde17bc42e0716c94bf19d92e4c9f5a00c5feb401f5bc01101fdf2a8b7cacf60"},
+    {file = "coverage-6.4.4-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:cdbb0d89923c80dbd435b9cf8bba0ff55585a3cdb28cbec65f376c041472c60d"},
+    {file = "coverage-6.4.4-cp310-cp310-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:67f9346aeebea54e845d29b487eb38ec95f2ecf3558a3cffb26ee3f0dcc3e760"},
+    {file = "coverage-6.4.4-cp310-cp310-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:42c499c14efd858b98c4e03595bf914089b98400d30789511577aa44607a1b74"},
+    {file = "coverage-6.4.4-cp310-cp310-musllinux_1_1_aarch64.whl", hash = "sha256:c35cca192ba700979d20ac43024a82b9b32a60da2f983bec6c0f5b84aead635c"},
+    {file = "coverage-6.4.4-cp310-cp310-musllinux_1_1_i686.whl", hash = "sha256:9cc4f107009bca5a81caef2fca843dbec4215c05e917a59dec0c8db5cff1d2aa"},
+    {file = "coverage-6.4.4-cp310-cp310-musllinux_1_1_x86_64.whl", hash = "sha256:5f444627b3664b80d078c05fe6a850dd711beeb90d26731f11d492dcbadb6973"},
+    {file = "coverage-6.4.4-cp310-cp310-win32.whl", hash = "sha256:66e6df3ac4659a435677d8cd40e8eb1ac7219345d27c41145991ee9bf4b806a0"},
+    {file = "coverage-6.4.4-cp310-cp310-win_amd64.whl", hash = "sha256:35ef1f8d8a7a275aa7410d2f2c60fa6443f4a64fae9be671ec0696a68525b875"},
+    {file = "coverage-6.4.4-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:c1328d0c2f194ffda30a45f11058c02410e679456276bfa0bbe0b0ee87225fac"},
+    {file = "coverage-6.4.4-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:61b993f3998ee384935ee423c3d40894e93277f12482f6e777642a0141f55782"},
+    {file = "coverage-6.4.4-cp311-cp311-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:d5dd4b8e9cd0deb60e6fcc7b0647cbc1da6c33b9e786f9c79721fd303994832f"},
+    {file = "coverage-6.4.4-cp311-cp311-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:7026f5afe0d1a933685d8f2169d7c2d2e624f6255fb584ca99ccca8c0e966fd7"},
+    {file = "coverage-6.4.4-cp311-cp311-musllinux_1_1_aarch64.whl", hash = "sha256:9c7b9b498eb0c0d48b4c2abc0e10c2d78912203f972e0e63e3c9dc21f15abdaa"},
+    {file = "coverage-6.4.4-cp311-cp311-musllinux_1_1_i686.whl", hash = "sha256:ee2b2fb6eb4ace35805f434e0f6409444e1466a47f620d1d5763a22600f0f892"},
+    {file = "coverage-6.4.4-cp311-cp311-musllinux_1_1_x86_64.whl", hash = "sha256:ab066f5ab67059d1f1000b5e1aa8bbd75b6ed1fc0014559aea41a9eb66fc2ce0"},
+    {file = "coverage-6.4.4-cp311-cp311-win32.whl", hash = "sha256:9d6e1f3185cbfd3d91ac77ea065d85d5215d3dfa45b191d14ddfcd952fa53796"},
+    {file = "coverage-6.4.4-cp311-cp311-win_amd64.whl", hash = "sha256:e3d3c4cc38b2882f9a15bafd30aec079582b819bec1b8afdbde8f7797008108a"},
+    {file = "coverage-6.4.4-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:a095aa0a996ea08b10580908e88fbaf81ecf798e923bbe64fb98d1807db3d68a"},
+    {file = "coverage-6.4.4-cp37-cp37m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:ef6f44409ab02e202b31a05dd6666797f9de2aa2b4b3534e9d450e42dea5e817"},
+    {file = "coverage-6.4.4-cp37-cp37m-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:4b7101938584d67e6f45f0015b60e24a95bf8dea19836b1709a80342e01b472f"},
+    {file = "coverage-6.4.4-cp37-cp37m-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:14a32ec68d721c3d714d9b105c7acf8e0f8a4f4734c811eda75ff3718570b5e3"},
+    {file = "coverage-6.4.4-cp37-cp37m-musllinux_1_1_aarch64.whl", hash = "sha256:6a864733b22d3081749450466ac80698fe39c91cb6849b2ef8752fd7482011f3"},
+    {file = "coverage-6.4.4-cp37-cp37m-musllinux_1_1_i686.whl", hash = "sha256:08002f9251f51afdcc5e3adf5d5d66bb490ae893d9e21359b085f0e03390a820"},
+    {file = "coverage-6.4.4-cp37-cp37m-musllinux_1_1_x86_64.whl", hash = "sha256:a3b2752de32c455f2521a51bd3ffb53c5b3ae92736afde67ce83477f5c1dd928"},
+    {file = "coverage-6.4.4-cp37-cp37m-win32.whl", hash = "sha256:f855b39e4f75abd0dfbcf74a82e84ae3fc260d523fcb3532786bcbbcb158322c"},
+    {file = "coverage-6.4.4-cp37-cp37m-win_amd64.whl", hash = "sha256:ee6ae6bbcac0786807295e9687169fba80cb0617852b2fa118a99667e8e6815d"},
+    {file = "coverage-6.4.4-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:564cd0f5b5470094df06fab676c6d77547abfdcb09b6c29c8a97c41ad03b103c"},
+    {file = "coverage-6.4.4-cp38-cp38-macosx_11_0_arm64.whl", hash = "sha256:cbbb0e4cd8ddcd5ef47641cfac97d8473ab6b132dd9a46bacb18872828031685"},
+    {file = "coverage-6.4.4-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:6113e4df2fa73b80f77663445be6d567913fb3b82a86ceb64e44ae0e4b695de1"},
+    {file = "coverage-6.4.4-cp38-cp38-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:8d032bfc562a52318ae05047a6eb801ff31ccee172dc0d2504614e911d8fa83e"},
+    {file = "coverage-6.4.4-cp38-cp38-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:e431e305a1f3126477abe9a184624a85308da8edf8486a863601d58419d26ffa"},
+    {file = "coverage-6.4.4-cp38-cp38-musllinux_1_1_aarch64.whl", hash = "sha256:cf2afe83a53f77aec067033199797832617890e15bed42f4a1a93ea24794ae3e"},
+    {file = "coverage-6.4.4-cp38-cp38-musllinux_1_1_i686.whl", hash = "sha256:783bc7c4ee524039ca13b6d9b4186a67f8e63d91342c713e88c1865a38d0892a"},
+    {file = "coverage-6.4.4-cp38-cp38-musllinux_1_1_x86_64.whl", hash = "sha256:ff934ced84054b9018665ca3967fc48e1ac99e811f6cc99ea65978e1d384454b"},
+    {file = "coverage-6.4.4-cp38-cp38-win32.whl", hash = "sha256:e1fabd473566fce2cf18ea41171d92814e4ef1495e04471786cbc943b89a3781"},
+    {file = "coverage-6.4.4-cp38-cp38-win_amd64.whl", hash = "sha256:4179502f210ebed3ccfe2f78bf8e2d59e50b297b598b100d6c6e3341053066a2"},
+    {file = "coverage-6.4.4-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:98c0b9e9b572893cdb0a00e66cf961a238f8d870d4e1dc8e679eb8bdc2eb1b86"},
+    {file = "coverage-6.4.4-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:fc600f6ec19b273da1d85817eda339fb46ce9eef3e89f220055d8696e0a06908"},
+    {file = "coverage-6.4.4-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:7a98d6bf6d4ca5c07a600c7b4e0c5350cd483c85c736c522b786be90ea5bac4f"},
+    {file = "coverage-6.4.4-cp39-cp39-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:01778769097dbd705a24e221f42be885c544bb91251747a8a3efdec6eb4788f2"},
+    {file = "coverage-6.4.4-cp39-cp39-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:dfa0b97eb904255e2ab24166071b27408f1f69c8fbda58e9c0972804851e0558"},
+    {file = "coverage-6.4.4-cp39-cp39-musllinux_1_1_aarch64.whl", hash = "sha256:fcbe3d9a53e013f8ab88734d7e517eb2cd06b7e689bedf22c0eb68db5e4a0a19"},
+    {file = "coverage-6.4.4-cp39-cp39-musllinux_1_1_i686.whl", hash = "sha256:15e38d853ee224e92ccc9a851457fb1e1f12d7a5df5ae44544ce7863691c7a0d"},
+    {file = "coverage-6.4.4-cp39-cp39-musllinux_1_1_x86_64.whl", hash = "sha256:6913dddee2deff8ab2512639c5168c3e80b3ebb0f818fed22048ee46f735351a"},
+    {file = "coverage-6.4.4-cp39-cp39-win32.whl", hash = "sha256:354df19fefd03b9a13132fa6643527ef7905712109d9c1c1903f2133d3a4e145"},
+    {file = "coverage-6.4.4-cp39-cp39-win_amd64.whl", hash = "sha256:1238b08f3576201ebf41f7c20bf59baa0d05da941b123c6656e42cdb668e9827"},
+    {file = "coverage-6.4.4-pp36.pp37.pp38-none-any.whl", hash = "sha256:f67cf9f406cf0d2f08a3515ce2db5b82625a7257f88aad87904674def6ddaec1"},
+    {file = "coverage-6.4.4.tar.gz", hash = "sha256:e16c45b726acb780e1e6f88b286d3c10b3914ab03438f32117c4aa52d7f30d58"},
+]
+distlib = [
+    {file = "distlib-0.3.6-py2.py3-none-any.whl", hash = "sha256:f35c4b692542ca110de7ef0bea44d73981caeb34ca0b9b6b2e6d7790dda8f80e"},
+    {file = "distlib-0.3.6.tar.gz", hash = "sha256:14bad2d9b04d3a36127ac97f30b12a19268f211063d8f8ee4f47108896e11b46"},
+]
 execnet = [
     {file = "execnet-1.9.0-py2.py3-none-any.whl", hash = "sha256:a295f7cc774947aac58dde7fdc85f4aa00c42adf5d8f5468fc630c1acf30a142"},
     {file = "execnet-1.9.0.tar.gz", hash = "sha256:8f694f3ba9cc92cab508b152dcfe322153975c29bda272e2fd7f3f00f36e47c5"},
 ]
-filelock = []
-identify = []
-idna = []
+filelock = [
+    {file = "filelock-3.8.0-py3-none-any.whl", hash = "sha256:617eb4e5eedc82fc5f47b6d61e4d11cb837c56cb4544e39081099fa17ad109d4"},
+    {file = "filelock-3.8.0.tar.gz", hash = "sha256:55447caa666f2198c5b6b13a26d2084d26fa5b115c00d065664b2124680c4edc"},
+]
+identify = [
+    {file = "identify-2.5.5-py2.py3-none-any.whl", hash = "sha256:ef78c0d96098a3b5fe7720be4a97e73f439af7cf088ebf47b620aeaa10fadf97"},
+    {file = "identify-2.5.5.tar.gz", hash = "sha256:322a5699daecf7c6fd60e68852f36f2ecbb6a36ff6e6e973e0d2bb6fca203ee6"},
+]
+idna = [
+    {file = "idna-3.4-py3-none-any.whl", hash = "sha256:90b77e79eaa3eba6de819a0c442c0b4ceefc341a7a2ab77d7562bf49f425c5c2"},
+    {file = "idna-3.4.tar.gz", hash = "sha256:814f528e8dead7d329833b91c5faa87d60bf71824cd12a7530b5526063d02cb4"},
+]
 iniconfig = [
     {file = "iniconfig-1.1.1-py2.py3-none-any.whl", hash = "sha256:011e24c64b7f47f6ebd835bb12a743f2fbe9a26d4cecaa7f53bc4f35ee9da8b3"},
     {file = "iniconfig-1.1.1.tar.gz", hash = "sha256:bc3af051d7d14b2ee5ef9969666def0cd1a000e121eaea580d4a313df4b37f32"},
@@ -651,28 +781,84 @@ isort = [
     {file = "isort-5.10.1-py3-none-any.whl", hash = "sha256:6f62d78e2f89b4500b080fe3a81690850cd254227f27f75c3a0c491a1f351ba7"},
     {file = "isort-5.10.1.tar.gz", hash = "sha256:e8443a5e7a020e9d7f97f1d7d9cd17c88bcb3bc7e218bf9cf5095fe550be2951"},
 ]
-jinja2 = []
+jinja2 = [
+    {file = "Jinja2-3.1.2-py3-none-any.whl", hash = "sha256:6088930bfe239f0e6710546ab9c19c9ef35e29792895fed6e6e31a023a182a61"},
+    {file = "Jinja2-3.1.2.tar.gz", hash = "sha256:31351a702a408a9e7595a8fc6150fc3f43bb6bf7e319770cbc0db9df9437e852"},
+]
 jinja2-time = [
     {file = "jinja2-time-0.2.0.tar.gz", hash = "sha256:d14eaa4d315e7688daa4969f616f226614350c48730bfa1692d2caebd8c90d40"},
     {file = "jinja2_time-0.2.0-py2.py3-none-any.whl", hash = "sha256:d3eab6605e3ec8b7a0863df09cc1d23714908fa61aa6986a845c20ba488b4efa"},
 ]
-markupsafe = []
+markupsafe = [
+    {file = "MarkupSafe-2.1.1-cp310-cp310-macosx_10_9_universal2.whl", hash = "sha256:86b1f75c4e7c2ac2ccdaec2b9022845dbb81880ca318bb7a0a01fbf7813e3812"},
+    {file = "MarkupSafe-2.1.1-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:f121a1420d4e173a5d96e47e9a0c0dcff965afdf1626d28de1460815f7c4ee7a"},
+    {file = "MarkupSafe-2.1.1-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:a49907dd8420c5685cfa064a1335b6754b74541bbb3706c259c02ed65b644b3e"},
+    {file = "MarkupSafe-2.1.1-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:10c1bfff05d95783da83491be968e8fe789263689c02724e0c691933c52994f5"},
+    {file = "MarkupSafe-2.1.1-cp310-cp310-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:b7bd98b796e2b6553da7225aeb61f447f80a1ca64f41d83612e6139ca5213aa4"},
+    {file = "MarkupSafe-2.1.1-cp310-cp310-musllinux_1_1_aarch64.whl", hash = "sha256:b09bf97215625a311f669476f44b8b318b075847b49316d3e28c08e41a7a573f"},
+    {file = "MarkupSafe-2.1.1-cp310-cp310-musllinux_1_1_i686.whl", hash = "sha256:694deca8d702d5db21ec83983ce0bb4b26a578e71fbdbd4fdcd387daa90e4d5e"},
+    {file = "MarkupSafe-2.1.1-cp310-cp310-musllinux_1_1_x86_64.whl", hash = "sha256:efc1913fd2ca4f334418481c7e595c00aad186563bbc1ec76067848c7ca0a933"},
+    {file = "MarkupSafe-2.1.1-cp310-cp310-win32.whl", hash = "sha256:4a33dea2b688b3190ee12bd7cfa29d39c9ed176bda40bfa11099a3ce5d3a7ac6"},
+    {file = "MarkupSafe-2.1.1-cp310-cp310-win_amd64.whl", hash = "sha256:dda30ba7e87fbbb7eab1ec9f58678558fd9a6b8b853530e176eabd064da81417"},
+    {file = "MarkupSafe-2.1.1-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:671cd1187ed5e62818414afe79ed29da836dde67166a9fac6d435873c44fdd02"},
+    {file = "MarkupSafe-2.1.1-cp37-cp37m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:3799351e2336dc91ea70b034983ee71cf2f9533cdff7c14c90ea126bfd95d65a"},
+    {file = "MarkupSafe-2.1.1-cp37-cp37m-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:e72591e9ecd94d7feb70c1cbd7be7b3ebea3f548870aa91e2732960fa4d57a37"},
+    {file = "MarkupSafe-2.1.1-cp37-cp37m-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:6fbf47b5d3728c6aea2abb0589b5d30459e369baa772e0f37a0320185e87c980"},
+    {file = "MarkupSafe-2.1.1-cp37-cp37m-musllinux_1_1_aarch64.whl", hash = "sha256:d5ee4f386140395a2c818d149221149c54849dfcfcb9f1debfe07a8b8bd63f9a"},
+    {file = "MarkupSafe-2.1.1-cp37-cp37m-musllinux_1_1_i686.whl", hash = "sha256:bcb3ed405ed3222f9904899563d6fc492ff75cce56cba05e32eff40e6acbeaa3"},
+    {file = "MarkupSafe-2.1.1-cp37-cp37m-musllinux_1_1_x86_64.whl", hash = "sha256:e1c0b87e09fa55a220f058d1d49d3fb8df88fbfab58558f1198e08c1e1de842a"},
+    {file = "MarkupSafe-2.1.1-cp37-cp37m-win32.whl", hash = "sha256:8dc1c72a69aa7e082593c4a203dcf94ddb74bb5c8a731e4e1eb68d031e8498ff"},
+    {file = "MarkupSafe-2.1.1-cp37-cp37m-win_amd64.whl", hash = "sha256:97a68e6ada378df82bc9f16b800ab77cbf4b2fada0081794318520138c088e4a"},
+    {file = "MarkupSafe-2.1.1-cp38-cp38-macosx_10_9_universal2.whl", hash = "sha256:e8c843bbcda3a2f1e3c2ab25913c80a3c5376cd00c6e8c4a86a89a28c8dc5452"},
+    {file = "MarkupSafe-2.1.1-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:0212a68688482dc52b2d45013df70d169f542b7394fc744c02a57374a4207003"},
+    {file = "MarkupSafe-2.1.1-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:8e576a51ad59e4bfaac456023a78f6b5e6e7651dcd383bcc3e18d06f9b55d6d1"},
+    {file = "MarkupSafe-2.1.1-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:4b9fe39a2ccc108a4accc2676e77da025ce383c108593d65cc909add5c3bd601"},
+    {file = "MarkupSafe-2.1.1-cp38-cp38-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:96e37a3dc86e80bf81758c152fe66dbf60ed5eca3d26305edf01892257049925"},
+    {file = "MarkupSafe-2.1.1-cp38-cp38-musllinux_1_1_aarch64.whl", hash = "sha256:6d0072fea50feec76a4c418096652f2c3238eaa014b2f94aeb1d56a66b41403f"},
+    {file = "MarkupSafe-2.1.1-cp38-cp38-musllinux_1_1_i686.whl", hash = "sha256:089cf3dbf0cd6c100f02945abeb18484bd1ee57a079aefd52cffd17fba910b88"},
+    {file = "MarkupSafe-2.1.1-cp38-cp38-musllinux_1_1_x86_64.whl", hash = "sha256:6a074d34ee7a5ce3effbc526b7083ec9731bb3cbf921bbe1d3005d4d2bdb3a63"},
+    {file = "MarkupSafe-2.1.1-cp38-cp38-win32.whl", hash = "sha256:421be9fbf0ffe9ffd7a378aafebbf6f4602d564d34be190fc19a193232fd12b1"},
+    {file = "MarkupSafe-2.1.1-cp38-cp38-win_amd64.whl", hash = "sha256:fc7b548b17d238737688817ab67deebb30e8073c95749d55538ed473130ec0c7"},
+    {file = "MarkupSafe-2.1.1-cp39-cp39-macosx_10_9_universal2.whl", hash = "sha256:e04e26803c9c3851c931eac40c695602c6295b8d432cbe78609649ad9bd2da8a"},
+    {file = "MarkupSafe-2.1.1-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:b87db4360013327109564f0e591bd2a3b318547bcef31b468a92ee504d07ae4f"},
+    {file = "MarkupSafe-2.1.1-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:99a2a507ed3ac881b975a2976d59f38c19386d128e7a9a18b7df6fff1fd4c1d6"},
+    {file = "MarkupSafe-2.1.1-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:56442863ed2b06d19c37f94d999035e15ee982988920e12a5b4ba29b62ad1f77"},
+    {file = "MarkupSafe-2.1.1-cp39-cp39-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:3ce11ee3f23f79dbd06fb3d63e2f6af7b12db1d46932fe7bd8afa259a5996603"},
+    {file = "MarkupSafe-2.1.1-cp39-cp39-musllinux_1_1_aarch64.whl", hash = "sha256:33b74d289bd2f5e527beadcaa3f401e0df0a89927c1559c8566c066fa4248ab7"},
+    {file = "MarkupSafe-2.1.1-cp39-cp39-musllinux_1_1_i686.whl", hash = "sha256:43093fb83d8343aac0b1baa75516da6092f58f41200907ef92448ecab8825135"},
+    {file = "MarkupSafe-2.1.1-cp39-cp39-musllinux_1_1_x86_64.whl", hash = "sha256:8e3dcf21f367459434c18e71b2a9532d96547aef8a871872a5bd69a715c15f96"},
+    {file = "MarkupSafe-2.1.1-cp39-cp39-win32.whl", hash = "sha256:d4306c36ca495956b6d568d276ac11fdd9c30a36f1b6eb928070dc5360b22e1c"},
+    {file = "MarkupSafe-2.1.1-cp39-cp39-win_amd64.whl", hash = "sha256:46d00d6cfecdde84d40e572d63735ef81423ad31184100411e6e3388d405e247"},
+    {file = "MarkupSafe-2.1.1.tar.gz", hash = "sha256:7f91197cc9e48f989d12e4e6fbc46495c446636dfc81b9ccf50bb0ec74b91d4b"},
+]
 mypy-extensions = [
     {file = "mypy_extensions-0.4.3-py2.py3-none-any.whl", hash = "sha256:090fedd75945a69ae91ce1303b5824f428daf5a028d2f6ab8a299250a846f15d"},
     {file = "mypy_extensions-0.4.3.tar.gz", hash = "sha256:2d82818f5bb3e369420cb3c4060a7970edba416647068eb4c5343488a6c604a8"},
 ]
-nodeenv = []
+nodeenv = [
+    {file = "nodeenv-1.7.0-py2.py3-none-any.whl", hash = "sha256:27083a7b96a25f2f5e1d8cb4b6317ee8aeda3bdd121394e5ac54e498028a042e"},
+    {file = "nodeenv-1.7.0.tar.gz", hash = "sha256:e0e7f7dfb85fc5394c6fe1e8fa98131a2473e04311a45afb6508f7cf1836fa2b"},
+]
 packaging = [
     {file = "packaging-21.3-py3-none-any.whl", hash = "sha256:ef103e05f519cdc783ae24ea4e2e0f508a9c99b2d4969652eed6a2e1ea5bd522"},
     {file = "packaging-21.3.tar.gz", hash = "sha256:dd47c42927d89ab911e606518907cc2d3a1f38bbd026385970643f9c5b8ecfeb"},
 ]
-pathspec = []
-platformdirs = []
+pathspec = [
+    {file = "pathspec-0.10.1-py3-none-any.whl", hash = "sha256:46846318467efc4556ccfd27816e004270a9eeeeb4d062ce5e6fc7a87c573f93"},
+    {file = "pathspec-0.10.1.tar.gz", hash = "sha256:7ace6161b621d31e7902eb6b5ae148d12cfd23f4a249b9ffb6b9fee12084323d"},
+]
+platformdirs = [
+    {file = "platformdirs-2.5.2-py3-none-any.whl", hash = "sha256:027d8e83a2d7de06bbac4e5ef7e023c02b863d7ea5d079477e722bb41ab25788"},
+    {file = "platformdirs-2.5.2.tar.gz", hash = "sha256:58c8abb07dcb441e6ee4b11d8df0ac856038f944ab98b7be6b27b2a3c7feef19"},
+]
 pluggy = [
     {file = "pluggy-1.0.0-py2.py3-none-any.whl", hash = "sha256:74134bbf457f031a36d68416e1509f34bd5ccc019f0bcc952c7b909d06b37bd3"},
     {file = "pluggy-1.0.0.tar.gz", hash = "sha256:4224373bacce55f955a878bf9cfa763c1e360858e330072059e10bad68531159"},
 ]
-pre-commit = []
+pre-commit = [
+    {file = "pre_commit-2.20.0-py2.py3-none-any.whl", hash = "sha256:51a5ba7c480ae8072ecdb6933df22d2f812dc897d5fe848778116129a681aac7"},
+    {file = "pre_commit-2.20.0.tar.gz", hash = "sha256:a978dac7bc9ec0bcee55c18a277d553b0f419d259dadb4b9418ff2d00eb43959"},
+]
 py = [
     {file = "py-1.11.0-py2.py3-none-any.whl", hash = "sha256:607c53218732647dff4acdfcd50cb62615cedf612e72d1724fb1a0cc6405b378"},
     {file = "py-1.11.0.tar.gz", hash = "sha256:51c75c4126074b472f746a24399ad32f6053d1b34b68d2fa41e558e6f4a98719"},
@@ -681,19 +867,34 @@ pyparsing = [
     {file = "pyparsing-3.0.9-py3-none-any.whl", hash = "sha256:5026bae9a10eeaefb61dab2f09052b9f4307d44aee4eda64b309723d8d206bbc"},
     {file = "pyparsing-3.0.9.tar.gz", hash = "sha256:2b020ecf7d21b687f219b71ecad3631f644a47f01403fa1d1036b0c6416d70fb"},
 ]
-pytest = []
+pytest = [
+    {file = "pytest-7.1.3-py3-none-any.whl", hash = "sha256:1377bda3466d70b55e3f5cecfa55bb7cfcf219c7964629b967c37cf0bda818b7"},
+    {file = "pytest-7.1.3.tar.gz", hash = "sha256:4f365fec2dff9c1162f834d9f18af1ba13062db0c708bf7b946f8a5c76180c39"},
+]
 pytest-cov = [
     {file = "pytest-cov-3.0.0.tar.gz", hash = "sha256:e7f0f5b1617d2210a2cabc266dfe2f4c75a8d32fb89eafb7ad9d06f6d076d470"},
     {file = "pytest_cov-3.0.0-py3-none-any.whl", hash = "sha256:578d5d15ac4a25e5f961c938b85a05b09fdaae9deef3bb6de9a6e766622ca7a6"},
 ]
-pytest-forked = []
-pytest-xdist = []
+pytest-forked = [
+    {file = "pytest-forked-1.4.0.tar.gz", hash = "sha256:8b67587c8f98cbbadfdd804539ed5455b6ed03802203485dd2f53c1422d7440e"},
+    {file = "pytest_forked-1.4.0-py3-none-any.whl", hash = "sha256:bbbb6717efc886b9d64537b41fb1497cfaf3c9601276be8da2cccfea5a3c8ad8"},
+]
+pytest-xdist = [
+    {file = "pytest-xdist-2.5.0.tar.gz", hash = "sha256:4580deca3ff04ddb2ac53eba39d76cb5dd5edeac050cb6fbc768b0dd712b4edf"},
+    {file = "pytest_xdist-2.5.0-py3-none-any.whl", hash = "sha256:6fe5c74fec98906deb8f2d2b616b5c782022744978e7bd4695d39c8f42d0ce65"},
+]
 python-dateutil = [
     {file = "python-dateutil-2.8.2.tar.gz", hash = "sha256:0123cacc1627ae19ddf3c27a5de5bd67ee4586fbdd6440d9748f8abb483d3e86"},
     {file = "python_dateutil-2.8.2-py2.py3-none-any.whl", hash = "sha256:961d03dc3453ebbc59dbdea9e4e11c5651520a876d0f4db161e8674aae935da9"},
 ]
-python-dotenv = []
-python-slugify = []
+python-dotenv = [
+    {file = "python-dotenv-0.21.0.tar.gz", hash = "sha256:b77d08274639e3d34145dfa6c7008e66df0f04b7be7a75fd0d5292c191d79045"},
+    {file = "python_dotenv-0.21.0-py3-none-any.whl", hash = "sha256:1684eb44636dd462b66c3ee016599815514527ad99965de77f43e0944634a7e5"},
+]
+python-slugify = [
+    {file = "python-slugify-6.1.2.tar.gz", hash = "sha256:272d106cb31ab99b3496ba085e3fea0e9e76dcde967b5e9992500d1f785ce4e1"},
+    {file = "python_slugify-6.1.2-py2.py3-none-any.whl", hash = "sha256:7b2c274c308b62f4269a9ba701aa69a797e9bca41aeee5b3a9e79e36b6656927"},
+]
 pyyaml = [
     {file = "PyYAML-6.0-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:d4db7c7aef085872ef65a8fd7d6d09a14ae91f691dec3e87ee5ee0539d516f53"},
     {file = "PyYAML-6.0-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:9df7ed3b3d2e0ecfe09e14741b857df43adb5a3ddadc919a2d94fbdf78fea53c"},
@@ -702,6 +903,13 @@ pyyaml = [
     {file = "PyYAML-6.0-cp310-cp310-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:f84fbc98b019fef2ee9a1cb3ce93e3187a6df0b2538a651bfb890254ba9f90b5"},
     {file = "PyYAML-6.0-cp310-cp310-win32.whl", hash = "sha256:2cd5df3de48857ed0544b34e2d40e9fac445930039f3cfe4bcc592a1f836d513"},
     {file = "PyYAML-6.0-cp310-cp310-win_amd64.whl", hash = "sha256:daf496c58a8c52083df09b80c860005194014c3698698d1a57cbcfa182142a3a"},
+    {file = "PyYAML-6.0-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:d4b0ba9512519522b118090257be113b9468d804b19d63c71dbcf4a48fa32358"},
+    {file = "PyYAML-6.0-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:81957921f441d50af23654aa6c5e5eaf9b06aba7f0a19c18a538dc7ef291c5a1"},
+    {file = "PyYAML-6.0-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:afa17f5bc4d1b10afd4466fd3a44dc0e245382deca5b3c353d8b757f9e3ecb8d"},
+    {file = "PyYAML-6.0-cp311-cp311-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:dbad0e9d368bb989f4515da330b88a057617d16b6a8245084f1b05400f24609f"},
+    {file = "PyYAML-6.0-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:432557aa2c09802be39460360ddffd48156e30721f5e8d917f01d31694216782"},
+    {file = "PyYAML-6.0-cp311-cp311-win32.whl", hash = "sha256:bfaef573a63ba8923503d27530362590ff4f576c626d86a9fed95822a8255fd7"},
+    {file = "PyYAML-6.0-cp311-cp311-win_amd64.whl", hash = "sha256:01b45c0191e6d66c470b6cf1b9531a771a83c1c4208272ead47a3ae4f2f603bf"},
     {file = "PyYAML-6.0-cp36-cp36m-macosx_10_9_x86_64.whl", hash = "sha256:897b80890765f037df3403d22bab41627ca8811ae55e9a722fd0392850ec4d86"},
     {file = "PyYAML-6.0-cp36-cp36m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:50602afada6d6cbfad699b0c7bb50d5ccffa7e46a3d738092afddc1f9758427f"},
     {file = "PyYAML-6.0-cp36-cp36m-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:48c346915c114f5fdb3ead70312bd042a953a8ce5c7106d5bfb1a5254e47da92"},
@@ -729,12 +937,22 @@ pyyaml = [
     {file = "PyYAML-6.0-cp39-cp39-win_amd64.whl", hash = "sha256:b3d267842bf12586ba6c734f89d1f5b871df0273157918b0ccefa29deb05c21c"},
     {file = "PyYAML-6.0.tar.gz", hash = "sha256:68fb519c14306fec9720a2a5b45bc9f0c8d1b9c72adf45c37baedfcd949c35a2"},
 ]
-requests = []
+requests = [
+    {file = "requests-2.28.1-py3-none-any.whl", hash = "sha256:8fefa2a1a1365bf5520aac41836fbee479da67864514bdb821f31ce07ce65349"},
+    {file = "requests-2.28.1.tar.gz", hash = "sha256:7c5599b102feddaa661c826c56ab4fee28bfd17f5abca1ebbe3e7f19d7c97983"},
+]
+setuptools = [
+    {file = "setuptools-65.4.0-py3-none-any.whl", hash = "sha256:c2d2709550f15aab6c9110196ea312f468f41cd546bceb24127a1be6fdcaeeb1"},
+    {file = "setuptools-65.4.0.tar.gz", hash = "sha256:a8f6e213b4b0661f590ccf40de95d28a177cd747d098624ad3f69c40287297e9"},
+]
 six = [
     {file = "six-1.16.0-py2.py3-none-any.whl", hash = "sha256:8abb2f1d86890a2dfb989f9a77cfcfd3e47c2a354b01111771326f8aa26e0254"},
     {file = "six-1.16.0.tar.gz", hash = "sha256:1e61c37477a1626458e36f7b1d82aa5c9b094fa4802892072e49de9c60c4c926"},
 ]
-soupsieve = []
+soupsieve = [
+    {file = "soupsieve-2.3.2.post1-py3-none-any.whl", hash = "sha256:3b2503d3c7084a42b1ebd08116e5f81aadfaea95863628c80a3b774a11b7c759"},
+    {file = "soupsieve-2.3.2.post1.tar.gz", hash = "sha256:fc53893b3da2c33de295667a0e19f078c14bf86544af307354de5fcf12a3f30d"},
+]
 text-unidecode = [
     {file = "text-unidecode-1.3.tar.gz", hash = "sha256:bad6603bb14d279193107714b288be206cac565dfa49aa5b105294dd5c4aab93"},
     {file = "text_unidecode-1.3-py2.py3-none-any.whl", hash = "sha256:1311f10e8b895935241623731c2ba64f4c455287888b18189350b67134a822e8"},
@@ -747,7 +965,19 @@ tomli = [
     {file = "tomli-2.0.1-py3-none-any.whl", hash = "sha256:939de3e7a6161af0c887ef91b7d41a53e7c5a1ca976325f429cb46ea9bc30ecc"},
     {file = "tomli-2.0.1.tar.gz", hash = "sha256:de526c12914f0c550d15924c62d72abc48d6fe7364aa87328337a31007fe8a4f"},
 ]
-tox = []
-tqdm = []
-urllib3 = []
-virtualenv = []
+tox = [
+    {file = "tox-3.26.0-py2.py3-none-any.whl", hash = "sha256:bf037662d7c740d15c9924ba23bb3e587df20598697bb985ac2b49bdc2d847f6"},
+    {file = "tox-3.26.0.tar.gz", hash = "sha256:44f3c347c68c2c68799d7d44f1808f9d396fc8a1a500cbc624253375c7ae107e"},
+]
+tqdm = [
+    {file = "tqdm-4.64.1-py2.py3-none-any.whl", hash = "sha256:6fee160d6ffcd1b1c68c65f14c829c22832bc401726335ce92c52d395944a6a1"},
+    {file = "tqdm-4.64.1.tar.gz", hash = "sha256:5f4f682a004951c1b450bc753c710e9280c5746ce6ffedee253ddbcbf54cf1e4"},
+]
+urllib3 = [
+    {file = "urllib3-1.26.12-py2.py3-none-any.whl", hash = "sha256:b930dd878d5a8afb066a637fbb35144fe7901e3b209d1cd4f524bd0e9deee997"},
+    {file = "urllib3-1.26.12.tar.gz", hash = "sha256:3fa96cf423e6987997fc326ae8df396db2a8b7c667747d47ddd8ecba91f4a74e"},
+]
+virtualenv = [
+    {file = "virtualenv-20.16.5-py3-none-any.whl", hash = "sha256:d07dfc5df5e4e0dbc92862350ad87a36ed505b978f6c39609dc489eadd5b0d27"},
+    {file = "virtualenv-20.16.5.tar.gz", hash = "sha256:227ea1b9994fdc5ea31977ba3383ef296d7472ea85be9d6732e42a91c04e80da"},
+]
diff --git a/pyproject.toml b/pyproject.toml
index 397f1c2c..51c21aa7 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -19,7 +19,7 @@ cookiecutter = "^2.1.1"
 pytest = "^7.1.2"
 pytest-cov = "^3.0.0"
 pytest-xdist = "^2.5.0"
-python-dotenv = "^0.20.0"
+python-dotenv = "^0.21.0"
 tox = "^3.25.1"
 pre-commit = "^2.19.0"
 isort = "^5.10.1"

From 6e9dcd05327561058684e0d09ffb541dac345a8f Mon Sep 17 00:00:00 2001
From: Roel Adriaans <roel@adriaans.org>
Date: Tue, 27 Sep 2022 19:05:14 +0200
Subject: [PATCH 122/371] Run pyupgrade with the current files

---
 .pre-commit-config.yaml                    | 6 ++++++
 src/adventofcode2021/solutions/day04.py    | 8 ++++----
 src/adventofcode2021/solutions/day05.py    | 5 ++---
 src/adventofcode2021/solutions/day08.py    | 6 ++----
 src/adventofcode2021/utils/abstract.py     | 7 +++----
 src/adventofcode2021/utils/advent_utils.py | 7 ++-----
 template/hooks/pre_gen_project.py          | 2 +-
 7 files changed, 20 insertions(+), 21 deletions(-)

diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index b69053e7..d6d371b8 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -29,3 +29,9 @@ repos:
     - id: check-merge-conflict
     - id: debug-statements
       language_version: python3
+
+  - repo: https://github.com/asottile/pyupgrade
+    rev: v2.38.2
+    hooks:
+    - id: pyupgrade
+      args: [ "--py310-plus" ]
diff --git a/src/adventofcode2021/solutions/day04.py b/src/adventofcode2021/solutions/day04.py
index aaef13a3..9b9f56cd 100644
--- a/src/adventofcode2021/solutions/day04.py
+++ b/src/adventofcode2021/solutions/day04.py
@@ -1,5 +1,5 @@
 from collections import defaultdict
-from typing import Literal, Union
+from typing import Literal
 
 from adventofcode2021.utils.abstract import FileReaderSolution
 
@@ -70,7 +70,7 @@ def read_input(self, input_data):
             board = Board(board_text)
             self.boards.append(board)
 
-    def is_winner(self) -> Union[Literal[False], Board]:
+    def is_winner(self) -> Literal[False] | Board:
         """Do we have any wining boards?"""
         for board in self.boards:
             if board.is_winner():
@@ -90,7 +90,7 @@ def solve(self, input_data: str) -> int:
         self.read_input(input_data)
 
         number = -1
-        won_board: Union[Literal[False], Board] = False
+        won_board: Literal[False] | Board = False
 
         for number in self.random_numbers:
             self.draw(number)
@@ -110,7 +110,7 @@ class Day04PartB(Day04, FileReaderSolution):
     def solve(self, input_data: str) -> int:
         self.read_input(input_data)
 
-        last_won: Union[Literal[False], Board] = False
+        last_won: Literal[False] | Board = False
         number = -1
         already_won = set()
         for number in self.random_numbers:
diff --git a/src/adventofcode2021/solutions/day05.py b/src/adventofcode2021/solutions/day05.py
index f94f002f..24600959 100644
--- a/src/adventofcode2021/solutions/day05.py
+++ b/src/adventofcode2021/solutions/day05.py
@@ -3,7 +3,6 @@
 import typing
 from collections import Counter
 from dataclasses import dataclass
-from typing import Tuple
 
 from adventofcode2021.utils.abstract import FileReaderSolution
 
@@ -17,7 +16,7 @@ class Point:
 
 
 class Day05:
-    def parse_lines(self, line) -> Tuple[Point, Point]:
+    def parse_lines(self, line) -> tuple[Point, Point]:
         """ "
         Parse 2,2 -> 2,1 or 419,207 -> 419,109
         As x1,y1 -> x2,y2
@@ -29,7 +28,7 @@ def parse_lines(self, line) -> Tuple[Point, Point]:
         p2 = Point(x=int(matches["x2"]), y=int(matches["y2"]))
         return p1, p2
 
-    def find_overlap(self, points: list[Tuple[Point, Point]]) -> list[Point]:
+    def find_overlap(self, points: list[tuple[Point, Point]]) -> list[Point]:
         """Find the overlapping locations in the list of points"""
         locations: typing.Counter = Counter()
 
diff --git a/src/adventofcode2021/solutions/day08.py b/src/adventofcode2021/solutions/day08.py
index 56b0be93..c7bef245 100644
--- a/src/adventofcode2021/solutions/day08.py
+++ b/src/adventofcode2021/solutions/day08.py
@@ -1,11 +1,9 @@
-from typing import Tuple
-
 from adventofcode2021.utils.abstract import FileReaderSolution
 
 
 class Day08:
     @staticmethod
-    def parse(input_string: str) -> Tuple[list[str], list[str]]:
+    def parse(input_string: str) -> tuple[list[str], list[str]]:
         """
         Parse the input string into two components:
         - The 10 patterns we see
@@ -50,7 +48,7 @@ def map(self, patterns) -> dict[str, int]:
         of the digits
         """
         # Store every unique pattern we see, and remove them after we matched
-        pattern_set = set(["".join(sorted(v)) for v in patterns])
+        pattern_set = {"".join(sorted(v)) for v in patterns}
 
         # Store the total mapping, this will contain letters -> Digit, eg:
         # {"bcdf": 4, acdfg": 3}
diff --git a/src/adventofcode2021/utils/abstract.py b/src/adventofcode2021/utils/abstract.py
index cbf6b2a7..7b3eaeb2 100644
--- a/src/adventofcode2021/utils/abstract.py
+++ b/src/adventofcode2021/utils/abstract.py
@@ -1,11 +1,10 @@
 from abc import ABC, abstractmethod
 from pathlib import Path
-from typing import Union
 
 
 class AbstractSolution(ABC):
     @abstractmethod
-    def solve(self, input_data: str) -> Union[str, int]:
+    def solve(self, input_data: str) -> str | int:
         raise NotImplementedError
 
 
@@ -14,7 +13,7 @@ class SimpleSolution(AbstractSolution, ABC):
     This solution implements a simple input_text that is used by the solve method.
     """
 
-    def __call__(self, input_text: str) -> Union[str, int]:
+    def __call__(self, input_text: str) -> str | int:
         """
         Give the input_text as parameter, process this and return the result
         """
@@ -27,7 +26,7 @@ class FileReaderSolution(AbstractSolution, ABC):
     Implement filereader
     """
 
-    def __call__(self, input_file: str) -> Union[str, int]:
+    def __call__(self, input_file: str) -> str | int:
         """
         Give the input_text as parameter, process this and return the result
         """
diff --git a/src/adventofcode2021/utils/advent_utils.py b/src/adventofcode2021/utils/advent_utils.py
index 8303a142..52b0a5a3 100644
--- a/src/adventofcode2021/utils/advent_utils.py
+++ b/src/adventofcode2021/utils/advent_utils.py
@@ -1,7 +1,4 @@
-from typing import List
-
-
-def string_to_list_of_ints(input_string: str, split_string: str = ",") -> List[int]:
+def string_to_list_of_ints(input_string: str, split_string: str = ",") -> list[int]:
     """
     Split a string on `split_string` and return a list of integers
 
@@ -13,7 +10,7 @@ def string_to_list_of_ints(input_string: str, split_string: str = ",") -> List[i
     return list_of_ints
 
 
-def string_of_single_to_list_of_ints(input_string: str) -> List[int]:
+def string_of_single_to_list_of_ints(input_string: str) -> list[int]:
     """
     Split a string on `split_string` and return a list of integers
 
diff --git a/template/hooks/pre_gen_project.py b/template/hooks/pre_gen_project.py
index b1daddcd..adb581af 100644
--- a/template/hooks/pre_gen_project.py
+++ b/template/hooks/pre_gen_project.py
@@ -17,7 +17,7 @@
     sys.exit(1)
 
 # Check that we have a leading zero when needed:
-prefix_day_name = "{:02d}".format(int_day_name)
+prefix_day_name = f"{int_day_name:02d}"
 if prefix_day_name != day_name:
     print(f"ERROR: day_name: {day_name} must have a leading zero")
     sys.exit(1)

From 92a74a3592feddc18ce21fd18a28ba1dfff6100f Mon Sep 17 00:00:00 2001
From: Roel Adriaans <roel@adriaans.org>
Date: Tue, 27 Sep 2022 19:06:59 +0200
Subject: [PATCH 123/371] Only run on pull_request?

---
 .github/workflows/tox.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/tox.yml b/.github/workflows/tox.yml
index e387fbce..4c6111b3 100644
--- a/.github/workflows/tox.yml
+++ b/.github/workflows/tox.yml
@@ -1,6 +1,6 @@
 name: Python Run Tox
 
-on: [push, pull_request]
+on: pull_request
 
 jobs:
   build:

From f76a89bab341c2a29f1d377a6806fc4e3d627809 Mon Sep 17 00:00:00 2001
From: Roel Adriaans <roel.adriaans@asml.com>
Date: Thu, 2 Dec 2021 14:18:23 +0100
Subject: [PATCH 124/371] Day 2 with Pattern Matching! But it crashed mypy :(

---
 src/adventofcode2021/solutions/day02.py | 45 +++++++++++++------------
 tests/solutions/test_day02_a.py         |  7 ++++
 tests/solutions/test_day02_b.py         |  7 ++++
 tox.ini                                 |  2 +-
 4 files changed, 38 insertions(+), 23 deletions(-)

diff --git a/src/adventofcode2021/solutions/day02.py b/src/adventofcode2021/solutions/day02.py
index 1315df2b..ba9faf33 100644
--- a/src/adventofcode2021/solutions/day02.py
+++ b/src/adventofcode2021/solutions/day02.py
@@ -6,21 +6,21 @@ class Day02:
 
 
 class Day02PartA(Day02, FileReaderSolution):
-    MAPPING = {
-        "up": (-1, 0),
-        "down": (1, 0),
-        "forward": (0, 1),
-    }
-
     def solve(self, input_data: str) -> int:
         depth = position = 0
-        for line in input_data.split("\n"):
-            if not line:
-                continue
+        for line in [line for line in input_data.split("\n") if line]:
             direction, movement = line.split(" ")[0], int(line.split(" ")[1])
-            d_depth, d_movement = self.MAPPING[direction]
-            depth += d_depth * movement
-            position += d_movement * movement
+
+            match direction:
+                case "up":
+                    depth -= movement
+                case "down":
+                    depth += movement
+                case "forward":
+                    position += movement
+                case _:
+                    raise ValueError(f"Invalid direction value: {repr(direction)}")
+
         return depth * position
 
 
@@ -28,17 +28,18 @@ class Day02PartB(Day02, FileReaderSolution):
     def solve(self, input_data: str) -> int:
         depth = position = aim = 0
 
-        for line in input_data.split("\n"):
-            if not line:
-                continue
+        for line in [line for line in input_data.split("\n") if line]:
 
             direction, movement = line.split(" ")[0], int(line.split(" ")[1])
+            match direction:
+                case "down":
+                    aim += movement
+                case "up":
+                    aim -= movement
+                case "forward":
+                    position += movement
+                    depth += movement * aim
+                case _:
+                    raise ValueError(f"Invalid direction value: {repr(direction)}")
 
-            if direction == "down":
-                aim += movement
-            elif direction == "up":
-                aim -= movement
-            else:
-                position += movement
-                depth += movement * aim
         return depth * position
diff --git a/tests/solutions/test_day02_a.py b/tests/solutions/test_day02_a.py
index b0582986..c47e670e 100644
--- a/tests/solutions/test_day02_a.py
+++ b/tests/solutions/test_day02_a.py
@@ -1,3 +1,5 @@
+import pytest
+
 from adventofcode2021.solutions.day02 import Day02PartA
 
 
@@ -14,6 +16,11 @@ def test_day02a_solve(self):
         result = solution.solve(test_data)
         assert result == 150
 
+    def test_day02a_invalid_direction(self):
+        with pytest.raises(ValueError):
+            solution = Day02PartA()
+            solution.solve("backwards 1")
+
     def test_day02a_data(self):
         """Result we got when we did the real solution"""
         solution = Day02PartA()
diff --git a/tests/solutions/test_day02_b.py b/tests/solutions/test_day02_b.py
index f96bad55..828bc56e 100644
--- a/tests/solutions/test_day02_b.py
+++ b/tests/solutions/test_day02_b.py
@@ -1,3 +1,5 @@
+import pytest
+
 from adventofcode2021.solutions.day02 import Day02PartB
 
 
@@ -14,6 +16,11 @@ def test_day02b_solve(self):
         result = solution.solve(test_data)
         assert result == 900
 
+    def test_day02b_invalid_direction(self):
+        with pytest.raises(ValueError):
+            solution = Day02PartB()
+            solution.solve("backwards 1")
+
     def test_day02b_data(self):
         """Result we got when we did the real solution"""
         solution = Day02PartB()
diff --git a/tox.ini b/tox.ini
index 2c51f9ef..5e7c3a60 100644
--- a/tox.ini
+++ b/tox.ini
@@ -82,7 +82,7 @@ skip_install = true
 deps =
     black
 commands =
-    black --check --diff src/ tests/
+    black --target-version py310 --check --diff src/ tests/
 
 [testenv:mypy]
 skip_install = true

From 90273f8cc567ed5b5fb8cd953024d27183c8eaac Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 29 Sep 2022 04:39:55 +0000
Subject: [PATCH 125/371] Bump pytest-cov from 3.0.0 to 4.0.0

Bumps [pytest-cov](https://github.com/pytest-dev/pytest-cov) from 3.0.0 to 4.0.0.
- [Release notes](https://github.com/pytest-dev/pytest-cov/releases)
- [Changelog](https://github.com/pytest-dev/pytest-cov/blob/master/CHANGELOG.rst)
- [Commits](https://github.com/pytest-dev/pytest-cov/compare/v3.0.0...v4.0.0)

---
updated-dependencies:
- dependency-name: pytest-cov
  dependency-type: direct:development
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 poetry.lock    | 8 ++++----
 pyproject.toml | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/poetry.lock b/poetry.lock
index e19f4bd8..826dc988 100644
--- a/poetry.lock
+++ b/poetry.lock
@@ -395,7 +395,7 @@ testing = ["argcomplete", "hypothesis (>=3.56)", "mock", "nose", "pygments (>=2.
 
 [[package]]
 name = "pytest-cov"
-version = "3.0.0"
+version = "4.0.0"
 description = "Pytest plugin for measuring coverage."
 category = "dev"
 optional = false
@@ -625,7 +625,7 @@ testing = ["coverage (>=6.2)", "coverage-enable-subprocess (>=1)", "flaky (>=3.7
 [metadata]
 lock-version = "1.1"
 python-versions = "^3.10"
-content-hash = "9fab8d1755b2431ac6a365285f76ae7b0553d3644ac000f14c94634d78d89cbd"
+content-hash = "abe64f67f3e88cc2399858e158404c92f9d90be8128ae9abf18f6fb1fde10a80"
 
 [metadata.files]
 anytree = [
@@ -872,8 +872,8 @@ pytest = [
     {file = "pytest-7.1.3.tar.gz", hash = "sha256:4f365fec2dff9c1162f834d9f18af1ba13062db0c708bf7b946f8a5c76180c39"},
 ]
 pytest-cov = [
-    {file = "pytest-cov-3.0.0.tar.gz", hash = "sha256:e7f0f5b1617d2210a2cabc266dfe2f4c75a8d32fb89eafb7ad9d06f6d076d470"},
-    {file = "pytest_cov-3.0.0-py3-none-any.whl", hash = "sha256:578d5d15ac4a25e5f961c938b85a05b09fdaae9deef3bb6de9a6e766622ca7a6"},
+    {file = "pytest-cov-4.0.0.tar.gz", hash = "sha256:996b79efde6433cdbd0088872dbc5fb3ed7fe1578b68cdbba634f14bb8dd0470"},
+    {file = "pytest_cov-4.0.0-py3-none-any.whl", hash = "sha256:2feb1b751d66a8bd934e5edfa2e961d11309dc37b73b0eabe73b5945fee20f6b"},
 ]
 pytest-forked = [
     {file = "pytest-forked-1.4.0.tar.gz", hash = "sha256:8b67587c8f98cbbadfdd804539ed5455b6ed03802203485dd2f53c1422d7440e"},
diff --git a/pyproject.toml b/pyproject.toml
index 51c21aa7..9cbb32e7 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -17,7 +17,7 @@ tqdm = "^4.64.0"
 black = "^22.6"
 cookiecutter = "^2.1.1"
 pytest = "^7.1.2"
-pytest-cov = "^3.0.0"
+pytest-cov = "^4.0.0"
 pytest-xdist = "^2.5.0"
 python-dotenv = "^0.21.0"
 tox = "^3.25.1"

From 36f4eb1a5c559df0269bec080741558bdb32fa12 Mon Sep 17 00:00:00 2001
From: Roel Adriaans <roel.adriaans@asml.com>
Date: Thu, 29 Sep 2022 09:35:30 +0200
Subject: [PATCH 126/371] Add day 09, part 1

---
 .../solutions/data/day_09/day09.txt           | 100 ++++++++++++++++++
 src/adventofcode2021/solutions/day09.py       |  55 ++++++++++
 tests/solutions/test_day09_a.py               |  28 +++++
 3 files changed, 183 insertions(+)
 create mode 100644 src/adventofcode2021/solutions/data/day_09/day09.txt
 create mode 100644 src/adventofcode2021/solutions/day09.py
 create mode 100644 tests/solutions/test_day09_a.py

diff --git a/src/adventofcode2021/solutions/data/day_09/day09.txt b/src/adventofcode2021/solutions/data/day_09/day09.txt
new file mode 100644
index 00000000..e2e538a9
--- /dev/null
+++ b/src/adventofcode2021/solutions/data/day_09/day09.txt
@@ -0,0 +1,100 @@
+7678999878989655432345789645679998765678998765434567897854323489543467898999785456789123989109765458
+6567898767878943101234678923678987654599987533323468976543212379954578967898654398993299879998754387
+5428988654567893212645699213567898543689876321013456897654323567895699656799543237894988659876543235
+6219876532178954324596988901289999698799965434565567998865439878976789545678932146999876545995432124
+5301988631079966546689877892397898799899876567677678989876545689989897234999943239898985432987654265
+6212987432367897656899756789456789989943987878998789878987659792196976546899865498767994321398754376
+5429876543456789897998767896569898978932198989949896569999798943235989756798976987656789520999866789
+6534989654678898999239878987698987567893239996823987698898987894476799868987897896547897639898997894
+7676798798799967894345989399897696457894547895612998987657896789987897979986789987535679798767989923
+8787899999895459965456895499987545348987656954109899996532345996598965499765678996547899987955679434
+9898998798986578977567896989876432167899767963298789987831234897679879987654567987698929896434598945
+9949987696598789898978999876989643456789878974987679876542546789889999998543479998999019765323597896
+8939998985439896789989389965597656587898999989876545989753657895999989899697568919998998943210126789
+7998999874321965889991278954498768998987999899976432399864798934989876789987678924987987895434335991
+6877999965439654567892469893349879019876789789876541989878999329876545678998789439876896796545449890
+5456889879998963456953998792123989929965456699987799876989987912983534767999896598965345689987659789
+5345678998787999769899877689934599898766344578999989545697896899892123457899987987421236799998998678
+1234589987656787998787654577895789789654213799098765433456895698789012456999699876434349988999987567
+2455689898546876987665343456789895698766439893129876212356924997679133477897578987646498877899999456
+3576798765435455696543212567899964569987898993298865101248939876568949588926496798797987765698976567
+4799897654321234987854343456999653456798987989987654312346795325459998999212345699998986564567899688
+6989998767433345699765454567898799999969876678999985323489893210298987992101296789029897423456998789
+8979879876544476789876565778919987878954965567899876544678954321987676789212989893298775212347999893
+9769865989699988895987986789929876565969854349965988965989875439896565678939878965997654303567895932
+8949876798987899954598987899899975444898765456894999876898986698765434567898767899876543212347894541
+6732987987896789543459998987698765323789878677923899988987897987854324678987656999989754323456943210
+5421299896785678952349879999549886212678989989765789199876759876544215799999545698999865534568964721
+7532398765654679893499767897632998343567893598986891098765345975432106789987234997964987665778965673
+9678998544263456789988959789543987657678932467897932129954234596543312899876129876853498786899876789
+8989876432102345679876434678954598767899743478998943498764345987986324678944098765432129897999998996
+7899987653212456789954323499765679898987654589129654569895456798875435899432129874321012979998999765
+6789998764343568899983212389876789999598765699939765678987667899986545986543298985435433567897898654
+5698999889654689969874301278987899995439876799898996789998789967987676897684987899876574679946999543
+4567894998788797645965212367998978989567988899787789898999895456798789999895996212987989789035698912
+3459943219899895434596776456789765878979899987645678987689954345679896798999854301298999892124567901
+2588954323999954323987886567898954569898789895434567998567893234699945987998765412569321943235678912
+1467975754798765102498997688967932456789698765423478899455789124989239886569885323457939654345679324
+2356899765679843212349998799456891348995569543213456789324678939878998776457995434567898965567789535
+4567899879789764334467999890345989969544398754302398893213999998767987654349876776699957896788998745
+7679943989999878876578987921235679898931239965614689965354899989654398768124997898789546789899987656
+8789432199899989987679765434356898777999459877323567896765789878965459878236898949895435899987898769
+9996431098788991098789879865468999656788968986545978987976899769879878989356999434976567978976989898
+6797643989657989199894989976789987547897899898767989898988998656989989198767898921297678967965678997
+5989859764546778987953299987898798623456798769878998789999987545699993239878957890998989456894567986
+4578998943436567996592109798987643214567989657989987667999987636798954569989346989879594345993479875
+3459976832323456789489297659298754323579876545699876557989999947997895678994219878965432256989599854
+1569765321012367892378989432129898734567988435689764345678998799896989789875699767895421019878989763
+2979876465433458921269878993234987655689876324997653256789989654765678999986987656789532198767978932
+9899997598545769210359767989345698978789995436789767967999978943234568989999876545679673299956767891
+7678998987656898521298655678956789989890987545679978979998767894345679878998765434568984987845656789
+5467869998769987439987834567997891299991987676789989999987656789459894567899875323479895996434345679
+4328956999878976598765423456789920198989998789897594987654345679767893479999983212998789875321234589
+3212347899999987689896514567895439987878999899969423498543234578978942346789765929877678995434345699
+4323456789998998799987625678976598965456899998754312987654547899989321457899879898765534987646656789
+5436567998987899989699876789987987854345799879876533498987656789795452567954999789854424987657898896
+9597778987656999879545987899898996543236878965987645569998768995696563467892987689943215598768959934
+8989899876545698768996798998759897652123467894598786689999879654989694598993995578994103469878948923
+7678956989656987656989899987545789643014989912989897899898989769979989679989894469989912456989237894
+6567899998768996545678956795437699654423458909878969998797899898768778989977673234767893567890146789
+5454578999899998656989349989326578967434567898769459997656999987855667899866582123456789678921237993
+5323457898988998767892198975412468998658998987658998878546689876543556789954321014569899989743678932
+5434578987677789878989987654301656789767899498767897651234579994312347898765432785678999998654568941
+8656789876435678989678999765212345699878901399988999530145678987523556789879545676789898999875678932
+8798999754323699094567899874323456899999213989999998921456789797687678999988657887896787893986989543
+9899898765214589123789998765474587998765439778899876542347895698798789999899767998965345932397899655
+8946789874345678934690989987565678999876598656789987673656954329899898898789898979873234991098998976
+7657894995456789545791976798786789989989987545791298784967899212945997787678999965432125789199687897
+9767923987877897656999875899897899878998996434690249899878998909896985678567899876553239899987545699
+9898934998988998987899987899998999767987654323589356976989876898799864323456789998674999989995432378
+3939999879399899598978998998789998656798895212679467895499965536567973212345892139799889578976653467
+2123989765456789799767899887699987545989987825678978954349873213459854323456999012998778989987854578
+1034979876789894987656789765569895239875498434569989767459654323498765456567897999875667899998769989
+3249867987899965986545678954498764345984399565878999878598776434789896587689966789943458999879898999
+4398756798959896965434989543359895459865987676789999998679986565699987678797655698965567896567987678
+5987545789349789874323478921239876567978998787899989598789997676789998889893234987896689965439876567
+6798435678998678955412567890124989878989799898998879329899898789897899997992109986999791986323965456
+8999323699987589432101678921265696989997678999997568912998759897996987656789298975698910987439854345
+9998434598765478943312989892376965399876546798775467893498942956889876545678987764567891296598763234
+6987545789876569765529899789499894236995435987655345679987621345678965434786796543456799397998521065
+5698656795998978997698765678998789945989412396543238789296549496789876212345987432345678989997432156
+4569767894349989989899876789987687899875324987652146790197698989997984101456798543456789979876543234
+7695979943256997878999989899876546798765459876543234892398797678976543219597987654767899865989754546
+8983598954569876557998998913985434569878969987656345789989986567897655998989998866978998754599867656
+9672567895698987445987897654954323678989978998765456999879876458989769897778999877899999863212998767
+8543479976987894323456789799899939899497989549877667898765964345678979786667899988989987654201239879
+7656567899996789434569899988767898954345798767998788987654321234589998654557898999678996543212378989
+8767678998987896545678999875456787943234679878999899876543210156799987543238967976579998754323567898
+9878789987698939876789398754346896795345799989989942987654921234578975432123459985458999895454578967
+2989999896579920987996209543212345689567989899875321298769832345689986543234567894367899986895789456
+3499998755465891298965498932101234567978978789965433349987655466789987654355678965456989998999892345
+9567897645234789349996987893323346788989865667899564559998776567894298765696989796567978999998921234
+8978965432145679959889896894894487899998754345978975698989897678992199896787897689679867899867890123
+7899876541034567898775765789765698910987543234567896987676998989989987979898976578998956989656989934
+6987998643123456789654324899876789991299654345678999876545789999879876569969323488987645678945679895
+5476789654234569898775013678989898989399865476789998964335679986567965498653212346986534799134998799
+4345698765545878959898723459994967979988976597998997643212398765457894329965623678997656789029898678
+3236989876676789543997634678943459869877997689367899854323459854346965939876784569789867997998767567
+2135678987798994312498545689642399759866859789245699978754667965457899845989765679679878956999543458
+3446889398919865324987656796530987649754349890134589989765778976579998756799897789545989349898742455
+4587993209101965435698787895421298432101245932375678999876899987678999867899998996432191298765431234
diff --git a/src/adventofcode2021/solutions/day09.py b/src/adventofcode2021/solutions/day09.py
new file mode 100644
index 00000000..807aad82
--- /dev/null
+++ b/src/adventofcode2021/solutions/day09.py
@@ -0,0 +1,55 @@
+from __future__ import annotations
+from adventofcode2021.utils.abstract import FileReaderSolution
+
+
+class Day09:
+    @staticmethod
+    def create_grid(lines) -> list[list[int]]:
+        """Create an of ints from a list of strings"""
+        grid = [[int(val) for val in line] for line in lines]
+
+        return grid
+
+
+class Day09PartA(Day09, FileReaderSolution):
+    grid = dict[int, dict[int, int]]
+
+    def is_spot(self, i, j) -> bool:
+        value = self.grid[i][j]
+        if value == 9:
+            # Will never be higher, we can exit early
+            return False
+        # Possible options:
+        options = [
+            (i + 1, j),
+            (i - 1, j),
+            (i, j + 1),
+            (i, j - 1),
+        ]
+        for direction in options:
+            try:
+                if self.grid[direction[0]][direction[1]] < value:
+                    return False
+            except IndexError:
+                # We must be at an edge, ignore
+                pass
+        # Nothing false, must be alright
+        return True
+
+    def solve(self, input_data: str) -> int:
+        lines = input_data.splitlines()
+        self.grid = self.create_grid(lines)
+        low_spots = []
+
+        # Find the low spots
+        for i in range(len(self.grid)):
+            for j in range(len(self.grid[0])):
+                if self.is_spot(i, j):
+                    low_spots.append(self.grid[i][j] + 1)
+
+        return sum(low_spots)
+
+
+class Day09PartB(Day09, FileReaderSolution):
+    def solve(self, input_data: str) -> int:
+        raise NotImplementedError
diff --git a/tests/solutions/test_day09_a.py b/tests/solutions/test_day09_a.py
new file mode 100644
index 00000000..d7eea713
--- /dev/null
+++ b/tests/solutions/test_day09_a.py
@@ -0,0 +1,28 @@
+from adventofcode2021.solutions.day09 import Day09PartA
+
+test_input = """\
+2199943210
+3987894921
+9856789892
+8767896789
+9899965678"""
+
+
+class TestDay09PartA:
+    def test_create_grid(self):
+        grid = Day09PartA.create_grid(test_input.splitlines())
+        assert len(grid) == 5
+        assert len(grid[1]) == 10
+        assert grid[0][0] == 2
+        assert grid[4][9] == 8
+
+    def test_day09a_solve(self):
+        solution = Day09PartA()
+        result = solution.solve(test_input)
+        assert result == 15
+
+    def test_day09a_data(self):
+        """Result we got when we did the real solution"""
+        solution = Day09PartA()
+        res = solution("day_09/day09.txt")
+        assert res == 550

From 0470b61eaf773d12befb277b366a2f2b7cfced99 Mon Sep 17 00:00:00 2001
From: Roel Adriaans <roel.adriaans@asml.com>
Date: Thu, 29 Sep 2022 09:45:20 +0200
Subject: [PATCH 127/371] Make the main loop an list comprehension, make mypy
 happy

---
 src/adventofcode2021/solutions/day09.py | 21 +++++++++++----------
 1 file changed, 11 insertions(+), 10 deletions(-)

diff --git a/src/adventofcode2021/solutions/day09.py b/src/adventofcode2021/solutions/day09.py
index 807aad82..6f0afb73 100644
--- a/src/adventofcode2021/solutions/day09.py
+++ b/src/adventofcode2021/solutions/day09.py
@@ -1,8 +1,11 @@
 from __future__ import annotations
+
 from adventofcode2021.utils.abstract import FileReaderSolution
 
 
 class Day09:
+    grid: list[list[int]]
+
     @staticmethod
     def create_grid(lines) -> list[list[int]]:
         """Create an of ints from a list of strings"""
@@ -12,9 +15,7 @@ def create_grid(lines) -> list[list[int]]:
 
 
 class Day09PartA(Day09, FileReaderSolution):
-    grid = dict[int, dict[int, int]]
-
-    def is_spot(self, i, j) -> bool:
+    def is_spot(self, i: int, j: int) -> bool:
         value = self.grid[i][j]
         if value == 9:
             # Will never be higher, we can exit early
@@ -39,15 +40,15 @@ def is_spot(self, i, j) -> bool:
     def solve(self, input_data: str) -> int:
         lines = input_data.splitlines()
         self.grid = self.create_grid(lines)
-        low_spots = []
 
-        # Find the low spots
-        for i in range(len(self.grid)):
-            for j in range(len(self.grid[0])):
-                if self.is_spot(i, j):
-                    low_spots.append(self.grid[i][j] + 1)
+        total_risk_level = sum(
+            self.grid[i][j] + 1
+            for i in range(len(self.grid))
+            for j in range(len(self.grid[0]))
+            if self.is_spot(i, j)
+        )
 
-        return sum(low_spots)
+        return total_risk_level
 
 
 class Day09PartB(Day09, FileReaderSolution):

From 260e82f84612a9a64a52a3bfb76c5736123b76ac Mon Sep 17 00:00:00 2001
From: Roel Adriaans <roel.adriaans@asml.com>
Date: Fri, 30 Sep 2022 15:54:41 +0200
Subject: [PATCH 128/371] Implement day 9, part 2

---
 poetry.lock                             | 122 ++++++++++++------------
 src/adventofcode2021/solutions/day09.py |  81 +++++++++++++++-
 tests/solutions/test_day09_b.py         |  39 ++++++++
 3 files changed, 179 insertions(+), 63 deletions(-)
 create mode 100644 tests/solutions/test_day09_b.py

diff --git a/poetry.lock b/poetry.lock
index 826dc988..24ad1df8 100644
--- a/poetry.lock
+++ b/poetry.lock
@@ -158,7 +158,7 @@ requests = ">=2.23.0"
 
 [[package]]
 name = "coverage"
-version = "6.4.4"
+version = "6.5.0"
 description = "Code coverage measurement for Python"
 category = "dev"
 optional = false
@@ -243,7 +243,7 @@ plugins = ["setuptools"]
 requirements_deprecated_finder = ["pip-api", "pipreqs"]
 
 [[package]]
-name = "jinja2"
+name = "Jinja2"
 version = "3.1.2"
 description = "A very fast and expressive template engine."
 category = "dev"
@@ -269,7 +269,7 @@ arrow = "*"
 jinja2 = "*"
 
 [[package]]
-name = "markupsafe"
+name = "MarkupSafe"
 version = "2.1.1"
 description = "Safely add untrusted strings to HTML/XML markup."
 category = "dev"
@@ -475,7 +475,7 @@ text-unidecode = ">=1.3"
 unidecode = ["Unidecode (>=1.1.1)"]
 
 [[package]]
-name = "pyyaml"
+name = "PyYAML"
 version = "6.0"
 description = "YAML parser and emitter for Python"
 category = "dev"
@@ -502,14 +502,14 @@ use_chardet_on_py3 = ["chardet (>=3.0.2,<6)"]
 
 [[package]]
 name = "setuptools"
-version = "65.4.0"
+version = "65.4.1"
 description = "Easily download, build, install, upgrade, and uninstall Python packages"
 category = "dev"
 optional = false
 python-versions = ">=3.7"
 
 [package.extras]
-docs = ["furo", "jaraco.packaging (>=9)", "jaraco.tidelift (>=1.4)", "pygments-github-lexers (==0.0.5)", "rst.linker (>=1.9)", "sphinx", "sphinx-favicon", "sphinx-hoverxref (<2)", "sphinx-inline-tabs", "sphinx-notfound-page (==0.8.3)", "sphinx-reredirects", "sphinxcontrib-towncrier"]
+docs = ["furo", "jaraco.packaging (>=9)", "jaraco.tidelift (>=1.4)", "pygments-github-lexers (==0.0.5)", "rst.linker (>=1.9)", "sphinx (>=3.5)", "sphinx-favicon", "sphinx-hoverxref (<2)", "sphinx-inline-tabs", "sphinx-notfound-page (==0.8.3)", "sphinx-reredirects", "sphinxcontrib-towncrier"]
 testing = ["build[virtualenv]", "filelock (>=3.4.0)", "flake8 (<5)", "flake8-2020", "ini2toml[lite] (>=0.9)", "jaraco.envs (>=2.2)", "jaraco.path (>=3.2.0)", "mock", "pip (>=19.1)", "pip-run (>=8.8)", "pytest (>=6)", "pytest-black (>=0.3.7)", "pytest-checkdocs (>=2.4)", "pytest-cov", "pytest-enabler (>=1.3)", "pytest-flake8", "pytest-mypy (>=0.9.1)", "pytest-perf", "pytest-xdist", "tomli-w (>=1.0.0)", "virtualenv (>=13.0.0)", "wheel"]
 testing-integration = ["build[virtualenv]", "filelock (>=3.4.0)", "jaraco.envs (>=2.2)", "jaraco.path (>=3.2.0)", "pytest", "pytest-enabler", "pytest-xdist", "tomli", "virtualenv (>=13.0.0)", "wheel"]
 
@@ -702,56 +702,56 @@ cookiecutter = [
     {file = "cookiecutter-2.1.1.tar.gz", hash = "sha256:f3982be8d9c53dac1261864013fdec7f83afd2e42ede6f6dd069c5e149c540d5"},
 ]
 coverage = [
-    {file = "coverage-6.4.4-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:e7b4da9bafad21ea45a714d3ea6f3e1679099e420c8741c74905b92ee9bfa7cc"},
-    {file = "coverage-6.4.4-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:fde17bc42e0716c94bf19d92e4c9f5a00c5feb401f5bc01101fdf2a8b7cacf60"},
-    {file = "coverage-6.4.4-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:cdbb0d89923c80dbd435b9cf8bba0ff55585a3cdb28cbec65f376c041472c60d"},
-    {file = "coverage-6.4.4-cp310-cp310-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:67f9346aeebea54e845d29b487eb38ec95f2ecf3558a3cffb26ee3f0dcc3e760"},
-    {file = "coverage-6.4.4-cp310-cp310-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:42c499c14efd858b98c4e03595bf914089b98400d30789511577aa44607a1b74"},
-    {file = "coverage-6.4.4-cp310-cp310-musllinux_1_1_aarch64.whl", hash = "sha256:c35cca192ba700979d20ac43024a82b9b32a60da2f983bec6c0f5b84aead635c"},
-    {file = "coverage-6.4.4-cp310-cp310-musllinux_1_1_i686.whl", hash = "sha256:9cc4f107009bca5a81caef2fca843dbec4215c05e917a59dec0c8db5cff1d2aa"},
-    {file = "coverage-6.4.4-cp310-cp310-musllinux_1_1_x86_64.whl", hash = "sha256:5f444627b3664b80d078c05fe6a850dd711beeb90d26731f11d492dcbadb6973"},
-    {file = "coverage-6.4.4-cp310-cp310-win32.whl", hash = "sha256:66e6df3ac4659a435677d8cd40e8eb1ac7219345d27c41145991ee9bf4b806a0"},
-    {file = "coverage-6.4.4-cp310-cp310-win_amd64.whl", hash = "sha256:35ef1f8d8a7a275aa7410d2f2c60fa6443f4a64fae9be671ec0696a68525b875"},
-    {file = "coverage-6.4.4-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:c1328d0c2f194ffda30a45f11058c02410e679456276bfa0bbe0b0ee87225fac"},
-    {file = "coverage-6.4.4-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:61b993f3998ee384935ee423c3d40894e93277f12482f6e777642a0141f55782"},
-    {file = "coverage-6.4.4-cp311-cp311-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:d5dd4b8e9cd0deb60e6fcc7b0647cbc1da6c33b9e786f9c79721fd303994832f"},
-    {file = "coverage-6.4.4-cp311-cp311-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:7026f5afe0d1a933685d8f2169d7c2d2e624f6255fb584ca99ccca8c0e966fd7"},
-    {file = "coverage-6.4.4-cp311-cp311-musllinux_1_1_aarch64.whl", hash = "sha256:9c7b9b498eb0c0d48b4c2abc0e10c2d78912203f972e0e63e3c9dc21f15abdaa"},
-    {file = "coverage-6.4.4-cp311-cp311-musllinux_1_1_i686.whl", hash = "sha256:ee2b2fb6eb4ace35805f434e0f6409444e1466a47f620d1d5763a22600f0f892"},
-    {file = "coverage-6.4.4-cp311-cp311-musllinux_1_1_x86_64.whl", hash = "sha256:ab066f5ab67059d1f1000b5e1aa8bbd75b6ed1fc0014559aea41a9eb66fc2ce0"},
-    {file = "coverage-6.4.4-cp311-cp311-win32.whl", hash = "sha256:9d6e1f3185cbfd3d91ac77ea065d85d5215d3dfa45b191d14ddfcd952fa53796"},
-    {file = "coverage-6.4.4-cp311-cp311-win_amd64.whl", hash = "sha256:e3d3c4cc38b2882f9a15bafd30aec079582b819bec1b8afdbde8f7797008108a"},
-    {file = "coverage-6.4.4-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:a095aa0a996ea08b10580908e88fbaf81ecf798e923bbe64fb98d1807db3d68a"},
-    {file = "coverage-6.4.4-cp37-cp37m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:ef6f44409ab02e202b31a05dd6666797f9de2aa2b4b3534e9d450e42dea5e817"},
-    {file = "coverage-6.4.4-cp37-cp37m-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:4b7101938584d67e6f45f0015b60e24a95bf8dea19836b1709a80342e01b472f"},
-    {file = "coverage-6.4.4-cp37-cp37m-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:14a32ec68d721c3d714d9b105c7acf8e0f8a4f4734c811eda75ff3718570b5e3"},
-    {file = "coverage-6.4.4-cp37-cp37m-musllinux_1_1_aarch64.whl", hash = "sha256:6a864733b22d3081749450466ac80698fe39c91cb6849b2ef8752fd7482011f3"},
-    {file = "coverage-6.4.4-cp37-cp37m-musllinux_1_1_i686.whl", hash = "sha256:08002f9251f51afdcc5e3adf5d5d66bb490ae893d9e21359b085f0e03390a820"},
-    {file = "coverage-6.4.4-cp37-cp37m-musllinux_1_1_x86_64.whl", hash = "sha256:a3b2752de32c455f2521a51bd3ffb53c5b3ae92736afde67ce83477f5c1dd928"},
-    {file = "coverage-6.4.4-cp37-cp37m-win32.whl", hash = "sha256:f855b39e4f75abd0dfbcf74a82e84ae3fc260d523fcb3532786bcbbcb158322c"},
-    {file = "coverage-6.4.4-cp37-cp37m-win_amd64.whl", hash = "sha256:ee6ae6bbcac0786807295e9687169fba80cb0617852b2fa118a99667e8e6815d"},
-    {file = "coverage-6.4.4-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:564cd0f5b5470094df06fab676c6d77547abfdcb09b6c29c8a97c41ad03b103c"},
-    {file = "coverage-6.4.4-cp38-cp38-macosx_11_0_arm64.whl", hash = "sha256:cbbb0e4cd8ddcd5ef47641cfac97d8473ab6b132dd9a46bacb18872828031685"},
-    {file = "coverage-6.4.4-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:6113e4df2fa73b80f77663445be6d567913fb3b82a86ceb64e44ae0e4b695de1"},
-    {file = "coverage-6.4.4-cp38-cp38-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:8d032bfc562a52318ae05047a6eb801ff31ccee172dc0d2504614e911d8fa83e"},
-    {file = "coverage-6.4.4-cp38-cp38-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:e431e305a1f3126477abe9a184624a85308da8edf8486a863601d58419d26ffa"},
-    {file = "coverage-6.4.4-cp38-cp38-musllinux_1_1_aarch64.whl", hash = "sha256:cf2afe83a53f77aec067033199797832617890e15bed42f4a1a93ea24794ae3e"},
-    {file = "coverage-6.4.4-cp38-cp38-musllinux_1_1_i686.whl", hash = "sha256:783bc7c4ee524039ca13b6d9b4186a67f8e63d91342c713e88c1865a38d0892a"},
-    {file = "coverage-6.4.4-cp38-cp38-musllinux_1_1_x86_64.whl", hash = "sha256:ff934ced84054b9018665ca3967fc48e1ac99e811f6cc99ea65978e1d384454b"},
-    {file = "coverage-6.4.4-cp38-cp38-win32.whl", hash = "sha256:e1fabd473566fce2cf18ea41171d92814e4ef1495e04471786cbc943b89a3781"},
-    {file = "coverage-6.4.4-cp38-cp38-win_amd64.whl", hash = "sha256:4179502f210ebed3ccfe2f78bf8e2d59e50b297b598b100d6c6e3341053066a2"},
-    {file = "coverage-6.4.4-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:98c0b9e9b572893cdb0a00e66cf961a238f8d870d4e1dc8e679eb8bdc2eb1b86"},
-    {file = "coverage-6.4.4-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:fc600f6ec19b273da1d85817eda339fb46ce9eef3e89f220055d8696e0a06908"},
-    {file = "coverage-6.4.4-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:7a98d6bf6d4ca5c07a600c7b4e0c5350cd483c85c736c522b786be90ea5bac4f"},
-    {file = "coverage-6.4.4-cp39-cp39-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:01778769097dbd705a24e221f42be885c544bb91251747a8a3efdec6eb4788f2"},
-    {file = "coverage-6.4.4-cp39-cp39-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:dfa0b97eb904255e2ab24166071b27408f1f69c8fbda58e9c0972804851e0558"},
-    {file = "coverage-6.4.4-cp39-cp39-musllinux_1_1_aarch64.whl", hash = "sha256:fcbe3d9a53e013f8ab88734d7e517eb2cd06b7e689bedf22c0eb68db5e4a0a19"},
-    {file = "coverage-6.4.4-cp39-cp39-musllinux_1_1_i686.whl", hash = "sha256:15e38d853ee224e92ccc9a851457fb1e1f12d7a5df5ae44544ce7863691c7a0d"},
-    {file = "coverage-6.4.4-cp39-cp39-musllinux_1_1_x86_64.whl", hash = "sha256:6913dddee2deff8ab2512639c5168c3e80b3ebb0f818fed22048ee46f735351a"},
-    {file = "coverage-6.4.4-cp39-cp39-win32.whl", hash = "sha256:354df19fefd03b9a13132fa6643527ef7905712109d9c1c1903f2133d3a4e145"},
-    {file = "coverage-6.4.4-cp39-cp39-win_amd64.whl", hash = "sha256:1238b08f3576201ebf41f7c20bf59baa0d05da941b123c6656e42cdb668e9827"},
-    {file = "coverage-6.4.4-pp36.pp37.pp38-none-any.whl", hash = "sha256:f67cf9f406cf0d2f08a3515ce2db5b82625a7257f88aad87904674def6ddaec1"},
-    {file = "coverage-6.4.4.tar.gz", hash = "sha256:e16c45b726acb780e1e6f88b286d3c10b3914ab03438f32117c4aa52d7f30d58"},
+    {file = "coverage-6.5.0-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:ef8674b0ee8cc11e2d574e3e2998aea5df5ab242e012286824ea3c6970580e53"},
+    {file = "coverage-6.5.0-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:784f53ebc9f3fd0e2a3f6a78b2be1bd1f5575d7863e10c6e12504f240fd06660"},
+    {file = "coverage-6.5.0-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:b4a5be1748d538a710f87542f22c2cad22f80545a847ad91ce45e77417293eb4"},
+    {file = "coverage-6.5.0-cp310-cp310-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:83516205e254a0cb77d2d7bb3632ee019d93d9f4005de31dca0a8c3667d5bc04"},
+    {file = "coverage-6.5.0-cp310-cp310-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:af4fffaffc4067232253715065e30c5a7ec6faac36f8fc8d6f64263b15f74db0"},
+    {file = "coverage-6.5.0-cp310-cp310-musllinux_1_1_aarch64.whl", hash = "sha256:97117225cdd992a9c2a5515db1f66b59db634f59d0679ca1fa3fe8da32749cae"},
+    {file = "coverage-6.5.0-cp310-cp310-musllinux_1_1_i686.whl", hash = "sha256:a1170fa54185845505fbfa672f1c1ab175446c887cce8212c44149581cf2d466"},
+    {file = "coverage-6.5.0-cp310-cp310-musllinux_1_1_x86_64.whl", hash = "sha256:11b990d520ea75e7ee8dcab5bc908072aaada194a794db9f6d7d5cfd19661e5a"},
+    {file = "coverage-6.5.0-cp310-cp310-win32.whl", hash = "sha256:5dbec3b9095749390c09ab7c89d314727f18800060d8d24e87f01fb9cfb40b32"},
+    {file = "coverage-6.5.0-cp310-cp310-win_amd64.whl", hash = "sha256:59f53f1dc5b656cafb1badd0feb428c1e7bc19b867479ff72f7a9dd9b479f10e"},
+    {file = "coverage-6.5.0-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:4a5375e28c5191ac38cca59b38edd33ef4cc914732c916f2929029b4bfb50795"},
+    {file = "coverage-6.5.0-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:c4ed2820d919351f4167e52425e096af41bfabacb1857186c1ea32ff9983ed75"},
+    {file = "coverage-6.5.0-cp311-cp311-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:33a7da4376d5977fbf0a8ed91c4dffaaa8dbf0ddbf4c8eea500a2486d8bc4d7b"},
+    {file = "coverage-6.5.0-cp311-cp311-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:a8fb6cf131ac4070c9c5a3e21de0f7dc5a0fbe8bc77c9456ced896c12fcdad91"},
+    {file = "coverage-6.5.0-cp311-cp311-musllinux_1_1_aarch64.whl", hash = "sha256:a6b7d95969b8845250586f269e81e5dfdd8ff828ddeb8567a4a2eaa7313460c4"},
+    {file = "coverage-6.5.0-cp311-cp311-musllinux_1_1_i686.whl", hash = "sha256:1ef221513e6f68b69ee9e159506d583d31aa3567e0ae84eaad9d6ec1107dddaa"},
+    {file = "coverage-6.5.0-cp311-cp311-musllinux_1_1_x86_64.whl", hash = "sha256:cca4435eebea7962a52bdb216dec27215d0df64cf27fc1dd538415f5d2b9da6b"},
+    {file = "coverage-6.5.0-cp311-cp311-win32.whl", hash = "sha256:98e8a10b7a314f454d9eff4216a9a94d143a7ee65018dd12442e898ee2310578"},
+    {file = "coverage-6.5.0-cp311-cp311-win_amd64.whl", hash = "sha256:bc8ef5e043a2af066fa8cbfc6e708d58017024dc4345a1f9757b329a249f041b"},
+    {file = "coverage-6.5.0-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:4433b90fae13f86fafff0b326453dd42fc9a639a0d9e4eec4d366436d1a41b6d"},
+    {file = "coverage-6.5.0-cp37-cp37m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:f4f05d88d9a80ad3cac6244d36dd89a3c00abc16371769f1340101d3cb899fc3"},
+    {file = "coverage-6.5.0-cp37-cp37m-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:94e2565443291bd778421856bc975d351738963071e9b8839ca1fc08b42d4bef"},
+    {file = "coverage-6.5.0-cp37-cp37m-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:027018943386e7b942fa832372ebc120155fd970837489896099f5cfa2890f79"},
+    {file = "coverage-6.5.0-cp37-cp37m-musllinux_1_1_aarch64.whl", hash = "sha256:255758a1e3b61db372ec2736c8e2a1fdfaf563977eedbdf131de003ca5779b7d"},
+    {file = "coverage-6.5.0-cp37-cp37m-musllinux_1_1_i686.whl", hash = "sha256:851cf4ff24062c6aec510a454b2584f6e998cada52d4cb58c5e233d07172e50c"},
+    {file = "coverage-6.5.0-cp37-cp37m-musllinux_1_1_x86_64.whl", hash = "sha256:12adf310e4aafddc58afdb04d686795f33f4d7a6fa67a7a9d4ce7d6ae24d949f"},
+    {file = "coverage-6.5.0-cp37-cp37m-win32.whl", hash = "sha256:b5604380f3415ba69de87a289a2b56687faa4fe04dbee0754bfcae433489316b"},
+    {file = "coverage-6.5.0-cp37-cp37m-win_amd64.whl", hash = "sha256:4a8dbc1f0fbb2ae3de73eb0bdbb914180c7abfbf258e90b311dcd4f585d44bd2"},
+    {file = "coverage-6.5.0-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:d900bb429fdfd7f511f868cedd03a6bbb142f3f9118c09b99ef8dc9bf9643c3c"},
+    {file = "coverage-6.5.0-cp38-cp38-macosx_11_0_arm64.whl", hash = "sha256:2198ea6fc548de52adc826f62cb18554caedfb1d26548c1b7c88d8f7faa8f6ba"},
+    {file = "coverage-6.5.0-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:6c4459b3de97b75e3bd6b7d4b7f0db13f17f504f3d13e2a7c623786289dd670e"},
+    {file = "coverage-6.5.0-cp38-cp38-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:20c8ac5386253717e5ccc827caad43ed66fea0efe255727b1053a8154d952398"},
+    {file = "coverage-6.5.0-cp38-cp38-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:6b07130585d54fe8dff3d97b93b0e20290de974dc8177c320aeaf23459219c0b"},
+    {file = "coverage-6.5.0-cp38-cp38-musllinux_1_1_aarch64.whl", hash = "sha256:dbdb91cd8c048c2b09eb17713b0c12a54fbd587d79adcebad543bc0cd9a3410b"},
+    {file = "coverage-6.5.0-cp38-cp38-musllinux_1_1_i686.whl", hash = "sha256:de3001a203182842a4630e7b8d1a2c7c07ec1b45d3084a83d5d227a3806f530f"},
+    {file = "coverage-6.5.0-cp38-cp38-musllinux_1_1_x86_64.whl", hash = "sha256:e07f4a4a9b41583d6eabec04f8b68076ab3cd44c20bd29332c6572dda36f372e"},
+    {file = "coverage-6.5.0-cp38-cp38-win32.whl", hash = "sha256:6d4817234349a80dbf03640cec6109cd90cba068330703fa65ddf56b60223a6d"},
+    {file = "coverage-6.5.0-cp38-cp38-win_amd64.whl", hash = "sha256:7ccf362abd726b0410bf8911c31fbf97f09f8f1061f8c1cf03dfc4b6372848f6"},
+    {file = "coverage-6.5.0-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:633713d70ad6bfc49b34ead4060531658dc6dfc9b3eb7d8a716d5873377ab745"},
+    {file = "coverage-6.5.0-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:95203854f974e07af96358c0b261f1048d8e1083f2de9b1c565e1be4a3a48cfc"},
+    {file = "coverage-6.5.0-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:b9023e237f4c02ff739581ef35969c3739445fb059b060ca51771e69101efffe"},
+    {file = "coverage-6.5.0-cp39-cp39-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:265de0fa6778d07de30bcf4d9dc471c3dc4314a23a3c6603d356a3c9abc2dfcf"},
+    {file = "coverage-6.5.0-cp39-cp39-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:8f830ed581b45b82451a40faabb89c84e1a998124ee4212d440e9c6cf70083e5"},
+    {file = "coverage-6.5.0-cp39-cp39-musllinux_1_1_aarch64.whl", hash = "sha256:7b6be138d61e458e18d8e6ddcddd36dd96215edfe5f1168de0b1b32635839b62"},
+    {file = "coverage-6.5.0-cp39-cp39-musllinux_1_1_i686.whl", hash = "sha256:42eafe6778551cf006a7c43153af1211c3aaab658d4d66fa5fcc021613d02518"},
+    {file = "coverage-6.5.0-cp39-cp39-musllinux_1_1_x86_64.whl", hash = "sha256:723e8130d4ecc8f56e9a611e73b31219595baa3bb252d539206f7bbbab6ffc1f"},
+    {file = "coverage-6.5.0-cp39-cp39-win32.whl", hash = "sha256:d9ecf0829c6a62b9b573c7bb6d4dcd6ba8b6f80be9ba4fc7ed50bf4ac9aecd72"},
+    {file = "coverage-6.5.0-cp39-cp39-win_amd64.whl", hash = "sha256:fc2af30ed0d5ae0b1abdb4ebdce598eafd5b35397d4d75deb341a614d333d987"},
+    {file = "coverage-6.5.0-pp36.pp37.pp38-none-any.whl", hash = "sha256:1431986dac3923c5945271f169f59c45b8802a114c8f548d611f2015133df77a"},
+    {file = "coverage-6.5.0.tar.gz", hash = "sha256:f642e90754ee3e06b0e7e51bce3379590e76b7f76b708e1a71ff043f87025c84"},
 ]
 distlib = [
     {file = "distlib-0.3.6-py2.py3-none-any.whl", hash = "sha256:f35c4b692542ca110de7ef0bea44d73981caeb34ca0b9b6b2e6d7790dda8f80e"},
@@ -781,7 +781,7 @@ isort = [
     {file = "isort-5.10.1-py3-none-any.whl", hash = "sha256:6f62d78e2f89b4500b080fe3a81690850cd254227f27f75c3a0c491a1f351ba7"},
     {file = "isort-5.10.1.tar.gz", hash = "sha256:e8443a5e7a020e9d7f97f1d7d9cd17c88bcb3bc7e218bf9cf5095fe550be2951"},
 ]
-jinja2 = [
+Jinja2 = [
     {file = "Jinja2-3.1.2-py3-none-any.whl", hash = "sha256:6088930bfe239f0e6710546ab9c19c9ef35e29792895fed6e6e31a023a182a61"},
     {file = "Jinja2-3.1.2.tar.gz", hash = "sha256:31351a702a408a9e7595a8fc6150fc3f43bb6bf7e319770cbc0db9df9437e852"},
 ]
@@ -789,7 +789,7 @@ jinja2-time = [
     {file = "jinja2-time-0.2.0.tar.gz", hash = "sha256:d14eaa4d315e7688daa4969f616f226614350c48730bfa1692d2caebd8c90d40"},
     {file = "jinja2_time-0.2.0-py2.py3-none-any.whl", hash = "sha256:d3eab6605e3ec8b7a0863df09cc1d23714908fa61aa6986a845c20ba488b4efa"},
 ]
-markupsafe = [
+MarkupSafe = [
     {file = "MarkupSafe-2.1.1-cp310-cp310-macosx_10_9_universal2.whl", hash = "sha256:86b1f75c4e7c2ac2ccdaec2b9022845dbb81880ca318bb7a0a01fbf7813e3812"},
     {file = "MarkupSafe-2.1.1-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:f121a1420d4e173a5d96e47e9a0c0dcff965afdf1626d28de1460815f7c4ee7a"},
     {file = "MarkupSafe-2.1.1-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:a49907dd8420c5685cfa064a1335b6754b74541bbb3706c259c02ed65b644b3e"},
@@ -895,7 +895,7 @@ python-slugify = [
     {file = "python-slugify-6.1.2.tar.gz", hash = "sha256:272d106cb31ab99b3496ba085e3fea0e9e76dcde967b5e9992500d1f785ce4e1"},
     {file = "python_slugify-6.1.2-py2.py3-none-any.whl", hash = "sha256:7b2c274c308b62f4269a9ba701aa69a797e9bca41aeee5b3a9e79e36b6656927"},
 ]
-pyyaml = [
+PyYAML = [
     {file = "PyYAML-6.0-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:d4db7c7aef085872ef65a8fd7d6d09a14ae91f691dec3e87ee5ee0539d516f53"},
     {file = "PyYAML-6.0-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:9df7ed3b3d2e0ecfe09e14741b857df43adb5a3ddadc919a2d94fbdf78fea53c"},
     {file = "PyYAML-6.0-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:77f396e6ef4c73fdc33a9157446466f1cff553d979bd00ecb64385760c6babdc"},
@@ -942,8 +942,8 @@ requests = [
     {file = "requests-2.28.1.tar.gz", hash = "sha256:7c5599b102feddaa661c826c56ab4fee28bfd17f5abca1ebbe3e7f19d7c97983"},
 ]
 setuptools = [
-    {file = "setuptools-65.4.0-py3-none-any.whl", hash = "sha256:c2d2709550f15aab6c9110196ea312f468f41cd546bceb24127a1be6fdcaeeb1"},
-    {file = "setuptools-65.4.0.tar.gz", hash = "sha256:a8f6e213b4b0661f590ccf40de95d28a177cd747d098624ad3f69c40287297e9"},
+    {file = "setuptools-65.4.1-py3-none-any.whl", hash = "sha256:1b6bdc6161661409c5f21508763dc63ab20a9ac2f8ba20029aaaa7fdb9118012"},
+    {file = "setuptools-65.4.1.tar.gz", hash = "sha256:3050e338e5871e70c72983072fe34f6032ae1cdeeeb67338199c2f74e083a80e"},
 ]
 six = [
     {file = "six-1.16.0-py2.py3-none-any.whl", hash = "sha256:8abb2f1d86890a2dfb989f9a77cfcfd3e47c2a354b01111771326f8aa26e0254"},
diff --git a/src/adventofcode2021/solutions/day09.py b/src/adventofcode2021/solutions/day09.py
index 6f0afb73..0355dd5e 100644
--- a/src/adventofcode2021/solutions/day09.py
+++ b/src/adventofcode2021/solutions/day09.py
@@ -13,8 +13,16 @@ def create_grid(lines) -> list[list[int]]:
 
         return grid
 
+    def get_location(self, i: int, j: int) -> int | bool:
+        """Return the value of a location, or False"""
+        if i < 0 or j < 0:
+            # We can't index negative, with a list is will loop around
+            return False
+        try:
+            return self.grid[i][j]
+        except IndexError:
+            return False
 
-class Day09PartA(Day09, FileReaderSolution):
     def is_spot(self, i: int, j: int) -> bool:
         value = self.grid[i][j]
         if value == 9:
@@ -37,6 +45,22 @@ def is_spot(self, i: int, j: int) -> bool:
         # Nothing false, must be alright
         return True
 
+    def print_grid(self, highlights=None):  # pragma: no cover
+        """Print the grid, and optionally put locations in highlights in bold"""
+        if highlights is None:
+            highlights = []
+        print()
+        for i in range(len(self.grid)):
+            for j in range(len(self.grid[0])):
+                if (i, j) in highlights:
+                    print(f"*{self.get_location(i, j)}* ({i}, {j})", end=";")
+                else:
+                    print(f"{self.get_location(i, j)} ({i}, {j})", end=";")
+            print()
+        return 0
+
+
+class Day09PartA(Day09, FileReaderSolution):
     def solve(self, input_data: str) -> int:
         lines = input_data.splitlines()
         self.grid = self.create_grid(lines)
@@ -52,5 +76,58 @@ def solve(self, input_data: str) -> int:
 
 
 class Day09PartB(Day09, FileReaderSolution):
+    def find_basins(self) -> list[set[tuple[int, int]]]:
+        """Find a list of basins.
+
+        Returns a list of basins. A basin consists of a list of (i, j) locations.
+        """
+        # Let's start with the low-points:
+        low_points = [
+            (i, j)
+            for i in range(len(self.grid))
+            for j in range(len(self.grid[0]))
+            if self.is_spot(i, j)
+        ]
+
+        basins = []
+        for point in low_points:
+            locations = self.find_basin_locations(point[0], point[1])
+            basins.append(locations)
+
+        # Sort based on length:
+        basins.sort(key=lambda x: len(x), reverse=True)
+        return basins
+
+    def find_basin_locations(self, i, j) -> set[tuple[int, int]]:
+        """For a location (i, j), return the points in the basin"""
+        if self.grid[i][j] == 9:
+            # Base case
+            return set()
+
+        points = {(i, j)}
+        current_value = self.grid[i][j]
+
+        options = [
+            (i + 1, j),
+            (i - 1, j),
+            (i, j + 1),
+            (i, j - 1),
+        ]
+        for direction in options:
+            if neighbor_value := self.get_location(direction[0], direction[1]):
+                # Cells with value 9 do not count. And the next value needs to be higher
+                if 8 >= neighbor_value > current_value:
+                    # Valid next step, add the points
+                    points.add((direction[0], direction[1]))
+                    # Now to see, if we can get from here:
+                    extra_points = self.find_basin_locations(direction[0], direction[1])
+                    if extra_points:
+                        points.update(extra_points)
+        return points
+
     def solve(self, input_data: str) -> int:
-        raise NotImplementedError
+        lines = input_data.splitlines()
+        self.grid = self.create_grid(lines)
+
+        basins = self.find_basins()
+        return len(basins[0]) * len(basins[1]) * len(basins[2])
diff --git a/tests/solutions/test_day09_b.py b/tests/solutions/test_day09_b.py
new file mode 100644
index 00000000..e1833399
--- /dev/null
+++ b/tests/solutions/test_day09_b.py
@@ -0,0 +1,39 @@
+from test_day09_a import test_input
+
+from adventofcode2021.solutions.day09 import Day09PartB
+
+
+class TestDay09PartB:
+    def test_find_basin1_locations(self):
+        solution = Day09PartB()
+        solution.grid = solution.create_grid(test_input.splitlines())
+
+        basin0 = solution.find_basin_locations(0, 1)
+        assert len(basin0) == 3
+
+    def test_find_basin2_locations(self):
+        solution = Day09PartB()
+        solution.grid = solution.create_grid(test_input.splitlines())
+
+        basin = solution.find_basin_locations(0, 9)
+        assert len(basin) == 9
+
+    def test_find_basin3_locations(self):
+        solution = Day09PartB()
+        solution.grid = solution.create_grid(test_input.splitlines())
+
+        basin = solution.find_basin_locations(4, 6)
+        assert len(basin) == 9
+
+    def test_day09b_solve(self):
+        solution = Day09PartB()
+        result = solution.solve(test_input)
+        assert result == 1134
+
+    def test_day09b_data(self):
+        """Result we got when we did the real solution"""
+        solution = Day09PartB()
+        res = solution("day_09/day09.txt")
+        # Solution is too low :(
+        assert res > 561946
+        assert res == 1100682

From a2c1779487e5fc5eda4b1423637379dfd2a87ea0 Mon Sep 17 00:00:00 2001
From: Roel Adriaans <roel@adriaans.org>
Date: Sun, 2 Oct 2022 23:00:57 +0200
Subject: [PATCH 129/371] Feature/day 10 (#67)

* Add a stack class

* WIP For day 10

* Implement part 1

* Finish day 10. Stacky stacky
---
 .../solutions/data/day_10/day10.txt           | 102 +++++++++++++++++
 src/adventofcode2021/solutions/day10.py       | 105 ++++++++++++++++++
 src/adventofcode2021/utils/stack.py           |  25 +++++
 tests/solutions/test_day10_a.py               |  52 +++++++++
 tests/solutions/test_day10_b.py               |  46 ++++++++
 tests/test_stack.py                           |  37 ++++++
 6 files changed, 367 insertions(+)
 create mode 100644 src/adventofcode2021/solutions/data/day_10/day10.txt
 create mode 100644 src/adventofcode2021/solutions/day10.py
 create mode 100644 src/adventofcode2021/utils/stack.py
 create mode 100644 tests/solutions/test_day10_a.py
 create mode 100644 tests/solutions/test_day10_b.py
 create mode 100644 tests/test_stack.py

diff --git a/src/adventofcode2021/solutions/data/day_10/day10.txt b/src/adventofcode2021/solutions/data/day_10/day10.txt
new file mode 100644
index 00000000..8023311c
--- /dev/null
+++ b/src/adventofcode2021/solutions/data/day_10/day10.txt
@@ -0,0 +1,102 @@
+(({({({(({{<{{()<>}}>}}([<[(<>{})(()()))[[{}[]]{<>{}}]>(<(<>[])<[]()>><[{}[]]([]<>)>)]{{({{}[]}{{}{}})}})
+[{(<(<<([[[{(([]{})<(){}>)<{<>}(()[])>}]]{[([(()[])[[][]]]<((){})((){})>)({{{}[]}<{}>})]}]){{[[<<{<>}(<
+((<[([(({<<<{{<><>}({}<>)}{{<>{}}[[]()]}>>([<[{}{}]>{[()<>]<<>()>}]<(<{}()><[]{}>)<<[]<>>}>)>}[<{<([<><>]<
+[<[<({{({{[({[[][]]<{}<>>})<[<{}{}>]([<><>](<>{}))>]{[{[[]{}}{{}{}}}<(<><>)({})>]{({()()}[<>()])
+[<{<<({[{{{(<({}()){{}[]}><(<><>)[[]{}]>)}<(([{}{}]{<>[]}))<(<<>[]>){<[]>(<>{})}>>}({{((<>())<
+{[([<[<({((([<[]()>{{}()}]<[{}{}]{[]()}>){{<<>[]>}(<<>()>)})([<({}<>)<{}()>>{[()[]]({}[])}]))(([{<
+(({[<[((<([[(<[]()>{{}[]})([[]{}]<<><>>)]({{{}()}((){})})]<[<{[]{}}(()<>)>{(()[])<(){}>}]((<()
+([<[[((<<({({([]{})<()()>}({()()}([]())))<{(<>[])<()[]>}>}>{{<[[<>()](()<>)](<[]{}><<>()>)
+[[{{(<{[[<<{{<()()>(<>())}<{<><>}<<>[]>>}>{<<({}[]){()<>}>([()[]]({}<>})>(({<>()}[[]<>])<{()<>}{<>()}>)}>[[[
+<[<{[{{[[(<[{<[]>[[]{}]}<[(){}]<[]<>>)]><[<(<><>)(<>{})>{<<>{}>[[]{}]}]<[[[][]]<<>()>][<<>
+<{[<<({[(<[<((()<>)[<><>]){((){})[()[]]}>[{([][]){[]<>)}{[{}[]](<>{})}]]{{{({}[]){()()}}({(){}}{()})}[[{[]
+[<([[(<[{<<<<{[]()}<<>{}>><{[]{}}((){})>>>[<<(<>())<{}<>>><({}<>][<>()]>><<[{}[]][<><>]>(<()[]>{{}})>]>}(<<[
+(<(<[({([{(<([[]()]<()[]>)[(()())]><({{}[]}<(){}>)[(<>[])(<>[])]>)[<[<<>{}>[{}[]]]<<<>[]>{()()}>>
+[{[{<[<(<<<<([()<>]{()<>}){({}[]){{}{}}}>{([[][]]([]()))<<<>{}>{{}[]}>}>{({{[]<>}[<>{}]}[<[]()>((){})]>[([{}
+[{{({<<{(<(<(<<><>><<><>>){<{}[]>)>)>)}>>{[<{[<<{(()<>)<{}{}>}{<()()>(()[])}>([<<>[]><()<>>]<[{}{}]<()<>>>)>
+<{<{({<{<<<{(({}{})(<>[]))}[([{}()]({}<>))]>[<[<<><>><[]<>>]>]>[[((<[]<>>)[[()[]]<[][]>])<<{{}[
+([([(({<<(({{((){})[{}()]}((()()){{}<>})}[[(()())]])(<(((){}){[]()})({{}[]}{{}{}})>{{[<>[]]{[]()}}[[{}<
+{[[{[{[{<({[<{[]<>}({}<>)><[<><>]>]<<({}<>)<<>()>>>]<([{<>{}}]<<<>[]><{}()>>){<[()[]][<>{}]>[<<>
+<<[<[(<<(<(((<[]<>>){{[]()}(()[])})[<{[][]}(<>())>{<()<>>{()[]}}])(({[[]{}]<{}<>>}(<()<>>[()[]]))<[[
+<[<([([([{[<[[<><>]]{([][])[<>{}]}>[{{[][]}{<>()}}(({}[])<[]{}>)]]{<({[]}[()[]])>}}([([(()<>)]{([]{}){{}
+{<<[{[{[{(((([<><>](<><>))[<(){}>{<>()}])[{<<>{}>}(<<><>>[()[]])]>({({()<>}({}{}))<[{}[]]{()<>}>}<
+{(({((((<[{(<(<>())><([]<>)[{}()]>)[([{}[]]{[][]})[<[]{}>{<>()}]]}<[{{{}<>}[{}[]]}]{<<()>>}>][({(<{}()><{}[]
+[([[<<[[{[{<<[{}<>]>(({}())(<>{}))>}]}{{[(({{}{}}[()<>])<(()<>){[]()}>)<<{[]<>}{<>[]}><[[]{}]([][])>>
+([<{[(<([{<{[<<><>>[[]()]]<({}<>)[{}{}]>}<<[[]()]{<>{}}><<[][]>[{}()]>>>}{<{<{[]{}}[[]()]>(<
+((<<[[<(<[(((<<>{}>(()[]))({[]{}}([]<>)))[{<<>[]><{}[]>}{(<>[]){(){}}}]>[[[[{}<>]<()()>]](<(()<>)(<>)>{[
+[(<((<<<[(<<<<[]{}>{()()}>>>{((([]())([]()))){{{[]<>}{<>[]}}{[{}()]{<>()}}}}}]{<<{(([]{}))[<{}<>>({
+<<[({[<(<[{(({{}()}{{}<>}))}<<{[[]()][<>{}]}({<>()}<[]<>>)>>][<(<[()<>]>[(<>[])<{}{}>])>[{<[{}{}]([]())>((<>
+[{{[<<[<[[({(({}())<<>()>>{{<>}[<><>]}})<<[[<>[]][[]]]({()<>}<()()>)>{{{<><>}}([(){}]<[]>)}>][{<{((){
+{[({[[((([{<<<{}{}><()()>><([]{})>><[{()()}{<>{}}]>}][<[<(<>{})(<>{})>((<>{}){{}<>})]<{<[]()>(<>{})}(<
+((<{({({({<{<<{}[]>({}{})>[<[]<>>({}[])]}>})})})}({{(<[[([<([]())([][])>][({()()}{{}{}})])[[{
+{{{{{[((([({<<<>{}>(()<>)>{[<>[]]{{}()})}[(<[]{}>[<>()])<(()<>)[<>()]>])<({[{}()][()[]]}{[{}<>
+{[(([{(<<<[([<{}{}>[{}<>]]<<<>()>[{}()]>)([[<>{}][{}<>]]{{{}()}<<>[]>})]><{{[([]{})[{}[]]]}{({<><
+{<{([<[{[{[[[{{}{}}<{}()>]<{{}()}>]]([[([]())[(){}]]<<[]<>>{(){}}>]<[[{}()](()[])]{{()()}}>)}[(<[((
+{{{{{[{{(<(((<<>[]>([][])){{()<>}[()<>]})(<{()[]}{<>[]}>({<>()}[(){}])))>)}((<{{<<()[]>(()<>)><<()()>[{
+[[[(<[{[{([<<<<>><<>>><[[]{}](()<>)>>]<{[(()<>)[[]<>]]{<[][]>[[]()]>}[<([]<>)[{}{}]>{[(){}]([]
+<[<(<{{{{<{[{(()())}[{(){}}{{}()}]]<<[<><>]({})>[(<><>)]>>>({{{(<>[]){()()}}<((){}){()[]}>}({({}()
+<[{{[<([[[(<<<()[]>({}())><[{}[]]{[][]}}>)<([{[]()}{{}{}}]{[[]{}][{}<>]})[<<<>{}>><{[]}<<>()>>]>]{
+{((<<{[{<[(<[[<><>]{[]<>}][[<>()][{}{}]]>[<{{}()}({}[])>[[<>[]][<>[]]]])<{<({}{})>{<{}<>]{(){}}}
+<[{([<<{(([((([]<>))<<{}()>(()[])>)(([()[]]{[]()}))]<[<<{}()><[]{}>><([]<>)<(){}>>][{[<><>][<>
+[<(<{[{[[(<{<[<>()]>}([<<>[]>{<><>}]{(()[])(()<>)})>)]((<<(<()<>>{[]{}}){<[]()>}>([<{}<>>([]())
+{({[[<<{{[{<{<[]()>}{<{}<>><{}>}>(<{()<>}((){})><{<>{}}([][])>)}][[<{{()()}({}[])}<{<>{}}<<>{}>>>{<<[]()
+[{<([<<[{[[<(<<>()><[][]>)>(<<<>{}><{}()>>[[{}<>]<()<>>])]][{([[{}()]]{({}())(()()]})(<<()<>>(()[])>)}<[([[]
+[([((([[[(<<{[()<>][{}{}])([<><>]<{}>)>((<{}<>><()<>>)({{}<>}<{}{}>))>[{((()[])[(){}])}({{{}{}
+<{[<[[{{<[{([[<><>]]<<{}()>([]<>)>)([(<>[])][({}()){()<>}])}{<([[]<>][<>{}])(<()()>({}[]))>
+([{({[({{<((<(()<>){[]{}}><<<>[]><()[]>>)(<{[]<>}[{}[]]><{{}()}[[]()]>))>}}{[[[[<(()())<<>()>
+{<<<[<<<{<<{<({}()){[]{}}>}>>}><{<{<[{[][]}(<>)]([[]<>][<><>])>}([{({}[])<{}{}>}]{[[()[]]][[<>[]]<[]{}>]})>}>
+[[[(<<(<((([<([]<>)[<>]><([]<>)<{}{}>>]{({{}[]}<()<>>)[<()<>>]}))){{<{<[[][]](<><>)>{<{}{}>{{}[]}}}<[[[]{}]
+[[{({[[((((<<(<>{})(()<>)){[<>[]]}>))[(<<<[]<>>{<><>}>>(({{}()}(<>{}))))(<[{[]<>}((){})]{<{}<>>
+<<<(([[{{<<({{<><>}<<>{}>})>{[<<<>>[()[]]>[{()[]}{<>[]}]]{{[<><>]}(<{}<>>(<>[]))}}>}}<{<[(({{}{}}{[]()})
+{({(({<({[{(<({}<>)[()()]><[<>{}]>){{(()<>){[][]}}([<>()](<>()))}}{[<<{}()>([]{})>[<<>()><<>{}>]][
+{<{[(<([[{<({<()[]>[<>[]]}[[<>()]<()()>])>{[[{()<>}{()()}][[{}<>][{}()]]]([{{}<>}]<{<>[]}([])>)}}[<[[<[](
+({(<({([{<[[[(<>]({}{})][<()><()[]>]]]<(<[()<>]>{{()[]}[()[]]})([[<>[]][()<>]](({}())([]())))>>}]{(({
+{[[<<{[{<[[<((<>[])<{}{}>)>]{<<[(){}]<{}{}>>>[<{()<>}<{}<>>><[()<>]>]}]>><[[({<(<>[]){()<>}>}[[[{}<>]]([[]<>]
+<{<<{[{<{([{[[[][]]]}]((<{[]<>}{()}>(<[]{}>[()[]]))<{{()()}[[]{}]}<{<>[]}{<>[]}>]))}<{[([<[][]>
+({[({[[[{(<[{(<>())([][])}<([]())({}())}]>({(<()<>>{{}{}})<[()[]]<<>>>}([[{}[]][()]]{{{}[]}<[][]>})))[
+[{[{{{([{[({{<[]()>[{}{}]}<{()}<{}<>>>}<[<()[]>{[]()}]>){{{[<>{}][<>[]]}{<()<>>{<>[]}}}[{(<>[])<()[]>}
+<<[[{({([([{{(()())<<><>>}}]<(({[]<>})<<(){}><<><>>>)>)(<{{({}[])<[]()>}{({}[])[<>[]]}}>)]<<[<[{()[]}<{}>]
+{{[{<(<[<(({<<[]{}]><[[]<>]<<><>>>}<(<(){}>)>)[[([{}{}][[]{}])[<()()>]]<{{{}[]}{{}}}[[[]()]<{}[]>]>])
+{<({(<{[[[({(((){})([]()))<(()())([]{})>}[((()()>([][]))])][{[{{{}()}{()()}}[[[]()]{[]<>}]]}{(({[]<>
+([{{<<<([<[({<<>[]>{[][]}}(({}{})[<>{}]))]{{((<>{})){<()()>(<>())}}}>]({[([([][])]{[(){}](()[])}){<[{}()}>}
+<[{<[<<{[[{[[({}())<{}()>]]([(()<>)][(()())(()[])])}<(<[[][])<()()>>)([[{}](<>[])](<{}()>{[][]
+(<([{({{(({{{({}[])}({{}<>}<[]()>)}<<<{}>{()<>}>({<><>}{<>[]})>}({{[<>()][<>[]]}}(<({})<[]()>>)
+[{(<[[[<<{{{(([]())([][]))<{()<>}(()<>)>}<[{[]()}[()()]][[[]()][{}()]])}({<(<>()){<><>}>}[[(()()){(){}}]{(<
+[(([[{[{((((<<<>()>({}())>{{{}()}[[][]]})<<<{}{}>([])>>)<[{[[]{}]}{<{}{})<{}>}]<(<{}{}>{<>[]}){<[]{}>{
+<{<<<((([(<{<<{}[]>[[][]]>[<<><>>]}>)<[[[<()()>{<><>}](<(){}>[[]{}])]][<{{<>()}({}<>)}>{[{<><>)]{(()<>)
+(((<(([([[[({<[]>[[][]]}[{<><>}<[]()>])<({[]()}(()[]))>]<[{[{}{}]}(<[]{}><()()>>]<(<()()>)({<><>})>>]<(<
+[[{<{({<(((<<{[]()}(()<>)>([{}()][()<>])><[([]<>)[()[]]]{{()()}(<><>)}>){[(<[]>)[[[]{}]{[]()}]]}){[[{<()[
+{([{(<{({<((<[()]<()<>>>({{}}[{}<>])))>><{<{<[<>[]]<[]{}>>}<[[{}]({}{})]{(<>())<()()>}>>(<
+<[<{{[({{([{{{{}[]}({}<>]}{<[]{}><()[]>}}<[[()][()()]]{{()()}({})}>]{[(<()<>><{}<>>)[[()]{[]{}}]]<{<[]
+(<<<[((<[((<[<<>[]>(()<>)]{{[][]}<{}<>>}>[[<{}()>[{}<>]]{{(){}}[{}()]}])<<([{}[]]{(){}})(<[]
+({({[<[[{<<([((){}){[]<>}])>({[<()>(<><>)]})>[[({{(){}}}[[<>[]]<[][]>])[<(()())(<><>)>{([])}]]({[([]<>)
+<[[[{(([[<[((<<><>>(<>[])}[{<>[]}[<>[]]]){<[<><>]>[(()[])[[]{}]]}](<{<[]<>>(<>[])}((()())<[]<>>)>({<(){}>
+[{{{[[{([{{[{(<>())([])}]<(<[]><{}>)>}}{[{[<()[]>{()}][{()<>}{[][]}]}((({}<>)({}()))(<<><>>
+[[{[[{{{{{<(<[[]<>]{[]}>)(<<()][()<>]>[{[]()}{<>[]}])>[(<<[]()>{[]<>}>(<[]<>>{<>{}}))[[{<>()}
+([[{[[[([(<{[{{}{}}{<>[]}]{{<><>}}}>)<(<{<(){}>[<>[]]}{<{}[]>{{}[]}}>[[({}<>)(()())]<<{}{}><[]()>>
+({{{([[({({({{()[]}({}{})}({()<>}[{}<>]))}{{<[{}[]>[[]()]>{[{}()]<[]<>>}}[(<()()><{}{}>)({[]<>}<<><>>)
+{{<{{{[{((<[([[]{}]<<>{}>){<<>()>(<>[])}]{{([]()){[]{}}}}><({{{}[]}<[]()>}{<<>[]><[]{}>}>{<[()()](<>
+[{([<[<([[[<<(()[]){(){}}>[[{}{}](<><>)]>({[{}()]}<(()<>){()[]}>)]]<<[[(()[])<<>{}>]{<()<>}<{}<>
+<[{<({{[([[((<{}>[{}[]])((<>[])([]{})))(([{}[]]{{}()})({{}()}(<>{})))][[(<<>[]>){[{}{}]{[][
+<<<<[(({{({([<{}()>{<>[]}](({}<>)<<><>>)){([[]()]{<>{}}){(<><>)}}}){<{[[<>()]]({{}{}}<()()>)}>[[([()](()[]))]
+<({[({{{({<{([<>()]){[[]{}]([])}}(<[<>[]][()<>]>([<>[]][<>{}]))>[[((())([]()))<([]<>)((){})>]<
+((({[<((<{<([({}{})[{}<>]][<(){}>({}{})])({[[][]]{<><>}}<<<>()><()()>>)>}([[[{<>[]}][{<>[]}
+[{[[(((<{<{({(()[]){[]{}}){([]())[<>[]]})[(({}){[]{}})({[]{}}{()()})]}<{({<>{}}){({}<>){()()}}
+{(<{[({<(([<<([]{})<(){}>>([{}[]]{{}{}})>]{<{[<>()]{[]<>}}>}))>({{<{<(<>{})([]{})>}<{{()<>}<[][
+{(<<[([<[<({([()[]]{<><>})[[<>[]]([][])]}{({[]{}}[[]])(<[]()>)})>]>{<(({[[[]][{}[]]][<{}{}>(()<>)]}<{[{}<>]({
+{<({<<{(<{([[<[]<>)[<>[]]](<()[]>)])[[{{()[]}<[][]>}{[()[]][<><>]}][{<{}()>([]<>)}(<<>[]>({}[])
+<({[[<{{<[{[<{()<>}>][<[[]<>](<>())>({{}()))]}[((<{}()>([]{}))(([]{})<<><>>))<<{<>{}}[{}[]]>>
+{[({[(<([([<[<{}<>>[<><>]]{{<>()}{()()}}><([()<>]<<>()>)({<>[]}({}()))>]<<[[()[]]<<><>>]<((){})(<><
+<((({<(<({{{[({}())(()())][(<>)]}[[{{}[]}[<>[]]]([[][]]{()()})]}({{([]{})<[]()>}[(())({}<>)]}<{{[][]}{()()}}
+[{{([[([{{{(<<[]()>[()[]]>{{[]<>}[[]()]})[<([]<>)<[][]>>]}}}(([[{(<>{}){[]{}}}{[(){}]{<>[]}}
+([[{[{<[([[<[[()[]]([]())]<{<>{}}[<>[]>>>{{(<>())([]<>)}<({}[])<[]{}>>}]{<<{[][]}{<>()}>{(()())<(){}>}><
+(<[({<(<(((<[<<>()>{{}()}]{(<>)<()()>}>([(<>[]}<[][]>]{{{}()}(<>)}))[[[{{}[]}{{}}]([[]<>]<{}()>)]])[{<[{[
+{<([{(([[[[{((<><>)(<>())){({}())<[]{}>}}<{(<>[]){<>[]}}<{{}<>}[(){}]>>]]][[(<{<{}()>{[]}}[<<>>{{}<>}]>([
+<{[[<({[[({([{()()}{[][]}]([[][]]<{}>))}{<[<{}())<[]()>]{(()()){{}<>}}>({[{}<>]{()[]}}<{()<>}
+[<<((<(([(<{[[()<>]{{}<>}]([[]()][<>[]])}{(<[]>)((()[]){[]()))}>{{(([][])({}{}))<[(){}]>}})
+[<[<{[{{[[[<<((){})<()>><{{}[]}{[]()}>><((()){[][]})>][<{<<>[]>[<>[]]}({<>[]}{()()})><{(<>{})<<>()>}>]][([[
+([<[<{<{(((<([{}<>])([<>[]]([][]))>[<([]())<()<>>><<()()>{{}()}>])>[<<<{()<>}<<>[]>>{<{}()
+<({{<(<([({<[{<>[]}]<[{}{}]{()[]}>>(({[]()}))}[<<{(){}}([][])>(<()()>{()})>{([[][]]<<>{}>)<<[][]>([]())>}
+{[(([<([[<[<{[()]}>[<[<>{}][<><>]>{[()]{<>}}]](<{([][]){[]()}}[{()()}(<>[])]><[[[]<>][[][]]]<
+<<({<<<({(<<[<[]()>{[][]}][<{}{}>{[]<>}]>[{{<><>}<()()>}(<{}{}>(<>))]>{[[<()()>[[]()]]{<<>[]><[]{}>}]})
+[[[(<<(({[(((((){})(<>{}))<[[]()]{{}{})>)(<[()[]]{[]<>}><[<><>]{<>{}}>))([<({}<>)({}[])>[[(){}]
+{[[{<[{([<[<{(<><>)}({{}}([][]))>]{{<[<>{}]>(<<>()>[[]<>])}}>({[<<{}<>><()<>>>(<<>()>{<><>})]}[(<<(
diff --git a/src/adventofcode2021/solutions/day10.py b/src/adventofcode2021/solutions/day10.py
new file mode 100644
index 00000000..a1478688
--- /dev/null
+++ b/src/adventofcode2021/solutions/day10.py
@@ -0,0 +1,105 @@
+from adventofcode2021.utils.abstract import FileReaderSolution
+from adventofcode2021.utils.stack import Stack
+
+
+class Day10:
+    CHARATERS = {
+        ")": 3,
+        "]": 57,
+        "}": 1197,
+        ">": 25137,
+    }
+    COMPLETE_CHARACTERS = {
+        ")": 1,
+        "]": 2,
+        "}": 3,
+        ">": 4,
+    }
+
+    @staticmethod
+    def parse_chunk(chunk) -> bool | str:
+        """Parse a chunk and return the first invalid character. If the chunk is valid,
+        return True"""
+        stack: Stack[str] = Stack()
+        # Start adding and popping from the stack
+        for char in chunk:
+            if char in ("(", "[", "{", "<"):
+                stack.push(char)
+            else:
+                popped = stack.pop()
+                if char == "]" and popped == "[":
+                    continue
+                elif char == ")" and popped == "(":
+                    continue
+                elif char == "}" and popped == "{":
+                    continue
+                elif char == ">" and popped == "<":
+                    continue
+                else:
+                    return char
+        return True
+
+    @staticmethod
+    def complete_chunk(chunk) -> str:
+        """Complete a chunk. Chunk must be valid, just missing data"""
+        stack: Stack[str] = Stack()
+        # Start adding and popping from the stack
+        for char in chunk:
+            if char in ("(", "[", "{", "<"):
+                stack.push(char)
+            else:
+                stack.pop()
+        # Resulting characters in the stack must be completed
+        missing = []
+        while not stack.empty:
+            char = stack.pop()
+            match char:
+                case "<":
+                    missing.append(">")
+                case "(":
+                    missing.append(")")
+                case "[":
+                    missing.append("]")
+                case "{":
+                    missing.append("}")
+        return "".join(missing)
+
+    def compute_score(self, char) -> int:
+        return self.CHARATERS[char]
+
+
+class Day10PartA(Day10, FileReaderSolution):
+    def solve(self, input_data: str) -> int:
+        chunks = input_data.splitlines()
+        invalid_characters = [self.parse_chunk(chunk) for chunk in chunks]
+        score = sum(
+            self.compute_score(char) for char in invalid_characters if char is not True
+        )
+        return score
+
+
+class Day10PartB(Day10, FileReaderSolution):
+    def compute_complete_score(self, input_string) -> int:
+        score = 0
+        for char in input_string:
+            score *= 5
+            score += self.COMPLETE_CHARACTERS[char]
+
+        return score
+
+    def solve(self, input_data: str) -> int:
+        # First compute all the valid strings
+        valid = [
+            chunk
+            for chunk in input_data.splitlines()
+            if self.parse_chunk(chunk) is True
+        ]
+
+        scores = [
+            self.compute_complete_score(self.complete_chunk(chunk)) for chunk in valid
+        ]
+        sorted_scores = sorted(scores)
+
+        # Compute middle and return the score
+        middle = len(sorted_scores) // 2
+        return sorted_scores[middle]
diff --git a/src/adventofcode2021/utils/stack.py b/src/adventofcode2021/utils/stack.py
new file mode 100644
index 00000000..1831ae1e
--- /dev/null
+++ b/src/adventofcode2021/utils/stack.py
@@ -0,0 +1,25 @@
+from __future__ import annotations
+
+from typing import Generic, TypeVar
+
+T = TypeVar("T")
+
+
+class Stack(Generic[T]):
+    def __init__(self) -> None:
+        self._container: list[T] = []
+
+    @property
+    def empty(self) -> bool:
+        # not is true for empty container
+        return not self._container
+
+    def push(self, item: T) -> None:
+        self._container.append(item)
+
+    def pop(self) -> T:
+        # LIFO
+        return self._container.pop()
+
+    def __repr__(self) -> str:
+        return repr(self._container)
diff --git a/tests/solutions/test_day10_a.py b/tests/solutions/test_day10_a.py
new file mode 100644
index 00000000..7d40f663
--- /dev/null
+++ b/tests/solutions/test_day10_a.py
@@ -0,0 +1,52 @@
+import pytest
+
+from adventofcode2021.solutions.day10 import Day10PartA
+
+test_data = """[({(<(())[]>[[{[]{<()<>>
+[(()[<>])]({[<{<<[]>>(
+{([(<{}[<>[]}>{[]{[(<()>
+(((({<>}<{<{<>}{[]{[]{}
+[[<[([]))<([[{}[[()]]]
+[{[{({}]{}}([{[{{{}}([]
+{<[[]]>}<{[{[{[]{()[[[]
+[<(<(<(<{}))><([]([]()
+<{([([[(<>()){}]>(<<{{
+<{([{{}}[<[[[<>{}]]]>[]]"""
+
+
+class TestDay10PartA:
+    @pytest.mark.parametrize(
+        ("input_data", "invalid_character"),
+        [
+            ("{([(<{}[<>[]}>{[]{[(<()>", "}"),
+            ("[[<[([]))<([[{}[[()]]]", ")"),
+        ],
+    )
+    def test_invalid_parsing(self, input_data, invalid_character):
+        solution = Day10PartA()
+        assert solution.parse_chunk(input_data) == invalid_character
+
+    @pytest.mark.parametrize(
+        "input_data",
+        [
+            "([])",
+            "{()()()}",
+            "<([{}])>",
+            "[<>({}){}[([])<>]]",
+            "(((((((((())))))))))",
+        ],
+    )
+    def test_valid_parsing(self, input_data):
+        solution = Day10PartA()
+        assert solution.parse_chunk(input_data) is True
+
+    def test_day10a_solve(self):
+        solution = Day10PartA()
+        result = solution.solve(test_data)
+        assert result == 26397
+
+    def test_day10a_data(self):
+        """Result we got when we did the real solution"""
+        solution = Day10PartA()
+        res = solution("day_10/day10.txt")
+        assert res == 389589
diff --git a/tests/solutions/test_day10_b.py b/tests/solutions/test_day10_b.py
new file mode 100644
index 00000000..7986010c
--- /dev/null
+++ b/tests/solutions/test_day10_b.py
@@ -0,0 +1,46 @@
+import pytest
+from test_day10_a import test_data
+
+from adventofcode2021.solutions.day10 import Day10PartB
+
+
+class TestDay10PartB:
+    @pytest.mark.parametrize(
+        ("input_data", "invalid_character"),
+        [
+            ("[({(<(())[]>[[{[]{<()<>>", "}}]])})]"),
+            ("[(()[<>])]({[<{<<[]>>(", ")}>]})"),
+            ("(((({<>}<{<{<>}{[]{[]{}", "}}>}>))))"),
+            ("{<[[]]>}<{[{[{[]{()[[[]", "]]}}]}]}>"),
+            ("<{([{{}}[<[[[<>{}]]]>[]]", "])}>"),
+            ("", ""),
+        ],
+    )
+    def test_complete_chunk(self, input_data, invalid_character):
+        solution = Day10PartB()
+        assert solution.complete_chunk(input_data) == invalid_character
+
+    @pytest.mark.parametrize(
+        ("input_string", "expected_score"),
+        [
+            ("])}>", 294),
+            ("}}]])})]", 288957),
+            (")}>]})", 5566),
+            ("}}>}>))))", 1480781),
+            ("]]}}]}]}>", 995444),
+        ],
+    )
+    def test_compute_score(self, input_string, expected_score):
+        solution = Day10PartB()
+        assert solution.compute_complete_score(input_string) == expected_score
+
+    def test_day10b_solve(self):
+        solution = Day10PartB()
+        result = solution.solve(test_data)
+        assert result == 288957
+
+    def test_day10b_data(self):
+        """Result we got when we did the real solution"""
+        solution = Day10PartB()
+        res = solution("day_10/day10.txt")
+        assert res == 1190420163
diff --git a/tests/test_stack.py b/tests/test_stack.py
new file mode 100644
index 00000000..1b12970e
--- /dev/null
+++ b/tests/test_stack.py
@@ -0,0 +1,37 @@
+import pytest
+
+from adventofcode2021.utils.stack import Stack
+
+
+def test_stack():
+    st = Stack()
+
+    # Check if empty
+    assert st.empty
+
+    # Popping empty should raise index error
+    with pytest.raises(IndexError):
+        st.pop()
+
+    # Add some items
+    st.push(1)
+    st.push(2)
+    st.push(3)
+
+    # We should have some data now
+    assert not st.empty
+
+    # Let's look at the data
+    assert repr(st) == repr([1, 2, 3])
+
+    # Stack, to the Last In, First Out.
+    assert st.pop() == 3
+    assert st.pop() == 2
+    assert st.pop() == 1
+
+    # Should be empty again
+    assert st.empty
+    assert repr(st) == repr([])
+
+    with pytest.raises(IndexError):
+        st.pop()

From dfb215b6e8c002e6f0430c9b263112ca93eab049 Mon Sep 17 00:00:00 2001
From: Roel Adriaans <roel@adriaans.org>
Date: Thu, 6 Oct 2022 11:42:06 +0200
Subject: [PATCH 130/371] Implement day 11, where part b was not even an
 exponential growth!

---
 .../solutions/data/day_11/day11.txt           |  10 ++
 src/adventofcode2021/solutions/day11.py       | 111 +++++++++++++++
 tests/solutions/test_day11_a.py               | 134 ++++++++++++++++++
 tests/solutions/test_day11_b.py               |  25 ++++
 4 files changed, 280 insertions(+)
 create mode 100644 src/adventofcode2021/solutions/data/day_11/day11.txt
 create mode 100644 src/adventofcode2021/solutions/day11.py
 create mode 100644 tests/solutions/test_day11_a.py
 create mode 100644 tests/solutions/test_day11_b.py

diff --git a/src/adventofcode2021/solutions/data/day_11/day11.txt b/src/adventofcode2021/solutions/data/day_11/day11.txt
new file mode 100644
index 00000000..03ecedae
--- /dev/null
+++ b/src/adventofcode2021/solutions/data/day_11/day11.txt
@@ -0,0 +1,10 @@
+8548335644
+6576521782
+1223677762
+1284713113
+6125654778
+6435726842
+5664175556
+1445736556
+2248473568
+6451473526
diff --git a/src/adventofcode2021/solutions/day11.py b/src/adventofcode2021/solutions/day11.py
new file mode 100644
index 00000000..9ca59105
--- /dev/null
+++ b/src/adventofcode2021/solutions/day11.py
@@ -0,0 +1,111 @@
+from __future__ import annotations
+
+from collections.abc import Iterator
+
+from adventofcode2021.utils.abstract import FileReaderSolution
+
+
+class Octopus:
+    def __init__(self, value: int):
+        self.value = value
+
+    def update(self) -> bool:
+        """Update the value. If the value resets to 0, return true"""
+        self.value = (self.value + 1) % 10
+        return self.value == 0
+
+    def __repr__(self):
+        return f"{self.value}"
+
+    def __str__(self):
+        return f"{self.value}"
+
+
+class Day11:
+    grid: dict[tuple[int, int], Octopus]
+    max_i: int
+    max_j: int
+    total_flashes: int
+    total_steps: int
+
+    def create_grid(self, lines: list[str]):
+        self.grid = {}
+        for i, line in enumerate(lines):
+            for j, value in enumerate(line):
+                self.grid[(i, j)] = Octopus(int(value))
+        self.max_i = i
+        self.max_j = j
+
+        self.total_flashes = 0
+        self.total_steps = 0
+
+    def print_grid(self) -> str:
+        """Return the grid is a single line"""
+        res = []
+        previous_line = 0
+        for locatation, item in self.grid.items():
+            if locatation[0] != previous_line:
+                res.append("\n")
+                previous_line = locatation[0]
+
+            res.append(str(item))
+        return "".join(res)
+
+    def _get_neighbours(self, i, j) -> Iterator[tuple[int, int]]:
+        """Get a list of neighbours for this location."""
+        # breakpoint()
+        neighbours = [
+            (i + 1, j),
+            (i - 1, j),
+            (i, j + 1),
+            (i, j - 1),
+            (i - 1, j - 1),
+            (i + 1, j - 1),
+            (i - 1, j + 1),
+            (i + 1, j + 1),
+        ]
+        for location in neighbours:
+            if location[0] < 0 or location[0] > self.max_i:
+                continue
+            if location[1] < 0 or location[1] > self.max_j:
+                continue
+            yield location
+
+    def step(self) -> int:
+        """Perform a step, and return the number of Octopusses that flashed"""
+        # An octopus van only flash once per step.
+        # If an octopus is in flashed, we cannot update it anymore, it stays 0
+        flashed_octopuses = set()
+
+        queue = list(self.grid.keys())
+        for location in queue:
+            octopus = self.grid[location]
+            if location not in flashed_octopuses:
+                flashed = octopus.update()
+                if flashed:
+                    flashed_octopuses.add(location)
+                    # Find the neighbours for this location
+                    for i, j in self._get_neighbours(location[0], location[1]):
+                        queue.append((i, j))
+        self.total_flashes += len(flashed_octopuses)
+        self.total_steps += 1
+        return len(flashed_octopuses)
+
+
+class Day11PartA(Day11, FileReaderSolution):
+    def solve(self, input_data: str) -> int:
+        self.create_grid(input_data.splitlines())
+        for _ in range(100):
+            self.step()
+        return self.total_flashes
+
+
+class Day11PartB(Day11, FileReaderSolution):
+    def solve(self, input_data: str) -> int:
+        self.create_grid(input_data.splitlines())
+        total_octopuses = len(self.grid)
+        for i in range(1, 100000):
+            flashed = self.step()
+            if flashed == total_octopuses:
+                return i
+        return -1
diff --git a/tests/solutions/test_day11_a.py b/tests/solutions/test_day11_a.py
new file mode 100644
index 00000000..c1e52e11
--- /dev/null
+++ b/tests/solutions/test_day11_a.py
@@ -0,0 +1,134 @@
+from adventofcode2021.solutions.day11 import Day11PartA, Octopus
+
+
+class TestDay11PartA:
+    def test_octopus(self):
+        squidward = Octopus(8)
+        assert squidward.value == 8
+
+        flashed = squidward.update()
+        assert flashed is False
+        assert squidward.value == 9
+
+        flashed = squidward.update()
+        assert flashed is True
+        assert squidward.value == 0
+
+    def test_simple(self):
+        start_condition = """11111
+19991
+19191
+19991
+11111"""
+
+        step_1 = """34543
+40004
+50005
+40004
+34543"""
+
+        step_2 = """45654
+51115
+61116
+51115
+45654"""
+
+        solution = Day11PartA()
+        solution.create_grid(start_condition.splitlines())
+
+        # Test that our print_grid() function works
+        assert solution.print_grid() == start_condition
+
+        # And step and validate
+        solution.step()
+        assert solution.print_grid() == step_1
+
+        # And step and validate
+        solution.step()
+        assert solution.print_grid() == step_2
+
+    def test_day11a_solve(self):
+        start_condition = """5483143223
+2745854711
+5264556173
+6141336146
+6357385478
+4167524645
+2176841721
+6882881134
+4846848554
+5283751526"""
+        step_1 = """6594254334
+3856965822
+6375667284
+7252447257
+7468496589
+5278635756
+3287952832
+7993992245
+5957959665
+6394862637"""
+        step_2 = """8807476555
+5089087054
+8597889608
+8485769600
+8700908800
+6600088989
+6800005943
+0000007456
+9000000876
+8700006848"""
+        step_3 = """0050900866
+8500800575
+9900000039
+9700000041
+9935080063
+7712300000
+7911250009
+2211130000
+0421125000
+0021119000"""
+        step_4 = """2263031977
+0923031697
+0032221150
+0041111163
+0076191174
+0053411122
+0042361120
+5532241122
+1532247211
+1132230211"""
+        solution = Day11PartA()
+        solution.create_grid(start_condition.splitlines())
+
+        # Test that our print_grid() function works
+        assert solution.print_grid() == start_condition
+        assert solution.total_flashes == 0
+        # And step and validate
+        solution.step()
+        assert solution.print_grid() == step_1
+        solution.step()
+        assert solution.print_grid() == step_2
+        solution.step()
+        assert solution.print_grid() == step_3
+        solution.step()
+        assert solution.print_grid() == step_4
+
+        # We have done 4 steps, let's do 6 more to reach the 10 steps
+        for _ in range(0, 6):
+            solution.step()
+        assert solution.total_steps == 10
+        assert solution.total_flashes == 204
+
+        # And 100 steps
+        for _ in range(0, 90):
+            solution.step()
+        assert solution.total_steps == 100
+        assert solution.total_flashes == 1656
+
+    def test_day11a_data(self):
+        """Result we got when we did the real solution"""
+        solution = Day11PartA()
+        res = solution("day_11/day11.txt")
+        assert solution.total_steps == 100
+        assert res == 1601
diff --git a/tests/solutions/test_day11_b.py b/tests/solutions/test_day11_b.py
new file mode 100644
index 00000000..dab13b37
--- /dev/null
+++ b/tests/solutions/test_day11_b.py
@@ -0,0 +1,25 @@
+from adventofcode2021.solutions.day11 import Day11PartB
+
+
+class TestDay11PartB:
+    def test_day11b_solve(self):
+        start_condition = """5483143223
+2745854711
+5264556173
+6141336146
+6357385478
+4167524645
+2176841721
+6882881134
+4846848554
+5283751526"""
+
+        solution = Day11PartB()
+        result = solution.solve(start_condition)
+        assert result == 195
+
+    def test_day11b_data(self):
+        """Result we got when we did the real solution"""
+        solution = Day11PartB()
+        res = solution("day_11/day11.txt")
+        assert res == 368

From cf7e74b42fe0de7d3d636ffe49c49100bbbc8ca7 Mon Sep 17 00:00:00 2001
From: Roel Adriaans <roel@adriaans.org>
Date: Thu, 6 Oct 2022 11:56:08 +0200
Subject: [PATCH 131/371] Remove some tuples not needed, make _get_neighbours a
 little simpler

---
 src/adventofcode2021/solutions/day11.py | 33 +++++++++++--------------
 1 file changed, 14 insertions(+), 19 deletions(-)

diff --git a/src/adventofcode2021/solutions/day11.py b/src/adventofcode2021/solutions/day11.py
index 9ca59105..724f3bfd 100644
--- a/src/adventofcode2021/solutions/day11.py
+++ b/src/adventofcode2021/solutions/day11.py
@@ -32,7 +32,7 @@ def create_grid(self, lines: list[str]):
         self.grid = {}
         for i, line in enumerate(lines):
             for j, value in enumerate(line):
-                self.grid[(i, j)] = Octopus(int(value))
+                self.grid[i, j] = Octopus(int(value))
         self.max_i = i
         self.max_j = j
 
@@ -53,23 +53,17 @@ def print_grid(self) -> str:
 
     def _get_neighbours(self, i, j) -> Iterator[tuple[int, int]]:
         """Get a list of neighbours for this location."""
-        # breakpoint()
-        neighbours = [
-            (i + 1, j),
-            (i - 1, j),
-            (i, j + 1),
-            (i, j - 1),
-            (i - 1, j - 1),
-            (i + 1, j - 1),
-            (i - 1, j + 1),
-            (i + 1, j + 1),
-        ]
-        for location in neighbours:
-            if location[0] < 0 or location[0] > self.max_i:
-                continue
-            if location[1] < 0 or location[1] > self.max_j:
-                continue
-            yield location
+        for di in (-1, 0, 1):
+            for dj in (-1, 0, 1):
+                if di == 0 and dj == 0:
+                    continue
+                new_i = di + i
+                new_j = dj + j
+                if new_i < 0 or new_i > self.max_i:
+                    continue
+                if new_j < 0 or new_j > self.max_j:
+                    continue
+                yield new_i, new_j
 
     def step(self) -> int:
         """Perform a step, and return the number of Octopusses that flashed"""
@@ -85,7 +79,8 @@ def step(self) -> int:
                 if flashed:
                     flashed_octopuses.add(location)
                     # Find the neighbours for this location
-                    for i, j in self._get_neighbours(location[0], location[1]):
+                    for i, j in self._get_neighbours(*location):
+                        print(f"Neighbours: {i}, {j}")
                         queue.append((i, j))
         self.total_flashes += len(flashed_octopuses)
         self.total_steps += 1

From 2d875dbedf8142e745d529d91b644458cb1e0aa8 Mon Sep 17 00:00:00 2001
From: Roel Adriaans <roel.adriaans@asml.com>
Date: Thu, 6 Oct 2022 16:54:07 +0200
Subject: [PATCH 132/371] Update stuffs

---
 .pre-commit-config.yaml | 2 +-
 poetry.lock             | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index d6d371b8..6cecab91 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -31,7 +31,7 @@ repos:
       language_version: python3
 
   - repo: https://github.com/asottile/pyupgrade
-    rev: v2.38.2
+    rev: v3.0.0
     hooks:
     - id: pyupgrade
       args: [ "--py310-plus" ]
diff --git a/poetry.lock b/poetry.lock
index 24ad1df8..f780c02e 100644
--- a/poetry.lock
+++ b/poetry.lock
@@ -203,7 +203,7 @@ testing = ["covdefaults (>=2.2)", "coverage (>=6.4.2)", "pytest (>=7.1.2)", "pyt
 
 [[package]]
 name = "identify"
-version = "2.5.5"
+version = "2.5.6"
 description = "File identification library for Python"
 category = "dev"
 optional = false
@@ -766,8 +766,8 @@ filelock = [
     {file = "filelock-3.8.0.tar.gz", hash = "sha256:55447caa666f2198c5b6b13a26d2084d26fa5b115c00d065664b2124680c4edc"},
 ]
 identify = [
-    {file = "identify-2.5.5-py2.py3-none-any.whl", hash = "sha256:ef78c0d96098a3b5fe7720be4a97e73f439af7cf088ebf47b620aeaa10fadf97"},
-    {file = "identify-2.5.5.tar.gz", hash = "sha256:322a5699daecf7c6fd60e68852f36f2ecbb6a36ff6e6e973e0d2bb6fca203ee6"},
+    {file = "identify-2.5.6-py2.py3-none-any.whl", hash = "sha256:b276db7ec52d7e89f5bc4653380e33054ddc803d25875952ad90b0f012cbcdaa"},
+    {file = "identify-2.5.6.tar.gz", hash = "sha256:6c32dbd747aa4ceee1df33f25fed0b0f6e0d65721b15bd151307ff7056d50245"},
 ]
 idna = [
     {file = "idna-3.4-py3-none-any.whl", hash = "sha256:90b77e79eaa3eba6de819a0c442c0b4ceefc341a7a2ab77d7562bf49f425c5c2"},

From 458bb4f4928b65fb3f6e060d8309b9330a3bf19a Mon Sep 17 00:00:00 2001
From: Roel Adriaans <roel@adriaans.org>
Date: Fri, 7 Oct 2022 09:35:48 +0200
Subject: [PATCH 133/371] Add day-12 tests. Also networkx, but that isn't going
 to work :)

---
 .../solutions/data/day_12/day12.txt           | 24 +++++++
 src/adventofcode2021/solutions/day11.py       |  1 -
 src/adventofcode2021/solutions/day12.py       | 23 +++++++
 tests/solutions/test_day12_a.py               | 63 +++++++++++++++++++
 tests/solutions/test_day12_b.py               | 19 ++++++
 5 files changed, 129 insertions(+), 1 deletion(-)
 create mode 100644 src/adventofcode2021/solutions/data/day_12/day12.txt
 create mode 100644 src/adventofcode2021/solutions/day12.py
 create mode 100644 tests/solutions/test_day12_a.py
 create mode 100644 tests/solutions/test_day12_b.py

diff --git a/src/adventofcode2021/solutions/data/day_12/day12.txt b/src/adventofcode2021/solutions/data/day_12/day12.txt
new file mode 100644
index 00000000..e1a22751
--- /dev/null
+++ b/src/adventofcode2021/solutions/data/day_12/day12.txt
@@ -0,0 +1,24 @@
+pf-pk
+ZQ-iz
+iz-NY
+ZQ-end
+pf-gx
+pk-ZQ
+ZQ-dc
+NY-start
+NY-pf
+NY-gx
+ag-ZQ
+pf-start
+start-gx
+BN-ag
+iz-pf
+ag-FD
+pk-NY
+gx-pk
+end-BN
+ag-pf
+iz-pk
+pk-ag
+iz-end
+iz-BN
diff --git a/src/adventofcode2021/solutions/day11.py b/src/adventofcode2021/solutions/day11.py
index 724f3bfd..a3249281 100644
--- a/src/adventofcode2021/solutions/day11.py
+++ b/src/adventofcode2021/solutions/day11.py
@@ -80,7 +80,6 @@ def step(self) -> int:
                     flashed_octopuses.add(location)
                     # Find the neighbours for this location
                     for i, j in self._get_neighbours(*location):
-                        print(f"Neighbours: {i}, {j}")
                         queue.append((i, j))
         self.total_flashes += len(flashed_octopuses)
         self.total_steps += 1
diff --git a/src/adventofcode2021/solutions/day12.py b/src/adventofcode2021/solutions/day12.py
new file mode 100644
index 00000000..a1159c39
--- /dev/null
+++ b/src/adventofcode2021/solutions/day12.py
@@ -0,0 +1,23 @@
+from adventofcode2021.utils.abstract import FileReaderSolution
+
+
+class Day12:
+    def create_graph(self, input_data: list[str]):
+        g = nx.Graph()
+        for line in input_data:
+            start, end = line.split("-")
+            # g.add_edges_from([(start, end)])
+            g.add_edge(start, end)
+        return g
+
+
+class Day12PartA(Day12, FileReaderSolution):
+    def solve(self, input_data: str) -> int:
+        graph = self.create_graph(input_data.splitlines())
+
+        return 0
+
+
+class Day12PartB(Day12, FileReaderSolution):
+    def solve(self, input_data: str) -> int:
+        raise NotImplementedError
diff --git a/tests/solutions/test_day12_a.py b/tests/solutions/test_day12_a.py
new file mode 100644
index 00000000..9142fd55
--- /dev/null
+++ b/tests/solutions/test_day12_a.py
@@ -0,0 +1,63 @@
+import pytest
+
+from adventofcode2021.solutions.day12 import Day12PartA
+
+test_data_short = """start-A
+start-b
+A-c
+A-b
+b-d
+A-end
+b-end"""
+
+test_data = """dc-end
+HN-start
+start-kj
+dc-start
+dc-HN
+LN-dc
+HN-end
+kj-sa
+kj-HN
+kj-dc"""
+
+test_data_longer = """fs-end
+he-DX
+fs-he
+start-DX
+pj-DX
+end-zg
+zg-sl
+zg-pj
+pj-he
+RW-he
+fs-DX
+pj-RW
+zg-RW
+start-pj
+he-WI
+zg-he
+pj-fs
+start-RW"""
+
+
+class TestDay12PartA:
+    @pytest.mark.parametrize(
+        ("input_data", "expected_result"),
+        [
+            (test_data_short, 10),
+            # (test_data, 19),
+            # (test_data_longer, 226),
+        ],
+    )
+    def test_day12a_solve(self, input_data, expected_result):
+        solution = Day12PartA()
+        result = solution.solve(input_data)
+        assert result == expected_result
+
+    @pytest.mark.xfail(reason="Not yet implemented", raises=NotImplementedError)
+    def test_day12a_data(self):
+        """Result we got when we did the real solution"""
+        solution = Day12PartA()
+        res = solution("day_12/day12.txt")
+        assert res == 0
diff --git a/tests/solutions/test_day12_b.py b/tests/solutions/test_day12_b.py
new file mode 100644
index 00000000..ba284792
--- /dev/null
+++ b/tests/solutions/test_day12_b.py
@@ -0,0 +1,19 @@
+import pytest
+
+from adventofcode2021.solutions.day12 import Day12PartB
+
+
+class TestDay12PartB:
+    @pytest.mark.xfail(reason="Not yet implemented", raises=NotImplementedError)
+    @pytest.mark.parametrize(("input_data", "expected_result"), [("", ""), ("", "")])
+    def test_day12b_solve(self, input_data, expected_result):
+        solution = Day12PartB()
+        result = solution.solve(input_data)
+        assert result == expected_result
+
+    @pytest.mark.xfail(reason="Not yet implemented", raises=NotImplementedError)
+    def test_day12b_data(self):
+        """Result we got when we did the real solution"""
+        solution = Day12PartB()
+        res = solution("day_12/day12.txt")
+        assert res == 0

From d0295ef7241b3a83862efa3e3de1cf13662709d5 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 7 Oct 2022 13:42:31 +0200
Subject: [PATCH 134/371] Bump black from 22.8.0 to 22.10.0 (#70)

Bumps [black](https://github.com/psf/black) from 22.8.0 to 22.10.0.
- [Release notes](https://github.com/psf/black/releases)
- [Changelog](https://github.com/psf/black/blob/main/CHANGES.md)
- [Commits](https://github.com/psf/black/compare/22.8.0...22.10.0)

---
updated-dependencies:
- dependency-name: black
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 poetry.lock    | 41 +++++++++++++++--------------------------
 pyproject.toml |  2 +-
 2 files changed, 16 insertions(+), 27 deletions(-)

diff --git a/poetry.lock b/poetry.lock
index f780c02e..1bb5aa68 100644
--- a/poetry.lock
+++ b/poetry.lock
@@ -66,11 +66,11 @@ chardet = ">=3.0.2"
 
 [[package]]
 name = "black"
-version = "22.8.0"
+version = "22.10.0"
 description = "The uncompromising code formatter."
 category = "dev"
 optional = false
-python-versions = ">=3.6.2"
+python-versions = ">=3.7"
 
 [package.dependencies]
 click = ">=8.0.0"
@@ -625,7 +625,7 @@ testing = ["coverage (>=6.2)", "coverage-enable-subprocess (>=1)", "flaky (>=3.7
 [metadata]
 lock-version = "1.1"
 python-versions = "^3.10"
-content-hash = "abe64f67f3e88cc2399858e158404c92f9d90be8128ae9abf18f6fb1fde10a80"
+content-hash = "cf9e268590e8b1eb0e0c421733f39bc9a4ad1df7cea343af93cde1af67eb1a40"
 
 [metadata.files]
 anytree = [
@@ -649,29 +649,18 @@ binaryornot = [
     {file = "binaryornot-0.4.4.tar.gz", hash = "sha256:359501dfc9d40632edc9fac890e19542db1a287bbcfa58175b66658392018061"},
 ]
 black = [
-    {file = "black-22.8.0-cp310-cp310-macosx_10_9_universal2.whl", hash = "sha256:ce957f1d6b78a8a231b18e0dd2d94a33d2ba738cd88a7fe64f53f659eea49fdd"},
-    {file = "black-22.8.0-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:5107ea36b2b61917956d018bd25129baf9ad1125e39324a9b18248d362156a27"},
-    {file = "black-22.8.0-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:e8166b7bfe5dcb56d325385bd1d1e0f635f24aae14b3ae437102dedc0c186747"},
-    {file = "black-22.8.0-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:dd82842bb272297503cbec1a2600b6bfb338dae017186f8f215c8958f8acf869"},
-    {file = "black-22.8.0-cp310-cp310-win_amd64.whl", hash = "sha256:d839150f61d09e7217f52917259831fe2b689f5c8e5e32611736351b89bb2a90"},
-    {file = "black-22.8.0-cp36-cp36m-macosx_10_9_x86_64.whl", hash = "sha256:a05da0430bd5ced89176db098567973be52ce175a55677436a271102d7eaa3fe"},
-    {file = "black-22.8.0-cp36-cp36m-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:4a098a69a02596e1f2a58a2a1c8d5a05d5a74461af552b371e82f9fa4ada8342"},
-    {file = "black-22.8.0-cp36-cp36m-win_amd64.whl", hash = "sha256:5594efbdc35426e35a7defa1ea1a1cb97c7dbd34c0e49af7fb593a36bd45edab"},
-    {file = "black-22.8.0-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:a983526af1bea1e4cf6768e649990f28ee4f4137266921c2c3cee8116ae42ec3"},
-    {file = "black-22.8.0-cp37-cp37m-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:3b2c25f8dea5e8444bdc6788a2f543e1fb01494e144480bc17f806178378005e"},
-    {file = "black-22.8.0-cp37-cp37m-win_amd64.whl", hash = "sha256:78dd85caaab7c3153054756b9fe8c611efa63d9e7aecfa33e533060cb14b6d16"},
-    {file = "black-22.8.0-cp38-cp38-macosx_10_9_universal2.whl", hash = "sha256:cea1b2542d4e2c02c332e83150e41e3ca80dc0fb8de20df3c5e98e242156222c"},
-    {file = "black-22.8.0-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:5b879eb439094751185d1cfdca43023bc6786bd3c60372462b6f051efa6281a5"},
-    {file = "black-22.8.0-cp38-cp38-macosx_11_0_arm64.whl", hash = "sha256:0a12e4e1353819af41df998b02c6742643cfef58282915f781d0e4dd7a200411"},
-    {file = "black-22.8.0-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:c3a73f66b6d5ba7288cd5d6dad9b4c9b43f4e8a4b789a94bf5abfb878c663eb3"},
-    {file = "black-22.8.0-cp38-cp38-win_amd64.whl", hash = "sha256:e981e20ec152dfb3e77418fb616077937378b322d7b26aa1ff87717fb18b4875"},
-    {file = "black-22.8.0-cp39-cp39-macosx_10_9_universal2.whl", hash = "sha256:8ce13ffed7e66dda0da3e0b2eb1bdfc83f5812f66e09aca2b0978593ed636b6c"},
-    {file = "black-22.8.0-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:32a4b17f644fc288c6ee2bafdf5e3b045f4eff84693ac069d87b1a347d861497"},
-    {file = "black-22.8.0-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:0ad827325a3a634bae88ae7747db1a395d5ee02cf05d9aa7a9bd77dfb10e940c"},
-    {file = "black-22.8.0-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:53198e28a1fb865e9fe97f88220da2e44df6da82b18833b588b1883b16bb5d41"},
-    {file = "black-22.8.0-cp39-cp39-win_amd64.whl", hash = "sha256:bc4d4123830a2d190e9cc42a2e43570f82ace35c3aeb26a512a2102bce5af7ec"},
-    {file = "black-22.8.0-py3-none-any.whl", hash = "sha256:d2c21d439b2baf7aa80d6dd4e3659259be64c6f49dfd0f32091063db0e006db4"},
-    {file = "black-22.8.0.tar.gz", hash = "sha256:792f7eb540ba9a17e8656538701d3eb1afcb134e3b45b71f20b25c77a8db7e6e"},
+    {file = "black-22.10.0-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:14ff67aec0a47c424bc99b71005202045dc09270da44a27848d534600ac64fc7"},
+    {file = "black-22.10.0-cp310-cp310-win_amd64.whl", hash = "sha256:819dc789f4498ecc91438a7de64427c73b45035e2e3680c92e18795a839ebb66"},
+    {file = "black-22.10.0-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:b8b49776299fece66bffaafe357d929ca9451450f5466e997a7285ab0fe28e3b"},
+    {file = "black-22.10.0-cp311-cp311-win_amd64.whl", hash = "sha256:21199526696b8f09c3997e2b4db8d0b108d801a348414264d2eb8eb2532e540d"},
+    {file = "black-22.10.0-cp37-cp37m-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:1e464456d24e23d11fced2bc8c47ef66d471f845c7b7a42f3bd77bf3d1789650"},
+    {file = "black-22.10.0-cp37-cp37m-win_amd64.whl", hash = "sha256:9311e99228ae10023300ecac05be5a296f60d2fd10fff31cf5c1fa4ca4b1988d"},
+    {file = "black-22.10.0-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:915ace4ff03fdfff953962fa672d44be269deb2eaf88499a0f8805221bc68c87"},
+    {file = "black-22.10.0-cp38-cp38-win_amd64.whl", hash = "sha256:444ebfb4e441254e87bad00c661fe32df9969b2bf224373a448d8aca2132b395"},
+    {file = "black-22.10.0-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:72ef3925f30e12a184889aac03d77d031056860ccae8a1e519f6cbb742736383"},
+    {file = "black-22.10.0-cp39-cp39-win_amd64.whl", hash = "sha256:432247333090c8c5366e69627ccb363bc58514ae3e63f7fc75c54b1ea80fa7de"},
+    {file = "black-22.10.0-py3-none-any.whl", hash = "sha256:c957b2b4ea88587b46cf49d1dc17681c1e672864fd7af32fc1e9664d572b3458"},
+    {file = "black-22.10.0.tar.gz", hash = "sha256:f513588da599943e0cde4e32cc9879e825d58720d6557062d1098c5ad80080e1"},
 ]
 certifi = [
     {file = "certifi-2022.9.24-py3-none-any.whl", hash = "sha256:90c1a32f1d68f940488354e36370f6cca89f0f106db09518524c88d6ed83f382"},
diff --git a/pyproject.toml b/pyproject.toml
index 9cbb32e7..1995b2b9 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -14,7 +14,7 @@ beautifulsoup4 = "^4.11.1"
 tqdm = "^4.64.0"
 
 [tool.poetry.dev-dependencies]
-black = "^22.6"
+black = "^22.10"
 cookiecutter = "^2.1.1"
 pytest = "^7.1.2"
 pytest-cov = "^4.0.0"

From d7dc542f68545ec974877b6db497ebb55ad91ed4 Mon Sep 17 00:00:00 2001
From: Roel Adriaans <roel@adriaans.org>
Date: Fri, 7 Oct 2022 22:21:35 +0200
Subject: [PATCH 135/371] [WIP] Create a graph and some nodes

---
 src/adventofcode2021/solutions/day12.py | 11 ++--
 src/adventofcode2021/utils/graph.py     | 78 +++++++++++++++++++++++++
 tests/test_graph.py                     | 16 +++++
 3 files changed, 100 insertions(+), 5 deletions(-)
 create mode 100644 src/adventofcode2021/utils/graph.py
 create mode 100644 tests/test_graph.py

diff --git a/src/adventofcode2021/solutions/day12.py b/src/adventofcode2021/solutions/day12.py
index a1159c39..a26c4e85 100644
--- a/src/adventofcode2021/solutions/day12.py
+++ b/src/adventofcode2021/solutions/day12.py
@@ -1,19 +1,20 @@
 from adventofcode2021.utils.abstract import FileReaderSolution
+from adventofcode2021.utils.graph import Graph
 
 
 class Day12:
+    g: Graph
+
     def create_graph(self, input_data: list[str]):
-        g = nx.Graph()
+        self.g = Graph()
         for line in input_data:
             start, end = line.split("-")
-            # g.add_edges_from([(start, end)])
-            g.add_edge(start, end)
-        return g
+            self.g.add_edge(start, end)
 
 
 class Day12PartA(Day12, FileReaderSolution):
     def solve(self, input_data: str) -> int:
-        graph = self.create_graph(input_data.splitlines())
+        self.create_graph(input_data.splitlines())
 
         return 0
 
diff --git a/src/adventofcode2021/utils/graph.py b/src/adventofcode2021/utils/graph.py
new file mode 100644
index 00000000..a02fa874
--- /dev/null
+++ b/src/adventofcode2021/utils/graph.py
@@ -0,0 +1,78 @@
+from typing import TypeVar, Generic
+from collections.abc import Iterator
+from dataclasses import dataclass
+from collections import defaultdict
+
+
+# The type of the nodes
+V = TypeVar("V")
+
+
+@dataclass
+class Edge:
+    u: V
+    v: V
+
+    def __repr__(self):
+        return f"{self.u} -> {self.v}"
+
+    def __hash__(self):
+        return hash((self.u, self.v))
+
+
+class Graph(Generic[V]):
+    """
+    Very simple graph, enough for advent of code.
+
+    Definitions, that I always forget:
+    - Nodes: The Vertices / items that are there
+    - Edges: The links between vertices
+
+    """
+
+    def __init__(self, edges: Iterator[tuple[V, V]] = None):
+        """Create a new graph.
+
+        If edges is given, the network is created based on the edges.
+        For example
+
+        >>> g = Graph([("a", "b"), ("b", "c"), ("c", "a")])
+
+        Will create simple Graph with:
+        a <-> b
+        b <-> c
+        c <-> a
+        """
+
+        self._nodes: set[V] = set()
+        self._edges: defaultdict[V, list[Edge]] = defaultdict(list)
+        if edges:
+            self.add_from_list(edges)
+
+    def add_node(self, node: V):
+        self._nodes.add(node)
+
+    def add_edge(self, u, v):
+        self.add_node(u)
+        self.add_node(v)
+        new_edge = Edge(u, v)
+        self._edges[u].append(new_edge)
+        self._edges[v].append(new_edge)
+
+    def add_from_list(self, edges: Iterator[tuple[V, V]]):
+        """Add edges based on a list"""
+        for edge in edges:
+            self.add_edge(*edge)
+
+    def __repr__(self):
+        return f"Graph with {len(self.nodes)} nodes and {len(self.edges)} edges"
+
+    @property
+    def edges(self) -> set[Edge]:
+        """Return all the unique edges"""
+        return set([item for sublist in self._edges.values() for item in sublist])
+
+    @property
+    def nodes(self) -> set[V]:
+        """Return all the nodes"""
+        return self._nodes
diff --git a/tests/test_graph.py b/tests/test_graph.py
new file mode 100644
index 00000000..c0d4e156
--- /dev/null
+++ b/tests/test_graph.py
@@ -0,0 +1,16 @@
+from adventofcode2021.utils.graph import Graph, Edge
+
+
+def test_graph():
+    """Test the graph"""
+    g = Graph()
+    g.add_from_list(
+        [
+            ("a", "b"),
+            ("b", "c"),
+            ("a", "d"),
+        ]
+    )
+    assert repr(g) == "Graph with 4 nodes and 3 edges"
+    assert g.nodes == {"a", "b", "c", "d"}
+    assert list(g.edges)[0] == Edge("a", "b")

From a3c34a26e6c1d21905173f5ddaf76aa888b356e6 Mon Sep 17 00:00:00 2001
From: Roel Adriaans <roel@adriaans.org>
Date: Mon, 10 Oct 2022 04:40:32 +0200
Subject: [PATCH 136/371] Implement dfs, finds the first solution. Now the find
 them all )

---
 src/adventofcode2021/solutions/day12.py | 46 +++++++++++++++++++++++--
 src/adventofcode2021/utils/graph.py     | 19 +++++++---
 tests/test_graph.py                     |  8 +++--
 3 files changed, 65 insertions(+), 8 deletions(-)

diff --git a/src/adventofcode2021/solutions/day12.py b/src/adventofcode2021/solutions/day12.py
index a26c4e85..d877589c 100644
--- a/src/adventofcode2021/solutions/day12.py
+++ b/src/adventofcode2021/solutions/day12.py
@@ -1,5 +1,25 @@
+from __future__ import annotations
+
+from typing import Generic, TypeVar
+
 from adventofcode2021.utils.abstract import FileReaderSolution
 from adventofcode2021.utils.graph import Graph
+from adventofcode2021.utils.stack import Stack
+
+T = TypeVar("T")
+
+
+class Node(Generic[T]):
+    def __init__(
+        self,
+        state: T,
+        parent: Node | None,
+    ) -> None:
+        self.state: T = state
+        self.parent: Node | None = parent
+
+    def __repr__(self):
+        return repr(self.state)
 
 
 class Day12:
@@ -11,12 +31,34 @@ def create_graph(self, input_data: list[str]):
             start, end = line.split("-")
             self.g.add_edge(start, end)
 
+    def find_paths(self, initial: str) -> int:
+        """Find all the paths possible"""
+        frontier: Stack = Stack()
+        frontier.push(Node(initial, None))
+
+        # Explored is where we have been
+        explored = {initial}
+
+        while not frontier.empty:
+            current_node = frontier.pop()
+            if current_node.state == "end":
+                return current_node
+
+            for child in self.g.nodes_from_node(current_node.state):
+                if child in explored:
+                    continue
+
+                explored.add(child)
+                frontier.push(Node(child, current_node))
+        return None
+
 
 class Day12PartA(Day12, FileReaderSolution):
     def solve(self, input_data: str) -> int:
         self.create_graph(input_data.splitlines())
-
-        return 0
+        # Find path
+        paths = self.find_paths("start")
+        return len(paths)
 
 
 class Day12PartB(Day12, FileReaderSolution):
diff --git a/src/adventofcode2021/utils/graph.py b/src/adventofcode2021/utils/graph.py
index a02fa874..56be2e15 100644
--- a/src/adventofcode2021/utils/graph.py
+++ b/src/adventofcode2021/utils/graph.py
@@ -1,8 +1,7 @@
-from typing import TypeVar, Generic
+from collections import defaultdict
 from collections.abc import Iterator
 from dataclasses import dataclass
-from collections import defaultdict
-
+from typing import Generic, TypeVar
 
 # The type of the nodes
 V = TypeVar("V")
@@ -70,9 +69,21 @@ def __repr__(self):
     @property
     def edges(self) -> set[Edge]:
         """Return all the unique edges"""
-        return set([item for sublist in self._edges.values() for item in sublist])
+        return {item for sublist in self._edges.values() for item in sublist}
 
     @property
     def nodes(self) -> set[V]:
         """Return all the nodes"""
         return self._nodes
+
+    def edges_from_node(self, node: V) -> list[Edge]:
+        """Return all the edges directly connected to node"""
+        return self._edges[node]
+
+    def nodes_from_node(self, node: V) -> Iterator[V]:
+        """Return all the nodes directly connected to node"""
+        for edge in self._edges[node]:
+            if edge.v == node:
+                yield edge.u
+            else:
+                yield edge.v
diff --git a/tests/test_graph.py b/tests/test_graph.py
index c0d4e156..ba6bda45 100644
--- a/tests/test_graph.py
+++ b/tests/test_graph.py
@@ -1,4 +1,4 @@
-from adventofcode2021.utils.graph import Graph, Edge
+from adventofcode2021.utils.graph import Edge, Graph
 
 
 def test_graph():
@@ -13,4 +13,8 @@ def test_graph():
     )
     assert repr(g) == "Graph with 4 nodes and 3 edges"
     assert g.nodes == {"a", "b", "c", "d"}
-    assert list(g.edges)[0] == Edge("a", "b")
+    assert Edge("a", "b") in list(g.edges)
+
+    # Test the nodes reachable. From "a", we can connect to "b" and "d"
+    assert g.edges_from_node("a") == [Edge("a", "b"), Edge("a", "d")]
+    assert list(g.nodes_from_node("a")) == ["b", "d"]

From dfa237b1db68fb0d00ffb681229bde887527676a Mon Sep 17 00:00:00 2001
From: Roel Adriaans <roel.adriaans@asml.com>
Date: Wed, 12 Oct 2022 15:47:31 +0200
Subject: [PATCH 137/371] Implement day 12, part 1

---
 src/adventofcode2021/solutions/day12.py | 46 ++++++++++++++++++++-----
 tests/solutions/test_day12_a.py         |  7 ++--
 2 files changed, 40 insertions(+), 13 deletions(-)

diff --git a/src/adventofcode2021/solutions/day12.py b/src/adventofcode2021/solutions/day12.py
index d877589c..9b5cddd8 100644
--- a/src/adventofcode2021/solutions/day12.py
+++ b/src/adventofcode2021/solutions/day12.py
@@ -19,7 +19,23 @@ def __init__(
         self.parent: Node | None = parent
 
     def __repr__(self):
-        return repr(self.state)
+        if self.parent:
+            parents = self.node_to_path(self)
+            return f"{repr(self.state)} ({parents})"
+        else:
+            return repr(self.state)
+
+    @staticmethod
+    def node_to_path(node: Node[T]) -> list[T]:
+        path: list[T] = [node.state]
+
+        # work backwards from end to front
+        while node.parent is not None:
+            node = node.parent
+            path.append(node.state)
+
+        path.reverse()
+        return path
 
 
 class Day12:
@@ -31,36 +47,48 @@ def create_graph(self, input_data: list[str]):
             start, end = line.split("-")
             self.g.add_edge(start, end)
 
-    def find_paths(self, initial: str) -> int:
+    def find_paths(self, initial: str, max_visits: int = 1) -> list[Node]:
         """Find all the paths possible"""
         frontier: Stack = Stack()
         frontier.push(Node(initial, None))
 
         # Explored is where we have been
-        explored = {initial}
+        paths = []
 
         while not frontier.empty:
             current_node = frontier.pop()
             if current_node.state == "end":
-                return current_node
+                paths.append(current_node)
+                continue
 
             for child in self.g.nodes_from_node(current_node.state):
-                if child in explored:
+                if child == "start":
+                    # We can visit start only once
                     continue
+                elif child.isupper():
+                    # Uppercase, we can visit this node mode
+                    pass
+                else:
+                    # We can visit a lowercase node only once
+                    visited_list = Node.node_to_path(current_node)
+                    if visited_list.count(child) >= max_visits:
+                        continue
 
-                explored.add(child)
                 frontier.push(Node(child, current_node))
-        return None
+        return paths
 
 
 class Day12PartA(Day12, FileReaderSolution):
     def solve(self, input_data: str) -> int:
         self.create_graph(input_data.splitlines())
         # Find path
-        paths = self.find_paths("start")
+        paths = self.find_paths("start", 1)
         return len(paths)
 
 
 class Day12PartB(Day12, FileReaderSolution):
     def solve(self, input_data: str) -> int:
-        raise NotImplementedError
+        self.create_graph(input_data.splitlines())
+        # Find path
+        paths = self.find_paths("start", 2)
+        return len(paths)
diff --git a/tests/solutions/test_day12_a.py b/tests/solutions/test_day12_a.py
index 9142fd55..8af4a8dc 100644
--- a/tests/solutions/test_day12_a.py
+++ b/tests/solutions/test_day12_a.py
@@ -46,8 +46,8 @@ class TestDay12PartA:
         ("input_data", "expected_result"),
         [
             (test_data_short, 10),
-            # (test_data, 19),
-            # (test_data_longer, 226),
+            (test_data, 19),
+            (test_data_longer, 226),
         ],
     )
     def test_day12a_solve(self, input_data, expected_result):
@@ -55,9 +55,8 @@ def test_day12a_solve(self, input_data, expected_result):
         result = solution.solve(input_data)
         assert result == expected_result
 
-    @pytest.mark.xfail(reason="Not yet implemented", raises=NotImplementedError)
     def test_day12a_data(self):
         """Result we got when we did the real solution"""
         solution = Day12PartA()
         res = solution("day_12/day12.txt")
-        assert res == 0
+        assert res == 5212

From ca2f4432dac6e098edc8d0dbcb88997bd17187f0 Mon Sep 17 00:00:00 2001
From: Roel Adriaans <roel.adriaans@asml.com>
Date: Wed, 12 Oct 2022 15:55:55 +0200
Subject: [PATCH 138/371] Add tests day 12, part 2

---
 tests/solutions/test_day12_b.py | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/tests/solutions/test_day12_b.py b/tests/solutions/test_day12_b.py
index ba284792..242d0752 100644
--- a/tests/solutions/test_day12_b.py
+++ b/tests/solutions/test_day12_b.py
@@ -1,11 +1,18 @@
 import pytest
 
 from adventofcode2021.solutions.day12 import Day12PartB
+from test_day12_a import test_data_short, test_data, test_data_longer
 
 
 class TestDay12PartB:
-    @pytest.mark.xfail(reason="Not yet implemented", raises=NotImplementedError)
-    @pytest.mark.parametrize(("input_data", "expected_result"), [("", ""), ("", "")])
+    @pytest.mark.parametrize(
+        ("input_data", "expected_result"),
+        [
+            (test_data_short, 36),
+            # (test_data, 103),
+            # (test_data_longer, 3509),
+        ],
+    )
     def test_day12b_solve(self, input_data, expected_result):
         solution = Day12PartB()
         result = solution.solve(input_data)

From 40ef09c687c331f13afbb9cb48df231dcd72b809 Mon Sep 17 00:00:00 2001
From: Roel Adriaans <roel@adriaans.org>
Date: Wed, 12 Oct 2022 20:48:04 +0200
Subject: [PATCH 139/371] Solve day 12, part 2. Still a bit slow

---
 src/adventofcode2021/solutions/day12.py | 10 ++++++++--
 tests/solutions/test_day12_b.py         |  9 ++++-----
 2 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/src/adventofcode2021/solutions/day12.py b/src/adventofcode2021/solutions/day12.py
index 9b5cddd8..ec4052ec 100644
--- a/src/adventofcode2021/solutions/day12.py
+++ b/src/adventofcode2021/solutions/day12.py
@@ -71,8 +71,14 @@ def find_paths(self, initial: str, max_visits: int = 1) -> list[Node]:
                 else:
                     # We can visit a lowercase node only once
                     visited_list = Node.node_to_path(current_node)
-                    if visited_list.count(child) >= max_visits:
-                        continue
+                    if max_visits == 2:
+                        lower_cases = [node for node in visited_list if node.islower()]
+                        unique_lower = set(lower_cases)
+                        if len(lower_cases) == len(unique_lower) + 2:
+                            continue
+                    else:
+                        if visited_list.count(child) >= max_visits:
+                            continue
 
                 frontier.push(Node(child, current_node))
         return paths
diff --git a/tests/solutions/test_day12_b.py b/tests/solutions/test_day12_b.py
index 242d0752..01dfea28 100644
--- a/tests/solutions/test_day12_b.py
+++ b/tests/solutions/test_day12_b.py
@@ -1,7 +1,7 @@
 import pytest
+from test_day12_a import test_data, test_data_longer, test_data_short
 
 from adventofcode2021.solutions.day12 import Day12PartB
-from test_day12_a import test_data_short, test_data, test_data_longer
 
 
 class TestDay12PartB:
@@ -9,8 +9,8 @@ class TestDay12PartB:
         ("input_data", "expected_result"),
         [
             (test_data_short, 36),
-            # (test_data, 103),
-            # (test_data_longer, 3509),
+            (test_data, 103),
+            (test_data_longer, 3509),
         ],
     )
     def test_day12b_solve(self, input_data, expected_result):
@@ -18,9 +18,8 @@ def test_day12b_solve(self, input_data, expected_result):
         result = solution.solve(input_data)
         assert result == expected_result
 
-    @pytest.mark.xfail(reason="Not yet implemented", raises=NotImplementedError)
     def test_day12b_data(self):
         """Result we got when we did the real solution"""
         solution = Day12PartB()
         res = solution("day_12/day12.txt")
-        assert res == 0
+        assert res == 134862

From 038b860c1973944a38627e6dac21cd0be4d39219 Mon Sep 17 00:00:00 2001
From: Roel Adriaans <roel.adriaans@asml.com>
Date: Wed, 12 Oct 2022 22:21:09 +0200
Subject: [PATCH 140/371] Fix mypy error

---
 src/adventofcode2021/utils/graph.py | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/adventofcode2021/utils/graph.py b/src/adventofcode2021/utils/graph.py
index 56be2e15..56ed8d9e 100644
--- a/src/adventofcode2021/utils/graph.py
+++ b/src/adventofcode2021/utils/graph.py
@@ -8,11 +8,11 @@
 
 
 @dataclass
-class Edge:
+class Edge(Generic[V]):
     u: V
     v: V
 
-    def __repr__(self):
+    def __repr__(self) -> str:
         return f"{self.u} -> {self.v}"
 
     def __hash__(self):
@@ -51,7 +51,7 @@ def __init__(self, edges: Iterator[tuple[V, V]] = None):
     def add_node(self, node: V):
         self._nodes.add(node)
 
-    def add_edge(self, u, v):
+    def add_edge(self, u: V, v: V):
         self.add_node(u)
         self.add_node(v)
         new_edge = Edge(u, v)
@@ -63,7 +63,7 @@ def add_from_list(self, edges: Iterator[tuple[V, V]]):
         for edge in edges:
             self.add_edge(*edge)
 
-    def __repr__(self):
+    def __repr__(self) -> str:
         return f"Graph with {len(self.nodes)} nodes and {len(self.edges)} edges"
 
     @property

From ae554febf8d44f01463eb15fa006825579b67df1 Mon Sep 17 00:00:00 2001
From: Roel Adriaans <roel@adriaans.org>
Date: Fri, 14 Oct 2022 21:20:57 +0200
Subject: [PATCH 141/371] Add a queueueueue

---
 src/adventofcode2021/utils/queue.py | 26 ++++++++++++++++++++++++++
 tests/test_queue.py                 | 29 +++++++++++++++++++++++++++++
 2 files changed, 55 insertions(+)
 create mode 100644 src/adventofcode2021/utils/queue.py
 create mode 100644 tests/test_queue.py

diff --git a/src/adventofcode2021/utils/queue.py b/src/adventofcode2021/utils/queue.py
new file mode 100644
index 00000000..f0b07c21
--- /dev/null
+++ b/src/adventofcode2021/utils/queue.py
@@ -0,0 +1,26 @@
+from __future__ import annotations
+
+from collections import deque
+from typing import Generic, TypeVar
+
+T = TypeVar("T")
+
+
+class Queue(Generic[T]):
+    def __init__(self) -> None:
+        self._container: deque[T] = deque()
+
+    @property
+    def empty(self) -> bool:
+        # not is true for empty container
+        return not self._container
+
+    def push(self, item: T) -> None:
+        self._container.append(item)
+
+    def pop(self) -> T:
+        # FIFO
+        return self._container.popleft()
+
+    def __repr__(self) -> str:
+        return repr(self._container)
diff --git a/tests/test_queue.py b/tests/test_queue.py
new file mode 100644
index 00000000..1c09087d
--- /dev/null
+++ b/tests/test_queue.py
@@ -0,0 +1,29 @@
+import pytest
+
+from adventofcode2021.utils.queue import Queue
+
+
+def test_queue():
+    q = Queue()
+
+    assert q.empty
+    assert q.__repr__() == "deque([])"
+
+    # Let's add some stuff
+    q.push("a")
+    q.push("b")
+    q.push("c")
+
+    assert not q.empty
+    assert q.__repr__() == "deque(['a', 'b', 'c'])"
+
+    # First in is First out
+    assert q.pop() == "a"
+    assert q.pop() == "b"
+    assert q.pop() == "c"
+
+    # And empty again
+    assert q.empty
+
+    with pytest.raises(IndexError):
+        q.pop()

From 88668c722034215ad72d5b022ad2ffa17e831e7a Mon Sep 17 00:00:00 2001
From: Roel Adriaans <roel@adriaans.org>
Date: Sat, 15 Oct 2022 11:55:16 +0200
Subject: [PATCH 142/371] Implent day 13, part 1

---
 .../solutions/data/day_13/day13.txt           | 916 ++++++++++++++++++
 src/adventofcode2021/solutions/day13.py       |  92 ++
 tests/solutions/test_day13_a.py               |  76 ++
 3 files changed, 1084 insertions(+)
 create mode 100644 src/adventofcode2021/solutions/data/day_13/day13.txt
 create mode 100644 src/adventofcode2021/solutions/day13.py
 create mode 100644 tests/solutions/test_day13_a.py

diff --git a/src/adventofcode2021/solutions/data/day_13/day13.txt b/src/adventofcode2021/solutions/data/day_13/day13.txt
new file mode 100644
index 00000000..aef0a4af
--- /dev/null
+++ b/src/adventofcode2021/solutions/data/day_13/day13.txt
@@ -0,0 +1,916 @@
+1213,736
+1158,890
+626,303
+98,10
+878,268
+1208,143
+112,400
+865,894
+1218,179
+1089,418
+535,886
+726,515
+1263,786
+589,270
+80,518
+288,322
+1101,483
+989,308
+1002,707
+467,18
+1036,364
+552,591
+445,280
+912,40
+1268,761
+984,47
+883,574
+815,784
+719,236
+865,166
+836,581
+656,735
+228,264
+23,466
+1099,515
+1284,665
+432,268
+195,493
+1001,308
+430,222
+1294,537
+427,646
+574,381
+1116,829
+1143,808
+950,578
+293,579
+28,751
+169,341
+326,159
+257,721
+773,670
+1231,556
+306,436
+454,520
+1267,522
+85,309
+1273,358
+1019,208
+870,504
+647,175
+408,544
+1310,386
+912,854
+512,10
+674,770
+273,742
+626,584
+112,10
+736,420
+1198,884
+214,620
+139,751
+448,782
+771,646
+709,796
+755,460
+179,838
+360,578
+274,364
+656,401
+810,61
+194,310
+584,515
+773,238
+184,241
+932,661
+105,333
+1096,838
+959,838
+252,341
+1237,338
+112,884
+746,812
+735,556
+45,75
+815,838
+654,719
+1225,309
+1226,892
+453,465
+783,520
+987,446
+348,458
+976,175
+487,392
+1307,558
+1279,882
+145,509
+909,444
+1310,389
+626,527
+356,527
+363,774
+142,130
+246,581
+1064,581
+925,837
+166,842
+529,877
+124,341
+709,546
+651,490
+372,16
+537,614
+1004,213
+1198,661
+1240,40
+701,504
+1103,120
+638,462
+857,351
+269,794
+1099,122
+624,360
+1284,217
+902,26
+102,672
+691,208
+850,287
+1083,698
+636,770
+475,539
+1280,735
+495,712
+1273,655
+217,854
+1109,687
+345,565
+939,43
+902,203
+803,241
+35,838
+169,624
+206,236
+413,718
+617,599
+729,786
+372,430
+467,242
+771,324
+924,268
+574,854
+167,502
+141,738
+166,52
+659,336
+1240,123
+672,462
+902,581
+883,320
+37,655
+209,0
+897,875
+823,630
+1074,264
+385,794
+1131,838
+1151,504
+1294,357
+1260,396
+1228,768
+209,57
+1225,360
+1111,710
+333,586
+996,371
+954,140
+790,367
+843,348
+1058,877
+252,509
+181,385
+1218,267
+1123,428
+191,98
+1039,372
+214,504
+274,260
+359,751
+1109,753
+659,359
+10,674
+835,56
+730,490
+378,1
+0,539
+35,182
+276,661
+469,626
+1061,533
+783,432
+656,847
+281,707
+187,428
+1275,568
+716,143
+938,878
+663,117
+738,254
+954,86
+467,796
+966,761
+405,311
+209,651
+38,98
+1233,824
+430,837
+1290,841
+865,280
+1123,18
+985,170
+182,859
+1164,245
+656,607
+979,784
+634,10
+460,829
+768,172
+1126,317
+1000,805
+1198,830
+629,536
+208,542
+1193,747
+328,60
+1123,751
+1004,10
+1056,571
+254,571
+1086,57
+192,815
+1287,204
+1012,754
+838,411
+1225,361
+380,310
+616,117
+621,243
+1165,509
+706,781
+564,530
+905,311
+162,763
+354,889
+975,103
+10,226
+326,847
+184,317
+1261,143
+1310,65
+310,462
+1208,672
+402,17
+85,361
+129,847
+1020,486
+16,462
+618,856
+440,102
+686,381
+925,794
+453,65
+1287,639
+180,656
+507,91
+460,65
+893,271
+344,581
+609,208
+246,432
+781,246
+185,268
+311,696
+736,488
+346,707
+875,708
+38,565
+420,267
+433,18
+1101,651
+159,222
+420,627
+1245,446
+905,361
+954,527
+909,450
+495,392
+755,434
+179,429
+1230,868
+1129,621
+932,681
+211,122
+344,313
+52,530
+602,288
+947,326
+433,113
+634,557
+529,17
+647,117
+1253,324
+331,502
+580,205
+1111,184
+359,143
+52,36
+32,409
+1280,584
+112,661
+1143,392
+1228,126
+32,485
+28,310
+768,436
+1000,761
+281,502
+753,214
+443,646
+1213,680
+97,515
+939,820
+112,172
+1068,674
+371,43
+1089,642
+1064,82
+1131,429
+947,840
+684,751
+420,264
+1082,660
+965,553
+52,82
+795,751
+351,98
+1143,726
+815,224
+80,656
+900,605
+897,360
+706,333
+880,57
+676,841
+119,877
+938,16
+393,176
+1001,586
+507,388
+31,194
+405,182
+35,470
+185,716
+1310,57
+733,70
+391,658
+815,182
+31,65
+868,866
+356,140
+628,229
+841,492
+691,712
+1195,696
+634,287
+523,65
+345,138
+310,49
+663,623
+474,581
+520,639
+224,57
+1287,428
+328,579
+323,392
+351,504
+1287,255
+815,360
+194,136
+207,269
+542,436
+432,178
+110,634
+878,716
+201,829
+897,718
+52,726
+328,159
+1258,502
+1307,87
+1129,733
+979,315
+323,427
+1002,187
+351,639
+938,430
+527,520
+870,176
+1069,639
+1307,467
+36,856
+23,31
+413,534
+402,341
+687,65
+619,120
+634,884
+1258,858
+18,203
+542,885
+604,781
+1282,758
+5,553
+1294,385
+378,437
+1096,56
+835,838
+23,876
+1111,278
+1011,33
+308,707
+117,798
+331,763
+470,241
+830,732
+1265,691
+982,287
+950,709
+755,196
+691,694
+776,12
+1290,765
+619,40
+738,640
+1121,88
+938,464
+951,143
+537,208
+736,518
+405,126
+453,543
+365,694
+157,329
+385,57
+37,358
+482,341
+442,28
+870,457
+984,336
+693,239
+917,176
+45,158
+892,264
+1258,812
+1113,534
+303,7
+1004,661
+569,869
+281,158
+378,681
+569,534
+16,509
+435,708
+373,840
+1192,542
+721,606
+1041,794
+1151,392
+343,646
+684,143
+1064,740
+552,751
+1151,182
+1143,616
+698,313
+1064,812
+446,800
+564,812
+1191,717
+452,105
+85,360
+947,504
+380,82
+937,483
+319,551
+922,815
+1213,515
+984,607
+73,556
+309,852
+50,661
+1181,847
+1300,535
+448,560
+291,854
+447,8
+0,91
+1191,625
+932,233
+371,689
+361,131
+865,798
+1169,738
+446,94
+966,581
+110,309
+74,404
+1000,49
+1,842
+798,354
+20,884
+1233,406
+1230,243
+492,267
+867,248
+346,187
+1245,472
+736,406
+656,287
+962,590
+572,640
+544,260
+927,522
+841,786
+1029,392
+169,278
+378,445
+420,630
+488,52
+626,751
+927,372
+691,854
+803,355
+3,87
+1230,26
+154,341
+612,313
+823,560
+802,245
+216,137
+987,427
+207,120
+775,877
+897,176
+1266,654
+541,191
+159,110
+1275,182
+678,268
+1153,565
+1274,856
+991,656
+15,696
+172,341
+691,504
+310,705
+1275,470
+574,243
+448,637
+1111,262
+951,751
+619,390
+539,324
+626,143
+733,809
+656,281
+0,837
+529,429
+862,180
+1279,194
+947,568
+227,574
+378,400
+418,364
+556,182
+969,481
+500,61
+947,774
+761,333
+1012,136
+1258,530
+574,518
+666,311
+326,558
+512,130
+870,718
+689,682
+1104,658
+1101,614
+187,876
+1237,556
+313,861
+222,716
+676,884
+201,375
+336,28
+1058,509
+469,492
+1081,232
+361,763
+42,761
+1183,462
+1148,110
+1273,239
+905,712
+863,438
+905,518
+736,474
+1034,445
+1088,716
+1022,677
+117,224
+1265,686
+1171,751
+862,112
+0,165
+1123,546
+1310,508
+49,143
+880,837
+976,719
+684,361
+1233,70
+28,478
+82,126
+1053,721
+131,625
+900,289
+1193,278
+373,65
+1272,796
+490,617
+1016,633
+413,176
+82,96
+1116,584
+469,786
+867,646
+843,652
+1118,815
+775,886
+624,829
+166,500
+555,574
+385,837
+455,278
+487,840
+65,446
+1139,819
+1211,460
+1169,114
+1101,894
+624,381
+227,250
+119,269
+1029,56
+616,98
+905,126
+937,449
+1096,504
+1141,624
+1099,772
+201,687
+1116,65
+217,40
+708,136
+787,65
+1273,648
+1155,338
+659,87
+201,207
+402,161
+1091,708
+440,722
+447,269
+1022,572
+939,205
+497,329
+1058,553
+542,661
+863,886
+155,338
+622,857
+92,715
+612,133
+962,458
+634,159
+28,30
+288,677
+1028,878
+1183,520
+169,176
+23,428
+1292,203
+754,182
+555,320
+35,208
+701,75
+1022,322
+684,533
+320,623
+857,95
+18,770
+214,50
+7,777
+398,406
+261,176
+783,462
+709,98
+1123,815
+440,457
+708,168
+447,625
+359,418
+1278,485
+1012,143
+159,504
+38,796
+1230,332
+418,530
+877,255
+654,505
+28,136
+912,406
+1193,320
+485,46
+351,838
+1265,75
+758,143
+1300,226
+1282,527
+612,761
+575,556
+979,763
+77,70
+654,607
+688,261
+766,585
+145,385
+363,504
+676,287
+788,607
+857,465
+1128,35
+574,513
+1200,309
+10,668
+169,553
+654,57
+1064,868
+191,796
+45,686
+982,159
+795,79
+413,361
+761,863
+473,273
+0,401
+1017,579
+840,808
+99,434
+79,556
+162,784
+459,418
+798,10
+195,418
+651,404
+520,527
+959,887
+965,565
+288,217
+730,404
+1282,478
+602,364
+803,315
+962,304
+820,617
+741,534
+549,333
+862,714
+363,326
+102,222
+348,436
+1156,553
+1064,463
+97,214
+609,691
+214,722
+827,208
+372,688
+453,519
+385,401
+622,633
+70,40
+455,616
+949,763
+693,599
+194,758
+512,541
+1169,786
+617,536
+1086,837
+112,494
+910,161
+984,495
+959,56
+977,586
+454,262
+1141,341
+609,203
+748,19
+1143,560
+656,508
+541,703
+1181,495
+1183,246
+542,102
+736,189
+433,866
+661,756
+659,490
+331,446
+236,630
+610,688
+3,467
+446,268
+694,117
+308,35
+537,350
+1101,243
+951,418
+127,432
+979,110
+802,705
+741,86
+787,829
+1198,233
+808,890
+1279,12
+50,396
+1183,14
+23,255
+636,124
+448,714
+1236,205
+1193,798
+1103,625
+945,694
+1139,108
+522,287
+624,513
+997,33
+1190,658
+35,56
+1275,406
+773,208
+1125,716
+69,621
+1093,518
+1310,837
+1125,268
+865,448
+1102,94
+306,10
+373,483
+442,866
+858,105
+602,168
+624,159
+334,719
+480,162
+870,172
+602,736
+0,508
+1064,154
+1056,712
+582,161
+1261,591
+661,308
+35,200
+92,19
+214,390
+
+fold along x=655
+fold along y=447
+fold along x=327
+fold along y=223
+fold along x=163
+fold along y=111
+fold along x=81
+fold along y=55
+fold along x=40
+fold along y=27
+fold along y=13
+fold along y=6
diff --git a/src/adventofcode2021/solutions/day13.py b/src/adventofcode2021/solutions/day13.py
new file mode 100644
index 00000000..eaa343e8
--- /dev/null
+++ b/src/adventofcode2021/solutions/day13.py
@@ -0,0 +1,92 @@
+import re
+from collections import defaultdict
+
+from adventofcode2021.utils.abstract import FileReaderSolution
+from adventofcode2021.utils.queue import Queue
+
+
+class Day13:
+    grid: defaultdict[tuple[int, int], bool]
+    folds: Queue[tuple[str, int]]
+    size: int
+
+    def create_grid(self, lines: list[str]):
+        self.grid = defaultdict(lambda: False)
+        for line in lines:
+            j, i = line.split(",")
+            self.grid[int(i), int(j)] = True
+        self._set_size()
+
+    def _set_size(self):
+        self.size = max(max(i, j) for i, j in list(self.grid.keys()))
+
+    def create_folds(self, lines: list[str]):
+        p = re.compile(r"^fold along (?P<direction>[x|y])=(?P<fold_line>\d*)$")
+        self.folds = Queue()
+        for line in lines:
+            match = p.search(line).groupdict()
+            self.folds.push((match["direction"], int(match["fold_line"])))
+
+    def repr_grid(self):  # pragma: nocover
+        lines = []
+        for i in range(0, self.size + 1):
+            line = "".join(
+                "#" if self.grid[i, j] else "." for j in range(0, self.size + 1)
+            )
+            lines.append(line)
+        return "\n".join(lines)
+
+    def _fold(self):
+        direction, fold_line = self.folds.pop()
+        if direction == "y":
+            for i in range(fold_line + 1, self.size + 1):
+                for j in range(0, self.size + 1):
+                    if self.grid[i, j]:
+                        new_i = self._mirrored_location(i, fold_line)
+                        self.grid[new_i, j] = True
+        elif direction == "x":
+            for j in range(fold_line + 1, self.size + 1):
+                for i in range(0, self.size + 1):
+                    if self.grid[i, j]:
+                        new_j = self._mirrored_location(j, fold_line)
+                        self.grid[i, new_j] = True
+
+        # And then, delete everything under or left to the fold line
+        for i, j in list(self.grid.keys()):
+            if direction == "y":
+                if i > fold_line:
+                    del self.grid[i, j]
+            else:
+                if j > fold_line:
+                    del self.grid[i, j]
+        # Update the size, since we deleted stuff
+        self._set_size()
+
+    @staticmethod
+    def _mirrored_location(i: int, fold: int) -> int:
+        """Get the location oposide to this location, based on the fold"""
+        return i - ((i - fold) * 2)
+
+    def start_folding(self, loops=1):
+        for n in range(loops):
+            self._fold()
+        return True
+
+    def count_dots(self) -> int:
+        all_true = [i for i in self.grid.values() if i is True]
+        return sum(all_true)
+
+
+class Day13PartA(Day13, FileReaderSolution):
+    def solve(self, input_data: str) -> int:
+        locations, folds = input_data.split("\n\n")
+
+        self.create_grid(locations.splitlines())
+        self.create_folds(folds.splitlines())
+        self.start_folding(loops=1)
+        return self.count_dots()
+
+
+class Day13PartB(Day13, FileReaderSolution):
+    def solve(self, input_data: str) -> int:
+        raise NotImplementedError
diff --git a/tests/solutions/test_day13_a.py b/tests/solutions/test_day13_a.py
new file mode 100644
index 00000000..9da81798
--- /dev/null
+++ b/tests/solutions/test_day13_a.py
@@ -0,0 +1,76 @@
+import pytest
+
+from adventofcode2021.solutions.day13 import Day13PartA
+
+test_small_data = """0,0
+1,1
+2,2
+3,3
+4,4
+6,4
+7,3
+8,2
+9,1
+10,0
+4,1
+6,1
+1,10
+
+fold along y=5
+"""
+
+test_data = """6,10
+0,14
+9,10
+0,3
+10,4
+4,11
+6,0
+6,12
+4,1
+0,13
+10,12
+3,4
+3,0
+8,4
+1,10
+2,14
+8,10
+9,0
+
+fold along y=7
+fold along x=5
+"""
+
+
+class TestDay13PartA:
+    @pytest.mark.parametrize(
+        ("input_data", "expected_result"),
+        [
+            (test_small_data, 7),
+            (test_data, 17),
+        ],
+    )
+    def test_day13a_solve(self, input_data, expected_result):
+        solution = Day13PartA()
+        result = solution.solve(input_data)
+        assert result == expected_result
+
+    def test_day13a_two_folds(self):
+        solution = Day13PartA()
+        result = solution.solve(test_data)
+        assert result == 17
+
+        # To another fold
+        solution.start_folding(loops=1)
+
+        # And after the second loop, we should have 16 left
+        assert solution.count_dots() == 16
+
+    def test_day13a_data(self):
+        """Result we got when we did the real solution"""
+        solution = Day13PartA()
+        res = solution("day_13/day13.txt")
+        assert res < 903
+        assert res > 661
+        assert res == 753

From a51f56c8343648ec02c36cb50b6ed7d58c9c380d Mon Sep 17 00:00:00 2001
From: Roel Adriaans <roel@adriaans.org>
Date: Sat, 15 Oct 2022 14:16:44 +0200
Subject: [PATCH 143/371] Solve part b, which was pretty simple :)

---
 src/adventofcode2021/solutions/day13.py | 23 ++++++++++++++++++-----
 src/adventofcode2021/utils/queue.py     |  3 +++
 tests/solutions/test_day13_b.py         | 25 +++++++++++++++++++++++++
 tests/test_queue.py                     |  2 ++
 4 files changed, 48 insertions(+), 5 deletions(-)
 create mode 100644 tests/solutions/test_day13_b.py

diff --git a/src/adventofcode2021/solutions/day13.py b/src/adventofcode2021/solutions/day13.py
index eaa343e8..52d52a19 100644
--- a/src/adventofcode2021/solutions/day13.py
+++ b/src/adventofcode2021/solutions/day13.py
@@ -24,8 +24,9 @@ def create_folds(self, lines: list[str]):
         p = re.compile(r"^fold along (?P<direction>[x|y])=(?P<fold_line>\d*)$")
         self.folds = Queue()
         for line in lines:
-            match = p.search(line).groupdict()
-            self.folds.push((match["direction"], int(match["fold_line"])))
+            if match := p.search(line):
+                mdict = match.groupdict()
+                self.folds.push((mdict["direction"], int(mdict["fold_line"])))
 
     def repr_grid(self):  # pragma: nocover
         lines = []
@@ -67,7 +68,14 @@ def _mirrored_location(i: int, fold: int) -> int:
         """Get the location oposide to this location, based on the fold"""
         return i - ((i - fold) * 2)
 
-    def start_folding(self, loops=1):
+    def start_folding(self, loops=None):
+        """Start the folding process.
+
+        If loops is not specified or None, loop until we run out of folds
+        """
+        if not loops:
+            loops = len(self.folds)
+
         for n in range(loops):
             self._fold()
         return True
@@ -88,5 +96,10 @@ def solve(self, input_data: str) -> int:
 
 
 class Day13PartB(Day13, FileReaderSolution):
-    def solve(self, input_data: str) -> int:
-        raise NotImplementedError
+    def solve(self, input_data: str) -> str:
+        locations, folds = input_data.split("\n\n")
+
+        self.create_grid(locations.splitlines())
+        self.create_folds(folds.splitlines())
+        self.start_folding()
+        return self.repr_grid()
diff --git a/src/adventofcode2021/utils/queue.py b/src/adventofcode2021/utils/queue.py
index f0b07c21..48c0d882 100644
--- a/src/adventofcode2021/utils/queue.py
+++ b/src/adventofcode2021/utils/queue.py
@@ -24,3 +24,6 @@ def pop(self) -> T:
 
     def __repr__(self) -> str:
         return repr(self._container)
+
+    def __len__(self) -> int:
+        return len(self._container)
diff --git a/tests/solutions/test_day13_b.py b/tests/solutions/test_day13_b.py
new file mode 100644
index 00000000..2e5e963a
--- /dev/null
+++ b/tests/solutions/test_day13_b.py
@@ -0,0 +1,25 @@
+from textwrap import dedent
+
+from adventofcode2021.solutions.day13 import Day13PartB
+
+
+class TestDay13PartB:
+    def test_day13b_data(self):
+        """Result we got when we did the real solution"""
+        solution = Day13PartB()
+        res = solution("day_13/day13.txt")
+        # Since it's clear text, we compare the result with the actual result.
+        # Your puzzle answer was HZLEHJRK
+        asci_solution = """\
+        #..#.####.#....####.#..#...##.###..#..#
+        #..#....#.#....#....#..#....#.#..#.#.#.
+        ####...#..#....###..####....#.#..#.##..
+        #..#..#...#....#....#..#....#.###..#.#.
+        #..#.#....#....#....#..#.#..#.#.#..#.#.
+        #..#.####.####.####.#..#..##..#..#.#..#"""
+
+        asci_solution = dedent(asci_solution).splitlines()
+
+        result_list = res.splitlines()[:6]
+        assert asci_solution == result_list
+        assert solution.count_dots() == 98
diff --git a/tests/test_queue.py b/tests/test_queue.py
index 1c09087d..45079cfc 100644
--- a/tests/test_queue.py
+++ b/tests/test_queue.py
@@ -15,6 +15,7 @@ def test_queue():
     q.push("c")
 
     assert not q.empty
+    assert len(q) == 3
     assert q.__repr__() == "deque(['a', 'b', 'c'])"
 
     # First in is First out
@@ -24,6 +25,7 @@ def test_queue():
 
     # And empty again
     assert q.empty
+    assert len(q) == 0
 
     with pytest.raises(IndexError):
         q.pop()

From 4c8eb8d437c898e32fec07cc4261ab857655f963 Mon Sep 17 00:00:00 2001
From: Roel Adriaans <roel@adriaans.org>
Date: Sat, 15 Oct 2022 14:33:02 +0200
Subject: [PATCH 144/371] Update test result after test update

---
 tests/solutions/test_day13_a.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/solutions/test_day13_a.py b/tests/solutions/test_day13_a.py
index 9da81798..07191120 100644
--- a/tests/solutions/test_day13_a.py
+++ b/tests/solutions/test_day13_a.py
@@ -47,7 +47,7 @@ class TestDay13PartA:
     @pytest.mark.parametrize(
         ("input_data", "expected_result"),
         [
-            (test_small_data, 7),
+            (test_small_data, 13),
             (test_data, 17),
         ],
     )

From 55874aece9d321a32b43b216dfe64038de3c80a3 Mon Sep 17 00:00:00 2001
From: Roel Adriaans <roel@adriaans.org>
Date: Sat, 15 Oct 2022 21:19:41 +0200
Subject: [PATCH 145/371] Add day 14, part a. That works. Part b explodes :)

---
 .../solutions/data/day_14/day14.txt           | 102 +++++++++++++++++
 .../solutions/data/day_14/test_data.txt       |  18 +++
 src/adventofcode2021/solutions/day14.py       | 107 ++++++++++++++++++
 tests/solutions/test_day14_a.py               |  50 ++++++++
 4 files changed, 277 insertions(+)
 create mode 100644 src/adventofcode2021/solutions/data/day_14/day14.txt
 create mode 100644 src/adventofcode2021/solutions/data/day_14/test_data.txt
 create mode 100644 src/adventofcode2021/solutions/day14.py
 create mode 100644 tests/solutions/test_day14_a.py

diff --git a/src/adventofcode2021/solutions/data/day_14/day14.txt b/src/adventofcode2021/solutions/data/day_14/day14.txt
new file mode 100644
index 00000000..b0bcae67
--- /dev/null
+++ b/src/adventofcode2021/solutions/data/day_14/day14.txt
@@ -0,0 +1,102 @@
+FNFPPNKPPHSOKFFHOFOC
+
+VS -> B
+SV -> C
+PP -> N
+NS -> N
+BC -> N
+PB -> F
+BK -> P
+NV -> V
+KF -> C
+KS -> C
+PV -> N
+NF -> S
+PK -> F
+SC -> F
+KN -> K
+PN -> K
+OH -> F
+PS -> P
+FN -> O
+OP -> B
+FO -> C
+HS -> F
+VO -> C
+OS -> B
+PF -> V
+SB -> V
+KO -> O
+SK -> N
+KB -> F
+KH -> C
+CC -> B
+CS -> C
+OF -> C
+FS -> B
+FP -> H
+VN -> O
+NB -> N
+BS -> H
+PC -> H
+OO -> F
+BF -> O
+HC -> P
+BH -> S
+NP -> P
+FB -> C
+CB -> H
+BO -> C
+NN -> V
+SF -> N
+FC -> F
+KK -> C
+CN -> N
+BV -> F
+FK -> C
+CF -> F
+VV -> B
+VF -> S
+CK -> C
+OV -> P
+NC -> N
+SS -> F
+NK -> V
+HN -> O
+ON -> P
+FH -> O
+OB -> H
+SH -> H
+NH -> V
+FF -> B
+HP -> B
+PO -> P
+HB -> H
+CH -> N
+SN -> P
+HK -> P
+FV -> H
+SO -> O
+VH -> V
+BP -> V
+CV -> P
+KP -> K
+VB -> N
+HV -> K
+SP -> N
+HO -> P
+CP -> H
+VC -> N
+CO -> S
+BN -> H
+NO -> B
+HF -> O
+VP -> K
+KV -> H
+KC -> F
+HH -> C
+BB -> K
+VK -> P
+OK -> C
+OC -> C
+PH -> H
diff --git a/src/adventofcode2021/solutions/data/day_14/test_data.txt b/src/adventofcode2021/solutions/data/day_14/test_data.txt
new file mode 100644
index 00000000..b5594ddf
--- /dev/null
+++ b/src/adventofcode2021/solutions/data/day_14/test_data.txt
@@ -0,0 +1,18 @@
+NNCB
+
+CH -> B
+HH -> N
+CB -> H
+NH -> C
+HB -> C
+HC -> B
+HN -> C
+NN -> C
+BH -> H
+NC -> B
+NB -> B
+BN -> B
+BB -> N
+BC -> B
+CC -> N
+CN -> C
diff --git a/src/adventofcode2021/solutions/day14.py b/src/adventofcode2021/solutions/day14.py
new file mode 100644
index 00000000..3902cac2
--- /dev/null
+++ b/src/adventofcode2021/solutions/day14.py
@@ -0,0 +1,107 @@
+from __future__ import annotations
+
+from collections import Counter
+from typing import Generic, TypeVar
+
+import tqdm
+
+from adventofcode2021.utils.abstract import FileReaderSolution
+
+T = TypeVar("T")
+
+
+class Polymer(Generic[T]):
+    child: Polymer | None = None
+
+    def __init__(self, polymer: T, parent: Polymer | None = None):
+        """
+        Create a new Polymer with type T.
+
+        If parent is given, this Polymer adds itself to this parent as child
+        """
+        self._content = polymer
+        if parent:
+            parent.add_child(self)
+
+    def add_child(self, child: Polymer):
+        if self.child is None:
+            self.child = child
+        else:
+            raise ValueError(
+                f"Polymer {self._content} already has a child {self.child}"
+            )
+
+    @property
+    def content(self) -> T:
+        return self._content
+
+    def __repr__(self):
+        return repr(self._content)
+
+
+class Day14(Generic[T]):
+    root_node: Polymer
+
+    def initialize(self, input_data: str):
+        lines = input_data.splitlines()
+        self.parse_template(lines[0])
+        self.parse_rules(lines[2:])
+
+    def polimers_to_list(self) -> list[str]:
+        path: list[str] = [self.root_node.content]
+        node = self.root_node
+
+        while node.child is not None:
+            node = node.child
+            path.append(node.content)
+
+        return path
+
+    def parse_template(self, template: str):
+        self.root_node = Polymer(template[0])
+        current = self.root_node
+        for element in template[1:]:
+            current = Polymer(element, current)
+
+    def parse_rules(self, rules: list[str]):
+        self.rules: dict[str, str] = {}
+        for rule in rules:
+            pair = rule.split(" -> ")
+            self.rules[pair[0]] = pair[1]
+
+    def step(self):
+        """Apply the rules to the polymers"""
+        current_node = self.root_node
+        while current_node.child:
+            next_node = current_node.child
+            pair = f"{current_node.content}{next_node.content}"
+            element_to_add = self.rules[pair]
+
+            # Add a new polymer and add it between current_node and it's child
+            new_polymer = Polymer(element_to_add)
+            current_node.child = new_polymer
+            new_polymer.child = next_node
+            # And go to the next node in the chain
+            current_node = next_node
+
+    def count(self) -> int:
+        chain = self.polimers_to_list()
+        cnt = Counter(chain)
+        common = cnt.most_common()
+        return common[0][1] - common[-1][1]
+
+
+class Day14PartA(Day14, FileReaderSolution):
+    def solve(self, input_data: str) -> int:
+        self.initialize(input_data)
+        for _ in range(10):
+            self.step()
+        return self.count()
+
+
+class Day14PartB(Day14, FileReaderSolution):
+    def solve(self, input_data: str) -> int:
+        self.initialize(input_data)
+        for _ in tqdm.trange(40):
+            self.step()
+        return self.count()
diff --git a/tests/solutions/test_day14_a.py b/tests/solutions/test_day14_a.py
new file mode 100644
index 00000000..69612a27
--- /dev/null
+++ b/tests/solutions/test_day14_a.py
@@ -0,0 +1,50 @@
+import pathlib
+
+from adventofcode2021.solutions.day14 import Day14PartA
+
+
+class TestDay14PartA:
+    def load_testdata(self):
+        test_path = (
+            pathlib.Path(__file__).parent.parent.parent
+            / "src"
+            / "adventofcode2021"
+            / "solutions"
+            / "data"
+            / "day_14"
+            / "test_data.txt"
+        )
+        with open(test_path) as f:
+            test_data = f.read()
+        return test_data
+
+    def test_day14a_steps(self):
+        solution = Day14PartA()
+        solution.initialize(self.load_testdata())
+
+        assert "".join(solution.polimers_to_list()) == "NNCB"
+
+        # Do the first step
+        solution.step()
+        assert "".join(solution.polimers_to_list()) == "NCNBCHB"
+        solution.step()
+        assert "".join(solution.polimers_to_list()) == "NBCCNBBBCBHCB"
+        solution.step()
+        assert "".join(solution.polimers_to_list()) == "NBBBCNCCNBBNBNBBCHBHHBCHB"
+        solution.step()
+        assert (
+            "".join(solution.polimers_to_list())
+            == "NBBNBNBBCCNBCNCCNBBNBBNBBBNBBNBBCBHCBHHNHCBBCBHCB"
+        )
+
+    def test_day14a_solve(self):
+        solution = Day14PartA()
+        result = solution.solve(self.load_testdata())
+        assert result == 1588
+
+    def test_day14a_data(self):
+        """Result we got when we did the real solution"""
+        solution = Day14PartA()
+        res = solution("day_14/day14.txt")
+        assert res != 3292
+        assert res == 2975

From 5eec96ca21f6fab48b46685c501c143bd5180764 Mon Sep 17 00:00:00 2001
From: Roel Adriaans <roel@adriaans.org>
Date: Sun, 16 Oct 2022 23:18:22 +0200
Subject: [PATCH 146/371] Solve part 2, with some help

---
 src/adventofcode2021/solutions/day14.py | 65 +++++++++++++++++++------
 tests/solutions/test_day14_b.py         | 51 +++++++++++++++++++
 2 files changed, 101 insertions(+), 15 deletions(-)
 create mode 100644 tests/solutions/test_day14_b.py

diff --git a/src/adventofcode2021/solutions/day14.py b/src/adventofcode2021/solutions/day14.py
index 3902cac2..7e6a5aab 100644
--- a/src/adventofcode2021/solutions/day14.py
+++ b/src/adventofcode2021/solutions/day14.py
@@ -1,10 +1,9 @@
 from __future__ import annotations
 
+from abc import ABC, abstractmethod
 from collections import Counter
 from typing import Generic, TypeVar
 
-import tqdm
-
 from adventofcode2021.utils.abstract import FileReaderSolution
 
 T = TypeVar("T")
@@ -39,14 +38,27 @@ def __repr__(self):
         return repr(self._content)
 
 
-class Day14(Generic[T]):
-    root_node: Polymer
-
+class Day14(ABC):
     def initialize(self, input_data: str):
         lines = input_data.splitlines()
         self.parse_template(lines[0])
         self.parse_rules(lines[2:])
 
+    @abstractmethod
+    def parse_template(self, template: str):
+        raise NotImplementedError
+
+    def parse_rules(self, rules: list[str]):
+        self.rules: dict[str, str] = {}
+
+        for rule in rules:
+            pair = rule.split(" -> ")
+            self.rules[pair[0]] = pair[1]
+
+
+class Day14PartA(Day14, FileReaderSolution, Generic[T]):
+    root_node: Polymer
+
     def polimers_to_list(self) -> list[str]:
         path: list[str] = [self.root_node.content]
         node = self.root_node
@@ -63,12 +75,6 @@ def parse_template(self, template: str):
         for element in template[1:]:
             current = Polymer(element, current)
 
-    def parse_rules(self, rules: list[str]):
-        self.rules: dict[str, str] = {}
-        for rule in rules:
-            pair = rule.split(" -> ")
-            self.rules[pair[0]] = pair[1]
-
     def step(self):
         """Apply the rules to the polymers"""
         current_node = self.root_node
@@ -90,8 +96,6 @@ def count(self) -> int:
         common = cnt.most_common()
         return common[0][1] - common[-1][1]
 
-
-class Day14PartA(Day14, FileReaderSolution):
     def solve(self, input_data: str) -> int:
         self.initialize(input_data)
         for _ in range(10):
@@ -100,8 +104,39 @@ def solve(self, input_data: str) -> int:
 
 
 class Day14PartB(Day14, FileReaderSolution):
+    cnt: Counter[str]
+    word_counter: Counter[str]
+
+    def parse_template(self, template: str):
+        self.cnt = Counter()
+        for step in range(0, len(template) - 1):
+            self.cnt[template[step : step + 2]] += 1
+
+    def step(self):
+        new_counter: Counter[str] = Counter()
+        self.word_counter = Counter()
+        for item, count in self.cnt.items():
+            new_polymer = self.rules[item]
+            left = f"{item[0]}{new_polymer}"
+            right = f"{new_polymer}{item[1]}"
+            new_counter[left] += count
+            new_counter[right] += count
+
+            self.word_counter[item[0]] += count
+            self.word_counter[new_polymer] += count
+
+        self.cnt = new_counter
+
+    def count(self, char_to_fix: str) -> int:
+        # Fix off by one error for the last character in the recipe
+        self.word_counter[char_to_fix] += 1
+        common = self.word_counter.most_common()
+        return common[0][1] - common[-1][1]
+
     def solve(self, input_data: str) -> int:
         self.initialize(input_data)
-        for _ in tqdm.trange(40):
+        self.word_counter = Counter()
+        for _ in range(40):
             self.step()
-        return self.count()
+        char_to_fix = input_data.splitlines()[0][-1]
+        return self.count(char_to_fix)
diff --git a/tests/solutions/test_day14_b.py b/tests/solutions/test_day14_b.py
new file mode 100644
index 00000000..0243b20d
--- /dev/null
+++ b/tests/solutions/test_day14_b.py
@@ -0,0 +1,51 @@
+import pathlib
+
+from adventofcode2021.solutions.day14 import Day14PartB
+
+
+class TestDay14PartB:
+    def load_testdata(self):
+        test_path = (
+            pathlib.Path(__file__).parent.parent.parent
+            / "src"
+            / "adventofcode2021"
+            / "solutions"
+            / "data"
+            / "day_14"
+            / "test_data.txt"
+        )
+        with open(test_path) as f:
+            test_data = f.read()
+        return test_data
+
+    def test_day14a_steps(self):
+        solution = Day14PartB()
+        solution.initialize(self.load_testdata())
+
+        assert list(solution.cnt.keys()) == ["NN", "NC", "CB"]
+
+        # Do the first step
+        solution.step()
+        assert list(solution.cnt.keys()) == ["NC", "CN", "NB", "BC", "CH", "HB"]
+        solution.step()
+        assert list(solution.cnt.keys()) == [
+            "NB",
+            "BC",
+            "CC",
+            "CN",
+            "BB",
+            "CB",
+            "BH",
+            "HC",
+        ]
+
+    def test_day14b_solve(self):
+        solution = Day14PartB()
+        result = solution.solve(self.load_testdata())
+        assert result == 2188189693529
+
+    def test_day14b_data(self):
+        """Result we got when we did the real solution"""
+        solution = Day14PartB()
+        res = solution("day_14/day14.txt")
+        assert res == 3015383850689

From 3fd3d32a25052f7de94a749c4fe2ebf93d758657 Mon Sep 17 00:00:00 2001
From: Roel Adriaans <roel@adriaans.org>
Date: Mon, 17 Oct 2022 18:02:53 +0200
Subject: [PATCH 147/371] convert node to seperate module

---
 src/adventofcode2021/solutions/day12.py | 34 +-------------------
 src/adventofcode2021/utils/node.py      | 41 +++++++++++++++++++++++++
 tests/test_node.py                      | 13 ++++++++
 3 files changed, 55 insertions(+), 33 deletions(-)
 create mode 100644 src/adventofcode2021/utils/node.py
 create mode 100644 tests/test_node.py

diff --git a/src/adventofcode2021/solutions/day12.py b/src/adventofcode2021/solutions/day12.py
index ec4052ec..079e6ee0 100644
--- a/src/adventofcode2021/solutions/day12.py
+++ b/src/adventofcode2021/solutions/day12.py
@@ -1,42 +1,10 @@
 from __future__ import annotations
 
-from typing import Generic, TypeVar
-
 from adventofcode2021.utils.abstract import FileReaderSolution
 from adventofcode2021.utils.graph import Graph
+from adventofcode2021.utils.node import Node
 from adventofcode2021.utils.stack import Stack
 
-T = TypeVar("T")
-
-
-class Node(Generic[T]):
-    def __init__(
-        self,
-        state: T,
-        parent: Node | None,
-    ) -> None:
-        self.state: T = state
-        self.parent: Node | None = parent
-
-    def __repr__(self):
-        if self.parent:
-            parents = self.node_to_path(self)
-            return f"{repr(self.state)} ({parents})"
-        else:
-            return repr(self.state)
-
-    @staticmethod
-    def node_to_path(node: Node[T]) -> list[T]:
-        path: list[T] = [node.state]
-
-        # work backwards from end to front
-        while node.parent is not None:
-            node = node.parent
-            path.append(node.state)
-
-        path.reverse()
-        return path
-
 
 class Day12:
     g: Graph
diff --git a/src/adventofcode2021/utils/node.py b/src/adventofcode2021/utils/node.py
new file mode 100644
index 00000000..0eca98b8
--- /dev/null
+++ b/src/adventofcode2021/utils/node.py
@@ -0,0 +1,41 @@
+from __future__ import annotations
+
+from typing import Generic, TypeVar
+
+T = TypeVar("T")
+
+
+class Node(Generic[T]):
+    def __init__(
+        self,
+        state: T,
+        parent: Node | None,
+        cost: float = 0.0,
+        heuristic: float = 0.0,
+    ) -> None:
+        self.state: T = state
+        self.parent: Node | None = parent
+        self.cost: float = cost
+        self.heuristic: float = heuristic
+
+    def __lt__(self, other: Node) -> bool:
+        return (self.cost + self.heuristic) < (other.cost + other.heuristic)
+
+    def __repr__(self):
+        if self.parent:
+            parents = self.node_to_path(self)
+            return f"{repr(self.state)} ({parents})"
+        else:
+            return repr(self.state)
+
+    @staticmethod
+    def node_to_path(node: Node[T]) -> list[T]:
+        path: list[T] = [node.state]
+
+        # work backwards from end to front
+        while node.parent is not None:
+            node = node.parent
+            path.append(node.state)
+
+        path.reverse()
+        return path
diff --git a/tests/test_node.py b/tests/test_node.py
new file mode 100644
index 00000000..438cae9e
--- /dev/null
+++ b/tests/test_node.py
@@ -0,0 +1,13 @@
+from adventofcode2021.utils.node import Node
+
+
+def test_node():
+    n1 = Node("n1", None, cost=1, heuristic=0.5)
+    n2 = Node("n2", None, cost=3, heuristic=0.5)
+
+    # test __lt__ < and >
+    assert n1 < n2
+    assert n2 > n1
+
+    assert not n1 > n2
+    assert not n2 < n1

From 4aa2ccfde27cba1c6bd6a23eb5634de9bb645d75 Mon Sep 17 00:00:00 2001
From: Roel Adriaans <roel@adriaans.org>
Date: Mon, 17 Oct 2022 21:21:48 +0200
Subject: [PATCH 148/371] Update pre-commit

---
 .pre-commit-config.yaml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index 6cecab91..4056fc31 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -2,7 +2,7 @@
 
 repos:
   - repo: https://github.com/ambv/black
-    rev: 22.8.0
+    rev: 22.10.0
     hooks:
     - id: black
       language_version: 'python3.10'
@@ -31,7 +31,7 @@ repos:
       language_version: python3
 
   - repo: https://github.com/asottile/pyupgrade
-    rev: v3.0.0
+    rev: v3.1.0
     hooks:
     - id: pyupgrade
       args: [ "--py310-plus" ]

From 11df5f72f404c2bad11657f2125a7c606aaab440 Mon Sep 17 00:00:00 2001
From: Roel Adriaans <roel@adriaans.org>
Date: Mon, 17 Oct 2022 22:57:49 +0200
Subject: [PATCH 149/371] Implent day 15 with a*

---
 .../solutions/data/day_15/day15.txt           | 100 ++++++++++++++++++
 src/adventofcode2021/solutions/day15.py       |  99 +++++++++++++++++
 src/adventofcode2021/utils/node.py            |   4 +-
 src/adventofcode2021/utils/priority_queue.py  |  30 ++++++
 tests/solutions/test_day15_a.py               |  30 ++++++
 tests/solutions/test_day15_b.py               |  19 ++++
 tests/test_priority_queue.py                  |  32 ++++++
 7 files changed, 312 insertions(+), 2 deletions(-)
 create mode 100644 src/adventofcode2021/solutions/data/day_15/day15.txt
 create mode 100644 src/adventofcode2021/solutions/day15.py
 create mode 100644 src/adventofcode2021/utils/priority_queue.py
 create mode 100644 tests/solutions/test_day15_a.py
 create mode 100644 tests/solutions/test_day15_b.py
 create mode 100644 tests/test_priority_queue.py

diff --git a/src/adventofcode2021/solutions/data/day_15/day15.txt b/src/adventofcode2021/solutions/data/day_15/day15.txt
new file mode 100644
index 00000000..6936fa56
--- /dev/null
+++ b/src/adventofcode2021/solutions/data/day_15/day15.txt
@@ -0,0 +1,100 @@
+4186687989147999814661259829898977359647291819692699791589716697144967221276869433756649999295588871
+9579993679749288818462777979758389899855345699193951989579278675969459999771962775579518839338298959
+1894738811988829986939897965935486686617499991722996261993912481731199465919971986799399278712999782
+1798991999197599646882937687934577816793967249952136268979847913269346518916498238994739961511228199
+9435574999917188935889117454871237663681989719878743978685998643691852827889659294379989962189789397
+1287186485994768936859699815284782585998129781252852173994242594377218959522199456634287944896997477
+6871578685828444387466578691916461497421152984838997196971189849994217987462378568989112149961927162
+7768274969889132821379748891197337985999948668439879482957941547449986946969485998964739447974228199
+6119899848149845561175416892733976799153716987399849877688336359684788884925393779796985288168899689
+4996845932219644899659769779189949876689119199183768989763889857597819948719839521871979981993129997
+7971499518898381939993989968259841935786594299996668987418876241327929297499819168198774999935791789
+8989294919949989983962199991969649393768661242699997841129192918937761747992122625495987832497983839
+9193796854893698637899476297986944265798698814799938624992771227255589146257383921899989994776679887
+4334756645129733983199962473969489983391681896779948161888991958648992243799384951799484369968254197
+3897589718983888479499598486927599567991132535134176992998995528842653199838733759892691848919911965
+4679148996923438189941447789895191885899459228929969898955955149985546372179997888628657881619286194
+1937118887998986388482681782881457248688899158899789393499516488888462374326483236682998798615722853
+6195689398286838812371235192382116119318689749931893894699698728798112662462496988978199379898598866
+3598667272723491779627997242171698925739726186131177716968968996294417188885959345953827817132998916
+1519944142993199841941699294968698995369578867997917889486654246227818996739169669789783299682355389
+2218941499973319799449881275891614179598919311996995957544919198794848543979791884958959516939969219
+4969928867619586693815519699979837583397199899918239596989778919912718374562614761899323839812288883
+4855936491799949827125398889219996936966517688267989677877842817994535586775274925946999881433891957
+8286417898919511938725961691419591991718373621643197999428795392499517199181988921727949563179969937
+9799598842359999396315192721781796533395715957931195589679878962197894922584827998655919193882119747
+3596733995839917716256199122869916639699959191297487195198993981413883281881552818597499287994468921
+9949671259478897959558191915993198527179777513987286587968219695819717127199299999879994937372821471
+8249378982728396361285738518898489561395947793198621191918625935167998972944978648799726557998719965
+7619899787644498454282294163869114967398789836916526984791998996919139923399297147674389898585574776
+9111942711987883739917663118136911569869319778278994967178891769352338555498946169756877871931961982
+6954989628268695715489341165279919911929481331551514988377791678884689194626861899418189486988187196
+1819462714769811679339886649561184398943387381398374111893259263332462196663147969995978399985318239
+5937768118219191763293327629979394977197738665738899438171642995279694299219969159988395799597763668
+3291461484869889296977898298697429828289173149834423478945292182199415824177922916549799949953193879
+1938461244782856465297371494738596381799882745998197821555993687969996966286984128951579924456677666
+8886638972849948981279741919995595932462545197979478998888914891944269388691325898218761298944166847
+7769849843768975899579798663973882717917968179272968568988548353899829895969988942852739512849485839
+4919596981981199955396675779996973999115926318193769749858719429971435898898314541967918326262744692
+9428939863833456979949424997963112359568769457278772998214895922715716385828918118573181991931578573
+8919945114733399891857766867695887955299831314167987975798587699981852813182999668179217892885195717
+7829615636974128183729818178423852991286772241293984977736229951972653397977497982358118999979169527
+7678454168594951256517753759991589135985669199864949749979918888196592217499387199589133343552966949
+8119422818994191498579782647911968168369995353791886975894926897878195878273141879915185929899178913
+7812329158697789168971359189386971899579317149271996991878952964259175719498918358285996776631995878
+9798118835784749981579198674539868489483271923274791976877789892996338187898927994658982979997349969
+9477273878881877647882189728959299613586151139161966464289278681991998184686824768175919871511961966
+9919857379986667695988843749559544986945219991581945889944986929171111598994534999698186266698791899
+3364916489314919992195598739915711141128797962959982289869485229925786798316399838178937926382446575
+2912818892939859927197913851983396399515367773169977525919619892913778889736959997599938212997888999
+4269497115948499995519869489549197186338685988659588411268899899999195999277982898938479978149797899
+3138855298787916946189938289951966994893842399691932599386799774317826775321856863511339949735888591
+9733897918582559589982799938529959926219289553149439458798698918481698369293743899488672761241316887
+9619798992686999691852898789982336699137977478998561325989934554968868839199199849981989993956997737
+7814666463672918637235789938316749389166781969998932176878578551998868999959242799791163889899846618
+9752949893221898553499187799825682346799828142188861139653882938139928866836991245459863829858998188
+1294949935197948898211198819881821296119727851997212621698896779992584166151297999339447798989362865
+8857979499916691528235697973684821799598587795559197649942299182627691961754119479999397919999371999
+3639897596779561927789269443848789921551926711437415122732687969549143999812994994747148755956729799
+8189479699613591819419668445977548487918995489881996918529279195193653419211963279279488981196293619
+7769942161582739292291418918979238651767948597494938529498673335548793472916599629718619835683689798
+1443967882579519328556279988497355736822198149965929928867655364991863978624745431379799339814955462
+5927776538139999925395875739879971665969766377989855978985783316288891613911888192698992898496228999
+4498985971959196199898917257998721838949758577899699735618359619799765639325393752685931618839988982
+9271222993569417892936854989116919891916539499279699988988898912117194275188367347638899733999979479
+8949989981139499681975917393649688481934651921792679664191179486897183131928956968554995139981686389
+7962191923797875755447715827951379682855832437385839853577933144793497869981692875314354882519799553
+5128992922139559144923714752298595495672285988967293398448786911569199838943982999883117961297426499
+8887837819981395371469995591499812138687318489899589978711887586394316979829994752182888967999761941
+4893681718664157399988831419917865893379899824267999937689388942879969961988914852729672599794989919
+7312248188168819929919689984145998136999978866527958937869919995191889731964921422187913124158695483
+1995934118941529285329887951189939691994429296585739819181789891673771872761593319915593993359726869
+9178376188129495278157697583261964544798698662866449989548461168168994978883239965197992958259599417
+7663919381992298699792692185886119999619811741985984739951258951892913583767867857796887568417584593
+1297266781979951199991649899679929931554418138836998455744999971949192119966823664131889997645798969
+8232788388116981227918324519818347881696857569359958951859757893979496939319984967569346237349273857
+7238773794974819897958369992455877898617314138977999717721957364986479592853498471899729926854869798
+9878391892942689799673598628127189965914153991439798619189934269994189455718998379949117112176126989
+9973929724199999992691868979977851999589176846396911972898448289929187798994952812949496537671125959
+1999851559969582846994467995235249717871112937689273578288997999768999986918289729893872577599984999
+9639826949219419566648894893837467732548988641394718891963892129987789893997796988568119615849999292
+1789137499185696488578593116637776338811819819798897946799969999744936599977888992679598939814897239
+1898993919394812832691851739965989948599194617868799718436871959793778678152119469859885428989444875
+1928955817982693248957597176639577981934989444431377942375978689893966694969892673148697975965192967
+8939156599764959959624971858589817896299742515985991299629359293282898975995912994954899227188668259
+8347281993854997297951752467199916978618961316199881528383111998414679491485978958179782188115849599
+5153997217916411589639859739789296988862783439847938765879419419634265745421494282419788839588246771
+2498243979184715495742999998369689934798698692644248568728399838817475436568389586831934126588893791
+4269939791423799419849919851965159959197193319919446157531719199919647964852391954979787982752341889
+6888256495877821981959988897683657317979826991598259398399299894767999928935187864988998975719984713
+4516931875987991198444993999799912151866812927497985932581555999965919919896959219487969442855879795
+9117831286616618595952876951875959363319581619969847599913699789975737878813381279496799929179788952
+7155199582375177596239771834968736274537947828931257491992596349776938519629696192934989339917928959
+6154956939632968579969697178792319286739276642566898371421967928644337849993942923767955592861812737
+4953717561541462467713819911357819672328259763884449131189691872817494893258598965966394994368176862
+5798245473891383899999774482987686879993965686253893589656876299192799821792599679911948989319876219
+9663939886297395558994245189842687789786296421287286839148327197544259239498959126144988376992925925
+4854219729975244181379867291974957856869989846345783749989995133294615198981592844612926397559878688
+7392655881995888883398631561439948996957297196649154296958969899189769924689955593884962128277983469
+6697192855668444397469674996629985762592998746173742294384883989692259269891721199591851199192193737
+9994937637611891863444164899866981592248937698819756642199582891967599998156894879699913976933911189
diff --git a/src/adventofcode2021/solutions/day15.py b/src/adventofcode2021/solutions/day15.py
new file mode 100644
index 00000000..b5f1014e
--- /dev/null
+++ b/src/adventofcode2021/solutions/day15.py
@@ -0,0 +1,99 @@
+from __future__ import annotations
+
+from collections.abc import Iterator
+from typing import Generic
+
+from adventofcode2021.utils.abstract import FileReaderSolution
+from adventofcode2021.utils.node import Node, T
+from adventofcode2021.utils.priority_queue import PriorityQueue
+
+
+class Day15(Generic[T]):
+    cave: dict[tuple[int, int], int]
+    max_x: int
+    max_y: int
+
+    def fill_cave(self, input_data: list[str]):
+        self.cave = {}
+        for x, row in enumerate(input_data):
+            for y, value in enumerate(row):
+                self.cave[x, y] = int(value)
+        self.max_x = max(x for x, _ in self.cave)
+        self.max_y = max(y for _, y in self.cave)
+
+    def repr_cave(self) -> str:
+        lines = []
+        for x in range(0, self.max_x + 1):
+            lines.append(
+                "".join(str(self.cave[x, y]) for y in range(0, self.max_y + 1))
+            )
+        return "\n".join(lines)
+
+    def find_astar(self):
+        initial: T = (0, 0)
+        goal: T = (self.max_y, self.max_y)
+        path = self.astar(
+            initial=initial,
+            goal=goal,
+        )
+        return path
+
+    def astar(
+        self,
+        initial: T,
+        goal: T,
+    ) -> Node[T] | None:
+        # frontier is where we've yet to go
+        frontier: PriorityQueue[Node[T]] = PriorityQueue()
+        frontier.push(Node(initial, None, 0.0, self.cave[initial]))
+
+        # explored is where we've been
+        explored: dict[T, float] = {initial: 0.0}
+
+        # keep going while there is more to explore
+        while not frontier.empty:
+            current_node: Node[T] = frontier.pop()
+            current_state: T = current_node.state
+            # if we found the goal, we're done
+            if current_state == goal:
+                return current_node
+
+            # check where we can go next and haven't explored
+            for child in self._get_neighbours(*current_state):
+                new_cost: float = current_node.cost + self.cave[child]
+
+                if child not in explored or explored[child] > new_cost:
+                    explored[child] = new_cost
+                    frontier.push(Node(child, current_node, new_cost, self.cave[child]))
+        return None
+
+    def _get_neighbours(self, x, y) -> Iterator[tuple[int, int]]:
+        """Get a list of neighbours for this location."""
+        locations = [
+            (x + 1, y),
+            (x - 1, y),
+            (x, y + 1),
+            (x, y - 1),
+        ]
+        for new_x, new_y in locations:
+            if new_x < 0 or new_x > self.max_x:
+                continue
+            if new_y < 0 or new_y > self.max_y:
+                continue
+            yield new_x, new_y
+
+
+class Day15PartA(Day15, FileReaderSolution):
+    def solve(self, input_data: str) -> int:
+        self.fill_cave(input_data.splitlines())
+        path = self.find_astar()
+        locations = Node.node_to_path(path)
+        values = [self.cave[x, y] for x, y in locations]
+        # We skip the first location
+        total = sum(values[1:])
+        return total
+
+
+class Day15PartB(Day15, FileReaderSolution):
+    def solve(self, input_data: str) -> int:
+        raise NotImplementedError
diff --git a/src/adventofcode2021/utils/node.py b/src/adventofcode2021/utils/node.py
index 0eca98b8..d7a34102 100644
--- a/src/adventofcode2021/utils/node.py
+++ b/src/adventofcode2021/utils/node.py
@@ -24,9 +24,9 @@ def __lt__(self, other: Node) -> bool:
     def __repr__(self):
         if self.parent:
             parents = self.node_to_path(self)
-            return f"{repr(self.state)} ({parents})"
+            return f"{repr(self.state)} <{self.cost}/{self.heuristic}> ({parents})"
         else:
-            return repr(self.state)
+            return f"{repr(self.state)} <{self.cost}/{self.heuristic}>"
 
     @staticmethod
     def node_to_path(node: Node[T]) -> list[T]:
diff --git a/src/adventofcode2021/utils/priority_queue.py b/src/adventofcode2021/utils/priority_queue.py
new file mode 100644
index 00000000..3917a03d
--- /dev/null
+++ b/src/adventofcode2021/utils/priority_queue.py
@@ -0,0 +1,30 @@
+from __future__ import annotations
+
+from heapq import heappop, heappush
+from typing import Generic, TypeVar
+
+T = TypeVar("T")
+
+
+class PriorityQueue(Generic[T]):
+    def __init__(self) -> None:
+        self._container: list[T] = []
+
+    @property
+    def empty(self) -> bool:
+        # not is true for empty container
+        return not self._container
+
+    def push(self, item: T) -> None:
+        # in by priority
+        heappush(self._container, item)
+
+    def pop(self) -> T:
+        # out by priority
+        return heappop(self._container)
+
+    def __repr__(self) -> str:
+        return repr(self._container)
+
+    def __len__(self) -> int:
+        return len(self._container)
diff --git a/tests/solutions/test_day15_a.py b/tests/solutions/test_day15_a.py
new file mode 100644
index 00000000..35e9423a
--- /dev/null
+++ b/tests/solutions/test_day15_a.py
@@ -0,0 +1,30 @@
+import pytest
+
+from adventofcode2021.solutions.day15 import Day15PartA
+
+test_data = """\
+1163751742
+1381373672
+2136511328
+3694931569
+7463417111
+1319128137
+1359912421
+3125421639
+1293138521
+2311944581
+"""
+
+
+class TestDay15PartA:
+    @pytest.mark.parametrize(("input_data", "expected_result"), [(test_data, 40)])
+    def test_day15a_solve(self, input_data, expected_result):
+        solution = Day15PartA()
+        result = solution.solve(input_data)
+        assert result == expected_result
+
+    def test_day15a_data(self):
+        """Result we got when we did the real solution"""
+        solution = Day15PartA()
+        res = solution("day_15/day15.txt")
+        assert res == 702
diff --git a/tests/solutions/test_day15_b.py b/tests/solutions/test_day15_b.py
new file mode 100644
index 00000000..2f153005
--- /dev/null
+++ b/tests/solutions/test_day15_b.py
@@ -0,0 +1,19 @@
+import pytest
+
+from adventofcode2021.solutions.day15 import Day15PartB
+
+
+class TestDay15PartB:
+    @pytest.mark.xfail(reason="Not yet implemented", raises=NotImplementedError)
+    @pytest.mark.parametrize(("input_data", "expected_result"), [("", ""), ("", "")])
+    def test_day15b_solve(self, input_data, expected_result):
+        solution = Day15PartB()
+        result = solution.solve(input_data)
+        assert result == expected_result
+
+    @pytest.mark.xfail(reason="Not yet implemented", raises=NotImplementedError)
+    def test_day15b_data(self):
+        """Result we got when we did the real solution"""
+        solution = Day15PartB()
+        res = solution("day_15/day15.txt")
+        assert res == 0
diff --git a/tests/test_priority_queue.py b/tests/test_priority_queue.py
new file mode 100644
index 00000000..48cccd1e
--- /dev/null
+++ b/tests/test_priority_queue.py
@@ -0,0 +1,32 @@
+import pytest
+
+from adventofcode2021.utils.priority_queue import PriorityQueue
+
+
+def test_priorityqueue():
+    q = PriorityQueue()
+
+    assert q.empty
+    assert q.__repr__() == "[]"
+
+    # Let's add some stuff. The priority is not in order.
+    q.push((1, "a"))
+    q.push((3, "c"))
+    q.push((2, "b"))
+
+    assert not q.empty
+    assert len(q) == 3
+    # Repr is based on the insert order (?)
+    assert q.__repr__() == "[(1, 'a'), (3, 'c'), (2, 'b')]"
+
+    # Output is based on the priority
+    assert q.pop() == (1, "a")
+    assert q.pop() == (2, "b")
+    assert q.pop() == (3, "c")
+
+    # And empty again
+    assert q.empty
+    assert len(q) == 0
+
+    with pytest.raises(IndexError):
+        q.pop()

From 6ad17ab6a6d69a6517329fd7542a0d5ee2f0c9fb Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 18 Oct 2022 03:47:37 +0000
Subject: [PATCH 150/371] Bump pascalgn/automerge-action from 0.15.3 to 0.15.5

Bumps [pascalgn/automerge-action](https://github.com/pascalgn/automerge-action) from 0.15.3 to 0.15.5.
- [Release notes](https://github.com/pascalgn/automerge-action/releases)
- [Commits](https://github.com/pascalgn/automerge-action/compare/v0.15.3...v0.15.5)

---
updated-dependencies:
- dependency-name: pascalgn/automerge-action
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 .github/workflows/automerge.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/automerge.yml b/.github/workflows/automerge.yml
index c53ed1b9..93e350d3 100644
--- a/.github/workflows/automerge.yml
+++ b/.github/workflows/automerge.yml
@@ -22,7 +22,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: automerge
-        uses: "pascalgn/automerge-action@v0.15.3"
+        uses: "pascalgn/automerge-action@v0.15.5"
         env:
           GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN }}"
           MERGE_LABELS: automerge

From b2ca5b4a4b36174f974d7b1100ed8dcd84845b05 Mon Sep 17 00:00:00 2001
From: Roel Adriaans <roel.adriaans@asml.com>
Date: Tue, 18 Oct 2022 10:28:08 +0200
Subject: [PATCH 151/371] Make way for part 2

---
 src/adventofcode2021/solutions/day15.py | 54 ++++++++++++++++++++++---
 1 file changed, 48 insertions(+), 6 deletions(-)

diff --git a/src/adventofcode2021/solutions/day15.py b/src/adventofcode2021/solutions/day15.py
index b5f1014e..1a26e8f1 100644
--- a/src/adventofcode2021/solutions/day15.py
+++ b/src/adventofcode2021/solutions/day15.py
@@ -1,14 +1,15 @@
 from __future__ import annotations
 
+from abc import ABC, abstractmethod
 from collections.abc import Iterator
 from typing import Generic
-
+from functools import cache
 from adventofcode2021.utils.abstract import FileReaderSolution
 from adventofcode2021.utils.node import Node, T
 from adventofcode2021.utils.priority_queue import PriorityQueue
 
 
-class Day15(Generic[T]):
+class Day15(Generic[T], ABC):
     cave: dict[tuple[int, int], int]
     max_x: int
     max_y: int
@@ -18,8 +19,6 @@ def fill_cave(self, input_data: list[str]):
         for x, row in enumerate(input_data):
             for y, value in enumerate(row):
                 self.cave[x, y] = int(value)
-        self.max_x = max(x for x, _ in self.cave)
-        self.max_y = max(y for _, y in self.cave)
 
     def repr_cave(self) -> str:
         lines = []
@@ -29,6 +28,21 @@ def repr_cave(self) -> str:
             )
         return "\n".join(lines)
 
+    @property
+    @abstractmethod
+    def max_x(self) -> int:
+        raise NotImplementedError
+
+    @property
+    @abstractmethod
+    def max_y(self) -> int:
+        raise NotImplementedError
+
+    @abstractmethod
+    def get_value(self, x: int, y: int) -> int:
+        """Return the value at a location."""
+        raise NotImplementedError
+
     def find_astar(self):
         initial: T = (0, 0)
         goal: T = (self.max_y, self.max_y)
@@ -60,11 +74,13 @@ def astar(
 
             # check where we can go next and haven't explored
             for child in self._get_neighbours(*current_state):
-                new_cost: float = current_node.cost + self.cave[child]
+                child_value = self.get_value(*child)
+
+                new_cost: float = current_node.cost + child_value
 
                 if child not in explored or explored[child] > new_cost:
                     explored[child] = new_cost
-                    frontier.push(Node(child, current_node, new_cost, self.cave[child]))
+                    frontier.push(Node(child, current_node, new_cost, child_value))
         return None
 
     def _get_neighbours(self, x, y) -> Iterator[tuple[int, int]]:
@@ -84,6 +100,19 @@ def _get_neighbours(self, x, y) -> Iterator[tuple[int, int]]:
 
 
 class Day15PartA(Day15, FileReaderSolution):
+    def get_value(self, x: int, y: int) -> int:
+        return self.cave[x, y]
+
+    @property
+    @cache
+    def max_y(self) -> int:
+        return max(y for _, y in self.cave)
+
+    @property
+    @cache
+    def max_x(self) -> int:
+        return max(x for x, _ in self.cave)
+
     def solve(self, input_data: str) -> int:
         self.fill_cave(input_data.splitlines())
         path = self.find_astar()
@@ -95,5 +124,18 @@ def solve(self, input_data: str) -> int:
 
 
 class Day15PartB(Day15, FileReaderSolution):
+    def get_value(self, x: int, y: int) -> int:
+        return self.cave[x, y]
+
+    @property
+    @cache
+    def max_x(self) -> int:
+        return max(x for x, _ in self.cave) * 5
+
+    @property
+    @cache
+    def max_y(self) -> int:
+        return max(y for _, y in self.cave) * 5
+
     def solve(self, input_data: str) -> int:
         raise NotImplementedError

From c5468125d72556330e8dae73097372e80769f6e8 Mon Sep 17 00:00:00 2001
From: Roel Adriaans <roel.adriaans@asml.com>
Date: Tue, 18 Oct 2022 15:19:51 +0200
Subject: [PATCH 152/371] Implement day 15, part 2: With a virtual grid, not by
 computing everything

---
 src/adventofcode2021/solutions/day15.py | 80 +++++++++++++++----------
 tests/solutions/test_day15_b.py         | 27 +++++++--
 2 files changed, 73 insertions(+), 34 deletions(-)

diff --git a/src/adventofcode2021/solutions/day15.py b/src/adventofcode2021/solutions/day15.py
index 1a26e8f1..e66162b3 100644
--- a/src/adventofcode2021/solutions/day15.py
+++ b/src/adventofcode2021/solutions/day15.py
@@ -2,17 +2,17 @@
 
 from abc import ABC, abstractmethod
 from collections.abc import Iterator
-from typing import Generic
 from functools import cache
+
 from adventofcode2021.utils.abstract import FileReaderSolution
-from adventofcode2021.utils.node import Node, T
+from adventofcode2021.utils.node import Node
 from adventofcode2021.utils.priority_queue import PriorityQueue
 
+Point = tuple[int, int]
+
 
-class Day15(Generic[T], ABC):
-    cave: dict[tuple[int, int], int]
-    max_x: int
-    max_y: int
+class Day15(ABC):
+    cave: dict[Point, int]
 
     def fill_cave(self, input_data: list[str]):
         self.cave = {}
@@ -44,8 +44,8 @@ def get_value(self, x: int, y: int) -> int:
         raise NotImplementedError
 
     def find_astar(self):
-        initial: T = (0, 0)
-        goal: T = (self.max_y, self.max_y)
+        initial: Point = (0, 0)
+        goal: Point = (self.max_y, self.max_y)
         path = self.astar(
             initial=initial,
             goal=goal,
@@ -54,20 +54,20 @@ def find_astar(self):
 
     def astar(
         self,
-        initial: T,
-        goal: T,
-    ) -> Node[T] | None:
+        initial: Point,
+        goal: Point,
+    ) -> Node[Point] | None:
         # frontier is where we've yet to go
-        frontier: PriorityQueue[Node[T]] = PriorityQueue()
+        frontier: PriorityQueue[Node[Point]] = PriorityQueue()
         frontier.push(Node(initial, None, 0.0, self.cave[initial]))
 
         # explored is where we've been
-        explored: dict[T, float] = {initial: 0.0}
+        explored: dict[Point, float] = {initial: 0.0}
 
         # keep going while there is more to explore
         while not frontier.empty:
-            current_node: Node[T] = frontier.pop()
-            current_state: T = current_node.state
+            current_node: Node[Point] = frontier.pop()
+            current_state: Point = current_node.state
             # if we found the goal, we're done
             if current_state == goal:
                 return current_node
@@ -98,6 +98,15 @@ def _get_neighbours(self, x, y) -> Iterator[tuple[int, int]]:
                 continue
             yield new_x, new_y
 
+    def solve(self, input_data: str) -> int:
+        self.fill_cave(input_data.splitlines())
+        path = self.find_astar()
+        locations = Node.node_to_path(path)
+        values = [self.get_value(x, y) for x, y in locations]
+        # We skip the first location
+        total = sum(values[1:])
+        return total
+
 
 class Day15PartA(Day15, FileReaderSolution):
     def get_value(self, x: int, y: int) -> int:
@@ -113,29 +122,40 @@ def max_y(self) -> int:
     def max_x(self) -> int:
         return max(x for x, _ in self.cave)
 
-    def solve(self, input_data: str) -> int:
-        self.fill_cave(input_data.splitlines())
-        path = self.find_astar()
-        locations = Node.node_to_path(path)
-        values = [self.cave[x, y] for x, y in locations]
-        # We skip the first location
-        total = sum(values[1:])
-        return total
-
 
 class Day15PartB(Day15, FileReaderSolution):
     def get_value(self, x: int, y: int) -> int:
-        return self.cave[x, y]
+        multiplier = self.real_max_x + 1
+        mod_x = x % multiplier
+        mod_y = y % multiplier
+
+        delta_x = x // multiplier
+        delta_y = y // multiplier
+
+        old_value = self.cave[mod_x, mod_y]
+        quadrant = delta_x + delta_y
+        new_value = quadrant + old_value
+        # Wrap around when 10 or higher
+        if new_value >= 10:
+            new_value -= 9
+        return new_value
+
+    @property
+    @cache
+    def real_max_x(self) -> int:
+        return max(x for x, _ in self.cave)
+
+    @property
+    @cache
+    def real_max_y(self) -> int:
+        return max(y for _, y in self.cave)
 
     @property
     @cache
     def max_x(self) -> int:
-        return max(x for x, _ in self.cave) * 5
+        return (max(x for x, _ in self.cave) + 1) * 5 - 1
 
     @property
     @cache
     def max_y(self) -> int:
-        return max(y for _, y in self.cave) * 5
-
-    def solve(self, input_data: str) -> int:
-        raise NotImplementedError
+        return (max(y for _, y in self.cave) + 1) * 5 - 1
diff --git a/tests/solutions/test_day15_b.py b/tests/solutions/test_day15_b.py
index 2f153005..2a7d28c7 100644
--- a/tests/solutions/test_day15_b.py
+++ b/tests/solutions/test_day15_b.py
@@ -1,19 +1,38 @@
 import pytest
+from test_day15_a import test_data
 
 from adventofcode2021.solutions.day15 import Day15PartB
 
 
 class TestDay15PartB:
-    @pytest.mark.xfail(reason="Not yet implemented", raises=NotImplementedError)
-    @pytest.mark.parametrize(("input_data", "expected_result"), [("", ""), ("", "")])
+    @pytest.mark.parametrize(("input_data", "expected_result"), [(test_data, 315)])
     def test_day15b_solve(self, input_data, expected_result):
         solution = Day15PartB()
         result = solution.solve(input_data)
+
+        assert solution.get_value(10, 9) == 3
+        assert solution.get_value(10, 10) == 3
+
+        first_line = "".join(str(solution.get_value(0, n)) for n in range(50))
+        assert first_line == "11637517422274862853338597396444961841755517295286"
+
+        second_line = "".join(str(solution.get_value(1, n)) for n in range(50))
+        assert second_line == "13813736722492484783351359589446246169155735727126"
+
+        ten_line = "".join(str(solution.get_value(9, n)) for n in range(50))
+        assert ten_line == "23119445813422155692453326671356443778246755488935"
+
+        # First completely new line
+        eleven_line = "".join(str(solution.get_value(10, n)) for n in range(50))
+        assert eleven_line == "22748628533385973964449618417555172952866628316397"
+
+        assert solution.max_x == 49
+        assert solution.max_y == 49
+
         assert result == expected_result
 
-    @pytest.mark.xfail(reason="Not yet implemented", raises=NotImplementedError)
     def test_day15b_data(self):
         """Result we got when we did the real solution"""
         solution = Day15PartB()
         res = solution("day_15/day15.txt")
-        assert res == 0
+        assert res == 2955

From 71b4edeb48c7dbe5766ba9ec8fe404fc2590a603 Mon Sep 17 00:00:00 2001
From: Roel Adriaans <roel.adriaans@asml.com>
Date: Tue, 18 Oct 2022 16:02:23 +0200
Subject: [PATCH 153/371] Remove the heuristic flag, since that is not used or
 required. Simplify the calculation of the costs: path contains the cost to
 get here

---
 src/adventofcode2021/solutions/day15.py | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/src/adventofcode2021/solutions/day15.py b/src/adventofcode2021/solutions/day15.py
index e66162b3..2cc8a534 100644
--- a/src/adventofcode2021/solutions/day15.py
+++ b/src/adventofcode2021/solutions/day15.py
@@ -59,7 +59,9 @@ def astar(
     ) -> Node[Point] | None:
         # frontier is where we've yet to go
         frontier: PriorityQueue[Node[Point]] = PriorityQueue()
-        frontier.push(Node(initial, None, 0.0, self.cave[initial]))
+        # Create the first node. Setting the cost to 0, since we will not count
+        # this node in the path.
+        frontier.push(Node(initial, None, cost=0.0))
 
         # explored is where we've been
         explored: dict[Point, float] = {initial: 0.0}
@@ -80,7 +82,7 @@ def astar(
 
                 if child not in explored or explored[child] > new_cost:
                     explored[child] = new_cost
-                    frontier.push(Node(child, current_node, new_cost, child_value))
+                    frontier.push(Node(child, current_node, new_cost))
         return None
 
     def _get_neighbours(self, x, y) -> Iterator[tuple[int, int]]:
@@ -100,12 +102,9 @@ def _get_neighbours(self, x, y) -> Iterator[tuple[int, int]]:
 
     def solve(self, input_data: str) -> int:
         self.fill_cave(input_data.splitlines())
+        # The path should have the total cost from start to end
         path = self.find_astar()
-        locations = Node.node_to_path(path)
-        values = [self.get_value(x, y) for x, y in locations]
-        # We skip the first location
-        total = sum(values[1:])
-        return total
+        return int(path.cost)
 
 
 class Day15PartA(Day15, FileReaderSolution):

From 9064a7e4e1450511c1731dc9cce036be9ed68da7 Mon Sep 17 00:00:00 2001
From: Roel Adriaans <roel@adriaans.org>
Date: Wed, 19 Oct 2022 21:29:55 +0200
Subject: [PATCH 154/371] Parse header of packet

---
 .../solutions/data/day_16/day16.txt           |  1 +
 src/adventofcode2021/solutions/day16.py       | 68 +++++++++++++++++++
 tests/solutions/test_day16_a.py               | 26 +++++++
 tests/solutions/test_day16_b.py               | 19 ++++++
 4 files changed, 114 insertions(+)
 create mode 100644 src/adventofcode2021/solutions/data/day_16/day16.txt
 create mode 100644 src/adventofcode2021/solutions/day16.py
 create mode 100644 tests/solutions/test_day16_a.py
 create mode 100644 tests/solutions/test_day16_b.py

diff --git a/src/adventofcode2021/solutions/data/day_16/day16.txt b/src/adventofcode2021/solutions/data/day_16/day16.txt
new file mode 100644
index 00000000..4eb72284
--- /dev/null
+++ b/src/adventofcode2021/solutions/data/day_16/day16.txt
@@ -0,0 +1 @@
+005532447836402684AC7AB3801A800021F0961146B1007A1147C89440294D005C12D2A7BC992D3F4E50C72CDF29EECFD0ACD5CC016962099194002CE31C5D3005F401296CAF4B656A46B2DE5588015C913D8653A3A001B9C3C93D7AC672F4FF78C136532E6E0007FCDFA975A3004B002E69EC4FD2D32CDF3FFDDAF01C91FCA7B41700263818025A00B48DEF3DFB89D26C3281A200F4C5AF57582527BC1890042DE00B4B324DBA4FAFCE473EF7CC0802B59DA28580212B3BD99A78C8004EC300761DC128EE40086C4F8E50F0C01882D0FE29900A01C01C2C96F38FCBB3E18C96F38FCBB3E1BCC57E2AA0154EDEC45096712A64A2520C6401A9E80213D98562653D98562612A06C0143CB03C529B5D9FD87CBA64F88CA439EC5BB299718023800D3CE7A935F9EA884F5EFAE9E10079125AF39E80212330F93EC7DAD7A9D5C4002A24A806A0062019B6600730173640575A0147C60070011FCA005000F7080385800CBEE006800A30C023520077A401840004BAC00D7A001FB31AAD10CC016923DA00686769E019DA780D0022394854167C2A56FB75200D33801F696D5B922F98B68B64E02460054CAE900949401BB80021D0562344E00042A16C6B8253000600B78020200E44386B068401E8391661C4E14B804D3B6B27CFE98E73BCF55B65762C402768803F09620419100661EC2A8CE0008741A83917CC024970D9E718DD341640259D80200008444D8F713C401D88310E2EC9F20F3330E059009118019A8803F12A0FC6E1006E3744183D27312200D4AC01693F5A131C93F5A131C970D6008867379CD3221289B13D402492EE377917CACEDB3695AD61C939C7C10082597E3740E857396499EA31980293F4FD206B40123CEE27CFB64D5E57B9ACC7F993D9495444001C998E66B50896B0B90050D34DF3295289128E73070E00A4E7A389224323005E801049351952694C000
diff --git a/src/adventofcode2021/solutions/day16.py b/src/adventofcode2021/solutions/day16.py
new file mode 100644
index 00000000..cd5a4106
--- /dev/null
+++ b/src/adventofcode2021/solutions/day16.py
@@ -0,0 +1,68 @@
+from __future__ import annotations
+
+from adventofcode2021.utils.abstract import FileReaderSolution
+
+
+class Packet:
+    version: int
+    type_id: int
+
+    number: int | None
+
+    packet_data: int
+
+    def __init__(self, packet_data: str):
+        # Parse the hex and store it as an integer for easier management
+        self.packet_data = int(packet_data, 16)
+        # Store the original packet data for later reference
+        self._original_packet_data = packet_data
+
+        self._parse_data()
+
+    def _get_normalized_bit(self, bit_index):
+        """Get a bit from packet_data"""
+        return (self.packet_data >> bit_index) & 1
+
+    def _set_bit(self, bit_index: int):
+        """set bit n from packet_data"""
+        self.packet_data |= 1 << bit_index
+
+    def _clear_bit(self, bit_index: int):
+        """Clear bit n from packet_data"""
+        self.packet_data &= ~(1 << bit_index)
+
+    def _toggle_bit(self, bit_index):
+        self.packet_data ^= 1 << bit_index
+
+    def _take_bits(self, num_bits=None) -> int:
+        """Take n bits from the packet_data, return the value as int.
+        Consumes the packet data
+        """
+        # First, compute the result. Move the bit-string the number of bits - num_bits
+        # to the right
+        value = self.packet_data
+        res = value >> int.bit_length(value) - num_bits
+
+        # And remove the num_bits from the bit_string
+        for n in list(range(int.bit_length(value), int.bit_length(value) - 3, -1)):
+            self._clear_bit(n)
+
+        return res
+
+    def _parse_data(self):
+        self.version = self._take_bits(3)
+        self.type_id = self._take_bits(3)
+
+
+class Day16:
+    pass
+
+
+class Day16PartA(Day16, FileReaderSolution):
+    def solve(self, input_data: str) -> int:
+        raise NotImplementedError
+
+
+class Day16PartB(Day16, FileReaderSolution):
+    def solve(self, input_data: str) -> int:
+        raise NotImplementedError
diff --git a/tests/solutions/test_day16_a.py b/tests/solutions/test_day16_a.py
new file mode 100644
index 00000000..5d229519
--- /dev/null
+++ b/tests/solutions/test_day16_a.py
@@ -0,0 +1,26 @@
+import pytest
+
+from adventofcode2021.solutions.day16 import Day16PartA, Packet
+
+
+class TestDay16PartA:
+    def test_packet_parsing(self):
+        test_data = "D2FE28"
+        packet = Packet(test_data)
+        assert packet.version == 6
+        assert packet.type_id == 4
+        assert packet.number == 2021
+
+    @pytest.mark.xfail(reason="Not yet implemented", raises=NotImplementedError)
+    @pytest.mark.parametrize(("input_data", "expected_result"), [("", ""), ("", "")])
+    def test_day16a_solve(self, input_data, expected_result):
+        solution = Day16PartA()
+        result = solution.solve(input_data)
+        assert result == expected_result
+
+    @pytest.mark.xfail(reason="Not yet implemented", raises=NotImplementedError)
+    def test_day16a_data(self):
+        """Result we got when we did the real solution"""
+        solution = Day16PartA()
+        res = solution("day_16/day16.txt")
+        assert res == 0
diff --git a/tests/solutions/test_day16_b.py b/tests/solutions/test_day16_b.py
new file mode 100644
index 00000000..b968611b
--- /dev/null
+++ b/tests/solutions/test_day16_b.py
@@ -0,0 +1,19 @@
+import pytest
+
+from adventofcode2021.solutions.day16 import Day16PartB
+
+
+class TestDay16PartB:
+    @pytest.mark.xfail(reason="Not yet implemented", raises=NotImplementedError)
+    @pytest.mark.parametrize(("input_data", "expected_result"), [("", ""), ("", "")])
+    def test_day16b_solve(self, input_data, expected_result):
+        solution = Day16PartB()
+        result = solution.solve(input_data)
+        assert result == expected_result
+
+    @pytest.mark.xfail(reason="Not yet implemented", raises=NotImplementedError)
+    def test_day16b_data(self):
+        """Result we got when we did the real solution"""
+        solution = Day16PartB()
+        res = solution("day_16/day16.txt")
+        assert res == 0

From 8708ab9efea9443cf51f53e747eccbc4f0ab4330 Mon Sep 17 00:00:00 2001
From: Roel Adriaans <roel@adriaans.org>
Date: Thu, 20 Oct 2022 18:05:23 +0200
Subject: [PATCH 155/371] [WIP] Add some stuff for moving to other c

---
 src/adventofcode2021/solutions/day16.py | 117 ++++++++++++++++++------
 tests/solutions/test_day16_a.py         |  11 ++-
 2 files changed, 97 insertions(+), 31 deletions(-)

diff --git a/src/adventofcode2021/solutions/day16.py b/src/adventofcode2021/solutions/day16.py
index cd5a4106..0698a245 100644
--- a/src/adventofcode2021/solutions/day16.py
+++ b/src/adventofcode2021/solutions/day16.py
@@ -1,58 +1,115 @@
 from __future__ import annotations
 
+import logging
+from collections import deque
+from enum import IntEnum
+
 from adventofcode2021.utils.abstract import FileReaderSolution
 
 
+class TypeID(IntEnum):
+    """Define the different type of packages"""
+
+    LITERAL_VALUE = 4
+    OPERATOR = 6
+
+
 class Packet:
     version: int
     type_id: int
 
-    number: int | None
+    # Literal value packets
+    value: int | None
 
-    packet_data: int
+    # Operator packets
+    length_type_id: int | None
+    sub_packets: list[Packet]
 
-    def __init__(self, packet_data: str):
-        # Parse the hex and store it as an integer for easier management
-        self.packet_data = int(packet_data, 16)
-        # Store the original packet data for later reference
-        self._original_packet_data = packet_data
+    packet_str: deque[str]
+    _original_packet_data: str | deque
 
-        self._parse_data()
+    def from_hex(self, packet_data: str):
+        # Create the packet as a string, and fill on the left based on 4 bits chunks
+        packet_length = len(f"{packet_data:b}")
 
-    def _get_normalized_bit(self, bit_index):
-        """Get a bit from packet_data"""
-        return (self.packet_data >> bit_index) & 1
+        zfill_value = packet_length + (packet_length % 4)
+        self.packet_str = deque(f"{int(packet_data, 16):b}".zfill(zfill_value))
 
-    def _set_bit(self, bit_index: int):
-        """set bit n from packet_data"""
-        self.packet_data |= 1 << bit_index
+        # Store the original packet data for later reference
+        self._original_packet_data = packet_data
 
-    def _clear_bit(self, bit_index: int):
-        """Clear bit n from packet_data"""
-        self.packet_data &= ~(1 << bit_index)
+        self._parse_data()
 
-    def _toggle_bit(self, bit_index):
-        self.packet_data ^= 1 << bit_index
+    def from_deque(self, packet_data: deque):
+        self.packet_str = packet_data
+        self._original_packet_data = packet_data
+        self._parse_data()
 
-    def _take_bits(self, num_bits=None) -> int:
-        """Take n bits from the packet_data, return the value as int.
+    def _take_bits(self, num_bits: int = None) -> int:
+        """Take n bits from the packet_str, return the value as int.
         Consumes the packet data
         """
-        # First, compute the result. Move the bit-string the number of bits - num_bits
-        # to the right
-        value = self.packet_data
-        res = value >> int.bit_length(value) - num_bits
-
-        # And remove the num_bits from the bit_string
-        for n in list(range(int.bit_length(value), int.bit_length(value) - 3, -1)):
-            self._clear_bit(n)
+        # Pop num_bits from the string on the left
+        res = [self.packet_str.popleft() for _ in range(num_bits)]
+        # Convert to integer, from binary base 2
+        return int("".join(res), 2)
 
-        return res
+    def _peek_bits(self, num_bits: int) -> int:
+        """Look at the first num_bits bits"""
+        value = [self.packet_str[n] for n in range(num_bits)]
+        return int("".join(value), 2)
 
     def _parse_data(self):
         self.version = self._take_bits(3)
         self.type_id = self._take_bits(3)
 
+        # Parse the different types
+        match self.type_id:
+            case TypeID.LITERAL_VALUE.value:
+                logging.debug("Found literal value in packet")
+                self._parse_literal_value()
+            case _:
+                logging.debug("Found operator in packet")
+                self._parse_operator()
+
+    def _parse_literal_value(self):
+        """Parse literal value"""
+        next_bit: int = 1
+        value: int = 0
+        while next_bit == 1:
+            next_bit: int = self._take_bits(1)
+            group_bits = self._take_bits(4)
+            value = (value << 4) | group_bits
+
+        self.value = value
+        return
+
+    def _parse_operator(self):
+        self.sub_packets = list()
+
+        self.length_type_id = self._take_bits(1)
+
+        if self.length_type_id == 0:
+            # the next 15 bits are a number that represents the total length in bits
+            # of the sub-packets contained by this packet.
+            length_subpacket = self._take_bits(15)
+            subpackets = self._take_bits(length_subpacket)
+
+            while subpackets:
+                # Convert subpacket into hex
+
+                new_packet = Packet().from_deque(subpackets)
+                self.sub_packets.append(new_packet)
+                # If there is any data left, process it now
+                subpackets = int("".join(new_packet.packet_str), 2)
+            return
+
+        elif self.length_type_id == 1:
+            # The next 11 bits are a number that represents the number of
+            # sub-packets immediately contained by this packet.
+            subpackets = self._take_bits(11)
+            ...
+
 
 class Day16:
     pass
diff --git a/tests/solutions/test_day16_a.py b/tests/solutions/test_day16_a.py
index 5d229519..f716977b 100644
--- a/tests/solutions/test_day16_a.py
+++ b/tests/solutions/test_day16_a.py
@@ -9,7 +9,16 @@ def test_packet_parsing(self):
         packet = Packet(test_data)
         assert packet.version == 6
         assert packet.type_id == 4
-        assert packet.number == 2021
+        assert packet.value == 2021
+
+        # We still have 3 unused bits over
+        assert len(packet.packet_str) == 3
+
+    def test_packet_operator(self):
+        test_data = "38006F45291200"
+        packet = Packet(test_data)
+        assert packet.version == 1
+        assert packet.type_id == 6
 
     @pytest.mark.xfail(reason="Not yet implemented", raises=NotImplementedError)
     @pytest.mark.parametrize(("input_data", "expected_result"), [("", ""), ("", "")])

From 6813190e81b61b1daa5d406a4a8088e0d751e39a Mon Sep 17 00:00:00 2001
From: Roel Adriaans <roel@adriaans.org>
Date: Thu, 20 Oct 2022 18:09:56 +0200
Subject: [PATCH 156/371] Update dependencies

---
 poetry.lock | 392 ++++++++--------------------------------------------
 1 file changed, 57 insertions(+), 335 deletions(-)

diff --git a/poetry.lock b/poetry.lock
index 1bb5aa68..685618ac 100644
--- a/poetry.lock
+++ b/poetry.lock
@@ -33,10 +33,10 @@ optional = false
 python-versions = ">=3.5"
 
 [package.extras]
-dev = ["cloudpickle", "coverage[toml] (>=5.0.2)", "furo", "hypothesis", "mypy (>=0.900,!=0.940)", "pre-commit", "pympler", "pytest (>=4.3.0)", "pytest-mypy-plugins", "sphinx", "sphinx-notfound-page", "zope.interface"]
-docs = ["furo", "sphinx", "sphinx-notfound-page", "zope.interface"]
-tests = ["cloudpickle", "coverage[toml] (>=5.0.2)", "hypothesis", "mypy (>=0.900,!=0.940)", "pympler", "pytest (>=4.3.0)", "pytest-mypy-plugins", "zope.interface"]
-tests_no_zope = ["cloudpickle", "coverage[toml] (>=5.0.2)", "hypothesis", "mypy (>=0.900,!=0.940)", "pympler", "pytest (>=4.3.0)", "pytest-mypy-plugins"]
+dev = ["coverage[toml] (>=5.0.2)", "hypothesis", "pympler", "pytest (>=4.3.0)", "mypy (>=0.900,!=0.940)", "pytest-mypy-plugins", "zope.interface", "furo", "sphinx", "sphinx-notfound-page", "pre-commit", "cloudpickle"]
+docs = ["furo", "sphinx", "zope.interface", "sphinx-notfound-page"]
+tests = ["coverage[toml] (>=5.0.2)", "hypothesis", "pympler", "pytest (>=4.3.0)", "mypy (>=0.900,!=0.940)", "pytest-mypy-plugins", "zope.interface", "cloudpickle"]
+tests_no_zope = ["coverage[toml] (>=5.0.2)", "hypothesis", "pympler", "pytest (>=4.3.0)", "mypy (>=0.900,!=0.940)", "pytest-mypy-plugins", "cloudpickle"]
 
 [[package]]
 name = "beautifulsoup4"
@@ -237,13 +237,13 @@ optional = false
 python-versions = ">=3.6.1,<4.0"
 
 [package.extras]
-colors = ["colorama (>=0.4.3,<0.5.0)"]
 pipfile_deprecated_finder = ["pipreqs", "requirementslib"]
+requirements_deprecated_finder = ["pipreqs", "pip-api"]
+colors = ["colorama (>=0.4.3,<0.5.0)"]
 plugins = ["setuptools"]
-requirements_deprecated_finder = ["pip-api", "pipreqs"]
 
 [[package]]
-name = "Jinja2"
+name = "jinja2"
 version = "3.1.2"
 description = "A very fast and expressive template engine."
 category = "dev"
@@ -269,7 +269,7 @@ arrow = "*"
 jinja2 = "*"
 
 [[package]]
-name = "MarkupSafe"
+name = "markupsafe"
 version = "2.1.1"
 description = "Safely add untrusted strings to HTML/XML markup."
 category = "dev"
@@ -292,9 +292,6 @@ category = "dev"
 optional = false
 python-versions = ">=2.7,!=3.0.*,!=3.1.*,!=3.2.*,!=3.3.*,!=3.4.*,!=3.5.*,!=3.6.*"
 
-[package.dependencies]
-setuptools = "*"
-
 [[package]]
 name = "packaging"
 version = "21.3"
@@ -323,8 +320,8 @@ optional = false
 python-versions = ">=3.7"
 
 [package.extras]
-docs = ["furo (>=2021.7.5b38)", "proselint (>=0.10.2)", "sphinx (>=4)", "sphinx-autodoc-typehints (>=1.12)"]
-test = ["appdirs (==1.4.4)", "pytest (>=6)", "pytest-cov (>=2.7)", "pytest-mock (>=3.6)"]
+docs = ["furo (>=2021.7.5b38)", "proselint (>=0.10.2)", "sphinx-autodoc-typehints (>=1.12)", "sphinx (>=4)"]
+test = ["appdirs (==1.4.4)", "pytest-cov (>=2.7)", "pytest-mock (>=3.6)", "pytest (>=6)"]
 
 [[package]]
 name = "pluggy"
@@ -371,7 +368,7 @@ optional = false
 python-versions = ">=3.6.8"
 
 [package.extras]
-diagrams = ["jinja2", "railroad-diagrams"]
+diagrams = ["railroad-diagrams", "jinja2"]
 
 [[package]]
 name = "pytest"
@@ -406,7 +403,7 @@ coverage = {version = ">=5.2.1", extras = ["toml"]}
 pytest = ">=4.6"
 
 [package.extras]
-testing = ["fields", "hunter", "process-tests", "pytest-xdist", "six", "virtualenv"]
+testing = ["fields", "hunter", "process-tests", "six", "pytest-xdist", "virtualenv"]
 
 [[package]]
 name = "pytest-forked"
@@ -475,7 +472,7 @@ text-unidecode = ">=1.3"
 unidecode = ["Unidecode (>=1.1.1)"]
 
 [[package]]
-name = "PyYAML"
+name = "pyyaml"
 version = "6.0"
 description = "YAML parser and emitter for Python"
 category = "dev"
@@ -500,19 +497,6 @@ urllib3 = ">=1.21.1,<1.27"
 socks = ["PySocks (>=1.5.6,!=1.5.7)"]
 use_chardet_on_py3 = ["chardet (>=3.0.2,<6)"]
 
-[[package]]
-name = "setuptools"
-version = "65.4.1"
-description = "Easily download, build, install, upgrade, and uninstall Python packages"
-category = "dev"
-optional = false
-python-versions = ">=3.7"
-
-[package.extras]
-docs = ["furo", "jaraco.packaging (>=9)", "jaraco.tidelift (>=1.4)", "pygments-github-lexers (==0.0.5)", "rst.linker (>=1.9)", "sphinx (>=3.5)", "sphinx-favicon", "sphinx-hoverxref (<2)", "sphinx-inline-tabs", "sphinx-notfound-page (==0.8.3)", "sphinx-reredirects", "sphinxcontrib-towncrier"]
-testing = ["build[virtualenv]", "filelock (>=3.4.0)", "flake8 (<5)", "flake8-2020", "ini2toml[lite] (>=0.9)", "jaraco.envs (>=2.2)", "jaraco.path (>=3.2.0)", "mock", "pip (>=19.1)", "pip-run (>=8.8)", "pytest (>=6)", "pytest-black (>=0.3.7)", "pytest-checkdocs (>=2.4)", "pytest-cov", "pytest-enabler (>=1.3)", "pytest-flake8", "pytest-mypy (>=0.9.1)", "pytest-perf", "pytest-xdist", "tomli-w (>=1.0.0)", "virtualenv (>=13.0.0)", "wheel"]
-testing-integration = ["build[virtualenv]", "filelock (>=3.4.0)", "jaraco.envs (>=2.2)", "jaraco.path (>=3.2.0)", "pytest", "pytest-enabler", "pytest-xdist", "tomli", "virtualenv (>=13.0.0)", "wheel"]
-
 [[package]]
 name = "six"
 version = "1.16.0"
@@ -573,7 +557,7 @@ virtualenv = ">=16.0.0,<20.0.0 || >20.0.0,<20.0.1 || >20.0.1,<20.0.2 || >20.0.2,
 
 [package.extras]
 docs = ["pygments-github-lexers (>=0.0.5)", "sphinx (>=2.0.0)", "sphinxcontrib-autoprogram (>=0.1.5)", "towncrier (>=18.5.0)"]
-testing = ["flaky (>=3.4.0)", "freezegun (>=0.3.11)", "pathlib2 (>=2.3.3)", "psutil (>=5.6.1)", "pytest (>=4.0.0)", "pytest-cov (>=2.5.1)", "pytest-mock (>=1.10.0)", "pytest-randomly (>=1.0.0)"]
+testing = ["flaky (>=3.4.0)", "freezegun (>=0.3.11)", "pytest (>=4.0.0)", "pytest-cov (>=2.5.1)", "pytest-mock (>=1.10.0)", "pytest-randomly (>=1.0.0)", "psutil (>=5.6.1)", "pathlib2 (>=2.3.3)"]
 
 [[package]]
 name = "tqdm"
@@ -601,8 +585,8 @@ optional = false
 python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*, !=3.5.*, <4"
 
 [package.extras]
-brotli = ["brotli (>=1.0.9)", "brotlicffi (>=0.8.0)", "brotlipy (>=0.6.0)"]
-secure = ["certifi", "cryptography (>=1.3.4)", "idna (>=2.0.0)", "ipaddress", "pyOpenSSL (>=0.14)", "urllib3-secure-extra"]
+brotli = ["brotlicffi (>=0.8.0)", "brotli (>=1.0.9)", "brotlipy (>=0.6.0)"]
+secure = ["pyOpenSSL (>=0.14)", "cryptography (>=1.3.4)", "idna (>=2.0.0)", "certifi", "urllib3-secure-extra", "ipaddress"]
 socks = ["PySocks (>=1.5.6,!=1.5.7,<2.0)"]
 
 [[package]]
@@ -632,320 +616,70 @@ anytree = [
     {file = "anytree-2.8.0-py2.py3-none-any.whl", hash = "sha256:14c55ac77492b11532395049a03b773d14c7e30b22aa012e337b1e983de31521"},
     {file = "anytree-2.8.0.tar.gz", hash = "sha256:3f0f93f355a91bc3e6245319bf4c1d50e3416cc7a35cc1133c1ff38306bbccab"},
 ]
-arrow = [
-    {file = "arrow-1.2.3-py3-none-any.whl", hash = "sha256:5a49ab92e3b7b71d96cd6bfcc4df14efefc9dfa96ea19045815914a6ab6b1fe2"},
-    {file = "arrow-1.2.3.tar.gz", hash = "sha256:3934b30ca1b9f292376d9db15b19446088d12ec58629bc3f0da28fd55fb633a1"},
-]
-attrs = [
-    {file = "attrs-22.1.0-py2.py3-none-any.whl", hash = "sha256:86efa402f67bf2df34f51a335487cf46b1ec130d02b8d39fd248abfd30da551c"},
-    {file = "attrs-22.1.0.tar.gz", hash = "sha256:29adc2665447e5191d0e7c568fde78b21f9672d344281d0c6e1ab085429b22b6"},
-]
-beautifulsoup4 = [
-    {file = "beautifulsoup4-4.11.1-py3-none-any.whl", hash = "sha256:58d5c3d29f5a36ffeb94f02f0d786cd53014cf9b3b3951d42e0080d8a9498d30"},
-    {file = "beautifulsoup4-4.11.1.tar.gz", hash = "sha256:ad9aa55b65ef2808eb405f46cf74df7fcb7044d5cbc26487f96eb2ef2e436693"},
-]
-binaryornot = [
-    {file = "binaryornot-0.4.4-py2.py3-none-any.whl", hash = "sha256:b8b71173c917bddcd2c16070412e369c3ed7f0528926f70cac18a6c97fd563e4"},
-    {file = "binaryornot-0.4.4.tar.gz", hash = "sha256:359501dfc9d40632edc9fac890e19542db1a287bbcfa58175b66658392018061"},
-]
-black = [
-    {file = "black-22.10.0-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:14ff67aec0a47c424bc99b71005202045dc09270da44a27848d534600ac64fc7"},
-    {file = "black-22.10.0-cp310-cp310-win_amd64.whl", hash = "sha256:819dc789f4498ecc91438a7de64427c73b45035e2e3680c92e18795a839ebb66"},
-    {file = "black-22.10.0-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:b8b49776299fece66bffaafe357d929ca9451450f5466e997a7285ab0fe28e3b"},
-    {file = "black-22.10.0-cp311-cp311-win_amd64.whl", hash = "sha256:21199526696b8f09c3997e2b4db8d0b108d801a348414264d2eb8eb2532e540d"},
-    {file = "black-22.10.0-cp37-cp37m-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:1e464456d24e23d11fced2bc8c47ef66d471f845c7b7a42f3bd77bf3d1789650"},
-    {file = "black-22.10.0-cp37-cp37m-win_amd64.whl", hash = "sha256:9311e99228ae10023300ecac05be5a296f60d2fd10fff31cf5c1fa4ca4b1988d"},
-    {file = "black-22.10.0-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:915ace4ff03fdfff953962fa672d44be269deb2eaf88499a0f8805221bc68c87"},
-    {file = "black-22.10.0-cp38-cp38-win_amd64.whl", hash = "sha256:444ebfb4e441254e87bad00c661fe32df9969b2bf224373a448d8aca2132b395"},
-    {file = "black-22.10.0-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:72ef3925f30e12a184889aac03d77d031056860ccae8a1e519f6cbb742736383"},
-    {file = "black-22.10.0-cp39-cp39-win_amd64.whl", hash = "sha256:432247333090c8c5366e69627ccb363bc58514ae3e63f7fc75c54b1ea80fa7de"},
-    {file = "black-22.10.0-py3-none-any.whl", hash = "sha256:c957b2b4ea88587b46cf49d1dc17681c1e672864fd7af32fc1e9664d572b3458"},
-    {file = "black-22.10.0.tar.gz", hash = "sha256:f513588da599943e0cde4e32cc9879e825d58720d6557062d1098c5ad80080e1"},
-]
-certifi = [
-    {file = "certifi-2022.9.24-py3-none-any.whl", hash = "sha256:90c1a32f1d68f940488354e36370f6cca89f0f106db09518524c88d6ed83f382"},
-    {file = "certifi-2022.9.24.tar.gz", hash = "sha256:0d9c601124e5a6ba9712dbc60d9c53c21e34f5f641fe83002317394311bdce14"},
-]
-cfgv = [
-    {file = "cfgv-3.3.1-py2.py3-none-any.whl", hash = "sha256:c6a0883f3917a037485059700b9e75da2464e6c27051014ad85ba6aaa5884426"},
-    {file = "cfgv-3.3.1.tar.gz", hash = "sha256:f5a830efb9ce7a445376bb66ec94c638a9787422f96264c98edc6bdeed8ab736"},
-]
-chardet = [
-    {file = "chardet-5.0.0-py3-none-any.whl", hash = "sha256:d3e64f022d254183001eccc5db4040520c0f23b1a3f33d6413e099eb7f126557"},
-    {file = "chardet-5.0.0.tar.gz", hash = "sha256:0368df2bfd78b5fc20572bb4e9bb7fb53e2c094f60ae9993339e8671d0afb8aa"},
-]
-charset-normalizer = [
-    {file = "charset-normalizer-2.1.1.tar.gz", hash = "sha256:5a3d016c7c547f69d6f81fb0db9449ce888b418b5b9952cc5e6e66843e9dd845"},
-    {file = "charset_normalizer-2.1.1-py3-none-any.whl", hash = "sha256:83e9a75d1911279afd89352c68b45348559d1fc0506b054b346651b5e7fee29f"},
-]
-click = [
-    {file = "click-8.1.3-py3-none-any.whl", hash = "sha256:bb4d8133cb15a609f44e8213d9b391b0809795062913b383c62be0ee95b1db48"},
-    {file = "click-8.1.3.tar.gz", hash = "sha256:7682dc8afb30297001674575ea00d1814d808d6a36af415a82bd481d37ba7b8e"},
-]
-colorama = [
-    {file = "colorama-0.4.5-py2.py3-none-any.whl", hash = "sha256:854bf444933e37f5824ae7bfc1e98d5bce2ebe4160d46b5edf346a89358e99da"},
-    {file = "colorama-0.4.5.tar.gz", hash = "sha256:e6c6b4334fc50988a639d9b98aa429a0b57da6e17b9a44f0451f930b6967b7a4"},
-]
-cookiecutter = [
-    {file = "cookiecutter-2.1.1-py2.py3-none-any.whl", hash = "sha256:9f3ab027cec4f70916e28f03470bdb41e637a3ad354b4d65c765d93aad160022"},
-    {file = "cookiecutter-2.1.1.tar.gz", hash = "sha256:f3982be8d9c53dac1261864013fdec7f83afd2e42ede6f6dd069c5e149c540d5"},
-]
-coverage = [
-    {file = "coverage-6.5.0-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:ef8674b0ee8cc11e2d574e3e2998aea5df5ab242e012286824ea3c6970580e53"},
-    {file = "coverage-6.5.0-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:784f53ebc9f3fd0e2a3f6a78b2be1bd1f5575d7863e10c6e12504f240fd06660"},
-    {file = "coverage-6.5.0-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:b4a5be1748d538a710f87542f22c2cad22f80545a847ad91ce45e77417293eb4"},
-    {file = "coverage-6.5.0-cp310-cp310-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:83516205e254a0cb77d2d7bb3632ee019d93d9f4005de31dca0a8c3667d5bc04"},
-    {file = "coverage-6.5.0-cp310-cp310-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:af4fffaffc4067232253715065e30c5a7ec6faac36f8fc8d6f64263b15f74db0"},
-    {file = "coverage-6.5.0-cp310-cp310-musllinux_1_1_aarch64.whl", hash = "sha256:97117225cdd992a9c2a5515db1f66b59db634f59d0679ca1fa3fe8da32749cae"},
-    {file = "coverage-6.5.0-cp310-cp310-musllinux_1_1_i686.whl", hash = "sha256:a1170fa54185845505fbfa672f1c1ab175446c887cce8212c44149581cf2d466"},
-    {file = "coverage-6.5.0-cp310-cp310-musllinux_1_1_x86_64.whl", hash = "sha256:11b990d520ea75e7ee8dcab5bc908072aaada194a794db9f6d7d5cfd19661e5a"},
-    {file = "coverage-6.5.0-cp310-cp310-win32.whl", hash = "sha256:5dbec3b9095749390c09ab7c89d314727f18800060d8d24e87f01fb9cfb40b32"},
-    {file = "coverage-6.5.0-cp310-cp310-win_amd64.whl", hash = "sha256:59f53f1dc5b656cafb1badd0feb428c1e7bc19b867479ff72f7a9dd9b479f10e"},
-    {file = "coverage-6.5.0-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:4a5375e28c5191ac38cca59b38edd33ef4cc914732c916f2929029b4bfb50795"},
-    {file = "coverage-6.5.0-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:c4ed2820d919351f4167e52425e096af41bfabacb1857186c1ea32ff9983ed75"},
-    {file = "coverage-6.5.0-cp311-cp311-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:33a7da4376d5977fbf0a8ed91c4dffaaa8dbf0ddbf4c8eea500a2486d8bc4d7b"},
-    {file = "coverage-6.5.0-cp311-cp311-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:a8fb6cf131ac4070c9c5a3e21de0f7dc5a0fbe8bc77c9456ced896c12fcdad91"},
-    {file = "coverage-6.5.0-cp311-cp311-musllinux_1_1_aarch64.whl", hash = "sha256:a6b7d95969b8845250586f269e81e5dfdd8ff828ddeb8567a4a2eaa7313460c4"},
-    {file = "coverage-6.5.0-cp311-cp311-musllinux_1_1_i686.whl", hash = "sha256:1ef221513e6f68b69ee9e159506d583d31aa3567e0ae84eaad9d6ec1107dddaa"},
-    {file = "coverage-6.5.0-cp311-cp311-musllinux_1_1_x86_64.whl", hash = "sha256:cca4435eebea7962a52bdb216dec27215d0df64cf27fc1dd538415f5d2b9da6b"},
-    {file = "coverage-6.5.0-cp311-cp311-win32.whl", hash = "sha256:98e8a10b7a314f454d9eff4216a9a94d143a7ee65018dd12442e898ee2310578"},
-    {file = "coverage-6.5.0-cp311-cp311-win_amd64.whl", hash = "sha256:bc8ef5e043a2af066fa8cbfc6e708d58017024dc4345a1f9757b329a249f041b"},
-    {file = "coverage-6.5.0-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:4433b90fae13f86fafff0b326453dd42fc9a639a0d9e4eec4d366436d1a41b6d"},
-    {file = "coverage-6.5.0-cp37-cp37m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:f4f05d88d9a80ad3cac6244d36dd89a3c00abc16371769f1340101d3cb899fc3"},
-    {file = "coverage-6.5.0-cp37-cp37m-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:94e2565443291bd778421856bc975d351738963071e9b8839ca1fc08b42d4bef"},
-    {file = "coverage-6.5.0-cp37-cp37m-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:027018943386e7b942fa832372ebc120155fd970837489896099f5cfa2890f79"},
-    {file = "coverage-6.5.0-cp37-cp37m-musllinux_1_1_aarch64.whl", hash = "sha256:255758a1e3b61db372ec2736c8e2a1fdfaf563977eedbdf131de003ca5779b7d"},
-    {file = "coverage-6.5.0-cp37-cp37m-musllinux_1_1_i686.whl", hash = "sha256:851cf4ff24062c6aec510a454b2584f6e998cada52d4cb58c5e233d07172e50c"},
-    {file = "coverage-6.5.0-cp37-cp37m-musllinux_1_1_x86_64.whl", hash = "sha256:12adf310e4aafddc58afdb04d686795f33f4d7a6fa67a7a9d4ce7d6ae24d949f"},
-    {file = "coverage-6.5.0-cp37-cp37m-win32.whl", hash = "sha256:b5604380f3415ba69de87a289a2b56687faa4fe04dbee0754bfcae433489316b"},
-    {file = "coverage-6.5.0-cp37-cp37m-win_amd64.whl", hash = "sha256:4a8dbc1f0fbb2ae3de73eb0bdbb914180c7abfbf258e90b311dcd4f585d44bd2"},
-    {file = "coverage-6.5.0-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:d900bb429fdfd7f511f868cedd03a6bbb142f3f9118c09b99ef8dc9bf9643c3c"},
-    {file = "coverage-6.5.0-cp38-cp38-macosx_11_0_arm64.whl", hash = "sha256:2198ea6fc548de52adc826f62cb18554caedfb1d26548c1b7c88d8f7faa8f6ba"},
-    {file = "coverage-6.5.0-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:6c4459b3de97b75e3bd6b7d4b7f0db13f17f504f3d13e2a7c623786289dd670e"},
-    {file = "coverage-6.5.0-cp38-cp38-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:20c8ac5386253717e5ccc827caad43ed66fea0efe255727b1053a8154d952398"},
-    {file = "coverage-6.5.0-cp38-cp38-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:6b07130585d54fe8dff3d97b93b0e20290de974dc8177c320aeaf23459219c0b"},
-    {file = "coverage-6.5.0-cp38-cp38-musllinux_1_1_aarch64.whl", hash = "sha256:dbdb91cd8c048c2b09eb17713b0c12a54fbd587d79adcebad543bc0cd9a3410b"},
-    {file = "coverage-6.5.0-cp38-cp38-musllinux_1_1_i686.whl", hash = "sha256:de3001a203182842a4630e7b8d1a2c7c07ec1b45d3084a83d5d227a3806f530f"},
-    {file = "coverage-6.5.0-cp38-cp38-musllinux_1_1_x86_64.whl", hash = "sha256:e07f4a4a9b41583d6eabec04f8b68076ab3cd44c20bd29332c6572dda36f372e"},
-    {file = "coverage-6.5.0-cp38-cp38-win32.whl", hash = "sha256:6d4817234349a80dbf03640cec6109cd90cba068330703fa65ddf56b60223a6d"},
-    {file = "coverage-6.5.0-cp38-cp38-win_amd64.whl", hash = "sha256:7ccf362abd726b0410bf8911c31fbf97f09f8f1061f8c1cf03dfc4b6372848f6"},
-    {file = "coverage-6.5.0-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:633713d70ad6bfc49b34ead4060531658dc6dfc9b3eb7d8a716d5873377ab745"},
-    {file = "coverage-6.5.0-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:95203854f974e07af96358c0b261f1048d8e1083f2de9b1c565e1be4a3a48cfc"},
-    {file = "coverage-6.5.0-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:b9023e237f4c02ff739581ef35969c3739445fb059b060ca51771e69101efffe"},
-    {file = "coverage-6.5.0-cp39-cp39-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:265de0fa6778d07de30bcf4d9dc471c3dc4314a23a3c6603d356a3c9abc2dfcf"},
-    {file = "coverage-6.5.0-cp39-cp39-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:8f830ed581b45b82451a40faabb89c84e1a998124ee4212d440e9c6cf70083e5"},
-    {file = "coverage-6.5.0-cp39-cp39-musllinux_1_1_aarch64.whl", hash = "sha256:7b6be138d61e458e18d8e6ddcddd36dd96215edfe5f1168de0b1b32635839b62"},
-    {file = "coverage-6.5.0-cp39-cp39-musllinux_1_1_i686.whl", hash = "sha256:42eafe6778551cf006a7c43153af1211c3aaab658d4d66fa5fcc021613d02518"},
-    {file = "coverage-6.5.0-cp39-cp39-musllinux_1_1_x86_64.whl", hash = "sha256:723e8130d4ecc8f56e9a611e73b31219595baa3bb252d539206f7bbbab6ffc1f"},
-    {file = "coverage-6.5.0-cp39-cp39-win32.whl", hash = "sha256:d9ecf0829c6a62b9b573c7bb6d4dcd6ba8b6f80be9ba4fc7ed50bf4ac9aecd72"},
-    {file = "coverage-6.5.0-cp39-cp39-win_amd64.whl", hash = "sha256:fc2af30ed0d5ae0b1abdb4ebdce598eafd5b35397d4d75deb341a614d333d987"},
-    {file = "coverage-6.5.0-pp36.pp37.pp38-none-any.whl", hash = "sha256:1431986dac3923c5945271f169f59c45b8802a114c8f548d611f2015133df77a"},
-    {file = "coverage-6.5.0.tar.gz", hash = "sha256:f642e90754ee3e06b0e7e51bce3379590e76b7f76b708e1a71ff043f87025c84"},
-]
-distlib = [
-    {file = "distlib-0.3.6-py2.py3-none-any.whl", hash = "sha256:f35c4b692542ca110de7ef0bea44d73981caeb34ca0b9b6b2e6d7790dda8f80e"},
-    {file = "distlib-0.3.6.tar.gz", hash = "sha256:14bad2d9b04d3a36127ac97f30b12a19268f211063d8f8ee4f47108896e11b46"},
-]
-execnet = [
-    {file = "execnet-1.9.0-py2.py3-none-any.whl", hash = "sha256:a295f7cc774947aac58dde7fdc85f4aa00c42adf5d8f5468fc630c1acf30a142"},
-    {file = "execnet-1.9.0.tar.gz", hash = "sha256:8f694f3ba9cc92cab508b152dcfe322153975c29bda272e2fd7f3f00f36e47c5"},
-]
-filelock = [
-    {file = "filelock-3.8.0-py3-none-any.whl", hash = "sha256:617eb4e5eedc82fc5f47b6d61e4d11cb837c56cb4544e39081099fa17ad109d4"},
-    {file = "filelock-3.8.0.tar.gz", hash = "sha256:55447caa666f2198c5b6b13a26d2084d26fa5b115c00d065664b2124680c4edc"},
-]
-identify = [
-    {file = "identify-2.5.6-py2.py3-none-any.whl", hash = "sha256:b276db7ec52d7e89f5bc4653380e33054ddc803d25875952ad90b0f012cbcdaa"},
-    {file = "identify-2.5.6.tar.gz", hash = "sha256:6c32dbd747aa4ceee1df33f25fed0b0f6e0d65721b15bd151307ff7056d50245"},
-]
-idna = [
-    {file = "idna-3.4-py3-none-any.whl", hash = "sha256:90b77e79eaa3eba6de819a0c442c0b4ceefc341a7a2ab77d7562bf49f425c5c2"},
-    {file = "idna-3.4.tar.gz", hash = "sha256:814f528e8dead7d329833b91c5faa87d60bf71824cd12a7530b5526063d02cb4"},
-]
+arrow = []
+attrs = []
+beautifulsoup4 = []
+binaryornot = []
+black = []
+certifi = []
+cfgv = []
+chardet = []
+charset-normalizer = []
+click = []
+colorama = []
+cookiecutter = []
+coverage = []
+distlib = []
+execnet = []
+filelock = []
+identify = []
+idna = []
 iniconfig = [
-    {file = "iniconfig-1.1.1-py2.py3-none-any.whl", hash = "sha256:011e24c64b7f47f6ebd835bb12a743f2fbe9a26d4cecaa7f53bc4f35ee9da8b3"},
     {file = "iniconfig-1.1.1.tar.gz", hash = "sha256:bc3af051d7d14b2ee5ef9969666def0cd1a000e121eaea580d4a313df4b37f32"},
 ]
 isort = [
     {file = "isort-5.10.1-py3-none-any.whl", hash = "sha256:6f62d78e2f89b4500b080fe3a81690850cd254227f27f75c3a0c491a1f351ba7"},
     {file = "isort-5.10.1.tar.gz", hash = "sha256:e8443a5e7a020e9d7f97f1d7d9cd17c88bcb3bc7e218bf9cf5095fe550be2951"},
 ]
-Jinja2 = [
-    {file = "Jinja2-3.1.2-py3-none-any.whl", hash = "sha256:6088930bfe239f0e6710546ab9c19c9ef35e29792895fed6e6e31a023a182a61"},
-    {file = "Jinja2-3.1.2.tar.gz", hash = "sha256:31351a702a408a9e7595a8fc6150fc3f43bb6bf7e319770cbc0db9df9437e852"},
-]
-jinja2-time = [
-    {file = "jinja2-time-0.2.0.tar.gz", hash = "sha256:d14eaa4d315e7688daa4969f616f226614350c48730bfa1692d2caebd8c90d40"},
-    {file = "jinja2_time-0.2.0-py2.py3-none-any.whl", hash = "sha256:d3eab6605e3ec8b7a0863df09cc1d23714908fa61aa6986a845c20ba488b4efa"},
-]
-MarkupSafe = [
-    {file = "MarkupSafe-2.1.1-cp310-cp310-macosx_10_9_universal2.whl", hash = "sha256:86b1f75c4e7c2ac2ccdaec2b9022845dbb81880ca318bb7a0a01fbf7813e3812"},
-    {file = "MarkupSafe-2.1.1-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:f121a1420d4e173a5d96e47e9a0c0dcff965afdf1626d28de1460815f7c4ee7a"},
-    {file = "MarkupSafe-2.1.1-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:a49907dd8420c5685cfa064a1335b6754b74541bbb3706c259c02ed65b644b3e"},
-    {file = "MarkupSafe-2.1.1-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:10c1bfff05d95783da83491be968e8fe789263689c02724e0c691933c52994f5"},
-    {file = "MarkupSafe-2.1.1-cp310-cp310-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:b7bd98b796e2b6553da7225aeb61f447f80a1ca64f41d83612e6139ca5213aa4"},
-    {file = "MarkupSafe-2.1.1-cp310-cp310-musllinux_1_1_aarch64.whl", hash = "sha256:b09bf97215625a311f669476f44b8b318b075847b49316d3e28c08e41a7a573f"},
-    {file = "MarkupSafe-2.1.1-cp310-cp310-musllinux_1_1_i686.whl", hash = "sha256:694deca8d702d5db21ec83983ce0bb4b26a578e71fbdbd4fdcd387daa90e4d5e"},
-    {file = "MarkupSafe-2.1.1-cp310-cp310-musllinux_1_1_x86_64.whl", hash = "sha256:efc1913fd2ca4f334418481c7e595c00aad186563bbc1ec76067848c7ca0a933"},
-    {file = "MarkupSafe-2.1.1-cp310-cp310-win32.whl", hash = "sha256:4a33dea2b688b3190ee12bd7cfa29d39c9ed176bda40bfa11099a3ce5d3a7ac6"},
-    {file = "MarkupSafe-2.1.1-cp310-cp310-win_amd64.whl", hash = "sha256:dda30ba7e87fbbb7eab1ec9f58678558fd9a6b8b853530e176eabd064da81417"},
-    {file = "MarkupSafe-2.1.1-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:671cd1187ed5e62818414afe79ed29da836dde67166a9fac6d435873c44fdd02"},
-    {file = "MarkupSafe-2.1.1-cp37-cp37m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:3799351e2336dc91ea70b034983ee71cf2f9533cdff7c14c90ea126bfd95d65a"},
-    {file = "MarkupSafe-2.1.1-cp37-cp37m-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:e72591e9ecd94d7feb70c1cbd7be7b3ebea3f548870aa91e2732960fa4d57a37"},
-    {file = "MarkupSafe-2.1.1-cp37-cp37m-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:6fbf47b5d3728c6aea2abb0589b5d30459e369baa772e0f37a0320185e87c980"},
-    {file = "MarkupSafe-2.1.1-cp37-cp37m-musllinux_1_1_aarch64.whl", hash = "sha256:d5ee4f386140395a2c818d149221149c54849dfcfcb9f1debfe07a8b8bd63f9a"},
-    {file = "MarkupSafe-2.1.1-cp37-cp37m-musllinux_1_1_i686.whl", hash = "sha256:bcb3ed405ed3222f9904899563d6fc492ff75cce56cba05e32eff40e6acbeaa3"},
-    {file = "MarkupSafe-2.1.1-cp37-cp37m-musllinux_1_1_x86_64.whl", hash = "sha256:e1c0b87e09fa55a220f058d1d49d3fb8df88fbfab58558f1198e08c1e1de842a"},
-    {file = "MarkupSafe-2.1.1-cp37-cp37m-win32.whl", hash = "sha256:8dc1c72a69aa7e082593c4a203dcf94ddb74bb5c8a731e4e1eb68d031e8498ff"},
-    {file = "MarkupSafe-2.1.1-cp37-cp37m-win_amd64.whl", hash = "sha256:97a68e6ada378df82bc9f16b800ab77cbf4b2fada0081794318520138c088e4a"},
-    {file = "MarkupSafe-2.1.1-cp38-cp38-macosx_10_9_universal2.whl", hash = "sha256:e8c843bbcda3a2f1e3c2ab25913c80a3c5376cd00c6e8c4a86a89a28c8dc5452"},
-    {file = "MarkupSafe-2.1.1-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:0212a68688482dc52b2d45013df70d169f542b7394fc744c02a57374a4207003"},
-    {file = "MarkupSafe-2.1.1-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:8e576a51ad59e4bfaac456023a78f6b5e6e7651dcd383bcc3e18d06f9b55d6d1"},
-    {file = "MarkupSafe-2.1.1-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:4b9fe39a2ccc108a4accc2676e77da025ce383c108593d65cc909add5c3bd601"},
-    {file = "MarkupSafe-2.1.1-cp38-cp38-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:96e37a3dc86e80bf81758c152fe66dbf60ed5eca3d26305edf01892257049925"},
-    {file = "MarkupSafe-2.1.1-cp38-cp38-musllinux_1_1_aarch64.whl", hash = "sha256:6d0072fea50feec76a4c418096652f2c3238eaa014b2f94aeb1d56a66b41403f"},
-    {file = "MarkupSafe-2.1.1-cp38-cp38-musllinux_1_1_i686.whl", hash = "sha256:089cf3dbf0cd6c100f02945abeb18484bd1ee57a079aefd52cffd17fba910b88"},
-    {file = "MarkupSafe-2.1.1-cp38-cp38-musllinux_1_1_x86_64.whl", hash = "sha256:6a074d34ee7a5ce3effbc526b7083ec9731bb3cbf921bbe1d3005d4d2bdb3a63"},
-    {file = "MarkupSafe-2.1.1-cp38-cp38-win32.whl", hash = "sha256:421be9fbf0ffe9ffd7a378aafebbf6f4602d564d34be190fc19a193232fd12b1"},
-    {file = "MarkupSafe-2.1.1-cp38-cp38-win_amd64.whl", hash = "sha256:fc7b548b17d238737688817ab67deebb30e8073c95749d55538ed473130ec0c7"},
-    {file = "MarkupSafe-2.1.1-cp39-cp39-macosx_10_9_universal2.whl", hash = "sha256:e04e26803c9c3851c931eac40c695602c6295b8d432cbe78609649ad9bd2da8a"},
-    {file = "MarkupSafe-2.1.1-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:b87db4360013327109564f0e591bd2a3b318547bcef31b468a92ee504d07ae4f"},
-    {file = "MarkupSafe-2.1.1-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:99a2a507ed3ac881b975a2976d59f38c19386d128e7a9a18b7df6fff1fd4c1d6"},
-    {file = "MarkupSafe-2.1.1-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:56442863ed2b06d19c37f94d999035e15ee982988920e12a5b4ba29b62ad1f77"},
-    {file = "MarkupSafe-2.1.1-cp39-cp39-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:3ce11ee3f23f79dbd06fb3d63e2f6af7b12db1d46932fe7bd8afa259a5996603"},
-    {file = "MarkupSafe-2.1.1-cp39-cp39-musllinux_1_1_aarch64.whl", hash = "sha256:33b74d289bd2f5e527beadcaa3f401e0df0a89927c1559c8566c066fa4248ab7"},
-    {file = "MarkupSafe-2.1.1-cp39-cp39-musllinux_1_1_i686.whl", hash = "sha256:43093fb83d8343aac0b1baa75516da6092f58f41200907ef92448ecab8825135"},
-    {file = "MarkupSafe-2.1.1-cp39-cp39-musllinux_1_1_x86_64.whl", hash = "sha256:8e3dcf21f367459434c18e71b2a9532d96547aef8a871872a5bd69a715c15f96"},
-    {file = "MarkupSafe-2.1.1-cp39-cp39-win32.whl", hash = "sha256:d4306c36ca495956b6d568d276ac11fdd9c30a36f1b6eb928070dc5360b22e1c"},
-    {file = "MarkupSafe-2.1.1-cp39-cp39-win_amd64.whl", hash = "sha256:46d00d6cfecdde84d40e572d63735ef81423ad31184100411e6e3388d405e247"},
-    {file = "MarkupSafe-2.1.1.tar.gz", hash = "sha256:7f91197cc9e48f989d12e4e6fbc46495c446636dfc81b9ccf50bb0ec74b91d4b"},
-]
+jinja2 = []
+jinja2-time = []
+markupsafe = []
 mypy-extensions = [
     {file = "mypy_extensions-0.4.3-py2.py3-none-any.whl", hash = "sha256:090fedd75945a69ae91ce1303b5824f428daf5a028d2f6ab8a299250a846f15d"},
     {file = "mypy_extensions-0.4.3.tar.gz", hash = "sha256:2d82818f5bb3e369420cb3c4060a7970edba416647068eb4c5343488a6c604a8"},
 ]
-nodeenv = [
-    {file = "nodeenv-1.7.0-py2.py3-none-any.whl", hash = "sha256:27083a7b96a25f2f5e1d8cb4b6317ee8aeda3bdd121394e5ac54e498028a042e"},
-    {file = "nodeenv-1.7.0.tar.gz", hash = "sha256:e0e7f7dfb85fc5394c6fe1e8fa98131a2473e04311a45afb6508f7cf1836fa2b"},
-]
+nodeenv = []
 packaging = [
     {file = "packaging-21.3-py3-none-any.whl", hash = "sha256:ef103e05f519cdc783ae24ea4e2e0f508a9c99b2d4969652eed6a2e1ea5bd522"},
     {file = "packaging-21.3.tar.gz", hash = "sha256:dd47c42927d89ab911e606518907cc2d3a1f38bbd026385970643f9c5b8ecfeb"},
 ]
-pathspec = [
-    {file = "pathspec-0.10.1-py3-none-any.whl", hash = "sha256:46846318467efc4556ccfd27816e004270a9eeeeb4d062ce5e6fc7a87c573f93"},
-    {file = "pathspec-0.10.1.tar.gz", hash = "sha256:7ace6161b621d31e7902eb6b5ae148d12cfd23f4a249b9ffb6b9fee12084323d"},
-]
-platformdirs = [
-    {file = "platformdirs-2.5.2-py3-none-any.whl", hash = "sha256:027d8e83a2d7de06bbac4e5ef7e023c02b863d7ea5d079477e722bb41ab25788"},
-    {file = "platformdirs-2.5.2.tar.gz", hash = "sha256:58c8abb07dcb441e6ee4b11d8df0ac856038f944ab98b7be6b27b2a3c7feef19"},
-]
+pathspec = []
+platformdirs = []
 pluggy = [
     {file = "pluggy-1.0.0-py2.py3-none-any.whl", hash = "sha256:74134bbf457f031a36d68416e1509f34bd5ccc019f0bcc952c7b909d06b37bd3"},
     {file = "pluggy-1.0.0.tar.gz", hash = "sha256:4224373bacce55f955a878bf9cfa763c1e360858e330072059e10bad68531159"},
 ]
-pre-commit = [
-    {file = "pre_commit-2.20.0-py2.py3-none-any.whl", hash = "sha256:51a5ba7c480ae8072ecdb6933df22d2f812dc897d5fe848778116129a681aac7"},
-    {file = "pre_commit-2.20.0.tar.gz", hash = "sha256:a978dac7bc9ec0bcee55c18a277d553b0f419d259dadb4b9418ff2d00eb43959"},
-]
+pre-commit = []
 py = [
     {file = "py-1.11.0-py2.py3-none-any.whl", hash = "sha256:607c53218732647dff4acdfcd50cb62615cedf612e72d1724fb1a0cc6405b378"},
     {file = "py-1.11.0.tar.gz", hash = "sha256:51c75c4126074b472f746a24399ad32f6053d1b34b68d2fa41e558e6f4a98719"},
 ]
-pyparsing = [
-    {file = "pyparsing-3.0.9-py3-none-any.whl", hash = "sha256:5026bae9a10eeaefb61dab2f09052b9f4307d44aee4eda64b309723d8d206bbc"},
-    {file = "pyparsing-3.0.9.tar.gz", hash = "sha256:2b020ecf7d21b687f219b71ecad3631f644a47f01403fa1d1036b0c6416d70fb"},
-]
-pytest = [
-    {file = "pytest-7.1.3-py3-none-any.whl", hash = "sha256:1377bda3466d70b55e3f5cecfa55bb7cfcf219c7964629b967c37cf0bda818b7"},
-    {file = "pytest-7.1.3.tar.gz", hash = "sha256:4f365fec2dff9c1162f834d9f18af1ba13062db0c708bf7b946f8a5c76180c39"},
-]
-pytest-cov = [
-    {file = "pytest-cov-4.0.0.tar.gz", hash = "sha256:996b79efde6433cdbd0088872dbc5fb3ed7fe1578b68cdbba634f14bb8dd0470"},
-    {file = "pytest_cov-4.0.0-py3-none-any.whl", hash = "sha256:2feb1b751d66a8bd934e5edfa2e961d11309dc37b73b0eabe73b5945fee20f6b"},
-]
-pytest-forked = [
-    {file = "pytest-forked-1.4.0.tar.gz", hash = "sha256:8b67587c8f98cbbadfdd804539ed5455b6ed03802203485dd2f53c1422d7440e"},
-    {file = "pytest_forked-1.4.0-py3-none-any.whl", hash = "sha256:bbbb6717efc886b9d64537b41fb1497cfaf3c9601276be8da2cccfea5a3c8ad8"},
-]
-pytest-xdist = [
-    {file = "pytest-xdist-2.5.0.tar.gz", hash = "sha256:4580deca3ff04ddb2ac53eba39d76cb5dd5edeac050cb6fbc768b0dd712b4edf"},
-    {file = "pytest_xdist-2.5.0-py3-none-any.whl", hash = "sha256:6fe5c74fec98906deb8f2d2b616b5c782022744978e7bd4695d39c8f42d0ce65"},
-]
-python-dateutil = [
-    {file = "python-dateutil-2.8.2.tar.gz", hash = "sha256:0123cacc1627ae19ddf3c27a5de5bd67ee4586fbdd6440d9748f8abb483d3e86"},
-    {file = "python_dateutil-2.8.2-py2.py3-none-any.whl", hash = "sha256:961d03dc3453ebbc59dbdea9e4e11c5651520a876d0f4db161e8674aae935da9"},
-]
-python-dotenv = [
-    {file = "python-dotenv-0.21.0.tar.gz", hash = "sha256:b77d08274639e3d34145dfa6c7008e66df0f04b7be7a75fd0d5292c191d79045"},
-    {file = "python_dotenv-0.21.0-py3-none-any.whl", hash = "sha256:1684eb44636dd462b66c3ee016599815514527ad99965de77f43e0944634a7e5"},
-]
-python-slugify = [
-    {file = "python-slugify-6.1.2.tar.gz", hash = "sha256:272d106cb31ab99b3496ba085e3fea0e9e76dcde967b5e9992500d1f785ce4e1"},
-    {file = "python_slugify-6.1.2-py2.py3-none-any.whl", hash = "sha256:7b2c274c308b62f4269a9ba701aa69a797e9bca41aeee5b3a9e79e36b6656927"},
-]
-PyYAML = [
-    {file = "PyYAML-6.0-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:d4db7c7aef085872ef65a8fd7d6d09a14ae91f691dec3e87ee5ee0539d516f53"},
-    {file = "PyYAML-6.0-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:9df7ed3b3d2e0ecfe09e14741b857df43adb5a3ddadc919a2d94fbdf78fea53c"},
-    {file = "PyYAML-6.0-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:77f396e6ef4c73fdc33a9157446466f1cff553d979bd00ecb64385760c6babdc"},
-    {file = "PyYAML-6.0-cp310-cp310-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:a80a78046a72361de73f8f395f1f1e49f956c6be882eed58505a15f3e430962b"},
-    {file = "PyYAML-6.0-cp310-cp310-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:f84fbc98b019fef2ee9a1cb3ce93e3187a6df0b2538a651bfb890254ba9f90b5"},
-    {file = "PyYAML-6.0-cp310-cp310-win32.whl", hash = "sha256:2cd5df3de48857ed0544b34e2d40e9fac445930039f3cfe4bcc592a1f836d513"},
-    {file = "PyYAML-6.0-cp310-cp310-win_amd64.whl", hash = "sha256:daf496c58a8c52083df09b80c860005194014c3698698d1a57cbcfa182142a3a"},
-    {file = "PyYAML-6.0-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:d4b0ba9512519522b118090257be113b9468d804b19d63c71dbcf4a48fa32358"},
-    {file = "PyYAML-6.0-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:81957921f441d50af23654aa6c5e5eaf9b06aba7f0a19c18a538dc7ef291c5a1"},
-    {file = "PyYAML-6.0-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:afa17f5bc4d1b10afd4466fd3a44dc0e245382deca5b3c353d8b757f9e3ecb8d"},
-    {file = "PyYAML-6.0-cp311-cp311-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:dbad0e9d368bb989f4515da330b88a057617d16b6a8245084f1b05400f24609f"},
-    {file = "PyYAML-6.0-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:432557aa2c09802be39460360ddffd48156e30721f5e8d917f01d31694216782"},
-    {file = "PyYAML-6.0-cp311-cp311-win32.whl", hash = "sha256:bfaef573a63ba8923503d27530362590ff4f576c626d86a9fed95822a8255fd7"},
-    {file = "PyYAML-6.0-cp311-cp311-win_amd64.whl", hash = "sha256:01b45c0191e6d66c470b6cf1b9531a771a83c1c4208272ead47a3ae4f2f603bf"},
-    {file = "PyYAML-6.0-cp36-cp36m-macosx_10_9_x86_64.whl", hash = "sha256:897b80890765f037df3403d22bab41627ca8811ae55e9a722fd0392850ec4d86"},
-    {file = "PyYAML-6.0-cp36-cp36m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:50602afada6d6cbfad699b0c7bb50d5ccffa7e46a3d738092afddc1f9758427f"},
-    {file = "PyYAML-6.0-cp36-cp36m-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:48c346915c114f5fdb3ead70312bd042a953a8ce5c7106d5bfb1a5254e47da92"},
-    {file = "PyYAML-6.0-cp36-cp36m-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:98c4d36e99714e55cfbaaee6dd5badbc9a1ec339ebfc3b1f52e293aee6bb71a4"},
-    {file = "PyYAML-6.0-cp36-cp36m-win32.whl", hash = "sha256:0283c35a6a9fbf047493e3a0ce8d79ef5030852c51e9d911a27badfde0605293"},
-    {file = "PyYAML-6.0-cp36-cp36m-win_amd64.whl", hash = "sha256:07751360502caac1c067a8132d150cf3d61339af5691fe9e87803040dbc5db57"},
-    {file = "PyYAML-6.0-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:819b3830a1543db06c4d4b865e70ded25be52a2e0631ccd2f6a47a2822f2fd7c"},
-    {file = "PyYAML-6.0-cp37-cp37m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:473f9edb243cb1935ab5a084eb238d842fb8f404ed2193a915d1784b5a6b5fc0"},
-    {file = "PyYAML-6.0-cp37-cp37m-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:0ce82d761c532fe4ec3f87fc45688bdd3a4c1dc5e0b4a19814b9009a29baefd4"},
-    {file = "PyYAML-6.0-cp37-cp37m-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:231710d57adfd809ef5d34183b8ed1eeae3f76459c18fb4a0b373ad56bedcdd9"},
-    {file = "PyYAML-6.0-cp37-cp37m-win32.whl", hash = "sha256:c5687b8d43cf58545ade1fe3e055f70eac7a5a1a0bf42824308d868289a95737"},
-    {file = "PyYAML-6.0-cp37-cp37m-win_amd64.whl", hash = "sha256:d15a181d1ecd0d4270dc32edb46f7cb7733c7c508857278d3d378d14d606db2d"},
-    {file = "PyYAML-6.0-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:0b4624f379dab24d3725ffde76559cff63d9ec94e1736b556dacdfebe5ab6d4b"},
-    {file = "PyYAML-6.0-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:213c60cd50106436cc818accf5baa1aba61c0189ff610f64f4a3e8c6726218ba"},
-    {file = "PyYAML-6.0-cp38-cp38-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:9fa600030013c4de8165339db93d182b9431076eb98eb40ee068700c9c813e34"},
-    {file = "PyYAML-6.0-cp38-cp38-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:277a0ef2981ca40581a47093e9e2d13b3f1fbbeffae064c1d21bfceba2030287"},
-    {file = "PyYAML-6.0-cp38-cp38-win32.whl", hash = "sha256:d4eccecf9adf6fbcc6861a38015c2a64f38b9d94838ac1810a9023a0609e1b78"},
-    {file = "PyYAML-6.0-cp38-cp38-win_amd64.whl", hash = "sha256:1e4747bc279b4f613a09eb64bba2ba602d8a6664c6ce6396a4d0cd413a50ce07"},
-    {file = "PyYAML-6.0-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:055d937d65826939cb044fc8c9b08889e8c743fdc6a32b33e2390f66013e449b"},
-    {file = "PyYAML-6.0-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:e61ceaab6f49fb8bdfaa0f92c4b57bcfbea54c09277b1b4f7ac376bfb7a7c174"},
-    {file = "PyYAML-6.0-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:d67d839ede4ed1b28a4e8909735fc992a923cdb84e618544973d7dfc71540803"},
-    {file = "PyYAML-6.0-cp39-cp39-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:cba8c411ef271aa037d7357a2bc8f9ee8b58b9965831d9e51baf703280dc73d3"},
-    {file = "PyYAML-6.0-cp39-cp39-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:40527857252b61eacd1d9af500c3337ba8deb8fc298940291486c465c8b46ec0"},
-    {file = "PyYAML-6.0-cp39-cp39-win32.whl", hash = "sha256:b5b9eccad747aabaaffbc6064800670f0c297e52c12754eb1d976c57e4f74dcb"},
-    {file = "PyYAML-6.0-cp39-cp39-win_amd64.whl", hash = "sha256:b3d267842bf12586ba6c734f89d1f5b871df0273157918b0ccefa29deb05c21c"},
-    {file = "PyYAML-6.0.tar.gz", hash = "sha256:68fb519c14306fec9720a2a5b45bc9f0c8d1b9c72adf45c37baedfcd949c35a2"},
-]
-requests = [
-    {file = "requests-2.28.1-py3-none-any.whl", hash = "sha256:8fefa2a1a1365bf5520aac41836fbee479da67864514bdb821f31ce07ce65349"},
-    {file = "requests-2.28.1.tar.gz", hash = "sha256:7c5599b102feddaa661c826c56ab4fee28bfd17f5abca1ebbe3e7f19d7c97983"},
-]
-setuptools = [
-    {file = "setuptools-65.4.1-py3-none-any.whl", hash = "sha256:1b6bdc6161661409c5f21508763dc63ab20a9ac2f8ba20029aaaa7fdb9118012"},
-    {file = "setuptools-65.4.1.tar.gz", hash = "sha256:3050e338e5871e70c72983072fe34f6032ae1cdeeeb67338199c2f74e083a80e"},
-]
+pyparsing = []
+pytest = []
+pytest-cov = []
+pytest-forked = []
+pytest-xdist = []
+python-dateutil = []
+python-dotenv = []
+python-slugify = []
+pyyaml = []
+requests = []
 six = [
     {file = "six-1.16.0-py2.py3-none-any.whl", hash = "sha256:8abb2f1d86890a2dfb989f9a77cfcfd3e47c2a354b01111771326f8aa26e0254"},
     {file = "six-1.16.0.tar.gz", hash = "sha256:1e61c37477a1626458e36f7b1d82aa5c9b094fa4802892072e49de9c60c4c926"},
 ]
-soupsieve = [
-    {file = "soupsieve-2.3.2.post1-py3-none-any.whl", hash = "sha256:3b2503d3c7084a42b1ebd08116e5f81aadfaea95863628c80a3b774a11b7c759"},
-    {file = "soupsieve-2.3.2.post1.tar.gz", hash = "sha256:fc53893b3da2c33de295667a0e19f078c14bf86544af307354de5fcf12a3f30d"},
-]
-text-unidecode = [
-    {file = "text-unidecode-1.3.tar.gz", hash = "sha256:bad6603bb14d279193107714b288be206cac565dfa49aa5b105294dd5c4aab93"},
-    {file = "text_unidecode-1.3-py2.py3-none-any.whl", hash = "sha256:1311f10e8b895935241623731c2ba64f4c455287888b18189350b67134a822e8"},
-]
+soupsieve = []
+text-unidecode = []
 toml = [
     {file = "toml-0.10.2-py2.py3-none-any.whl", hash = "sha256:806143ae5bfb6a3c6e736a764057db0e6a0e05e338b5630894a5f779cabb4f9b"},
     {file = "toml-0.10.2.tar.gz", hash = "sha256:b3bda1d108d5dd99f4a20d24d9c348e91c4db7ab1b749200bded2f839ccbe68f"},
@@ -954,19 +688,7 @@ tomli = [
     {file = "tomli-2.0.1-py3-none-any.whl", hash = "sha256:939de3e7a6161af0c887ef91b7d41a53e7c5a1ca976325f429cb46ea9bc30ecc"},
     {file = "tomli-2.0.1.tar.gz", hash = "sha256:de526c12914f0c550d15924c62d72abc48d6fe7364aa87328337a31007fe8a4f"},
 ]
-tox = [
-    {file = "tox-3.26.0-py2.py3-none-any.whl", hash = "sha256:bf037662d7c740d15c9924ba23bb3e587df20598697bb985ac2b49bdc2d847f6"},
-    {file = "tox-3.26.0.tar.gz", hash = "sha256:44f3c347c68c2c68799d7d44f1808f9d396fc8a1a500cbc624253375c7ae107e"},
-]
-tqdm = [
-    {file = "tqdm-4.64.1-py2.py3-none-any.whl", hash = "sha256:6fee160d6ffcd1b1c68c65f14c829c22832bc401726335ce92c52d395944a6a1"},
-    {file = "tqdm-4.64.1.tar.gz", hash = "sha256:5f4f682a004951c1b450bc753c710e9280c5746ce6ffedee253ddbcbf54cf1e4"},
-]
-urllib3 = [
-    {file = "urllib3-1.26.12-py2.py3-none-any.whl", hash = "sha256:b930dd878d5a8afb066a637fbb35144fe7901e3b209d1cd4f524bd0e9deee997"},
-    {file = "urllib3-1.26.12.tar.gz", hash = "sha256:3fa96cf423e6987997fc326ae8df396db2a8b7c667747d47ddd8ecba91f4a74e"},
-]
-virtualenv = [
-    {file = "virtualenv-20.16.5-py3-none-any.whl", hash = "sha256:d07dfc5df5e4e0dbc92862350ad87a36ed505b978f6c39609dc489eadd5b0d27"},
-    {file = "virtualenv-20.16.5.tar.gz", hash = "sha256:227ea1b9994fdc5ea31977ba3383ef296d7472ea85be9d6732e42a91c04e80da"},
-]
+tox = []
+tqdm = []
+urllib3 = []
+virtualenv = []

From f84542a461789c650e925227746e2eedf513ef8f Mon Sep 17 00:00:00 2001
From: Roel Adriaans <roel@adriaans.org>
Date: Thu, 20 Oct 2022 23:01:55 +0200
Subject: [PATCH 157/371] Solve part 1, after some bit bangling

---
 src/adventofcode2021/solutions/day16.py | 71 ++++++++++++++++---------
 tests/solutions/test_day16_a.py         | 45 +++++++++++++---
 2 files changed, 82 insertions(+), 34 deletions(-)

diff --git a/src/adventofcode2021/solutions/day16.py b/src/adventofcode2021/solutions/day16.py
index 0698a245..83247d82 100644
--- a/src/adventofcode2021/solutions/day16.py
+++ b/src/adventofcode2021/solutions/day16.py
@@ -25,38 +25,47 @@ class Packet:
     length_type_id: int | None
     sub_packets: list[Packet]
 
-    packet_str: deque[str]
+    packet_deq: deque[str]
     _original_packet_data: str | deque
 
-    def from_hex(self, packet_data: str):
-        # Create the packet as a string, and fill on the left based on 4 bits chunks
-        packet_length = len(f"{packet_data:b}")
+    def __init__(self):
+        self.sub_packets = []
 
-        zfill_value = packet_length + (packet_length % 4)
-        self.packet_str = deque(f"{int(packet_data, 16):b}".zfill(zfill_value))
+    def from_hex(self, packet_data: str) -> Packet:
+        # Add one, then convert to bin and remove the one again.
+        # This will make sure we have the leading zeros in the bit string
+        bin_value = bin(int("1" + packet_data, 16))[3:]
+        deque_data = deque(bin_value)
 
-        # Store the original packet data for later reference
-        self._original_packet_data = packet_data
-
-        self._parse_data()
+        return self.from_deque(deque_data)
 
-    def from_deque(self, packet_data: deque):
-        self.packet_str = packet_data
+    def from_deque(self, packet_data: deque) -> Packet:
+        self.packet_deq = packet_data
         self._original_packet_data = packet_data
         self._parse_data()
+        return self
 
-    def _take_bits(self, num_bits: int = None) -> int:
-        """Take n bits from the packet_str, return the value as int.
+    def _take_bits(self, num_bits: int) -> int:
+        """Take n bits from the packet_deq, return the value as int.
         Consumes the packet data
         """
         # Pop num_bits from the string on the left
-        res = [self.packet_str.popleft() for _ in range(num_bits)]
+        res = [self.packet_deq.popleft() for _ in range(num_bits)]
         # Convert to integer, from binary base 2
         return int("".join(res), 2)
 
+    def _take_bits_as_deque(self, num_bits: int) -> deque:
+        """Take n bits from the packet_deq, return the value as int.
+        Consumes the packet data
+        """
+        # Pop num_bits from the string on the left
+        res = [self.packet_deq.popleft() for _ in range(num_bits)]
+        # Convert to integer, from binary base 2
+        return deque(res)
+
     def _peek_bits(self, num_bits: int) -> int:
         """Look at the first num_bits bits"""
-        value = [self.packet_str[n] for n in range(num_bits)]
+        value = [self.packet_deq[n] for n in range(num_bits)]
         return int("".join(value), 2)
 
     def _parse_data(self):
@@ -77,7 +86,7 @@ def _parse_literal_value(self):
         next_bit: int = 1
         value: int = 0
         while next_bit == 1:
-            next_bit: int = self._take_bits(1)
+            next_bit = self._take_bits(1)
             group_bits = self._take_bits(4)
             value = (value << 4) | group_bits
 
@@ -85,7 +94,7 @@ def _parse_literal_value(self):
         return
 
     def _parse_operator(self):
-        self.sub_packets = list()
+        # self.sub_packets = []
 
         self.length_type_id = self._take_bits(1)
 
@@ -93,22 +102,21 @@ def _parse_operator(self):
             # the next 15 bits are a number that represents the total length in bits
             # of the sub-packets contained by this packet.
             length_subpacket = self._take_bits(15)
-            subpackets = self._take_bits(length_subpacket)
+            subpackets = self._take_bits_as_deque(length_subpacket)
 
             while subpackets:
-                # Convert subpacket into hex
-
                 new_packet = Packet().from_deque(subpackets)
                 self.sub_packets.append(new_packet)
                 # If there is any data left, process it now
-                subpackets = int("".join(new_packet.packet_str), 2)
-            return
+                subpackets = new_packet.packet_deq
 
         elif self.length_type_id == 1:
             # The next 11 bits are a number that represents the number of
             # sub-packets immediately contained by this packet.
-            subpackets = self._take_bits(11)
-            ...
+            num_subpackets = self._take_bits(11)
+            for n in range(num_subpackets):
+                new_packet = Packet().from_deque(self.packet_deq)
+                self.sub_packets.append(new_packet)
 
 
 class Day16:
@@ -116,8 +124,19 @@ class Day16:
 
 
 class Day16PartA(Day16, FileReaderSolution):
+    def sum_version(self, packet: Packet) -> int:
+        """Recurse into subpackages and sum the total versions"""
+        total = packet.version
+        for subpack in packet.sub_packets:
+            total += self.sum_version(subpack)
+
+        return total
+
     def solve(self, input_data: str) -> int:
-        raise NotImplementedError
+        root_packet = Packet().from_hex(input_data)
+        # Deep dive into the packets
+        res = self.sum_version(root_packet)
+        return res
 
 
 class Day16PartB(Day16, FileReaderSolution):
diff --git a/tests/solutions/test_day16_a.py b/tests/solutions/test_day16_a.py
index f716977b..327e8f7e 100644
--- a/tests/solutions/test_day16_a.py
+++ b/tests/solutions/test_day16_a.py
@@ -6,30 +6,59 @@
 class TestDay16PartA:
     def test_packet_parsing(self):
         test_data = "D2FE28"
-        packet = Packet(test_data)
+        packet = Packet().from_hex(test_data)
         assert packet.version == 6
         assert packet.type_id == 4
         assert packet.value == 2021
 
         # We still have 3 unused bits over
-        assert len(packet.packet_str) == 3
+        assert len(packet.packet_deq) == 3
 
-    def test_packet_operator(self):
+    def test_packet_operator_zero(self):
         test_data = "38006F45291200"
-        packet = Packet(test_data)
+        packet = Packet().from_hex(test_data)
         assert packet.version == 1
         assert packet.type_id == 6
+        assert packet.length_type_id == 0
+        assert len(packet.sub_packets) == 2
+        assert packet.sub_packets[0].value == 10
+        assert packet.sub_packets[1].value == 20
 
-    @pytest.mark.xfail(reason="Not yet implemented", raises=NotImplementedError)
-    @pytest.mark.parametrize(("input_data", "expected_result"), [("", ""), ("", "")])
+    def test_packet_operator_one(self):
+        test_data = "EE00D40C823060"
+        packet = Packet().from_hex(test_data)
+        assert packet.version == 7
+        assert packet.type_id == 3
+        assert packet.length_type_id == 1
+        assert len(packet.sub_packets) == 3
+        assert packet.sub_packets[0].value == 1
+        assert packet.sub_packets[1].value == 2
+        assert packet.sub_packets[2].value == 3
+
+    def test_nested(self):
+        packet = Packet().from_hex("8A004A801A8002F478")
+        assert packet.version == 4
+        assert len(packet.sub_packets) == 1
+        assert packet.sub_packets[0].version == 1
+        assert packet.sub_packets[0].sub_packets[0].version == 5
+        assert packet.sub_packets[0].sub_packets[0].sub_packets[0].version == 6
+
+    @pytest.mark.parametrize(
+        ("input_data", "expected_result"),
+        [
+            ("8A004A801A8002F478", 16),
+            ("620080001611562C8802118E34", 12),
+            ("C0015000016115A2E0802F182340", 23),
+            ("A0016C880162017C3686B18A3D4780", 31),
+        ],
+    )
     def test_day16a_solve(self, input_data, expected_result):
         solution = Day16PartA()
         result = solution.solve(input_data)
         assert result == expected_result
 
-    @pytest.mark.xfail(reason="Not yet implemented", raises=NotImplementedError)
     def test_day16a_data(self):
         """Result we got when we did the real solution"""
         solution = Day16PartA()
         res = solution("day_16/day16.txt")
-        assert res == 0
+        assert res == 981

From 49476b11e1a72d08ffe41080b916782eff92516f Mon Sep 17 00:00:00 2001
From: Roel Adriaans <roel@adriaans.org>
Date: Fri, 21 Oct 2022 11:28:05 +0200
Subject: [PATCH 158/371] Implement day 16 part 2, parsing of the packets

---
 src/adventofcode2021/solutions/day16.py | 60 ++++++++++++++++++++++---
 tests/solutions/test_day16_b.py         | 18 ++++++--
 2 files changed, 68 insertions(+), 10 deletions(-)

diff --git a/src/adventofcode2021/solutions/day16.py b/src/adventofcode2021/solutions/day16.py
index 83247d82..ff7c4dec 100644
--- a/src/adventofcode2021/solutions/day16.py
+++ b/src/adventofcode2021/solutions/day16.py
@@ -1,6 +1,6 @@
 from __future__ import annotations
 
-import logging
+import math
 from collections import deque
 from enum import IntEnum
 
@@ -10,8 +10,14 @@
 class TypeID(IntEnum):
     """Define the different type of packages"""
 
+    SUM = 0
+    PRODUCT = 1
+    MINIMUM = 2
+    MAXIMUM = 3
     LITERAL_VALUE = 4
-    OPERATOR = 6
+    GREATHER_THAN = 5
+    LESS_THAN = 6
+    EQUAL_TO = 7
 
 
 class Packet:
@@ -19,7 +25,7 @@ class Packet:
     type_id: int
 
     # Literal value packets
-    value: int | None
+    value: int
 
     # Operator packets
     length_type_id: int | None
@@ -75,10 +81,8 @@ def _parse_data(self):
         # Parse the different types
         match self.type_id:
             case TypeID.LITERAL_VALUE.value:
-                logging.debug("Found literal value in packet")
                 self._parse_literal_value()
             case _:
-                logging.debug("Found operator in packet")
                 self._parse_operator()
 
     def _parse_literal_value(self):
@@ -140,5 +144,49 @@ def solve(self, input_data: str) -> int:
 
 
 class Day16PartB(Day16, FileReaderSolution):
+    def evaluate(self, packet: Packet) -> int:
+        """Evaluate the packet, and its subpackets"""
+        if packet.type_id in (
+            TypeID.SUM.value,
+            TypeID.PRODUCT.value,
+            TypeID.MAXIMUM.value,
+            TypeID.MINIMUM.value,
+        ):
+            # Evaluate the sub-packets. By using evaluate, we get the literal value
+            # or the package is parsed with the subpackages
+            lit_values = [self.evaluate(sub) for sub in packet.sub_packets]
+
+            # Now appy the function to the literal values
+            if packet.type_id == TypeID.SUM.value:
+                return sum(lit_values)
+            elif packet.type_id == TypeID.PRODUCT.value:
+                return math.prod(lit_values)
+            elif packet.type_id == TypeID.MAXIMUM.value:
+                return max(lit_values)
+            elif packet.type_id == TypeID.MINIMUM.value:
+                return min(lit_values)
+            else:
+                raise ValueError("Unknown operator %s", packet.type_id)
+        elif packet.type_id in (
+            TypeID.GREATHER_THAN.value,
+            TypeID.LESS_THAN.value,
+            TypeID.EQUAL_TO.value,
+        ):
+            left = self.evaluate(packet.sub_packets[0])
+            right = self.evaluate(packet.sub_packets[1])
+            if packet.type_id == TypeID.GREATHER_THAN.value:
+                return 1 if left > right else 0
+            elif packet.type_id == TypeID.LESS_THAN.value:
+                return 1 if left < right else 0
+            if packet.type_id == TypeID.EQUAL_TO.value:
+                return 1 if left == right else 0
+        elif packet.type_id == TypeID.LITERAL_VALUE.value:
+            return packet.value
+        else:
+            raise ValueError("Unknown operator %s", packet.type_id)
+        return -1
+
     def solve(self, input_data: str) -> int:
-        raise NotImplementedError
+        root_packet = Packet().from_hex(input_data)
+        result = self.evaluate(root_packet)
+        return result
diff --git a/tests/solutions/test_day16_b.py b/tests/solutions/test_day16_b.py
index b968611b..820c8874 100644
--- a/tests/solutions/test_day16_b.py
+++ b/tests/solutions/test_day16_b.py
@@ -4,16 +4,26 @@
 
 
 class TestDay16PartB:
-    @pytest.mark.xfail(reason="Not yet implemented", raises=NotImplementedError)
-    @pytest.mark.parametrize(("input_data", "expected_result"), [("", ""), ("", "")])
+    @pytest.mark.parametrize(
+        ("input_data", "expected_result"),
+        [
+            ("C200B40A82", 3),  # (1+2)
+            ("04005AC33890", 54),  # (6*9)
+            ("880086C3E88112", 7),  # min(7,8,9)
+            ("CE00C43D881120", 9),  # max(7,8,9)
+            ("D8005AC2A8F0", 1),  # 5 < 15
+            ("F600BC2D8F", 0),  # 5 > 15
+            ("9C005AC2F8F0", 0),  # 5 != 15
+            ("9C0141080250320F1802104A08", 1),  # (1 + 3) == (2 * 2)
+        ],
+    )
     def test_day16b_solve(self, input_data, expected_result):
         solution = Day16PartB()
         result = solution.solve(input_data)
         assert result == expected_result
 
-    @pytest.mark.xfail(reason="Not yet implemented", raises=NotImplementedError)
     def test_day16b_data(self):
         """Result we got when we did the real solution"""
         solution = Day16PartB()
         res = solution("day_16/day16.txt")
-        assert res == 0
+        assert res == 299227024091

From 2f1ce495ca03255fc19ecc43775b9addbcb3492b Mon Sep 17 00:00:00 2001
From: Roel Adriaans <roel@adriaans.org>
Date: Fri, 21 Oct 2022 11:49:08 +0200
Subject: [PATCH 159/371] Remove the nested if's, make it easier to read the
 code

---
 src/adventofcode2021/solutions/day16.py | 66 +++++++++----------------
 tests/solutions/test_day16_a.py         | 22 ++++-----
 2 files changed, 35 insertions(+), 53 deletions(-)

diff --git a/src/adventofcode2021/solutions/day16.py b/src/adventofcode2021/solutions/day16.py
index ff7c4dec..be1e1789 100644
--- a/src/adventofcode2021/solutions/day16.py
+++ b/src/adventofcode2021/solutions/day16.py
@@ -29,13 +29,13 @@ class Packet:
 
     # Operator packets
     length_type_id: int | None
-    sub_packets: list[Packet]
+    sub: list[Packet]
 
     packet_deq: deque[str]
     _original_packet_data: str | deque
 
     def __init__(self):
-        self.sub_packets = []
+        self.sub = []
 
     def from_hex(self, packet_data: str) -> Packet:
         # Add one, then convert to bin and remove the one again.
@@ -110,7 +110,7 @@ def _parse_operator(self):
 
             while subpackets:
                 new_packet = Packet().from_deque(subpackets)
-                self.sub_packets.append(new_packet)
+                self.sub.append(new_packet)
                 # If there is any data left, process it now
                 subpackets = new_packet.packet_deq
 
@@ -120,7 +120,7 @@ def _parse_operator(self):
             num_subpackets = self._take_bits(11)
             for n in range(num_subpackets):
                 new_packet = Packet().from_deque(self.packet_deq)
-                self.sub_packets.append(new_packet)
+                self.sub.append(new_packet)
 
 
 class Day16:
@@ -131,7 +131,7 @@ class Day16PartA(Day16, FileReaderSolution):
     def sum_version(self, packet: Packet) -> int:
         """Recurse into subpackages and sum the total versions"""
         total = packet.version
-        for subpack in packet.sub_packets:
+        for subpack in packet.sub:
             total += self.sum_version(subpack)
 
         return total
@@ -144,49 +144,31 @@ def solve(self, input_data: str) -> int:
 
 
 class Day16PartB(Day16, FileReaderSolution):
-    def evaluate(self, packet: Packet) -> int:
+    def eval(self, packet: Packet) -> int:
         """Evaluate the packet, and its subpackets"""
-        if packet.type_id in (
-            TypeID.SUM.value,
-            TypeID.PRODUCT.value,
-            TypeID.MAXIMUM.value,
-            TypeID.MINIMUM.value,
-        ):
-            # Evaluate the sub-packets. By using evaluate, we get the literal value
-            # or the package is parsed with the subpackages
-            lit_values = [self.evaluate(sub) for sub in packet.sub_packets]
-
-            # Now appy the function to the literal values
-            if packet.type_id == TypeID.SUM.value:
-                return sum(lit_values)
-            elif packet.type_id == TypeID.PRODUCT.value:
-                return math.prod(lit_values)
-            elif packet.type_id == TypeID.MAXIMUM.value:
-                return max(lit_values)
-            elif packet.type_id == TypeID.MINIMUM.value:
-                return min(lit_values)
-            else:
-                raise ValueError("Unknown operator %s", packet.type_id)
-        elif packet.type_id in (
-            TypeID.GREATHER_THAN.value,
-            TypeID.LESS_THAN.value,
-            TypeID.EQUAL_TO.value,
-        ):
-            left = self.evaluate(packet.sub_packets[0])
-            right = self.evaluate(packet.sub_packets[1])
-            if packet.type_id == TypeID.GREATHER_THAN.value:
-                return 1 if left > right else 0
-            elif packet.type_id == TypeID.LESS_THAN.value:
-                return 1 if left < right else 0
-            if packet.type_id == TypeID.EQUAL_TO.value:
-                return 1 if left == right else 0
+        # Evaluate the sub-packets. By using evaluate, we get the literal value
+        # or the package is parsed with the subpackages
+        # Now appy the function to the literal values
+        if packet.type_id == TypeID.SUM.value:
+            return sum([self.eval(sub) for sub in packet.sub])
+        elif packet.type_id == TypeID.PRODUCT.value:
+            return math.prod([self.eval(sub) for sub in packet.sub])
+        elif packet.type_id == TypeID.MAXIMUM.value:
+            return max([self.eval(sub) for sub in packet.sub])
+        elif packet.type_id == TypeID.MINIMUM.value:
+            return min([self.eval(sub) for sub in packet.sub])
+        elif packet.type_id == TypeID.GREATHER_THAN.value:
+            return 1 if self.eval(packet.sub[0]) > self.eval(packet.sub[1]) else 0
+        elif packet.type_id == TypeID.LESS_THAN.value:
+            return 1 if self.eval(packet.sub[0]) < self.eval(packet.sub[1]) else 0
+        elif packet.type_id == TypeID.EQUAL_TO.value:
+            return 1 if self.eval(packet.sub[0]) == self.eval(packet.sub[1]) else 0
         elif packet.type_id == TypeID.LITERAL_VALUE.value:
             return packet.value
         else:
             raise ValueError("Unknown operator %s", packet.type_id)
-        return -1
 
     def solve(self, input_data: str) -> int:
         root_packet = Packet().from_hex(input_data)
-        result = self.evaluate(root_packet)
+        result = self.eval(root_packet)
         return result
diff --git a/tests/solutions/test_day16_a.py b/tests/solutions/test_day16_a.py
index 327e8f7e..ed7a4e2c 100644
--- a/tests/solutions/test_day16_a.py
+++ b/tests/solutions/test_day16_a.py
@@ -20,9 +20,9 @@ def test_packet_operator_zero(self):
         assert packet.version == 1
         assert packet.type_id == 6
         assert packet.length_type_id == 0
-        assert len(packet.sub_packets) == 2
-        assert packet.sub_packets[0].value == 10
-        assert packet.sub_packets[1].value == 20
+        assert len(packet.sub) == 2
+        assert packet.sub[0].value == 10
+        assert packet.sub[1].value == 20
 
     def test_packet_operator_one(self):
         test_data = "EE00D40C823060"
@@ -30,18 +30,18 @@ def test_packet_operator_one(self):
         assert packet.version == 7
         assert packet.type_id == 3
         assert packet.length_type_id == 1
-        assert len(packet.sub_packets) == 3
-        assert packet.sub_packets[0].value == 1
-        assert packet.sub_packets[1].value == 2
-        assert packet.sub_packets[2].value == 3
+        assert len(packet.sub) == 3
+        assert packet.sub[0].value == 1
+        assert packet.sub[1].value == 2
+        assert packet.sub[2].value == 3
 
     def test_nested(self):
         packet = Packet().from_hex("8A004A801A8002F478")
         assert packet.version == 4
-        assert len(packet.sub_packets) == 1
-        assert packet.sub_packets[0].version == 1
-        assert packet.sub_packets[0].sub_packets[0].version == 5
-        assert packet.sub_packets[0].sub_packets[0].sub_packets[0].version == 6
+        assert len(packet.sub) == 1
+        assert packet.sub[0].version == 1
+        assert packet.sub[0].sub[0].version == 5
+        assert packet.sub[0].sub[0].sub[0].version == 6
 
     @pytest.mark.parametrize(
         ("input_data", "expected_result"),

From 1f2fb8a5304dcd7bf801cedbb4c5db86e483021d Mon Sep 17 00:00:00 2001
From: Roel Adriaans <roel@adriaans.org>
Date: Fri, 21 Oct 2022 11:51:41 +0200
Subject: [PATCH 160/371] Remove unused variable

---
 src/adventofcode2021/solutions/day16.py | 2 --
 1 file changed, 2 deletions(-)

diff --git a/src/adventofcode2021/solutions/day16.py b/src/adventofcode2021/solutions/day16.py
index be1e1789..865fa926 100644
--- a/src/adventofcode2021/solutions/day16.py
+++ b/src/adventofcode2021/solutions/day16.py
@@ -32,7 +32,6 @@ class Packet:
     sub: list[Packet]
 
     packet_deq: deque[str]
-    _original_packet_data: str | deque
 
     def __init__(self):
         self.sub = []
@@ -47,7 +46,6 @@ def from_hex(self, packet_data: str) -> Packet:
 
     def from_deque(self, packet_data: deque) -> Packet:
         self.packet_deq = packet_data
-        self._original_packet_data = packet_data
         self._parse_data()
         return self
 

From 890aae9edc78a2ec5562ea03a1fd129f3f88f68e Mon Sep 17 00:00:00 2001
From: Roel Adriaans <roel@adriaans.org>
Date: Fri, 21 Oct 2022 20:51:34 +0200
Subject: [PATCH 161/371] Simplyfy, match is not needed, and remove dead code

---
 src/adventofcode2021/solutions/day16.py | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/src/adventofcode2021/solutions/day16.py b/src/adventofcode2021/solutions/day16.py
index 865fa926..86a0d0fa 100644
--- a/src/adventofcode2021/solutions/day16.py
+++ b/src/adventofcode2021/solutions/day16.py
@@ -77,11 +77,10 @@ def _parse_data(self):
         self.type_id = self._take_bits(3)
 
         # Parse the different types
-        match self.type_id:
-            case TypeID.LITERAL_VALUE.value:
-                self._parse_literal_value()
-            case _:
-                self._parse_operator()
+        if self.type_id == TypeID.LITERAL_VALUE.value:
+            self._parse_literal_value()
+        else:
+            self._parse_operator()
 
     def _parse_literal_value(self):
         """Parse literal value"""
@@ -96,8 +95,6 @@ def _parse_literal_value(self):
         return
 
     def _parse_operator(self):
-        # self.sub_packets = []
-
         self.length_type_id = self._take_bits(1)
 
         if self.length_type_id == 0:

From 8d7353a05a11741a061c670ceda2e64d6657983e Mon Sep 17 00:00:00 2001
From: Roel Adriaans <roel@adriaans.org>
Date: Sat, 22 Oct 2022 00:04:16 +0200
Subject: [PATCH 162/371] Implement part a

---
 .../solutions/data/day_17/day17.txt           |   1 +
 src/adventofcode2021/solutions/day17.py       | 104 ++++++++++++++++++
 tests/solutions/test_day17_a.py               |  63 +++++++++++
 3 files changed, 168 insertions(+)
 create mode 100644 src/adventofcode2021/solutions/data/day_17/day17.txt
 create mode 100644 src/adventofcode2021/solutions/day17.py
 create mode 100644 tests/solutions/test_day17_a.py

diff --git a/src/adventofcode2021/solutions/data/day_17/day17.txt b/src/adventofcode2021/solutions/data/day_17/day17.txt
new file mode 100644
index 00000000..190b8dda
--- /dev/null
+++ b/src/adventofcode2021/solutions/data/day_17/day17.txt
@@ -0,0 +1 @@
+target area: x=244..303, y=-91..-54
diff --git a/src/adventofcode2021/solutions/day17.py b/src/adventofcode2021/solutions/day17.py
new file mode 100644
index 00000000..66aa8910
--- /dev/null
+++ b/src/adventofcode2021/solutions/day17.py
@@ -0,0 +1,104 @@
+import logging
+import re
+from dataclasses import dataclass
+from typing import NamedTuple
+
+from adventofcode2021.utils.abstract import FileReaderSolution
+
+
+class Point(NamedTuple):
+    x: int
+    y: int
+
+
+@dataclass
+class TargetArea:
+    min_x: int
+    max_x: int
+    min_y: int
+    max_y: int
+
+    def __repr__(self):
+        return f"target area: x={self.min_x}..{self.max_x}, {self.min_y}..{self.max_y}"
+
+    def is_in_target(self, location: Point) -> bool:
+        """Return if we are withing the target spot"""
+        # This is not the best solution, but it works. Can be optimized.. :)
+        if location.x in range(self.min_x, self.max_x + 1) and location.y in range(
+            self.min_y, self.max_y + 1
+        ):
+            return True
+        else:
+            return False
+
+    def overshot(self, location: Point) -> bool:
+        """Returns True if the location is further away then the location"""
+        if location.x > self.max_x:
+            return True
+        if location.y < self.min_y:
+            return True
+        return False
+
+
+class Day17:
+    def parse_str(self, line: str) -> TargetArea:
+        p = re.compile(
+            r"target area: x=(?P<min_x>-?\d+)..(?P<max_x>-?\d+), "
+            r"y=(?P<min_y>-?\d+)..(?P<max_y>-?\d+)"
+        )
+
+        if match := p.search(line):
+            mdict = match.groupdict()
+            # Convert all the strings into integers
+            for key, value in mdict.items():
+                mdict[key] = int(value)
+            return TargetArea(**mdict)  # type: ignore
+        else:
+            raise ValueError("Line could not be matched: ", line)
+
+    @staticmethod
+    def compute_trajectory(
+        launch_speed: tuple[int, int], target: TargetArea
+    ) -> int | bool:
+        """Compute the trajectory and return the max height (y) from the course.
+        Returns an integer with the highest path, or false if we overshot
+        """
+        max_y = 0
+        location = Point(0, 0)
+        dx, dy = launch_speed
+        while not target.overshot(location):
+            # Looping
+            location = Point(location.x + dx, location.y + dy)
+            if dx > 0:
+                dx -= 1
+            elif dx < 0:
+                dx += 1
+            # Due to gravity, the probe's y velocity decreases by 1.
+            dy -= 1
+            max_y = max(max_y, location.y)
+            if target.is_in_target(location):
+                # We hit the target!
+                return max_y
+        # We overshot, not target reachable from here
+        return False
+
+
+class Day17PartA(Day17, FileReaderSolution):
+    def solve(self, input_data: str) -> int:
+        destination = self.parse_str(input_data)
+        found_max, max_dx, max_dy = 0, 0, 0
+
+        for dx in range(0, 23):
+            for dy in range(0, 91):
+                res = self.compute_trajectory((dx, dy), destination)
+                if res > found_max:
+                    found_max = res
+                    max_dx = dx
+                    max_dy = dy
+        logging.info(f"{max_dx=}, {max_dy=}")
+        return found_max
+
+
+class Day17PartB(Day17, FileReaderSolution):
+    def solve(self, input_data: str) -> int:
+        raise NotImplementedError
diff --git a/tests/solutions/test_day17_a.py b/tests/solutions/test_day17_a.py
new file mode 100644
index 00000000..c48cd478
--- /dev/null
+++ b/tests/solutions/test_day17_a.py
@@ -0,0 +1,63 @@
+import pytest
+
+from adventofcode2021.solutions.day17 import Day17PartA, Point, TargetArea
+
+
+class TestDay17PartA:
+    @pytest.mark.parametrize(
+        ("x", "y", "expected_result"),
+        [
+            (25, -7, True),
+            (20, -10, True),  # Living on the edge
+            (15, -7, False),
+            (20, 0, False),
+            (0, 0, False),
+        ],
+    )
+    def test_target(self, x, y, expected_result):
+        area = TargetArea(20, 30, -10, -5)
+        assert area.is_in_target(Point(x, y)) == expected_result
+
+    @pytest.mark.parametrize(
+        ("x", "y", "expected_result"),
+        [
+            (0, 0, False),  # Starting position
+            (15, 5, False),  # Above the target area, to the left of the area
+            (25, 7, False),  # Right above it
+            (15, -5, False),  # Vertically within the area, still above it
+            (31, -6, True),  # Next to it, to the right
+            (29, -11, True),  # Below the area
+        ],
+    )
+    def test_overshot(self, x, y, expected_result):
+        area = TargetArea(20, 30, -10, -5)
+        assert area.overshot(Point(x, y)) == expected_result
+
+    def test_trajectory(self):
+        solution = Day17PartA()
+        destination = solution.parse_str("target area: x=20..30, y=-10..-5")
+        assert destination.min_x == 20
+        assert destination.max_x == 30
+        assert destination.min_y == -10
+        assert destination.max_y == -5
+
+        result = solution.compute_trajectory((7, 2), target=destination)
+        assert result == 3
+
+        assert solution.compute_trajectory((6, 3), target=destination) == 6
+        assert solution.compute_trajectory((9, 0), target=destination) == 0
+        assert solution.compute_trajectory((17, -4), target=destination) is False
+
+    @pytest.mark.parametrize(
+        ("input_data", "expected_result"), [("target area: x=20..30, y=-10..-5", 45)]
+    )
+    def test_day17a_solve(self, input_data, expected_result):
+        solution = Day17PartA()
+        result = solution.solve(input_data)
+        assert result == expected_result
+
+    def test_day17a_data(self):
+        """Result we got when we did the real solution"""
+        solution = Day17PartA()
+        res = solution("day_17/day17.txt")
+        assert res == 4095

From ef977ea53014b04a2f8bc34f9ac97f3afc9250aa Mon Sep 17 00:00:00 2001
From: Roel Adriaans <roel@adriaans.org>
Date: Sat, 22 Oct 2022 00:33:04 +0200
Subject: [PATCH 163/371] Bruteforce part 2

---
 src/adventofcode2021/solutions/day17.py | 25 +++++++++++++++---
 tests/solutions/test_day17_b.py         | 34 +++++++++++++++++++++++++
 2 files changed, 56 insertions(+), 3 deletions(-)
 create mode 100644 tests/solutions/test_day17_b.py

diff --git a/src/adventofcode2021/solutions/day17.py b/src/adventofcode2021/solutions/day17.py
index 66aa8910..7bb0e66a 100644
--- a/src/adventofcode2021/solutions/day17.py
+++ b/src/adventofcode2021/solutions/day17.py
@@ -63,7 +63,7 @@ def compute_trajectory(
         """Compute the trajectory and return the max height (y) from the course.
         Returns an integer with the highest path, or false if we overshot
         """
-        max_y = 0
+        max_y = float("-inf")
         location = Point(0, 0)
         dx, dy = launch_speed
         while not target.overshot(location):
@@ -78,7 +78,7 @@ def compute_trajectory(
             max_y = max(max_y, location.y)
             if target.is_in_target(location):
                 # We hit the target!
-                return max_y
+                return int(max_y)
         # We overshot, not target reachable from here
         return False
 
@@ -101,4 +101,23 @@ def solve(self, input_data: str) -> int:
 
 class Day17PartB(Day17, FileReaderSolution):
     def solve(self, input_data: str) -> int:
-        raise NotImplementedError
+        destination = self.parse_str(input_data)
+        found = []
+
+        min_dy, min_dx = float("inf"), float("inf")
+        max_dy, max_dx = float("-inf"), float("-inf")
+
+        for dx in range(21, 304):
+            for dy in range(-92, 91):
+                res = self.compute_trajectory((dx, dy), destination)
+                if res is not False:
+                    min_dx = min(min_dx, dx)
+                    min_dy = min(min_dy, dy)
+                    max_dx = max(max_dx, dx)
+                    max_dy = max(max_dy, dy)
+                    found.append(res)
+
+        logging.info(f"{min_dy=}, {max_dy=}")
+        logging.info(f"{min_dx=}, {max_dx=}")
+
+        return len(found)
diff --git a/tests/solutions/test_day17_b.py b/tests/solutions/test_day17_b.py
new file mode 100644
index 00000000..88db82e7
--- /dev/null
+++ b/tests/solutions/test_day17_b.py
@@ -0,0 +1,34 @@
+import pytest
+
+from adventofcode2021.solutions.day17 import Day17PartB
+
+
+class TestDay17PartB:
+    @pytest.mark.parametrize(
+        ("velocity", "expected_result"),
+        [
+            ((23, -10), True),
+        ],
+    )
+    def test_locations(self, velocity, expected_result):
+        solution = Day17PartB()
+        destination = solution.parse_str("target area: x=20..30, y=-10..-5")
+        result = solution.compute_trajectory(velocity, target=destination)
+        if expected_result is True:
+            assert result is not False
+        else:
+            assert result is False
+
+    @pytest.mark.parametrize(
+        ("input_data", "expected_result"), [("target area: x=20..30, y=-10..-5", 112)]
+    )
+    def test_day17b_solve(self, input_data, expected_result):
+        solution = Day17PartB()
+        result = solution.solve(input_data)
+        assert result == expected_result
+
+    def test_day17b_data(self):
+        """Result we got when we did the real solution"""
+        solution = Day17PartB()
+        res = solution("day_17/day17.txt")
+        assert res == 3773

From df4639a3bc900dcd09c931711c6dd0e00e64979b Mon Sep 17 00:00:00 2001
From: Roel Adriaans <roel@adriaans.org>
Date: Sat, 22 Oct 2022 00:45:52 +0200
Subject: [PATCH 164/371] Optimise the locations we need to search

---
 src/adventofcode2021/solutions/day17.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/adventofcode2021/solutions/day17.py b/src/adventofcode2021/solutions/day17.py
index 7bb0e66a..41f1b1c9 100644
--- a/src/adventofcode2021/solutions/day17.py
+++ b/src/adventofcode2021/solutions/day17.py
@@ -107,8 +107,8 @@ def solve(self, input_data: str) -> int:
         min_dy, min_dx = float("inf"), float("inf")
         max_dy, max_dx = float("-inf"), float("-inf")
 
-        for dx in range(21, 304):
-            for dy in range(-92, 91):
+        for dx in range(1, destination.max_x + 1):
+            for dy in range(destination.min_y, abs(destination.min_y)):
                 res = self.compute_trajectory((dx, dy), destination)
                 if res is not False:
                     min_dx = min(min_dx, dx)

From ba3f88981c26cb049a11c78fe7a16d1a1d796d9e Mon Sep 17 00:00:00 2001
From: Roel Adriaans <roel.adriaans@asml.com>
Date: Sun, 23 Oct 2022 13:09:12 +0200
Subject: [PATCH 165/371] Cleanup a bit of branch 17

---
 src/adventofcode2021/solutions/day17.py | 21 +++++++--------------
 1 file changed, 7 insertions(+), 14 deletions(-)

diff --git a/src/adventofcode2021/solutions/day17.py b/src/adventofcode2021/solutions/day17.py
index 41f1b1c9..7bfab9c9 100644
--- a/src/adventofcode2021/solutions/day17.py
+++ b/src/adventofcode2021/solutions/day17.py
@@ -23,21 +23,14 @@ def __repr__(self):
 
     def is_in_target(self, location: Point) -> bool:
         """Return if we are withing the target spot"""
-        # This is not the best solution, but it works. Can be optimized.. :)
-        if location.x in range(self.min_x, self.max_x + 1) and location.y in range(
-            self.min_y, self.max_y + 1
-        ):
-            return True
-        else:
-            return False
+        return (
+            self.min_x <= location.x <= self.max_x
+            and self.min_y <= location.y <= self.max_y
+        )
 
     def overshot(self, location: Point) -> bool:
         """Returns True if the location is further away then the location"""
-        if location.x > self.max_x:
-            return True
-        if location.y < self.min_y:
-            return True
-        return False
+        return location.x > self.max_x or location.y < self.min_y
 
 
 class Day17:
@@ -88,8 +81,8 @@ def solve(self, input_data: str) -> int:
         destination = self.parse_str(input_data)
         found_max, max_dx, max_dy = 0, 0, 0
 
-        for dx in range(0, 23):
-            for dy in range(0, 91):
+        for dx in range(1, destination.max_x + 1):
+            for dy in range(destination.min_y, abs(destination.min_y)):
                 res = self.compute_trajectory((dx, dy), destination)
                 if res > found_max:
                     found_max = res

From eb1056c0c2d1840976fe29db20edb20eb5fcf9e7 Mon Sep 17 00:00:00 2001
From: Roel Adriaans <roel@adriaans.org>
Date: Sun, 23 Oct 2022 16:40:57 +0200
Subject: [PATCH 166/371] Cleanup

---
 src/adventofcode2021/solutions/day17.py | 44 +++++++++----------------
 1 file changed, 15 insertions(+), 29 deletions(-)

diff --git a/src/adventofcode2021/solutions/day17.py b/src/adventofcode2021/solutions/day17.py
index 41f1b1c9..f685b63c 100644
--- a/src/adventofcode2021/solutions/day17.py
+++ b/src/adventofcode2021/solutions/day17.py
@@ -1,4 +1,3 @@
-import logging
 import re
 from dataclasses import dataclass
 from typing import NamedTuple
@@ -71,8 +70,6 @@ def compute_trajectory(
             location = Point(location.x + dx, location.y + dy)
             if dx > 0:
                 dx -= 1
-            elif dx < 0:
-                dx += 1
             # Due to gravity, the probe's y velocity decreases by 1.
             dy -= 1
             max_y = max(max_y, location.y)
@@ -82,42 +79,31 @@ def compute_trajectory(
         # We overshot, not target reachable from here
         return False
 
+    @staticmethod
+    def yield_values(destination):
+        """Yield the dx, dy values that can be valid starting points"""
+        for dx in range(1, destination.max_x + 1):
+            for dy in range(destination.min_y, abs(destination.min_y)):
+                yield dx, dy
+
 
 class Day17PartA(Day17, FileReaderSolution):
     def solve(self, input_data: str) -> int:
         destination = self.parse_str(input_data)
-        found_max, max_dx, max_dy = 0, 0, 0
 
-        for dx in range(0, 23):
-            for dy in range(0, 91):
-                res = self.compute_trajectory((dx, dy), destination)
-                if res > found_max:
-                    found_max = res
-                    max_dx = dx
-                    max_dy = dy
-        logging.info(f"{max_dx=}, {max_dy=}")
-        return found_max
+        return max(
+            self.compute_trajectory((dx, dy), destination)
+            for dx, dy in self.yield_values(destination)
+        )
 
 
 class Day17PartB(Day17, FileReaderSolution):
     def solve(self, input_data: str) -> int:
         destination = self.parse_str(input_data)
         found = []
-
-        min_dy, min_dx = float("inf"), float("inf")
-        max_dy, max_dx = float("-inf"), float("-inf")
-
-        for dx in range(1, destination.max_x + 1):
-            for dy in range(destination.min_y, abs(destination.min_y)):
-                res = self.compute_trajectory((dx, dy), destination)
-                if res is not False:
-                    min_dx = min(min_dx, dx)
-                    min_dy = min(min_dy, dy)
-                    max_dx = max(max_dx, dx)
-                    max_dy = max(max_dy, dy)
-                    found.append(res)
-
-        logging.info(f"{min_dy=}, {max_dy=}")
-        logging.info(f"{min_dx=}, {max_dx=}")
+        for dx, dy in self.yield_values(destination):
+            res = self.compute_trajectory((dx, dy), destination)
+            if res is not False:
+                found.append(res)
 
         return len(found)

From 30ca96d890c106f026422e038c6379f0d5abeb64 Mon Sep 17 00:00:00 2001
From: Roel Adriaans <roel.adriaans@asml.com>
Date: Mon, 24 Oct 2022 16:39:12 +0200
Subject: [PATCH 167/371] Cleanup test

---
 tests/solutions/test_day17_b.py | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/tests/solutions/test_day17_b.py b/tests/solutions/test_day17_b.py
index 88db82e7..7715110b 100644
--- a/tests/solutions/test_day17_b.py
+++ b/tests/solutions/test_day17_b.py
@@ -14,10 +14,7 @@ def test_locations(self, velocity, expected_result):
         solution = Day17PartB()
         destination = solution.parse_str("target area: x=20..30, y=-10..-5")
         result = solution.compute_trajectory(velocity, target=destination)
-        if expected_result is True:
-            assert result is not False
-        else:
-            assert result is False
+        assert result is not expected_result
 
     @pytest.mark.parametrize(
         ("input_data", "expected_result"), [("target area: x=20..30, y=-10..-5", 112)]

From 1f26e0ec7a50bb302d10da92207dc5766daac404 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 26 Oct 2022 19:00:29 +0200
Subject: [PATCH 168/371] Bump tox from 3.26.0 to 3.27.0 (#81)

Bumps [tox](https://github.com/tox-dev/tox) from 3.26.0 to 3.27.0.
- [Release notes](https://github.com/tox-dev/tox/releases)
- [Changelog](https://github.com/tox-dev/tox/blob/master/docs/changelog.rst)
- [Commits](https://github.com/tox-dev/tox/compare/3.26.0...3.27.0)

---
updated-dependencies:
- dependency-name: tox
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 poetry.lock    | 403 ++++++++++++++++++++++++++++++++++++++++++-------
 pyproject.toml |   2 +-
 2 files changed, 346 insertions(+), 59 deletions(-)

diff --git a/poetry.lock b/poetry.lock
index 685618ac..a00e17cb 100644
--- a/poetry.lock
+++ b/poetry.lock
@@ -33,10 +33,10 @@ optional = false
 python-versions = ">=3.5"
 
 [package.extras]
-dev = ["coverage[toml] (>=5.0.2)", "hypothesis", "pympler", "pytest (>=4.3.0)", "mypy (>=0.900,!=0.940)", "pytest-mypy-plugins", "zope.interface", "furo", "sphinx", "sphinx-notfound-page", "pre-commit", "cloudpickle"]
-docs = ["furo", "sphinx", "zope.interface", "sphinx-notfound-page"]
-tests = ["coverage[toml] (>=5.0.2)", "hypothesis", "pympler", "pytest (>=4.3.0)", "mypy (>=0.900,!=0.940)", "pytest-mypy-plugins", "zope.interface", "cloudpickle"]
-tests_no_zope = ["coverage[toml] (>=5.0.2)", "hypothesis", "pympler", "pytest (>=4.3.0)", "mypy (>=0.900,!=0.940)", "pytest-mypy-plugins", "cloudpickle"]
+dev = ["cloudpickle", "coverage[toml] (>=5.0.2)", "furo", "hypothesis", "mypy (>=0.900,!=0.940)", "pre-commit", "pympler", "pytest (>=4.3.0)", "pytest-mypy-plugins", "sphinx", "sphinx-notfound-page", "zope.interface"]
+docs = ["furo", "sphinx", "sphinx-notfound-page", "zope.interface"]
+tests = ["cloudpickle", "coverage[toml] (>=5.0.2)", "hypothesis", "mypy (>=0.900,!=0.940)", "pympler", "pytest (>=4.3.0)", "pytest-mypy-plugins", "zope.interface"]
+tests-no-zope = ["cloudpickle", "coverage[toml] (>=5.0.2)", "hypothesis", "mypy (>=0.900,!=0.940)", "pympler", "pytest (>=4.3.0)", "pytest-mypy-plugins"]
 
 [[package]]
 name = "beautifulsoup4"
@@ -118,7 +118,7 @@ optional = false
 python-versions = ">=3.6.0"
 
 [package.extras]
-unicode_backport = ["unicodedata2"]
+unicode-backport = ["unicodedata2"]
 
 [[package]]
 name = "click"
@@ -237,10 +237,10 @@ optional = false
 python-versions = ">=3.6.1,<4.0"
 
 [package.extras]
-pipfile_deprecated_finder = ["pipreqs", "requirementslib"]
-requirements_deprecated_finder = ["pipreqs", "pip-api"]
 colors = ["colorama (>=0.4.3,<0.5.0)"]
+pipfile-deprecated-finder = ["pipreqs", "requirementslib"]
 plugins = ["setuptools"]
+requirements-deprecated-finder = ["pip-api", "pipreqs"]
 
 [[package]]
 name = "jinja2"
@@ -292,6 +292,9 @@ category = "dev"
 optional = false
 python-versions = ">=2.7,!=3.0.*,!=3.1.*,!=3.2.*,!=3.3.*,!=3.4.*,!=3.5.*,!=3.6.*"
 
+[package.dependencies]
+setuptools = "*"
+
 [[package]]
 name = "packaging"
 version = "21.3"
@@ -320,8 +323,8 @@ optional = false
 python-versions = ">=3.7"
 
 [package.extras]
-docs = ["furo (>=2021.7.5b38)", "proselint (>=0.10.2)", "sphinx-autodoc-typehints (>=1.12)", "sphinx (>=4)"]
-test = ["appdirs (==1.4.4)", "pytest-cov (>=2.7)", "pytest-mock (>=3.6)", "pytest (>=6)"]
+docs = ["furo (>=2021.7.5b38)", "proselint (>=0.10.2)", "sphinx (>=4)", "sphinx-autodoc-typehints (>=1.12)"]
+test = ["appdirs (==1.4.4)", "pytest (>=6)", "pytest-cov (>=2.7)", "pytest-mock (>=3.6)"]
 
 [[package]]
 name = "pluggy"
@@ -368,7 +371,7 @@ optional = false
 python-versions = ">=3.6.8"
 
 [package.extras]
-diagrams = ["railroad-diagrams", "jinja2"]
+diagrams = ["jinja2", "railroad-diagrams"]
 
 [[package]]
 name = "pytest"
@@ -403,7 +406,7 @@ coverage = {version = ">=5.2.1", extras = ["toml"]}
 pytest = ">=4.6"
 
 [package.extras]
-testing = ["fields", "hunter", "process-tests", "six", "pytest-xdist", "virtualenv"]
+testing = ["fields", "hunter", "process-tests", "pytest-xdist", "six", "virtualenv"]
 
 [[package]]
 name = "pytest-forked"
@@ -495,7 +498,20 @@ urllib3 = ">=1.21.1,<1.27"
 
 [package.extras]
 socks = ["PySocks (>=1.5.6,!=1.5.7)"]
-use_chardet_on_py3 = ["chardet (>=3.0.2,<6)"]
+use-chardet-on-py3 = ["chardet (>=3.0.2,<6)"]
+
+[[package]]
+name = "setuptools"
+version = "65.5.0"
+description = "Easily download, build, install, upgrade, and uninstall Python packages"
+category = "dev"
+optional = false
+python-versions = ">=3.7"
+
+[package.extras]
+docs = ["furo", "jaraco.packaging (>=9)", "jaraco.tidelift (>=1.4)", "pygments-github-lexers (==0.0.5)", "rst.linker (>=1.9)", "sphinx (>=3.5)", "sphinx-favicon", "sphinx-hoverxref (<2)", "sphinx-inline-tabs", "sphinx-notfound-page (==0.8.3)", "sphinx-reredirects", "sphinxcontrib-towncrier"]
+testing = ["build[virtualenv]", "filelock (>=3.4.0)", "flake8 (<5)", "flake8-2020", "ini2toml[lite] (>=0.9)", "jaraco.envs (>=2.2)", "jaraco.path (>=3.2.0)", "mock", "pip (>=19.1)", "pip-run (>=8.8)", "pytest (>=6)", "pytest-black (>=0.3.7)", "pytest-checkdocs (>=2.4)", "pytest-cov", "pytest-enabler (>=1.3)", "pytest-flake8", "pytest-mypy (>=0.9.1)", "pytest-perf", "pytest-xdist", "tomli-w (>=1.0.0)", "virtualenv (>=13.0.0)", "wheel"]
+testing-integration = ["build[virtualenv]", "filelock (>=3.4.0)", "jaraco.envs (>=2.2)", "jaraco.path (>=3.2.0)", "pytest", "pytest-enabler", "pytest-xdist", "tomli", "virtualenv (>=13.0.0)", "wheel"]
 
 [[package]]
 name = "six"
@@ -539,7 +555,7 @@ python-versions = ">=3.7"
 
 [[package]]
 name = "tox"
-version = "3.26.0"
+version = "3.27.0"
 description = "tox is a generic virtualenv management and test command line tool"
 category = "dev"
 optional = false
@@ -557,7 +573,7 @@ virtualenv = ">=16.0.0,<20.0.0 || >20.0.0,<20.0.1 || >20.0.1,<20.0.2 || >20.0.2,
 
 [package.extras]
 docs = ["pygments-github-lexers (>=0.0.5)", "sphinx (>=2.0.0)", "sphinxcontrib-autoprogram (>=0.1.5)", "towncrier (>=18.5.0)"]
-testing = ["flaky (>=3.4.0)", "freezegun (>=0.3.11)", "pytest (>=4.0.0)", "pytest-cov (>=2.5.1)", "pytest-mock (>=1.10.0)", "pytest-randomly (>=1.0.0)", "psutil (>=5.6.1)", "pathlib2 (>=2.3.3)"]
+testing = ["flaky (>=3.4.0)", "freezegun (>=0.3.11)", "pathlib2 (>=2.3.3)", "psutil (>=5.6.1)", "pytest (>=4.0.0)", "pytest-cov (>=2.5.1)", "pytest-mock (>=1.10.0)", "pytest-randomly (>=1.0.0)"]
 
 [[package]]
 name = "tqdm"
@@ -585,8 +601,8 @@ optional = false
 python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*, !=3.5.*, <4"
 
 [package.extras]
-brotli = ["brotlicffi (>=0.8.0)", "brotli (>=1.0.9)", "brotlipy (>=0.6.0)"]
-secure = ["pyOpenSSL (>=0.14)", "cryptography (>=1.3.4)", "idna (>=2.0.0)", "certifi", "urllib3-secure-extra", "ipaddress"]
+brotli = ["brotli (>=1.0.9)", "brotlicffi (>=0.8.0)", "brotlipy (>=0.6.0)"]
+secure = ["certifi", "cryptography (>=1.3.4)", "idna (>=2.0.0)", "ipaddress", "pyOpenSSL (>=0.14)", "urllib3-secure-extra"]
 socks = ["PySocks (>=1.5.6,!=1.5.7,<2.0)"]
 
 [[package]]
@@ -609,77 +625,336 @@ testing = ["coverage (>=6.2)", "coverage-enable-subprocess (>=1)", "flaky (>=3.7
 [metadata]
 lock-version = "1.1"
 python-versions = "^3.10"
-content-hash = "cf9e268590e8b1eb0e0c421733f39bc9a4ad1df7cea343af93cde1af67eb1a40"
+content-hash = "2d01a3fd4cd57f82e438d74ab6638b055737fdc2d12e29dd5f571c3b551578e0"
 
 [metadata.files]
 anytree = [
     {file = "anytree-2.8.0-py2.py3-none-any.whl", hash = "sha256:14c55ac77492b11532395049a03b773d14c7e30b22aa012e337b1e983de31521"},
     {file = "anytree-2.8.0.tar.gz", hash = "sha256:3f0f93f355a91bc3e6245319bf4c1d50e3416cc7a35cc1133c1ff38306bbccab"},
 ]
-arrow = []
-attrs = []
-beautifulsoup4 = []
-binaryornot = []
-black = []
-certifi = []
-cfgv = []
-chardet = []
-charset-normalizer = []
-click = []
-colorama = []
-cookiecutter = []
-coverage = []
-distlib = []
-execnet = []
-filelock = []
-identify = []
-idna = []
+arrow = [
+    {file = "arrow-1.2.3-py3-none-any.whl", hash = "sha256:5a49ab92e3b7b71d96cd6bfcc4df14efefc9dfa96ea19045815914a6ab6b1fe2"},
+    {file = "arrow-1.2.3.tar.gz", hash = "sha256:3934b30ca1b9f292376d9db15b19446088d12ec58629bc3f0da28fd55fb633a1"},
+]
+attrs = [
+    {file = "attrs-22.1.0-py2.py3-none-any.whl", hash = "sha256:86efa402f67bf2df34f51a335487cf46b1ec130d02b8d39fd248abfd30da551c"},
+    {file = "attrs-22.1.0.tar.gz", hash = "sha256:29adc2665447e5191d0e7c568fde78b21f9672d344281d0c6e1ab085429b22b6"},
+]
+beautifulsoup4 = [
+    {file = "beautifulsoup4-4.11.1-py3-none-any.whl", hash = "sha256:58d5c3d29f5a36ffeb94f02f0d786cd53014cf9b3b3951d42e0080d8a9498d30"},
+    {file = "beautifulsoup4-4.11.1.tar.gz", hash = "sha256:ad9aa55b65ef2808eb405f46cf74df7fcb7044d5cbc26487f96eb2ef2e436693"},
+]
+binaryornot = [
+    {file = "binaryornot-0.4.4-py2.py3-none-any.whl", hash = "sha256:b8b71173c917bddcd2c16070412e369c3ed7f0528926f70cac18a6c97fd563e4"},
+    {file = "binaryornot-0.4.4.tar.gz", hash = "sha256:359501dfc9d40632edc9fac890e19542db1a287bbcfa58175b66658392018061"},
+]
+black = [
+    {file = "black-22.10.0-1fixedarch-cp310-cp310-macosx_11_0_x86_64.whl", hash = "sha256:5cc42ca67989e9c3cf859e84c2bf014f6633db63d1cbdf8fdb666dcd9e77e3fa"},
+    {file = "black-22.10.0-1fixedarch-cp311-cp311-macosx_11_0_x86_64.whl", hash = "sha256:5d8f74030e67087b219b032aa33a919fae8806d49c867846bfacde57f43972ef"},
+    {file = "black-22.10.0-1fixedarch-cp37-cp37m-macosx_10_16_x86_64.whl", hash = "sha256:197df8509263b0b8614e1df1756b1dd41be6738eed2ba9e9769f3880c2b9d7b6"},
+    {file = "black-22.10.0-1fixedarch-cp38-cp38-macosx_10_16_x86_64.whl", hash = "sha256:2644b5d63633702bc2c5f3754b1b475378fbbfb481f62319388235d0cd104c2d"},
+    {file = "black-22.10.0-1fixedarch-cp39-cp39-macosx_11_0_x86_64.whl", hash = "sha256:e41a86c6c650bcecc6633ee3180d80a025db041a8e2398dcc059b3afa8382cd4"},
+    {file = "black-22.10.0-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:2039230db3c6c639bd84efe3292ec7b06e9214a2992cd9beb293d639c6402edb"},
+    {file = "black-22.10.0-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:14ff67aec0a47c424bc99b71005202045dc09270da44a27848d534600ac64fc7"},
+    {file = "black-22.10.0-cp310-cp310-win_amd64.whl", hash = "sha256:819dc789f4498ecc91438a7de64427c73b45035e2e3680c92e18795a839ebb66"},
+    {file = "black-22.10.0-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:5b9b29da4f564ba8787c119f37d174f2b69cdfdf9015b7d8c5c16121ddc054ae"},
+    {file = "black-22.10.0-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:b8b49776299fece66bffaafe357d929ca9451450f5466e997a7285ab0fe28e3b"},
+    {file = "black-22.10.0-cp311-cp311-win_amd64.whl", hash = "sha256:21199526696b8f09c3997e2b4db8d0b108d801a348414264d2eb8eb2532e540d"},
+    {file = "black-22.10.0-cp37-cp37m-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:1e464456d24e23d11fced2bc8c47ef66d471f845c7b7a42f3bd77bf3d1789650"},
+    {file = "black-22.10.0-cp37-cp37m-win_amd64.whl", hash = "sha256:9311e99228ae10023300ecac05be5a296f60d2fd10fff31cf5c1fa4ca4b1988d"},
+    {file = "black-22.10.0-cp38-cp38-macosx_11_0_arm64.whl", hash = "sha256:fba8a281e570adafb79f7755ac8721b6cf1bbf691186a287e990c7929c7692ff"},
+    {file = "black-22.10.0-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:915ace4ff03fdfff953962fa672d44be269deb2eaf88499a0f8805221bc68c87"},
+    {file = "black-22.10.0-cp38-cp38-win_amd64.whl", hash = "sha256:444ebfb4e441254e87bad00c661fe32df9969b2bf224373a448d8aca2132b395"},
+    {file = "black-22.10.0-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:974308c58d057a651d182208a484ce80a26dac0caef2895836a92dd6ebd725e0"},
+    {file = "black-22.10.0-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:72ef3925f30e12a184889aac03d77d031056860ccae8a1e519f6cbb742736383"},
+    {file = "black-22.10.0-cp39-cp39-win_amd64.whl", hash = "sha256:432247333090c8c5366e69627ccb363bc58514ae3e63f7fc75c54b1ea80fa7de"},
+    {file = "black-22.10.0-py3-none-any.whl", hash = "sha256:c957b2b4ea88587b46cf49d1dc17681c1e672864fd7af32fc1e9664d572b3458"},
+    {file = "black-22.10.0.tar.gz", hash = "sha256:f513588da599943e0cde4e32cc9879e825d58720d6557062d1098c5ad80080e1"},
+]
+certifi = [
+    {file = "certifi-2022.9.24-py3-none-any.whl", hash = "sha256:90c1a32f1d68f940488354e36370f6cca89f0f106db09518524c88d6ed83f382"},
+    {file = "certifi-2022.9.24.tar.gz", hash = "sha256:0d9c601124e5a6ba9712dbc60d9c53c21e34f5f641fe83002317394311bdce14"},
+]
+cfgv = [
+    {file = "cfgv-3.3.1-py2.py3-none-any.whl", hash = "sha256:c6a0883f3917a037485059700b9e75da2464e6c27051014ad85ba6aaa5884426"},
+    {file = "cfgv-3.3.1.tar.gz", hash = "sha256:f5a830efb9ce7a445376bb66ec94c638a9787422f96264c98edc6bdeed8ab736"},
+]
+chardet = [
+    {file = "chardet-5.0.0-py3-none-any.whl", hash = "sha256:d3e64f022d254183001eccc5db4040520c0f23b1a3f33d6413e099eb7f126557"},
+    {file = "chardet-5.0.0.tar.gz", hash = "sha256:0368df2bfd78b5fc20572bb4e9bb7fb53e2c094f60ae9993339e8671d0afb8aa"},
+]
+charset-normalizer = [
+    {file = "charset-normalizer-2.1.1.tar.gz", hash = "sha256:5a3d016c7c547f69d6f81fb0db9449ce888b418b5b9952cc5e6e66843e9dd845"},
+    {file = "charset_normalizer-2.1.1-py3-none-any.whl", hash = "sha256:83e9a75d1911279afd89352c68b45348559d1fc0506b054b346651b5e7fee29f"},
+]
+click = [
+    {file = "click-8.1.3-py3-none-any.whl", hash = "sha256:bb4d8133cb15a609f44e8213d9b391b0809795062913b383c62be0ee95b1db48"},
+    {file = "click-8.1.3.tar.gz", hash = "sha256:7682dc8afb30297001674575ea00d1814d808d6a36af415a82bd481d37ba7b8e"},
+]
+colorama = [
+    {file = "colorama-0.4.5-py2.py3-none-any.whl", hash = "sha256:854bf444933e37f5824ae7bfc1e98d5bce2ebe4160d46b5edf346a89358e99da"},
+    {file = "colorama-0.4.5.tar.gz", hash = "sha256:e6c6b4334fc50988a639d9b98aa429a0b57da6e17b9a44f0451f930b6967b7a4"},
+]
+cookiecutter = [
+    {file = "cookiecutter-2.1.1-py2.py3-none-any.whl", hash = "sha256:9f3ab027cec4f70916e28f03470bdb41e637a3ad354b4d65c765d93aad160022"},
+    {file = "cookiecutter-2.1.1.tar.gz", hash = "sha256:f3982be8d9c53dac1261864013fdec7f83afd2e42ede6f6dd069c5e149c540d5"},
+]
+coverage = [
+    {file = "coverage-6.5.0-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:ef8674b0ee8cc11e2d574e3e2998aea5df5ab242e012286824ea3c6970580e53"},
+    {file = "coverage-6.5.0-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:784f53ebc9f3fd0e2a3f6a78b2be1bd1f5575d7863e10c6e12504f240fd06660"},
+    {file = "coverage-6.5.0-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:b4a5be1748d538a710f87542f22c2cad22f80545a847ad91ce45e77417293eb4"},
+    {file = "coverage-6.5.0-cp310-cp310-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:83516205e254a0cb77d2d7bb3632ee019d93d9f4005de31dca0a8c3667d5bc04"},
+    {file = "coverage-6.5.0-cp310-cp310-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:af4fffaffc4067232253715065e30c5a7ec6faac36f8fc8d6f64263b15f74db0"},
+    {file = "coverage-6.5.0-cp310-cp310-musllinux_1_1_aarch64.whl", hash = "sha256:97117225cdd992a9c2a5515db1f66b59db634f59d0679ca1fa3fe8da32749cae"},
+    {file = "coverage-6.5.0-cp310-cp310-musllinux_1_1_i686.whl", hash = "sha256:a1170fa54185845505fbfa672f1c1ab175446c887cce8212c44149581cf2d466"},
+    {file = "coverage-6.5.0-cp310-cp310-musllinux_1_1_x86_64.whl", hash = "sha256:11b990d520ea75e7ee8dcab5bc908072aaada194a794db9f6d7d5cfd19661e5a"},
+    {file = "coverage-6.5.0-cp310-cp310-win32.whl", hash = "sha256:5dbec3b9095749390c09ab7c89d314727f18800060d8d24e87f01fb9cfb40b32"},
+    {file = "coverage-6.5.0-cp310-cp310-win_amd64.whl", hash = "sha256:59f53f1dc5b656cafb1badd0feb428c1e7bc19b867479ff72f7a9dd9b479f10e"},
+    {file = "coverage-6.5.0-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:4a5375e28c5191ac38cca59b38edd33ef4cc914732c916f2929029b4bfb50795"},
+    {file = "coverage-6.5.0-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:c4ed2820d919351f4167e52425e096af41bfabacb1857186c1ea32ff9983ed75"},
+    {file = "coverage-6.5.0-cp311-cp311-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:33a7da4376d5977fbf0a8ed91c4dffaaa8dbf0ddbf4c8eea500a2486d8bc4d7b"},
+    {file = "coverage-6.5.0-cp311-cp311-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:a8fb6cf131ac4070c9c5a3e21de0f7dc5a0fbe8bc77c9456ced896c12fcdad91"},
+    {file = "coverage-6.5.0-cp311-cp311-musllinux_1_1_aarch64.whl", hash = "sha256:a6b7d95969b8845250586f269e81e5dfdd8ff828ddeb8567a4a2eaa7313460c4"},
+    {file = "coverage-6.5.0-cp311-cp311-musllinux_1_1_i686.whl", hash = "sha256:1ef221513e6f68b69ee9e159506d583d31aa3567e0ae84eaad9d6ec1107dddaa"},
+    {file = "coverage-6.5.0-cp311-cp311-musllinux_1_1_x86_64.whl", hash = "sha256:cca4435eebea7962a52bdb216dec27215d0df64cf27fc1dd538415f5d2b9da6b"},
+    {file = "coverage-6.5.0-cp311-cp311-win32.whl", hash = "sha256:98e8a10b7a314f454d9eff4216a9a94d143a7ee65018dd12442e898ee2310578"},
+    {file = "coverage-6.5.0-cp311-cp311-win_amd64.whl", hash = "sha256:bc8ef5e043a2af066fa8cbfc6e708d58017024dc4345a1f9757b329a249f041b"},
+    {file = "coverage-6.5.0-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:4433b90fae13f86fafff0b326453dd42fc9a639a0d9e4eec4d366436d1a41b6d"},
+    {file = "coverage-6.5.0-cp37-cp37m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:f4f05d88d9a80ad3cac6244d36dd89a3c00abc16371769f1340101d3cb899fc3"},
+    {file = "coverage-6.5.0-cp37-cp37m-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:94e2565443291bd778421856bc975d351738963071e9b8839ca1fc08b42d4bef"},
+    {file = "coverage-6.5.0-cp37-cp37m-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:027018943386e7b942fa832372ebc120155fd970837489896099f5cfa2890f79"},
+    {file = "coverage-6.5.0-cp37-cp37m-musllinux_1_1_aarch64.whl", hash = "sha256:255758a1e3b61db372ec2736c8e2a1fdfaf563977eedbdf131de003ca5779b7d"},
+    {file = "coverage-6.5.0-cp37-cp37m-musllinux_1_1_i686.whl", hash = "sha256:851cf4ff24062c6aec510a454b2584f6e998cada52d4cb58c5e233d07172e50c"},
+    {file = "coverage-6.5.0-cp37-cp37m-musllinux_1_1_x86_64.whl", hash = "sha256:12adf310e4aafddc58afdb04d686795f33f4d7a6fa67a7a9d4ce7d6ae24d949f"},
+    {file = "coverage-6.5.0-cp37-cp37m-win32.whl", hash = "sha256:b5604380f3415ba69de87a289a2b56687faa4fe04dbee0754bfcae433489316b"},
+    {file = "coverage-6.5.0-cp37-cp37m-win_amd64.whl", hash = "sha256:4a8dbc1f0fbb2ae3de73eb0bdbb914180c7abfbf258e90b311dcd4f585d44bd2"},
+    {file = "coverage-6.5.0-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:d900bb429fdfd7f511f868cedd03a6bbb142f3f9118c09b99ef8dc9bf9643c3c"},
+    {file = "coverage-6.5.0-cp38-cp38-macosx_11_0_arm64.whl", hash = "sha256:2198ea6fc548de52adc826f62cb18554caedfb1d26548c1b7c88d8f7faa8f6ba"},
+    {file = "coverage-6.5.0-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:6c4459b3de97b75e3bd6b7d4b7f0db13f17f504f3d13e2a7c623786289dd670e"},
+    {file = "coverage-6.5.0-cp38-cp38-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:20c8ac5386253717e5ccc827caad43ed66fea0efe255727b1053a8154d952398"},
+    {file = "coverage-6.5.0-cp38-cp38-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:6b07130585d54fe8dff3d97b93b0e20290de974dc8177c320aeaf23459219c0b"},
+    {file = "coverage-6.5.0-cp38-cp38-musllinux_1_1_aarch64.whl", hash = "sha256:dbdb91cd8c048c2b09eb17713b0c12a54fbd587d79adcebad543bc0cd9a3410b"},
+    {file = "coverage-6.5.0-cp38-cp38-musllinux_1_1_i686.whl", hash = "sha256:de3001a203182842a4630e7b8d1a2c7c07ec1b45d3084a83d5d227a3806f530f"},
+    {file = "coverage-6.5.0-cp38-cp38-musllinux_1_1_x86_64.whl", hash = "sha256:e07f4a4a9b41583d6eabec04f8b68076ab3cd44c20bd29332c6572dda36f372e"},
+    {file = "coverage-6.5.0-cp38-cp38-win32.whl", hash = "sha256:6d4817234349a80dbf03640cec6109cd90cba068330703fa65ddf56b60223a6d"},
+    {file = "coverage-6.5.0-cp38-cp38-win_amd64.whl", hash = "sha256:7ccf362abd726b0410bf8911c31fbf97f09f8f1061f8c1cf03dfc4b6372848f6"},
+    {file = "coverage-6.5.0-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:633713d70ad6bfc49b34ead4060531658dc6dfc9b3eb7d8a716d5873377ab745"},
+    {file = "coverage-6.5.0-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:95203854f974e07af96358c0b261f1048d8e1083f2de9b1c565e1be4a3a48cfc"},
+    {file = "coverage-6.5.0-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:b9023e237f4c02ff739581ef35969c3739445fb059b060ca51771e69101efffe"},
+    {file = "coverage-6.5.0-cp39-cp39-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:265de0fa6778d07de30bcf4d9dc471c3dc4314a23a3c6603d356a3c9abc2dfcf"},
+    {file = "coverage-6.5.0-cp39-cp39-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:8f830ed581b45b82451a40faabb89c84e1a998124ee4212d440e9c6cf70083e5"},
+    {file = "coverage-6.5.0-cp39-cp39-musllinux_1_1_aarch64.whl", hash = "sha256:7b6be138d61e458e18d8e6ddcddd36dd96215edfe5f1168de0b1b32635839b62"},
+    {file = "coverage-6.5.0-cp39-cp39-musllinux_1_1_i686.whl", hash = "sha256:42eafe6778551cf006a7c43153af1211c3aaab658d4d66fa5fcc021613d02518"},
+    {file = "coverage-6.5.0-cp39-cp39-musllinux_1_1_x86_64.whl", hash = "sha256:723e8130d4ecc8f56e9a611e73b31219595baa3bb252d539206f7bbbab6ffc1f"},
+    {file = "coverage-6.5.0-cp39-cp39-win32.whl", hash = "sha256:d9ecf0829c6a62b9b573c7bb6d4dcd6ba8b6f80be9ba4fc7ed50bf4ac9aecd72"},
+    {file = "coverage-6.5.0-cp39-cp39-win_amd64.whl", hash = "sha256:fc2af30ed0d5ae0b1abdb4ebdce598eafd5b35397d4d75deb341a614d333d987"},
+    {file = "coverage-6.5.0-pp36.pp37.pp38-none-any.whl", hash = "sha256:1431986dac3923c5945271f169f59c45b8802a114c8f548d611f2015133df77a"},
+    {file = "coverage-6.5.0.tar.gz", hash = "sha256:f642e90754ee3e06b0e7e51bce3379590e76b7f76b708e1a71ff043f87025c84"},
+]
+distlib = [
+    {file = "distlib-0.3.6-py2.py3-none-any.whl", hash = "sha256:f35c4b692542ca110de7ef0bea44d73981caeb34ca0b9b6b2e6d7790dda8f80e"},
+    {file = "distlib-0.3.6.tar.gz", hash = "sha256:14bad2d9b04d3a36127ac97f30b12a19268f211063d8f8ee4f47108896e11b46"},
+]
+execnet = [
+    {file = "execnet-1.9.0-py2.py3-none-any.whl", hash = "sha256:a295f7cc774947aac58dde7fdc85f4aa00c42adf5d8f5468fc630c1acf30a142"},
+    {file = "execnet-1.9.0.tar.gz", hash = "sha256:8f694f3ba9cc92cab508b152dcfe322153975c29bda272e2fd7f3f00f36e47c5"},
+]
+filelock = [
+    {file = "filelock-3.8.0-py3-none-any.whl", hash = "sha256:617eb4e5eedc82fc5f47b6d61e4d11cb837c56cb4544e39081099fa17ad109d4"},
+    {file = "filelock-3.8.0.tar.gz", hash = "sha256:55447caa666f2198c5b6b13a26d2084d26fa5b115c00d065664b2124680c4edc"},
+]
+identify = [
+    {file = "identify-2.5.6-py2.py3-none-any.whl", hash = "sha256:b276db7ec52d7e89f5bc4653380e33054ddc803d25875952ad90b0f012cbcdaa"},
+    {file = "identify-2.5.6.tar.gz", hash = "sha256:6c32dbd747aa4ceee1df33f25fed0b0f6e0d65721b15bd151307ff7056d50245"},
+]
+idna = [
+    {file = "idna-3.4-py3-none-any.whl", hash = "sha256:90b77e79eaa3eba6de819a0c442c0b4ceefc341a7a2ab77d7562bf49f425c5c2"},
+    {file = "idna-3.4.tar.gz", hash = "sha256:814f528e8dead7d329833b91c5faa87d60bf71824cd12a7530b5526063d02cb4"},
+]
 iniconfig = [
+    {file = "iniconfig-1.1.1-py2.py3-none-any.whl", hash = "sha256:011e24c64b7f47f6ebd835bb12a743f2fbe9a26d4cecaa7f53bc4f35ee9da8b3"},
     {file = "iniconfig-1.1.1.tar.gz", hash = "sha256:bc3af051d7d14b2ee5ef9969666def0cd1a000e121eaea580d4a313df4b37f32"},
 ]
 isort = [
     {file = "isort-5.10.1-py3-none-any.whl", hash = "sha256:6f62d78e2f89b4500b080fe3a81690850cd254227f27f75c3a0c491a1f351ba7"},
     {file = "isort-5.10.1.tar.gz", hash = "sha256:e8443a5e7a020e9d7f97f1d7d9cd17c88bcb3bc7e218bf9cf5095fe550be2951"},
 ]
-jinja2 = []
-jinja2-time = []
-markupsafe = []
+jinja2 = [
+    {file = "Jinja2-3.1.2-py3-none-any.whl", hash = "sha256:6088930bfe239f0e6710546ab9c19c9ef35e29792895fed6e6e31a023a182a61"},
+    {file = "Jinja2-3.1.2.tar.gz", hash = "sha256:31351a702a408a9e7595a8fc6150fc3f43bb6bf7e319770cbc0db9df9437e852"},
+]
+jinja2-time = [
+    {file = "jinja2-time-0.2.0.tar.gz", hash = "sha256:d14eaa4d315e7688daa4969f616f226614350c48730bfa1692d2caebd8c90d40"},
+    {file = "jinja2_time-0.2.0-py2.py3-none-any.whl", hash = "sha256:d3eab6605e3ec8b7a0863df09cc1d23714908fa61aa6986a845c20ba488b4efa"},
+]
+markupsafe = [
+    {file = "MarkupSafe-2.1.1-cp310-cp310-macosx_10_9_universal2.whl", hash = "sha256:86b1f75c4e7c2ac2ccdaec2b9022845dbb81880ca318bb7a0a01fbf7813e3812"},
+    {file = "MarkupSafe-2.1.1-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:f121a1420d4e173a5d96e47e9a0c0dcff965afdf1626d28de1460815f7c4ee7a"},
+    {file = "MarkupSafe-2.1.1-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:a49907dd8420c5685cfa064a1335b6754b74541bbb3706c259c02ed65b644b3e"},
+    {file = "MarkupSafe-2.1.1-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:10c1bfff05d95783da83491be968e8fe789263689c02724e0c691933c52994f5"},
+    {file = "MarkupSafe-2.1.1-cp310-cp310-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:b7bd98b796e2b6553da7225aeb61f447f80a1ca64f41d83612e6139ca5213aa4"},
+    {file = "MarkupSafe-2.1.1-cp310-cp310-musllinux_1_1_aarch64.whl", hash = "sha256:b09bf97215625a311f669476f44b8b318b075847b49316d3e28c08e41a7a573f"},
+    {file = "MarkupSafe-2.1.1-cp310-cp310-musllinux_1_1_i686.whl", hash = "sha256:694deca8d702d5db21ec83983ce0bb4b26a578e71fbdbd4fdcd387daa90e4d5e"},
+    {file = "MarkupSafe-2.1.1-cp310-cp310-musllinux_1_1_x86_64.whl", hash = "sha256:efc1913fd2ca4f334418481c7e595c00aad186563bbc1ec76067848c7ca0a933"},
+    {file = "MarkupSafe-2.1.1-cp310-cp310-win32.whl", hash = "sha256:4a33dea2b688b3190ee12bd7cfa29d39c9ed176bda40bfa11099a3ce5d3a7ac6"},
+    {file = "MarkupSafe-2.1.1-cp310-cp310-win_amd64.whl", hash = "sha256:dda30ba7e87fbbb7eab1ec9f58678558fd9a6b8b853530e176eabd064da81417"},
+    {file = "MarkupSafe-2.1.1-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:671cd1187ed5e62818414afe79ed29da836dde67166a9fac6d435873c44fdd02"},
+    {file = "MarkupSafe-2.1.1-cp37-cp37m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:3799351e2336dc91ea70b034983ee71cf2f9533cdff7c14c90ea126bfd95d65a"},
+    {file = "MarkupSafe-2.1.1-cp37-cp37m-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:e72591e9ecd94d7feb70c1cbd7be7b3ebea3f548870aa91e2732960fa4d57a37"},
+    {file = "MarkupSafe-2.1.1-cp37-cp37m-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:6fbf47b5d3728c6aea2abb0589b5d30459e369baa772e0f37a0320185e87c980"},
+    {file = "MarkupSafe-2.1.1-cp37-cp37m-musllinux_1_1_aarch64.whl", hash = "sha256:d5ee4f386140395a2c818d149221149c54849dfcfcb9f1debfe07a8b8bd63f9a"},
+    {file = "MarkupSafe-2.1.1-cp37-cp37m-musllinux_1_1_i686.whl", hash = "sha256:bcb3ed405ed3222f9904899563d6fc492ff75cce56cba05e32eff40e6acbeaa3"},
+    {file = "MarkupSafe-2.1.1-cp37-cp37m-musllinux_1_1_x86_64.whl", hash = "sha256:e1c0b87e09fa55a220f058d1d49d3fb8df88fbfab58558f1198e08c1e1de842a"},
+    {file = "MarkupSafe-2.1.1-cp37-cp37m-win32.whl", hash = "sha256:8dc1c72a69aa7e082593c4a203dcf94ddb74bb5c8a731e4e1eb68d031e8498ff"},
+    {file = "MarkupSafe-2.1.1-cp37-cp37m-win_amd64.whl", hash = "sha256:97a68e6ada378df82bc9f16b800ab77cbf4b2fada0081794318520138c088e4a"},
+    {file = "MarkupSafe-2.1.1-cp38-cp38-macosx_10_9_universal2.whl", hash = "sha256:e8c843bbcda3a2f1e3c2ab25913c80a3c5376cd00c6e8c4a86a89a28c8dc5452"},
+    {file = "MarkupSafe-2.1.1-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:0212a68688482dc52b2d45013df70d169f542b7394fc744c02a57374a4207003"},
+    {file = "MarkupSafe-2.1.1-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:8e576a51ad59e4bfaac456023a78f6b5e6e7651dcd383bcc3e18d06f9b55d6d1"},
+    {file = "MarkupSafe-2.1.1-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:4b9fe39a2ccc108a4accc2676e77da025ce383c108593d65cc909add5c3bd601"},
+    {file = "MarkupSafe-2.1.1-cp38-cp38-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:96e37a3dc86e80bf81758c152fe66dbf60ed5eca3d26305edf01892257049925"},
+    {file = "MarkupSafe-2.1.1-cp38-cp38-musllinux_1_1_aarch64.whl", hash = "sha256:6d0072fea50feec76a4c418096652f2c3238eaa014b2f94aeb1d56a66b41403f"},
+    {file = "MarkupSafe-2.1.1-cp38-cp38-musllinux_1_1_i686.whl", hash = "sha256:089cf3dbf0cd6c100f02945abeb18484bd1ee57a079aefd52cffd17fba910b88"},
+    {file = "MarkupSafe-2.1.1-cp38-cp38-musllinux_1_1_x86_64.whl", hash = "sha256:6a074d34ee7a5ce3effbc526b7083ec9731bb3cbf921bbe1d3005d4d2bdb3a63"},
+    {file = "MarkupSafe-2.1.1-cp38-cp38-win32.whl", hash = "sha256:421be9fbf0ffe9ffd7a378aafebbf6f4602d564d34be190fc19a193232fd12b1"},
+    {file = "MarkupSafe-2.1.1-cp38-cp38-win_amd64.whl", hash = "sha256:fc7b548b17d238737688817ab67deebb30e8073c95749d55538ed473130ec0c7"},
+    {file = "MarkupSafe-2.1.1-cp39-cp39-macosx_10_9_universal2.whl", hash = "sha256:e04e26803c9c3851c931eac40c695602c6295b8d432cbe78609649ad9bd2da8a"},
+    {file = "MarkupSafe-2.1.1-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:b87db4360013327109564f0e591bd2a3b318547bcef31b468a92ee504d07ae4f"},
+    {file = "MarkupSafe-2.1.1-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:99a2a507ed3ac881b975a2976d59f38c19386d128e7a9a18b7df6fff1fd4c1d6"},
+    {file = "MarkupSafe-2.1.1-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:56442863ed2b06d19c37f94d999035e15ee982988920e12a5b4ba29b62ad1f77"},
+    {file = "MarkupSafe-2.1.1-cp39-cp39-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:3ce11ee3f23f79dbd06fb3d63e2f6af7b12db1d46932fe7bd8afa259a5996603"},
+    {file = "MarkupSafe-2.1.1-cp39-cp39-musllinux_1_1_aarch64.whl", hash = "sha256:33b74d289bd2f5e527beadcaa3f401e0df0a89927c1559c8566c066fa4248ab7"},
+    {file = "MarkupSafe-2.1.1-cp39-cp39-musllinux_1_1_i686.whl", hash = "sha256:43093fb83d8343aac0b1baa75516da6092f58f41200907ef92448ecab8825135"},
+    {file = "MarkupSafe-2.1.1-cp39-cp39-musllinux_1_1_x86_64.whl", hash = "sha256:8e3dcf21f367459434c18e71b2a9532d96547aef8a871872a5bd69a715c15f96"},
+    {file = "MarkupSafe-2.1.1-cp39-cp39-win32.whl", hash = "sha256:d4306c36ca495956b6d568d276ac11fdd9c30a36f1b6eb928070dc5360b22e1c"},
+    {file = "MarkupSafe-2.1.1-cp39-cp39-win_amd64.whl", hash = "sha256:46d00d6cfecdde84d40e572d63735ef81423ad31184100411e6e3388d405e247"},
+    {file = "MarkupSafe-2.1.1.tar.gz", hash = "sha256:7f91197cc9e48f989d12e4e6fbc46495c446636dfc81b9ccf50bb0ec74b91d4b"},
+]
 mypy-extensions = [
     {file = "mypy_extensions-0.4.3-py2.py3-none-any.whl", hash = "sha256:090fedd75945a69ae91ce1303b5824f428daf5a028d2f6ab8a299250a846f15d"},
     {file = "mypy_extensions-0.4.3.tar.gz", hash = "sha256:2d82818f5bb3e369420cb3c4060a7970edba416647068eb4c5343488a6c604a8"},
 ]
-nodeenv = []
+nodeenv = [
+    {file = "nodeenv-1.7.0-py2.py3-none-any.whl", hash = "sha256:27083a7b96a25f2f5e1d8cb4b6317ee8aeda3bdd121394e5ac54e498028a042e"},
+    {file = "nodeenv-1.7.0.tar.gz", hash = "sha256:e0e7f7dfb85fc5394c6fe1e8fa98131a2473e04311a45afb6508f7cf1836fa2b"},
+]
 packaging = [
     {file = "packaging-21.3-py3-none-any.whl", hash = "sha256:ef103e05f519cdc783ae24ea4e2e0f508a9c99b2d4969652eed6a2e1ea5bd522"},
     {file = "packaging-21.3.tar.gz", hash = "sha256:dd47c42927d89ab911e606518907cc2d3a1f38bbd026385970643f9c5b8ecfeb"},
 ]
-pathspec = []
-platformdirs = []
+pathspec = [
+    {file = "pathspec-0.10.1-py3-none-any.whl", hash = "sha256:46846318467efc4556ccfd27816e004270a9eeeeb4d062ce5e6fc7a87c573f93"},
+    {file = "pathspec-0.10.1.tar.gz", hash = "sha256:7ace6161b621d31e7902eb6b5ae148d12cfd23f4a249b9ffb6b9fee12084323d"},
+]
+platformdirs = [
+    {file = "platformdirs-2.5.2-py3-none-any.whl", hash = "sha256:027d8e83a2d7de06bbac4e5ef7e023c02b863d7ea5d079477e722bb41ab25788"},
+    {file = "platformdirs-2.5.2.tar.gz", hash = "sha256:58c8abb07dcb441e6ee4b11d8df0ac856038f944ab98b7be6b27b2a3c7feef19"},
+]
 pluggy = [
     {file = "pluggy-1.0.0-py2.py3-none-any.whl", hash = "sha256:74134bbf457f031a36d68416e1509f34bd5ccc019f0bcc952c7b909d06b37bd3"},
     {file = "pluggy-1.0.0.tar.gz", hash = "sha256:4224373bacce55f955a878bf9cfa763c1e360858e330072059e10bad68531159"},
 ]
-pre-commit = []
+pre-commit = [
+    {file = "pre_commit-2.20.0-py2.py3-none-any.whl", hash = "sha256:51a5ba7c480ae8072ecdb6933df22d2f812dc897d5fe848778116129a681aac7"},
+    {file = "pre_commit-2.20.0.tar.gz", hash = "sha256:a978dac7bc9ec0bcee55c18a277d553b0f419d259dadb4b9418ff2d00eb43959"},
+]
 py = [
     {file = "py-1.11.0-py2.py3-none-any.whl", hash = "sha256:607c53218732647dff4acdfcd50cb62615cedf612e72d1724fb1a0cc6405b378"},
     {file = "py-1.11.0.tar.gz", hash = "sha256:51c75c4126074b472f746a24399ad32f6053d1b34b68d2fa41e558e6f4a98719"},
 ]
-pyparsing = []
-pytest = []
-pytest-cov = []
-pytest-forked = []
-pytest-xdist = []
-python-dateutil = []
-python-dotenv = []
-python-slugify = []
-pyyaml = []
-requests = []
+pyparsing = [
+    {file = "pyparsing-3.0.9-py3-none-any.whl", hash = "sha256:5026bae9a10eeaefb61dab2f09052b9f4307d44aee4eda64b309723d8d206bbc"},
+    {file = "pyparsing-3.0.9.tar.gz", hash = "sha256:2b020ecf7d21b687f219b71ecad3631f644a47f01403fa1d1036b0c6416d70fb"},
+]
+pytest = [
+    {file = "pytest-7.1.3-py3-none-any.whl", hash = "sha256:1377bda3466d70b55e3f5cecfa55bb7cfcf219c7964629b967c37cf0bda818b7"},
+    {file = "pytest-7.1.3.tar.gz", hash = "sha256:4f365fec2dff9c1162f834d9f18af1ba13062db0c708bf7b946f8a5c76180c39"},
+]
+pytest-cov = [
+    {file = "pytest-cov-4.0.0.tar.gz", hash = "sha256:996b79efde6433cdbd0088872dbc5fb3ed7fe1578b68cdbba634f14bb8dd0470"},
+    {file = "pytest_cov-4.0.0-py3-none-any.whl", hash = "sha256:2feb1b751d66a8bd934e5edfa2e961d11309dc37b73b0eabe73b5945fee20f6b"},
+]
+pytest-forked = [
+    {file = "pytest-forked-1.4.0.tar.gz", hash = "sha256:8b67587c8f98cbbadfdd804539ed5455b6ed03802203485dd2f53c1422d7440e"},
+    {file = "pytest_forked-1.4.0-py3-none-any.whl", hash = "sha256:bbbb6717efc886b9d64537b41fb1497cfaf3c9601276be8da2cccfea5a3c8ad8"},
+]
+pytest-xdist = [
+    {file = "pytest-xdist-2.5.0.tar.gz", hash = "sha256:4580deca3ff04ddb2ac53eba39d76cb5dd5edeac050cb6fbc768b0dd712b4edf"},
+    {file = "pytest_xdist-2.5.0-py3-none-any.whl", hash = "sha256:6fe5c74fec98906deb8f2d2b616b5c782022744978e7bd4695d39c8f42d0ce65"},
+]
+python-dateutil = [
+    {file = "python-dateutil-2.8.2.tar.gz", hash = "sha256:0123cacc1627ae19ddf3c27a5de5bd67ee4586fbdd6440d9748f8abb483d3e86"},
+    {file = "python_dateutil-2.8.2-py2.py3-none-any.whl", hash = "sha256:961d03dc3453ebbc59dbdea9e4e11c5651520a876d0f4db161e8674aae935da9"},
+]
+python-dotenv = [
+    {file = "python-dotenv-0.21.0.tar.gz", hash = "sha256:b77d08274639e3d34145dfa6c7008e66df0f04b7be7a75fd0d5292c191d79045"},
+    {file = "python_dotenv-0.21.0-py3-none-any.whl", hash = "sha256:1684eb44636dd462b66c3ee016599815514527ad99965de77f43e0944634a7e5"},
+]
+python-slugify = [
+    {file = "python-slugify-6.1.2.tar.gz", hash = "sha256:272d106cb31ab99b3496ba085e3fea0e9e76dcde967b5e9992500d1f785ce4e1"},
+    {file = "python_slugify-6.1.2-py2.py3-none-any.whl", hash = "sha256:7b2c274c308b62f4269a9ba701aa69a797e9bca41aeee5b3a9e79e36b6656927"},
+]
+pyyaml = [
+    {file = "PyYAML-6.0-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:d4db7c7aef085872ef65a8fd7d6d09a14ae91f691dec3e87ee5ee0539d516f53"},
+    {file = "PyYAML-6.0-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:9df7ed3b3d2e0ecfe09e14741b857df43adb5a3ddadc919a2d94fbdf78fea53c"},
+    {file = "PyYAML-6.0-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:77f396e6ef4c73fdc33a9157446466f1cff553d979bd00ecb64385760c6babdc"},
+    {file = "PyYAML-6.0-cp310-cp310-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:a80a78046a72361de73f8f395f1f1e49f956c6be882eed58505a15f3e430962b"},
+    {file = "PyYAML-6.0-cp310-cp310-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:f84fbc98b019fef2ee9a1cb3ce93e3187a6df0b2538a651bfb890254ba9f90b5"},
+    {file = "PyYAML-6.0-cp310-cp310-win32.whl", hash = "sha256:2cd5df3de48857ed0544b34e2d40e9fac445930039f3cfe4bcc592a1f836d513"},
+    {file = "PyYAML-6.0-cp310-cp310-win_amd64.whl", hash = "sha256:daf496c58a8c52083df09b80c860005194014c3698698d1a57cbcfa182142a3a"},
+    {file = "PyYAML-6.0-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:d4b0ba9512519522b118090257be113b9468d804b19d63c71dbcf4a48fa32358"},
+    {file = "PyYAML-6.0-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:81957921f441d50af23654aa6c5e5eaf9b06aba7f0a19c18a538dc7ef291c5a1"},
+    {file = "PyYAML-6.0-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:afa17f5bc4d1b10afd4466fd3a44dc0e245382deca5b3c353d8b757f9e3ecb8d"},
+    {file = "PyYAML-6.0-cp311-cp311-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:dbad0e9d368bb989f4515da330b88a057617d16b6a8245084f1b05400f24609f"},
+    {file = "PyYAML-6.0-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:432557aa2c09802be39460360ddffd48156e30721f5e8d917f01d31694216782"},
+    {file = "PyYAML-6.0-cp311-cp311-win32.whl", hash = "sha256:bfaef573a63ba8923503d27530362590ff4f576c626d86a9fed95822a8255fd7"},
+    {file = "PyYAML-6.0-cp311-cp311-win_amd64.whl", hash = "sha256:01b45c0191e6d66c470b6cf1b9531a771a83c1c4208272ead47a3ae4f2f603bf"},
+    {file = "PyYAML-6.0-cp36-cp36m-macosx_10_9_x86_64.whl", hash = "sha256:897b80890765f037df3403d22bab41627ca8811ae55e9a722fd0392850ec4d86"},
+    {file = "PyYAML-6.0-cp36-cp36m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:50602afada6d6cbfad699b0c7bb50d5ccffa7e46a3d738092afddc1f9758427f"},
+    {file = "PyYAML-6.0-cp36-cp36m-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:48c346915c114f5fdb3ead70312bd042a953a8ce5c7106d5bfb1a5254e47da92"},
+    {file = "PyYAML-6.0-cp36-cp36m-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:98c4d36e99714e55cfbaaee6dd5badbc9a1ec339ebfc3b1f52e293aee6bb71a4"},
+    {file = "PyYAML-6.0-cp36-cp36m-win32.whl", hash = "sha256:0283c35a6a9fbf047493e3a0ce8d79ef5030852c51e9d911a27badfde0605293"},
+    {file = "PyYAML-6.0-cp36-cp36m-win_amd64.whl", hash = "sha256:07751360502caac1c067a8132d150cf3d61339af5691fe9e87803040dbc5db57"},
+    {file = "PyYAML-6.0-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:819b3830a1543db06c4d4b865e70ded25be52a2e0631ccd2f6a47a2822f2fd7c"},
+    {file = "PyYAML-6.0-cp37-cp37m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:473f9edb243cb1935ab5a084eb238d842fb8f404ed2193a915d1784b5a6b5fc0"},
+    {file = "PyYAML-6.0-cp37-cp37m-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:0ce82d761c532fe4ec3f87fc45688bdd3a4c1dc5e0b4a19814b9009a29baefd4"},
+    {file = "PyYAML-6.0-cp37-cp37m-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:231710d57adfd809ef5d34183b8ed1eeae3f76459c18fb4a0b373ad56bedcdd9"},
+    {file = "PyYAML-6.0-cp37-cp37m-win32.whl", hash = "sha256:c5687b8d43cf58545ade1fe3e055f70eac7a5a1a0bf42824308d868289a95737"},
+    {file = "PyYAML-6.0-cp37-cp37m-win_amd64.whl", hash = "sha256:d15a181d1ecd0d4270dc32edb46f7cb7733c7c508857278d3d378d14d606db2d"},
+    {file = "PyYAML-6.0-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:0b4624f379dab24d3725ffde76559cff63d9ec94e1736b556dacdfebe5ab6d4b"},
+    {file = "PyYAML-6.0-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:213c60cd50106436cc818accf5baa1aba61c0189ff610f64f4a3e8c6726218ba"},
+    {file = "PyYAML-6.0-cp38-cp38-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:9fa600030013c4de8165339db93d182b9431076eb98eb40ee068700c9c813e34"},
+    {file = "PyYAML-6.0-cp38-cp38-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:277a0ef2981ca40581a47093e9e2d13b3f1fbbeffae064c1d21bfceba2030287"},
+    {file = "PyYAML-6.0-cp38-cp38-win32.whl", hash = "sha256:d4eccecf9adf6fbcc6861a38015c2a64f38b9d94838ac1810a9023a0609e1b78"},
+    {file = "PyYAML-6.0-cp38-cp38-win_amd64.whl", hash = "sha256:1e4747bc279b4f613a09eb64bba2ba602d8a6664c6ce6396a4d0cd413a50ce07"},
+    {file = "PyYAML-6.0-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:055d937d65826939cb044fc8c9b08889e8c743fdc6a32b33e2390f66013e449b"},
+    {file = "PyYAML-6.0-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:e61ceaab6f49fb8bdfaa0f92c4b57bcfbea54c09277b1b4f7ac376bfb7a7c174"},
+    {file = "PyYAML-6.0-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:d67d839ede4ed1b28a4e8909735fc992a923cdb84e618544973d7dfc71540803"},
+    {file = "PyYAML-6.0-cp39-cp39-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:cba8c411ef271aa037d7357a2bc8f9ee8b58b9965831d9e51baf703280dc73d3"},
+    {file = "PyYAML-6.0-cp39-cp39-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:40527857252b61eacd1d9af500c3337ba8deb8fc298940291486c465c8b46ec0"},
+    {file = "PyYAML-6.0-cp39-cp39-win32.whl", hash = "sha256:b5b9eccad747aabaaffbc6064800670f0c297e52c12754eb1d976c57e4f74dcb"},
+    {file = "PyYAML-6.0-cp39-cp39-win_amd64.whl", hash = "sha256:b3d267842bf12586ba6c734f89d1f5b871df0273157918b0ccefa29deb05c21c"},
+    {file = "PyYAML-6.0.tar.gz", hash = "sha256:68fb519c14306fec9720a2a5b45bc9f0c8d1b9c72adf45c37baedfcd949c35a2"},
+]
+requests = [
+    {file = "requests-2.28.1-py3-none-any.whl", hash = "sha256:8fefa2a1a1365bf5520aac41836fbee479da67864514bdb821f31ce07ce65349"},
+    {file = "requests-2.28.1.tar.gz", hash = "sha256:7c5599b102feddaa661c826c56ab4fee28bfd17f5abca1ebbe3e7f19d7c97983"},
+]
+setuptools = [
+    {file = "setuptools-65.5.0-py3-none-any.whl", hash = "sha256:f62ea9da9ed6289bfe868cd6845968a2c854d1427f8548d52cae02a42b4f0356"},
+    {file = "setuptools-65.5.0.tar.gz", hash = "sha256:512e5536220e38146176efb833d4a62aa726b7bbff82cfbc8ba9eaa3996e0b17"},
+]
 six = [
     {file = "six-1.16.0-py2.py3-none-any.whl", hash = "sha256:8abb2f1d86890a2dfb989f9a77cfcfd3e47c2a354b01111771326f8aa26e0254"},
     {file = "six-1.16.0.tar.gz", hash = "sha256:1e61c37477a1626458e36f7b1d82aa5c9b094fa4802892072e49de9c60c4c926"},
 ]
-soupsieve = []
-text-unidecode = []
+soupsieve = [
+    {file = "soupsieve-2.3.2.post1-py3-none-any.whl", hash = "sha256:3b2503d3c7084a42b1ebd08116e5f81aadfaea95863628c80a3b774a11b7c759"},
+    {file = "soupsieve-2.3.2.post1.tar.gz", hash = "sha256:fc53893b3da2c33de295667a0e19f078c14bf86544af307354de5fcf12a3f30d"},
+]
+text-unidecode = [
+    {file = "text-unidecode-1.3.tar.gz", hash = "sha256:bad6603bb14d279193107714b288be206cac565dfa49aa5b105294dd5c4aab93"},
+    {file = "text_unidecode-1.3-py2.py3-none-any.whl", hash = "sha256:1311f10e8b895935241623731c2ba64f4c455287888b18189350b67134a822e8"},
+]
 toml = [
     {file = "toml-0.10.2-py2.py3-none-any.whl", hash = "sha256:806143ae5bfb6a3c6e736a764057db0e6a0e05e338b5630894a5f779cabb4f9b"},
     {file = "toml-0.10.2.tar.gz", hash = "sha256:b3bda1d108d5dd99f4a20d24d9c348e91c4db7ab1b749200bded2f839ccbe68f"},
@@ -688,7 +963,19 @@ tomli = [
     {file = "tomli-2.0.1-py3-none-any.whl", hash = "sha256:939de3e7a6161af0c887ef91b7d41a53e7c5a1ca976325f429cb46ea9bc30ecc"},
     {file = "tomli-2.0.1.tar.gz", hash = "sha256:de526c12914f0c550d15924c62d72abc48d6fe7364aa87328337a31007fe8a4f"},
 ]
-tox = []
-tqdm = []
-urllib3 = []
-virtualenv = []
+tox = [
+    {file = "tox-3.27.0-py2.py3-none-any.whl", hash = "sha256:89e4bc6df3854e9fc5582462e328dd3660d7d865ba625ae5881bbc63836a6324"},
+    {file = "tox-3.27.0.tar.gz", hash = "sha256:d2c945f02a03d4501374a3d5430877380deb69b218b1df9b7f1d2f2a10befaf9"},
+]
+tqdm = [
+    {file = "tqdm-4.64.1-py2.py3-none-any.whl", hash = "sha256:6fee160d6ffcd1b1c68c65f14c829c22832bc401726335ce92c52d395944a6a1"},
+    {file = "tqdm-4.64.1.tar.gz", hash = "sha256:5f4f682a004951c1b450bc753c710e9280c5746ce6ffedee253ddbcbf54cf1e4"},
+]
+urllib3 = [
+    {file = "urllib3-1.26.12-py2.py3-none-any.whl", hash = "sha256:b930dd878d5a8afb066a637fbb35144fe7901e3b209d1cd4f524bd0e9deee997"},
+    {file = "urllib3-1.26.12.tar.gz", hash = "sha256:3fa96cf423e6987997fc326ae8df396db2a8b7c667747d47ddd8ecba91f4a74e"},
+]
+virtualenv = [
+    {file = "virtualenv-20.16.5-py3-none-any.whl", hash = "sha256:d07dfc5df5e4e0dbc92862350ad87a36ed505b978f6c39609dc489eadd5b0d27"},
+    {file = "virtualenv-20.16.5.tar.gz", hash = "sha256:227ea1b9994fdc5ea31977ba3383ef296d7472ea85be9d6732e42a91c04e80da"},
+]
diff --git a/pyproject.toml b/pyproject.toml
index 1995b2b9..c4ea0173 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -20,7 +20,7 @@ pytest = "^7.1.2"
 pytest-cov = "^4.0.0"
 pytest-xdist = "^2.5.0"
 python-dotenv = "^0.21.0"
-tox = "^3.25.1"
+tox = "^3.27.0"
 pre-commit = "^2.19.0"
 isort = "^5.10.1"
 

From e16f37eb3ccb09a90abd0416d319717b099ec93e Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 26 Oct 2022 17:02:01 +0000
Subject: [PATCH 169/371] Bump pytest from 7.1.3 to 7.2.0

Bumps [pytest](https://github.com/pytest-dev/pytest) from 7.1.3 to 7.2.0.
- [Release notes](https://github.com/pytest-dev/pytest/releases)
- [Changelog](https://github.com/pytest-dev/pytest/blob/main/CHANGELOG.rst)
- [Commits](https://github.com/pytest-dev/pytest/compare/7.1.3...7.2.0)

---
updated-dependencies:
- dependency-name: pytest
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 poetry.lock    | 27 +++++++++++++++++++++------
 pyproject.toml |  2 +-
 2 files changed, 22 insertions(+), 7 deletions(-)

diff --git a/poetry.lock b/poetry.lock
index a00e17cb..b30855aa 100644
--- a/poetry.lock
+++ b/poetry.lock
@@ -178,6 +178,17 @@ category = "dev"
 optional = false
 python-versions = "*"
 
+[[package]]
+name = "exceptiongroup"
+version = "1.0.0rc9"
+description = "Backport of PEP 654 (exception groups)"
+category = "dev"
+optional = false
+python-versions = ">=3.7"
+
+[package.extras]
+test = ["pytest (>=6)"]
+
 [[package]]
 name = "execnet"
 version = "1.9.0"
@@ -375,7 +386,7 @@ diagrams = ["jinja2", "railroad-diagrams"]
 
 [[package]]
 name = "pytest"
-version = "7.1.3"
+version = "7.2.0"
 description = "pytest: simple powerful testing with Python"
 category = "dev"
 optional = false
@@ -384,11 +395,11 @@ python-versions = ">=3.7"
 [package.dependencies]
 attrs = ">=19.2.0"
 colorama = {version = "*", markers = "sys_platform == \"win32\""}
+exceptiongroup = {version = ">=1.0.0rc8", markers = "python_version < \"3.11\""}
 iniconfig = "*"
 packaging = "*"
 pluggy = ">=0.12,<2.0"
-py = ">=1.8.2"
-tomli = ">=1.0.0"
+tomli = {version = ">=1.0.0", markers = "python_version < \"3.11\""}
 
 [package.extras]
 testing = ["argcomplete", "hypothesis (>=3.56)", "mock", "nose", "pygments (>=2.7.2)", "requests", "xmlschema"]
@@ -625,7 +636,7 @@ testing = ["coverage (>=6.2)", "coverage-enable-subprocess (>=1)", "flaky (>=3.7
 [metadata]
 lock-version = "1.1"
 python-versions = "^3.10"
-content-hash = "2d01a3fd4cd57f82e438d74ab6638b055737fdc2d12e29dd5f571c3b551578e0"
+content-hash = "df5792a40326a66f446173d239df452673b27d37144b98eb0a4463584ccfc19a"
 
 [metadata.files]
 anytree = [
@@ -755,6 +766,10 @@ distlib = [
     {file = "distlib-0.3.6-py2.py3-none-any.whl", hash = "sha256:f35c4b692542ca110de7ef0bea44d73981caeb34ca0b9b6b2e6d7790dda8f80e"},
     {file = "distlib-0.3.6.tar.gz", hash = "sha256:14bad2d9b04d3a36127ac97f30b12a19268f211063d8f8ee4f47108896e11b46"},
 ]
+exceptiongroup = [
+    {file = "exceptiongroup-1.0.0rc9-py3-none-any.whl", hash = "sha256:2e3c3fc1538a094aab74fad52d6c33fc94de3dfee3ee01f187c0e0c72aec5337"},
+    {file = "exceptiongroup-1.0.0rc9.tar.gz", hash = "sha256:9086a4a21ef9b31c72181c77c040a074ba0889ee56a7b289ff0afb0d97655f96"},
+]
 execnet = [
     {file = "execnet-1.9.0-py2.py3-none-any.whl", hash = "sha256:a295f7cc774947aac58dde7fdc85f4aa00c42adf5d8f5468fc630c1acf30a142"},
     {file = "execnet-1.9.0.tar.gz", hash = "sha256:8f694f3ba9cc92cab508b152dcfe322153975c29bda272e2fd7f3f00f36e47c5"},
@@ -866,8 +881,8 @@ pyparsing = [
     {file = "pyparsing-3.0.9.tar.gz", hash = "sha256:2b020ecf7d21b687f219b71ecad3631f644a47f01403fa1d1036b0c6416d70fb"},
 ]
 pytest = [
-    {file = "pytest-7.1.3-py3-none-any.whl", hash = "sha256:1377bda3466d70b55e3f5cecfa55bb7cfcf219c7964629b967c37cf0bda818b7"},
-    {file = "pytest-7.1.3.tar.gz", hash = "sha256:4f365fec2dff9c1162f834d9f18af1ba13062db0c708bf7b946f8a5c76180c39"},
+    {file = "pytest-7.2.0-py3-none-any.whl", hash = "sha256:892f933d339f068883b6fd5a459f03d85bfcb355e4981e146d2c7616c21fef71"},
+    {file = "pytest-7.2.0.tar.gz", hash = "sha256:c4014eb40e10f11f355ad4e3c2fb2c6c6d1919c73f3b5a433de4708202cade59"},
 ]
 pytest-cov = [
     {file = "pytest-cov-4.0.0.tar.gz", hash = "sha256:996b79efde6433cdbd0088872dbc5fb3ed7fe1578b68cdbba634f14bb8dd0470"},
diff --git a/pyproject.toml b/pyproject.toml
index c4ea0173..1b9e016c 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -16,7 +16,7 @@ tqdm = "^4.64.0"
 [tool.poetry.dev-dependencies]
 black = "^22.10"
 cookiecutter = "^2.1.1"
-pytest = "^7.1.2"
+pytest = "^7.2.0"
 pytest-cov = "^4.0.0"
 pytest-xdist = "^2.5.0"
 python-dotenv = "^0.21.0"

From fb5166b19294708784f49049c8c534a01d0b31f4 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 26 Oct 2022 17:07:35 +0000
Subject: [PATCH 170/371] Bump pytest-xdist from 2.5.0 to 3.0.2

Bumps [pytest-xdist](https://github.com/pytest-dev/pytest-xdist) from 2.5.0 to 3.0.2.
- [Release notes](https://github.com/pytest-dev/pytest-xdist/releases)
- [Changelog](https://github.com/pytest-dev/pytest-xdist/blob/master/CHANGELOG.rst)
- [Commits](https://github.com/pytest-dev/pytest-xdist/compare/v2.5.0...v3.0.2)

---
updated-dependencies:
- dependency-name: pytest-xdist
  dependency-type: direct:development
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 poetry.lock    | 25 ++++---------------------
 pyproject.toml |  2 +-
 2 files changed, 5 insertions(+), 22 deletions(-)

diff --git a/poetry.lock b/poetry.lock
index b30855aa..840048de 100644
--- a/poetry.lock
+++ b/poetry.lock
@@ -419,21 +419,9 @@ pytest = ">=4.6"
 [package.extras]
 testing = ["fields", "hunter", "process-tests", "pytest-xdist", "six", "virtualenv"]
 
-[[package]]
-name = "pytest-forked"
-version = "1.4.0"
-description = "run tests in isolated forked subprocesses"
-category = "dev"
-optional = false
-python-versions = ">=3.6"
-
-[package.dependencies]
-py = "*"
-pytest = ">=3.10"
-
 [[package]]
 name = "pytest-xdist"
-version = "2.5.0"
+version = "3.0.2"
 description = "pytest xdist plugin for distributed testing and loop-on-failing modes"
 category = "dev"
 optional = false
@@ -442,7 +430,6 @@ python-versions = ">=3.6"
 [package.dependencies]
 execnet = ">=1.1"
 pytest = ">=6.2.0"
-pytest-forked = "*"
 
 [package.extras]
 psutil = ["psutil (>=3.0)"]
@@ -636,7 +623,7 @@ testing = ["coverage (>=6.2)", "coverage-enable-subprocess (>=1)", "flaky (>=3.7
 [metadata]
 lock-version = "1.1"
 python-versions = "^3.10"
-content-hash = "df5792a40326a66f446173d239df452673b27d37144b98eb0a4463584ccfc19a"
+content-hash = "c48f44b08785d5a57f08e707d7243cfd1f97b2df9ab02fda2a20390fe84c37a4"
 
 [metadata.files]
 anytree = [
@@ -888,13 +875,9 @@ pytest-cov = [
     {file = "pytest-cov-4.0.0.tar.gz", hash = "sha256:996b79efde6433cdbd0088872dbc5fb3ed7fe1578b68cdbba634f14bb8dd0470"},
     {file = "pytest_cov-4.0.0-py3-none-any.whl", hash = "sha256:2feb1b751d66a8bd934e5edfa2e961d11309dc37b73b0eabe73b5945fee20f6b"},
 ]
-pytest-forked = [
-    {file = "pytest-forked-1.4.0.tar.gz", hash = "sha256:8b67587c8f98cbbadfdd804539ed5455b6ed03802203485dd2f53c1422d7440e"},
-    {file = "pytest_forked-1.4.0-py3-none-any.whl", hash = "sha256:bbbb6717efc886b9d64537b41fb1497cfaf3c9601276be8da2cccfea5a3c8ad8"},
-]
 pytest-xdist = [
-    {file = "pytest-xdist-2.5.0.tar.gz", hash = "sha256:4580deca3ff04ddb2ac53eba39d76cb5dd5edeac050cb6fbc768b0dd712b4edf"},
-    {file = "pytest_xdist-2.5.0-py3-none-any.whl", hash = "sha256:6fe5c74fec98906deb8f2d2b616b5c782022744978e7bd4695d39c8f42d0ce65"},
+    {file = "pytest-xdist-3.0.2.tar.gz", hash = "sha256:688da9b814370e891ba5de650c9327d1a9d861721a524eb917e620eec3e90291"},
+    {file = "pytest_xdist-3.0.2-py3-none-any.whl", hash = "sha256:9feb9a18e1790696ea23e1434fa73b325ed4998b0e9fcb221f16fd1945e6df1b"},
 ]
 python-dateutil = [
     {file = "python-dateutil-2.8.2.tar.gz", hash = "sha256:0123cacc1627ae19ddf3c27a5de5bd67ee4586fbdd6440d9748f8abb483d3e86"},
diff --git a/pyproject.toml b/pyproject.toml
index 1b9e016c..4aab084e 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -18,7 +18,7 @@ black = "^22.10"
 cookiecutter = "^2.1.1"
 pytest = "^7.2.0"
 pytest-cov = "^4.0.0"
-pytest-xdist = "^2.5.0"
+pytest-xdist = "^3.0.2"
 python-dotenv = "^0.21.0"
 tox = "^3.27.0"
 pre-commit = "^2.19.0"

From ced072df4835d3eddb061e8aa23bfad4f216b910 Mon Sep 17 00:00:00 2001
From: Roel Adriaans <roel@adriaans.org>
Date: Thu, 10 Nov 2022 20:52:47 +0100
Subject: [PATCH 171/371] Feature/day 18 (#82)

* [WIP] day 18?

* [WIP] Node-ish

* We can parse!

* Better repr, and add snakes together

* Find the deepest node

* Add some parents

* Fix a parsing issue that did not always trigger

* Add full example test

* find deepest only returns when it is allowed to explose

* find deepest snail more self-love

* Implement splitting \o/

And find another bug in explode ;(

* Explode test work as they should

* When adding together, don't forget to set the parents

* WIP Raise stopiterations, starting reduce?

* Implement reduce, add __lt__ since it might be that we have two Snails with the same prio

* Complement magnitude and finish day 18 :)

* Bruteforce day 18, part 2

* Simplyfy magnitude, we will always have a left/right

* Update dependencies

Co-authored-by: Roel Adriaans <roel.adriaans@asml.com>
---
 poetry.lock                                   | 363 ++++--------------
 .../solutions/data/day_18/day18.txt           | 100 +++++
 src/adventofcode2021/solutions/day18.py       | 263 +++++++++++++
 tests/solutions/test_day18_a.py               | 207 ++++++++++
 tests/solutions/test_day18_b.py               |  28 ++
 5 files changed, 671 insertions(+), 290 deletions(-)
 create mode 100644 src/adventofcode2021/solutions/data/day_18/day18.txt
 create mode 100644 src/adventofcode2021/solutions/day18.py
 create mode 100644 tests/solutions/test_day18_a.py
 create mode 100644 tests/solutions/test_day18_b.py

diff --git a/poetry.lock b/poetry.lock
index 840048de..bb3f0302 100644
--- a/poetry.lock
+++ b/poetry.lock
@@ -33,10 +33,10 @@ optional = false
 python-versions = ">=3.5"
 
 [package.extras]
-dev = ["cloudpickle", "coverage[toml] (>=5.0.2)", "furo", "hypothesis", "mypy (>=0.900,!=0.940)", "pre-commit", "pympler", "pytest (>=4.3.0)", "pytest-mypy-plugins", "sphinx", "sphinx-notfound-page", "zope.interface"]
-docs = ["furo", "sphinx", "sphinx-notfound-page", "zope.interface"]
-tests = ["cloudpickle", "coverage[toml] (>=5.0.2)", "hypothesis", "mypy (>=0.900,!=0.940)", "pympler", "pytest (>=4.3.0)", "pytest-mypy-plugins", "zope.interface"]
-tests-no-zope = ["cloudpickle", "coverage[toml] (>=5.0.2)", "hypothesis", "mypy (>=0.900,!=0.940)", "pympler", "pytest (>=4.3.0)", "pytest-mypy-plugins"]
+dev = ["coverage[toml] (>=5.0.2)", "hypothesis", "pympler", "pytest (>=4.3.0)", "mypy (>=0.900,!=0.940)", "pytest-mypy-plugins", "zope.interface", "furo", "sphinx", "sphinx-notfound-page", "pre-commit", "cloudpickle"]
+docs = ["furo", "sphinx", "zope.interface", "sphinx-notfound-page"]
+tests = ["coverage[toml] (>=5.0.2)", "hypothesis", "pympler", "pytest (>=4.3.0)", "mypy (>=0.900,!=0.940)", "pytest-mypy-plugins", "zope.interface", "cloudpickle"]
+tests_no_zope = ["coverage[toml] (>=5.0.2)", "hypothesis", "pympler", "pytest (>=4.3.0)", "mypy (>=0.900,!=0.940)", "pytest-mypy-plugins", "cloudpickle"]
 
 [[package]]
 name = "beautifulsoup4"
@@ -118,7 +118,7 @@ optional = false
 python-versions = ">=3.6.0"
 
 [package.extras]
-unicode-backport = ["unicodedata2"]
+unicode_backport = ["unicodedata2"]
 
 [[package]]
 name = "click"
@@ -133,11 +133,11 @@ colorama = {version = "*", markers = "platform_system == \"Windows\""}
 
 [[package]]
 name = "colorama"
-version = "0.4.5"
+version = "0.4.6"
 description = "Cross-platform colored terminal text."
 category = "main"
 optional = false
-python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*"
+python-versions = "!=3.0.*,!=3.1.*,!=3.2.*,!=3.3.*,!=3.4.*,!=3.5.*,!=3.6.*,>=2.7"
 
 [[package]]
 name = "cookiecutter"
@@ -180,7 +180,7 @@ python-versions = "*"
 
 [[package]]
 name = "exceptiongroup"
-version = "1.0.0rc9"
+version = "1.0.1"
 description = "Backport of PEP 654 (exception groups)"
 category = "dev"
 optional = false
@@ -214,7 +214,7 @@ testing = ["covdefaults (>=2.2)", "coverage (>=6.4.2)", "pytest (>=7.1.2)", "pyt
 
 [[package]]
 name = "identify"
-version = "2.5.6"
+version = "2.5.8"
 description = "File identification library for Python"
 category = "dev"
 optional = false
@@ -248,10 +248,10 @@ optional = false
 python-versions = ">=3.6.1,<4.0"
 
 [package.extras]
+pipfile_deprecated_finder = ["pipreqs", "requirementslib"]
+requirements_deprecated_finder = ["pipreqs", "pip-api"]
 colors = ["colorama (>=0.4.3,<0.5.0)"]
-pipfile-deprecated-finder = ["pipreqs", "requirementslib"]
 plugins = ["setuptools"]
-requirements-deprecated-finder = ["pip-api", "pipreqs"]
 
 [[package]]
 name = "jinja2"
@@ -303,9 +303,6 @@ category = "dev"
 optional = false
 python-versions = ">=2.7,!=3.0.*,!=3.1.*,!=3.2.*,!=3.3.*,!=3.4.*,!=3.5.*,!=3.6.*"
 
-[package.dependencies]
-setuptools = "*"
-
 [[package]]
 name = "packaging"
 version = "21.3"
@@ -327,15 +324,15 @@ python-versions = ">=3.7"
 
 [[package]]
 name = "platformdirs"
-version = "2.5.2"
-description = "A small Python module for determining appropriate platform-specific dirs, e.g. a \"user data dir\"."
+version = "2.5.3"
+description = "A small Python package for determining appropriate platform-specific dirs, e.g. a \"user data dir\"."
 category = "dev"
 optional = false
 python-versions = ">=3.7"
 
 [package.extras]
-docs = ["furo (>=2021.7.5b38)", "proselint (>=0.10.2)", "sphinx (>=4)", "sphinx-autodoc-typehints (>=1.12)"]
-test = ["appdirs (==1.4.4)", "pytest (>=6)", "pytest-cov (>=2.7)", "pytest-mock (>=3.6)"]
+docs = ["furo (>=2022.9.29)", "proselint (>=0.13)", "sphinx-autodoc-typehints (>=1.19.4)", "sphinx (>=5.3)"]
+test = ["appdirs (==1.4.4)", "pytest-cov (>=4)", "pytest-mock (>=3.10)", "pytest (>=7.2)"]
 
 [[package]]
 name = "pluggy"
@@ -382,7 +379,7 @@ optional = false
 python-versions = ">=3.6.8"
 
 [package.extras]
-diagrams = ["jinja2", "railroad-diagrams"]
+diagrams = ["railroad-diagrams", "jinja2"]
 
 [[package]]
 name = "pytest"
@@ -417,11 +414,23 @@ coverage = {version = ">=5.2.1", extras = ["toml"]}
 pytest = ">=4.6"
 
 [package.extras]
-testing = ["fields", "hunter", "process-tests", "pytest-xdist", "six", "virtualenv"]
+testing = ["fields", "hunter", "process-tests", "six", "pytest-xdist", "virtualenv"]
+
+[[package]]
+name = "pytest-forked"
+version = "1.4.0"
+description = "run tests in isolated forked subprocesses"
+category = "dev"
+optional = false
+python-versions = ">=3.6"
+
+[package.dependencies]
+py = "*"
+pytest = ">=3.10"
 
 [[package]]
 name = "pytest-xdist"
-version = "3.0.2"
+version = "2.5.0"
 description = "pytest xdist plugin for distributed testing and loop-on-failing modes"
 category = "dev"
 optional = false
@@ -430,6 +439,7 @@ python-versions = ">=3.6"
 [package.dependencies]
 execnet = ">=1.1"
 pytest = ">=6.2.0"
+pytest-forked = "*"
 
 [package.extras]
 psutil = ["psutil (>=3.0)"]
@@ -496,20 +506,7 @@ urllib3 = ">=1.21.1,<1.27"
 
 [package.extras]
 socks = ["PySocks (>=1.5.6,!=1.5.7)"]
-use-chardet-on-py3 = ["chardet (>=3.0.2,<6)"]
-
-[[package]]
-name = "setuptools"
-version = "65.5.0"
-description = "Easily download, build, install, upgrade, and uninstall Python packages"
-category = "dev"
-optional = false
-python-versions = ">=3.7"
-
-[package.extras]
-docs = ["furo", "jaraco.packaging (>=9)", "jaraco.tidelift (>=1.4)", "pygments-github-lexers (==0.0.5)", "rst.linker (>=1.9)", "sphinx (>=3.5)", "sphinx-favicon", "sphinx-hoverxref (<2)", "sphinx-inline-tabs", "sphinx-notfound-page (==0.8.3)", "sphinx-reredirects", "sphinxcontrib-towncrier"]
-testing = ["build[virtualenv]", "filelock (>=3.4.0)", "flake8 (<5)", "flake8-2020", "ini2toml[lite] (>=0.9)", "jaraco.envs (>=2.2)", "jaraco.path (>=3.2.0)", "mock", "pip (>=19.1)", "pip-run (>=8.8)", "pytest (>=6)", "pytest-black (>=0.3.7)", "pytest-checkdocs (>=2.4)", "pytest-cov", "pytest-enabler (>=1.3)", "pytest-flake8", "pytest-mypy (>=0.9.1)", "pytest-perf", "pytest-xdist", "tomli-w (>=1.0.0)", "virtualenv (>=13.0.0)", "wheel"]
-testing-integration = ["build[virtualenv]", "filelock (>=3.4.0)", "jaraco.envs (>=2.2)", "jaraco.path (>=3.2.0)", "pytest", "pytest-enabler", "pytest-xdist", "tomli", "virtualenv (>=13.0.0)", "wheel"]
+use_chardet_on_py3 = ["chardet (>=3.0.2,<6)"]
 
 [[package]]
 name = "six"
@@ -571,7 +568,7 @@ virtualenv = ">=16.0.0,<20.0.0 || >20.0.0,<20.0.1 || >20.0.1,<20.0.2 || >20.0.2,
 
 [package.extras]
 docs = ["pygments-github-lexers (>=0.0.5)", "sphinx (>=2.0.0)", "sphinxcontrib-autoprogram (>=0.1.5)", "towncrier (>=18.5.0)"]
-testing = ["flaky (>=3.4.0)", "freezegun (>=0.3.11)", "pathlib2 (>=2.3.3)", "psutil (>=5.6.1)", "pytest (>=4.0.0)", "pytest-cov (>=2.5.1)", "pytest-mock (>=1.10.0)", "pytest-randomly (>=1.0.0)"]
+testing = ["flaky (>=3.4.0)", "freezegun (>=0.3.11)", "pytest (>=4.0.0)", "pytest-cov (>=2.5.1)", "pytest-mock (>=1.10.0)", "pytest-randomly (>=1.0.0)", "psutil (>=5.6.1)", "pathlib2 (>=2.3.3)"]
 
 [[package]]
 name = "tqdm"
@@ -599,180 +596,65 @@ optional = false
 python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*, !=3.5.*, <4"
 
 [package.extras]
-brotli = ["brotli (>=1.0.9)", "brotlicffi (>=0.8.0)", "brotlipy (>=0.6.0)"]
-secure = ["certifi", "cryptography (>=1.3.4)", "idna (>=2.0.0)", "ipaddress", "pyOpenSSL (>=0.14)", "urllib3-secure-extra"]
+brotli = ["brotlicffi (>=0.8.0)", "brotli (>=1.0.9)", "brotlipy (>=0.6.0)"]
+secure = ["pyOpenSSL (>=0.14)", "cryptography (>=1.3.4)", "idna (>=2.0.0)", "certifi", "urllib3-secure-extra", "ipaddress"]
 socks = ["PySocks (>=1.5.6,!=1.5.7,<2.0)"]
 
 [[package]]
 name = "virtualenv"
-version = "20.16.5"
+version = "20.16.6"
 description = "Virtual Python Environment builder"
 category = "dev"
 optional = false
 python-versions = ">=3.6"
 
 [package.dependencies]
-distlib = ">=0.3.5,<1"
+distlib = ">=0.3.6,<1"
 filelock = ">=3.4.1,<4"
 platformdirs = ">=2.4,<3"
 
 [package.extras]
-docs = ["proselint (>=0.13)", "sphinx (>=5.1.1)", "sphinx-argparse (>=0.3.1)", "sphinx-rtd-theme (>=1)", "towncrier (>=21.9)"]
+docs = ["proselint (>=0.13)", "sphinx (>=5.3)", "sphinx-argparse (>=0.3.2)", "sphinx-rtd-theme (>=1)", "towncrier (>=22.8)"]
 testing = ["coverage (>=6.2)", "coverage-enable-subprocess (>=1)", "flaky (>=3.7)", "packaging (>=21.3)", "pytest (>=7.0.1)", "pytest-env (>=0.6.2)", "pytest-freezegun (>=0.4.2)", "pytest-mock (>=3.6.1)", "pytest-randomly (>=3.10.3)", "pytest-timeout (>=2.1)"]
 
 [metadata]
 lock-version = "1.1"
 python-versions = "^3.10"
-content-hash = "c48f44b08785d5a57f08e707d7243cfd1f97b2df9ab02fda2a20390fe84c37a4"
+content-hash = "cf9e268590e8b1eb0e0c421733f39bc9a4ad1df7cea343af93cde1af67eb1a40"
 
 [metadata.files]
 anytree = [
     {file = "anytree-2.8.0-py2.py3-none-any.whl", hash = "sha256:14c55ac77492b11532395049a03b773d14c7e30b22aa012e337b1e983de31521"},
     {file = "anytree-2.8.0.tar.gz", hash = "sha256:3f0f93f355a91bc3e6245319bf4c1d50e3416cc7a35cc1133c1ff38306bbccab"},
 ]
-arrow = [
-    {file = "arrow-1.2.3-py3-none-any.whl", hash = "sha256:5a49ab92e3b7b71d96cd6bfcc4df14efefc9dfa96ea19045815914a6ab6b1fe2"},
-    {file = "arrow-1.2.3.tar.gz", hash = "sha256:3934b30ca1b9f292376d9db15b19446088d12ec58629bc3f0da28fd55fb633a1"},
-]
-attrs = [
-    {file = "attrs-22.1.0-py2.py3-none-any.whl", hash = "sha256:86efa402f67bf2df34f51a335487cf46b1ec130d02b8d39fd248abfd30da551c"},
-    {file = "attrs-22.1.0.tar.gz", hash = "sha256:29adc2665447e5191d0e7c568fde78b21f9672d344281d0c6e1ab085429b22b6"},
-]
-beautifulsoup4 = [
-    {file = "beautifulsoup4-4.11.1-py3-none-any.whl", hash = "sha256:58d5c3d29f5a36ffeb94f02f0d786cd53014cf9b3b3951d42e0080d8a9498d30"},
-    {file = "beautifulsoup4-4.11.1.tar.gz", hash = "sha256:ad9aa55b65ef2808eb405f46cf74df7fcb7044d5cbc26487f96eb2ef2e436693"},
-]
+arrow = []
+attrs = []
+beautifulsoup4 = []
 binaryornot = [
     {file = "binaryornot-0.4.4-py2.py3-none-any.whl", hash = "sha256:b8b71173c917bddcd2c16070412e369c3ed7f0528926f70cac18a6c97fd563e4"},
     {file = "binaryornot-0.4.4.tar.gz", hash = "sha256:359501dfc9d40632edc9fac890e19542db1a287bbcfa58175b66658392018061"},
 ]
-black = [
-    {file = "black-22.10.0-1fixedarch-cp310-cp310-macosx_11_0_x86_64.whl", hash = "sha256:5cc42ca67989e9c3cf859e84c2bf014f6633db63d1cbdf8fdb666dcd9e77e3fa"},
-    {file = "black-22.10.0-1fixedarch-cp311-cp311-macosx_11_0_x86_64.whl", hash = "sha256:5d8f74030e67087b219b032aa33a919fae8806d49c867846bfacde57f43972ef"},
-    {file = "black-22.10.0-1fixedarch-cp37-cp37m-macosx_10_16_x86_64.whl", hash = "sha256:197df8509263b0b8614e1df1756b1dd41be6738eed2ba9e9769f3880c2b9d7b6"},
-    {file = "black-22.10.0-1fixedarch-cp38-cp38-macosx_10_16_x86_64.whl", hash = "sha256:2644b5d63633702bc2c5f3754b1b475378fbbfb481f62319388235d0cd104c2d"},
-    {file = "black-22.10.0-1fixedarch-cp39-cp39-macosx_11_0_x86_64.whl", hash = "sha256:e41a86c6c650bcecc6633ee3180d80a025db041a8e2398dcc059b3afa8382cd4"},
-    {file = "black-22.10.0-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:2039230db3c6c639bd84efe3292ec7b06e9214a2992cd9beb293d639c6402edb"},
-    {file = "black-22.10.0-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:14ff67aec0a47c424bc99b71005202045dc09270da44a27848d534600ac64fc7"},
-    {file = "black-22.10.0-cp310-cp310-win_amd64.whl", hash = "sha256:819dc789f4498ecc91438a7de64427c73b45035e2e3680c92e18795a839ebb66"},
-    {file = "black-22.10.0-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:5b9b29da4f564ba8787c119f37d174f2b69cdfdf9015b7d8c5c16121ddc054ae"},
-    {file = "black-22.10.0-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:b8b49776299fece66bffaafe357d929ca9451450f5466e997a7285ab0fe28e3b"},
-    {file = "black-22.10.0-cp311-cp311-win_amd64.whl", hash = "sha256:21199526696b8f09c3997e2b4db8d0b108d801a348414264d2eb8eb2532e540d"},
-    {file = "black-22.10.0-cp37-cp37m-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:1e464456d24e23d11fced2bc8c47ef66d471f845c7b7a42f3bd77bf3d1789650"},
-    {file = "black-22.10.0-cp37-cp37m-win_amd64.whl", hash = "sha256:9311e99228ae10023300ecac05be5a296f60d2fd10fff31cf5c1fa4ca4b1988d"},
-    {file = "black-22.10.0-cp38-cp38-macosx_11_0_arm64.whl", hash = "sha256:fba8a281e570adafb79f7755ac8721b6cf1bbf691186a287e990c7929c7692ff"},
-    {file = "black-22.10.0-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:915ace4ff03fdfff953962fa672d44be269deb2eaf88499a0f8805221bc68c87"},
-    {file = "black-22.10.0-cp38-cp38-win_amd64.whl", hash = "sha256:444ebfb4e441254e87bad00c661fe32df9969b2bf224373a448d8aca2132b395"},
-    {file = "black-22.10.0-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:974308c58d057a651d182208a484ce80a26dac0caef2895836a92dd6ebd725e0"},
-    {file = "black-22.10.0-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:72ef3925f30e12a184889aac03d77d031056860ccae8a1e519f6cbb742736383"},
-    {file = "black-22.10.0-cp39-cp39-win_amd64.whl", hash = "sha256:432247333090c8c5366e69627ccb363bc58514ae3e63f7fc75c54b1ea80fa7de"},
-    {file = "black-22.10.0-py3-none-any.whl", hash = "sha256:c957b2b4ea88587b46cf49d1dc17681c1e672864fd7af32fc1e9664d572b3458"},
-    {file = "black-22.10.0.tar.gz", hash = "sha256:f513588da599943e0cde4e32cc9879e825d58720d6557062d1098c5ad80080e1"},
-]
-certifi = [
-    {file = "certifi-2022.9.24-py3-none-any.whl", hash = "sha256:90c1a32f1d68f940488354e36370f6cca89f0f106db09518524c88d6ed83f382"},
-    {file = "certifi-2022.9.24.tar.gz", hash = "sha256:0d9c601124e5a6ba9712dbc60d9c53c21e34f5f641fe83002317394311bdce14"},
-]
+black = []
+certifi = []
 cfgv = [
     {file = "cfgv-3.3.1-py2.py3-none-any.whl", hash = "sha256:c6a0883f3917a037485059700b9e75da2464e6c27051014ad85ba6aaa5884426"},
     {file = "cfgv-3.3.1.tar.gz", hash = "sha256:f5a830efb9ce7a445376bb66ec94c638a9787422f96264c98edc6bdeed8ab736"},
 ]
-chardet = [
-    {file = "chardet-5.0.0-py3-none-any.whl", hash = "sha256:d3e64f022d254183001eccc5db4040520c0f23b1a3f33d6413e099eb7f126557"},
-    {file = "chardet-5.0.0.tar.gz", hash = "sha256:0368df2bfd78b5fc20572bb4e9bb7fb53e2c094f60ae9993339e8671d0afb8aa"},
-]
-charset-normalizer = [
-    {file = "charset-normalizer-2.1.1.tar.gz", hash = "sha256:5a3d016c7c547f69d6f81fb0db9449ce888b418b5b9952cc5e6e66843e9dd845"},
-    {file = "charset_normalizer-2.1.1-py3-none-any.whl", hash = "sha256:83e9a75d1911279afd89352c68b45348559d1fc0506b054b346651b5e7fee29f"},
-]
-click = [
-    {file = "click-8.1.3-py3-none-any.whl", hash = "sha256:bb4d8133cb15a609f44e8213d9b391b0809795062913b383c62be0ee95b1db48"},
-    {file = "click-8.1.3.tar.gz", hash = "sha256:7682dc8afb30297001674575ea00d1814d808d6a36af415a82bd481d37ba7b8e"},
-]
-colorama = [
-    {file = "colorama-0.4.5-py2.py3-none-any.whl", hash = "sha256:854bf444933e37f5824ae7bfc1e98d5bce2ebe4160d46b5edf346a89358e99da"},
-    {file = "colorama-0.4.5.tar.gz", hash = "sha256:e6c6b4334fc50988a639d9b98aa429a0b57da6e17b9a44f0451f930b6967b7a4"},
-]
-cookiecutter = [
-    {file = "cookiecutter-2.1.1-py2.py3-none-any.whl", hash = "sha256:9f3ab027cec4f70916e28f03470bdb41e637a3ad354b4d65c765d93aad160022"},
-    {file = "cookiecutter-2.1.1.tar.gz", hash = "sha256:f3982be8d9c53dac1261864013fdec7f83afd2e42ede6f6dd069c5e149c540d5"},
-]
-coverage = [
-    {file = "coverage-6.5.0-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:ef8674b0ee8cc11e2d574e3e2998aea5df5ab242e012286824ea3c6970580e53"},
-    {file = "coverage-6.5.0-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:784f53ebc9f3fd0e2a3f6a78b2be1bd1f5575d7863e10c6e12504f240fd06660"},
-    {file = "coverage-6.5.0-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:b4a5be1748d538a710f87542f22c2cad22f80545a847ad91ce45e77417293eb4"},
-    {file = "coverage-6.5.0-cp310-cp310-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:83516205e254a0cb77d2d7bb3632ee019d93d9f4005de31dca0a8c3667d5bc04"},
-    {file = "coverage-6.5.0-cp310-cp310-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:af4fffaffc4067232253715065e30c5a7ec6faac36f8fc8d6f64263b15f74db0"},
-    {file = "coverage-6.5.0-cp310-cp310-musllinux_1_1_aarch64.whl", hash = "sha256:97117225cdd992a9c2a5515db1f66b59db634f59d0679ca1fa3fe8da32749cae"},
-    {file = "coverage-6.5.0-cp310-cp310-musllinux_1_1_i686.whl", hash = "sha256:a1170fa54185845505fbfa672f1c1ab175446c887cce8212c44149581cf2d466"},
-    {file = "coverage-6.5.0-cp310-cp310-musllinux_1_1_x86_64.whl", hash = "sha256:11b990d520ea75e7ee8dcab5bc908072aaada194a794db9f6d7d5cfd19661e5a"},
-    {file = "coverage-6.5.0-cp310-cp310-win32.whl", hash = "sha256:5dbec3b9095749390c09ab7c89d314727f18800060d8d24e87f01fb9cfb40b32"},
-    {file = "coverage-6.5.0-cp310-cp310-win_amd64.whl", hash = "sha256:59f53f1dc5b656cafb1badd0feb428c1e7bc19b867479ff72f7a9dd9b479f10e"},
-    {file = "coverage-6.5.0-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:4a5375e28c5191ac38cca59b38edd33ef4cc914732c916f2929029b4bfb50795"},
-    {file = "coverage-6.5.0-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:c4ed2820d919351f4167e52425e096af41bfabacb1857186c1ea32ff9983ed75"},
-    {file = "coverage-6.5.0-cp311-cp311-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:33a7da4376d5977fbf0a8ed91c4dffaaa8dbf0ddbf4c8eea500a2486d8bc4d7b"},
-    {file = "coverage-6.5.0-cp311-cp311-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:a8fb6cf131ac4070c9c5a3e21de0f7dc5a0fbe8bc77c9456ced896c12fcdad91"},
-    {file = "coverage-6.5.0-cp311-cp311-musllinux_1_1_aarch64.whl", hash = "sha256:a6b7d95969b8845250586f269e81e5dfdd8ff828ddeb8567a4a2eaa7313460c4"},
-    {file = "coverage-6.5.0-cp311-cp311-musllinux_1_1_i686.whl", hash = "sha256:1ef221513e6f68b69ee9e159506d583d31aa3567e0ae84eaad9d6ec1107dddaa"},
-    {file = "coverage-6.5.0-cp311-cp311-musllinux_1_1_x86_64.whl", hash = "sha256:cca4435eebea7962a52bdb216dec27215d0df64cf27fc1dd538415f5d2b9da6b"},
-    {file = "coverage-6.5.0-cp311-cp311-win32.whl", hash = "sha256:98e8a10b7a314f454d9eff4216a9a94d143a7ee65018dd12442e898ee2310578"},
-    {file = "coverage-6.5.0-cp311-cp311-win_amd64.whl", hash = "sha256:bc8ef5e043a2af066fa8cbfc6e708d58017024dc4345a1f9757b329a249f041b"},
-    {file = "coverage-6.5.0-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:4433b90fae13f86fafff0b326453dd42fc9a639a0d9e4eec4d366436d1a41b6d"},
-    {file = "coverage-6.5.0-cp37-cp37m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:f4f05d88d9a80ad3cac6244d36dd89a3c00abc16371769f1340101d3cb899fc3"},
-    {file = "coverage-6.5.0-cp37-cp37m-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:94e2565443291bd778421856bc975d351738963071e9b8839ca1fc08b42d4bef"},
-    {file = "coverage-6.5.0-cp37-cp37m-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:027018943386e7b942fa832372ebc120155fd970837489896099f5cfa2890f79"},
-    {file = "coverage-6.5.0-cp37-cp37m-musllinux_1_1_aarch64.whl", hash = "sha256:255758a1e3b61db372ec2736c8e2a1fdfaf563977eedbdf131de003ca5779b7d"},
-    {file = "coverage-6.5.0-cp37-cp37m-musllinux_1_1_i686.whl", hash = "sha256:851cf4ff24062c6aec510a454b2584f6e998cada52d4cb58c5e233d07172e50c"},
-    {file = "coverage-6.5.0-cp37-cp37m-musllinux_1_1_x86_64.whl", hash = "sha256:12adf310e4aafddc58afdb04d686795f33f4d7a6fa67a7a9d4ce7d6ae24d949f"},
-    {file = "coverage-6.5.0-cp37-cp37m-win32.whl", hash = "sha256:b5604380f3415ba69de87a289a2b56687faa4fe04dbee0754bfcae433489316b"},
-    {file = "coverage-6.5.0-cp37-cp37m-win_amd64.whl", hash = "sha256:4a8dbc1f0fbb2ae3de73eb0bdbb914180c7abfbf258e90b311dcd4f585d44bd2"},
-    {file = "coverage-6.5.0-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:d900bb429fdfd7f511f868cedd03a6bbb142f3f9118c09b99ef8dc9bf9643c3c"},
-    {file = "coverage-6.5.0-cp38-cp38-macosx_11_0_arm64.whl", hash = "sha256:2198ea6fc548de52adc826f62cb18554caedfb1d26548c1b7c88d8f7faa8f6ba"},
-    {file = "coverage-6.5.0-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:6c4459b3de97b75e3bd6b7d4b7f0db13f17f504f3d13e2a7c623786289dd670e"},
-    {file = "coverage-6.5.0-cp38-cp38-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:20c8ac5386253717e5ccc827caad43ed66fea0efe255727b1053a8154d952398"},
-    {file = "coverage-6.5.0-cp38-cp38-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:6b07130585d54fe8dff3d97b93b0e20290de974dc8177c320aeaf23459219c0b"},
-    {file = "coverage-6.5.0-cp38-cp38-musllinux_1_1_aarch64.whl", hash = "sha256:dbdb91cd8c048c2b09eb17713b0c12a54fbd587d79adcebad543bc0cd9a3410b"},
-    {file = "coverage-6.5.0-cp38-cp38-musllinux_1_1_i686.whl", hash = "sha256:de3001a203182842a4630e7b8d1a2c7c07ec1b45d3084a83d5d227a3806f530f"},
-    {file = "coverage-6.5.0-cp38-cp38-musllinux_1_1_x86_64.whl", hash = "sha256:e07f4a4a9b41583d6eabec04f8b68076ab3cd44c20bd29332c6572dda36f372e"},
-    {file = "coverage-6.5.0-cp38-cp38-win32.whl", hash = "sha256:6d4817234349a80dbf03640cec6109cd90cba068330703fa65ddf56b60223a6d"},
-    {file = "coverage-6.5.0-cp38-cp38-win_amd64.whl", hash = "sha256:7ccf362abd726b0410bf8911c31fbf97f09f8f1061f8c1cf03dfc4b6372848f6"},
-    {file = "coverage-6.5.0-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:633713d70ad6bfc49b34ead4060531658dc6dfc9b3eb7d8a716d5873377ab745"},
-    {file = "coverage-6.5.0-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:95203854f974e07af96358c0b261f1048d8e1083f2de9b1c565e1be4a3a48cfc"},
-    {file = "coverage-6.5.0-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:b9023e237f4c02ff739581ef35969c3739445fb059b060ca51771e69101efffe"},
-    {file = "coverage-6.5.0-cp39-cp39-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:265de0fa6778d07de30bcf4d9dc471c3dc4314a23a3c6603d356a3c9abc2dfcf"},
-    {file = "coverage-6.5.0-cp39-cp39-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:8f830ed581b45b82451a40faabb89c84e1a998124ee4212d440e9c6cf70083e5"},
-    {file = "coverage-6.5.0-cp39-cp39-musllinux_1_1_aarch64.whl", hash = "sha256:7b6be138d61e458e18d8e6ddcddd36dd96215edfe5f1168de0b1b32635839b62"},
-    {file = "coverage-6.5.0-cp39-cp39-musllinux_1_1_i686.whl", hash = "sha256:42eafe6778551cf006a7c43153af1211c3aaab658d4d66fa5fcc021613d02518"},
-    {file = "coverage-6.5.0-cp39-cp39-musllinux_1_1_x86_64.whl", hash = "sha256:723e8130d4ecc8f56e9a611e73b31219595baa3bb252d539206f7bbbab6ffc1f"},
-    {file = "coverage-6.5.0-cp39-cp39-win32.whl", hash = "sha256:d9ecf0829c6a62b9b573c7bb6d4dcd6ba8b6f80be9ba4fc7ed50bf4ac9aecd72"},
-    {file = "coverage-6.5.0-cp39-cp39-win_amd64.whl", hash = "sha256:fc2af30ed0d5ae0b1abdb4ebdce598eafd5b35397d4d75deb341a614d333d987"},
-    {file = "coverage-6.5.0-pp36.pp37.pp38-none-any.whl", hash = "sha256:1431986dac3923c5945271f169f59c45b8802a114c8f548d611f2015133df77a"},
-    {file = "coverage-6.5.0.tar.gz", hash = "sha256:f642e90754ee3e06b0e7e51bce3379590e76b7f76b708e1a71ff043f87025c84"},
-]
-distlib = [
-    {file = "distlib-0.3.6-py2.py3-none-any.whl", hash = "sha256:f35c4b692542ca110de7ef0bea44d73981caeb34ca0b9b6b2e6d7790dda8f80e"},
-    {file = "distlib-0.3.6.tar.gz", hash = "sha256:14bad2d9b04d3a36127ac97f30b12a19268f211063d8f8ee4f47108896e11b46"},
-]
-exceptiongroup = [
-    {file = "exceptiongroup-1.0.0rc9-py3-none-any.whl", hash = "sha256:2e3c3fc1538a094aab74fad52d6c33fc94de3dfee3ee01f187c0e0c72aec5337"},
-    {file = "exceptiongroup-1.0.0rc9.tar.gz", hash = "sha256:9086a4a21ef9b31c72181c77c040a074ba0889ee56a7b289ff0afb0d97655f96"},
-]
+chardet = []
+charset-normalizer = []
+click = []
+colorama = []
+cookiecutter = []
+coverage = []
+distlib = []
+exceptiongroup = []
 execnet = [
     {file = "execnet-1.9.0-py2.py3-none-any.whl", hash = "sha256:a295f7cc774947aac58dde7fdc85f4aa00c42adf5d8f5468fc630c1acf30a142"},
     {file = "execnet-1.9.0.tar.gz", hash = "sha256:8f694f3ba9cc92cab508b152dcfe322153975c29bda272e2fd7f3f00f36e47c5"},
 ]
-filelock = [
-    {file = "filelock-3.8.0-py3-none-any.whl", hash = "sha256:617eb4e5eedc82fc5f47b6d61e4d11cb837c56cb4544e39081099fa17ad109d4"},
-    {file = "filelock-3.8.0.tar.gz", hash = "sha256:55447caa666f2198c5b6b13a26d2084d26fa5b115c00d065664b2124680c4edc"},
-]
-identify = [
-    {file = "identify-2.5.6-py2.py3-none-any.whl", hash = "sha256:b276db7ec52d7e89f5bc4653380e33054ddc803d25875952ad90b0f012cbcdaa"},
-    {file = "identify-2.5.6.tar.gz", hash = "sha256:6c32dbd747aa4ceee1df33f25fed0b0f6e0d65721b15bd151307ff7056d50245"},
-]
-idna = [
-    {file = "idna-3.4-py3-none-any.whl", hash = "sha256:90b77e79eaa3eba6de819a0c442c0b4ceefc341a7a2ab77d7562bf49f425c5c2"},
-    {file = "idna-3.4.tar.gz", hash = "sha256:814f528e8dead7d329833b91c5faa87d60bf71824cd12a7530b5526063d02cb4"},
-]
+filelock = []
+identify = []
+idna = []
 iniconfig = [
     {file = "iniconfig-1.1.1-py2.py3-none-any.whl", hash = "sha256:011e24c64b7f47f6ebd835bb12a743f2fbe9a26d4cecaa7f53bc4f35ee9da8b3"},
     {file = "iniconfig-1.1.1.tar.gz", hash = "sha256:bc3af051d7d14b2ee5ef9969666def0cd1a000e121eaea580d4a313df4b37f32"},
@@ -781,84 +663,28 @@ isort = [
     {file = "isort-5.10.1-py3-none-any.whl", hash = "sha256:6f62d78e2f89b4500b080fe3a81690850cd254227f27f75c3a0c491a1f351ba7"},
     {file = "isort-5.10.1.tar.gz", hash = "sha256:e8443a5e7a020e9d7f97f1d7d9cd17c88bcb3bc7e218bf9cf5095fe550be2951"},
 ]
-jinja2 = [
-    {file = "Jinja2-3.1.2-py3-none-any.whl", hash = "sha256:6088930bfe239f0e6710546ab9c19c9ef35e29792895fed6e6e31a023a182a61"},
-    {file = "Jinja2-3.1.2.tar.gz", hash = "sha256:31351a702a408a9e7595a8fc6150fc3f43bb6bf7e319770cbc0db9df9437e852"},
-]
+jinja2 = []
 jinja2-time = [
     {file = "jinja2-time-0.2.0.tar.gz", hash = "sha256:d14eaa4d315e7688daa4969f616f226614350c48730bfa1692d2caebd8c90d40"},
     {file = "jinja2_time-0.2.0-py2.py3-none-any.whl", hash = "sha256:d3eab6605e3ec8b7a0863df09cc1d23714908fa61aa6986a845c20ba488b4efa"},
 ]
-markupsafe = [
-    {file = "MarkupSafe-2.1.1-cp310-cp310-macosx_10_9_universal2.whl", hash = "sha256:86b1f75c4e7c2ac2ccdaec2b9022845dbb81880ca318bb7a0a01fbf7813e3812"},
-    {file = "MarkupSafe-2.1.1-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:f121a1420d4e173a5d96e47e9a0c0dcff965afdf1626d28de1460815f7c4ee7a"},
-    {file = "MarkupSafe-2.1.1-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:a49907dd8420c5685cfa064a1335b6754b74541bbb3706c259c02ed65b644b3e"},
-    {file = "MarkupSafe-2.1.1-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:10c1bfff05d95783da83491be968e8fe789263689c02724e0c691933c52994f5"},
-    {file = "MarkupSafe-2.1.1-cp310-cp310-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:b7bd98b796e2b6553da7225aeb61f447f80a1ca64f41d83612e6139ca5213aa4"},
-    {file = "MarkupSafe-2.1.1-cp310-cp310-musllinux_1_1_aarch64.whl", hash = "sha256:b09bf97215625a311f669476f44b8b318b075847b49316d3e28c08e41a7a573f"},
-    {file = "MarkupSafe-2.1.1-cp310-cp310-musllinux_1_1_i686.whl", hash = "sha256:694deca8d702d5db21ec83983ce0bb4b26a578e71fbdbd4fdcd387daa90e4d5e"},
-    {file = "MarkupSafe-2.1.1-cp310-cp310-musllinux_1_1_x86_64.whl", hash = "sha256:efc1913fd2ca4f334418481c7e595c00aad186563bbc1ec76067848c7ca0a933"},
-    {file = "MarkupSafe-2.1.1-cp310-cp310-win32.whl", hash = "sha256:4a33dea2b688b3190ee12bd7cfa29d39c9ed176bda40bfa11099a3ce5d3a7ac6"},
-    {file = "MarkupSafe-2.1.1-cp310-cp310-win_amd64.whl", hash = "sha256:dda30ba7e87fbbb7eab1ec9f58678558fd9a6b8b853530e176eabd064da81417"},
-    {file = "MarkupSafe-2.1.1-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:671cd1187ed5e62818414afe79ed29da836dde67166a9fac6d435873c44fdd02"},
-    {file = "MarkupSafe-2.1.1-cp37-cp37m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:3799351e2336dc91ea70b034983ee71cf2f9533cdff7c14c90ea126bfd95d65a"},
-    {file = "MarkupSafe-2.1.1-cp37-cp37m-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:e72591e9ecd94d7feb70c1cbd7be7b3ebea3f548870aa91e2732960fa4d57a37"},
-    {file = "MarkupSafe-2.1.1-cp37-cp37m-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:6fbf47b5d3728c6aea2abb0589b5d30459e369baa772e0f37a0320185e87c980"},
-    {file = "MarkupSafe-2.1.1-cp37-cp37m-musllinux_1_1_aarch64.whl", hash = "sha256:d5ee4f386140395a2c818d149221149c54849dfcfcb9f1debfe07a8b8bd63f9a"},
-    {file = "MarkupSafe-2.1.1-cp37-cp37m-musllinux_1_1_i686.whl", hash = "sha256:bcb3ed405ed3222f9904899563d6fc492ff75cce56cba05e32eff40e6acbeaa3"},
-    {file = "MarkupSafe-2.1.1-cp37-cp37m-musllinux_1_1_x86_64.whl", hash = "sha256:e1c0b87e09fa55a220f058d1d49d3fb8df88fbfab58558f1198e08c1e1de842a"},
-    {file = "MarkupSafe-2.1.1-cp37-cp37m-win32.whl", hash = "sha256:8dc1c72a69aa7e082593c4a203dcf94ddb74bb5c8a731e4e1eb68d031e8498ff"},
-    {file = "MarkupSafe-2.1.1-cp37-cp37m-win_amd64.whl", hash = "sha256:97a68e6ada378df82bc9f16b800ab77cbf4b2fada0081794318520138c088e4a"},
-    {file = "MarkupSafe-2.1.1-cp38-cp38-macosx_10_9_universal2.whl", hash = "sha256:e8c843bbcda3a2f1e3c2ab25913c80a3c5376cd00c6e8c4a86a89a28c8dc5452"},
-    {file = "MarkupSafe-2.1.1-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:0212a68688482dc52b2d45013df70d169f542b7394fc744c02a57374a4207003"},
-    {file = "MarkupSafe-2.1.1-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:8e576a51ad59e4bfaac456023a78f6b5e6e7651dcd383bcc3e18d06f9b55d6d1"},
-    {file = "MarkupSafe-2.1.1-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:4b9fe39a2ccc108a4accc2676e77da025ce383c108593d65cc909add5c3bd601"},
-    {file = "MarkupSafe-2.1.1-cp38-cp38-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:96e37a3dc86e80bf81758c152fe66dbf60ed5eca3d26305edf01892257049925"},
-    {file = "MarkupSafe-2.1.1-cp38-cp38-musllinux_1_1_aarch64.whl", hash = "sha256:6d0072fea50feec76a4c418096652f2c3238eaa014b2f94aeb1d56a66b41403f"},
-    {file = "MarkupSafe-2.1.1-cp38-cp38-musllinux_1_1_i686.whl", hash = "sha256:089cf3dbf0cd6c100f02945abeb18484bd1ee57a079aefd52cffd17fba910b88"},
-    {file = "MarkupSafe-2.1.1-cp38-cp38-musllinux_1_1_x86_64.whl", hash = "sha256:6a074d34ee7a5ce3effbc526b7083ec9731bb3cbf921bbe1d3005d4d2bdb3a63"},
-    {file = "MarkupSafe-2.1.1-cp38-cp38-win32.whl", hash = "sha256:421be9fbf0ffe9ffd7a378aafebbf6f4602d564d34be190fc19a193232fd12b1"},
-    {file = "MarkupSafe-2.1.1-cp38-cp38-win_amd64.whl", hash = "sha256:fc7b548b17d238737688817ab67deebb30e8073c95749d55538ed473130ec0c7"},
-    {file = "MarkupSafe-2.1.1-cp39-cp39-macosx_10_9_universal2.whl", hash = "sha256:e04e26803c9c3851c931eac40c695602c6295b8d432cbe78609649ad9bd2da8a"},
-    {file = "MarkupSafe-2.1.1-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:b87db4360013327109564f0e591bd2a3b318547bcef31b468a92ee504d07ae4f"},
-    {file = "MarkupSafe-2.1.1-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:99a2a507ed3ac881b975a2976d59f38c19386d128e7a9a18b7df6fff1fd4c1d6"},
-    {file = "MarkupSafe-2.1.1-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:56442863ed2b06d19c37f94d999035e15ee982988920e12a5b4ba29b62ad1f77"},
-    {file = "MarkupSafe-2.1.1-cp39-cp39-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:3ce11ee3f23f79dbd06fb3d63e2f6af7b12db1d46932fe7bd8afa259a5996603"},
-    {file = "MarkupSafe-2.1.1-cp39-cp39-musllinux_1_1_aarch64.whl", hash = "sha256:33b74d289bd2f5e527beadcaa3f401e0df0a89927c1559c8566c066fa4248ab7"},
-    {file = "MarkupSafe-2.1.1-cp39-cp39-musllinux_1_1_i686.whl", hash = "sha256:43093fb83d8343aac0b1baa75516da6092f58f41200907ef92448ecab8825135"},
-    {file = "MarkupSafe-2.1.1-cp39-cp39-musllinux_1_1_x86_64.whl", hash = "sha256:8e3dcf21f367459434c18e71b2a9532d96547aef8a871872a5bd69a715c15f96"},
-    {file = "MarkupSafe-2.1.1-cp39-cp39-win32.whl", hash = "sha256:d4306c36ca495956b6d568d276ac11fdd9c30a36f1b6eb928070dc5360b22e1c"},
-    {file = "MarkupSafe-2.1.1-cp39-cp39-win_amd64.whl", hash = "sha256:46d00d6cfecdde84d40e572d63735ef81423ad31184100411e6e3388d405e247"},
-    {file = "MarkupSafe-2.1.1.tar.gz", hash = "sha256:7f91197cc9e48f989d12e4e6fbc46495c446636dfc81b9ccf50bb0ec74b91d4b"},
-]
+markupsafe = []
 mypy-extensions = [
     {file = "mypy_extensions-0.4.3-py2.py3-none-any.whl", hash = "sha256:090fedd75945a69ae91ce1303b5824f428daf5a028d2f6ab8a299250a846f15d"},
     {file = "mypy_extensions-0.4.3.tar.gz", hash = "sha256:2d82818f5bb3e369420cb3c4060a7970edba416647068eb4c5343488a6c604a8"},
 ]
-nodeenv = [
-    {file = "nodeenv-1.7.0-py2.py3-none-any.whl", hash = "sha256:27083a7b96a25f2f5e1d8cb4b6317ee8aeda3bdd121394e5ac54e498028a042e"},
-    {file = "nodeenv-1.7.0.tar.gz", hash = "sha256:e0e7f7dfb85fc5394c6fe1e8fa98131a2473e04311a45afb6508f7cf1836fa2b"},
-]
+nodeenv = []
 packaging = [
     {file = "packaging-21.3-py3-none-any.whl", hash = "sha256:ef103e05f519cdc783ae24ea4e2e0f508a9c99b2d4969652eed6a2e1ea5bd522"},
     {file = "packaging-21.3.tar.gz", hash = "sha256:dd47c42927d89ab911e606518907cc2d3a1f38bbd026385970643f9c5b8ecfeb"},
 ]
-pathspec = [
-    {file = "pathspec-0.10.1-py3-none-any.whl", hash = "sha256:46846318467efc4556ccfd27816e004270a9eeeeb4d062ce5e6fc7a87c573f93"},
-    {file = "pathspec-0.10.1.tar.gz", hash = "sha256:7ace6161b621d31e7902eb6b5ae148d12cfd23f4a249b9ffb6b9fee12084323d"},
-]
-platformdirs = [
-    {file = "platformdirs-2.5.2-py3-none-any.whl", hash = "sha256:027d8e83a2d7de06bbac4e5ef7e023c02b863d7ea5d079477e722bb41ab25788"},
-    {file = "platformdirs-2.5.2.tar.gz", hash = "sha256:58c8abb07dcb441e6ee4b11d8df0ac856038f944ab98b7be6b27b2a3c7feef19"},
-]
+pathspec = []
+platformdirs = []
 pluggy = [
     {file = "pluggy-1.0.0-py2.py3-none-any.whl", hash = "sha256:74134bbf457f031a36d68416e1509f34bd5ccc019f0bcc952c7b909d06b37bd3"},
     {file = "pluggy-1.0.0.tar.gz", hash = "sha256:4224373bacce55f955a878bf9cfa763c1e360858e330072059e10bad68531159"},
 ]
-pre-commit = [
-    {file = "pre_commit-2.20.0-py2.py3-none-any.whl", hash = "sha256:51a5ba7c480ae8072ecdb6933df22d2f812dc897d5fe848778116129a681aac7"},
-    {file = "pre_commit-2.20.0.tar.gz", hash = "sha256:a978dac7bc9ec0bcee55c18a277d553b0f419d259dadb4b9418ff2d00eb43959"},
-]
+pre-commit = []
 py = [
     {file = "py-1.11.0-py2.py3-none-any.whl", hash = "sha256:607c53218732647dff4acdfcd50cb62615cedf612e72d1724fb1a0cc6405b378"},
     {file = "py-1.11.0.tar.gz", hash = "sha256:51c75c4126074b472f746a24399ad32f6053d1b34b68d2fa41e558e6f4a98719"},
@@ -867,30 +693,16 @@ pyparsing = [
     {file = "pyparsing-3.0.9-py3-none-any.whl", hash = "sha256:5026bae9a10eeaefb61dab2f09052b9f4307d44aee4eda64b309723d8d206bbc"},
     {file = "pyparsing-3.0.9.tar.gz", hash = "sha256:2b020ecf7d21b687f219b71ecad3631f644a47f01403fa1d1036b0c6416d70fb"},
 ]
-pytest = [
-    {file = "pytest-7.2.0-py3-none-any.whl", hash = "sha256:892f933d339f068883b6fd5a459f03d85bfcb355e4981e146d2c7616c21fef71"},
-    {file = "pytest-7.2.0.tar.gz", hash = "sha256:c4014eb40e10f11f355ad4e3c2fb2c6c6d1919c73f3b5a433de4708202cade59"},
-]
-pytest-cov = [
-    {file = "pytest-cov-4.0.0.tar.gz", hash = "sha256:996b79efde6433cdbd0088872dbc5fb3ed7fe1578b68cdbba634f14bb8dd0470"},
-    {file = "pytest_cov-4.0.0-py3-none-any.whl", hash = "sha256:2feb1b751d66a8bd934e5edfa2e961d11309dc37b73b0eabe73b5945fee20f6b"},
-]
-pytest-xdist = [
-    {file = "pytest-xdist-3.0.2.tar.gz", hash = "sha256:688da9b814370e891ba5de650c9327d1a9d861721a524eb917e620eec3e90291"},
-    {file = "pytest_xdist-3.0.2-py3-none-any.whl", hash = "sha256:9feb9a18e1790696ea23e1434fa73b325ed4998b0e9fcb221f16fd1945e6df1b"},
-]
+pytest = []
+pytest-cov = []
+pytest-forked = []
+pytest-xdist = []
 python-dateutil = [
     {file = "python-dateutil-2.8.2.tar.gz", hash = "sha256:0123cacc1627ae19ddf3c27a5de5bd67ee4586fbdd6440d9748f8abb483d3e86"},
     {file = "python_dateutil-2.8.2-py2.py3-none-any.whl", hash = "sha256:961d03dc3453ebbc59dbdea9e4e11c5651520a876d0f4db161e8674aae935da9"},
 ]
-python-dotenv = [
-    {file = "python-dotenv-0.21.0.tar.gz", hash = "sha256:b77d08274639e3d34145dfa6c7008e66df0f04b7be7a75fd0d5292c191d79045"},
-    {file = "python_dotenv-0.21.0-py3-none-any.whl", hash = "sha256:1684eb44636dd462b66c3ee016599815514527ad99965de77f43e0944634a7e5"},
-]
-python-slugify = [
-    {file = "python-slugify-6.1.2.tar.gz", hash = "sha256:272d106cb31ab99b3496ba085e3fea0e9e76dcde967b5e9992500d1f785ce4e1"},
-    {file = "python_slugify-6.1.2-py2.py3-none-any.whl", hash = "sha256:7b2c274c308b62f4269a9ba701aa69a797e9bca41aeee5b3a9e79e36b6656927"},
-]
+python-dotenv = []
+python-slugify = []
 pyyaml = [
     {file = "PyYAML-6.0-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:d4db7c7aef085872ef65a8fd7d6d09a14ae91f691dec3e87ee5ee0539d516f53"},
     {file = "PyYAML-6.0-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:9df7ed3b3d2e0ecfe09e14741b857df43adb5a3ddadc919a2d94fbdf78fea53c"},
@@ -899,13 +711,6 @@ pyyaml = [
     {file = "PyYAML-6.0-cp310-cp310-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:f84fbc98b019fef2ee9a1cb3ce93e3187a6df0b2538a651bfb890254ba9f90b5"},
     {file = "PyYAML-6.0-cp310-cp310-win32.whl", hash = "sha256:2cd5df3de48857ed0544b34e2d40e9fac445930039f3cfe4bcc592a1f836d513"},
     {file = "PyYAML-6.0-cp310-cp310-win_amd64.whl", hash = "sha256:daf496c58a8c52083df09b80c860005194014c3698698d1a57cbcfa182142a3a"},
-    {file = "PyYAML-6.0-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:d4b0ba9512519522b118090257be113b9468d804b19d63c71dbcf4a48fa32358"},
-    {file = "PyYAML-6.0-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:81957921f441d50af23654aa6c5e5eaf9b06aba7f0a19c18a538dc7ef291c5a1"},
-    {file = "PyYAML-6.0-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:afa17f5bc4d1b10afd4466fd3a44dc0e245382deca5b3c353d8b757f9e3ecb8d"},
-    {file = "PyYAML-6.0-cp311-cp311-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:dbad0e9d368bb989f4515da330b88a057617d16b6a8245084f1b05400f24609f"},
-    {file = "PyYAML-6.0-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:432557aa2c09802be39460360ddffd48156e30721f5e8d917f01d31694216782"},
-    {file = "PyYAML-6.0-cp311-cp311-win32.whl", hash = "sha256:bfaef573a63ba8923503d27530362590ff4f576c626d86a9fed95822a8255fd7"},
-    {file = "PyYAML-6.0-cp311-cp311-win_amd64.whl", hash = "sha256:01b45c0191e6d66c470b6cf1b9531a771a83c1c4208272ead47a3ae4f2f603bf"},
     {file = "PyYAML-6.0-cp36-cp36m-macosx_10_9_x86_64.whl", hash = "sha256:897b80890765f037df3403d22bab41627ca8811ae55e9a722fd0392850ec4d86"},
     {file = "PyYAML-6.0-cp36-cp36m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:50602afada6d6cbfad699b0c7bb50d5ccffa7e46a3d738092afddc1f9758427f"},
     {file = "PyYAML-6.0-cp36-cp36m-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:48c346915c114f5fdb3ead70312bd042a953a8ce5c7106d5bfb1a5254e47da92"},
@@ -933,22 +738,12 @@ pyyaml = [
     {file = "PyYAML-6.0-cp39-cp39-win_amd64.whl", hash = "sha256:b3d267842bf12586ba6c734f89d1f5b871df0273157918b0ccefa29deb05c21c"},
     {file = "PyYAML-6.0.tar.gz", hash = "sha256:68fb519c14306fec9720a2a5b45bc9f0c8d1b9c72adf45c37baedfcd949c35a2"},
 ]
-requests = [
-    {file = "requests-2.28.1-py3-none-any.whl", hash = "sha256:8fefa2a1a1365bf5520aac41836fbee479da67864514bdb821f31ce07ce65349"},
-    {file = "requests-2.28.1.tar.gz", hash = "sha256:7c5599b102feddaa661c826c56ab4fee28bfd17f5abca1ebbe3e7f19d7c97983"},
-]
-setuptools = [
-    {file = "setuptools-65.5.0-py3-none-any.whl", hash = "sha256:f62ea9da9ed6289bfe868cd6845968a2c854d1427f8548d52cae02a42b4f0356"},
-    {file = "setuptools-65.5.0.tar.gz", hash = "sha256:512e5536220e38146176efb833d4a62aa726b7bbff82cfbc8ba9eaa3996e0b17"},
-]
+requests = []
 six = [
     {file = "six-1.16.0-py2.py3-none-any.whl", hash = "sha256:8abb2f1d86890a2dfb989f9a77cfcfd3e47c2a354b01111771326f8aa26e0254"},
     {file = "six-1.16.0.tar.gz", hash = "sha256:1e61c37477a1626458e36f7b1d82aa5c9b094fa4802892072e49de9c60c4c926"},
 ]
-soupsieve = [
-    {file = "soupsieve-2.3.2.post1-py3-none-any.whl", hash = "sha256:3b2503d3c7084a42b1ebd08116e5f81aadfaea95863628c80a3b774a11b7c759"},
-    {file = "soupsieve-2.3.2.post1.tar.gz", hash = "sha256:fc53893b3da2c33de295667a0e19f078c14bf86544af307354de5fcf12a3f30d"},
-]
+soupsieve = []
 text-unidecode = [
     {file = "text-unidecode-1.3.tar.gz", hash = "sha256:bad6603bb14d279193107714b288be206cac565dfa49aa5b105294dd5c4aab93"},
     {file = "text_unidecode-1.3-py2.py3-none-any.whl", hash = "sha256:1311f10e8b895935241623731c2ba64f4c455287888b18189350b67134a822e8"},
@@ -961,19 +756,7 @@ tomli = [
     {file = "tomli-2.0.1-py3-none-any.whl", hash = "sha256:939de3e7a6161af0c887ef91b7d41a53e7c5a1ca976325f429cb46ea9bc30ecc"},
     {file = "tomli-2.0.1.tar.gz", hash = "sha256:de526c12914f0c550d15924c62d72abc48d6fe7364aa87328337a31007fe8a4f"},
 ]
-tox = [
-    {file = "tox-3.27.0-py2.py3-none-any.whl", hash = "sha256:89e4bc6df3854e9fc5582462e328dd3660d7d865ba625ae5881bbc63836a6324"},
-    {file = "tox-3.27.0.tar.gz", hash = "sha256:d2c945f02a03d4501374a3d5430877380deb69b218b1df9b7f1d2f2a10befaf9"},
-]
-tqdm = [
-    {file = "tqdm-4.64.1-py2.py3-none-any.whl", hash = "sha256:6fee160d6ffcd1b1c68c65f14c829c22832bc401726335ce92c52d395944a6a1"},
-    {file = "tqdm-4.64.1.tar.gz", hash = "sha256:5f4f682a004951c1b450bc753c710e9280c5746ce6ffedee253ddbcbf54cf1e4"},
-]
-urllib3 = [
-    {file = "urllib3-1.26.12-py2.py3-none-any.whl", hash = "sha256:b930dd878d5a8afb066a637fbb35144fe7901e3b209d1cd4f524bd0e9deee997"},
-    {file = "urllib3-1.26.12.tar.gz", hash = "sha256:3fa96cf423e6987997fc326ae8df396db2a8b7c667747d47ddd8ecba91f4a74e"},
-]
-virtualenv = [
-    {file = "virtualenv-20.16.5-py3-none-any.whl", hash = "sha256:d07dfc5df5e4e0dbc92862350ad87a36ed505b978f6c39609dc489eadd5b0d27"},
-    {file = "virtualenv-20.16.5.tar.gz", hash = "sha256:227ea1b9994fdc5ea31977ba3383ef296d7472ea85be9d6732e42a91c04e80da"},
-]
+tox = []
+tqdm = []
+urllib3 = []
+virtualenv = []
diff --git a/src/adventofcode2021/solutions/data/day_18/day18.txt b/src/adventofcode2021/solutions/data/day_18/day18.txt
new file mode 100644
index 00000000..7b840519
--- /dev/null
+++ b/src/adventofcode2021/solutions/data/day_18/day18.txt
@@ -0,0 +1,100 @@
+[[[5,3],[[8,6],[7,1]]],[8,0]]
+[2,[[3,6],[[3,6],1]]]
+[9,[[[7,1],3],3]]
+[[[3,[3,9]],[3,9]],[[[7,4],4],3]]
+[[[[1,8],[9,6]],[[1,1],2]],[[[3,1],4],6]]
+[[[[4,0],[2,5]],[9,4]],[[[6,9],[0,1]],1]]
+[[1,[[3,7],[5,3]]],[[[9,9],[9,6]],[0,9]]]
+[[[2,[9,9]],[3,3]],[[[5,1],1],[9,0]]]
+[3,[3,9]]
+[[[[1,6],[4,3]],3],[[9,[4,0]],[[2,0],4]]]
+[[2,[6,7]],[6,2]]
+[[[9,[3,3]],[5,[8,7]]],[9,[[7,7],[0,6]]]]
+[[[4,[7,5]],[9,[9,0]]],0]
+[7,[[3,8],8]]
+[[[7,0],[9,9]],8]
+[4,[[[9,4],[8,1]],[2,[3,5]]]]
+[[[2,6],[5,[5,5]]],[[[7,0],[2,2]],[9,8]]]
+[[0,[0,[1,1]]],9]
+[[[2,[7,9]],1],[8,[[8,8],[6,8]]]]
+[[8,[[5,3],[4,4]]],[0,[2,[3,7]]]]
+[[[2,[1,3]],5],[[9,[9,8]],[[8,4],[9,7]]]]
+[[[9,9],[[0,1],[6,2]]],4]
+[[[0,3],[[8,0],4]],[[7,5],2]]
+[[[0,[1,7]],4],[[7,4],[[0,6],[2,8]]]]
+[[[2,[8,3]],1],[[[5,6],9],[[6,8],[3,9]]]]
+[[[0,[5,9]],[7,7]],[4,[[2,3],[6,8]]]]
+[[2,[9,7]],[5,0]]
+[[1,[[8,1],[1,7]]],[3,5]]
+[[[[2,7],0],[[8,6],[0,4]]],[[1,[5,5]],[[0,1],[2,8]]]]
+[[0,4],[[1,1],[9,[6,2]]]]
+[[[6,[6,0]],7],[3,[4,[3,7]]]]
+[[[3,[9,6]],0],9]
+[6,[[7,[1,6]],[7,8]]]
+[[4,[8,[6,6]]],[[[0,1],1],[6,[9,0]]]]
+[[[8,4],[2,[6,0]]],[[9,5],[[7,9],0]]]
+[[[7,7],[[7,3],9]],[[3,7],6]]
+[[7,[9,0]],5]
+[[1,5],[2,[[6,4],[5,0]]]]
+[0,[[0,6],[[5,1],7]]]
+[[3,0],9]
+[1,[8,[[9,8],[6,5]]]]
+[[[7,8],[0,[8,2]]],[1,[1,[2,4]]]]
+[[[2,[5,6]],3],[[4,[9,5]],[9,8]]]
+[[[[0,0],[8,7]],[[9,1],2]],[[9,[6,9]],4]]
+[8,[[9,6],[[2,4],5]]]
+[[[2,[0,4]],[2,[3,7]]],[[[8,1],[9,4]],4]]
+[8,2]
+[[[3,7],0],7]
+[[0,1],[[2,4],[1,5]]]
+[[6,[2,2]],[[[3,3],1],[[4,0],6]]]
+[2,[[5,8],6]]
+[7,[5,[5,5]]]
+[[1,[[2,4],0]],[[2,[8,3]],[4,[3,7]]]]
+[[[5,1],[[7,6],3]],[[[4,8],[5,9]],8]]
+[[[8,[3,5]],[[1,8],[0,3]]],[[0,[1,8]],[6,8]]]
+[[[[0,8],8],[[0,5],[7,6]]],[2,1]]
+[5,[4,[7,0]]]
+[[7,[[6,5],[5,2]]],[4,6]]
+[[2,6],[[2,1],[[2,3],[2,3]]]]
+[[[0,[4,9]],[3,[8,9]]],[[[9,0],[6,2]],[2,1]]]
+[6,[6,[0,[3,1]]]]
+[[[9,8],[[4,9],8]],[[[3,2],[9,1]],5]]
+[[[[2,6],[0,9]],[2,7]],[1,[9,2]]]
+[[[5,[7,9]],[[2,3],2]],[[[9,5],0],[[9,6],[3,3]]]]
+[[[[6,3],[2,1]],[[7,6],[6,8]]],[[[0,2],[8,0]],[0,[9,5]]]]
+[[[[2,0],0],1],[4,[[3,6],[3,1]]]]
+[[[3,1],[5,0]],[[[3,3],[0,2]],[5,8]]]
+[[[[1,0],8],[[2,3],[2,1]]],[[4,[5,5]],[[9,8],3]]]
+[[[8,[0,5]],[9,9]],[[[7,0],1],[[7,2],7]]]
+[[[[3,0],4],7],[[3,9],[4,[9,7]]]]
+[[[8,3],0],[6,5]]
+[[2,[[3,8],6]],[[[3,2],[1,4]],[[1,6],[9,4]]]]
+[[[[6,2],[4,7]],[3,9]],[[1,[6,5]],4]]
+[[[[8,3],2],[8,2]],5]
+[[[9,[9,0]],[4,7]],[[[5,9],2],6]]
+[4,[[6,0],3]]
+[[[5,9],[8,3]],0]
+[[[[6,1],[4,8]],[9,[1,6]]],1]
+[[[8,5],[2,2]],6]
+[2,[5,[[5,7],[6,0]]]]
+[[[[3,6],[2,3]],6],[[6,[6,5]],[[6,4],[6,9]]]]
+[[4,[[1,3],1]],1]
+[[2,[7,[4,3]]],0]
+[[8,[[1,1],1]],[[4,1],[[9,6],[1,3]]]]
+[[8,1],[3,[2,[5,7]]]]
+[8,[[[2,4],[8,3]],[[8,7],[2,8]]]]
+[[0,[[5,7],8]],[[3,[6,6]],[0,8]]]
+[7,[[1,3],[2,4]]]
+[[[2,0],[0,1]],[[[8,9],[7,0]],[3,6]]]
+[[[1,6],[[6,9],[6,3]]],[2,[1,1]]]
+[[1,[7,[8,1]]],[[[0,3],[9,1]],[[1,5],2]]]
+[[[[1,3],2],1],[[[0,4],5],[[5,0],[1,1]]]]
+[[[2,[0,1]],[5,6]],4]
+[[8,3],[[6,4],[[0,9],5]]]
+[[[[2,7],4],[7,0]],[[[6,7],2],[3,8]]]
+[[[[9,3],9],[[2,9],[9,0]]],[[[7,5],3],[[8,8],8]]]
+[[[[0,1],[8,4]],[4,[8,5]]],[2,[1,[0,2]]]]
+[[5,[[3,5],[9,2]]],[[[2,2],3],[[4,7],3]]]
+[[[7,8],8],2]
+[9,[2,1]]
diff --git a/src/adventofcode2021/solutions/day18.py b/src/adventofcode2021/solutions/day18.py
new file mode 100644
index 00000000..607869be
--- /dev/null
+++ b/src/adventofcode2021/solutions/day18.py
@@ -0,0 +1,263 @@
+from __future__ import annotations
+
+import functools
+import math
+from collections import deque
+
+from adventofcode2021.utils.abstract import FileReaderSolution
+from adventofcode2021.utils.priority_queue import PriorityQueue
+
+
+class Snail:
+    value: int
+    left: Snail
+    right: Snail
+    parent: Snail
+
+    def __init__(self, value: int = None, left=None, right=None, parent=None):
+        self.value = value  # type: ignore
+        self.left = left
+        self.right = right
+        self.parent = parent
+
+    @property
+    def has_value(self):
+        return self.left is None and self.right is None
+
+    def __repr__(self):
+        if self.has_value:
+            return str(self.value)
+        left = repr(self.left) if self.left else None
+        right = repr(self.right) if self.right else None
+        if left and right:
+            return f"[{left},{right}]"
+        else:
+            return f"[{left or right}]"
+
+    def __add__(self, other) -> Snail:
+        new = Snail(left=self, right=other)
+        self.parent = new
+        other.parent = new
+        return new
+
+    def __lt__(self, other: Snail):
+        if self.has_value and other.has_value:
+            return self.value < other.value  # type: ignore
+        else:
+            return False
+
+    def find_deepest_snail(self, n: int = 0) -> tuple[Snail | None, int]:
+        """Find the first snail at level nested inside 4 pairs"""
+        if n >= 5:
+            if self.has_value:
+                return self.parent, n
+            else:
+                return self, n
+
+        if self.left:
+            left_snail, left_value = self.left.find_deepest_snail(n + 1)
+        else:
+            left_snail, left_value = None, 0
+        if self.right:
+            right_snail, right_value = self.right.find_deepest_snail(n + 1)
+        else:
+            right_snail, right_value = None, 0
+
+        if right_value > left_value:
+            return right_snail, right_value
+        else:
+            return left_snail, left_value
+
+    def find_splittable(self) -> Snail | None:
+        if self.has_value and self.value >= 10:  # type: ignore
+            return self
+
+        if self.left:
+            left_snail = self.left.find_splittable()
+        else:
+            left_snail = None
+        if self.right:
+            right_snail = self.right.find_splittable()
+        else:
+            right_snail = None
+
+        if left_snail:
+            return left_snail
+        else:
+            return right_snail
+
+
+class Day18:
+    def create_tree(self, line) -> Snail:
+        queue = deque(line)
+        root_node = self.parse(queue)
+        return root_node
+
+    def parse(self, queue: deque[str]) -> Snail:
+        """Create a nested structure of snails from a dequeue of lists"""
+
+        if queue[0] == "[":
+            # Remove [
+            queue.popleft()
+            left = self.parse(queue)
+            # Remove ,
+            queue.popleft()
+            right = self.parse(queue)
+            # Remove ]
+            queue.popleft()
+            new_snail = Snail(left=left, right=right)
+            left.parent = new_snail
+            right.parent = new_snail
+            return new_snail
+        else:
+            # Next digit is a number. We assume that we only have single digits number
+            # in the input.
+            digits = []
+            while queue[0].isdigit():
+                digits.append(queue.popleft())
+            return Snail(value=int("".join(map(str, digits))))
+
+    def explode(self, root_node: Snail) -> Snail:
+        """Explode a snail"""
+        # The root snail will explode:
+        deepest, depth = Snail.find_deepest_snail(root_node)
+        if not deepest:
+            # Nothing to explode anymore
+            raise StopIteration
+        right_value = deepest.right.value
+        left_value = deepest.left.value
+        # Copying C# :)
+        # https://github.com/VSZM/Advent_Of_Code/blob/master/2021/AOC2021/Day18.cs
+        q: PriorityQueue[tuple[int, Snail]] = PriorityQueue()
+        visited: set[Snail] = set()
+
+        q.push((3, deepest.parent))  # type: ignore
+        visited.add(deepest)
+        path_to_root = []
+
+        current = deepest
+        while current:
+            path_to_root.append(current)
+            current = current.parent
+
+        while not q.empty:
+            _, node = q.pop()
+            if node in visited:
+                continue
+            visited.add(node)
+
+            if node.has_value:
+                node.value += left_value
+                break
+
+            if node.right and node not in path_to_root and node.right not in visited:
+                q.push((1, node.right))
+            if node.left and node.left not in visited:
+                q.push((2, node.left))
+            if node.parent is not None and node.parent not in visited:
+                q.push((3, node.parent))
+
+        # Explode to the right
+        q = PriorityQueue()
+        visited = set()
+
+        q.push((3, deepest.parent))  # type: ignore
+        visited.add(deepest)
+
+        while not q.empty:
+            _, node = q.pop()
+            if node in visited:
+                continue
+            visited.add(node)
+
+            if node.has_value:
+                node.value += right_value
+                break
+
+            if node.left and node not in path_to_root and node.left not in visited:
+                q.push((1, node.left))
+            if node.right and node.right not in visited:
+                q.push((2, node.right))
+            if node.parent is not None and node.parent not in visited:
+                q.push((3, node.parent))
+
+        # And remove the exploded node
+        deepest.value = 0
+        deepest.right = None  # type: ignore
+        deepest.left = None  # type: ignore
+        return root_node
+
+    def split(self, node: Snail) -> Snail:
+        """Split the snails.
+        If any regular number is 10 or greater, the leftmost such regular number splits.
+        """
+        splittable = node.find_splittable()
+        if not splittable:
+            raise StopIteration
+
+        value = splittable.value
+        left = math.floor(value / 2)
+        right = math.ceil(value / 2)
+        left_snail = Snail(value=left, parent=splittable)
+        right_snail = Snail(value=right, parent=splittable)
+
+        splittable.value = None  # type: ignore
+        splittable.left = left_snail
+        splittable.right = right_snail
+
+        return node
+
+    def reduce(self, snail1: Snail, snail2: Snail) -> Snail:
+        """Add and then reduce the snails"""
+        super_snail = snail1 + snail2
+
+        did_explode = True
+        did_split = True
+        while did_explode or did_split:
+            try:
+                self.explode(super_snail)
+                did_explode = True
+                continue
+            except StopIteration:
+                did_explode = False
+            try:
+                self.split(super_snail)
+                did_split = True
+                continue
+            except StopIteration:
+                did_split = False
+        return super_snail
+
+    def magnitude(self, snail: Snail) -> int:
+        if snail.has_value:
+            return snail.value
+
+        left = self.magnitude(snail.left) * 3
+        right = self.magnitude(snail.right) * 2
+
+        return left + right
+
+
+class Day18PartA(Day18, FileReaderSolution):
+    def solve(self, input_data: str) -> int:
+        snails = [self.create_tree(line) for line in input_data.splitlines()]
+        result = functools.reduce(self.reduce, snails)
+        magnitude = self.magnitude(result)
+        return magnitude
+
+
+class Day18PartB(Day18, FileReaderSolution):
+    def solve(self, input_data: str) -> int:
+        lines = input_data.splitlines()
+        combinations = ((x, y) for x in lines for y in lines)
+        max_value = 0
+        for snail1_str, snail2_str in combinations:
+            snail1 = self.create_tree(snail1_str)
+            snail2 = self.create_tree(snail2_str)
+
+            result = self.reduce(snail1, snail2)
+            magnitude = self.magnitude(result)
+            if magnitude > max_value:
+                max_value = magnitude
+
+        return max_value
diff --git a/tests/solutions/test_day18_a.py b/tests/solutions/test_day18_a.py
new file mode 100644
index 00000000..642c699e
--- /dev/null
+++ b/tests/solutions/test_day18_a.py
@@ -0,0 +1,207 @@
+from textwrap import dedent
+
+import pytest
+
+from adventofcode2021.solutions.day18 import Day18PartA, Snail
+
+
+class TestDay18PartA:
+    test_data = """\
+        [[[0,[5,8]],[[1,7],[9,6]]],[[4,[1,2]],[[1,4],2]]]
+        [[[5,[2,8]],4],[5,[[9,9],0]]]
+        [6,[[[6,2],[5,6]],[[7,6],[4,7]]]]
+        [[[6,[0,7]],[0,9]],[4,[9,[9,0]]]]
+        [[[7,[6,4]],[3,[1,3]]],[[[5,5],1],9]]
+        [[6,[[7,3],[3,2]]],[[[3,8],[5,7]],4]]
+        [[[[5,4],[7,7]],8],[[8,3],8]]
+        [[9,3],[[9,9],[6,[4,9]]]]
+        [[2,[[7,7],7]],[[5,8],[[9,3],[0,2]]]]
+        [[[[5,2],5],[8,[3,7]]],[[5,[7,5]],[4,4]]]
+    """
+
+    def test_repr(self):
+        zero_snail = Snail(value=0)
+        assert repr(zero_snail) == "0"
+
+    def test_single_snail(self):
+        test_snail = "[3,9]"
+        root_snail = Day18PartA().create_tree(test_snail)
+        assert root_snail.left.value == 3
+        assert root_snail.right.value == 9
+        assert repr(root_snail) == test_snail
+
+        # Not deep enough for an explosion to happen
+        deepest, depth = root_snail.find_deepest_snail()
+        assert deepest is None
+        assert depth == 0
+
+    def test_simple_parsing(self):
+        """Simple example"""
+        test_snail = "[1,[2,3]]"
+        root_snail = Day18PartA().create_tree(test_snail)
+        assert root_snail.left.value == 1
+        assert root_snail.right.left.value == 2
+        assert root_snail.right.right.value == 3
+        assert root_snail.right.parent is root_snail
+        assert repr(root_snail) == test_snail
+
+        # Not deep enough for an explosion to happen
+        deepest, depth = root_snail.find_deepest_snail()
+        assert deepest is None
+        assert depth == 0
+
+    def test_complex_parsing(self):
+        """Now, make is what more complex"""
+        test_snail = "[[[[[9,8],1],2],3],4]"
+        root_snail = Day18PartA().create_tree(test_snail)
+        assert root_snail.right.value == 4
+        # [[[[9,8],1],2],3]
+        assert root_snail.left.right.value == 3
+        # [[[9,8],1],2]
+        assert root_snail.left.left.right.value == 2
+        assert root_snail.left.parent is root_snail
+        assert root_snail.left.left.left.parent is root_snail.left.left
+        assert repr(root_snail) == test_snail
+        deepest, depth = Snail.find_deepest_snail(root_snail)
+        assert repr(deepest) == "[9,8]"
+        assert depth == 5
+
+    def test_addition(self):
+        snail1 = Day18PartA().create_tree("[1,2]")
+        snail2 = Day18PartA().create_tree("[[3,4],5]")
+
+        combined = snail1 + snail2
+        assert repr(combined) == "[[1,2],[[3,4],5]]"
+
+    def test_deepest(self):
+        snail = Day18PartA().create_tree("[[[[[4,3],4],4],[7,[[8,4],9]]],[1,1]]")
+        deepest, depth = snail.find_deepest_snail()
+        assert repr(deepest) == "[4,3]"
+        assert depth == 5
+
+    def test_full_example(self):
+        snail1_str = "[[[[4,3],4],4],[7,[[8,4],9]]]"
+        snail2_str = "[1,1]"
+
+        snail1 = Day18PartA().create_tree(snail1_str)
+        assert repr(snail1) == snail1_str
+
+        snail2 = Day18PartA().create_tree(snail2_str)
+        assert repr(snail2) == snail2_str
+
+        snail = snail1 + snail2
+        assert repr(snail) == "[[[[[4,3],4],4],[7,[[8,4],9]]],[1,1]]"
+
+        # Time to explode, first time
+        snail = Day18PartA().explode(snail)
+        assert repr(snail) == "[[[[0,7],4],[7,[[8,4],9]]],[1,1]]"
+
+        # Time to explode, second time
+        snail = Day18PartA().explode(snail)
+        assert repr(snail) == "[[[[0,7],4],[15,[0,13]]],[1,1]]"
+
+        # We cannot explode anymore:
+        deepest, depth = snail.find_deepest_snail()
+        assert deepest is None
+        assert depth == 0
+
+        # And also the explode function will not change anything
+        with pytest.raises(StopIteration):
+            Day18PartA().explode(snail)
+        assert repr(snail) == "[[[[0,7],4],[15,[0,13]]],[1,1]]"
+
+        # Time to split:
+        snail = Day18PartA().split(snail)
+        assert repr(snail) == "[[[[0,7],4],[[7,8],[0,13]]],[1,1]]"
+        snail = Day18PartA().split(snail)
+        assert repr(snail) == "[[[[0,7],4],[[7,8],[0,[6,7]]]],[1,1]]"
+        # And a new split does nothing:
+        with pytest.raises(StopIteration):
+            Day18PartA().split(snail)
+        assert repr(snail) == "[[[[0,7],4],[[7,8],[0,[6,7]]]],[1,1]]"
+
+        # Explode for the last time:
+        final_state = "[[[[0,7],4],[[7,8],[6,0]]],[8,1]]"
+
+        snail = Day18PartA().explode(snail)
+        assert repr(snail) == final_state
+
+        # Exploding of splitting will no longer update the state
+        with pytest.raises(StopIteration):
+            Day18PartA().explode(snail)
+        assert repr(snail) == final_state
+        with pytest.raises(StopIteration):
+            Day18PartA().split(snail)
+        assert repr(snail) == final_state
+
+    @pytest.mark.parametrize(
+        ("input_data", "expected_result"),
+        [
+            ("[[[[[9,8],1],2],3],4]", "[[[[0,9],2],3],4]"),
+            ("[7,[6,[5,[4,[3,2]]]]]", "[7,[6,[5,[7,0]]]]"),
+            ("[[6,[5,[4,[3,2]]]],1]", "[[6,[5,[7,0]]],3]"),
+            (
+                "[[[[0,7],4],[[7,8],[0,[6,7]]]],[1,1]]",
+                "[[[[0,7],4],[[7,8],[6,0]]],[8,1]]",
+            ),
+        ],
+    )
+    def test_explode(self, input_data, expected_result):
+        solution = Day18PartA()
+        root_node = solution.create_tree(input_data)
+        exploded = solution.explode(root_node)
+        assert repr(exploded) == expected_result
+
+    @pytest.mark.parametrize(
+        ("input_data", "expected_result"),
+        [
+            ("[[[[0,7],4],[15,[0,13]]],[1,1]]", "[[[[0,7],4],[[7,8],[0,13]]],[1,1]]"),
+            (
+                "[[[[0,7],4],[[7,8],[0,13]]],[1,1]]",
+                "[[[[0,7],4],[[7,8],[0,[6,7]]]],[1,1]]",
+            ),
+        ],
+    )
+    def test_split(self, input_data, expected_result):
+        solution = Day18PartA()
+        root_node = solution.create_tree(input_data)
+        splitted = solution.split(root_node)
+        assert repr(splitted) == expected_result
+
+    def test_reduce(self):
+        solution = Day18PartA()
+        snail1 = solution.create_tree("[[[[4,3],4],4],[7,[[8,4],9]]]")
+        snail2 = solution.create_tree("[1,1]")
+
+        result = solution.reduce(snail1, snail2)
+        assert repr(result) == "[[[[0,7],4],[[7,8],[6,0]]],[8,1]]"
+
+    @pytest.mark.parametrize(
+        ("input_data", "expected_result"),
+        [
+            ("[9,1]", 29),
+            ("[1,9]", 21),
+            ("[[9,1],[1,9]]", 129),
+            ("[[1,2],[[3,4],5]]", 143),
+            ("[[[[0,7],4],[[7,8],[6,0]]],[8,1]]", 1384),
+            ("[[[[1,1],[2,2]],[3,3]],[4,4]]", 445),
+            ("[[[[3,0],[5,3]],[4,4]],[5,5]]", 791),
+            ("[[[[5,0],[7,4]],[5,5]],[6,6]]", 1137),
+            ("[[[[8,7],[7,7]],[[8,6],[7,7]]],[[[0,7],[6,6]],[8,7]]]", 3488),
+        ],
+    )
+    def test_magnitude(self, input_data, expected_result):
+        solution = Day18PartA()
+        snail = solution.create_tree(input_data)
+        assert solution.magnitude(snail) == expected_result
+
+    def test_day18a_solve(self):
+        solution = Day18PartA()
+        result = solution.solve(dedent(self.test_data))
+        assert result == 4140
+
+    def test_day18a_data(self):
+        """Result we got when we did the real solution"""
+        solution = Day18PartA()
+        res = solution("day_18/day18.txt")
+        assert res == 3359
diff --git a/tests/solutions/test_day18_b.py b/tests/solutions/test_day18_b.py
new file mode 100644
index 00000000..5dedb551
--- /dev/null
+++ b/tests/solutions/test_day18_b.py
@@ -0,0 +1,28 @@
+from textwrap import dedent
+
+from adventofcode2021.solutions.day18 import Day18PartB
+
+
+class TestDay18PartB:
+    def test_day18b_solve(self):
+        test_data = """\
+        [[[0,[5,8]],[[1,7],[9,6]]],[[4,[1,2]],[[1,4],2]]]
+        [[[5,[2,8]],4],[5,[[9,9],0]]]
+        [6,[[[6,2],[5,6]],[[7,6],[4,7]]]]
+        [[[6,[0,7]],[0,9]],[4,[9,[9,0]]]]
+        [[[7,[6,4]],[3,[1,3]]],[[[5,5],1],9]]
+        [[6,[[7,3],[3,2]]],[[[3,8],[5,7]],4]]
+        [[[[5,4],[7,7]],8],[[8,3],8]]
+        [[9,3],[[9,9],[6,[4,9]]]]
+        [[2,[[7,7],7]],[[5,8],[[9,3],[0,2]]]]
+        [[[[5,2],5],[8,[3,7]]],[[5,[7,5]],[4,4]]]
+        """
+        solution = Day18PartB()
+        result = solution.solve(dedent(test_data))
+        assert result == 3993
+
+    def test_day18b_data(self):
+        """Result we got when we did the real solution"""
+        solution = Day18PartB()
+        res = solution("day_18/day18.txt")
+        assert res == 4616

From e0d4d804dd85d786ab2933b92700c6c4050be21b Mon Sep 17 00:00:00 2001
From: Roel Adriaans <roel@adriaans.org>
Date: Fri, 11 Nov 2022 14:43:05 +0100
Subject: [PATCH 172/371] Update mypypip to latest version

---
 src/adventofcode2021/solutions/day15.py | 12 ++++++------
 src/adventofcode2021/solutions/day18.py |  2 +-
 src/adventofcode2021/utils/graph.py     |  2 +-
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/adventofcode2021/solutions/day15.py b/src/adventofcode2021/solutions/day15.py
index 2cc8a534..506e9f96 100644
--- a/src/adventofcode2021/solutions/day15.py
+++ b/src/adventofcode2021/solutions/day15.py
@@ -112,12 +112,12 @@ def get_value(self, x: int, y: int) -> int:
         return self.cave[x, y]
 
     @property
-    @cache
+    @cache  # type: ignore
     def max_y(self) -> int:
         return max(y for _, y in self.cave)
 
     @property
-    @cache
+    @cache  # type: ignore
     def max_x(self) -> int:
         return max(x for x, _ in self.cave)
 
@@ -140,21 +140,21 @@ def get_value(self, x: int, y: int) -> int:
         return new_value
 
     @property
-    @cache
+    @cache  # type: ignore
     def real_max_x(self) -> int:
         return max(x for x, _ in self.cave)
 
     @property
-    @cache
+    @cache  # type: ignore
     def real_max_y(self) -> int:
         return max(y for _, y in self.cave)
 
     @property
-    @cache
+    @cache  # type: ignore
     def max_x(self) -> int:
         return (max(x for x, _ in self.cave) + 1) * 5 - 1
 
     @property
-    @cache
+    @cache  # type: ignore
     def max_y(self) -> int:
         return (max(y for _, y in self.cave) + 1) * 5 - 1
diff --git a/src/adventofcode2021/solutions/day18.py b/src/adventofcode2021/solutions/day18.py
index 607869be..f7779ec4 100644
--- a/src/adventofcode2021/solutions/day18.py
+++ b/src/adventofcode2021/solutions/day18.py
@@ -14,7 +14,7 @@ class Snail:
     right: Snail
     parent: Snail
 
-    def __init__(self, value: int = None, left=None, right=None, parent=None):
+    def __init__(self, value: int | None = None, left=None, right=None, parent=None):
         self.value = value  # type: ignore
         self.left = left
         self.right = right
diff --git a/src/adventofcode2021/utils/graph.py b/src/adventofcode2021/utils/graph.py
index 56ed8d9e..eb66ad78 100644
--- a/src/adventofcode2021/utils/graph.py
+++ b/src/adventofcode2021/utils/graph.py
@@ -29,7 +29,7 @@ class Graph(Generic[V]):
 
     """
 
-    def __init__(self, edges: Iterator[tuple[V, V]] = None):
+    def __init__(self, edges: Iterator[tuple[V, V]] | None = None):
         """Create a new graph.
 
         If edges is given, the network is created based on the edges.

From 397a5b7c4c891eb61cb08a0ec78d5197ba8f9316 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 11 Nov 2022 13:51:43 +0000
Subject: [PATCH 173/371] Bump pytest-xdist from 2.5.0 to 3.0.2

Bumps [pytest-xdist](https://github.com/pytest-dev/pytest-xdist) from 2.5.0 to 3.0.2.
- [Release notes](https://github.com/pytest-dev/pytest-xdist/releases)
- [Changelog](https://github.com/pytest-dev/pytest-xdist/blob/master/CHANGELOG.rst)
- [Commits](https://github.com/pytest-dev/pytest-xdist/compare/v2.5.0...v3.0.2)

---
updated-dependencies:
- dependency-name: pytest-xdist
  dependency-type: direct:development
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 poetry.lock | 345 ++++++++++++++++++++++++++++++++++++++++++----------
 1 file changed, 281 insertions(+), 64 deletions(-)

diff --git a/poetry.lock b/poetry.lock
index bb3f0302..5c4caf2d 100644
--- a/poetry.lock
+++ b/poetry.lock
@@ -33,10 +33,10 @@ optional = false
 python-versions = ">=3.5"
 
 [package.extras]
-dev = ["coverage[toml] (>=5.0.2)", "hypothesis", "pympler", "pytest (>=4.3.0)", "mypy (>=0.900,!=0.940)", "pytest-mypy-plugins", "zope.interface", "furo", "sphinx", "sphinx-notfound-page", "pre-commit", "cloudpickle"]
-docs = ["furo", "sphinx", "zope.interface", "sphinx-notfound-page"]
-tests = ["coverage[toml] (>=5.0.2)", "hypothesis", "pympler", "pytest (>=4.3.0)", "mypy (>=0.900,!=0.940)", "pytest-mypy-plugins", "zope.interface", "cloudpickle"]
-tests_no_zope = ["coverage[toml] (>=5.0.2)", "hypothesis", "pympler", "pytest (>=4.3.0)", "mypy (>=0.900,!=0.940)", "pytest-mypy-plugins", "cloudpickle"]
+dev = ["cloudpickle", "coverage[toml] (>=5.0.2)", "furo", "hypothesis", "mypy (>=0.900,!=0.940)", "pre-commit", "pympler", "pytest (>=4.3.0)", "pytest-mypy-plugins", "sphinx", "sphinx-notfound-page", "zope.interface"]
+docs = ["furo", "sphinx", "sphinx-notfound-page", "zope.interface"]
+tests = ["cloudpickle", "coverage[toml] (>=5.0.2)", "hypothesis", "mypy (>=0.900,!=0.940)", "pympler", "pytest (>=4.3.0)", "pytest-mypy-plugins", "zope.interface"]
+tests-no-zope = ["cloudpickle", "coverage[toml] (>=5.0.2)", "hypothesis", "mypy (>=0.900,!=0.940)", "pympler", "pytest (>=4.3.0)", "pytest-mypy-plugins"]
 
 [[package]]
 name = "beautifulsoup4"
@@ -118,7 +118,7 @@ optional = false
 python-versions = ">=3.6.0"
 
 [package.extras]
-unicode_backport = ["unicodedata2"]
+unicode-backport = ["unicodedata2"]
 
 [[package]]
 name = "click"
@@ -248,10 +248,10 @@ optional = false
 python-versions = ">=3.6.1,<4.0"
 
 [package.extras]
-pipfile_deprecated_finder = ["pipreqs", "requirementslib"]
-requirements_deprecated_finder = ["pipreqs", "pip-api"]
 colors = ["colorama (>=0.4.3,<0.5.0)"]
+pipfile-deprecated-finder = ["pipreqs", "requirementslib"]
 plugins = ["setuptools"]
+requirements-deprecated-finder = ["pip-api", "pipreqs"]
 
 [[package]]
 name = "jinja2"
@@ -303,6 +303,9 @@ category = "dev"
 optional = false
 python-versions = ">=2.7,!=3.0.*,!=3.1.*,!=3.2.*,!=3.3.*,!=3.4.*,!=3.5.*,!=3.6.*"
 
+[package.dependencies]
+setuptools = "*"
+
 [[package]]
 name = "packaging"
 version = "21.3"
@@ -331,8 +334,8 @@ optional = false
 python-versions = ">=3.7"
 
 [package.extras]
-docs = ["furo (>=2022.9.29)", "proselint (>=0.13)", "sphinx-autodoc-typehints (>=1.19.4)", "sphinx (>=5.3)"]
-test = ["appdirs (==1.4.4)", "pytest-cov (>=4)", "pytest-mock (>=3.10)", "pytest (>=7.2)"]
+docs = ["furo (>=2022.9.29)", "proselint (>=0.13)", "sphinx (>=5.3)", "sphinx-autodoc-typehints (>=1.19.4)"]
+test = ["appdirs (==1.4.4)", "pytest (>=7.2)", "pytest-cov (>=4)", "pytest-mock (>=3.10)"]
 
 [[package]]
 name = "pluggy"
@@ -379,7 +382,7 @@ optional = false
 python-versions = ">=3.6.8"
 
 [package.extras]
-diagrams = ["railroad-diagrams", "jinja2"]
+diagrams = ["jinja2", "railroad-diagrams"]
 
 [[package]]
 name = "pytest"
@@ -414,23 +417,11 @@ coverage = {version = ">=5.2.1", extras = ["toml"]}
 pytest = ">=4.6"
 
 [package.extras]
-testing = ["fields", "hunter", "process-tests", "six", "pytest-xdist", "virtualenv"]
-
-[[package]]
-name = "pytest-forked"
-version = "1.4.0"
-description = "run tests in isolated forked subprocesses"
-category = "dev"
-optional = false
-python-versions = ">=3.6"
-
-[package.dependencies]
-py = "*"
-pytest = ">=3.10"
+testing = ["fields", "hunter", "process-tests", "pytest-xdist", "six", "virtualenv"]
 
 [[package]]
 name = "pytest-xdist"
-version = "2.5.0"
+version = "3.0.2"
 description = "pytest xdist plugin for distributed testing and loop-on-failing modes"
 category = "dev"
 optional = false
@@ -439,7 +430,6 @@ python-versions = ">=3.6"
 [package.dependencies]
 execnet = ">=1.1"
 pytest = ">=6.2.0"
-pytest-forked = "*"
 
 [package.extras]
 psutil = ["psutil (>=3.0)"]
@@ -506,7 +496,20 @@ urllib3 = ">=1.21.1,<1.27"
 
 [package.extras]
 socks = ["PySocks (>=1.5.6,!=1.5.7)"]
-use_chardet_on_py3 = ["chardet (>=3.0.2,<6)"]
+use-chardet-on-py3 = ["chardet (>=3.0.2,<6)"]
+
+[[package]]
+name = "setuptools"
+version = "65.5.1"
+description = "Easily download, build, install, upgrade, and uninstall Python packages"
+category = "dev"
+optional = false
+python-versions = ">=3.7"
+
+[package.extras]
+docs = ["furo", "jaraco.packaging (>=9)", "jaraco.tidelift (>=1.4)", "pygments-github-lexers (==0.0.5)", "rst.linker (>=1.9)", "sphinx (>=3.5)", "sphinx-favicon", "sphinx-hoverxref (<2)", "sphinx-inline-tabs", "sphinx-notfound-page (==0.8.3)", "sphinx-reredirects", "sphinxcontrib-towncrier"]
+testing = ["build[virtualenv]", "filelock (>=3.4.0)", "flake8 (<5)", "flake8-2020", "ini2toml[lite] (>=0.9)", "jaraco.envs (>=2.2)", "jaraco.path (>=3.2.0)", "pip (>=19.1)", "pip-run (>=8.8)", "pytest (>=6)", "pytest-black (>=0.3.7)", "pytest-checkdocs (>=2.4)", "pytest-cov", "pytest-enabler (>=1.3)", "pytest-flake8", "pytest-mypy (>=0.9.1)", "pytest-perf", "pytest-timeout", "pytest-xdist", "tomli-w (>=1.0.0)", "virtualenv (>=13.0.0)", "wheel"]
+testing-integration = ["build[virtualenv]", "filelock (>=3.4.0)", "jaraco.envs (>=2.2)", "jaraco.path (>=3.2.0)", "pytest", "pytest-enabler", "pytest-xdist", "tomli", "virtualenv (>=13.0.0)", "wheel"]
 
 [[package]]
 name = "six"
@@ -568,7 +571,7 @@ virtualenv = ">=16.0.0,<20.0.0 || >20.0.0,<20.0.1 || >20.0.1,<20.0.2 || >20.0.2,
 
 [package.extras]
 docs = ["pygments-github-lexers (>=0.0.5)", "sphinx (>=2.0.0)", "sphinxcontrib-autoprogram (>=0.1.5)", "towncrier (>=18.5.0)"]
-testing = ["flaky (>=3.4.0)", "freezegun (>=0.3.11)", "pytest (>=4.0.0)", "pytest-cov (>=2.5.1)", "pytest-mock (>=1.10.0)", "pytest-randomly (>=1.0.0)", "psutil (>=5.6.1)", "pathlib2 (>=2.3.3)"]
+testing = ["flaky (>=3.4.0)", "freezegun (>=0.3.11)", "pathlib2 (>=2.3.3)", "psutil (>=5.6.1)", "pytest (>=4.0.0)", "pytest-cov (>=2.5.1)", "pytest-mock (>=1.10.0)", "pytest-randomly (>=1.0.0)"]
 
 [[package]]
 name = "tqdm"
@@ -596,8 +599,8 @@ optional = false
 python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*, !=3.5.*, <4"
 
 [package.extras]
-brotli = ["brotlicffi (>=0.8.0)", "brotli (>=1.0.9)", "brotlipy (>=0.6.0)"]
-secure = ["pyOpenSSL (>=0.14)", "cryptography (>=1.3.4)", "idna (>=2.0.0)", "certifi", "urllib3-secure-extra", "ipaddress"]
+brotli = ["brotli (>=1.0.9)", "brotlicffi (>=0.8.0)", "brotlipy (>=0.6.0)"]
+secure = ["certifi", "cryptography (>=1.3.4)", "idna (>=2.0.0)", "ipaddress", "pyOpenSSL (>=0.14)", "urllib3-secure-extra"]
 socks = ["PySocks (>=1.5.6,!=1.5.7,<2.0)"]
 
 [[package]]
@@ -620,41 +623,156 @@ testing = ["coverage (>=6.2)", "coverage-enable-subprocess (>=1)", "flaky (>=3.7
 [metadata]
 lock-version = "1.1"
 python-versions = "^3.10"
-content-hash = "cf9e268590e8b1eb0e0c421733f39bc9a4ad1df7cea343af93cde1af67eb1a40"
+content-hash = "c48f44b08785d5a57f08e707d7243cfd1f97b2df9ab02fda2a20390fe84c37a4"
 
 [metadata.files]
 anytree = [
     {file = "anytree-2.8.0-py2.py3-none-any.whl", hash = "sha256:14c55ac77492b11532395049a03b773d14c7e30b22aa012e337b1e983de31521"},
     {file = "anytree-2.8.0.tar.gz", hash = "sha256:3f0f93f355a91bc3e6245319bf4c1d50e3416cc7a35cc1133c1ff38306bbccab"},
 ]
-arrow = []
-attrs = []
-beautifulsoup4 = []
+arrow = [
+    {file = "arrow-1.2.3-py3-none-any.whl", hash = "sha256:5a49ab92e3b7b71d96cd6bfcc4df14efefc9dfa96ea19045815914a6ab6b1fe2"},
+    {file = "arrow-1.2.3.tar.gz", hash = "sha256:3934b30ca1b9f292376d9db15b19446088d12ec58629bc3f0da28fd55fb633a1"},
+]
+attrs = [
+    {file = "attrs-22.1.0-py2.py3-none-any.whl", hash = "sha256:86efa402f67bf2df34f51a335487cf46b1ec130d02b8d39fd248abfd30da551c"},
+    {file = "attrs-22.1.0.tar.gz", hash = "sha256:29adc2665447e5191d0e7c568fde78b21f9672d344281d0c6e1ab085429b22b6"},
+]
+beautifulsoup4 = [
+    {file = "beautifulsoup4-4.11.1-py3-none-any.whl", hash = "sha256:58d5c3d29f5a36ffeb94f02f0d786cd53014cf9b3b3951d42e0080d8a9498d30"},
+    {file = "beautifulsoup4-4.11.1.tar.gz", hash = "sha256:ad9aa55b65ef2808eb405f46cf74df7fcb7044d5cbc26487f96eb2ef2e436693"},
+]
 binaryornot = [
     {file = "binaryornot-0.4.4-py2.py3-none-any.whl", hash = "sha256:b8b71173c917bddcd2c16070412e369c3ed7f0528926f70cac18a6c97fd563e4"},
     {file = "binaryornot-0.4.4.tar.gz", hash = "sha256:359501dfc9d40632edc9fac890e19542db1a287bbcfa58175b66658392018061"},
 ]
-black = []
-certifi = []
+black = [
+    {file = "black-22.10.0-1fixedarch-cp310-cp310-macosx_11_0_x86_64.whl", hash = "sha256:5cc42ca67989e9c3cf859e84c2bf014f6633db63d1cbdf8fdb666dcd9e77e3fa"},
+    {file = "black-22.10.0-1fixedarch-cp311-cp311-macosx_11_0_x86_64.whl", hash = "sha256:5d8f74030e67087b219b032aa33a919fae8806d49c867846bfacde57f43972ef"},
+    {file = "black-22.10.0-1fixedarch-cp37-cp37m-macosx_10_16_x86_64.whl", hash = "sha256:197df8509263b0b8614e1df1756b1dd41be6738eed2ba9e9769f3880c2b9d7b6"},
+    {file = "black-22.10.0-1fixedarch-cp38-cp38-macosx_10_16_x86_64.whl", hash = "sha256:2644b5d63633702bc2c5f3754b1b475378fbbfb481f62319388235d0cd104c2d"},
+    {file = "black-22.10.0-1fixedarch-cp39-cp39-macosx_11_0_x86_64.whl", hash = "sha256:e41a86c6c650bcecc6633ee3180d80a025db041a8e2398dcc059b3afa8382cd4"},
+    {file = "black-22.10.0-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:2039230db3c6c639bd84efe3292ec7b06e9214a2992cd9beb293d639c6402edb"},
+    {file = "black-22.10.0-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:14ff67aec0a47c424bc99b71005202045dc09270da44a27848d534600ac64fc7"},
+    {file = "black-22.10.0-cp310-cp310-win_amd64.whl", hash = "sha256:819dc789f4498ecc91438a7de64427c73b45035e2e3680c92e18795a839ebb66"},
+    {file = "black-22.10.0-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:5b9b29da4f564ba8787c119f37d174f2b69cdfdf9015b7d8c5c16121ddc054ae"},
+    {file = "black-22.10.0-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:b8b49776299fece66bffaafe357d929ca9451450f5466e997a7285ab0fe28e3b"},
+    {file = "black-22.10.0-cp311-cp311-win_amd64.whl", hash = "sha256:21199526696b8f09c3997e2b4db8d0b108d801a348414264d2eb8eb2532e540d"},
+    {file = "black-22.10.0-cp37-cp37m-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:1e464456d24e23d11fced2bc8c47ef66d471f845c7b7a42f3bd77bf3d1789650"},
+    {file = "black-22.10.0-cp37-cp37m-win_amd64.whl", hash = "sha256:9311e99228ae10023300ecac05be5a296f60d2fd10fff31cf5c1fa4ca4b1988d"},
+    {file = "black-22.10.0-cp38-cp38-macosx_11_0_arm64.whl", hash = "sha256:fba8a281e570adafb79f7755ac8721b6cf1bbf691186a287e990c7929c7692ff"},
+    {file = "black-22.10.0-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:915ace4ff03fdfff953962fa672d44be269deb2eaf88499a0f8805221bc68c87"},
+    {file = "black-22.10.0-cp38-cp38-win_amd64.whl", hash = "sha256:444ebfb4e441254e87bad00c661fe32df9969b2bf224373a448d8aca2132b395"},
+    {file = "black-22.10.0-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:974308c58d057a651d182208a484ce80a26dac0caef2895836a92dd6ebd725e0"},
+    {file = "black-22.10.0-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:72ef3925f30e12a184889aac03d77d031056860ccae8a1e519f6cbb742736383"},
+    {file = "black-22.10.0-cp39-cp39-win_amd64.whl", hash = "sha256:432247333090c8c5366e69627ccb363bc58514ae3e63f7fc75c54b1ea80fa7de"},
+    {file = "black-22.10.0-py3-none-any.whl", hash = "sha256:c957b2b4ea88587b46cf49d1dc17681c1e672864fd7af32fc1e9664d572b3458"},
+    {file = "black-22.10.0.tar.gz", hash = "sha256:f513588da599943e0cde4e32cc9879e825d58720d6557062d1098c5ad80080e1"},
+]
+certifi = [
+    {file = "certifi-2022.9.24-py3-none-any.whl", hash = "sha256:90c1a32f1d68f940488354e36370f6cca89f0f106db09518524c88d6ed83f382"},
+    {file = "certifi-2022.9.24.tar.gz", hash = "sha256:0d9c601124e5a6ba9712dbc60d9c53c21e34f5f641fe83002317394311bdce14"},
+]
 cfgv = [
     {file = "cfgv-3.3.1-py2.py3-none-any.whl", hash = "sha256:c6a0883f3917a037485059700b9e75da2464e6c27051014ad85ba6aaa5884426"},
     {file = "cfgv-3.3.1.tar.gz", hash = "sha256:f5a830efb9ce7a445376bb66ec94c638a9787422f96264c98edc6bdeed8ab736"},
 ]
-chardet = []
-charset-normalizer = []
-click = []
-colorama = []
-cookiecutter = []
-coverage = []
-distlib = []
-exceptiongroup = []
+chardet = [
+    {file = "chardet-5.0.0-py3-none-any.whl", hash = "sha256:d3e64f022d254183001eccc5db4040520c0f23b1a3f33d6413e099eb7f126557"},
+    {file = "chardet-5.0.0.tar.gz", hash = "sha256:0368df2bfd78b5fc20572bb4e9bb7fb53e2c094f60ae9993339e8671d0afb8aa"},
+]
+charset-normalizer = [
+    {file = "charset-normalizer-2.1.1.tar.gz", hash = "sha256:5a3d016c7c547f69d6f81fb0db9449ce888b418b5b9952cc5e6e66843e9dd845"},
+    {file = "charset_normalizer-2.1.1-py3-none-any.whl", hash = "sha256:83e9a75d1911279afd89352c68b45348559d1fc0506b054b346651b5e7fee29f"},
+]
+click = [
+    {file = "click-8.1.3-py3-none-any.whl", hash = "sha256:bb4d8133cb15a609f44e8213d9b391b0809795062913b383c62be0ee95b1db48"},
+    {file = "click-8.1.3.tar.gz", hash = "sha256:7682dc8afb30297001674575ea00d1814d808d6a36af415a82bd481d37ba7b8e"},
+]
+colorama = [
+    {file = "colorama-0.4.6-py2.py3-none-any.whl", hash = "sha256:4f1d9991f5acc0ca119f9d443620b77f9d6b33703e51011c16baf57afb285fc6"},
+    {file = "colorama-0.4.6.tar.gz", hash = "sha256:08695f5cb7ed6e0531a20572697297273c47b8cae5a63ffc6d6ed5c201be6e44"},
+]
+cookiecutter = [
+    {file = "cookiecutter-2.1.1-py2.py3-none-any.whl", hash = "sha256:9f3ab027cec4f70916e28f03470bdb41e637a3ad354b4d65c765d93aad160022"},
+    {file = "cookiecutter-2.1.1.tar.gz", hash = "sha256:f3982be8d9c53dac1261864013fdec7f83afd2e42ede6f6dd069c5e149c540d5"},
+]
+coverage = [
+    {file = "coverage-6.5.0-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:ef8674b0ee8cc11e2d574e3e2998aea5df5ab242e012286824ea3c6970580e53"},
+    {file = "coverage-6.5.0-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:784f53ebc9f3fd0e2a3f6a78b2be1bd1f5575d7863e10c6e12504f240fd06660"},
+    {file = "coverage-6.5.0-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:b4a5be1748d538a710f87542f22c2cad22f80545a847ad91ce45e77417293eb4"},
+    {file = "coverage-6.5.0-cp310-cp310-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:83516205e254a0cb77d2d7bb3632ee019d93d9f4005de31dca0a8c3667d5bc04"},
+    {file = "coverage-6.5.0-cp310-cp310-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:af4fffaffc4067232253715065e30c5a7ec6faac36f8fc8d6f64263b15f74db0"},
+    {file = "coverage-6.5.0-cp310-cp310-musllinux_1_1_aarch64.whl", hash = "sha256:97117225cdd992a9c2a5515db1f66b59db634f59d0679ca1fa3fe8da32749cae"},
+    {file = "coverage-6.5.0-cp310-cp310-musllinux_1_1_i686.whl", hash = "sha256:a1170fa54185845505fbfa672f1c1ab175446c887cce8212c44149581cf2d466"},
+    {file = "coverage-6.5.0-cp310-cp310-musllinux_1_1_x86_64.whl", hash = "sha256:11b990d520ea75e7ee8dcab5bc908072aaada194a794db9f6d7d5cfd19661e5a"},
+    {file = "coverage-6.5.0-cp310-cp310-win32.whl", hash = "sha256:5dbec3b9095749390c09ab7c89d314727f18800060d8d24e87f01fb9cfb40b32"},
+    {file = "coverage-6.5.0-cp310-cp310-win_amd64.whl", hash = "sha256:59f53f1dc5b656cafb1badd0feb428c1e7bc19b867479ff72f7a9dd9b479f10e"},
+    {file = "coverage-6.5.0-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:4a5375e28c5191ac38cca59b38edd33ef4cc914732c916f2929029b4bfb50795"},
+    {file = "coverage-6.5.0-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:c4ed2820d919351f4167e52425e096af41bfabacb1857186c1ea32ff9983ed75"},
+    {file = "coverage-6.5.0-cp311-cp311-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:33a7da4376d5977fbf0a8ed91c4dffaaa8dbf0ddbf4c8eea500a2486d8bc4d7b"},
+    {file = "coverage-6.5.0-cp311-cp311-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:a8fb6cf131ac4070c9c5a3e21de0f7dc5a0fbe8bc77c9456ced896c12fcdad91"},
+    {file = "coverage-6.5.0-cp311-cp311-musllinux_1_1_aarch64.whl", hash = "sha256:a6b7d95969b8845250586f269e81e5dfdd8ff828ddeb8567a4a2eaa7313460c4"},
+    {file = "coverage-6.5.0-cp311-cp311-musllinux_1_1_i686.whl", hash = "sha256:1ef221513e6f68b69ee9e159506d583d31aa3567e0ae84eaad9d6ec1107dddaa"},
+    {file = "coverage-6.5.0-cp311-cp311-musllinux_1_1_x86_64.whl", hash = "sha256:cca4435eebea7962a52bdb216dec27215d0df64cf27fc1dd538415f5d2b9da6b"},
+    {file = "coverage-6.5.0-cp311-cp311-win32.whl", hash = "sha256:98e8a10b7a314f454d9eff4216a9a94d143a7ee65018dd12442e898ee2310578"},
+    {file = "coverage-6.5.0-cp311-cp311-win_amd64.whl", hash = "sha256:bc8ef5e043a2af066fa8cbfc6e708d58017024dc4345a1f9757b329a249f041b"},
+    {file = "coverage-6.5.0-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:4433b90fae13f86fafff0b326453dd42fc9a639a0d9e4eec4d366436d1a41b6d"},
+    {file = "coverage-6.5.0-cp37-cp37m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:f4f05d88d9a80ad3cac6244d36dd89a3c00abc16371769f1340101d3cb899fc3"},
+    {file = "coverage-6.5.0-cp37-cp37m-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:94e2565443291bd778421856bc975d351738963071e9b8839ca1fc08b42d4bef"},
+    {file = "coverage-6.5.0-cp37-cp37m-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:027018943386e7b942fa832372ebc120155fd970837489896099f5cfa2890f79"},
+    {file = "coverage-6.5.0-cp37-cp37m-musllinux_1_1_aarch64.whl", hash = "sha256:255758a1e3b61db372ec2736c8e2a1fdfaf563977eedbdf131de003ca5779b7d"},
+    {file = "coverage-6.5.0-cp37-cp37m-musllinux_1_1_i686.whl", hash = "sha256:851cf4ff24062c6aec510a454b2584f6e998cada52d4cb58c5e233d07172e50c"},
+    {file = "coverage-6.5.0-cp37-cp37m-musllinux_1_1_x86_64.whl", hash = "sha256:12adf310e4aafddc58afdb04d686795f33f4d7a6fa67a7a9d4ce7d6ae24d949f"},
+    {file = "coverage-6.5.0-cp37-cp37m-win32.whl", hash = "sha256:b5604380f3415ba69de87a289a2b56687faa4fe04dbee0754bfcae433489316b"},
+    {file = "coverage-6.5.0-cp37-cp37m-win_amd64.whl", hash = "sha256:4a8dbc1f0fbb2ae3de73eb0bdbb914180c7abfbf258e90b311dcd4f585d44bd2"},
+    {file = "coverage-6.5.0-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:d900bb429fdfd7f511f868cedd03a6bbb142f3f9118c09b99ef8dc9bf9643c3c"},
+    {file = "coverage-6.5.0-cp38-cp38-macosx_11_0_arm64.whl", hash = "sha256:2198ea6fc548de52adc826f62cb18554caedfb1d26548c1b7c88d8f7faa8f6ba"},
+    {file = "coverage-6.5.0-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:6c4459b3de97b75e3bd6b7d4b7f0db13f17f504f3d13e2a7c623786289dd670e"},
+    {file = "coverage-6.5.0-cp38-cp38-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:20c8ac5386253717e5ccc827caad43ed66fea0efe255727b1053a8154d952398"},
+    {file = "coverage-6.5.0-cp38-cp38-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:6b07130585d54fe8dff3d97b93b0e20290de974dc8177c320aeaf23459219c0b"},
+    {file = "coverage-6.5.0-cp38-cp38-musllinux_1_1_aarch64.whl", hash = "sha256:dbdb91cd8c048c2b09eb17713b0c12a54fbd587d79adcebad543bc0cd9a3410b"},
+    {file = "coverage-6.5.0-cp38-cp38-musllinux_1_1_i686.whl", hash = "sha256:de3001a203182842a4630e7b8d1a2c7c07ec1b45d3084a83d5d227a3806f530f"},
+    {file = "coverage-6.5.0-cp38-cp38-musllinux_1_1_x86_64.whl", hash = "sha256:e07f4a4a9b41583d6eabec04f8b68076ab3cd44c20bd29332c6572dda36f372e"},
+    {file = "coverage-6.5.0-cp38-cp38-win32.whl", hash = "sha256:6d4817234349a80dbf03640cec6109cd90cba068330703fa65ddf56b60223a6d"},
+    {file = "coverage-6.5.0-cp38-cp38-win_amd64.whl", hash = "sha256:7ccf362abd726b0410bf8911c31fbf97f09f8f1061f8c1cf03dfc4b6372848f6"},
+    {file = "coverage-6.5.0-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:633713d70ad6bfc49b34ead4060531658dc6dfc9b3eb7d8a716d5873377ab745"},
+    {file = "coverage-6.5.0-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:95203854f974e07af96358c0b261f1048d8e1083f2de9b1c565e1be4a3a48cfc"},
+    {file = "coverage-6.5.0-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:b9023e237f4c02ff739581ef35969c3739445fb059b060ca51771e69101efffe"},
+    {file = "coverage-6.5.0-cp39-cp39-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:265de0fa6778d07de30bcf4d9dc471c3dc4314a23a3c6603d356a3c9abc2dfcf"},
+    {file = "coverage-6.5.0-cp39-cp39-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:8f830ed581b45b82451a40faabb89c84e1a998124ee4212d440e9c6cf70083e5"},
+    {file = "coverage-6.5.0-cp39-cp39-musllinux_1_1_aarch64.whl", hash = "sha256:7b6be138d61e458e18d8e6ddcddd36dd96215edfe5f1168de0b1b32635839b62"},
+    {file = "coverage-6.5.0-cp39-cp39-musllinux_1_1_i686.whl", hash = "sha256:42eafe6778551cf006a7c43153af1211c3aaab658d4d66fa5fcc021613d02518"},
+    {file = "coverage-6.5.0-cp39-cp39-musllinux_1_1_x86_64.whl", hash = "sha256:723e8130d4ecc8f56e9a611e73b31219595baa3bb252d539206f7bbbab6ffc1f"},
+    {file = "coverage-6.5.0-cp39-cp39-win32.whl", hash = "sha256:d9ecf0829c6a62b9b573c7bb6d4dcd6ba8b6f80be9ba4fc7ed50bf4ac9aecd72"},
+    {file = "coverage-6.5.0-cp39-cp39-win_amd64.whl", hash = "sha256:fc2af30ed0d5ae0b1abdb4ebdce598eafd5b35397d4d75deb341a614d333d987"},
+    {file = "coverage-6.5.0-pp36.pp37.pp38-none-any.whl", hash = "sha256:1431986dac3923c5945271f169f59c45b8802a114c8f548d611f2015133df77a"},
+    {file = "coverage-6.5.0.tar.gz", hash = "sha256:f642e90754ee3e06b0e7e51bce3379590e76b7f76b708e1a71ff043f87025c84"},
+]
+distlib = [
+    {file = "distlib-0.3.6-py2.py3-none-any.whl", hash = "sha256:f35c4b692542ca110de7ef0bea44d73981caeb34ca0b9b6b2e6d7790dda8f80e"},
+    {file = "distlib-0.3.6.tar.gz", hash = "sha256:14bad2d9b04d3a36127ac97f30b12a19268f211063d8f8ee4f47108896e11b46"},
+]
+exceptiongroup = [
+    {file = "exceptiongroup-1.0.1-py3-none-any.whl", hash = "sha256:4d6c0aa6dd825810941c792f53d7b8d71da26f5e5f84f20f9508e8f2d33b140a"},
+    {file = "exceptiongroup-1.0.1.tar.gz", hash = "sha256:73866f7f842ede6cb1daa42c4af078e2035e5f7607f0e2c762cc51bb31bbe7b2"},
+]
 execnet = [
     {file = "execnet-1.9.0-py2.py3-none-any.whl", hash = "sha256:a295f7cc774947aac58dde7fdc85f4aa00c42adf5d8f5468fc630c1acf30a142"},
     {file = "execnet-1.9.0.tar.gz", hash = "sha256:8f694f3ba9cc92cab508b152dcfe322153975c29bda272e2fd7f3f00f36e47c5"},
 ]
-filelock = []
-identify = []
-idna = []
+filelock = [
+    {file = "filelock-3.8.0-py3-none-any.whl", hash = "sha256:617eb4e5eedc82fc5f47b6d61e4d11cb837c56cb4544e39081099fa17ad109d4"},
+    {file = "filelock-3.8.0.tar.gz", hash = "sha256:55447caa666f2198c5b6b13a26d2084d26fa5b115c00d065664b2124680c4edc"},
+]
+identify = [
+    {file = "identify-2.5.8-py2.py3-none-any.whl", hash = "sha256:48b7925fe122720088aeb7a6c34f17b27e706b72c61070f27fe3789094233440"},
+    {file = "identify-2.5.8.tar.gz", hash = "sha256:7a214a10313b9489a0d61467db2856ae8d0b8306fc923e03a9effa53d8aedc58"},
+]
+idna = [
+    {file = "idna-3.4-py3-none-any.whl", hash = "sha256:90b77e79eaa3eba6de819a0c442c0b4ceefc341a7a2ab77d7562bf49f425c5c2"},
+    {file = "idna-3.4.tar.gz", hash = "sha256:814f528e8dead7d329833b91c5faa87d60bf71824cd12a7530b5526063d02cb4"},
+]
 iniconfig = [
     {file = "iniconfig-1.1.1-py2.py3-none-any.whl", hash = "sha256:011e24c64b7f47f6ebd835bb12a743f2fbe9a26d4cecaa7f53bc4f35ee9da8b3"},
     {file = "iniconfig-1.1.1.tar.gz", hash = "sha256:bc3af051d7d14b2ee5ef9969666def0cd1a000e121eaea580d4a313df4b37f32"},
@@ -663,28 +781,84 @@ isort = [
     {file = "isort-5.10.1-py3-none-any.whl", hash = "sha256:6f62d78e2f89b4500b080fe3a81690850cd254227f27f75c3a0c491a1f351ba7"},
     {file = "isort-5.10.1.tar.gz", hash = "sha256:e8443a5e7a020e9d7f97f1d7d9cd17c88bcb3bc7e218bf9cf5095fe550be2951"},
 ]
-jinja2 = []
+jinja2 = [
+    {file = "Jinja2-3.1.2-py3-none-any.whl", hash = "sha256:6088930bfe239f0e6710546ab9c19c9ef35e29792895fed6e6e31a023a182a61"},
+    {file = "Jinja2-3.1.2.tar.gz", hash = "sha256:31351a702a408a9e7595a8fc6150fc3f43bb6bf7e319770cbc0db9df9437e852"},
+]
 jinja2-time = [
     {file = "jinja2-time-0.2.0.tar.gz", hash = "sha256:d14eaa4d315e7688daa4969f616f226614350c48730bfa1692d2caebd8c90d40"},
     {file = "jinja2_time-0.2.0-py2.py3-none-any.whl", hash = "sha256:d3eab6605e3ec8b7a0863df09cc1d23714908fa61aa6986a845c20ba488b4efa"},
 ]
-markupsafe = []
+markupsafe = [
+    {file = "MarkupSafe-2.1.1-cp310-cp310-macosx_10_9_universal2.whl", hash = "sha256:86b1f75c4e7c2ac2ccdaec2b9022845dbb81880ca318bb7a0a01fbf7813e3812"},
+    {file = "MarkupSafe-2.1.1-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:f121a1420d4e173a5d96e47e9a0c0dcff965afdf1626d28de1460815f7c4ee7a"},
+    {file = "MarkupSafe-2.1.1-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:a49907dd8420c5685cfa064a1335b6754b74541bbb3706c259c02ed65b644b3e"},
+    {file = "MarkupSafe-2.1.1-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:10c1bfff05d95783da83491be968e8fe789263689c02724e0c691933c52994f5"},
+    {file = "MarkupSafe-2.1.1-cp310-cp310-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:b7bd98b796e2b6553da7225aeb61f447f80a1ca64f41d83612e6139ca5213aa4"},
+    {file = "MarkupSafe-2.1.1-cp310-cp310-musllinux_1_1_aarch64.whl", hash = "sha256:b09bf97215625a311f669476f44b8b318b075847b49316d3e28c08e41a7a573f"},
+    {file = "MarkupSafe-2.1.1-cp310-cp310-musllinux_1_1_i686.whl", hash = "sha256:694deca8d702d5db21ec83983ce0bb4b26a578e71fbdbd4fdcd387daa90e4d5e"},
+    {file = "MarkupSafe-2.1.1-cp310-cp310-musllinux_1_1_x86_64.whl", hash = "sha256:efc1913fd2ca4f334418481c7e595c00aad186563bbc1ec76067848c7ca0a933"},
+    {file = "MarkupSafe-2.1.1-cp310-cp310-win32.whl", hash = "sha256:4a33dea2b688b3190ee12bd7cfa29d39c9ed176bda40bfa11099a3ce5d3a7ac6"},
+    {file = "MarkupSafe-2.1.1-cp310-cp310-win_amd64.whl", hash = "sha256:dda30ba7e87fbbb7eab1ec9f58678558fd9a6b8b853530e176eabd064da81417"},
+    {file = "MarkupSafe-2.1.1-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:671cd1187ed5e62818414afe79ed29da836dde67166a9fac6d435873c44fdd02"},
+    {file = "MarkupSafe-2.1.1-cp37-cp37m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:3799351e2336dc91ea70b034983ee71cf2f9533cdff7c14c90ea126bfd95d65a"},
+    {file = "MarkupSafe-2.1.1-cp37-cp37m-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:e72591e9ecd94d7feb70c1cbd7be7b3ebea3f548870aa91e2732960fa4d57a37"},
+    {file = "MarkupSafe-2.1.1-cp37-cp37m-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:6fbf47b5d3728c6aea2abb0589b5d30459e369baa772e0f37a0320185e87c980"},
+    {file = "MarkupSafe-2.1.1-cp37-cp37m-musllinux_1_1_aarch64.whl", hash = "sha256:d5ee4f386140395a2c818d149221149c54849dfcfcb9f1debfe07a8b8bd63f9a"},
+    {file = "MarkupSafe-2.1.1-cp37-cp37m-musllinux_1_1_i686.whl", hash = "sha256:bcb3ed405ed3222f9904899563d6fc492ff75cce56cba05e32eff40e6acbeaa3"},
+    {file = "MarkupSafe-2.1.1-cp37-cp37m-musllinux_1_1_x86_64.whl", hash = "sha256:e1c0b87e09fa55a220f058d1d49d3fb8df88fbfab58558f1198e08c1e1de842a"},
+    {file = "MarkupSafe-2.1.1-cp37-cp37m-win32.whl", hash = "sha256:8dc1c72a69aa7e082593c4a203dcf94ddb74bb5c8a731e4e1eb68d031e8498ff"},
+    {file = "MarkupSafe-2.1.1-cp37-cp37m-win_amd64.whl", hash = "sha256:97a68e6ada378df82bc9f16b800ab77cbf4b2fada0081794318520138c088e4a"},
+    {file = "MarkupSafe-2.1.1-cp38-cp38-macosx_10_9_universal2.whl", hash = "sha256:e8c843bbcda3a2f1e3c2ab25913c80a3c5376cd00c6e8c4a86a89a28c8dc5452"},
+    {file = "MarkupSafe-2.1.1-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:0212a68688482dc52b2d45013df70d169f542b7394fc744c02a57374a4207003"},
+    {file = "MarkupSafe-2.1.1-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:8e576a51ad59e4bfaac456023a78f6b5e6e7651dcd383bcc3e18d06f9b55d6d1"},
+    {file = "MarkupSafe-2.1.1-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:4b9fe39a2ccc108a4accc2676e77da025ce383c108593d65cc909add5c3bd601"},
+    {file = "MarkupSafe-2.1.1-cp38-cp38-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:96e37a3dc86e80bf81758c152fe66dbf60ed5eca3d26305edf01892257049925"},
+    {file = "MarkupSafe-2.1.1-cp38-cp38-musllinux_1_1_aarch64.whl", hash = "sha256:6d0072fea50feec76a4c418096652f2c3238eaa014b2f94aeb1d56a66b41403f"},
+    {file = "MarkupSafe-2.1.1-cp38-cp38-musllinux_1_1_i686.whl", hash = "sha256:089cf3dbf0cd6c100f02945abeb18484bd1ee57a079aefd52cffd17fba910b88"},
+    {file = "MarkupSafe-2.1.1-cp38-cp38-musllinux_1_1_x86_64.whl", hash = "sha256:6a074d34ee7a5ce3effbc526b7083ec9731bb3cbf921bbe1d3005d4d2bdb3a63"},
+    {file = "MarkupSafe-2.1.1-cp38-cp38-win32.whl", hash = "sha256:421be9fbf0ffe9ffd7a378aafebbf6f4602d564d34be190fc19a193232fd12b1"},
+    {file = "MarkupSafe-2.1.1-cp38-cp38-win_amd64.whl", hash = "sha256:fc7b548b17d238737688817ab67deebb30e8073c95749d55538ed473130ec0c7"},
+    {file = "MarkupSafe-2.1.1-cp39-cp39-macosx_10_9_universal2.whl", hash = "sha256:e04e26803c9c3851c931eac40c695602c6295b8d432cbe78609649ad9bd2da8a"},
+    {file = "MarkupSafe-2.1.1-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:b87db4360013327109564f0e591bd2a3b318547bcef31b468a92ee504d07ae4f"},
+    {file = "MarkupSafe-2.1.1-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:99a2a507ed3ac881b975a2976d59f38c19386d128e7a9a18b7df6fff1fd4c1d6"},
+    {file = "MarkupSafe-2.1.1-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:56442863ed2b06d19c37f94d999035e15ee982988920e12a5b4ba29b62ad1f77"},
+    {file = "MarkupSafe-2.1.1-cp39-cp39-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:3ce11ee3f23f79dbd06fb3d63e2f6af7b12db1d46932fe7bd8afa259a5996603"},
+    {file = "MarkupSafe-2.1.1-cp39-cp39-musllinux_1_1_aarch64.whl", hash = "sha256:33b74d289bd2f5e527beadcaa3f401e0df0a89927c1559c8566c066fa4248ab7"},
+    {file = "MarkupSafe-2.1.1-cp39-cp39-musllinux_1_1_i686.whl", hash = "sha256:43093fb83d8343aac0b1baa75516da6092f58f41200907ef92448ecab8825135"},
+    {file = "MarkupSafe-2.1.1-cp39-cp39-musllinux_1_1_x86_64.whl", hash = "sha256:8e3dcf21f367459434c18e71b2a9532d96547aef8a871872a5bd69a715c15f96"},
+    {file = "MarkupSafe-2.1.1-cp39-cp39-win32.whl", hash = "sha256:d4306c36ca495956b6d568d276ac11fdd9c30a36f1b6eb928070dc5360b22e1c"},
+    {file = "MarkupSafe-2.1.1-cp39-cp39-win_amd64.whl", hash = "sha256:46d00d6cfecdde84d40e572d63735ef81423ad31184100411e6e3388d405e247"},
+    {file = "MarkupSafe-2.1.1.tar.gz", hash = "sha256:7f91197cc9e48f989d12e4e6fbc46495c446636dfc81b9ccf50bb0ec74b91d4b"},
+]
 mypy-extensions = [
     {file = "mypy_extensions-0.4.3-py2.py3-none-any.whl", hash = "sha256:090fedd75945a69ae91ce1303b5824f428daf5a028d2f6ab8a299250a846f15d"},
     {file = "mypy_extensions-0.4.3.tar.gz", hash = "sha256:2d82818f5bb3e369420cb3c4060a7970edba416647068eb4c5343488a6c604a8"},
 ]
-nodeenv = []
+nodeenv = [
+    {file = "nodeenv-1.7.0-py2.py3-none-any.whl", hash = "sha256:27083a7b96a25f2f5e1d8cb4b6317ee8aeda3bdd121394e5ac54e498028a042e"},
+    {file = "nodeenv-1.7.0.tar.gz", hash = "sha256:e0e7f7dfb85fc5394c6fe1e8fa98131a2473e04311a45afb6508f7cf1836fa2b"},
+]
 packaging = [
     {file = "packaging-21.3-py3-none-any.whl", hash = "sha256:ef103e05f519cdc783ae24ea4e2e0f508a9c99b2d4969652eed6a2e1ea5bd522"},
     {file = "packaging-21.3.tar.gz", hash = "sha256:dd47c42927d89ab911e606518907cc2d3a1f38bbd026385970643f9c5b8ecfeb"},
 ]
-pathspec = []
-platformdirs = []
+pathspec = [
+    {file = "pathspec-0.10.1-py3-none-any.whl", hash = "sha256:46846318467efc4556ccfd27816e004270a9eeeeb4d062ce5e6fc7a87c573f93"},
+    {file = "pathspec-0.10.1.tar.gz", hash = "sha256:7ace6161b621d31e7902eb6b5ae148d12cfd23f4a249b9ffb6b9fee12084323d"},
+]
+platformdirs = [
+    {file = "platformdirs-2.5.3-py3-none-any.whl", hash = "sha256:0cb405749187a194f444c25c82ef7225232f11564721eabffc6ec70df83b11cb"},
+    {file = "platformdirs-2.5.3.tar.gz", hash = "sha256:6e52c21afff35cb659c6e52d8b4d61b9bd544557180440538f255d9382c8cbe0"},
+]
 pluggy = [
     {file = "pluggy-1.0.0-py2.py3-none-any.whl", hash = "sha256:74134bbf457f031a36d68416e1509f34bd5ccc019f0bcc952c7b909d06b37bd3"},
     {file = "pluggy-1.0.0.tar.gz", hash = "sha256:4224373bacce55f955a878bf9cfa763c1e360858e330072059e10bad68531159"},
 ]
-pre-commit = []
+pre-commit = [
+    {file = "pre_commit-2.20.0-py2.py3-none-any.whl", hash = "sha256:51a5ba7c480ae8072ecdb6933df22d2f812dc897d5fe848778116129a681aac7"},
+    {file = "pre_commit-2.20.0.tar.gz", hash = "sha256:a978dac7bc9ec0bcee55c18a277d553b0f419d259dadb4b9418ff2d00eb43959"},
+]
 py = [
     {file = "py-1.11.0-py2.py3-none-any.whl", hash = "sha256:607c53218732647dff4acdfcd50cb62615cedf612e72d1724fb1a0cc6405b378"},
     {file = "py-1.11.0.tar.gz", hash = "sha256:51c75c4126074b472f746a24399ad32f6053d1b34b68d2fa41e558e6f4a98719"},
@@ -693,16 +867,30 @@ pyparsing = [
     {file = "pyparsing-3.0.9-py3-none-any.whl", hash = "sha256:5026bae9a10eeaefb61dab2f09052b9f4307d44aee4eda64b309723d8d206bbc"},
     {file = "pyparsing-3.0.9.tar.gz", hash = "sha256:2b020ecf7d21b687f219b71ecad3631f644a47f01403fa1d1036b0c6416d70fb"},
 ]
-pytest = []
-pytest-cov = []
-pytest-forked = []
-pytest-xdist = []
+pytest = [
+    {file = "pytest-7.2.0-py3-none-any.whl", hash = "sha256:892f933d339f068883b6fd5a459f03d85bfcb355e4981e146d2c7616c21fef71"},
+    {file = "pytest-7.2.0.tar.gz", hash = "sha256:c4014eb40e10f11f355ad4e3c2fb2c6c6d1919c73f3b5a433de4708202cade59"},
+]
+pytest-cov = [
+    {file = "pytest-cov-4.0.0.tar.gz", hash = "sha256:996b79efde6433cdbd0088872dbc5fb3ed7fe1578b68cdbba634f14bb8dd0470"},
+    {file = "pytest_cov-4.0.0-py3-none-any.whl", hash = "sha256:2feb1b751d66a8bd934e5edfa2e961d11309dc37b73b0eabe73b5945fee20f6b"},
+]
+pytest-xdist = [
+    {file = "pytest-xdist-3.0.2.tar.gz", hash = "sha256:688da9b814370e891ba5de650c9327d1a9d861721a524eb917e620eec3e90291"},
+    {file = "pytest_xdist-3.0.2-py3-none-any.whl", hash = "sha256:9feb9a18e1790696ea23e1434fa73b325ed4998b0e9fcb221f16fd1945e6df1b"},
+]
 python-dateutil = [
     {file = "python-dateutil-2.8.2.tar.gz", hash = "sha256:0123cacc1627ae19ddf3c27a5de5bd67ee4586fbdd6440d9748f8abb483d3e86"},
     {file = "python_dateutil-2.8.2-py2.py3-none-any.whl", hash = "sha256:961d03dc3453ebbc59dbdea9e4e11c5651520a876d0f4db161e8674aae935da9"},
 ]
-python-dotenv = []
-python-slugify = []
+python-dotenv = [
+    {file = "python-dotenv-0.21.0.tar.gz", hash = "sha256:b77d08274639e3d34145dfa6c7008e66df0f04b7be7a75fd0d5292c191d79045"},
+    {file = "python_dotenv-0.21.0-py3-none-any.whl", hash = "sha256:1684eb44636dd462b66c3ee016599815514527ad99965de77f43e0944634a7e5"},
+]
+python-slugify = [
+    {file = "python-slugify-6.1.2.tar.gz", hash = "sha256:272d106cb31ab99b3496ba085e3fea0e9e76dcde967b5e9992500d1f785ce4e1"},
+    {file = "python_slugify-6.1.2-py2.py3-none-any.whl", hash = "sha256:7b2c274c308b62f4269a9ba701aa69a797e9bca41aeee5b3a9e79e36b6656927"},
+]
 pyyaml = [
     {file = "PyYAML-6.0-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:d4db7c7aef085872ef65a8fd7d6d09a14ae91f691dec3e87ee5ee0539d516f53"},
     {file = "PyYAML-6.0-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:9df7ed3b3d2e0ecfe09e14741b857df43adb5a3ddadc919a2d94fbdf78fea53c"},
@@ -711,6 +899,13 @@ pyyaml = [
     {file = "PyYAML-6.0-cp310-cp310-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:f84fbc98b019fef2ee9a1cb3ce93e3187a6df0b2538a651bfb890254ba9f90b5"},
     {file = "PyYAML-6.0-cp310-cp310-win32.whl", hash = "sha256:2cd5df3de48857ed0544b34e2d40e9fac445930039f3cfe4bcc592a1f836d513"},
     {file = "PyYAML-6.0-cp310-cp310-win_amd64.whl", hash = "sha256:daf496c58a8c52083df09b80c860005194014c3698698d1a57cbcfa182142a3a"},
+    {file = "PyYAML-6.0-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:d4b0ba9512519522b118090257be113b9468d804b19d63c71dbcf4a48fa32358"},
+    {file = "PyYAML-6.0-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:81957921f441d50af23654aa6c5e5eaf9b06aba7f0a19c18a538dc7ef291c5a1"},
+    {file = "PyYAML-6.0-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:afa17f5bc4d1b10afd4466fd3a44dc0e245382deca5b3c353d8b757f9e3ecb8d"},
+    {file = "PyYAML-6.0-cp311-cp311-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:dbad0e9d368bb989f4515da330b88a057617d16b6a8245084f1b05400f24609f"},
+    {file = "PyYAML-6.0-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:432557aa2c09802be39460360ddffd48156e30721f5e8d917f01d31694216782"},
+    {file = "PyYAML-6.0-cp311-cp311-win32.whl", hash = "sha256:bfaef573a63ba8923503d27530362590ff4f576c626d86a9fed95822a8255fd7"},
+    {file = "PyYAML-6.0-cp311-cp311-win_amd64.whl", hash = "sha256:01b45c0191e6d66c470b6cf1b9531a771a83c1c4208272ead47a3ae4f2f603bf"},
     {file = "PyYAML-6.0-cp36-cp36m-macosx_10_9_x86_64.whl", hash = "sha256:897b80890765f037df3403d22bab41627ca8811ae55e9a722fd0392850ec4d86"},
     {file = "PyYAML-6.0-cp36-cp36m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:50602afada6d6cbfad699b0c7bb50d5ccffa7e46a3d738092afddc1f9758427f"},
     {file = "PyYAML-6.0-cp36-cp36m-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:48c346915c114f5fdb3ead70312bd042a953a8ce5c7106d5bfb1a5254e47da92"},
@@ -738,12 +933,22 @@ pyyaml = [
     {file = "PyYAML-6.0-cp39-cp39-win_amd64.whl", hash = "sha256:b3d267842bf12586ba6c734f89d1f5b871df0273157918b0ccefa29deb05c21c"},
     {file = "PyYAML-6.0.tar.gz", hash = "sha256:68fb519c14306fec9720a2a5b45bc9f0c8d1b9c72adf45c37baedfcd949c35a2"},
 ]
-requests = []
+requests = [
+    {file = "requests-2.28.1-py3-none-any.whl", hash = "sha256:8fefa2a1a1365bf5520aac41836fbee479da67864514bdb821f31ce07ce65349"},
+    {file = "requests-2.28.1.tar.gz", hash = "sha256:7c5599b102feddaa661c826c56ab4fee28bfd17f5abca1ebbe3e7f19d7c97983"},
+]
+setuptools = [
+    {file = "setuptools-65.5.1-py3-none-any.whl", hash = "sha256:d0b9a8433464d5800cbe05094acf5c6d52a91bfac9b52bcfc4d41382be5d5d31"},
+    {file = "setuptools-65.5.1.tar.gz", hash = "sha256:e197a19aa8ec9722928f2206f8de752def0e4c9fc6953527360d1c36d94ddb2f"},
+]
 six = [
     {file = "six-1.16.0-py2.py3-none-any.whl", hash = "sha256:8abb2f1d86890a2dfb989f9a77cfcfd3e47c2a354b01111771326f8aa26e0254"},
     {file = "six-1.16.0.tar.gz", hash = "sha256:1e61c37477a1626458e36f7b1d82aa5c9b094fa4802892072e49de9c60c4c926"},
 ]
-soupsieve = []
+soupsieve = [
+    {file = "soupsieve-2.3.2.post1-py3-none-any.whl", hash = "sha256:3b2503d3c7084a42b1ebd08116e5f81aadfaea95863628c80a3b774a11b7c759"},
+    {file = "soupsieve-2.3.2.post1.tar.gz", hash = "sha256:fc53893b3da2c33de295667a0e19f078c14bf86544af307354de5fcf12a3f30d"},
+]
 text-unidecode = [
     {file = "text-unidecode-1.3.tar.gz", hash = "sha256:bad6603bb14d279193107714b288be206cac565dfa49aa5b105294dd5c4aab93"},
     {file = "text_unidecode-1.3-py2.py3-none-any.whl", hash = "sha256:1311f10e8b895935241623731c2ba64f4c455287888b18189350b67134a822e8"},
@@ -756,7 +961,19 @@ tomli = [
     {file = "tomli-2.0.1-py3-none-any.whl", hash = "sha256:939de3e7a6161af0c887ef91b7d41a53e7c5a1ca976325f429cb46ea9bc30ecc"},
     {file = "tomli-2.0.1.tar.gz", hash = "sha256:de526c12914f0c550d15924c62d72abc48d6fe7364aa87328337a31007fe8a4f"},
 ]
-tox = []
-tqdm = []
-urllib3 = []
-virtualenv = []
+tox = [
+    {file = "tox-3.27.0-py2.py3-none-any.whl", hash = "sha256:89e4bc6df3854e9fc5582462e328dd3660d7d865ba625ae5881bbc63836a6324"},
+    {file = "tox-3.27.0.tar.gz", hash = "sha256:d2c945f02a03d4501374a3d5430877380deb69b218b1df9b7f1d2f2a10befaf9"},
+]
+tqdm = [
+    {file = "tqdm-4.64.1-py2.py3-none-any.whl", hash = "sha256:6fee160d6ffcd1b1c68c65f14c829c22832bc401726335ce92c52d395944a6a1"},
+    {file = "tqdm-4.64.1.tar.gz", hash = "sha256:5f4f682a004951c1b450bc753c710e9280c5746ce6ffedee253ddbcbf54cf1e4"},
+]
+urllib3 = [
+    {file = "urllib3-1.26.12-py2.py3-none-any.whl", hash = "sha256:b930dd878d5a8afb066a637fbb35144fe7901e3b209d1cd4f524bd0e9deee997"},
+    {file = "urllib3-1.26.12.tar.gz", hash = "sha256:3fa96cf423e6987997fc326ae8df396db2a8b7c667747d47ddd8ecba91f4a74e"},
+]
+virtualenv = [
+    {file = "virtualenv-20.16.6-py3-none-any.whl", hash = "sha256:186ca84254abcbde98180fd17092f9628c5fe742273c02724972a1d8a2035108"},
+    {file = "virtualenv-20.16.6.tar.gz", hash = "sha256:530b850b523c6449406dfba859d6345e48ef19b8439606c5d74d7d3c9e14d76e"},
+]

From b0a3aba223238ed4ad477b6d00518f476cdcebcd Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 15 Nov 2022 04:12:48 +0000
Subject: [PATCH 174/371] Bump tox from 3.27.0 to 3.27.1

Bumps [tox](https://github.com/tox-dev/tox) from 3.27.0 to 3.27.1.
- [Release notes](https://github.com/tox-dev/tox/releases)
- [Changelog](https://github.com/tox-dev/tox/blob/master/docs/changelog.rst)
- [Commits](https://github.com/tox-dev/tox/compare/3.27.0...3.27.1)

---
updated-dependencies:
- dependency-name: tox
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 poetry.lock    | 8 ++++----
 pyproject.toml | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/poetry.lock b/poetry.lock
index 5c4caf2d..4c431c33 100644
--- a/poetry.lock
+++ b/poetry.lock
@@ -553,7 +553,7 @@ python-versions = ">=3.7"
 
 [[package]]
 name = "tox"
-version = "3.27.0"
+version = "3.27.1"
 description = "tox is a generic virtualenv management and test command line tool"
 category = "dev"
 optional = false
@@ -623,7 +623,7 @@ testing = ["coverage (>=6.2)", "coverage-enable-subprocess (>=1)", "flaky (>=3.7
 [metadata]
 lock-version = "1.1"
 python-versions = "^3.10"
-content-hash = "c48f44b08785d5a57f08e707d7243cfd1f97b2df9ab02fda2a20390fe84c37a4"
+content-hash = "f71be4e7f00d6dea92fe9e67fd4825e0e5bb84f7fd67158a4a3ef5218c79dcb7"
 
 [metadata.files]
 anytree = [
@@ -962,8 +962,8 @@ tomli = [
     {file = "tomli-2.0.1.tar.gz", hash = "sha256:de526c12914f0c550d15924c62d72abc48d6fe7364aa87328337a31007fe8a4f"},
 ]
 tox = [
-    {file = "tox-3.27.0-py2.py3-none-any.whl", hash = "sha256:89e4bc6df3854e9fc5582462e328dd3660d7d865ba625ae5881bbc63836a6324"},
-    {file = "tox-3.27.0.tar.gz", hash = "sha256:d2c945f02a03d4501374a3d5430877380deb69b218b1df9b7f1d2f2a10befaf9"},
+    {file = "tox-3.27.1-py2.py3-none-any.whl", hash = "sha256:f52ca66eae115fcfef0e77ef81fd107133d295c97c52df337adedb8dfac6ab84"},
+    {file = "tox-3.27.1.tar.gz", hash = "sha256:b2a920e35a668cc06942ffd1cf3a4fb221a4d909ca72191fb6d84b0b18a7be04"},
 ]
 tqdm = [
     {file = "tqdm-4.64.1-py2.py3-none-any.whl", hash = "sha256:6fee160d6ffcd1b1c68c65f14c829c22832bc401726335ce92c52d395944a6a1"},
diff --git a/pyproject.toml b/pyproject.toml
index 4aab084e..0c5c1139 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -20,7 +20,7 @@ pytest = "^7.2.0"
 pytest-cov = "^4.0.0"
 pytest-xdist = "^3.0.2"
 python-dotenv = "^0.21.0"
-tox = "^3.27.0"
+tox = "^3.27.1"
 pre-commit = "^2.19.0"
 isort = "^5.10.1"
 

From 127e95fcbeb06f2d1bcc07b87fe869db280db597 Mon Sep 17 00:00:00 2001
From: Roel Adriaans <roel@adriaans.org>
Date: Wed, 23 Nov 2022 11:39:30 +0100
Subject: [PATCH 175/371] Feature/day 21 (#86)

* Day 21, part a.
* Also gitignore venv*/ (eg, /venv311 , /venv310)
* Part b with a lot of help from asottile
---
 .gitignore                                    |  1 +
 .../solutions/data/day_21/day21.txt           |  2 +
 src/adventofcode2021/solutions/day21.py       | 84 +++++++++++++++++++
 tests/solutions/test_day21_a.py               | 36 ++++++++
 tests/solutions/test_day21_b.py               | 19 +++++
 5 files changed, 142 insertions(+)
 create mode 100644 src/adventofcode2021/solutions/data/day_21/day21.txt
 create mode 100644 src/adventofcode2021/solutions/day21.py
 create mode 100644 tests/solutions/test_day21_a.py
 create mode 100644 tests/solutions/test_day21_b.py

diff --git a/.gitignore b/.gitignore
index 1a44fb17..f1e7ffbf 100644
--- a/.gitignore
+++ b/.gitignore
@@ -108,6 +108,7 @@ celerybeat-schedule
 .venv*
 env/
 venv/
+venv*/
 ENV/
 env.bak/
 venv.bak/
diff --git a/src/adventofcode2021/solutions/data/day_21/day21.txt b/src/adventofcode2021/solutions/data/day_21/day21.txt
new file mode 100644
index 00000000..9a247e09
--- /dev/null
+++ b/src/adventofcode2021/solutions/data/day_21/day21.txt
@@ -0,0 +1,2 @@
+Player 1 starting position: 2
+Player 2 starting position: 8
diff --git a/src/adventofcode2021/solutions/day21.py b/src/adventofcode2021/solutions/day21.py
new file mode 100644
index 00000000..fd535410
--- /dev/null
+++ b/src/adventofcode2021/solutions/day21.py
@@ -0,0 +1,84 @@
+import itertools
+from collections import Counter
+from collections.abc import Iterator
+from functools import cache
+
+from adventofcode2021.utils.abstract import FileReaderSolution
+
+
+class Day21:
+    @staticmethod
+    def modulo(n: int) -> int:
+        return ((n - 1) % 10) + 1
+
+    @staticmethod
+    def dice() -> Iterator[int]:
+        for n in itertools.count(start=1):
+            yield ((n - 1) % 100) + 1
+
+    def run_loops(self, location_1: int, location_2: int) -> int:
+        score_1, score_2 = 0, 0
+        dice = self.dice()
+        player_1 = True
+        for n in itertools.count(start=1):
+            throw = sum([next(dice) for n in range(3)])
+            if player_1:
+                location_1 = self.modulo(location_1 + throw)
+                score_1 += location_1
+            else:
+                location_2 = self.modulo(location_2 + throw)
+                score_2 += location_2
+
+            # And switch players
+            player_1 = not player_1
+
+            # Have we won yet?
+            if score_1 >= 1000:
+                return score_2 * (n * 3)
+            elif score_2 >= 1000:
+                return score_1 * (n * 3)
+
+        raise ValueError("Infinity ended and no score was found.")
+
+
+class Day21PartA(Day21, FileReaderSolution):
+    def solve(self, input_data: str) -> int:
+        lines = input_data.splitlines()
+        start_1 = int(lines[0][-1])
+        start_2 = int(lines[1][-1])
+        return self.run_loops(start_1, start_2)
+
+
+class Day21PartB(Day21, FileReaderSolution):
+    cnt: Counter[int]
+
+    @cache
+    def find_wins(
+        self, location_1: int, score_1: int, location_2: int, score_2: int
+    ) -> tuple[int, int]:
+        wins_1 = wins_2 = 0
+        for throw, multiplier in self.cnt.items():
+            new_1 = self.modulo(location_1 + throw)
+            new_1_score = score_1 + new_1
+            if new_1_score >= 21:
+                wins_1 += multiplier
+            else:
+                tmp_2_wins, tmp_1_wins = self.find_wins(
+                    location_2, score_2, new_1, new_1_score
+                )
+                wins_1 += tmp_1_wins * multiplier
+                wins_2 += tmp_2_wins * multiplier
+        return wins_1, wins_2
+
+    def solve(self, input_data: str) -> int:
+        lines = input_data.splitlines()
+        start_1 = int(lines[0][-1])
+        start_2 = int(lines[1][-1])
+
+        # Pre-compute the throws and the number of times it can happen
+        options = (1, 2, 3)
+        self.cnt = Counter(
+            sum(pt) for pt in itertools.product(options, options, options)
+        )
+        p1, p2 = self.find_wins(start_1, 0, start_2, 0)
+        return max(p1, p2)
diff --git a/tests/solutions/test_day21_a.py b/tests/solutions/test_day21_a.py
new file mode 100644
index 00000000..f163e561
--- /dev/null
+++ b/tests/solutions/test_day21_a.py
@@ -0,0 +1,36 @@
+import pytest
+
+from adventofcode2021.solutions.day21 import Day21PartA
+
+
+class TestDay21PartA:
+    @pytest.mark.parametrize(
+        ("input_data", "expected_result"),
+        [
+            (1, 1),
+            (2, 2),
+            (9, 9),
+            (10, 10),
+            (11, 1),
+            (12, 2),
+            (13, 3),
+        ],
+    )
+    def test_mod(self, input_data, expected_result):
+        assert Day21PartA.modulo(input_data) == expected_result
+
+    def test_day21a_solve(self):
+        start_data = """\
+        Player 1 starting position: 4
+        Player 2 starting position: 8
+        """
+
+        solution = Day21PartA()
+        result = solution.solve(start_data)
+        assert result == 739785
+
+    def test_day21a_data(self):
+        """Result we got when we did the real solution"""
+        solution = Day21PartA()
+        res = solution("day_21/day21.txt")
+        assert res == 1196172
diff --git a/tests/solutions/test_day21_b.py b/tests/solutions/test_day21_b.py
new file mode 100644
index 00000000..53c9d1e2
--- /dev/null
+++ b/tests/solutions/test_day21_b.py
@@ -0,0 +1,19 @@
+from adventofcode2021.solutions.day21 import Day21PartB
+
+
+class TestDay21PartA:
+    def test_day21a_solve(self):
+        start_data = """\
+        Player 1 starting position: 4
+        Player 2 starting position: 8
+        """
+
+        solution = Day21PartB()
+        result = solution.solve(start_data)
+        assert result == 444356092776315
+
+    def test_day21a_data(self):
+        """Result we got when we did the real solution"""
+        solution = Day21PartB()
+        res = solution("day_21/day21.txt")
+        assert res == 106768284484217

From c6391ee271ba1e4ae60498d71883268fee1b9172 Mon Sep 17 00:00:00 2001
From: Roel Adriaans <roel@adriaans.org>
Date: Fri, 25 Nov 2022 21:58:06 +0100
Subject: [PATCH 176/371] Feature/day 21 (#87)

Implement day 19 by @anthonywritescode , implement part 2 self.
Still no idea how this works, figuring it out now
---
 .../solutions/data/day_19/day19.txt           | 780 ++++++++++++++++++
 .../solutions/data/day_19/test_data.txt       | 136 +++
 src/adventofcode2021/solutions/day19.py       | 152 ++++
 src/adventofcode2021/utils/point.py           |  25 +
 tests/solutions/test_day19_a.py               |  30 +
 tests/solutions/test_day19_b.py               |  33 +
 tests/test_point.py                           |  66 ++
 7 files changed, 1222 insertions(+)
 create mode 100644 src/adventofcode2021/solutions/data/day_19/day19.txt
 create mode 100644 src/adventofcode2021/solutions/data/day_19/test_data.txt
 create mode 100644 src/adventofcode2021/solutions/day19.py
 create mode 100644 src/adventofcode2021/utils/point.py
 create mode 100644 tests/solutions/test_day19_a.py
 create mode 100644 tests/solutions/test_day19_b.py
 create mode 100644 tests/test_point.py

diff --git a/src/adventofcode2021/solutions/data/day_19/day19.txt b/src/adventofcode2021/solutions/data/day_19/day19.txt
new file mode 100644
index 00000000..1366db27
--- /dev/null
+++ b/src/adventofcode2021/solutions/data/day_19/day19.txt
@@ -0,0 +1,780 @@
+--- scanner 0 ---
+-757,414,492
+-593,762,-478
+-608,779,-508
+-761,323,468
+-583,-536,626
+539,660,453
+745,-932,544
+419,509,439
+62,-24,118
+338,-793,-584
+-775,808,-521
+708,771,-798
+-90,-99,12
+400,-811,-639
+850,-816,468
+715,652,-760
+-820,276,460
+737,-883,437
+716,659,-718
+-619,-458,-521
+-551,-451,-643
+477,574,399
+-653,-464,-508
+-596,-505,704
+438,-706,-637
+-589,-621,598
+
+--- scanner 1 ---
+-386,481,-530
+568,822,748
+56,78,41
+-653,837,672
+-825,-465,-698
+-842,-495,-683
+517,-321,717
+401,-495,-638
+442,717,-695
+-661,-765,361
+558,611,-702
+-871,-508,-516
+-339,473,-471
+-709,-772,450
+441,-376,741
+-477,505,-534
+388,-630,-740
+473,639,-708
+-528,845,807
+-610,763,777
+583,809,645
+502,-587,734
+395,-508,-672
+-37,-6,-116
+-623,-735,471
+505,810,757
+
+--- scanner 2 ---
+-695,364,-810
+-642,483,453
+745,-960,-441
+743,235,-394
+15,-139,-14
+-452,-639,536
+635,652,646
+810,-702,549
+700,-762,505
+-453,-534,569
+621,-860,-431
+695,501,604
+-510,489,384
+-706,370,-596
+-536,388,405
+-628,402,-625
+633,540,465
+802,-735,390
+606,-923,-539
+578,271,-459
+105,-2,-130
+-517,-596,-542
+-571,-576,-529
+-486,-440,473
+654,315,-514
+-443,-634,-618
+
+--- scanner 3 ---
+812,-526,-776
+447,879,691
+-2,88,14
+-853,-613,-699
+868,-612,-712
+-746,793,-620
+-860,-681,-577
+491,-498,660
+-529,-701,302
+502,814,567
+-540,613,383
+445,628,-447
+355,810,596
+403,-351,685
+-807,800,-831
+-33,-43,-159
+-731,776,-886
+583,616,-432
+-582,553,534
+-602,-816,250
+471,485,-398
+872,-622,-827
+-568,-778,372
+377,-461,620
+-721,615,495
+-847,-579,-712
+
+--- scanner 4 ---
+-383,-542,-722
+703,879,-598
+587,-459,579
+-424,322,707
+-398,371,564
+113,1,1
+629,-610,639
+-400,-767,313
+-455,-643,378
+777,869,-619
+-308,-672,382
+793,544,399
+-536,356,576
+828,-723,-592
+-389,-498,-592
+768,-571,577
+854,755,392
+-621,489,-516
+-611,512,-432
+849,-622,-566
+-443,-593,-655
+753,753,-624
+778,810,416
+780,-628,-698
+-654,590,-372
+
+--- scanner 5 ---
+366,-674,-398
+646,574,-495
+810,-712,775
+-776,-616,-664
+709,499,-484
+538,832,519
+-851,-513,601
+330,-736,-449
+-832,-477,488
+754,549,-531
+534,-704,-421
+589,756,371
+-769,699,-884
+742,-698,801
+-608,351,427
+616,920,401
+-821,-527,-723
+-149,-42,-32
+-775,702,-638
+-576,337,535
+-750,-560,-579
+-717,658,-756
+632,-708,837
+-18,44,105
+-824,-294,581
+-538,374,539
+
+--- scanner 6 ---
+-670,706,-858
+342,376,641
+405,-867,-344
+-768,-540,-416
+-591,518,863
+-711,414,845
+-776,-509,-579
+281,-922,466
+-464,-713,728
+378,352,-541
+288,342,-625
+287,-929,-439
+-757,-508,-659
+-18,-130,-81
+-577,685,-840
+371,-842,552
+-550,433,837
+-523,-701,877
+303,376,-402
+247,-928,631
+-659,-686,773
+333,388,704
+445,389,626
+-433,677,-834
+358,-840,-351
+
+--- scanner 7 ---
+-608,662,-491
+-421,395,723
+537,400,-654
+-801,-707,334
+-716,-378,-908
+-606,481,-603
+-691,-669,364
+722,-794,-779
+-712,-755,327
+-551,-443,-872
+-64,-119,-13
+50,75,-130
+590,472,837
+655,-609,-741
+-668,620,-642
+-445,471,778
+569,546,847
+-428,456,512
+595,496,721
+733,-580,-773
+563,421,-755
+669,469,-660
+-627,-498,-828
+799,-779,496
+860,-721,542
+820,-593,474
+
+--- scanner 8 ---
+529,-663,-800
+519,-548,-804
+-429,-739,586
+271,298,-446
+-718,433,-595
+505,549,874
+562,-663,915
+615,-599,-744
+-729,576,-465
+351,484,-448
+-529,-792,673
+305,358,-378
+-68,-144,62
+498,443,758
+528,-676,921
+-836,389,447
+-828,282,496
+-796,-643,-252
+-491,-794,568
+-652,604,-655
+492,471,843
+-653,-636,-220
+460,-798,928
+-941,313,563
+-115,1,182
+-609,-662,-266
+
+--- scanner 9 ---
+819,-614,-852
+-394,-498,662
+-568,774,-852
+-488,737,-781
+-672,-417,-703
+-664,-337,-815
+652,-627,-823
+498,457,699
+595,-492,407
+-568,636,624
+645,572,-483
+575,387,738
+47,-73,82
+-546,514,691
+697,-627,420
+-442,625,-847
+-356,-496,767
+-671,-375,-696
+460,335,665
+745,655,-394
+663,-614,414
+865,584,-431
+637,-657,-806
+-700,627,697
+-294,-551,749
+
+--- scanner 10 ---
+12,120,-29
+-342,-679,-939
+530,-282,501
+-809,684,-468
+489,-308,416
+572,350,621
+-403,-504,359
+577,584,627
+403,-417,-730
+-66,14,-156
+414,664,-519
+598,-372,-703
+650,-300,397
+-506,-519,372
+-884,650,-644
+-765,612,-643
+-394,-441,371
+462,-268,-718
+-374,674,418
+-308,-514,-945
+398,839,-455
+-344,592,336
+363,708,-493
+-479,717,344
+623,433,604
+-432,-593,-859
+
+--- scanner 11 ---
+891,-554,-721
+-666,637,-444
+-607,-541,-415
+29,2,4
+162,154,-54
+-404,-217,531
+532,510,-451
+713,-606,830
+928,-640,-742
+-654,574,-435
+-681,-584,-520
+-609,441,448
+-689,-459,-385
+-398,-451,536
+743,571,-458
+921,-592,-831
+534,611,565
+477,586,-475
+781,-478,790
+408,661,539
+-653,652,-547
+759,-664,769
+-524,415,489
+418,587,560
+-421,-300,582
+-628,433,609
+
+--- scanner 12 ---
+-377,614,-406
+-552,-831,694
+527,-699,-733
+-754,618,829
+-411,-958,-621
+745,422,-840
+509,-816,-841
+-425,703,-413
+849,417,-798
+605,657,787
+-689,453,793
+-338,-820,700
+772,341,-775
+649,784,719
+670,-589,575
+-539,-918,-553
+-353,-897,-575
+-463,593,-443
+463,-695,-855
+130,-179,-79
+513,-525,626
+-634,529,749
+703,610,736
+45,-46,33
+661,-442,574
+-523,-753,662
+
+--- scanner 13 ---
+909,550,-668
+112,-89,-14
+-273,384,725
+824,456,386
+-373,374,601
+-793,-530,-506
+-594,-593,-472
+787,-689,-321
+-657,472,-591
+717,-801,-298
+821,591,-739
+-310,482,586
+-637,485,-537
+493,-740,530
+749,-693,-284
+724,419,337
+474,-627,566
+-531,-606,790
+-33,37,38
+-471,-562,680
+501,-647,347
+618,425,401
+-699,-626,-473
+944,544,-718
+-498,-447,782
+-599,561,-463
+
+--- scanner 14 ---
+551,-821,-732
+-578,-311,780
+558,-481,467
+-688,548,475
+743,667,230
+628,740,282
+-667,-431,700
+384,-850,-719
+-866,523,-640
+608,409,-597
+-743,-376,744
+-94,25,-89
+458,-392,550
+-849,538,-906
+566,-804,-762
+506,422,-732
+-493,-640,-462
+-603,-602,-492
+705,701,352
+-582,-688,-455
+338,-429,479
+-873,462,-851
+540,416,-719
+-626,687,514
+-686,729,363
+
+--- scanner 15 ---
+-702,-746,443
+739,592,-374
+597,814,559
+763,-590,-410
+-670,658,-388
+682,788,518
+727,655,-365
+-335,568,609
+-345,642,630
+-858,-671,-565
+-459,719,-381
+-404,643,-405
+438,-883,401
+-843,-533,-553
+701,796,679
+-892,-559,-696
+409,-907,638
+-725,-756,527
+-624,-789,383
+430,-889,545
+726,577,-477
+-80,-67,-39
+-461,618,635
+773,-674,-320
+58,23,81
+739,-451,-335
+
+--- scanner 16 ---
+-755,578,-603
+487,691,-754
+593,698,-638
+20,82,-38
+-923,-807,452
+382,-791,415
+-559,792,522
+-834,-736,364
+-836,-723,-539
+552,845,568
+-922,-847,-618
+-610,838,475
+-739,456,-638
+394,-761,-691
+678,891,498
+358,-716,554
+382,-752,-628
+738,925,566
+565,704,-723
+348,-806,638
+-667,922,511
+-779,551,-493
+-916,-813,-453
+-153,145,64
+-861,-689,357
+395,-649,-613
+
+--- scanner 17 ---
+664,-630,-754
+805,704,436
+-431,686,597
+-587,-662,388
+-631,-532,382
+569,439,-825
+400,-738,620
+-717,-556,-781
+-461,651,805
+-984,750,-627
+423,-822,610
+-711,-688,-850
+459,413,-747
+674,775,343
+780,-635,-778
+790,-656,-704
+-840,657,-649
+-53,56,-150
+-812,-662,-829
+451,333,-808
+-112,-109,-68
+-936,553,-605
+-682,-599,442
+708,813,465
+501,-882,653
+-541,612,682
+
+--- scanner 18 ---
+552,283,-704
+606,-679,-568
+33,2,166
+471,-600,469
+15,-169,53
+-565,601,731
+-501,373,-422
+-680,574,833
+846,372,668
+634,306,-684
+-534,478,-421
+563,-505,400
+703,258,-627
+-665,-549,-505
+-466,-662,726
+618,-629,465
+552,-774,-505
+-521,541,841
+-617,-644,-611
+-605,-701,664
+804,401,618
+-686,-650,-479
+-424,-813,666
+893,472,557
+-597,279,-455
+546,-730,-635
+
+--- scanner 19 ---
+835,-511,-678
+895,455,462
+650,-578,-640
+-505,-664,948
+-359,-696,-553
+161,-95,23
+790,538,-336
+749,472,-391
+888,283,439
+30,-35,133
+-384,431,727
+-455,-638,822
+-462,405,617
+820,-434,597
+-380,-670,-654
+784,307,460
+699,385,-327
+621,-500,-672
+-401,325,609
+-428,-564,-559
+-560,649,-682
+762,-373,643
+-604,545,-778
+-431,-643,938
+634,-413,575
+-582,742,-826
+
+--- scanner 20 ---
+-600,-782,533
+596,577,-670
+620,550,-780
+-646,690,-519
+286,-347,543
+763,-848,-655
+-541,-753,-645
+413,595,320
+321,586,395
+-752,697,-635
+-75,63,-4
+677,-724,-734
+-518,-812,451
+-554,-650,-660
+-526,-677,576
+-882,525,309
+-724,703,-550
+-890,466,262
+-24,138,-191
+461,-391,471
+-175,5,-154
+462,-272,509
+-553,-762,-582
+-858,529,400
+373,551,219
+580,455,-635
+757,-814,-820
+
+--- scanner 21 ---
+-377,-514,-910
+844,-627,-723
+759,-599,-717
+-445,-454,-944
+-402,821,411
+929,642,-755
+749,-810,733
+734,-797,630
+812,-798,742
+-294,-810,772
+-514,787,542
+-376,772,554
+875,-705,-710
+876,388,726
+-447,-640,-864
+916,507,-653
+800,333,702
+-433,-834,697
+-803,392,-696
+-517,-844,787
+922,520,-687
+-743,443,-600
+22,-64,-168
+160,4,-35
+815,599,719
+-799,507,-686
+
+--- scanner 22 ---
+817,529,-684
+728,823,688
+-473,-503,418
+-72,102,143
+-547,657,684
+559,-544,861
+-476,801,651
+821,-620,-435
+699,781,638
+-521,742,740
+628,870,577
+-465,-410,601
+526,-703,853
+622,-557,-401
+-721,-457,-213
+727,-524,-402
+-528,962,-575
+499,-588,751
+-580,834,-534
+-689,-349,-227
+66,6,64
+794,611,-664
+842,680,-607
+-446,-523,637
+-522,716,-578
+-759,-461,-250
+
+--- scanner 23 ---
+-352,-697,-348
+432,569,514
+-44,-72,111
+-406,627,809
+-581,-621,391
+-473,788,-390
+819,-664,596
+877,399,-834
+566,-655,-584
+782,-784,667
+366,523,626
+473,-689,-636
+-378,729,728
+-410,628,711
+730,-564,679
+-673,698,-393
+-334,-673,-384
+-432,-525,427
+361,649,477
+-528,-485,420
+-310,-680,-500
+151,90,68
+-518,655,-370
+946,312,-770
+592,-590,-584
+865,328,-773
+
+--- scanner 24 ---
+-519,780,-365
+634,802,-649
+-674,902,562
+105,13,-47
+-667,878,446
+-662,-634,635
+-479,684,-358
+465,-735,700
+-522,-563,-663
+704,539,455
+430,-788,740
+757,-463,-300
+-606,-678,-646
+677,-509,-447
+794,739,452
+-657,-639,463
+-706,-723,627
+735,834,-666
+-595,-597,-832
+575,-753,793
+661,694,432
+-62,53,53
+633,806,-747
+678,-478,-454
+-691,860,410
+-615,631,-329
+
+--- scanner 25 ---
+183,2,-88
+656,638,481
+894,-843,430
+-325,-646,403
+-658,-347,-552
+619,806,-682
+657,512,589
+562,876,-811
+5,-20,46
+-679,-329,-645
+-650,-353,-408
+-315,-562,313
+536,-608,-751
+586,835,-891
+-759,588,-782
+701,481,532
+-639,600,608
+867,-836,383
+-349,-785,328
+567,-771,-743
+956,-748,312
+535,-528,-732
+-702,558,533
+-554,511,-793
+-765,497,-720
+-786,627,617
+
+--- scanner 26 ---
+568,-612,-772
+-494,-703,-776
+689,-640,-900
+512,-573,342
+765,568,275
+-699,525,741
+508,448,-580
+558,403,-627
+-458,-494,437
+58,44,-10
+-695,623,-517
+-620,-556,487
+-452,-603,-788
+-689,415,705
+929,541,305
+675,-619,407
+479,-562,414
+-703,347,679
+-665,791,-494
+-527,-407,477
+128,-52,-173
+583,511,-591
+698,-517,-736
+-727,827,-545
+-409,-773,-839
+841,619,423
+
+--- scanner 27 ---
+743,-494,-529
+20,142,-6
+374,-668,657
+-568,-551,-817
+374,719,-731
+-538,-500,730
+-515,-415,-788
+-385,-491,820
+-427,-538,747
+-393,697,-399
+411,815,380
+-365,799,-480
+530,822,418
+420,-486,700
+-702,757,526
+-419,-455,-781
+403,-501,670
+-626,716,631
+-397,698,-497
+157,78,120
+379,593,-582
+523,823,460
+445,639,-694
+832,-594,-612
+-640,682,457
+795,-714,-541
diff --git a/src/adventofcode2021/solutions/data/day_19/test_data.txt b/src/adventofcode2021/solutions/data/day_19/test_data.txt
new file mode 100644
index 00000000..4e496e9e
--- /dev/null
+++ b/src/adventofcode2021/solutions/data/day_19/test_data.txt
@@ -0,0 +1,136 @@
+--- scanner 0 ---
+404,-588,-901
+528,-643,409
+-838,591,734
+390,-675,-793
+-537,-823,-458
+-485,-357,347
+-345,-311,381
+-661,-816,-575
+-876,649,763
+-618,-824,-621
+553,345,-567
+474,580,667
+-447,-329,318
+-584,868,-557
+544,-627,-890
+564,392,-477
+455,729,728
+-892,524,684
+-689,845,-530
+423,-701,434
+7,-33,-71
+630,319,-379
+443,580,662
+-789,900,-551
+459,-707,401
+
+--- scanner 1 ---
+686,422,578
+605,423,415
+515,917,-361
+-336,658,858
+95,138,22
+-476,619,847
+-340,-569,-846
+567,-361,727
+-460,603,-452
+669,-402,600
+729,430,532
+-500,-761,534
+-322,571,750
+-466,-666,-811
+-429,-592,574
+-355,545,-477
+703,-491,-529
+-328,-685,520
+413,935,-424
+-391,539,-444
+586,-435,557
+-364,-763,-893
+807,-499,-711
+755,-354,-619
+553,889,-390
+
+--- scanner 2 ---
+649,640,665
+682,-795,504
+-784,533,-524
+-644,584,-595
+-588,-843,648
+-30,6,44
+-674,560,763
+500,723,-460
+609,671,-379
+-555,-800,653
+-675,-892,-343
+697,-426,-610
+578,704,681
+493,664,-388
+-671,-858,530
+-667,343,800
+571,-461,-707
+-138,-166,112
+-889,563,-600
+646,-828,498
+640,759,510
+-630,509,768
+-681,-892,-333
+673,-379,-804
+-742,-814,-386
+577,-820,562
+
+--- scanner 3 ---
+-589,542,597
+605,-692,669
+-500,565,-823
+-660,373,557
+-458,-679,-417
+-488,449,543
+-626,468,-788
+338,-750,-386
+528,-832,-391
+562,-778,733
+-938,-730,414
+543,643,-506
+-524,371,-870
+407,773,750
+-104,29,83
+378,-903,-323
+-778,-728,485
+426,699,580
+-438,-605,-362
+-469,-447,-387
+509,732,623
+647,635,-688
+-868,-804,481
+614,-800,639
+595,780,-596
+
+--- scanner 4 ---
+727,592,562
+-293,-554,779
+441,611,-461
+-714,465,-776
+-743,427,-804
+-660,-479,-426
+832,-632,460
+927,-485,-438
+408,393,-506
+466,436,-512
+110,16,151
+-258,-428,682
+-393,719,612
+-211,-452,876
+808,-476,-593
+-575,615,604
+-485,667,467
+-680,325,-822
+-627,-443,-432
+872,-547,-609
+833,512,582
+807,604,487
+839,-516,451
+891,-625,532
+-652,-548,-490
+30,-46,-14
diff --git a/src/adventofcode2021/solutions/day19.py b/src/adventofcode2021/solutions/day19.py
new file mode 100644
index 00000000..5df08ab2
--- /dev/null
+++ b/src/adventofcode2021/solutions/day19.py
@@ -0,0 +1,152 @@
+import collections
+import itertools
+from typing import NamedTuple
+
+from adventofcode2021.utils.abstract import FileReaderSolution
+from adventofcode2021.utils.point import XYZPoint as Point
+
+
+class Scanner(NamedTuple):
+    sequence: int
+    beacons: list[Point]
+
+
+class AxisInfo(NamedTuple):
+    axis: int
+    sign: int
+    diff: int
+
+
+class Day19:
+    scanner_positions: dict[int, Point]
+
+    @staticmethod
+    def parse_input(input_data) -> list[Scanner]:
+        block = input_data.split("\n\n")
+        scanners: list[Scanner] = []
+
+        for line in block:
+            lines = line.splitlines()
+            # Split on spaces, scanner # will be on the 3rd split
+            sequence = int(lines[0].split()[2])
+
+            beacons = []
+            for beacon_str in lines[1:]:
+                beacons.append(Point(*[int(b) for b in beacon_str.split(",")]))
+
+            scanners.append(Scanner(sequence=sequence, beacons=beacons))
+        return scanners
+
+    @staticmethod
+    def x_edges_from(
+        src: Scanner,
+        scanners_by_id: dict[int, Scanner],
+    ) -> dict[int, AxisInfo]:
+        x_edges = {}
+        for other in scanners_by_id.values():
+            for axis in (0, 1, 2):
+                for sign in (-1, 1):
+                    d_x: collections.Counter[int] = collections.Counter()
+                    for x, _, _ in src.beacons:
+                        for other_pt in other.beacons:
+                            d_x[x - other_pt[axis] * sign] += 1
+
+                    ((x_diff, n),) = d_x.most_common(1)
+                    if n >= 12:
+                        x_edges[other.sequence] = AxisInfo(
+                            axis=axis,
+                            sign=sign,
+                            diff=x_diff,
+                        )
+        return x_edges
+
+    @staticmethod
+    def yz_edges_from(
+        src: Scanner,
+        x_edges: dict[int, AxisInfo],
+        scanners_by_id: dict[int, Scanner],
+    ) -> tuple[dict[int, AxisInfo], dict[int, AxisInfo]]:
+        y_edges = {}
+        z_edges = {}
+
+        for dst_id in x_edges:
+            other = scanners_by_id[dst_id]
+            for axis in (0, 1, 2):
+                for sign in (-1, 1):
+                    d_y: collections.Counter[int] = collections.Counter()
+                    d_z: collections.Counter[int] = collections.Counter()
+                    for _, y, z in src.beacons:
+                        for other_pt in other.beacons:
+                            d_y[y - other_pt[axis] * sign] += 1
+                            d_z[z - other_pt[axis] * sign] += 1
+
+                    ((y_diff, y_n),) = d_y.most_common(1)
+                    if y_n >= 12:
+                        y_edges[dst_id] = AxisInfo(
+                            axis=axis,
+                            sign=sign,
+                            diff=y_diff,
+                        )
+
+                    ((z_diff, z_n),) = d_z.most_common(1)
+                    if z_n >= 12:
+                        z_edges[dst_id] = AxisInfo(
+                            axis=axis,
+                            sign=sign,
+                            diff=z_diff,
+                        )
+
+        return y_edges, z_edges
+
+    def compute(self, input_data: str):
+        scanners: list[Scanner] = self.parse_input(input_data)
+        scanners_by_id: dict[int, Scanner] = {
+            scanner.sequence: scanner for scanner in scanners
+        }
+
+        self.scanner_positions = {0: Point(0, 0, 0)}
+        all_points = set(scanners_by_id[0].beacons)
+        todo = [scanners_by_id.pop(0)]
+        while todo:
+            src = todo.pop()
+
+            x_edges = self.x_edges_from(src, scanners_by_id)
+            y_edges, z_edges = self.yz_edges_from(src, x_edges, scanners_by_id)
+
+            for k in x_edges:
+                dst_x = x_edges[k].diff
+                dst_y = y_edges[k].diff
+                dst_z = z_edges[k].diff
+
+                self.scanner_positions[k] = Point(dst_x, dst_y, dst_z)
+
+                next_scanner = scanners_by_id.pop(k)
+                next_scanner.beacons[:] = [
+                    Point(
+                        dst_x + x_edges[k].sign * pt[x_edges[k].axis],
+                        dst_y + y_edges[k].sign * pt[y_edges[k].axis],
+                        dst_z + z_edges[k].sign * pt[z_edges[k].axis],
+                    )
+                    for pt in next_scanner.beacons
+                ]
+                all_points.update(next_scanner.beacons)
+
+                todo.append(next_scanner)
+
+        return all_points
+
+
+class Day19PartA(Day19, FileReaderSolution):
+    def solve(self, input_data: str) -> int:
+        return len(self.compute(input_data))
+
+
+class Day19PartB(Day19, FileReaderSolution):
+    def solve(self, input_data: str) -> int:
+        self.compute(input_data)
+
+        distance = 0
+        for a, b in itertools.permutations(self.scanner_positions.values(), 2):
+            distance = max(distance, a.distance(b))
+
+        return distance
diff --git a/src/adventofcode2021/utils/point.py b/src/adventofcode2021/utils/point.py
new file mode 100644
index 00000000..445e2322
--- /dev/null
+++ b/src/adventofcode2021/utils/point.py
@@ -0,0 +1,25 @@
+from typing import NamedTuple
+
+
+class XYZPoint(NamedTuple):
+    x: int
+    y: int
+    z: int
+
+    def __add__(self, other):
+        if not issubclass(type(other), XYZPoint):
+            raise ValueError("Cannot add incompatible types together")
+        return XYZPoint(x=self.x + other.x, y=self.y + other.y, z=self.z + other.z)
+
+    def distance(self, other):
+        return abs(self.x - other.x) + abs(self.y - other.y) + abs(self.z - other.z)
+
+
+class XYPoint(NamedTuple):
+    x: int
+    y: int
+
+    def __add__(self, other):
+        if not issubclass(type(other), XYPoint):
+            raise ValueError("Cannot add incompatible types together")
+        return XYPoint(x=self.x + other.x, y=self.y + other.y)
diff --git a/tests/solutions/test_day19_a.py b/tests/solutions/test_day19_a.py
new file mode 100644
index 00000000..2b4bfa81
--- /dev/null
+++ b/tests/solutions/test_day19_a.py
@@ -0,0 +1,30 @@
+import pathlib
+
+from adventofcode2021.solutions.day19 import Day19PartA
+
+
+class TestDay19PartA:
+    def load_testdata(self):
+        test_path = (
+            pathlib.Path(__file__).parent.parent.parent
+            / "src"
+            / "adventofcode2021"
+            / "solutions"
+            / "data"
+            / "day_19"
+            / "test_data.txt"
+        )
+        with open(test_path) as f:
+            test_data = f.read()
+        return test_data
+
+    def test_day19a_solve(self):
+        solution = Day19PartA()
+        result = solution.solve(self.load_testdata())
+        assert result == 79
+
+    def test_day19a_data(self):
+        """Result we got when we did the real solution"""
+        solution = Day19PartA()
+        res = solution("day_19/day19.txt")
+        assert res == 323
diff --git a/tests/solutions/test_day19_b.py b/tests/solutions/test_day19_b.py
new file mode 100644
index 00000000..799b4419
--- /dev/null
+++ b/tests/solutions/test_day19_b.py
@@ -0,0 +1,33 @@
+import pathlib
+
+import pytest
+
+from adventofcode2021.solutions.day19 import Day19PartB
+
+
+class TestDay19PartB:
+    def load_testdata(self):
+        test_path = (
+            pathlib.Path(__file__).parent.parent.parent
+            / "src"
+            / "adventofcode2021"
+            / "solutions"
+            / "data"
+            / "day_19"
+            / "test_data.txt"
+        )
+        with open(test_path) as f:
+            test_data = f.read()
+        return test_data
+
+    def test_day19b_solve(self):
+        solution = Day19PartB()
+        result = solution.solve(self.load_testdata())
+        assert result == 3621
+
+    @pytest.mark.xfail(reason="Not yet implemented", raises=NotImplementedError)
+    def test_day19b_data(self):
+        """Result we got when we did the real solution"""
+        solution = Day19PartB()
+        res = solution("day_19/day19.txt")
+        assert res == 10685
diff --git a/tests/test_point.py b/tests/test_point.py
new file mode 100644
index 00000000..08a1810d
--- /dev/null
+++ b/tests/test_point.py
@@ -0,0 +1,66 @@
+import pytest
+
+from adventofcode2021.utils import point
+
+
+def test_xyzpoint():
+    p1 = point.XYZPoint(1, 2, 3)
+    assert p1.x == 1
+    assert p1.y == 2
+    assert p1.z == 3
+
+    assert repr(p1) == "XYZPoint(x=1, y=2, z=3)"
+
+    p2 = point.XYZPoint(6, 7, 8)
+
+    total = p1 + p2
+    assert total.x == 7
+    assert total.y == 9
+    assert total.z == 11
+
+    p1_same = point.XYZPoint(1, 2, 3)
+    assert p1 == p1_same
+    assert p1 != p2
+
+    # Since it's a named tuple, we can also get the values from it:
+    x, y, z = p1
+    assert x == 1
+    assert y == 2
+    assert z == 3
+
+
+def test_xyzdistance():
+    p1 = point.XYZPoint(1105, -1205, 1229)
+    p2 = point.XYZPoint(-92, -2380, -20)
+
+    assert p1.distance(p2) == 3621
+
+
+def test_xypoint():
+    p1 = point.XYPoint(1, 2)
+    assert p1.x == 1
+    assert p1.y == 2
+
+    assert repr(p1) == "XYPoint(x=1, y=2)"
+
+    p2 = point.XYPoint(6, 7)
+
+    total = p1 + p2
+    assert total.x == 7
+    assert total.y == 9
+
+    p1_same = point.XYPoint(1, 2)
+    assert p1 == p1_same
+    assert p1 != p2
+
+
+def test_invalid_together():
+    xy = point.XYPoint(1, 2)
+    xyz = point.XYZPoint(6, 7, 8)
+
+    with pytest.raises(ValueError):
+        xyz + xy
+    with pytest.raises(ValueError):
+        xy + xyz
+
+    assert xy != xyz

From 11277d213cf908260e299c71eb6476bc2db6c56f Mon Sep 17 00:00:00 2001
From: Roel Adriaans <roel@adriaans.org>
Date: Sun, 27 Nov 2022 11:42:15 +0100
Subject: [PATCH 177/371] Feature/day 20 (#88)

* n is not used in list comprehention, use _ instead of variable also in outer scope.

It works, but it's not pretty

* Add some test data

* Works for sample input, but not yet for the real data. Way to complex,
again

* Implement the 'special case', for the real input.

Co-authored-by: Roel Adriaans <roel.adriaans@asml.com>
---
 .../solutions/data/day_20/day20.txt           | 102 ++++++++++++++++
 .../solutions/data/day_20/test_data.txt       |   7 ++
 src/adventofcode2021/solutions/day20.py       | 115 ++++++++++++++++++
 src/adventofcode2021/solutions/day21.py       |   2 +-
 tests/solutions/test_day20_a.py               |  69 +++++++++++
 tests/solutions/test_day20_b.py               |  31 +++++
 6 files changed, 325 insertions(+), 1 deletion(-)
 create mode 100644 src/adventofcode2021/solutions/data/day_20/day20.txt
 create mode 100644 src/adventofcode2021/solutions/data/day_20/test_data.txt
 create mode 100644 src/adventofcode2021/solutions/day20.py
 create mode 100644 tests/solutions/test_day20_a.py
 create mode 100644 tests/solutions/test_day20_b.py

diff --git a/src/adventofcode2021/solutions/data/day_20/day20.txt b/src/adventofcode2021/solutions/data/day_20/day20.txt
new file mode 100644
index 00000000..23921b71
--- /dev/null
+++ b/src/adventofcode2021/solutions/data/day_20/day20.txt
@@ -0,0 +1,102 @@
+##..#.#...##.####..#..###.#.#.#.#.####.#.##.....#####.##..#..#.#.##.......##.##.#.#...#....#.####..#.##.##....###..##.#####.##....##.#.#.#.#....####...##.#......#.#..##......##..#..###.#..####.###...##.#.##.#..##.##..#.#.#..###..##.####.#.#.#..#.##...#..##...##.#####..##.##..#...#..###.#.#...#..#..##...#.#..........#...#...#.#.#.#..#.###..##....####..#######.##.#.....#.#.###...##...###...#.##.##.##..#......#.###...#.#.#.#...##.#.#.##.#..###.#...##...##.......####.##..#.#....#.#####..#..#####.#.....#....#.#.
+
+.##.#...##..##.#..........#####..#.##..######.##..#....#..#####.#.#####.#..#...#..#####..#.......##.
+.#.#.#.#####..##.#.###..#.##.##.......#.####.#............#.#....####..#.#####.##.##.#.###..#..##...
+.##.#.#...##....#.#..#...........##.#.#..#####...#..##.###..##.###..........#####..##..##.#.####....
+##..####.####.###.......#....#.#####.##...#....###...##...###...#...##..####....####..#####..##..###
+...###.##.....#......###.#.###..#..###...#.#..#.#######.##..#..#..#..##.##..#####.#####.###...#.###.
+##.###.#....##..####.#..#.###.##.#.##..#...#...###.###.#..#..#.#.###.##.#..###.#.###....###.###.....
+#.#.##..#.....#.....##....######...#........#.#.#.#.######..#...##.#.######...#.##########..#.###..#
+.##.#...##.#......###..####.##.#...#..##.#.####...##..####..#####..##.###.#.###...#.#.######.#.#####
+..#..##..#.#.#...####..###.#..#...#..#.#.#.#.###..####.#...#......#..#..####.#...#.#.#......#...#..#
+#...###..#.#.###.#.##.##.#.#.#####....#....#.....#####...#..#..#.#####..##.....#..###.#..###.#..#...
+..##.#.#..##.#.#...#...#.#.#..#.#.##....#####....#.##...#..#..#.#....###...##..#.#.##.##.#.......#.#
+##.##.#######.###.#..#....#..##..#.###.....#.###..#.#..#....#.#..###.##.#.....#.#.#.##.#...#..##.#..
+.....#.#.#.#.####.#..####.#....##.###.###...########.#.#....#..##.#.#####...##....##....#.......#.#.
+##..#...#..#.#.####..#.#..####.#####.#####.###..#.#####.#..#...##.######.###.#..#.##.#.#..#..#.####.
+#.##.##.#.####...#.#.#.#..####.#.#...###...#.#....##...####.#..#####.#.####.#..#.....###.#..#...#.#.
+.#..#.##...####...##.####...###..####.##........#.#.##..#..#.##...#....##.#.#..#.#.###...##.......#.
+..#..#..#.###.##...###....#.#..#..##..#...###.###...#..#.....#..#.####.#.#.#.##..###...#....##.#.###
+###.##....##.#.##..####.#.###...###.###.#####..##.###.....#.#####....#.##..##.#####.##..###....#....
+###..#...###..#....#..#.#...#....###.#.####.##..#.#..#.###..#..#.##.#.#.......#...#....#...###..#.##
+#...#.#.#...#.####.##.#.#..#...##.....#..##....#..#.##..##.####.#.#.###..##..#.#.#.###.#.#..####..##
+.###..###.##..###..#..#.##..#...#.##.#.......####.#..##.#...#.##..#..........##..####..##.###..###..
+###.#.#...###..#...#####.####..#..#######.#.#.###.##.###.#.####.##.#####..###.#####.#...####.##..##.
+.##..##..##.#...######.###...#.##.##....##.#...##.#####.#...##..#.#...#.#..#.##.#....##.####.#.##.#.
+...####..#...#...####.#.#...#...###..#.##...####.#..######.##.....##..#...#...####.###.#..##.##..#..
+#.#####.##.##..#..##.#.####..##.#.#...#..####.##..###.####.##.##...#.#...#.#.#####.####.#.###..#..#.
+..#.....#..##..#...#####..##.###..##.#..##..##..####.#..#.####.###...#####.#.###.....#..#.####.#.##.
+#####....###..##.#.######.#.##..##.#.#####.##########.#...##...###....###.#.....#.....###.#.#.#.##.#
+##.....#.###.###.#.##.########....##.##.###...#######..##..#.#.#..#.##..####..#.###.#.###.#.#......#
+..##..#...#.#.#.#.###.#..#####.#.#..#......####..#.###..###...##...##.##..#..#..#.##.#..###..##.#.#.
+.#.#..#..###.##.#.#...#.#...##...#.###..#.#.##.#....#..####..#.#.##.#..#...##.#.....##...####.....#.
+##.#..##...#..##.####.##....##..#####.###...#..######..#....#..#######..#..#.####.#...##.##..##..#..
+..##.#.###....#..#.....#..#.#.#.#........#..##.#.#.......####.##...#.#.##.######..##..#....#.#......
+.....#....#.#.##...#..######.###.###.##....##.#.##.###.....#..#.#....#####.#..##.#.....#..#.##....##
+##.....#.#...####...##.##.#.##.#.##......#.#########.#.##..##...###.##.#..#....#..##.####..#######..
+##...#.########.###.#....#...#..##.##.###....##...#####..##.####..##..#..#####.#..######.####...#.#.
+##.####..##.#####..#..###...##.......#...#.###.#.#..#..#....#.#..##.....#.#....####.###...#.#..##.#.
+#.#.#.#.###..#.#####.#...##...#.###.##..#.#####.....#...#.#.#..#...##....#...####.####.##.#.....####
+..###.##.#......#######..#...##..###.##....#....#.#..###...#..###.#.#...#..##...####.###.###..#.#.##
+.#..#.#.##..###########.#.#..#.###.######...###.##..#.###..##.#...#.#...###.#.##.##.#..#..#..#.#...#
+.#..#.#..##....#....####.#..##....#.###.####..#.##.#.#..###.#.##.#........##.#...###.#.......##.#...
+...###.#.#.##.##.##.....#.#.#..#..#.##.#######...##....#.#......##....##.#.####.####.###.#....##..#.
+.#.##..#.##.##.####.....##...#..###.###.###..#..##.####..##...#.###.##..##..#####.#..###....###.##.#
+#.###...#####.#..#.####...##.#..#...######.....#.#....##.#.#...##....#...........##.##.##.#...######
+##..#..##.....##..#.#..##.##.#..#...####.######.......###..#..##.##..##..##..###..##.##.#.#.....#...
+#......###..#####..#######.#.#..#.###..##.#..##.##.##.#..###.###..##.##.....#.#..####.#.##...##..###
+.##...#..###..##..#.#####.#####.###...#.........#.##.##.###.#.#.#...###.#..###.##.##.#..#..#...###.#
+#.###.###.###.#.###.#.##....##..##.......#....##.###.###.#.###..#..###.#.##.##..#.#...######.####..#
+..#####.###.##.#..##.##.#..#.###..#.####....#...##.#.......#.#..##.#.......##.##.#######...######.##
+#.##...###..#..##.....#.#.##.#..##...##.#####..#...##...#..#.####.#.##.##.#....##.###.#.##..##..#.#.
+..#.###.#.##...#..##.#..####.###..#####.##.####.#.##..####.###..##..#...#.##...#.###....####...####.
+.###.....###.#....######.#####..#..#..#.#.#..#..#.###.#........##.###...#...##..#..#...#.....#.###.#
+..###.##.#.#####.#..########..##..##.#..###.#.##.#....#.###........#....#...#.#...##.#.##..#..##.##.
+###.#.#.#...#..##....#.##....##.#######.#.##.#.##....#....###.#.#.....#.##..###..##..#..##..#.#..##.
+.#.##..#.##..##.##.##..#.###.#..##.###.#.###.##......##.#...##.##..##...##.#...##.#..#..#.##..#.##..
+####..####.###..#..#####...###.#....###.#...##........#.#...#..#.#.###..####.#.#.######...#..##.#.#.
+#...#..#.##..#.#.#.#.#...##.#.##..#...#.###.###.#....##.#..##.#.###..##....#.###.#.##..#..##....#...
+#.###.#.##.###.#..#...####.#....#..#.#####.#...#.###.##.##.###.###..#...#.#.####..###..........##.#.
+##.##.#.###.#.##.####...###.#.###..###...####..#####.###...#.##...###.##..#.####.#.##...#....##.#.##
+#....#..##.##.##......##...##.##..#####...#.##.###.##...##..##..###..#..#..#...###.##.#..#..#.#...##
+###.####.....#.#....####..#.##.........#....##.....#....##.#..##.##..####..###.####.#...##....##.##.
+#.......###.#..####.##..#..##...#....###...##.......##.....###.######.#..#..##..#....#.###.#..##.###
+#.###.##..##..##.##...#.........####..####..#..##...##.#..#..#######.###...#......#.##.####.#..##...
+#.####...##.#...#.#.###...##...#....#.##.##.####.#.#....###....#...#........##.##..#.#.####..#.#.#..
+.#..###.#..#.....##..#..#.###..###.#.##...#.#.....#...#....#.##.#..#.#...#..#.#..###..#.#...###.....
+.####....####....#.#.....#..#.#.##........#..#.####.##.##...#.#.####.#..#.##..##..#...#.#.##...#.#.#
+#####.#...####.#.####.#...#..#...#.#.##.#..#...##..#.#...##.###.##.#.###.###.#...#..#.###.##.##...#.
+#.#....#.###.##..##.##..##.#...#.###....###....###..#.####.###..#.#.##...#..####....#.####...###.#..
+.#...#.###.#.####..#.#####...##...#..##........#....#..#.#.##..##.##.#######.#.#.#.##.#.#.#.##..#...
+#....#....#.#.##.##.##..###..###.##..#.##.....###.###......#.#....#..#.##......#.###.#..#.#.#.#..###
+#####.#####.##...#.#..#..##.####.#......######..####..##.##.##.#.......#...####..#..###.#..##.#.#.#.
+#.##...##..##......###...#.#.##...#.#...#..##.###.#..#.##...#.#.#.##.###.##.#####....#...#.....##..#
+..##....##..#..##..##...#..#.##.####.##........###..##.##.#.#.##..#..###...#..#...##.#.##.########.#
+#...#.#####.###.#....#....#######.###..#..#.#..##..#.###.#.####.##.#..###..#....###.###....###.#..##
+.......###.#.#.#..#.#..###...#.##..#..#...#..#....#..#...#.#####.#...##.#.###.###.#..#.##.#..##.....
+....#.##...#.##.#.###..#####..#.######.###...###..##.#.#.##.###.##.####..#..#.....#.......#.######.#
+##..####......##...##.#..#..#..#..##.#.#..##..####.#.######.#...##..#..#.##.##..###..#..#.#..#..#...
+.##.#..#..##.#.##..#..#.#.#...##.##...##.#.########..##..#...#####.....#.#..###.#.##.##.###..#..#.##
+..##...#.#..#.#.##.###..#....#..###...#..##....##.#..######..###.#.#####..#.###.##.###..#####...####
+#.#..###.##.#...#..###..#.##.##...####.####.#.....##....###..#..#...####.####.###...#..#.#.#.#.##..#
+###..##...#.#..##..#...##..###.#.....#...##.###.#..###...###.####..###.#..#.#...##.....#............
+.#####..##...##....######...#..###.#.#......#...######.#..#...###.#...#..####.#......##..#..#.#...#.
+.#..####.#.#..###..#.#.##.####..#.#....#.####..##...#..#.#.#..###.........##.#.#####...###...#.#..#.
+.#.#....#..####..##..#########.#..#.##..###..#..#...###....##.....####...#..#.##....#######.####.##.
+##.#.####..#...#..#.##.#..#....##.####..####..###.#.#...#######.#.###..###.###..#.###.##...##.##..#.
+.#####.....##.#....##...##...#.#..####.##..#....##.###.#####.##.#.#.#...#...#.#.#.......##..##.##.#.
+.##..#.#.###.#.#.#....##.#...#....#...#...#..#######....##.#.#.#####.#.###..#..#...#......#..#.##..#
+...##.....#..#.####.###...#####.#.#....##.#.#.#.#...####.####.#..##.#.##.##.###..##...##.....#...###
+####.###..###.####..###.##..#.#####.#...##.#..#.#.##.####.#..####..#..##....####.#....#...#.####.#.#
+##....##.#.#.##.###..#####.##..##..#..##..##..#.#..###.##.#####...#..#.##.#.####.####..#...##..#..##
+#.#..###..##..#..#..####..#..#.#..#.##...###.#.#.#.#...####.#.#...####.##..#.#.#..#.##..##..##.#....
+##.#.####....##..##..####.#######..##....######.##.#....#..#...#.#..#.##.#...#.#.#.#.#..###....#.#.#
+.##.###..#.###..##...####.###.#.##.###.#...#..#......######.##.##.##.####.##.##....#.#......####.#.#
+#..###.####.#...#.###.###.#..##.###..#.#.#####..#.##.##.#.##.##..###.####...####..#..###...#.##.####
+#...............#.##.###...#..#..#.##.##.#.##.#.#...#.#....#..#.######..#..#..##....#.##..#..#..#.##
+###.###...#...#..#....##.......#.#..#...##...#....#..######..#.....##.####..#....#...##...######..##
+..##..#..##.#.##..###.#...............####...##..##......#...#.....#..#....#.#...#.....##..#####..##
+#.....##.#.##.###......###.#.##..###....###..#...#..###.#..#..##...#..#.##...#.#...#..#.....##...#.#
+..##....#..#.#.#.####..#.#.#....#.#.#.#.##.#..#.#..#..#.#.##.####......##..#...##..#.#.##..#.....#..
+.#..##....###.###..##....#####.#....####....#.#.##..#...#.###.##..#.....##........###.###.####..#.#.
+.###.##..#..#...#.#.#######.##.#.#.#.#.###.#.#.#.#......#####.###.#.#.#......#.#..#.#.##..#.##.#.#.#
diff --git a/src/adventofcode2021/solutions/data/day_20/test_data.txt b/src/adventofcode2021/solutions/data/day_20/test_data.txt
new file mode 100644
index 00000000..8fa4bd47
--- /dev/null
+++ b/src/adventofcode2021/solutions/data/day_20/test_data.txt
@@ -0,0 +1,7 @@
+..#.#..#####.#.#.#.###.##.....###.##.#..###.####..#####..#....#..#..##..###..######.###...####..#..#####..##..#.#####...##.#.#..#.##..#.#......#.###.######.###.####...#.##.##..#..#..#####.....#.#....###..#.##......#.....#..#..#..##..#...##.######.####.####.#.#...#.......#..#.#.#...####.##.#......#..#...##.#.##..#...##.#.##..###.#......#.#.......#.#.#.####.###.##...#.....####.#..#..#.##.#....##..#.####....##...##..#...#......#.#.......#.......##..####..#...#.#.#...##..#.#..###..#####........#..####......#..#
+
+#..#.
+#....
+##..#
+..#..
+..###
diff --git a/src/adventofcode2021/solutions/day20.py b/src/adventofcode2021/solutions/day20.py
new file mode 100644
index 00000000..c155d041
--- /dev/null
+++ b/src/adventofcode2021/solutions/day20.py
@@ -0,0 +1,115 @@
+from collections import defaultdict
+
+from adventofcode2021.utils.abstract import FileReaderSolution
+from adventofcode2021.utils.point import XYPoint as Point
+
+
+class Day20:
+    enhancement: str
+    image: defaultdict[Point, bool]
+    special_case: bool
+
+    def parse(self, input_data: str):
+        """Return the enhancement as a string with # or .
+        Return the image as a
+        """
+        self.enhancement, image = input_data.split("\n\n")
+        # If we are in the special case, the first and last values will be # and .
+        # This causes all the unset pixels to flip everytime.
+        self.special_case = self.enhancement[0] == "#" and self.enhancement[-1] == "."
+
+        self.image = defaultdict(lambda: False)
+        for x, line in enumerate(image.splitlines()):
+            for y, point in enumerate(line):
+                self.image[Point(x, y)] = True if point == "#" else False
+
+    @staticmethod
+    def get_pixels(point: Point) -> list[Point]:
+        """For a pixel, get the list of pixels we need to consider"""
+        direction = (-1, 0, 1)
+        points = [Point(point.x + x, point.y + y) for x in direction for y in direction]
+        return points
+
+    def points_to_index(self, points: list[Point]) -> int:
+        """Convert a list of points to index of the enhancement"""
+        bin_str = "".join(["1" if self.image[pnt] else "0" for pnt in points])
+        idx = int(bin_str, 2)
+        return idx
+
+    def points_to_pixel(self, points: list[Point]) -> bool:
+        idx = self.points_to_index(points)
+        return self.enhancement[idx] == "#"
+
+    def get_new_value(self, point) -> bool:
+        """Get a new value for a certain point"""
+        points = self.get_pixels(point)
+        value = self.points_to_pixel(points)
+        return value
+
+    def loop(self, loops: int):
+        """Loop `loops` times over the image"""
+        for n in range(loops):
+            self.compute(n)
+
+    @staticmethod
+    def min_max_values(image: defaultdict[Point, bool]) -> tuple[int, int, int, int]:
+        """Return max_x, min_x, max_y, min_y for image"""
+        true_values = [pnt for pnt, value in image.items() if value]
+        max_x = max(pnt.x for pnt in true_values)
+        min_x = min(pnt.x for pnt in true_values)
+        max_y = max(pnt.y for pnt in true_values)
+        min_y = min(pnt.y for pnt in true_values)
+        return max_x, min_x, max_y, min_y
+
+    def __repr__(self):  # pragma: nocover
+        return self.print_image(self.image)
+
+    def print_image(self, image):  # pragma: nocover
+        max_x, min_x, max_y, min_y = self.min_max_values(image)
+        lines = []
+        for x in range(min_x, max_x + 1):
+            line = []
+            for y in range(min_y, max_y + 1):
+                line.append("#" if image[Point(x, y)] else ".")
+            lines.append("".join(line))
+        return "\n".join(lines)
+
+    def compute(self, n):
+        max_x, min_x, max_y, min_y = self.min_max_values(self.image)
+
+        # If we're in the special case, with the test answer, flip the default
+        # True/False, on or off. This will make sure that we compute the points as
+        # if they are on.
+        if self.special_case and n % 2 == 0:
+            default_value = True
+        else:
+            default_value = False
+
+        new_image: defaultdict[Point, bool] = defaultdict(lambda: default_value)
+
+        for x in range(min_x - 10, max_x + 10):
+            for y in range(min_y - 10, max_y + 10):
+                pnt = Point(x, y)
+                new_value = self.get_new_value(pnt)
+                new_image[pnt] = new_value
+
+        self.image = new_image
+
+    def count_pixels(self) -> int:
+        return sum(self.image.values())
+
+
+class Day20PartA(Day20, FileReaderSolution):
+    def solve(self, input_data: str) -> int:
+        self.parse(input_data)
+        self.loop(2)
+        pixels = self.count_pixels()
+        return pixels
+
+
+class Day20PartB(Day20, FileReaderSolution):
+    def solve(self, input_data: str) -> int:
+        self.parse(input_data)
+        self.loop(50)
+        pixels = self.count_pixels()
+        return pixels
diff --git a/src/adventofcode2021/solutions/day21.py b/src/adventofcode2021/solutions/day21.py
index fd535410..240c2434 100644
--- a/src/adventofcode2021/solutions/day21.py
+++ b/src/adventofcode2021/solutions/day21.py
@@ -21,7 +21,7 @@ def run_loops(self, location_1: int, location_2: int) -> int:
         dice = self.dice()
         player_1 = True
         for n in itertools.count(start=1):
-            throw = sum([next(dice) for n in range(3)])
+            throw = sum([next(dice) for _ in range(3)])
             if player_1:
                 location_1 = self.modulo(location_1 + throw)
                 score_1 += location_1
diff --git a/tests/solutions/test_day20_a.py b/tests/solutions/test_day20_a.py
new file mode 100644
index 00000000..93b62959
--- /dev/null
+++ b/tests/solutions/test_day20_a.py
@@ -0,0 +1,69 @@
+import pathlib
+
+from adventofcode2021.solutions.day20 import Day20PartA
+from adventofcode2021.utils.point import XYPoint as Point
+
+
+class TestDay20PartA:
+    @staticmethod
+    def load_testdata():
+        test_path = (
+            pathlib.Path(__file__).parent.parent.parent
+            / "src"
+            / "adventofcode2021"
+            / "solutions"
+            / "data"
+            / "day_20"
+            / "test_data.txt"
+        )
+        with open(test_path) as f:
+            test_data = f.read()
+        return test_data
+
+    def test_parsing(self):
+        data = self.load_testdata()
+        solution = Day20PartA()
+        solution.parse(data)
+
+        assert len(solution.enhancement) == 512
+
+        assert solution.image[Point(0, 0)] is True
+        assert solution.image[Point(1, 0)] is True
+        assert solution.image[Point(0, 1)] is False
+
+    def test_points(self):
+        solution = Day20PartA()
+        solution.parse(self.load_testdata())
+        assert not solution.special_case
+        points = solution.get_pixels(Point(5, 10))
+        assert len(points) == 9
+        assert points == [
+            Point(4, 9),
+            Point(4, 10),
+            Point(4, 11),
+            Point(5, 9),
+            Point(5, 10),
+            Point(5, 11),
+            Point(6, 9),
+            Point(6, 10),
+            Point(6, 11),
+        ]
+
+        # For the example, we need other points:
+        points = solution.get_pixels(Point(2, 2))
+        idx = solution.points_to_index(points)
+        assert idx == 34
+        assert solution.points_to_pixel(points) is True
+
+    def test_day20a_solve(self):
+        solution = Day20PartA()
+        result = solution.solve(self.load_testdata())
+        assert result == 35
+
+    def test_day20a_data(self):
+        """Result we got when we did the real solution"""
+        solution = Day20PartA()
+        res = solution("day_20/day20.txt")
+        assert solution.special_case
+        assert res != 9113
+        assert res == 4968
diff --git a/tests/solutions/test_day20_b.py b/tests/solutions/test_day20_b.py
new file mode 100644
index 00000000..53162232
--- /dev/null
+++ b/tests/solutions/test_day20_b.py
@@ -0,0 +1,31 @@
+import pathlib
+
+from adventofcode2021.solutions.day20 import Day20PartB
+
+
+class TestDay20PartB:
+    @staticmethod
+    def load_testdata():
+        test_path = (
+            pathlib.Path(__file__).parent.parent.parent
+            / "src"
+            / "adventofcode2021"
+            / "solutions"
+            / "data"
+            / "day_20"
+            / "test_data.txt"
+        )
+        with open(test_path) as f:
+            test_data = f.read()
+        return test_data
+
+    def test_day20b_solve(self):
+        solution = Day20PartB()
+        result = solution.solve(self.load_testdata())
+        assert result == 3351
+
+    def test_day20b_data(self):
+        """Result we got when we did the real solution"""
+        solution = Day20PartB()
+        res = solution("day_20/day20.txt")
+        assert res == 16793

From f32ad63b7c4450111a4018d075135a0d8dc9cb1c Mon Sep 17 00:00:00 2001
From: Roel Adriaans <roel@adriaans.org>
Date: Tue, 29 Nov 2022 12:07:33 +0100
Subject: [PATCH 178/371] Feature/day 22 (#89)

* Day 22, part a. Bruteforce works still fine for this solution.

Part b not so much

* [WIP] Day 22, part b

* Implement day 22, part b

Co-authored-by: Roel Adriaans <roel.adriaans@asml.com>
---
 .../solutions/data/day_22/day22.txt           | 420 ++++++++++++++++++
 src/adventofcode2021/solutions/day22.py       | 176 ++++++++
 tests/solutions/test_day22_a.py               |  81 ++++
 tests/solutions/test_day22_b.py               |  93 ++++
 4 files changed, 770 insertions(+)
 create mode 100644 src/adventofcode2021/solutions/data/day_22/day22.txt
 create mode 100644 src/adventofcode2021/solutions/day22.py
 create mode 100644 tests/solutions/test_day22_a.py
 create mode 100644 tests/solutions/test_day22_b.py

diff --git a/src/adventofcode2021/solutions/data/day_22/day22.txt b/src/adventofcode2021/solutions/data/day_22/day22.txt
new file mode 100644
index 00000000..6dbb841a
--- /dev/null
+++ b/src/adventofcode2021/solutions/data/day_22/day22.txt
@@ -0,0 +1,420 @@
+on x=-36..10,y=-44..1,z=-18..28
+on x=-7..46,y=-3..48,z=-32..13
+on x=-11..41,y=-24..30,z=-20..31
+on x=-20..30,y=-47..-2,z=-27..21
+on x=-11..36,y=-22..32,z=-9..44
+on x=-48..5,y=-40..9,z=-49..3
+on x=-23..21,y=-15..33,z=-27..24
+on x=-44..7,y=-18..28,z=-28..20
+on x=-4..48,y=-30..15,z=-5..40
+on x=-25..28,y=-6..45,z=-12..37
+off x=-1..15,y=-20..-7,z=40..49
+on x=-9..35,y=-49..3,z=-14..39
+off x=-42..-30,y=-3..13,z=-31..-21
+on x=-10..35,y=-35..17,z=-16..31
+off x=13..32,y=21..34,z=31..41
+on x=-45..8,y=-14..35,z=-38..8
+off x=-7..12,y=-38..-21,z=3..22
+on x=2..48,y=-35..13,z=-26..18
+off x=-2..13,y=-45..-34,z=21..31
+on x=-10..38,y=-25..29,z=-7..39
+on x=-28883..-15508,y=-45719..-19250,z=56543..85023
+on x=-12548..-2670,y=30162..59686,z=48743..65546
+on x=-78921..-48935,y=-58375..-40461,z=-10520..6680
+on x=60459..69694,y=-39118..-9610,z=23410..40752
+on x=-58993..-46464,y=34788..49715,z=24225..58919
+on x=-65933..-59172,y=-59855..-28101,z=15518..30376
+on x=71139..80625,y=2500..13619,z=2217..25098
+on x=4121..18569,y=-18050..2029,z=60597..88243
+on x=-62229..-28636,y=-71733..-45733,z=27808..50457
+on x=51593..76990,y=38902..45907,z=-369..26292
+on x=68985..96599,y=-17288..2120,z=-22861..271
+on x=33104..64386,y=29057..55665,z=40253..58523
+on x=-81466..-54567,y=8733..27282,z=-41215..-36144
+on x=-34804..-15638,y=58589..76038,z=-7633..20193
+on x=63492..75206,y=-46967..-27894,z=-31857..-14808
+on x=15351..28152,y=13194..20955,z=70126..86947
+on x=15635..22669,y=5152..32704,z=73208..87128
+on x=68794..83406,y=-35783..-25729,z=-34499..611
+on x=-56069..-53663,y=-54346..-28657,z=-34834..-22216
+on x=43156..76066,y=27637..45059,z=-47820..-23733
+on x=-7711..3045,y=-15369..-10641,z=-79312..-63232
+on x=43441..54152,y=-50110..-43904,z=37321..47410
+on x=37294..75033,y=38364..67854,z=-20476..1157
+on x=33388..53211,y=-67459..-48539,z=-10662..13639
+on x=-79542..-57726,y=22115..25011,z=-45772..-23453
+on x=58873..78039,y=-50697..-37524,z=-12235..18506
+on x=-48962..-34784,y=11652..37386,z=45532..84431
+on x=-76170..-57572,y=46417..54598,z=15783..30309
+on x=-15755..6100,y=-61498..-53921,z=50597..61974
+on x=-6806..20000,y=-23020..12532,z=70539..85001
+on x=-5720..16234,y=-55004..-34338,z=-72531..-66790
+on x=52008..79539,y=-29253..-1374,z=20347..53617
+on x=-17897..-9708,y=-37245..-4510,z=-87664..-60248
+on x=-61794..-42398,y=38848..66317,z=-44362..-16971
+on x=-24978..-4568,y=52963..66034,z=43492..60015
+on x=7791..33094,y=56170..69087,z=33048..42256
+on x=-28232..-9944,y=-58134..-55076,z=39582..72486
+on x=13368..20524,y=-15360..9002,z=-91847..-66065
+on x=21517..29129,y=8445..19558,z=-86160..-74234
+on x=7605..17401,y=-27480..-3051,z=66012..93068
+on x=48250..69867,y=-31582..-11779,z=-56446..-41985
+on x=30111..42304,y=-78761..-42351,z=37002..41561
+on x=-36891..-9404,y=-86518..-61745,z=26166..39934
+on x=-63590..-34919,y=15132..31704,z=-63932..-48407
+on x=-77664..-60473,y=-30186..-15049,z=-49261..-26017
+on x=-10394..7444,y=9391..11534,z=61309..96960
+on x=-61302..-46820,y=-61513..-47545,z=6430..32125
+on x=-53453..-50770,y=24345..56020,z=-57501..-25958
+on x=35507..53900,y=-45542..-16679,z=47346..57922
+on x=49907..69107,y=16930..38051,z=-55262..-38287
+on x=-42743..-9759,y=60466..91647,z=-15118..2553
+on x=-38266..-19863,y=55550..63311,z=-53318..-27055
+on x=16905..41490,y=-69890..-56924,z=-44140..-8205
+on x=-7784..7941,y=75866..85826,z=9452..37078
+on x=-74561..-58611,y=-46579..-25328,z=-30557..3529
+on x=-1196..34343,y=-70013..-55588,z=-53911..-45594
+on x=-84676..-65369,y=41869..61576,z=-9248..2231
+on x=-72551..-47185,y=-9381..6167,z=37047..52656
+on x=-11907..5784,y=4948..19640,z=73120..80649
+on x=60584..84455,y=-24861..-3368,z=-48749..-21563
+on x=29668..44628,y=57549..74598,z=-32991..-15066
+on x=-8097..12767,y=-95426..-64216,z=-31088..-18926
+on x=-90928..-65347,y=4057..22029,z=8907..23501
+on x=67918..80236,y=5507..41836,z=15812..32291
+on x=-54150..-29579,y=-5372..22568,z=47613..65289
+on x=17728..44669,y=-74646..-42398,z=-65777..-28928
+on x=2093..29295,y=2422..21121,z=-80503..-62049
+on x=-65522..-55148,y=46700..59432,z=-9362..25101
+on x=-7488..12850,y=-63622..-27400,z=-76767..-56877
+on x=60992..81192,y=-11975..19873,z=-3571..8236
+on x=44146..78572,y=-9134..16963,z=-66784..-33238
+on x=-67138..-46342,y=14132..43100,z=30402..56588
+on x=-70324..-52042,y=-31051..-13658,z=-47636..-26736
+on x=21928..31761,y=-73324..-55278,z=28922..52429
+on x=-4143..594,y=-42034..-14668,z=-84348..-68488
+on x=-77510..-53349,y=-32972..-14462,z=-35462..-12815
+on x=-70793..-40538,y=39761..54365,z=11991..30477
+on x=-71944..-51391,y=37600..68072,z=-32488..-15952
+on x=-48143..-30165,y=59536..78681,z=-32203..-16092
+on x=-22818..-7935,y=24969..33664,z=60669..81438
+on x=40670..63322,y=-72933..-51831,z=-30393..-10006
+on x=-70534..-53025,y=-16537..2105,z=32890..66787
+on x=47454..79394,y=-35253..-20693,z=18988..57611
+on x=73161..82246,y=-8780..22720,z=-8294..13514
+on x=-14026..7081,y=18421..45722,z=65918..73183
+on x=71629..83673,y=-10335..8808,z=29998..38745
+on x=-18224..-5442,y=69881..95741,z=6388..30178
+on x=-19490..4842,y=20201..45030,z=56709..85888
+on x=-21272..1593,y=49547..63167,z=38145..67363
+on x=-24949..-15012,y=-55330..-20572,z=-82713..-59674
+on x=-46843..-24448,y=50679..73327,z=10520..44286
+on x=-70925..-39700,y=24871..27793,z=44234..49938
+on x=-69305..-53956,y=-59578..-31239,z=-25502..-7568
+on x=7557..28629,y=-88776..-75206,z=-7437..10667
+on x=29471..53359,y=68936..73945,z=-4133..20290
+on x=-52402..-36243,y=19080..37365,z=50135..59326
+on x=3810..25116,y=69407..81609,z=9528..20530
+on x=18211..49212,y=44337..71877,z=49052..60986
+on x=28678..50797,y=-32839..-20421,z=48041..67561
+on x=-58157..-42217,y=-31760..-17143,z=-62357..-53538
+on x=38952..50290,y=-6367..203,z=50379..82544
+on x=-64714..-50678,y=-61423..-47693,z=8332..35457
+on x=-28002..-6142,y=-56131..-47383,z=-63420..-52948
+on x=-63668..-38918,y=-65020..-36544,z=11622..50689
+on x=2203..24329,y=-61091..-52282,z=-76789..-51275
+on x=56581..84220,y=29670..43186,z=-37910..-9928
+on x=-3024..19466,y=54892..76361,z=-46362..-26851
+on x=-76700..-44506,y=-13884..9365,z=-64510..-49973
+on x=-98589..-75961,y=-6842..5373,z=11405..14256
+on x=65044..94963,y=3807..18057,z=-27060..-1035
+on x=61066..70500,y=-44968..-27340,z=-21797..5949
+on x=52464..65749,y=-40619..-28476,z=-37598..-15955
+on x=-49101..-23335,y=51397..82890,z=-45440..-19364
+on x=-20109..-2856,y=-30361..-20065,z=62578..78115
+on x=-74043..-52114,y=-39430..-25290,z=16802..43618
+on x=66008..75716,y=-23679..8708,z=-50980..-18608
+on x=-86101..-58392,y=-18786..15377,z=17168..41798
+on x=-55661..-31358,y=-71798..-47063,z=18694..36502
+on x=62286..80814,y=-48258..-23908,z=-30461..-15403
+on x=33889..57622,y=13502..43857,z=-77450..-62147
+on x=13184..26706,y=64762..81475,z=19767..24962
+on x=17019..43275,y=-16424..-4301,z=70607..85745
+on x=-53965..-36029,y=-68815..-48815,z=-7800..9952
+on x=18884..42169,y=60155..75959,z=12031..18073
+on x=-588..28626,y=16567..43074,z=-79903..-63075
+on x=-76497..-54641,y=-46269..-25830,z=-17322..15993
+on x=-6746..10944,y=62505..90487,z=-15775..16197
+on x=28300..46689,y=68064..75699,z=-7771..9898
+on x=-64368..-42702,y=-27174..-17167,z=-65200..-54350
+on x=56910..75581,y=-25585..-10411,z=36135..70404
+on x=27504..56469,y=26502..50082,z=52431..67864
+on x=-47454..-37493,y=-67803..-57848,z=-29137..878
+on x=40122..63672,y=10395..35054,z=52859..66240
+on x=-24265..-4217,y=67213..89517,z=9977..26874
+on x=50270..58887,y=-41794..-23584,z=40880..59729
+on x=68731..78696,y=-29443..-10975,z=-30363..-12403
+on x=-615..6005,y=-84686..-66275,z=-50736..-37214
+on x=8778..42467,y=-13464..-446,z=69383..77050
+on x=33082..59847,y=-40174..-16924,z=-63761..-39798
+on x=-53945..-40416,y=37398..54780,z=28513..47277
+on x=29636..49940,y=-34924..-2346,z=49599..74490
+on x=-20966..1270,y=53988..61813,z=32916..53496
+on x=-78940..-45838,y=-26622..2631,z=38955..63550
+on x=17146..39670,y=-85003..-58477,z=2984..42382
+on x=-47551..-28981,y=-69198..-57064,z=-44298..-22310
+on x=-89258..-74497,y=-16850..5067,z=-12367..-5955
+on x=35772..53724,y=27657..48119,z=31033..63316
+on x=-62854..-41757,y=35022..54608,z=-35013..-12195
+on x=-30556..1226,y=-73571..-54097,z=-57803..-47669
+on x=13295..34276,y=-39163..-28171,z=-76250..-46210
+on x=-24292..6457,y=-91190..-66574,z=-31565..-5150
+on x=-16536..6036,y=-96225..-64362,z=-2492..9962
+on x=-57058..-30220,y=-18364..-2584,z=53719..63761
+on x=-43431..-16673,y=-38683..-22112,z=55769..74887
+on x=51701..67855,y=27295..46226,z=10849..38820
+on x=-35845..-7342,y=69450..89187,z=11752..29177
+on x=12543..45244,y=12075..38035,z=-87164..-50531
+on x=42339..73473,y=18241..51391,z=23838..43287
+on x=-438..24585,y=-66283..-35680,z=-64361..-46114
+on x=2725..22019,y=-82057..-72900,z=-1614..14652
+on x=14414..28316,y=-89722..-59311,z=9219..41520
+on x=-30825..-5463,y=-69878..-54745,z=-57852..-36139
+on x=-42896..-18813,y=-26684..7083,z=69312..90303
+on x=-27862..8215,y=27378..63022,z=-78357..-58765
+on x=52982..82324,y=-39425..-17991,z=19533..52779
+on x=55425..68878,y=-13141..10398,z=46593..62864
+on x=-76576..-55809,y=-40969..-19894,z=3576..33104
+on x=-45307..-29762,y=35548..70551,z=-52791..-40213
+on x=-84553..-64887,y=31408..56688,z=-11919..-300
+on x=57673..92102,y=20171..35124,z=-9934..27320
+on x=19319..44889,y=59566..70621,z=-52354..-34667
+on x=-58420..-23963,y=33856..56920,z=-66732..-50674
+on x=28594..47830,y=15367..45508,z=58553..69000
+on x=28763..35947,y=27403..56374,z=56409..73208
+on x=-74680..-63533,y=-38056..-6996,z=-33003..-18382
+on x=-38982..-10495,y=51354..78493,z=14740..42196
+on x=-46516..-10037,y=58846..77938,z=-33954..-19867
+on x=-54547..-39672,y=56254..74136,z=23189..29880
+on x=-61220..-53773,y=-12236..3866,z=56997..61730
+on x=-50154..-29903,y=-76428..-48553,z=31157..51784
+on x=-3181..17338,y=-80949..-72492,z=772..12702
+on x=-52042..-18254,y=49025..64175,z=21945..52993
+on x=-78058..-63586,y=-2293..19310,z=-36720..-25831
+on x=15904..36582,y=-91457..-60504,z=7939..32474
+on x=60022..93528,y=8546..20580,z=-27953..-11390
+on x=27563..49707,y=-69314..-63488,z=7268..35058
+on x=10646..21929,y=-94609..-61003,z=-22912..-276
+on x=-7047..-5297,y=68888..78769,z=-39475..-17434
+on x=-51536..-39822,y=43126..53870,z=-56736..-20372
+on x=-63164..-52556,y=-54428..-38069,z=24521..42713
+on x=-9022..12417,y=-80149..-46957,z=37357..45570
+on x=-22997..-2789,y=-95315..-56998,z=12379..39404
+on x=4898..15841,y=-81249..-73910,z=-32251..-9796
+on x=45502..60898,y=-37324..-31476,z=-54682..-27792
+on x=-37888..-21927,y=50938..67533,z=28289..58560
+on x=48655..63250,y=-26438..8352,z=56367..77784
+on x=-70807..-50021,y=-53252..-46314,z=-24297..4509
+on x=-80873..-68066,y=-11712..4769,z=-38161..-7193
+on x=-61783..-29833,y=-9380..1417,z=-77655..-50187
+on x=3605..15598,y=40600..75869,z=49206..60071
+on x=-65903..-61409,y=-47405..-24492,z=21618..49883
+off x=-23920..-8406,y=-17972..2067,z=-81283..-75868
+on x=-51193..-26274,y=-60490..-42301,z=38488..65879
+on x=50827..65635,y=-57757..-39886,z=-30611..-26720
+off x=10778..32144,y=52231..74635,z=-59687..-31847
+on x=68985..85992,y=28873..51019,z=-15998..-6295
+on x=55740..70763,y=35214..53322,z=-31223..-11358
+off x=-46538..-9788,y=58032..67324,z=40222..49034
+on x=18545..29590,y=14108..34635,z=-74700..-62707
+off x=-73624..-41200,y=-52536..-46813,z=14770..34179
+on x=-85523..-67379,y=-36300..-19906,z=-11338..6871
+on x=5293..28679,y=-85681..-52644,z=28833..41645
+off x=-51969..-35153,y=1198..17984,z=51124..72722
+off x=-17375..11682,y=18325..41509,z=-87033..-61425
+off x=-22666..7568,y=73727..92674,z=-28360..-7249
+off x=2661..24254,y=57090..84315,z=-42803..-25128
+on x=67178..86929,y=-41603..-21134,z=-346..8549
+on x=35402..59738,y=27059..52875,z=40124..50352
+on x=-77706..-63549,y=-759..30679,z=-256..20062
+off x=-80738..-61445,y=-13769..19667,z=19760..24546
+on x=-69653..-38658,y=22405..42680,z=-49778..-26262
+off x=-51542..-25536,y=-71500..-51185,z=4129..28507
+on x=30425..45199,y=-30596..-9292,z=-81014..-57309
+off x=22726..47883,y=-41245..-17684,z=-71414..-46137
+on x=66872..87978,y=-22706..13112,z=-43536..-20972
+off x=72640..92993,y=7096..22204,z=-21297..-19581
+off x=21559..34912,y=-13473..3913,z=-90125..-71617
+on x=744..7099,y=37714..55130,z=-78023..-47590
+off x=34748..53357,y=35764..63887,z=19808..38379
+on x=25985..47421,y=38665..52801,z=36388..65665
+on x=55491..76208,y=38300..48792,z=4819..32069
+off x=-85210..-68567,y=27276..41154,z=-8241..7567
+on x=63368..77016,y=14285..35196,z=17323..34006
+off x=-60020..-46013,y=-73070..-54235,z=22512..40151
+on x=-64581..-46760,y=-65678..-38839,z=-11746..21206
+off x=65614..85707,y=-40016..-9936,z=9078..15465
+on x=-9441..19579,y=-3745..15148,z=63724..88861
+on x=26670..47587,y=44470..53665,z=-63802..-36681
+off x=52461..72456,y=-41431..-31911,z=-53314..-36616
+on x=-60681..-44210,y=-60182..-40629,z=-24793..-16265
+on x=-31104..2318,y=-86070..-52791,z=28552..42162
+off x=56152..74985,y=-56214..-43026,z=-27304..2627
+off x=-58202..-26230,y=-45050..-25862,z=55000..65772
+off x=-59248..-38705,y=-33544..-18000,z=-57812..-36852
+off x=-40613..-22939,y=39403..42071,z=-74302..-53828
+on x=58073..86025,y=19542..52637,z=19540..25772
+on x=-42291..-19252,y=-80500..-52486,z=720..19957
+off x=10093..18140,y=62563..85515,z=28642..49390
+off x=-64723..-55102,y=15882..40874,z=27744..48116
+on x=-76209..-64298,y=-23310..-3022,z=-44907..-32933
+off x=-4161..22460,y=-26759..-12671,z=59101..80357
+on x=-69122..-56614,y=-57446..-26219,z=30581..49966
+off x=-61329..-48995,y=45179..68334,z=-44523..-16756
+off x=-24020..7983,y=-36028..-14601,z=-80855..-74658
+off x=61787..80253,y=-29352..-27483,z=-15894..3760
+on x=-1854..34165,y=15342..20798,z=-92676..-69474
+off x=58756..72759,y=-62605..-44134,z=-21424..-1787
+on x=-47927..-19270,y=-27779..-11020,z=-71061..-55792
+off x=-64633..-41666,y=-15311..4190,z=52613..67692
+off x=-52623..-22282,y=-67672..-60890,z=-41105..-5342
+on x=-67475..-41123,y=-29899..-11967,z=54507..64513
+off x=76435..88917,y=8907..20588,z=-13737..11171
+off x=51043..69285,y=46979..54200,z=-37046..-15549
+off x=-4759..21371,y=-30523..-17915,z=-85776..-63473
+on x=-3021..6979,y=-81245..-51685,z=31497..53887
+on x=-42289..-13283,y=-92861..-62635,z=-18257..-6390
+on x=-51969..-28706,y=44357..69139,z=-39332..-9477
+off x=-33356..-13804,y=36523..58443,z=50012..60983
+on x=-77633..-57968,y=-19312..-3510,z=6439..28195
+on x=-18502..12035,y=81..13762,z=-84168..-60344
+on x=-74341..-54080,y=35210..49882,z=28945..49835
+on x=-38013..-25461,y=-18541..7865,z=-77418..-60933
+on x=59594..82825,y=-28804..-8293,z=-10951..20475
+off x=-52646..-29322,y=-40881..-10533,z=-78124..-55227
+off x=-15749..8718,y=4472..14637,z=-91734..-64978
+off x=-85443..-73836,y=12784..39748,z=-16386..772
+on x=45947..61764,y=-35058..-17779,z=-64178..-45494
+off x=67007..86564,y=-48178..-21841,z=-7916..21903
+off x=-70444..-42983,y=29771..42787,z=-46211..-27338
+off x=-8655..2415,y=-91243..-75694,z=-10069..21248
+on x=-28009..-6226,y=-23740..-9157,z=-91944..-63046
+on x=-53152..-30990,y=-44975..-30727,z=52775..71982
+on x=-49716..-41146,y=-73921..-57473,z=11332..24465
+off x=-2468..25267,y=14929..32548,z=67505..84462
+on x=-68710..-62616,y=28813..52525,z=-10067..25405
+on x=-83946..-68639,y=-19770..10504,z=-33827..-25268
+off x=28131..44635,y=-50172..-27160,z=-62100..-58549
+off x=-5052..-648,y=-56625..-47094,z=-74342..-45910
+on x=-33892..-13031,y=18611..36918,z=-92168..-71425
+on x=12323..33021,y=-80108..-64718,z=-10537..4349
+on x=-65196..-43458,y=49295..56256,z=24974..37959
+off x=2343..28904,y=-66431..-45886,z=40141..44839
+off x=-43465..-41019,y=17236..49935,z=-74235..-53337
+off x=-18022..-9342,y=61778..91679,z=-11289..2632
+off x=27708..51714,y=32957..50756,z=-58390..-57621
+on x=2882..33961,y=57329..91039,z=-28800..8934
+on x=-28292..-11351,y=-12966..17150,z=59094..83553
+on x=-31558..-13040,y=-59193..-40820,z=48349..64602
+off x=-70755..-50969,y=-29136..-18641,z=-49761..-40422
+on x=19772..43254,y=-70111..-52042,z=29212..49446
+on x=20916..52515,y=-18713..-9635,z=-86771..-70085
+off x=-66621..-56476,y=33941..67405,z=-29611..-13697
+on x=-16965..3932,y=4803..22490,z=-82564..-77111
+on x=68709..71323,y=7232..38254,z=-30840..-18351
+off x=5053..18207,y=-90431..-74952,z=18441..31217
+off x=-74398..-51344,y=-2219..21971,z=-61004..-37925
+off x=74068..94286,y=-42547..-9453,z=-26993..4323
+off x=41826..54877,y=-63131..-48823,z=-42712..-13977
+off x=13230..36879,y=32795..49062,z=45626..77570
+off x=23178..54380,y=41412..62986,z=-66089..-51283
+off x=-52700..-47103,y=46951..63017,z=-23336..-3928
+on x=55437..83769,y=14588..38653,z=-53752..-37763
+on x=52203..65253,y=-47076..-16647,z=-44344..-39083
+on x=-24677..-13564,y=-93290..-68207,z=-5248..30373
+on x=58276..75450,y=15533..26129,z=36700..50632
+on x=33595..45488,y=-46844..-26635,z=46199..78178
+off x=55930..57540,y=-5693..10566,z=48756..60854
+off x=-43978..-26866,y=27173..53069,z=52366..76519
+off x=12681..30594,y=-86555..-56687,z=-1032..21854
+off x=6723..32769,y=-11041..11447,z=-81198..-62638
+on x=9134..15625,y=2017..27628,z=60348..76873
+off x=-67518..-40657,y=51003..78100,z=-26418..-11016
+off x=21010..26746,y=7821..43523,z=-88644..-58412
+off x=-19309..1323,y=63051..88447,z=-37925..-14723
+off x=-48511..-16244,y=56142..80658,z=-41680..-13036
+off x=13205..26460,y=-1684..20312,z=74227..85935
+on x=-49930..-24221,y=-54440..-30185,z=51665..80505
+on x=33932..55567,y=63494..66224,z=-10823..17738
+off x=-72574..-60303,y=-40445..-32434,z=14706..50012
+off x=-62145..-40946,y=-20722..-11341,z=-69258..-49860
+on x=-6554..15879,y=-66512..-52368,z=-71414..-48612
+on x=-60210..-31346,y=-68773..-53452,z=-45457..-19495
+off x=-22760..15679,y=64480..84538,z=4557..24345
+off x=40880..60578,y=-77805..-51810,z=-11706..22124
+off x=54298..63931,y=-50276..-24575,z=-36735..-19199
+off x=-2702..16842,y=-68238..-54782,z=51640..59991
+off x=-17862..105,y=-70163..-52096,z=-48967..-37649
+on x=-23272..-8212,y=10790..16944,z=75341..78080
+off x=48941..60207,y=-58116..-34953,z=-181..16162
+off x=5924..29813,y=-83457..-61519,z=23528..43432
+off x=-32079..-4914,y=42932..60356,z=-60990..-43336
+on x=-4510..5766,y=-7403..18802,z=64415..93546
+off x=26759..39620,y=48484..70752,z=-40115..-22503
+on x=-31250..-18094,y=-66695..-60649,z=36011..46860
+off x=-6978..17301,y=-82714..-67715,z=-35229..-13936
+on x=47265..63370,y=30543..57312,z=-46051..-16607
+on x=-14629..-7679,y=7650..29132,z=65592..94972
+on x=-66456..-38183,y=-52095..-46968,z=23915..46975
+off x=17676..42736,y=20462..26192,z=-81379..-67528
+off x=-67513..-46555,y=-24343..-99,z=-60193..-24652
+off x=-54467..-29572,y=-21268..-454,z=-66862..-49810
+off x=-19627..11711,y=-4455..22317,z=-83580..-68034
+on x=-38582..-13323,y=-58703..-34875,z=40913..79387
+on x=19178..32973,y=-59328..-56472,z=-68131..-40152
+off x=-45576..-23539,y=26133..50542,z=53177..62216
+off x=-77778..-52243,y=-48364..-42612,z=11905..32815
+on x=-79500..-68229,y=30167..46383,z=-6940..2452
+on x=31596..49128,y=598..18219,z=-81334..-54801
+off x=-81143..-68496,y=-16944..5539,z=-24074..-1450
+on x=-65649..-54882,y=-38296..-2979,z=29377..53941
+on x=6682..17340,y=-7921..-151,z=59077..85403
+off x=57914..76253,y=-4380..31345,z=-46399..-38698
+on x=32232..45129,y=-63185..-26040,z=36983..65363
+off x=-73881..-60419,y=-1795..21,z=37655..53767
+off x=15120..32138,y=63066..68156,z=16751..50217
+off x=23124..35098,y=36183..54646,z=47845..65258
+on x=51869..75912,y=6923..45250,z=-32268..-21057
+off x=49292..70804,y=-36314..-9052,z=-43544..-23519
+on x=21711..48338,y=2359..36023,z=60816..80004
+on x=-53507..-26657,y=-25557..-8931,z=-69305..-62052
+off x=60112..97989,y=-944..17784,z=-13750..15620
+on x=-28375..-10818,y=-52043..-34064,z=-65489..-55145
+on x=-58165..-43070,y=-12854..8136,z=-72321..-48657
+off x=51577..74648,y=-47469..-30666,z=8713..27929
+off x=-44464..-19855,y=-1741..22412,z=-79221..-59565
+off x=-89466..-59198,y=26732..49125,z=-11133..14327
+on x=53250..69420,y=44980..62695,z=4186..26328
+off x=26415..41630,y=-39332..-16373,z=-67936..-61161
+off x=-48619..-43433,y=-67120..-39586,z=28870..57974
+on x=17598..33705,y=30681..37573,z=43332..75560
+on x=-25540..-21306,y=-17465..4532,z=-91226..-71533
+off x=47293..62013,y=-25617..-8386,z=35935..50569
+off x=-49057..-28405,y=41861..63380,z=-51878..-39569
+off x=-5394..11201,y=39779..75186,z=-67429..-37636
+on x=-51758..-18083,y=-43700..-16277,z=44231..68503
+on x=-18052..11201,y=77165..95962,z=-18606..1615
+on x=-9094..15499,y=15118..29503,z=-88833..-67237
+on x=66146..81534,y=20925..38637,z=-16229..3378
+on x=-2669..13134,y=-80079..-65621,z=19565..43795
+on x=-71806..-67382,y=21162..50405,z=-6138..23589
+off x=19123..48071,y=-56188..-37077,z=48894..63329
+off x=-47660..-36230,y=40998..63389,z=-55710..-23610
+on x=-38780..-32773,y=62994..69808,z=32158..51582
+off x=63417..87982,y=-12566..21930,z=-30645..-20624
+on x=16242..53065,y=45895..74140,z=-57938..-26423
+on x=31963..45067,y=-36330..-22881,z=45365..68062
+on x=11053..33024,y=51385..80679,z=-47716..-39036
+off x=-30370..4676,y=22695..32755,z=67839..82155
+on x=1929..17141,y=-85885..-64577,z=-41851..-20316
+off x=46391..68161,y=47902..58287,z=-42465..-24023
diff --git a/src/adventofcode2021/solutions/day22.py b/src/adventofcode2021/solutions/day22.py
new file mode 100644
index 00000000..8992792e
--- /dev/null
+++ b/src/adventofcode2021/solutions/day22.py
@@ -0,0 +1,176 @@
+from __future__ import annotations
+
+import re
+from collections import defaultdict
+from itertools import filterfalse
+from typing import NamedTuple
+
+from adventofcode2021.utils.abstract import FileReaderSolution
+from adventofcode2021.utils.point import XYZPoint as Point
+
+
+class Step(NamedTuple):
+    # Action: True is Turn On.
+    action: bool
+
+    x_start: int
+    x_stop: int
+    y_start: int
+    y_stop: int
+    z_start: int
+    z_stop: int
+
+    @staticmethod
+    def from_str(input_data: str) -> Step:
+        """Split on x=11..13,y=11..13,z=11..13 into a new Step object"""
+        p = re.compile(
+            r"(?P<action>on|off) "
+            r"x=(?P<x_start>-?\d+)..(?P<x_stop>-?\d+),"
+            r"y=(?P<y_start>-?\d+)..(?P<y_stop>-?\d+),"
+            r"z=(?P<z_start>-?\d+)..(?P<z_stop>-?\d+)"
+        )
+        groups = p.search(input_data)
+        if not groups:
+            raise ValueError("Bad input: ", input_data)
+        mdict = groups.groupdict()
+        mdict["action"] = mdict["action"] == "on"
+        for key, value in mdict.items():
+            if key == "action":
+                continue
+            mdict[key] = int(value)
+        return Step(**mdict)  # type: ignore
+
+
+class Reboot(NamedTuple):
+    on: bool
+    cube: Cube
+
+    @staticmethod
+    def from_str(input_data: str) -> Reboot:
+        action, points = input_data.split()
+        return Reboot(action == "on", Cube.from_str(points))
+
+
+class Cube(NamedTuple):
+    x0: int
+    x1: int
+    y0: int
+    y1: int
+    z0: int
+    z1: int
+
+    @property
+    def size(self) -> int:
+        return (self.x1 - self.x0) * (self.y1 - self.y0) * (self.z1 - self.z0)
+
+    def intersects(self, other: Cube) -> bool:
+        return (
+            self.x0 < other.x1
+            and self.x1 - 1 >= other.x0
+            and self.y0 < other.y1
+            and self.y1 - 1 >= other.y0
+            and self.z0 < other.z1
+            and self.z1 - 1 >= other.z0
+        )
+
+    def contains(self, other: Cube) -> bool:
+        return (
+            self.x0 <= other.x0
+            and self.x1 >= other.x1
+            and self.y0 <= other.y0
+            and self.y1 >= other.y1
+            and self.z0 <= other.z0
+            and self.z1 >= other.z1
+        )
+
+    def subtract(self, other: Cube) -> list[Cube]:
+        """If `other` cube is inside this cube, split the cube into new cubes"""
+        if not self.intersects(other):
+            return [self]
+        elif other.contains(self):
+            return []
+
+        xs = sorted((self.x0, self.x1, other.x0, other.x1))
+        ys = sorted((self.y0, self.y1, other.y0, other.y1))
+        zs = sorted((self.z0, self.z1, other.z0, other.z1))
+
+        ret = []
+        for x0, x1 in zip(xs, xs[1:]):
+            for y0, y1 in zip(ys, ys[1:]):
+                for z0, z1 in zip(zs, zs[1:]):
+                    cube = Cube(x0, x1, y0, y1, z0, z1)
+                    if self.contains(cube) and not cube.intersects(other):
+                        ret.append(cube)
+        return ret
+
+    @staticmethod
+    def from_str(input_data: str) -> Cube:
+        """Split x=11..13,y=11..13,z=11..13 into a new Step object"""
+        p = re.compile(
+            r"x=(?P<x_start>-?\d+)..(?P<x_stop>-?\d+),"
+            r"y=(?P<y_start>-?\d+)..(?P<y_stop>-?\d+),"
+            r"z=(?P<z_start>-?\d+)..(?P<z_stop>-?\d+)"
+        )
+        groups = p.search(input_data)
+        if not groups:
+            raise ValueError("Bad input: ", input_data)
+        mdict = groups.groupdict()
+        return Cube(
+            x0=int(mdict["x_start"]),
+            x1=int(mdict["x_stop"]) + 1,
+            y0=int(mdict["y_start"]),
+            y1=int(mdict["y_stop"]) + 1,
+            z0=int(mdict["z_start"]),
+            z1=int(mdict["z_stop"]) + 1,
+        )
+
+
+class Day22:
+    ...
+
+
+class Day22PartA(Day22, FileReaderSolution):
+    grid: defaultdict[Point, bool]
+
+    def parse(self, input_data: str) -> list[Step]:
+        return [Step.from_str(line) for line in input_data.splitlines()]
+
+    def apply_steps(self, steps: list[Step]):
+        """Apply all the steps."""
+        for step in steps:
+            for x in range(step.x_start, step.x_stop + 1):
+                for y in range(step.y_start, step.y_stop + 1):
+                    for z in range(step.z_start, step.z_stop + 1):
+                        pnt = Point(x, y, z)
+                        self.grid[pnt] = step.action
+
+    def count_on(self) -> int:
+        return sum(pnt for pnt in self.grid.values() if pnt)
+
+    @staticmethod
+    def apply_limit(steps: list[Step]) -> list[Step]:
+        def filter_condition(step):
+            return min(step[1:]) < -50 or max(step[1:]) > 50
+
+        return list(filterfalse(filter_condition, steps))
+
+    def solve(self, input_data: str) -> int:
+        self.grid = defaultdict(lambda: False)
+        steps = self.parse(input_data)
+        # Apply the limit
+        steps = self.apply_limit(steps)
+        self.apply_steps(steps)
+        return self.count_on()
+
+
+class Day22PartB(Day22, FileReaderSolution):
+    def solve(self, input_data: str) -> int:
+        reboots = [Reboot.from_str(line) for line in input_data.splitlines()]
+
+        cubes: list[Cube] = []
+        for step in reboots:
+            cubes = [part for cube in cubes for part in cube.subtract(step.cube)]
+            if step.on:
+                cubes.append(step.cube)
+
+        return sum(cube.size for cube in cubes)
diff --git a/tests/solutions/test_day22_a.py b/tests/solutions/test_day22_a.py
new file mode 100644
index 00000000..4169e4d0
--- /dev/null
+++ b/tests/solutions/test_day22_a.py
@@ -0,0 +1,81 @@
+from textwrap import dedent
+
+from adventofcode2021.solutions.day22 import Day22PartA, Step
+
+
+class TestDay22PartA:
+    short_test = """\
+    on x=10..12,y=10..12,z=10..12
+    on x=11..13,y=11..13,z=11..13
+    off x=9..11,y=9..11,z=9..11
+    on x=10..10,y=10..10,z=10..10
+    """
+
+    long_test = """\
+    on x=-20..26,y=-36..17,z=-47..7
+    on x=-20..33,y=-21..23,z=-26..28
+    on x=-22..28,y=-29..23,z=-38..16
+    on x=-46..7,y=-6..46,z=-50..-1
+    on x=-49..1,y=-3..46,z=-24..28
+    on x=2..47,y=-22..22,z=-23..27
+    on x=-27..23,y=-28..26,z=-21..29
+    on x=-39..5,y=-6..47,z=-3..44
+    on x=-30..21,y=-8..43,z=-13..34
+    on x=-22..26,y=-27..20,z=-29..19
+    off x=-48..-32,y=26..41,z=-47..-37
+    on x=-12..35,y=6..50,z=-50..-2
+    off x=-48..-32,y=-32..-16,z=-15..-5
+    on x=-18..26,y=-33..15,z=-7..46
+    off x=-40..-22,y=-38..-28,z=23..41
+    on x=-16..35,y=-41..10,z=-47..6
+    off x=-32..-23,y=11..30,z=-14..3
+    on x=-49..-5,y=-3..45,z=-29..18
+    off x=18..30,y=-20..-8,z=-3..13
+    on x=-41..9,y=-7..43,z=-33..15
+    on x=-54112..-39298,y=-85059..-49293,z=-27449..7877
+    on x=967..23432,y=45373..81175,z=27513..53682
+    """
+
+    def test_steps(self):
+        test_strings = dedent(self.short_test).splitlines()
+        step1 = Step.from_str(test_strings[0])
+
+        assert step1.action
+        assert step1.x_start == step1.y_start == step1.z_start == 10
+        assert step1.x_stop == step1.y_stop == step1.z_stop == 12
+
+        step2 = Step.from_str("off x=10..11,y=12..13,z=-14..-12")
+        assert not step2.action
+        assert step2.x_start == 10
+        assert step2.x_stop == 11
+        assert step2.y_start == 12
+        assert step2.y_stop == 13
+        assert step2.z_start == -14
+        assert step2.z_stop == -12
+
+    def test_limit(self):
+        steps = [
+            Step(True, 1, 2, 3, 4, 5, 6),
+            Step(True, -54112, -39298, -85059, -49293, -27449, 7877),
+            Step(False, 967, 23432, 45373, 81175, 27513, 53682),
+        ]
+        filtered = Day22PartA.apply_limit(steps)
+
+        assert len(filtered) == 1
+        assert filtered[0] == Step(True, 1, 2, 3, 4, 5, 6)
+
+    def test_day22a_solve_short(self):
+        solution = Day22PartA()
+        result = solution.solve(dedent(self.short_test))
+        assert result == 39
+
+    def test_day22a_solve(self):
+        solution = Day22PartA()
+        result = solution.solve(dedent(self.long_test))
+        assert result == 590784
+
+    def test_day22a_data(self):
+        """Result we got when we did the real solution"""
+        solution = Day22PartA()
+        res = solution("day_22/day22.txt")
+        assert res == 603661
diff --git a/tests/solutions/test_day22_b.py b/tests/solutions/test_day22_b.py
new file mode 100644
index 00000000..29921d7a
--- /dev/null
+++ b/tests/solutions/test_day22_b.py
@@ -0,0 +1,93 @@
+from textwrap import dedent
+
+import pytest
+
+from adventofcode2021.solutions.day22 import Day22PartB
+
+
+class TestDay22PartB:
+    small_input = """\
+    on x=10..12,y=10..12,z=10..12
+    on x=11..13,y=11..13,z=11..13
+    off x=9..11,y=9..11,z=9..11
+    on x=10..10,y=10..10,z=10..10
+    """
+
+    test_data = """\
+    on x=-5..47,y=-31..22,z=-19..33
+    on x=-44..5,y=-27..21,z=-14..35
+    on x=-49..-1,y=-11..42,z=-10..38
+    on x=-20..34,y=-40..6,z=-44..1
+    off x=26..39,y=40..50,z=-2..11
+    on x=-41..5,y=-41..6,z=-36..8
+    off x=-43..-33,y=-45..-28,z=7..25
+    on x=-33..15,y=-32..19,z=-34..11
+    off x=35..47,y=-46..-34,z=-11..5
+    on x=-14..36,y=-6..44,z=-16..29
+    on x=-57795..-6158,y=29564..72030,z=20435..90618
+    on x=36731..105352,y=-21140..28532,z=16094..90401
+    on x=30999..107136,y=-53464..15513,z=8553..71215
+    on x=13528..83982,y=-99403..-27377,z=-24141..23996
+    on x=-72682..-12347,y=18159..111354,z=7391..80950
+    on x=-1060..80757,y=-65301..-20884,z=-103788..-16709
+    on x=-83015..-9461,y=-72160..-8347,z=-81239..-26856
+    on x=-52752..22273,y=-49450..9096,z=54442..119054
+    on x=-29982..40483,y=-108474..-28371,z=-24328..38471
+    on x=-4958..62750,y=40422..118853,z=-7672..65583
+    on x=55694..108686,y=-43367..46958,z=-26781..48729
+    on x=-98497..-18186,y=-63569..3412,z=1232..88485
+    on x=-726..56291,y=-62629..13224,z=18033..85226
+    on x=-110886..-34664,y=-81338..-8658,z=8914..63723
+    on x=-55829..24974,y=-16897..54165,z=-121762..-28058
+    on x=-65152..-11147,y=22489..91432,z=-58782..1780
+    on x=-120100..-32970,y=-46592..27473,z=-11695..61039
+    on x=-18631..37533,y=-124565..-50804,z=-35667..28308
+    on x=-57817..18248,y=49321..117703,z=5745..55881
+    on x=14781..98692,y=-1341..70827,z=15753..70151
+    on x=-34419..55919,y=-19626..40991,z=39015..114138
+    on x=-60785..11593,y=-56135..2999,z=-95368..-26915
+    on x=-32178..58085,y=17647..101866,z=-91405..-8878
+    on x=-53655..12091,y=50097..105568,z=-75335..-4862
+    on x=-111166..-40997,y=-71714..2688,z=5609..50954
+    on x=-16602..70118,y=-98693..-44401,z=5197..76897
+    on x=16383..101554,y=4615..83635,z=-44907..18747
+    off x=-95822..-15171,y=-19987..48940,z=10804..104439
+    on x=-89813..-14614,y=16069..88491,z=-3297..45228
+    on x=41075..99376,y=-20427..49978,z=-52012..13762
+    on x=-21330..50085,y=-17944..62733,z=-112280..-30197
+    on x=-16478..35915,y=36008..118594,z=-7885..47086
+    off x=-98156..-27851,y=-49952..43171,z=-99005..-8456
+    off x=2032..69770,y=-71013..4824,z=7471..94418
+    on x=43670..120875,y=-42068..12382,z=-24787..38892
+    off x=37514..111226,y=-45862..25743,z=-16714..54663
+    off x=25699..97951,y=-30668..59918,z=-15349..69697
+    off x=-44271..17935,y=-9516..60759,z=49131..112598
+    on x=-61695..-5813,y=40978..94975,z=8655..80240
+    off x=-101086..-9439,y=-7088..67543,z=33935..83858
+    off x=18020..114017,y=-48931..32606,z=21474..89843
+    off x=-77139..10506,y=-89994..-18797,z=-80..59318
+    off x=8476..79288,y=-75520..11602,z=-96624..-24783
+    on x=-47488..-1262,y=24338..100707,z=16292..72967
+    off x=-84341..13987,y=2429..92914,z=-90671..-1318
+    off x=-37810..49457,y=-71013..-7894,z=-105357..-13188
+    off x=-27365..46395,y=31009..98017,z=15428..76570
+    off x=-70369..-16548,y=22648..78696,z=-1892..86821
+    on x=-53470..21291,y=-120233..-33476,z=-44150..38147
+    off x=-93533..-4276,y=-16170..68771,z=-104985..-24507
+    """
+
+    @pytest.mark.parametrize(
+        ("input_data", "expected_result"),
+        [(small_input, 39), (test_data, 2758514936282235)],
+    )
+    def test_day22b_solve(self, input_data, expected_result):
+        solution = Day22PartB()
+        result = solution.solve(dedent(input_data))
+        assert result == expected_result
+
+    def test_day22b_data(self):
+        """Result we got when we did the real solution"""
+        solution = Day22PartB()
+        res = solution("day_22/day22.txt")
+        assert res > 1_237_169_550_955_992
+        assert res == 1_237_264_238_382_479

From 26a962012917c48658edb6f92a1c0726a1bb5047 Mon Sep 17 00:00:00 2001
From: Roel Adriaans <roel.adriaans@ordina.nl>
Date: Thu, 1 Dec 2022 08:02:17 +0100
Subject: [PATCH 179/371] Day 1 + typo fix

---
 src/adventofcode2022/main.py                  |    4 +-
 .../solutions/data/day_01/day01.txt           | 2236 +++++++++++++++++
 src/adventofcode2022/solutions/day01.py       |   26 +
 tests/solutions/test_day01_a.py               |    9 +
 tests/solutions/test_day01_b.py               |    9 +
 5 files changed, 2282 insertions(+), 2 deletions(-)
 create mode 100644 src/adventofcode2022/solutions/data/day_01/day01.txt
 create mode 100644 src/adventofcode2022/solutions/day01.py
 create mode 100644 tests/solutions/test_day01_a.py
 create mode 100644 tests/solutions/test_day01_b.py

diff --git a/src/adventofcode2022/main.py b/src/adventofcode2022/main.py
index b796cbd6..68062cb5 100644
--- a/src/adventofcode2022/main.py
+++ b/src/adventofcode2022/main.py
@@ -151,10 +151,10 @@ def download_input_data(year: str, day: str):
     if r.status_code != 200:
         print(f"Unable to download the input data. Response code {r.status_code}")
         if r.status_code == 500:
-            print("An internal server error accured. Is your session valid?")
+            print("An internal server error occured. Is your session valid?")
         elif r.status_code == 404:
             print(
-                "Solution not found: You are too early, or this day does not"
+                "Solution not found: You are too early, or this day does not "
                 "have an input file."
             )
         else:
diff --git a/src/adventofcode2022/solutions/data/day_01/day01.txt b/src/adventofcode2022/solutions/data/day_01/day01.txt
new file mode 100644
index 00000000..cd4e52e3
--- /dev/null
+++ b/src/adventofcode2022/solutions/data/day_01/day01.txt
@@ -0,0 +1,2236 @@
+4323
+4004
+4070
+1780
+5899
+1912
+2796
+5743
+3008
+1703
+4870
+5048
+2485
+1204
+
+30180
+
+33734
+19662
+
+2402
+4395
+2703
+1562
+2407
+3393
+4311
+1314
+2729
+2225
+4420
+4136
+2867
+1032
+2095
+
+7366
+3496
+6177
+1426
+4750
+2655
+3194
+4240
+4024
+3510
+2606
+2335
+
+1524
+17720
+23749
+
+2549
+1945
+3392
+4965
+5601
+4725
+1462
+1470
+2988
+5339
+1620
+6098
+4447
+5115
+4102
+
+2729
+4836
+10723
+6705
+2278
+3290
+2735
+1813
+
+10285
+2302
+6970
+10710
+8791
+5575
+9765
+2167
+
+1081
+6290
+3701
+2457
+9551
+9625
+3870
+8433
+5653
+
+5647
+2342
+5549
+2861
+4081
+3166
+1902
+3217
+3255
+4353
+1752
+2491
+3271
+4239
+5744
+
+14082
+
+24855
+23123
+18215
+
+9650
+5995
+11848
+1258
+10354
+5948
+9052
+
+5347
+7820
+4620
+4217
+2686
+7163
+4911
+8538
+6851
+8342
+
+6323
+3157
+6939
+3400
+5297
+6815
+1476
+2440
+5816
+6400
+4198
+2356
+
+6537
+2596
+5678
+7605
+1882
+4329
+7488
+6548
+3687
+2827
+1461
+
+4933
+4880
+1169
+4190
+5993
+5452
+5131
+3310
+5996
+2670
+1972
+4666
+3296
+3978
+4119
+
+1372
+2160
+1268
+3378
+5672
+2384
+2772
+2513
+3534
+1372
+4691
+4311
+3016
+5941
+5035
+
+3644
+2169
+5597
+1874
+1841
+1794
+2331
+4907
+1607
+3104
+1893
+2026
+4297
+4078
+
+7561
+8745
+10249
+2438
+4872
+5647
+7849
+6634
+
+21402
+34212
+
+2268
+2107
+3715
+6236
+3881
+6741
+6475
+2999
+4231
+3936
+4840
+
+2318
+5735
+19378
+7775
+
+1848
+12168
+
+3324
+5284
+6502
+5135
+2887
+5849
+4107
+1065
+1236
+1572
+5308
+2337
+5741
+1705
+
+4445
+3494
+4890
+3522
+3456
+3218
+7020
+3640
+4653
+4794
+6003
+4552
+
+13971
+2866
+14359
+1749
+2761
+
+8963
+2088
+6758
+16065
+4613
+
+8406
+3200
+4467
+5892
+6549
+6360
+7789
+1592
+5334
+5007
+
+9335
+9406
+12089
+10628
+8080
+1841
+6973
+
+7553
+10626
+8661
+1747
+4561
+10772
+
+3487
+2524
+2696
+4140
+4367
+2367
+6005
+2465
+2360
+3447
+1242
+6378
+4295
+
+23471
+14744
+19137
+
+15284
+10987
+1491
+17669
+
+2182
+5750
+7466
+1965
+1274
+5648
+7230
+6127
+7768
+5246
+2758
+
+7451
+6614
+6538
+6789
+
+7381
+6243
+3806
+4838
+5163
+2962
+6748
+1982
+1049
+5178
+6590
+3739
+
+1598
+4645
+5128
+3838
+4383
+2742
+1654
+2272
+5518
+1599
+2948
+
+6939
+6508
+4072
+2196
+3589
+1905
+2221
+6003
+6090
+3612
+1791
+5525
+4015
+
+27936
+
+1695
+5271
+5888
+3809
+4023
+4690
+
+4147
+14521
+18575
+11452
+
+2886
+3542
+4260
+5414
+4207
+6920
+3285
+4103
+2480
+5378
+5062
+2587
+1473
+
+6375
+5824
+2640
+1315
+8095
+1743
+3695
+7109
+
+5281
+2346
+4972
+4967
+6804
+1448
+9301
+1234
+
+52340
+
+5369
+5911
+3839
+6600
+4474
+1724
+3595
+3585
+3513
+7336
+2277
+4851
+
+7017
+12732
+9304
+12136
+6256
+12880
+
+3559
+2147
+4293
+1481
+4349
+5624
+3611
+5194
+4575
+1662
+6141
+5599
+1199
+5901
+
+29966
+20696
+
+3317
+4398
+1493
+1730
+2417
+1597
+5310
+5163
+4484
+5160
+1890
+5695
+4027
+4393
+
+13693
+6774
+7495
+9515
+9103
+12116
+
+10203
+26377
+
+6056
+5189
+3946
+3696
+4086
+6017
+7008
+5212
+2740
+7433
+3303
+6170
+
+6140
+3588
+5969
+3308
+3063
+4591
+6575
+
+1803
+8431
+1340
+5409
+12106
+5774
+
+6812
+6740
+1025
+7512
+9778
+7297
+9872
+4269
+
+7012
+1225
+6654
+4828
+4791
+1514
+4144
+5631
+6230
+2530
+6276
+2142
+
+5884
+5873
+5068
+5132
+3739
+4874
+2798
+2461
+6577
+4926
+4343
+1450
+
+68707
+
+4992
+3372
+5660
+7139
+5052
+6115
+1749
+2810
+7021
+5529
+5782
+4395
+
+1953
+4377
+6438
+1987
+5046
+3732
+4600
+5665
+5882
+1974
+6009
+3727
+1134
+
+6339
+5628
+7716
+2740
+8091
+3185
+3877
+2099
+2812
+
+1352
+1928
+2815
+7509
+1311
+6981
+4396
+4094
+3827
+2278
+2727
+
+2249
+4138
+3251
+3581
+4657
+2234
+2070
+1525
+2206
+3512
+5139
+3792
+6039
+5885
+
+5939
+1603
+6497
+4450
+4937
+1762
+1301
+4543
+6872
+4967
+1365
+5738
+2504
+
+22837
+10301
+13380
+
+3714
+1854
+
+2320
+6723
+2994
+3402
+4840
+4613
+3460
+4068
+6575
+4539
+2139
+1206
+3238
+
+1974
+11341
+4645
+12073
+2637
+
+3876
+2380
+7305
+1130
+6134
+7401
+3911
+7322
+6264
+3299
+5164
+1688
+
+5399
+3485
+6861
+4543
+10367
+10255
+
+4451
+2902
+6043
+4384
+4023
+3587
+2836
+5649
+4765
+2051
+1471
+2365
+1038
+2452
+
+11226
+13152
+4749
+9547
+
+5099
+2983
+12118
+9251
+12847
+9391
+
+23810
+22967
+13264
+
+8898
+11599
+3103
+6687
+5592
+3559
+
+14152
+2647
+9210
+
+4675
+5105
+3400
+2991
+1688
+5839
+4746
+6007
+5103
+4212
+3419
+4335
+1974
+2035
+2263
+
+3266
+1208
+4104
+5092
+1816
+4339
+4732
+1746
+2569
+5600
+2329
+1035
+4238
+6095
+5008
+
+17154
+20316
+25661
+
+1199
+
+1285
+6497
+3073
+1862
+6437
+2001
+3807
+3519
+2338
+6727
+1258
+3402
+4825
+
+6970
+8106
+9383
+12577
+
+10963
+5485
+10936
+12139
+8948
+10772
+11053
+
+24569
+16515
+12189
+
+4741
+3247
+4106
+1423
+2540
+2549
+10404
+6570
+
+10768
+23116
+9838
+
+3655
+3142
+3835
+3542
+7419
+5830
+3956
+7272
+1539
+7260
+3636
+4308
+
+1949
+5477
+3960
+1215
+2389
+5869
+5677
+2235
+4273
+6776
+5490
+5299
+4913
+
+3272
+2331
+4138
+2958
+4780
+5427
+5949
+2894
+3669
+4201
+3000
+3387
+1227
+5110
+1990
+
+7239
+18190
+17161
+16971
+
+3742
+2960
+3810
+2564
+1972
+5363
+1675
+2370
+4486
+5243
+4833
+6036
+1590
+6058
+
+4374
+3018
+4827
+4061
+2097
+4819
+2646
+6851
+3864
+1289
+3366
+3328
+2929
+
+16680
+6361
+9020
+14141
+
+12541
+12672
+12624
+
+5794
+7699
+10020
+9455
+1716
+2567
+8294
+1179
+
+8733
+6078
+10818
+2697
+10768
+5266
+5211
+
+9435
+7619
+3382
+14870
+2752
+
+5089
+1720
+1836
+6485
+6459
+4323
+5068
+5987
+2588
+6906
+6899
+4500
+
+6132
+4466
+5913
+1613
+5151
+3915
+4656
+3483
+2387
+1811
+6147
+5757
+6699
+
+4541
+1357
+5762
+1877
+2240
+4025
+5053
+1079
+6121
+8030
+5597
+
+2463
+2185
+2126
+4766
+2069
+4302
+2072
+5028
+1581
+2359
+1914
+4554
+3730
+4141
+1625
+
+5440
+7109
+6947
+4241
+7812
+7923
+9238
+6317
+4657
+
+8064
+5655
+8309
+5404
+4639
+8986
+2719
+3403
+2541
+
+6183
+5137
+7918
+7159
+3194
+3628
+5371
+1554
+3641
+5394
+6931
+
+11367
+16399
+9440
+3911
+
+7952
+5780
+9026
+1500
+3848
+8218
+9643
+6783
+
+1841
+5956
+1547
+5079
+6979
+7912
+2992
+6197
+8715
+
+31416
+13515
+
+5752
+6402
+5541
+2444
+2944
+3826
+6410
+6654
+6195
+3130
+1380
+6102
+5668
+
+3732
+5016
+1813
+5901
+2438
+1416
+8290
+5437
+2402
+7254
+
+31293
+6165
+
+24947
+
+10582
+24078
+25144
+
+11476
+12288
+4678
+4895
+16179
+
+2580
+6573
+13083
+5326
+5067
+
+30550
+
+14659
+2596
+9144
+17320
+
+3546
+14239
+16336
+15317
+5453
+
+3977
+4131
+1046
+6956
+5174
+10004
+8796
+7734
+
+3761
+4088
+2898
+6563
+1891
+3269
+1152
+4755
+3098
+5713
+4203
+2498
+2648
+
+21485
+22269
+
+1620
+1960
+2738
+2963
+1404
+1649
+7600
+1930
+3740
+5450
+7719
+
+3500
+7419
+4550
+3240
+4553
+2453
+1545
+7036
+6217
+1822
+7939
+
+17049
+12540
+17626
+
+3626
+10619
+10814
+4500
+3733
+9168
+5404
+
+3069
+6699
+2440
+5847
+2373
+4696
+6403
+3330
+6840
+5094
+7211
+
+1378
+7603
+2366
+7951
+9178
+4302
+3611
+4883
+
+6816
+4009
+6047
+1044
+1252
+2401
+6354
+4211
+5248
+2811
+1746
+2959
+
+2576
+5322
+4474
+5253
+3873
+6448
+1624
+1986
+1986
+2540
+2250
+5397
+4203
+5733
+
+1853
+5903
+5337
+1648
+7813
+8378
+5571
+5351
+6403
+
+6127
+5397
+2123
+1893
+4920
+6195
+5524
+6428
+4728
+3850
+4327
+2792
+2969
+2220
+
+1591
+4847
+2415
+1107
+1986
+3466
+6095
+7735
+4027
+2370
+7637
+
+3856
+11292
+2699
+14112
+3518
+
+5427
+2633
+6628
+2393
+3645
+2730
+6007
+3798
+1715
+2521
+5221
+5755
+6318
+
+5191
+4058
+3958
+1219
+1664
+2551
+3534
+6406
+5722
+4383
+2105
+6376
+1774
+6175
+
+14330
+9855
+17946
+
+3386
+4396
+3669
+1958
+3971
+1358
+5917
+6026
+4452
+1188
+3052
+2668
+1651
+5408
+4088
+
+5749
+2369
+2628
+4214
+1375
+3109
+2788
+6028
+4984
+3822
+4667
+6093
+3474
+
+1556
+6494
+3916
+5611
+4326
+6483
+2510
+6131
+3110
+2554
+1847
+5859
+2238
+
+1047
+11827
+3359
+8841
+11232
+5803
+9220
+
+5555
+6553
+3903
+3149
+5458
+10593
+8455
+10770
+
+10630
+7727
+6683
+4610
+7987
+7038
+9909
+4599
+
+4637
+1682
+4114
+4940
+2386
+3909
+3110
+1393
+
+6153
+4700
+5461
+7641
+2153
+5363
+
+63414
+
+4467
+1956
+5073
+1822
+9426
+3549
+6866
+4901
+9317
+
+19947
+11533
+16836
+18062
+
+7143
+5185
+13258
+3803
+
+5299
+2684
+2610
+3416
+1783
+5055
+2894
+1164
+4200
+4558
+4380
+3465
+3395
+
+4672
+2427
+6915
+2155
+3306
+4559
+2674
+2230
+6649
+7296
+3433
+
+2191
+4437
+4644
+6313
+1187
+1602
+6811
+1299
+1541
+4973
+2073
+2231
+4216
+
+4893
+8788
+5585
+10703
+9517
+6913
+1333
+
+11440
+25326
+18092
+
+10121
+6807
+4589
+6972
+5842
+8278
+6672
+4871
+
+13690
+7766
+7778
+12899
+3329
+4407
+
+7659
+15344
+17263
+13394
+
+6028
+9037
+2459
+8859
+6934
+5789
+5622
+5893
+8267
+
+10362
+
+5313
+5005
+6354
+3387
+2019
+4933
+4843
+1508
+4066
+1121
+5027
+2157
+2712
+5325
+
+35049
+
+2068
+2489
+2968
+3176
+2835
+1518
+5949
+1106
+1685
+1485
+3896
+4946
+
+5681
+7841
+5218
+5573
+2042
+5725
+6117
+3882
+5360
+1299
+3584
+
+6516
+2684
+6887
+1375
+4296
+7171
+7693
+4603
+8239
+
+7661
+8996
+3419
+4736
+5552
+7873
+8297
+4376
+
+5516
+3278
+2425
+3308
+7722
+5739
+5177
+6738
+9194
+
+13795
+12863
+8108
+9938
+2374
+12314
+
+4931
+6334
+6636
+6256
+1945
+8716
+7054
+2035
+6715
+2180
+
+21075
+7049
+23573
+
+6985
+9970
+9153
+10475
+4568
+6395
+5514
+2117
+
+4115
+2844
+1399
+3535
+4606
+1103
+1443
+5323
+4760
+3992
+5580
+1494
+3193
+5242
+4359
+
+5161
+4143
+7753
+3973
+4318
+5862
+
+1093
+1436
+1444
+4439
+1387
+2114
+4263
+5738
+4607
+5261
+4509
+1389
+4886
+4671
+1154
+
+13316
+14156
+1452
+11726
+4234
+
+8647
+7076
+1481
+1740
+6584
+4276
+1502
+1675
+4012
+7089
+
+8636
+8325
+8445
+4384
+4778
+8110
+10100
+3155
+
+19339
+8585
+5973
+9399
+
+1783
+15809
+1729
+
+3964
+1092
+5948
+8653
+2149
+3494
+7388
+7876
+9334
+
+1211
+4258
+1428
+1096
+3758
+1416
+5969
+5451
+4933
+1057
+1399
+5513
+3655
+3350
+1564
+
+4917
+3980
+5441
+1532
+5716
+2371
+1617
+3153
+1022
+1540
+3450
+2297
+1505
+5188
+2649
+
+2683
+2317
+5457
+9576
+8251
+8707
+1755
+7220
+
+4412
+10875
+10547
+6061
+6221
+2062
+9465
+
+3382
+5259
+3723
+3240
+5556
+4985
+4318
+5831
+2944
+1993
+2127
+4208
+3354
+
+6909
+7400
+4076
+3987
+1663
+7575
+7573
+8001
+1510
+3691
+
+7569
+9266
+1750
+4823
+6919
+5647
+2972
+8801
+8260
+
+3683
+5566
+8718
+4320
+7857
+2501
+1559
+8947
+
+2798
+4808
+3952
+5628
+2242
+1378
+4920
+10266
+
+1457
+7199
+1838
+5849
+6482
+4068
+7236
+1668
+2691
+
+15285
+10046
+11923
+
+1030
+2698
+3211
+7630
+4617
+3383
+1296
+7816
+6360
+7323
+3514
+
+17686
+34956
+
+7398
+2970
+5451
+1272
+1456
+6877
+2549
+4228
+5946
+6077
+6451
+6957
+
+4599
+2727
+2828
+3147
+1487
+2387
+5140
+5558
+6931
+
+4933
+6113
+2104
+6548
+5215
+5627
+6464
+3672
+6387
+3110
+1809
+2780
+1446
+
+5186
+1672
+2253
+3198
+2294
+2995
+5943
+3154
+3667
+5065
+2833
+4049
+2298
+5234
+2856
+
+3558
+2069
+2723
+3908
+6045
+2393
+4610
+1637
+4515
+3961
+1013
+1420
+3111
+1729
+
+17556
+18719
+8542
+7803
+
+1261
+4761
+5767
+4098
+3474
+6178
+6008
+8514
+1956
+
+7007
+4158
+2967
+7673
+5076
+7086
+1105
+7095
+5155
+5637
+2208
+
+4953
+5303
+5460
+5146
+2388
+2298
+1295
+6414
+6323
+4793
+5755
+3878
+1985
+2872
+
+7697
+4701
+1005
+6777
+1763
+5264
+6781
+6600
+1924
+1746
+6696
+
+3932
+3387
+4831
+5621
+5502
+1486
+6377
+6891
+5189
+6879
+2991
+2986
+3450
+
+2929
+2641
+2704
+2693
+6820
+3719
+1908
+2612
+6381
+3258
+1002
+5008
+
+7366
+34310
+
+2798
+5125
+8729
+4928
+1009
+6350
+7994
+2082
+6524
+6253
+
+1723
+1469
+2474
+4565
+1985
+3861
+5804
+3481
+4338
+3580
+2814
+2346
+1635
+4627
+
+13779
+15932
+16875
+2148
+
+8405
+11181
+7324
+10246
+11640
+9061
+2999
+
+2635
+1534
+1223
+1013
+4713
+5928
+5200
+4605
+4520
+1525
+6818
+4778
+3059
+
+3802
+2391
+8430
+10838
+5125
+3233
+11733
+
+47671
+
+11952
+2923
+3109
+4817
+4190
+3666
+11952
+
+8561
+7214
+4010
+7247
+7555
+7647
+3618
+8425
+
+2971
+3620
+5747
+7010
+5404
+2331
+2841
+8718
+2043
+5788
+
+2245
+4763
+6360
+5985
+2177
+6117
+7552
+1784
+4680
+2854
+
+6924
+1946
+5473
+3555
+1298
+1934
+10754
+8047
+
+9028
+1819
+2994
+5197
+8253
+9841
+
+6533
+1279
+4728
+3839
+1054
+2440
+2416
+2840
+4875
+
+5537
+5579
+6856
+4320
+3616
+2177
+6398
+3270
+2763
+1654
+3765
+3727
+3373
+
+6348
+1050
+4641
+4267
+5765
+7125
+2146
+2032
+5863
+3712
+6506
+5430
+
+5288
+7292
+9531
+7158
+11662
+
+8798
+8981
+9789
+16908
+
+5016
+13660
+8515
+5994
+
+4023
+6670
+6553
+4764
+1253
+3340
+5925
+1400
+2684
+5796
+1678
+3324
+
+5489
+1836
+19472
+11219
+
+1799
+4055
+7191
+3511
+9603
+3607
+4621
+8520
+8535
+
+2786
+4514
+3546
+6248
+1984
+3742
+2448
+2319
+3698
+1658
+3949
+6408
+3281
+3804
+
+7413
+3530
+8579
+19575
+
+13921
+5842
+12657
+1413
+9693
+2867
+
+1456
+4298
+1496
+6437
+4283
+2442
+3605
+5482
+6000
+3628
+2020
+2812
+2219
+3000
+
+7965
+3790
+9640
+10772
+9856
+7923
+10390
+
+6009
+2604
+8201
+11341
+7748
+6987
+
+60028
+
+7101
+5285
+9589
+11810
+11534
+4085
+1902
+
+2519
+9496
+2703
+
+3854
+5685
+3541
+3317
+2262
+5910
+3642
+3461
+5759
+3899
+1461
+2692
+6095
+4992
+3739
+
+9302
+4237
+7146
+11412
+9320
+9865
+11517
diff --git a/src/adventofcode2022/solutions/day01.py b/src/adventofcode2022/solutions/day01.py
new file mode 100644
index 00000000..a006f5d1
--- /dev/null
+++ b/src/adventofcode2022/solutions/day01.py
@@ -0,0 +1,26 @@
+from adventofcode2022.utils.abstract import FileReaderSolution
+
+
+class Day01:
+    pass
+
+
+class Day01PartA(Day01, FileReaderSolution):
+    def solve(self, input_data: str) -> int:
+        elfs = input_data.split("\n\n")
+        max_calories = 0
+        for elf in elfs:
+            total = sum([int(line) for line in elf.splitlines()])
+            max_calories = max(max_calories, total)
+        return max_calories
+
+
+class Day01PartB(Day01, FileReaderSolution):
+    def solve(self, input_data: str) -> int:
+        elfs = input_data.split("\n\n")
+        max_calories = []
+        for elf in elfs:
+            total = sum([int(line) for line in elf.splitlines()])
+            max_calories.append(total)
+        max_calories.sort()
+        return sum(max_calories[-3:])
diff --git a/tests/solutions/test_day01_a.py b/tests/solutions/test_day01_a.py
new file mode 100644
index 00000000..0ea27a7d
--- /dev/null
+++ b/tests/solutions/test_day01_a.py
@@ -0,0 +1,9 @@
+from adventofcode2022.solutions.day01 import Day01PartA
+
+
+class TestDay01PartA:
+    def test_day01a_data(self):
+        """Result we got when we did the real solution"""
+        solution = Day01PartA()
+        res = solution("day_01/day01.txt")
+        assert res == 70296
diff --git a/tests/solutions/test_day01_b.py b/tests/solutions/test_day01_b.py
new file mode 100644
index 00000000..94c7a656
--- /dev/null
+++ b/tests/solutions/test_day01_b.py
@@ -0,0 +1,9 @@
+from adventofcode2022.solutions.day01 import Day01PartB
+
+
+class TestDay01PartB:
+    def test_day01b_data(self):
+        """Result we got when we did the real solution"""
+        solution = Day01PartB()
+        res = solution("day_01/day01.txt")
+        assert res == 205381

From 59a3c8cf41b3a9e5803358bae0d840f176648c8c Mon Sep 17 00:00:00 2001
From: Roel Adriaans <roel.adriaans@ordina.nl>
Date: Fri, 2 Dec 2022 09:35:46 +0100
Subject: [PATCH 180/371] Over-engineered solution to day 2 :)

---
 .../solutions/data/day_02/day02.txt           | 2500 +++++++++++++++++
 src/adventofcode2022/solutions/day02.py       |  146 +
 tests/solutions/test_day02_a.py               |   15 +
 tests/solutions/test_day02_b.py               |   15 +
 4 files changed, 2676 insertions(+)
 create mode 100644 src/adventofcode2022/solutions/data/day_02/day02.txt
 create mode 100644 src/adventofcode2022/solutions/day02.py
 create mode 100644 tests/solutions/test_day02_a.py
 create mode 100644 tests/solutions/test_day02_b.py

diff --git a/src/adventofcode2022/solutions/data/day_02/day02.txt b/src/adventofcode2022/solutions/data/day_02/day02.txt
new file mode 100644
index 00000000..5525ccf3
--- /dev/null
+++ b/src/adventofcode2022/solutions/data/day_02/day02.txt
@@ -0,0 +1,2500 @@
+B Y
+A Z
+C Z
+A Y
+A Y
+B Y
+C Y
+A Y
+B Y
+B Y
+A Y
+B Z
+B Y
+A Y
+C Y
+B X
+B Y
+B Y
+B Y
+C Y
+B Y
+A Y
+B Y
+A Y
+B Y
+C Y
+A Y
+B X
+B Y
+B Y
+B X
+B Y
+C Y
+B Y
+C Z
+A X
+B Y
+B Y
+A Z
+B X
+C Y
+C Z
+B Y
+B Y
+A Y
+B X
+B Y
+B Y
+B X
+B Y
+C Y
+A Y
+B Y
+C Y
+C X
+B X
+B X
+A Z
+C Y
+B Y
+C Z
+B X
+B Y
+B Y
+B X
+B Y
+B Z
+B Y
+B Y
+B X
+B Y
+B X
+C X
+B Y
+B X
+A Y
+B Y
+B X
+B Y
+A Y
+B X
+B X
+B Y
+A Y
+B Y
+B Y
+B Y
+C Z
+B X
+B Y
+B X
+B X
+B Y
+B X
+C Z
+B Y
+B Y
+B Y
+B Y
+B Y
+B X
+A Y
+B Y
+C Y
+C Z
+A Y
+B Y
+A Y
+C Z
+B Y
+B X
+B Y
+C X
+A Y
+B X
+B Y
+B X
+B X
+B X
+A Y
+C Z
+B Y
+A Y
+B X
+A Y
+B Y
+A Y
+B X
+B Y
+B Y
+B Y
+B X
+B X
+C Z
+B Z
+B Y
+B X
+C Y
+C Y
+C Z
+C X
+C Y
+B Y
+B X
+A Y
+A Y
+B X
+C Z
+B X
+C X
+B X
+B Y
+B Y
+A Z
+B Z
+C Y
+C Y
+B Y
+B Y
+C Y
+C Y
+C Z
+B Y
+B X
+B Y
+B Y
+C Y
+B Y
+B Y
+B Y
+B Y
+B Y
+C Y
+A Z
+B X
+B Y
+C Z
+B Y
+C Y
+B Y
+B X
+C Y
+B Y
+B X
+C Y
+B Y
+B Y
+B Y
+A Y
+B X
+B X
+B Y
+B Y
+B X
+C Z
+B Y
+A Y
+A Y
+B X
+C X
+A Y
+B X
+B X
+B Y
+B Y
+A Y
+C Y
+C Z
+C Y
+B Y
+B Y
+A Y
+A Y
+A Y
+B Y
+B Y
+A X
+B Y
+B Y
+B X
+B X
+C Z
+B X
+B X
+A Y
+A Y
+A Y
+B Y
+B Y
+C Y
+B X
+A Y
+B Y
+C Z
+B X
+A Y
+C Z
+A Y
+B X
+C Y
+B Y
+B Y
+C Y
+B X
+B X
+B Y
+B Y
+B Y
+B Y
+A Y
+B X
+B X
+B Y
+A Y
+B Z
+A Y
+B Y
+C Y
+B Y
+B Y
+B X
+C Z
+B Y
+B Y
+B X
+B X
+C Z
+B Y
+A Y
+B Y
+B X
+C Y
+A Z
+C Z
+B Y
+B Y
+B X
+C Y
+C X
+B X
+C Y
+C Z
+B X
+B Y
+B Y
+C Z
+B X
+C X
+A Z
+A Y
+B X
+C X
+B Y
+A Z
+A Z
+A Y
+B X
+A Y
+B Y
+B Y
+C Z
+B X
+A Z
+B Y
+B X
+A Y
+B Y
+C Y
+B Y
+B X
+B X
+A Z
+B Y
+B Y
+C Z
+B X
+B X
+B Y
+C Z
+B X
+B X
+C Z
+B X
+A Y
+B X
+C Z
+A Y
+C X
+B Y
+B X
+B Y
+B Y
+C Y
+B X
+A Z
+A Y
+B X
+A Z
+B X
+B Y
+B Y
+A Z
+C X
+B Y
+B Y
+B Y
+A Z
+B Y
+B X
+C Y
+C Z
+B X
+B Y
+B Y
+B Y
+C Y
+A Z
+B Y
+C Z
+C X
+B Y
+C Y
+B Y
+B X
+B Y
+B Y
+A Y
+B Y
+B Y
+C Z
+A Z
+B X
+C Y
+B Y
+B Y
+B Y
+A Y
+A Y
+B Y
+A Y
+B Y
+A Y
+B X
+C Y
+B Y
+C X
+A X
+B X
+A Y
+C Y
+B Y
+A X
+B X
+A Z
+B X
+B Y
+B Y
+B X
+B Y
+B Y
+B X
+A Y
+A Z
+C Z
+B Y
+B Y
+B X
+C Z
+C Z
+B Y
+A Y
+B X
+C Z
+A Y
+B X
+B Z
+B Y
+B Y
+B Y
+B X
+B Y
+B X
+B X
+B Y
+C Y
+B Y
+B Y
+B Y
+B Y
+B Y
+C Z
+B X
+B Y
+B Y
+B Y
+B X
+B X
+C Y
+B X
+B X
+C Z
+B Y
+B Y
+B Y
+B Y
+B Y
+C Y
+B Y
+B Y
+B Y
+B X
+B Y
+B X
+B Y
+B Y
+C X
+B Y
+C X
+B X
+C Z
+C X
+B Y
+A Y
+A Z
+A Y
+C Y
+B X
+B Y
+B Y
+C Z
+A Z
+B Y
+B Y
+B Y
+B Y
+B Y
+B Y
+B Y
+C Y
+B Y
+C Y
+C X
+B X
+B X
+C Z
+A X
+B X
+B Y
+A Y
+B X
+B Y
+A Z
+B Y
+C Y
+B X
+B Y
+B Y
+C Y
+C Y
+B Y
+B X
+B X
+B Y
+B Y
+B Y
+B Y
+C Z
+B X
+B Y
+B Y
+B X
+B Y
+B X
+B X
+B Y
+B X
+B Y
+B Y
+C Y
+B X
+B Y
+B Y
+B Y
+A Y
+B Y
+A Z
+B Y
+C Y
+C Y
+B Y
+B X
+A X
+B Y
+A Y
+B X
+B Y
+B Y
+B X
+C Y
+C Z
+B X
+B Y
+A Y
+C Y
+A Z
+C Y
+B Y
+B Y
+B Y
+B X
+C Y
+B Y
+B Y
+A Y
+A X
+B Y
+B X
+B Y
+B Y
+A Y
+B X
+C X
+B Y
+A Y
+C Y
+B Y
+B Y
+A Y
+C Y
+A Y
+C Y
+B Y
+B X
+C Y
+C Y
+B Y
+B Y
+A Y
+B Y
+B Y
+B Y
+C Z
+B X
+B Y
+B X
+B X
+A X
+A Y
+B Y
+B X
+A Z
+B X
+A Y
+B Y
+C Y
+C Y
+C Y
+B Y
+A Y
+A Y
+B Y
+B Y
+B Z
+B Y
+B X
+A Y
+B X
+A Z
+B Y
+B Y
+B X
+B Y
+C Y
+A Z
+B Y
+C X
+C Y
+B Y
+B Y
+C X
+B Y
+A Y
+A Y
+C Z
+B X
+B X
+B X
+B X
+B Y
+C Z
+B X
+C Y
+A Y
+B Y
+A Y
+B Y
+A Y
+B Y
+B Y
+C Y
+B Y
+B Y
+B X
+B Y
+B X
+B Y
+B X
+B Y
+A Z
+C X
+B X
+C X
+B X
+A Y
+C Y
+B X
+C Y
+B X
+B X
+C Z
+C Y
+B X
+B X
+B X
+B Y
+C Y
+B X
+B X
+A Z
+B Y
+B Y
+C Y
+B X
+C Z
+C Y
+A Y
+B X
+C Y
+C X
+B Y
+B Y
+A X
+B Y
+B X
+B Y
+B X
+C Y
+B X
+A Y
+B Y
+B X
+B Y
+B Y
+B Y
+C Y
+C Y
+C Y
+C Y
+B X
+B Y
+A Z
+B X
+B X
+B Y
+B Y
+C Z
+B Y
+B X
+B Y
+B X
+C Y
+B Y
+C Z
+A X
+B X
+B Y
+C Y
+C X
+B X
+B X
+B Y
+B Y
+B Y
+B X
+B Y
+B Y
+B X
+C Z
+B Y
+B Y
+B X
+B X
+B Y
+B X
+C Z
+A Z
+C X
+C X
+B Y
+B X
+A Y
+B Y
+B X
+C Z
+A X
+B X
+B Y
+B X
+B X
+B Y
+B Y
+A Z
+B X
+A Y
+A Y
+B Y
+B X
+B Y
+C Y
+A Y
+A Y
+B X
+B Z
+C Y
+C Y
+B Y
+C X
+B X
+C Z
+C Z
+B Y
+C X
+A Y
+B Y
+B X
+A Y
+B Y
+C X
+B Y
+B X
+B Y
+C Z
+A X
+A Z
+B Y
+B Y
+B X
+B X
+A Y
+B Y
+B X
+B Y
+C Y
+B Y
+B X
+C Z
+C X
+C Y
+A Y
+B Y
+A Y
+B Y
+B Y
+B X
+B X
+A Y
+A Y
+B Y
+B Y
+B Y
+A Y
+B Y
+B Y
+B Y
+C Z
+A Z
+C Y
+B Y
+B X
+C Y
+A Z
+B X
+B Y
+A Z
+C Y
+B Y
+B X
+B Y
+B Y
+A Y
+B X
+B Z
+B X
+B X
+B X
+B X
+B Y
+B Y
+B X
+B Y
+C Y
+C X
+C Z
+B Y
+B Y
+C Y
+A Y
+B X
+B X
+B Y
+B X
+B Y
+B Y
+A Y
+B Y
+B Y
+B Y
+B Y
+A Y
+B X
+C Z
+B Y
+B Y
+B Y
+B X
+B Y
+C Y
+B X
+B X
+A Y
+A X
+A Y
+C X
+C Y
+B Y
+B Y
+C Y
+B X
+B Y
+B Y
+C Y
+B X
+C X
+B X
+C Y
+B Y
+B X
+B X
+B Y
+C X
+B X
+B Y
+B X
+B X
+B Y
+B X
+B Y
+B Y
+B Y
+C Y
+B Y
+B Y
+C Z
+B Y
+B X
+C Y
+B Y
+B Y
+B X
+B Y
+A Y
+B Y
+A Y
+B Y
+B Y
+A Z
+B X
+B Y
+B Y
+C Z
+B X
+B X
+B Y
+B Y
+B Y
+B X
+C Y
+C Y
+B X
+B Z
+A X
+B Z
+C Y
+B X
+B X
+A X
+B Y
+B X
+C Z
+C Y
+B X
+B Y
+B Y
+B Y
+C Z
+B Y
+C Y
+C Y
+A Y
+B X
+B Y
+B Y
+B Y
+A X
+B Y
+B Y
+B X
+B X
+A Y
+B X
+B Y
+A Z
+B Y
+C Z
+B X
+B Y
+B Y
+A Y
+A Y
+B Y
+B Y
+B Y
+B Y
+C Y
+C Z
+B X
+B X
+B Y
+B Y
+B X
+B X
+A X
+A Y
+B Y
+B Y
+B X
+B Y
+A Y
+B Z
+B X
+C Z
+B Y
+B X
+B X
+B Y
+B Y
+B Y
+C Y
+C X
+B X
+C Z
+B Z
+B X
+B X
+C Z
+C Y
+B X
+A Z
+C Y
+A Y
+B X
+B Y
+C Z
+B Y
+B Y
+B X
+B Y
+C Z
+B Y
+A Y
+B X
+B X
+B X
+C Y
+B X
+B Y
+B X
+B Y
+B Y
+A X
+C Y
+A Y
+C Y
+B X
+B Y
+B X
+B X
+B Y
+B Y
+B Y
+B Y
+B Y
+B Z
+B Y
+A X
+C Z
+B X
+A Y
+C Z
+B Y
+C X
+A Y
+C Y
+C X
+B Y
+B X
+B X
+C Z
+C Y
+A Z
+C Y
+A Y
+B Z
+A Y
+B X
+C X
+A Z
+C X
+B Y
+C X
+B Y
+A Y
+A X
+B X
+B Y
+B X
+B X
+B X
+A Y
+B Y
+B X
+B Y
+A X
+B Y
+C X
+B Y
+B X
+B Y
+A Y
+B X
+B Y
+B X
+B Y
+B X
+B Y
+B Y
+A Z
+A X
+B Y
+C Z
+B Y
+B Y
+B Y
+B Y
+C Y
+B Y
+A Y
+A Y
+C Z
+C Y
+B Y
+A Y
+B Y
+B X
+A Y
+C Y
+B Y
+B Y
+A Y
+B Y
+A X
+C X
+B Y
+B Y
+C X
+B Y
+B X
+A X
+B Y
+B Y
+B Y
+B X
+B X
+A Z
+B Y
+A X
+B X
+A Z
+B X
+C Z
+B Y
+B Y
+B Y
+B X
+B Y
+B Y
+C Y
+B Y
+B X
+A Y
+C Z
+B Y
+B X
+A Y
+C Y
+B X
+B Y
+B Y
+C Z
+A Y
+B X
+B Y
+B X
+B X
+C X
+B Z
+C Y
+B Y
+B Y
+B X
+B Y
+C Y
+C Y
+C Y
+B Y
+A Y
+C Z
+B Y
+C X
+C Y
+B Y
+B Y
+A Z
+B X
+A Y
+A Y
+A Z
+B X
+A Y
+C Z
+B Y
+B Y
+A X
+B X
+B Y
+C Z
+B Y
+B Y
+B X
+B Y
+B X
+B X
+A X
+C Y
+C Y
+C Y
+B Y
+B Y
+C Z
+B Y
+B X
+C X
+B Y
+C Z
+B X
+B Y
+B Y
+B Y
+B X
+B Y
+B X
+B X
+B Y
+B Y
+B Y
+B Y
+B X
+B Y
+B Y
+C Z
+B X
+B Y
+C Y
+B X
+B Z
+B Y
+C Z
+C Y
+B Y
+A Z
+A Y
+B X
+B Y
+C Y
+A X
+A Y
+B X
+B Y
+C Z
+B Y
+C X
+A Y
+C Y
+B Y
+B X
+B Y
+B Y
+B Y
+B X
+B Y
+C X
+A Z
+B X
+C Y
+A Y
+B X
+B Y
+B X
+B Y
+C X
+A Y
+A Y
+C Z
+B Y
+C Y
+B Y
+B Y
+B Y
+B Y
+B Y
+C Y
+A Y
+B Y
+B X
+C Y
+B Y
+B Y
+A Z
+B Y
+B Y
+B X
+B Y
+B Y
+B X
+A Y
+A Z
+B X
+B X
+C Y
+B Y
+B X
+C Y
+B Y
+A X
+B X
+B Y
+A Z
+B Y
+B Y
+B Y
+B Y
+B X
+A X
+B X
+C Y
+B Y
+B Y
+B X
+C Y
+B Y
+B X
+B Y
+B X
+A X
+B Y
+A Y
+B X
+C X
+B Y
+C Z
+B Y
+B Y
+C Y
+B Y
+C X
+B Y
+B X
+A Z
+B Y
+B X
+B Y
+A Y
+B Y
+B X
+B X
+B X
+B Y
+B Y
+B Y
+A Y
+C X
+B X
+B X
+C Z
+B Y
+A Y
+A Z
+A Y
+B Y
+B Y
+B X
+C X
+C Y
+C Z
+B Y
+B Y
+B Y
+B Y
+B Y
+B X
+C Y
+B Y
+B Y
+B X
+B X
+B Y
+B Y
+A Y
+A Y
+A Y
+B X
+B X
+C Y
+B Y
+A Z
+B X
+C Y
+B Y
+B X
+B Y
+B Y
+A Y
+A Y
+B Y
+B Y
+B X
+B X
+A Y
+A X
+A Z
+C X
+A Z
+B X
+B Y
+C Y
+A X
+B X
+C Z
+B Y
+C Y
+A Y
+C X
+B Y
+C X
+A Y
+B Y
+B X
+B Y
+A X
+B X
+B X
+B Y
+B Y
+B Y
+B X
+B Y
+B X
+B Y
+A X
+B Y
+B X
+B Y
+B Y
+B Y
+B X
+B X
+A Y
+B Y
+A Z
+B Y
+B X
+C Z
+B X
+B Y
+B Y
+B Y
+B X
+C Y
+B Y
+B Y
+A Y
+B X
+B X
+B Y
+B Y
+A Y
+B Y
+B X
+B Y
+B X
+B Y
+C X
+C Y
+B X
+B X
+B X
+C Z
+B Y
+B Y
+B X
+B X
+B Y
+A Y
+B Y
+C X
+A Y
+B Y
+B Y
+C X
+B X
+A Y
+C X
+B Y
+B X
+C Z
+B X
+B Y
+A Y
+B Y
+B X
+C Y
+A Y
+B Y
+A X
+B Y
+C Y
+C X
+B Y
+B X
+A Z
+B Y
+B Y
+B X
+B Y
+B Y
+B X
+B Y
+C Y
+B X
+B Y
+B X
+B X
+C Y
+B X
+B X
+A Y
+B X
+B Y
+B Y
+B Y
+B Y
+B Y
+B Y
+B Y
+C X
+B X
+B X
+A Y
+B Y
+A Y
+B X
+B Y
+A Y
+B Y
+A Z
+B X
+A Y
+C Z
+A Y
+A Z
+B X
+B Y
+A Y
+B X
+B X
+B Y
+B Y
+A Z
+A Y
+B X
+C Y
+B Y
+B Z
+C X
+C X
+B X
+A Y
+B X
+B Y
+B Y
+A X
+B Y
+A X
+B Y
+A Y
+B X
+B X
+A Z
+A Y
+A Y
+C Z
+B Y
+B Y
+C Z
+B Y
+B X
+C Y
+B Y
+B X
+A Y
+B Y
+B X
+C X
+C X
+B Y
+A Y
+B Y
+B Y
+B Y
+B X
+A Y
+B Y
+B Y
+A Y
+B Y
+B X
+B X
+C Y
+C X
+B Y
+C X
+B Y
+C Y
+B X
+B Y
+B X
+B Y
+B Y
+B X
+B Y
+B Y
+C Y
+B X
+B Y
+B X
+B Y
+A Y
+B X
+A Y
+B X
+B Y
+B X
+C X
+C Y
+B Y
+B X
+B Y
+B Y
+B X
+B Y
+B Y
+A Y
+B Y
+B X
+B Y
+B X
+C Y
+A Y
+B Y
+B X
+B Z
+B Y
+B X
+C Y
+B Y
+C Y
+C Y
+B X
+C Z
+B X
+C Y
+B Y
+A Y
+B Y
+A X
+B Y
+B Y
+B Y
+B Y
+A Z
+B Y
+B Y
+A Y
+C Y
+B Y
+B X
+B Y
+B X
+B Y
+B Z
+B X
+B X
+B Y
+B Y
+B Y
+B X
+B Y
+B X
+B Y
+B Y
+A Y
+C Z
+B Y
+B Y
+B X
+B X
+B X
+B Y
+A Y
+A Y
+B X
+B Y
+B X
+A X
+B Y
+B Y
+C Y
+A Y
+C Z
+A Z
+A Y
+B Y
+B Y
+B Y
+B Y
+B Y
+C X
+B Y
+A Y
+C X
+C Y
+B X
+A Z
+C Z
+A Z
+C Y
+B X
+B Y
+B Y
+B X
+B Y
+A Z
+C Z
+C X
+B X
+B Z
+A Y
+C Y
+C Y
+C Y
+A Y
+C X
+B X
+C Y
+C Y
+B Y
+B Y
+A Y
+B Y
+A Y
+A Y
+B X
+B X
+C Y
+B Y
+C Y
+B Y
+B Z
+B Y
+A Y
+B X
+B Y
+A X
+B X
+B Y
+B Y
+C Y
+B Y
+C Z
+B Z
+A Y
+A Y
+A Y
+B Y
+B X
+B Y
+A Y
+C X
+B X
+B Y
+B X
+C X
+B Y
+B X
+B Y
+B Y
+B X
+A Y
+A Y
+B Y
+B Y
+B Y
+A Z
+B Y
+B Y
+B Y
+B Y
+B Y
+B X
+B Y
+B Y
+B Y
+B Y
+B Y
+B X
+B X
+B X
+A X
+C Y
+C X
+C Z
+C Y
+B X
+B Y
+A Z
+B Y
+C Y
+B Y
+B X
+B Y
+A Y
+B X
+B X
+B X
+C Y
+B Y
+B Y
+B Y
+B X
+B Y
+B Y
+B Y
+B Y
+B Y
+B Y
+C X
+B Y
+A X
+B X
+C Z
+B X
+B Y
+B X
+B Y
+C Y
+B Y
+B Y
+B X
+A Z
+B Y
+A X
+B Y
+C Z
+C Y
+B Y
+B Y
+B Y
+C X
+B Y
+B Y
+B X
+A Y
+C Z
+B Y
+B X
+B Y
+B Y
+B Y
+B X
+B Y
+B Y
+B Y
+C X
+B X
+B X
+C Z
+B Y
+B Y
+B X
+A Z
+B Y
+B Y
+C Y
+C Y
+A Y
+C Y
+A Y
+B Y
+B X
+B Y
+B X
+C Y
+B Y
+B Y
+B Y
+B Y
+B Y
+C X
+B X
+B X
+B Y
+C X
+C Z
+B X
+A Y
+C Z
+B X
+B X
+C Y
+C Y
+A Y
+B Y
+B X
+B Y
+B Y
+A Z
+A Z
+B Y
+B Y
+B Y
+B Y
+B Y
+B Y
+B Y
+B X
+B Y
+C Y
+B Y
+B X
+A X
+B Y
+A Y
+A Y
+B Y
+B Y
+B X
+B Y
+B Y
+C Y
+A Y
+B X
+B X
+B X
+B Y
+B Y
+B Y
+B Y
+B X
+B X
+A Y
+B X
+B X
+B X
+B X
+B Y
+B X
+A X
+C Y
+B Y
+B Y
+A Y
+B Y
+B X
+C X
+C Y
+A Y
+B Y
+A Z
+C Y
+B Y
+B Y
+B Y
+B X
+B X
+B Y
+C X
+B X
+B Y
+C X
+B X
+A Y
+B Y
+B X
+B Y
+B Y
+B X
+B Y
+B Y
+C Y
+B X
+B X
+B X
+A Y
+B Y
+B X
+C Y
+C Y
+B X
+A Y
+B Y
+C Y
+B X
+B Y
+B X
+B X
+B Y
+C Y
+A Y
+C Y
+B X
+C X
+B Y
+B X
+A Y
+C Y
+B Y
+B Y
+B Y
+C Z
+C Y
+A Z
+A Y
+B Y
+B Y
+B Y
+B Y
+A Y
+B X
+B Y
+B Y
+C Y
+C X
+B Y
+B Y
+B Y
+B Y
+B X
+B X
+B X
+C Z
+B Y
+B Y
+C Y
+B X
+B Y
+B Y
+A Z
+B Y
+C Z
+B X
+A Y
+B X
+B Y
+A Y
+A Z
+A Z
+B Z
+B Y
+B Y
+A Y
+C Z
+B Y
+C Z
+B X
+B Y
+B Y
+B Y
+B Y
+C Y
+B X
+B X
+B X
+B X
+B X
+B Y
+A Z
+A Y
+B Y
+B Y
+B Y
+C X
+B Y
+A Y
+B Y
+B Y
+B X
+B Y
+C Y
+A Z
+A Y
+C Y
+C Z
+B X
+A Z
+B X
+B X
+B Z
+B Y
+C Y
+A Y
+B Y
+B Y
+B X
+C Z
+B Y
+B Y
+A Z
+A X
+B Y
+B X
+B Y
+B X
+B X
+B X
+B X
+A Y
+B Y
+A X
+B X
+B X
+B Y
+B X
+B Y
+B Y
+A Y
+B Y
+C Y
+A Z
+A Y
+B X
+B Y
+A Y
+C X
+B Y
+C Y
+B X
+B Y
+A Y
+B Y
+A Z
+B Y
+B Y
+A Y
+B X
+C Y
+B Y
+B Y
+C Z
+B X
+B Z
+B Y
+A Y
+B Y
+C X
+B Y
+B Y
+B Y
+B Y
+B Y
+C Z
+C Z
+B Y
+C Y
+C Z
+A X
+B Y
+A Y
+B X
+B X
+B Z
+B X
+A Y
+B Y
+B Y
+B Y
+A Z
+C Y
+B Y
+B Y
+C Y
+C Z
+C X
+B Y
+A X
+B Y
+A Y
+C X
+B Y
+B Y
+B Y
+B Z
+B X
+B X
+C Y
+B X
+B X
+C Z
+B Y
+B X
+B X
+B Y
+B Y
+B X
+C X
+B Y
+B Y
+B X
+A Y
+B Y
+C Y
+B Y
+A X
+B Y
+A Y
+A Y
+B Y
+B X
+B X
+C X
+B Y
+B X
+A Y
+C X
+A Y
+B X
+B Y
+B Y
+C Z
+B X
+B Y
+B X
+B Y
+B Y
+A Z
+B Z
+B Y
+B Y
+C Y
+C X
+C Y
+C Y
+B Y
+B Y
+B Y
+C Y
+A Z
+A Z
+B Y
+B X
+A Y
+B X
+B Y
+A Y
+B X
+B Y
+B X
+C X
+B Y
+B Y
+B X
+B X
+A Z
+A Y
+B Y
+A Y
+B Y
+B X
+B X
+A Y
+B X
+B Y
+B Y
+B X
+C X
+C X
+B Y
+B Y
+A Y
+B X
+B Y
+B Y
+B Y
+B Y
+C Y
+B Y
+C Z
+B Y
+B Y
+C X
+B X
+B Y
+B Y
+B X
+B X
+B Y
+B Y
+B Y
+B X
+A Z
+B Y
+B X
+C Z
+B X
+B Y
+A Z
+C Z
+A Z
+B X
+B Y
+B Y
+B Y
+B X
+B Y
+C Y
+C X
+C Y
+A X
+B Y
+B Z
+B Y
+B Y
+B Y
+A Y
+B X
+B Y
+C Y
+B Y
+B X
+B X
+B Y
+B Y
+B Y
+C Z
+B Y
+B X
+B Z
+B X
+B Y
+B Y
+B X
+B X
+A Y
+B X
+B X
+B X
+A Y
+B X
+B X
+B Y
+B X
+A X
+B Y
+B Y
+C Y
+B X
+B Y
+B X
+B X
+C Y
+B Y
+B Y
+B X
+A X
+C Y
+C X
+A Y
+B X
+B Y
+B Y
+B Y
+B Y
+B X
+B Y
+B Y
+B Y
+B Y
+C Y
+C Z
+B Y
+C X
+B X
+B Y
+A Z
+C X
+B X
+B Y
+B Y
+B X
+B Y
+B Y
+B Y
+B Y
+B Y
+B Y
+B Y
+C Y
+B Y
+C Y
+B X
+A Z
+B Y
+B X
+A Y
+B Y
+B X
+A Y
+B X
+B X
+B X
+B Y
+B Y
+B X
+B Y
+A Z
+B Y
+B Y
+B Y
+B Y
+B Y
+B Y
+B Y
+B Y
+B X
+B Y
+B Y
+A Y
+B Y
+B X
+B X
+C Y
+C X
+B Y
+A Y
+C Z
+B X
+B X
+B Y
+C Y
+A Y
+B Y
+B Y
+B X
+B Y
+B X
+C Y
+C Y
+B Y
+B X
+B X
+B Y
+C Y
+B Y
+C Y
+B Y
+B Y
+C Y
+A Y
+B Y
+A Z
+C X
+B Y
+B Y
+B X
+B X
+C Z
+B Y
+B Y
+B Y
+B X
+B X
+A X
+B X
+B Z
+B Y
+B X
+B X
+B Y
+B X
+B X
+B Y
+B Y
+B Y
+B Y
+A Y
+B Y
+B X
+B Z
+B Y
+A X
+A X
+A Y
+B Y
+B Y
+C Y
+A Y
+C Y
+B Y
+B X
+B Y
+B Y
+B X
+B Y
+A Y
+B Y
+B Y
+B X
+B Y
+A Y
+B X
+B Y
diff --git a/src/adventofcode2022/solutions/day02.py b/src/adventofcode2022/solutions/day02.py
new file mode 100644
index 00000000..3cd67b59
--- /dev/null
+++ b/src/adventofcode2022/solutions/day02.py
@@ -0,0 +1,146 @@
+from __future__ import annotations
+
+from adventofcode2022.utils.abstract import FileReaderSolution
+
+
+class RPC:
+    shape: str
+    score: int
+    wins_from: list[RPC]
+
+    def __init__(self, shape: str, score: int):
+        self.shape = shape
+        self.score = score
+        self.wins_from = []
+
+    def __repr__(self):
+        return f"RPC({self.shape} {self.score})"
+
+    def add_wins(self, rpc: RPC):
+        self.wins_from.append(rpc)
+
+    def wins(self, other):
+        """Check if other wins from us, and return this as a boolean"""
+        return other in self.wins_from
+
+
+class Day02:
+    games: dict[str, RPC]
+
+    @staticmethod
+    def create_types() -> dict[str, RPC]:
+        """Create al the possible types, wins and scores for the types"""
+        rpc_types: dict[str, RPC] = {
+            "A": RPC("Rock", 1),
+            "B": RPC("Paper", 2),
+            "C": RPC("Scissors", 3),
+            "X": RPC("Rock", 1),
+            "Y": RPC("Paper", 2),
+            "Z": RPC("Scissors", 3),
+        }
+
+        # Rock wins from Scissors
+        rpc_types["A"].add_wins(rpc_types["Z"])
+        rpc_types["X"].add_wins(rpc_types["C"])
+
+        # Paper wins from Rock
+        rpc_types["B"].add_wins(rpc_types["X"])
+        rpc_types["Y"].add_wins(rpc_types["A"])
+
+        # Sciccors wins from Paper
+        rpc_types["C"].add_wins(rpc_types["Y"])
+        rpc_types["Z"].add_wins(rpc_types["B"])
+
+        return rpc_types
+
+    @staticmethod
+    def play_game(games: list[tuple[RPC, RPC]]) -> tuple[int, int]:
+        score_p1, score_p2 = 0, 0
+        for p1, p2 in games:
+            if p1.shape == p2.shape:
+                # It's a draw
+                score_p1 += 3 + p1.score
+                score_p2 += 3 + p2.score
+            elif p1.wins(p2):
+                score_p1 += 6 + p1.score
+                score_p2 += p2.score
+            elif p2.wins(p1):
+                score_p2 += 6 + p2.score
+                score_p1 += p1.score
+            else:
+                score_p1 += p1.score
+                score_p2 += p2.score
+                print(f"It's a draw between {p1} and {p2}")
+        return score_p1, score_p2
+
+
+class Day02PartA(Day02, FileReaderSolution):
+    def parse(self, input_data: str) -> list[tuple[RPC, RPC]]:
+        """Create a list of games played"""
+        games: list[tuple[RPC, RPC]] = []
+        rpc_types = self.create_types()
+        for game in input_data.splitlines():
+            p1, p2 = game.split()
+            games.append((rpc_types[p1], rpc_types[p2]))
+
+        return games
+
+    def solve(self, input_data: str) -> int:
+        games = self.parse(input_data)
+        _, score_p2 = self.play_game(games)
+        return score_p2
+
+
+class Day02PartB(Day02, FileReaderSolution):
+    @staticmethod
+    def find_loose(rpc_types, rpc: RPC) -> RPC:
+        if rpc.shape == "Rock":
+            return rpc_types["Z"]  # Scissors
+        elif rpc.shape == "Paper":
+            return rpc_types["X"]  # Rock
+        elif rpc.shape == "Scissors":
+            return rpc_types["Y"]  # Paper
+        raise ValueError("Unknown type ", rpc.shape)
+
+    @staticmethod
+    def find_win(rpc_types, rpc: RPC) -> RPC:
+        if rpc.shape == "Rock":
+            return rpc_types["Y"]
+        elif rpc.shape == "Paper":
+            return rpc_types["Z"]
+        elif rpc.shape == "Scissors":
+            return rpc_types["X"]
+        raise ValueError("Unknown type ", rpc.shape)
+
+    @staticmethod
+    def find_draw(rpc_types, rpc: RPC) -> RPC:
+        if rpc.shape == "Rock":
+            return rpc_types["X"]
+        elif rpc.shape == "Paper":
+            return rpc_types["Y"]
+        elif rpc.shape == "Scissors":
+            return rpc_types["Z"]
+        raise ValueError("Unknown type ", rpc.shape)
+
+    def parse(self, input_data: str) -> list[tuple[RPC, RPC]]:
+        """Create a list of games played"""
+        games: list[tuple[RPC, RPC]] = []
+        rpc_types = self.create_types()
+        for game in input_data.splitlines():
+            p1, p2 = game.split()
+            if p2 == "X":
+                # Loose
+                rpc_p2 = self.find_loose(rpc_types, rpc_types[p1])
+            elif p2 == "Y":
+                # Draw
+                rpc_p2 = self.find_draw(rpc_types, rpc_types[p1])
+            else:
+                # Win
+                rpc_p2 = self.find_win(rpc_types, rpc_types[p1])
+            games.append((rpc_types[p1], rpc_p2))
+        return games
+
+    def solve(self, input_data: str) -> int:
+        games = self.parse(input_data)
+        _, score_p2 = self.play_game(games)
+        return score_p2
diff --git a/tests/solutions/test_day02_a.py b/tests/solutions/test_day02_a.py
new file mode 100644
index 00000000..e14e06ab
--- /dev/null
+++ b/tests/solutions/test_day02_a.py
@@ -0,0 +1,15 @@
+from adventofcode2022.solutions.day02 import Day02PartA
+
+
+class TestDay02PartA:
+    def test_day02a_solve(self):
+        test_data = "A Y\nB X\nC Z\n"
+        solution = Day02PartA()
+        result = solution.solve(test_data)
+        assert result == 15
+
+    def test_day02a_data(self):
+        """Result we got when we did the real solution"""
+        solution = Day02PartA()
+        res = solution("day_02/day02.txt")
+        assert res == 10404
diff --git a/tests/solutions/test_day02_b.py b/tests/solutions/test_day02_b.py
new file mode 100644
index 00000000..0803cda6
--- /dev/null
+++ b/tests/solutions/test_day02_b.py
@@ -0,0 +1,15 @@
+from adventofcode2022.solutions.day02 import Day02PartB
+
+
+class TestDay02PartB:
+    def test_day02b_solve(self):
+        test_data = "A Y\nB X\nC Z\n"
+        solution = Day02PartB()
+        result = solution.solve(test_data)
+        assert result == 12
+
+    def test_day02b_data(self):
+        """Result we got when we did the real solution"""
+        solution = Day02PartB()
+        res = solution("day_02/day02.txt")
+        assert res == 10334

From e2299e512b52772336b563793c493d92a0bf6efb Mon Sep 17 00:00:00 2001
From: Roel Adriaans <roel.adriaans@ordina.nl>
Date: Sat, 3 Dec 2022 23:22:26 +0100
Subject: [PATCH 181/371] Implement day 3, sets everywhere :)

---
 .../solutions/data/day_03/day03.txt           | 300 ++++++++++++++++++
 src/adventofcode2022/solutions/day03.py       |  41 +++
 tests/solutions/test_day03_a.py               |  38 +++
 tests/solutions/test_day03_b.py               |  24 ++
 4 files changed, 403 insertions(+)
 create mode 100644 src/adventofcode2022/solutions/data/day_03/day03.txt
 create mode 100644 src/adventofcode2022/solutions/day03.py
 create mode 100644 tests/solutions/test_day03_a.py
 create mode 100644 tests/solutions/test_day03_b.py

diff --git a/src/adventofcode2022/solutions/data/day_03/day03.txt b/src/adventofcode2022/solutions/data/day_03/day03.txt
new file mode 100644
index 00000000..0b6d449c
--- /dev/null
+++ b/src/adventofcode2022/solutions/data/day_03/day03.txt
@@ -0,0 +1,300 @@
+VdzVHmNpdVmBBCpmQLTNfTtMhMJnhFhTTf
+FgqsZbqDDFqRrhhJnsnLMTfhJG
+bRRRPrRRwSwbDqgjvDZbRbQzpzmQVWCzzBdvQBFCzlWV
+GcDdRdvhRssRhGDdShCRtqWjlQzqWgqzNfNjfQWWjt
+mwwnnPFwmVrPmJmzfNzqCjQCbgVlgC
+nPnHHLrHwmJTrCTJpThBscBSdSLGZvZBvRhZ
+RVQQcVlcSRclfZCCCnMJJTSTnC
+NdHwjdwjbBBZrrZrbJDZJJ
+wmhjGGBGwwmjtjtdPlfRcpVQlhRppVJF
+pplbNBPPrppllrFNbpvppSTcwqcWFhTTShhJDTchqd
+RGzRfLjjmZmfmwLftTWhStStJWTdWmDm
+nfsMjQssnpPvNnrPrw
+SjjBgllzlQjBZvlBBgcFbgJHsMhJqbMHPggJbM
+hRLRVDdRRWnJqnnHTqMCnH
+GRfLddRRpVhNVrWSjwQQzSzcGSBQSc
+qMwNqqBdQdnTVBBVVhMVnVFzTHPggTPjGRDzvPTjjmvPDj
+sbSrWJpStrtPtRPttzmmDD
+pfbJJcbsrcLpWLllsnFmcqcwQncnQQqVNQ
+RBTWCMwCwdZThPZcZZ
+pVmVpHLFFFHHVgVmvNmHSQNvddlPPzZJMPcdhclhjczLdZMP
+vnnNnFStGMRDwWnn
+fWDdJTpDJzdBBBdmDSbSRHRwPqbPbHgSbz
+slQtQvNsMVvrrgPRgRglnhwWPH
+sGMMQFrsjvNMfWmdpfFDFZBf
+vnMRMWCMJwWWwwWPjmSdVmLdzvVbLrhL
+HsNfDHQlZpNqfQzbLbrqhjLmVdjd
+dfDZQsNpstHHHptZDDtZWgngtgBMPMMRwCPtBBGW
+HwQwwbwFNWHwHBVFQFLQzRznZnSzcjjjpPbcPpSP
+vTfTJsCmsftJZmTSSdPvzdjRSvPdjd
+TrGtTJfmGDfDhrhJJJsqrZhDBFLHHLLQWFwwlWBVBBVwgLFD
+FFTJRLccQgmTbSsbGm
+PBPPqCvCwqwhQQVhQngmVmSgglmGnHbnmb
+zqthvtQPBfCCzPwQPtwQzPwNLfNRFNLdLRLFRFFNLFdFdW
+nszjQnsPwjznzCCrhJqvjqhmBv
+tFWdHGWFGtctlNNpZBBhmqTrrbWqvTBT
+dlFtcpHDVVVHFdNGHGpGfQgsPDzSMsQwwPwgLLBQ
+TzQqTJGvnnSzqrWTnvfbbcflQcVltfcCMPVM
+jFjNZFFJLpFwmBwblcpptcVtfbbVlR
+jmmJdBBLNdGDWDDrdzqn
+pzddqQmGgbqgGpbJmmdnLZDCRZnZvFlLRZLSlLRT
+rVwchcBBMwVBHhHTZCTSGSCRTZlTDr
+HtccPfjfBhMtVBGHWpNqJdJdpjNJppWz
+WThTWWhtPbZRvvWbbvRTSRMjVRLLgFssgLpVsfSF
+JdwrlJcCwfzdqwwjsjzpLMgVsMFgML
+lQrwHNGJHClvTmfhBmPQmt
+lbRLhcLRpLJzgdGddF
+qvhwqDDCVtBDVhfMVGFnzGGzTBnGzGGgFg
+VjCwCWCMtjVDtChvQhtffcSmHpNWrrcHZHHZpplWbp
+DJVDVdvpmZdPgrCbgbgCJC
+lzczcWwwznGhBgPSvTlCrNgqNC
+wGzzQhzGGsBBGRBcQwGwnwjmmRHpRfmmMpppMjjHDvLL
+HJjJQWjFmmWtFmJTMchghhDwNMhVMWML
+SznPSRfRSSPdrrPSShbDVhbLPwcwGGwVNh
+ddRfzdRrCrRsZDSnFjspvFvqFqFqTvJt
+lflfjQfjvljfbfMLTTDCmHNLNVbL
+HSJnRrrJZJssnGRrnsrcqqRnDCLBMhVCTLVLhVNVJBBBhhBm
+SsrGGqqnSsWSnnqWHSrPfzftvFdvWlwfQgQwWvzz
+nQlsGnFGwwqNJWmJJjpplt
+HMTLPTRdvsTCCThDCZdLdLDNNpJBWJbjJMpBmbtNptBWmm
+DLCzPzTzZDdLdGSGfSGrsnQGzr
+LNPPLHNPHQNQSBFDWDPgggFv
+hszfWCWJhrBMsSSBgvFD
+GGZjfmJTjmZfrJrZrZJRGwNQnlLNHWjLVjlwdVNHpV
+BdNVdTcGVclmTwrTnwPwrHCr
+zttBWzfLsCggHPwDrf
+szsWSMbWzzbqBbzJjtjsvMzzvdmdVpGllpcRNZZhmRpZcGGc
+CjdbMmmmZFnzzgHlttGBVqtBGtsldG
+LvPPWNcFSSRslWhBsllT
+ppccvLPpcSNwLLwrDNNpLvwJHCMDmbCJbFzgmZZmFgbgnM
+TTNRwZqhcTTjsNTTsmrJlvrmmmqqHSrlJH
+fLQCCdtcfCDDVbVVQdFbQbdJHMHrJHrHnMllHdMHPrMdln
+WfQLQWWDbwRTWcRssN
+HQGQWHPDHNjMNQGNWNTWCvZllzqFZqzvvzhCtvFj
+DfgwdgfcFpchztvt
+sRggdwwVdgmnSTnnDBPBNWLn
+WbCZCfTVTTJjSwGdWNDGGw
+MMRqggMsqhlmlhrssHgRnRmRvdzdczvdNGNLzScGDrNzrLNc
+lRqsnRhmqqQnQpgQMlgDqRfBTJVFbJZQtBCbZQJVZFFb
+JnhQcCnmLDsmgmgr
+bbMZppRFGGRPfBMMRGMZssTTrLlLfsLlVLdsLsdn
+GZGSpPGMZtGGPFFRGBCwhvwjjcnJctvQcvHq
+vvrPrHZMGJNRMnqn
+BVChWWcDVWsBwCWwGrJNhRLJJnJtLqnq
+cjDfcfpWWsfWccBsHgPgrPTdpZbbgggv
+GshtVtVtjSCVtVvVGtlVvFZLMvLRZmHmZwbLwZdLdZmR
+JWzNDQzjcgJgQBJgzgMwLLHZZcdPwRLwRdHZ
+QWTppBWfDrrNBTTfffhFCpVSjnhCGsFtsqSl
+nmbCnzHHNzCjCJHJNSCWHLBLrvBrrSGRBDhrDRLrGL
+TVtPllwcgdmTRhLQTQhT
+fdFtccFcpPmggfdfNzHzCMsbCnWnJs
+fMgddvjgRRvjvjVJVdTlZGGtGnrlnqTccNjl
+HHSFSWSmmpbBpZlGncrNGbNtrn
+WDWBDDBDBDCwPBWBDWNQDgzvVvLRvsVLRwvwdJVLwL
+ZSmmvcpsmcJmJvqgBZgZqqtCtZjl
+WhDwhFSDgtBFjnFg
+rTrSTLWTTHNMNwNrMVddwNNhsmJGQcRsRcJGsJzQJsrzPsPm
+GBtLmPsCQqsGqgghZHDzzgLbFz
+zjjVTzTlRjRJfznrvrfpnNhFSghbbNFgHrbHZbDHbH
+vpfcTJVpcVlfcQPMPCGzCBsd
+HMhZNffcPZfNMrzjjFdGcJDjvJ
+VSBVVLlSQQmTVSWpSQzDrHzTTvDvFjFdGGzT
+mQSplVHWbHLSgWQnShNwsZMZPfbsNCRNCt
+MMqvDzLwZzlMqQfdGWPfgPffPglH
+ShTcJshsrRdnrdfrrfHp
+VVRtFhsCJVJVvwQqDdbDQd
+dmnNMlFNvmvljnbpMWNDFQvfQJJGvfPCfHGgQQgcJg
+bRVzLBSSTRBRBBrwTrVtRwCfcGHcsJgJgzgGsggHCzcC
+ZbtVTTrrqrSSVwhqqwBRwFWMDFNdjdZpWjdDDppjMW
+MTzqtbLtwFzJgbHgfbdWWH
+VMNBjNVjvNfhhhhfNPhP
+jmGMvlDZZnVMtzlwzqqCpwFt
+PpzGspGmpPsFLrTnTLzzBg
+QCWvfjfWjRPFZgrvqrBvTg
+wwNRCNQQVNRWjNWfQbHCCClHGDGJdGhpdhtPGhltDlJD
+dhbpGzhllzGlPvnzNcvtNVnc
+gcFMsTJDMMwrZqfjjqvvfnPtqJ
+sWRWTRFwrTgLDDFWgMsTlpSlpbSCdWWdcbmpChGd
+QccdFFFcFbcQPQPHMgpPMp
+NJlNSSMLDfJfmlSqHZRNpRqNBRPRPq
+LlMmJfvDVVTJSmVMscsCFtvwcjWjrjCj
+NVVMGWFSMRVGWSthwhTJWzcJCcJsTs
+jqRLqlfRZcmjcCzT
+rlRRrdrflpdvPbHpflfPlfDBgBMQpGVQMgpVDGMggBDV
+VwRhccRsnQStRhtGQVQVsmjgDgqJdggDjqLDgJlLzmLl
+BWFZpWHBNCBCNBzBNvWBpzHZqqlMqgNdlllDdqDgJDLlfDdd
+pFbTrrrBzbzTtSwStQnnsrVn
+DRfFbFqzbddfPFtsJnJRsnClJRsn
+cgjgQgWvSLVQgmWWgWVjVSSSBTltThLnqJssnTCZsTThntZT
+qjwpSrmWgcSrGMfdFDFdwHFd
+RWjDDWDjDNjjgDtSRRgjcjzFpnzwdFbFNdbFbpnldwFF
+vQfPfTQJbZdThTzL
+PrBQJQsfQqrrbfmPqMBfJbggjRVgWjttsHRSgRctDjSs
+NgqNWqqWWdnJdqpBNFtCmJGCDHttDGDsHsHm
+BjvzhRLTrTBQhTMQRjRRcjPGtmDCZZDZSCmmMSSZmVmSSt
+vQzRvRzQcPcvfQzRnddppFgnFfWwBFlb
+nnPvfvgrtPDHgvvGTRRRPZQGpGCLLV
+FlBsBdbllFdfWpbGMCVMZLVbZQ
+lhchNcqFsJBlBszztvwHjvzgrzmzffgH
+zZhdjTpJJpjmmpPZhvqnnZHqZcggvgMbgv
+tFpFQFSFtBGlFNwFfNMnHfbHcnvcvcfvcqrM
+GBFlNLSNVGVSSGtQSLLBBlNtphDdzpmmPmTPhRmdzdVCCDdR
+rpRCCDLpmnCdJCjn
+vMhSFvgsMGLmnmWMmm
+wVqFFvwvPPHhFhhgHPwHshpqrDDzqlfRbpftRLblrllr
+CRNDzdJCVDWzVgDjdjzRJzWRMTbHsMNZNbZMMbsfhTtMTLMB
+wSlwQcSpqPpcqcqFSqpwslsTfZtLhtlthtBHtTMZ
+SPGFGFFmpcPGDrWDmjDJVffR
+dsmdtJthJphWqHRPnRRsvvnnfR
+cDBMDDDlBZglDZTMDfzVvNRrvNPVHzRRTV
+PGMCCDClBDDbbFqmmhqQdpWGmmWp
+BJjcGhcvCnBdGHsmHSzZDzSDMHmRMQ
+qLWPLVrTwWlwwwrfrFfGDNmDQRMbQMzzmmbQLNMM
+rVWrFlGqlqwVwVGgWGphnvgBBsnvsjdBnCBnBg
+sNNsfBsmcGmgNTcHHSpnTWHnpV
+QlrhlrlMglhDQrdFblvFtMdnDWwSHDWWwnTSjLwVDSwwwT
+QtdMvltZhbFlPPZbQtQthZQdqCsJJGzBqqCBmCNCqgRCBsfP
+SZnQnnHRWRQRVjHnqlJTQPfdlqfJftqG
+pDzmbDBFbBLvvzttfdlTTl
+gsDLLpcmsSZVwlnRsV
+LHsWjwjWqCLsqCHcLsjdLqcdbpMGZPPtBhthbZBpBhMllwPG
+VFnVbbvJSfbgphSpGlhRBBSP
+JrrTgmFgzvNbrmNnmnvzgTLjCQWDLDCsTjssjqcHLc
+QmwwqTqsrdqNNqgtvnVDVcGNNtvv
+WBFBpzzjSJBJzJbfntgPzVzcvPnzDf
+HcpbHZJBFpjpcSZrZsdRQZrCwrwd
+JqmLmbtTWThBTWvWGVSrrVDsSGSG
+wwzRzNjNNbsPVPds
+jfgQRZwpQclQfffHgpRpwpfTcqtLLqCbbFFFLmbmTTBnFB
+fGpcccNNqcctqGMprvMPmbbzFSflSRzPBBlBbS
+JCjnjTZTTGPSGmTFPb
+ZWHhJjHLDVDgHLLDGjnhctsstwqctNwWqNwwQrtv
+sDwQhcwhBDDwrhGsQnRBQHHMHHMNJMZFCFRbCRftMM
+zjjlmjqfdTqlWdzTqmLzlzVjNCHJNHNFMFtbJNZgVNMMCCtN
+vPTfLmPTLWBsPDnSscnS
+ngznwDPPTzhPPDCTQnTTDQBQqHNNrHFVppbbjRFFqFhHqRqr
+tZJtcGsGtLLcctRqVBbbqrspbHNq
+BmZSvGBMdWPzMPgnnz
+MpNWPVNWWZWVVNZHVcvJjgBjJMStMJSjjg
+rzdCzrCTTLRCslvJDSjjdScgDm
+RLhCQzqTCssThRQzRzwGQrrCFffbfWppNpWNWVcHqZbHpVPp
+zQzCVWdSSjCdjpchWcGftflGZcgG
+RwnJTJwmvFHTBFmtBccZZfBGMstllM
+wwvvHRwqDnHFrmqnrSbQVVQfSbqQjbqjbQ
+ttDftStSlftPgSHmJbFwnMnFwzbrLHMMzz
+GqTBqhBqBvppBvMMTznrCbCnLwfr
+RBjjpZZvvZqGcNhjjpNmDPfDcsgfDfgScsQQQg
+rsSFccvBHppHPsvQrSHSprFjnbLGdbzLfbGLLtLjjzLzvl
+JWWJhmwwTDTGtnzlhdbtLG
+CWNqWRNCwnCJVppQFFFFNrgHBB
+MSRVnMjnVRVnPlcsrtMtschgDl
+NWHBwJBwBBQCHHqwWQGBNgdrFFtsthcqdltdDsqttq
+CCTTGCNCCBfNJNNWbGGnvVzDSRfDRSZvLPSzRn
+MpRfjRjWpZzzzRzZSpjzZjTCQcGdHLWNGqdBdcBWWBLccn
+lrbrsPQDPQglDtwggcLCqnCdNNdHBLsqNd
+blwbJggvgbwlvQbvtgwmvVwRfTzfMMjFVfSFjZjMTSTSzj
+ttSGjHWVrwWrWWvhzvhmhDfR
+qMBdNNsccQgfDRzRmqlhRl
+gQJdfJPdQBsMggMjPrTCLjrGrCrtVT
+tGFdlwDwGFdNtStghWWdQFSnTVfCfZhrfVTVCVprnRRhVn
+cLsBPQJsQPmbmPHTnRRnHprCVfns
+MjmvPqqQjPbQzjLwwDWDSlzSlGSgwl
+NSCpFgfbscbZZZwrtgPZJT
+zGCQlVGmmQGVqqJwGtHZGrPHHRTH
+qQvVmvzmqCdhhjzCQLjljLQMnMDSFWcSfnMfpbfnNcFFbFDN
+zFgqjQBmWNlWlfHrHdLc
+wnbCpSSZZTJSJSnmdrtHfGtftlcpltpH
+ZSwhVPPJgNVmNFzs
+WNVJthVHRRfLqpqN
+gdCGcCgJBCrgScRLzbjQQLfRRR
+SCFdGSFvlhTJsnvW
+FFZwFZZwRmFFhHtNLNLGRtsqjLMt
+gbDnnrMbMCffMPbPLNjGNlcppNtspp
+rgbzrzDrgVgnrBzFWMWmWBwHWHShSB
+zjRVjDqzRjvSBnBGGsfsrFsV
+fLccLLZpJMctwJWWWJWpJGCwFwsgnngFBPsCnnTBPT
+LbJlZNWMtpMlHRNHzdfSDfdj
+VGbbnJGSTsVTssTTnVVWMtfBBmvftRHfHBMJJfZp
+ghqtrzgPrjdzQCjmZMHfRHZHBmQmmB
+gltFtDqFVlTVWlTl
+HqNqZDTvNvVTLPSTvzfrfHfdndffwnbdnwrH
+MpSJlFcMJmcpFlmClcMcRnWbWtthrnfwnCGrrWfrwC
+RjcJJmSFMRQpMRFjMNVvTZjNPPvLTBPBBB
+MzClDtlzJzFzNGGm
+bjcLRHlTBsFJGmRm
+HcPSSfTSpLZLbSwtrtvMnlDCDPCl
+gWWgQJCsVhgRLCWsdjpmcBHvfvrrnvCvBB
+TqDtztqtStlbNTPtllqZpvmcFHjNjvjNvHvmrrmj
+ztPPGZqTPSbJgchGgwRQgQ
+wVrdtTqtCCvbNgbNTTDN
+mhGzWhGzMGWGrRmbFLBHZRNHNvZvgB
+hhGhShpnsSrqVCVSSj
+HnlbmGnlHZHnlBcjgwfDVfwLsGLGLDgR
+WhWMWTvQPWPLDMFRCDMsVD
+QdzJQPSPZqJnJRnZ
+TTjTjFBcRBGjwsDTBLmrCftfRVrrCftCVNRP
+WnqbJWnnQJhSqVfVPfDnggfrVN
+hSlDMllvhbQqllZlSWQdSQTBjsFHBjTwGdHBTBszLzcc
+rNWqWDLZWcqFqLLLgQQJnndnQdNzzJVMzd
+cPtsPvChtRsGswHPGbwcPcdVnpzvnmBmVvJBJdJVJdzn
+PfRfRGtsHsSRftbbbbHhwCCsjZgSTgSZWDTcgDZjLqgqFWLq
+BNzPnPJNNMwHJRhBGRWRdjFQddFlFjWd
+npbZrgnLSCSrWFjjdlZGlcDF
+gqtmmngSbmgHJqfqzNBHBJ
+stgzttBPRRRdpSVVpdpS
+WJFcLQmJZHcCFLJmcZLMfbpGSWMNpGftSSpMrb
+mcvvQvHmtLCJmHZQHZHCDHJJnjqPjjPzwvwhnwPqTjPBzPnB
+DDmbbPqgFSbSQPtPQJttrltJ
+CRfcnZWmRRhJNVtsVnQlsp
+fcBvWvWzcZWCzTTCTTvccFMBHGDdSwGFFbqwFSGSmF
+tCRBPCPRjzsJszBmtjmCvSpHcppJpvZdHHHcHZJG
+qbrlLnWlQDQDNvmHHHHcrZZvdm
+nmnWnnWmgQsCFzFCRVCg
+sHMHCDZfcwMcRcLMcZDCRCHMPdJqgjvVdvqgdgfdJbQgvWQb
+FFhTzmzGrnmtjTBjBBprrmFtqGgQqvVdPbbgqQQWJvvWJQqV
+TrNjrnFSlwNZNlNL
+JQGdsdzSzsdFQFSdssnndNlZjNPTJZNljVjTPhVPhT
+GgGLfRmHGLhNVjjNTLhV
+HvGvwpbHHRwpBrvBgSSzSFndtzndCrsFMd
+DptFshMrhDhDwmPPhwSNhmmS
+RLdcdRvBjnvRVcvlcLbCcbCwwpGBwSmfZqqPPPPwzmfqZq
+VlRLvVjCJLnlpvvRdllLcJJWDHgMMHDDHtWFFDDQgH
+SsSdrndpDlCdLftd
+VGPVJgmQrVGHHZfwLlfCTmfwlDlT
+PcJHcGgcWWbJpjRrphRbFpRn
+PdPSMHMLzPPSShBdffMMzMRHQQrpppcqTCQQpCccTGTRCnCQ
+vsbWmFbmJmZFFsmsbfpGVrGnWrrpVpnnVcTV
+JZslstfZNNSSPdlSMwlM
+bLLzRzZLbRqJJrDGGVZdwssDvGQw
+FCtNJlTFtmPfldSvDvQFVVsjSv
+PmCPHBhhPpWLWgzgHJ
+qwmwFHCgPgPPqPwMCrHHFBVVRBttVRRffVfmsjVNNB
+WSvcSnvbSWbhcbjlQbvlSQhlfBGcspVVsVGfVscpzpNcpBtN
+hJSLhlvlTjPFHMLCCq
+bggDpTggncGVVWbQcG
+sRvSwwwFBSpFzvRvMFZqmPmMVqmcmPPVqhqqWq
+SRBBrFZZwrddBFRjlptnLgDnTggdtd
+PPfMcZMflbMQcMllPVfTVMwjWWmZvpWWpWhhjjpdWWww
+sDQNnzsnQgDNsFzFqtGjGmWWSpWrGhdpvphdSW
+nNQNqLBHLqzDnHgnVJfPJPCRBbfCcJlT
+fppppWsjcSDPjjDpGhgwbfTgHTCbHJwbHbTR
+rLBdQnvMNMmFPbLqHqTqgLHCgL
+nrFznvMNMQdttrBcScsDstWcPGtWSc
+lclnRSDnGZtvSwnZDZzhLffqdsCNwTBCBBdNsd
+mPjmjmrFFpmQjMJQjlNdlhCsCLsTlNLs
+ggmrHHVVQVPJpWrgpWScRvzZzGGRnZvlgzZn
+GjGJGQJGcMTVfFDQzNVQzP
+mHqdbmmdnJqVzVhRVNzPbR
+wStmHJsJsLZLjTvM
+QssMbVGdMQjZPjwVwHVZPZClllvgSgvlTgwwSSCgSCtC
+WmmFBmJrcFRBFrJJBFchzWCStgCTgvhvTlfsNqfTlvTv
+sFzzssDLzrBPjDVVddHMQD
+fztDZSGrNrlnbnPTgFFpln
+jvvQMMcLcjJmQwHdJvjQJnnbTbRFRphnnpsWgmFRPR
+vTLHHCQLHBBjJCSZrVCZtSfSfrft
+gHfHffHLjwHrRjLrLRZVMnTdTBsNTBwTVBsBnN
+DWPhqhhDhvSGvWPzSzMBQBQVMMBBmvssvQvQ
+CDGbqCDbChSbWGrHcHRgbcVcfrLJ
+frlTLmtllbbbdpJS
+qFjhzjThjHTFGHTjqhhjMzBhVpVpdbBnSJQRpBnVVdbRRQJd
+vjWPWjWPPPWgwmfCrNvTvZ
diff --git a/src/adventofcode2022/solutions/day03.py b/src/adventofcode2022/solutions/day03.py
new file mode 100644
index 00000000..6b92258b
--- /dev/null
+++ b/src/adventofcode2022/solutions/day03.py
@@ -0,0 +1,41 @@
+from adventofcode2022.utils.abstract import FileReaderSolution
+
+
+class Day03:
+    @staticmethod
+    def char_to_value(char) -> int:
+        if char.isupper():
+            value = ord(char) - ord("A") + 27
+        else:
+            value = ord(char) - ord("a") + 1
+        return value
+
+
+class Day03PartA(Day03, FileReaderSolution):
+    def solve(self, input_data: str) -> int:
+        total_value = 0
+        for line in input_data.splitlines():
+            values = [self.char_to_value(char) for char in line]
+
+            # Split in half
+            first = set(values[: len(values) // 2])
+            second = set(values[len(values) // 2 :])
+            difference = first.intersection(second)
+            total_value += difference.pop()
+
+        return total_value
+
+
+class Day03PartB(Day03, FileReaderSolution):
+    def solve(self, input_data: str) -> int:
+        lines = input_data.splitlines()
+        total_value = 0
+
+        for n in range(0, len(lines), 3):
+            first = set(self.char_to_value(char) for char in lines[n])
+            second = set(self.char_to_value(char) for char in lines[n + 1])
+            third = set(self.char_to_value(char) for char in lines[n + 2])
+            difference = first.intersection(second).intersection(third)
+            total_value += difference.pop()
+
+        return total_value
diff --git a/tests/solutions/test_day03_a.py b/tests/solutions/test_day03_a.py
new file mode 100644
index 00000000..2cd358f0
--- /dev/null
+++ b/tests/solutions/test_day03_a.py
@@ -0,0 +1,38 @@
+from textwrap import dedent
+
+import pytest
+
+from adventofcode2022.solutions.day03 import Day03PartA
+
+
+class TestDay03PartA:
+    @pytest.mark.parametrize(
+        ("input_data", "expected_result"),
+        [
+            ("a", 1),
+            ("z", 26),
+            ("A", 27),
+            ("Z", 52),
+        ],
+    )
+    def test_char_to_value(self, input_data, expected_result):
+        assert Day03PartA.char_to_value(input_data) == expected_result
+
+    def test_day03a_solve(self):
+        test_data = """\
+        JrwpWtwJgWrhcsFMMfFFhFp
+        jqHRNqRjqzjGDLGLrsFMfFZSrLrFZsSL
+        PmmdzqPrVvPwwTWBwg
+        wMqvLMZHhHMvwLHjbvcjnnSBnvTQFn
+        ttgJtRGJQctTZtZT
+        CrZsJsPPZsGzwwsLwLmpwMDw
+        """
+        solution = Day03PartA()
+        result = solution.solve(dedent(test_data))
+        assert result == 157
+
+    def test_day03a_data(self):
+        """Result we got when we did the real solution"""
+        solution = Day03PartA()
+        res = solution("day_03/day03.txt")
+        assert res == 8153
diff --git a/tests/solutions/test_day03_b.py b/tests/solutions/test_day03_b.py
new file mode 100644
index 00000000..bab2df8b
--- /dev/null
+++ b/tests/solutions/test_day03_b.py
@@ -0,0 +1,24 @@
+from textwrap import dedent
+
+from adventofcode2022.solutions.day03 import Day03PartB
+
+
+class TestDay03PartB:
+    def test_day03b_solve(self):
+        test_data = """\
+        JrwpWtwJgWrhcsFMMfFFhFp
+        jqHRNqRjqzjGDLGLrsFMfFZSrLrFZsSL
+        PmmdzqPrVvPwwTWBwg
+        wMqvLMZHhHMvwLHjbvcjnnSBnvTQFn
+        ttgJtRGJQctTZtZT
+        CrZsJsPPZsGzwwsLwLmpwMDw
+        """
+        solution = Day03PartB()
+        result = solution.solve(dedent(test_data))
+        assert result == 70
+
+    def test_day03b_data(self):
+        """Result we got when we did the real solution"""
+        solution = Day03PartB()
+        res = solution("day_03/day03.txt")
+        assert res == 2342

From 2cfd501d3be569347f08e559f2f5eda0759282b8 Mon Sep 17 00:00:00 2001
From: Roel Adriaans <roel.adriaans@ordina.nl>
Date: Sun, 4 Dec 2022 18:08:58 +0100
Subject: [PATCH 182/371] Implement day 4

---
 .../solutions/data/day_04/day04.txt           | 1000 +++++++++++++++++
 src/adventofcode2022/solutions/day04.py       |   55 +
 tests/solutions/test_day04_a.py               |   24 +
 tests/solutions/test_day04_b.py               |   24 +
 4 files changed, 1103 insertions(+)
 create mode 100644 src/adventofcode2022/solutions/data/day_04/day04.txt
 create mode 100644 src/adventofcode2022/solutions/day04.py
 create mode 100644 tests/solutions/test_day04_a.py
 create mode 100644 tests/solutions/test_day04_b.py

diff --git a/src/adventofcode2022/solutions/data/day_04/day04.txt b/src/adventofcode2022/solutions/data/day_04/day04.txt
new file mode 100644
index 00000000..20a83ca7
--- /dev/null
+++ b/src/adventofcode2022/solutions/data/day_04/day04.txt
@@ -0,0 +1,1000 @@
+30-31,2-31
+6-92,4-5
+35-39,42-44
+35-95,35-95
+12-98,99-99
+10-15,16-94
+37-85,84-84
+2-23,31-56
+52-68,51-69
+47-62,25-52
+9-62,61-61
+78-99,77-99
+92-94,11-93
+77-83,62-76
+3-7,29-59
+12-96,96-97
+48-48,12-47
+72-86,71-86
+6-90,90-95
+5-92,2-4
+11-63,1-64
+72-72,72-82
+65-68,68-69
+3-99,5-99
+5-80,5-5
+40-93,41-93
+27-31,25-58
+6-93,93-93
+25-75,75-76
+31-78,79-79
+16-60,33-86
+38-65,39-97
+46-52,45-88
+13-64,12-80
+53-53,35-52
+32-38,12-30
+43-49,42-96
+4-23,24-77
+32-63,27-64
+46-72,23-73
+78-89,56-88
+42-78,79-79
+2-87,2-88
+51-57,57-58
+56-63,55-63
+2-12,21-62
+5-7,6-41
+57-86,87-92
+17-18,17-42
+11-84,7-10
+13-75,4-75
+15-76,14-14
+96-96,2-97
+68-94,43-95
+57-66,67-85
+5-52,20-88
+25-62,25-62
+3-82,81-83
+88-89,85-88
+31-49,30-68
+58-60,59-61
+16-33,15-16
+13-97,13-66
+4-87,10-86
+6-6,7-99
+33-35,34-98
+48-88,82-89
+31-73,30-74
+1-95,2-95
+11-87,10-86
+60-61,21-60
+51-91,51-52
+15-37,16-38
+5-10,10-32
+23-25,24-34
+21-40,21-40
+12-52,13-31
+10-10,10-94
+41-82,4-82
+5-48,6-34
+73-81,42-72
+62-77,76-82
+41-82,56-83
+19-52,18-39
+19-92,54-93
+2-39,2-40
+95-96,3-95
+7-70,6-92
+7-89,6-58
+67-88,68-80
+14-74,73-86
+41-41,33-40
+2-91,8-90
+69-81,11-80
+8-90,9-98
+62-87,86-86
+7-70,39-69
+4-9,3-12
+4-96,11-95
+1-21,3-22
+18-24,92-99
+34-87,7-90
+96-99,82-88
+6-50,6-34
+13-53,12-54
+2-98,3-95
+8-11,17-91
+26-92,3-56
+36-61,46-84
+86-86,22-85
+20-76,76-76
+21-80,21-30
+34-78,55-90
+12-96,11-95
+43-43,15-44
+54-88,53-89
+37-37,50-66
+23-95,7-11
+7-58,21-59
+3-5,4-68
+5-75,8-76
+42-68,42-67
+36-36,36-47
+9-69,9-92
+30-56,36-80
+12-85,13-84
+11-64,65-87
+41-60,60-61
+2-30,31-41
+23-60,9-35
+87-89,15-88
+4-97,96-98
+9-92,9-91
+40-66,66-66
+39-95,69-96
+48-87,23-47
+5-96,6-95
+18-66,19-65
+5-38,39-61
+12-92,93-93
+9-97,10-97
+16-51,50-67
+3-14,14-28
+7-7,8-88
+6-45,5-36
+58-58,40-58
+8-56,7-56
+5-15,6-14
+97-97,7-96
+26-70,27-94
+20-21,20-91
+3-16,3-13
+9-10,9-92
+16-81,67-94
+72-88,6-73
+4-88,3-68
+25-53,24-54
+63-75,63-74
+31-31,31-56
+1-84,1-83
+41-89,40-67
+4-53,5-54
+13-83,13-14
+11-87,11-86
+4-63,4-63
+9-96,8-97
+2-74,1-88
+40-83,39-83
+46-71,45-75
+4-74,74-75
+99-99,72-98
+33-51,52-82
+22-69,22-23
+35-36,36-91
+8-97,97-98
+18-20,19-94
+6-16,7-17
+35-36,36-97
+4-78,79-79
+14-69,4-14
+50-64,19-51
+10-31,15-17
+52-74,74-74
+42-91,90-91
+35-69,10-70
+1-3,4-4
+37-66,67-67
+6-92,73-74
+21-96,21-97
+6-37,6-68
+25-78,79-92
+78-88,65-75
+14-99,8-8
+39-66,54-67
+33-80,79-91
+15-83,84-84
+51-51,10-50
+72-80,72-81
+4-92,2-24
+33-93,92-94
+4-10,4-68
+8-94,7-96
+1-39,38-69
+6-36,36-37
+86-86,31-85
+77-94,76-96
+8-75,17-76
+7-93,7-45
+8-61,40-70
+17-29,32-94
+26-26,12-25
+14-94,10-12
+29-42,32-39
+2-91,2-3
+12-85,28-86
+57-70,71-90
+9-16,17-87
+17-55,18-55
+18-98,19-19
+88-88,22-87
+5-93,4-92
+75-76,76-84
+5-6,6-41
+42-94,36-41
+52-66,1-62
+5-82,4-4
+1-87,3-88
+47-58,56-61
+7-57,7-97
+39-93,33-93
+31-48,20-32
+18-81,19-82
+16-77,17-78
+2-2,4-43
+22-23,23-93
+10-11,15-68
+89-95,15-88
+19-69,18-18
+85-98,34-84
+47-73,29-52
+56-56,23-55
+2-97,2-94
+34-64,17-63
+46-46,47-75
+15-90,91-91
+63-63,35-62
+46-56,52-89
+82-90,82-90
+17-23,5-7
+7-79,8-79
+40-76,39-71
+81-82,11-99
+31-41,37-44
+97-98,1-98
+13-92,11-16
+63-63,3-62
+10-23,27-46
+18-99,19-80
+43-65,55-56
+14-14,14-20
+14-75,15-74
+24-75,12-45
+32-32,33-83
+4-92,2-3
+35-50,34-72
+11-90,91-91
+62-84,78-97
+64-64,24-65
+13-93,12-94
+70-89,58-88
+35-44,36-43
+57-90,91-91
+19-20,20-96
+33-96,26-87
+9-61,10-62
+2-81,1-3
+69-98,69-98
+60-66,64-97
+8-8,4-7
+33-76,32-77
+35-96,34-86
+87-92,66-86
+5-39,8-67
+27-78,79-80
+5-98,1-1
+6-79,5-95
+65-87,88-88
+50-98,49-49
+55-58,54-60
+13-97,12-96
+74-74,1-73
+12-61,64-74
+10-98,10-11
+68-70,17-69
+41-58,13-65
+7-77,6-77
+50-95,41-49
+4-68,2-4
+14-54,14-40
+59-93,60-82
+21-95,26-95
+41-81,41-62
+41-89,40-88
+21-39,22-40
+30-94,29-88
+1-93,1-93
+5-78,4-79
+15-86,85-87
+89-90,17-89
+47-85,48-85
+84-84,83-85
+6-98,6-6
+3-92,3-93
+9-9,8-60
+36-90,6-35
+57-61,56-58
+4-92,3-93
+7-69,8-69
+78-78,4-79
+52-93,53-93
+30-90,30-91
+58-78,77-79
+21-41,42-53
+16-37,6-38
+2-77,3-77
+6-55,17-69
+36-73,37-71
+93-94,26-93
+22-79,22-79
+11-92,91-93
+1-62,3-65
+9-65,8-64
+11-32,7-33
+5-94,2-5
+80-82,80-81
+46-77,45-76
+2-98,1-99
+2-4,6-68
+56-83,55-82
+12-14,13-98
+78-90,5-80
+3-69,2-2
+83-83,76-82
+3-99,1-1
+28-72,28-50
+57-67,32-54
+4-99,7-98
+18-18,19-48
+79-85,84-84
+83-89,81-87
+31-89,30-87
+49-72,49-71
+28-29,28-51
+48-97,1-47
+13-45,8-12
+24-75,25-75
+63-89,76-86
+16-23,15-16
+25-49,26-48
+17-94,16-88
+6-95,7-96
+87-90,86-89
+11-93,3-95
+6-66,5-65
+97-99,39-98
+23-66,24-65
+54-56,55-70
+92-97,26-90
+7-86,7-87
+60-78,77-79
+90-95,71-94
+32-87,33-87
+13-13,14-72
+12-86,6-87
+24-44,45-75
+5-96,5-97
+2-83,7-79
+95-97,1-90
+72-80,73-75
+11-85,12-86
+7-50,8-8
+35-99,55-79
+56-98,57-99
+6-87,7-87
+28-72,27-71
+20-77,78-83
+8-67,68-83
+10-68,9-9
+35-63,35-64
+90-90,90-90
+5-97,1-99
+10-93,9-19
+6-90,4-77
+46-75,80-97
+9-77,10-82
+73-88,74-81
+43-65,43-44
+66-82,66-81
+62-63,63-77
+35-76,11-77
+22-93,89-90
+3-96,2-3
+11-29,2-33
+75-82,62-81
+46-47,46-53
+9-99,8-98
+32-93,33-87
+47-51,52-60
+18-83,84-84
+31-70,31-69
+26-93,19-92
+93-93,4-92
+2-14,4-35
+1-98,36-99
+7-83,82-96
+95-95,32-95
+34-39,9-38
+2-63,62-93
+24-98,99-99
+26-50,89-93
+82-97,35-81
+22-33,16-33
+1-5,11-66
+9-63,9-63
+36-36,36-77
+5-98,6-99
+22-93,50-92
+89-92,89-93
+48-90,91-91
+6-88,7-89
+27-38,38-84
+9-87,11-40
+24-83,23-82
+1-69,1-68
+16-67,62-65
+13-15,1-85
+41-65,40-42
+19-77,20-77
+44-93,45-93
+27-94,94-97
+12-97,12-96
+9-38,8-48
+22-49,6-49
+12-18,13-52
+14-52,13-14
+12-51,13-52
+10-36,37-37
+14-72,13-15
+2-99,72-81
+21-34,22-22
+86-86,60-85
+20-36,20-20
+10-96,11-96
+14-24,15-23
+8-96,8-95
+16-22,22-23
+32-90,33-97
+7-31,32-67
+35-68,22-77
+3-69,5-69
+13-62,12-61
+26-32,27-32
+68-77,67-76
+5-99,6-98
+2-56,8-65
+96-99,11-67
+3-25,15-24
+25-91,84-90
+9-39,10-38
+24-94,23-24
+78-80,29-79
+4-47,5-85
+39-81,81-82
+33-33,13-32
+31-69,32-83
+19-95,17-21
+75-75,74-74
+14-89,15-98
+4-99,6-98
+60-90,59-66
+50-72,46-73
+26-84,25-49
+9-77,8-77
+48-99,49-94
+91-95,10-90
+7-63,24-64
+79-85,11-80
+98-99,20-82
+2-98,1-97
+56-68,54-67
+30-30,31-87
+89-96,58-88
+6-56,3-5
+12-49,15-62
+26-33,26-66
+18-18,19-98
+13-27,14-26
+12-15,3-19
+5-98,46-98
+4-89,3-90
+5-15,5-19
+85-88,45-87
+94-97,97-98
+24-34,34-77
+55-56,2-55
+6-86,7-87
+42-50,43-50
+16-57,17-58
+3-22,2-3
+56-57,56-96
+5-91,82-92
+30-53,53-54
+12-25,13-47
+72-90,90-91
+15-49,49-89
+5-81,6-37
+57-58,58-82
+11-65,2-10
+41-97,42-96
+55-71,54-70
+4-81,1-98
+2-65,1-49
+7-45,6-45
+98-98,8-98
+8-93,41-92
+1-90,2-98
+14-93,43-92
+66-97,98-98
+36-87,87-88
+2-62,4-61
+22-76,23-76
+49-54,50-55
+50-53,52-94
+45-95,75-96
+22-77,78-78
+71-73,72-86
+9-83,10-82
+1-56,53-54
+71-71,63-70
+7-73,7-8
+6-9,6-66
+10-98,97-98
+4-50,50-50
+7-95,7-91
+6-7,7-96
+73-73,1-73
+43-68,44-77
+26-30,25-31
+92-92,9-92
+88-89,1-88
+12-97,96-98
+91-91,59-90
+4-9,3-16
+16-97,96-96
+50-89,49-90
+94-96,84-95
+55-71,70-72
+16-90,5-16
+1-96,3-95
+5-35,7-34
+16-72,16-54
+3-99,1-2
+8-87,10-88
+10-98,10-98
+8-67,4-69
+23-79,72-72
+17-74,17-75
+57-77,77-78
+74-84,85-98
+22-64,30-65
+3-73,1-72
+1-78,31-91
+4-93,4-94
+51-88,51-79
+5-19,19-99
+68-68,31-67
+2-98,3-3
+48-63,47-64
+67-71,72-73
+9-42,9-54
+2-50,2-39
+53-53,3-54
+36-37,36-69
+63-74,64-73
+14-65,13-65
+41-94,98-98
+1-60,6-99
+95-98,80-94
+71-74,32-78
+31-31,31-31
+6-7,6-33
+5-95,96-98
+5-93,6-94
+52-88,51-89
+55-76,55-77
+4-98,3-96
+59-89,58-94
+10-88,9-86
+13-97,13-96
+18-97,10-16
+7-98,4-97
+84-85,14-84
+26-88,76-87
+52-72,71-81
+38-52,39-52
+22-88,1-89
+7-97,2-7
+4-25,3-25
+43-73,42-74
+26-26,25-47
+34-84,40-84
+8-69,7-68
+2-52,1-85
+52-60,52-61
+38-71,37-70
+28-86,27-85
+99-99,7-98
+45-67,8-81
+7-93,7-58
+37-56,28-56
+29-99,66-98
+78-98,7-97
+4-72,3-77
+1-3,2-73
+1-14,2-35
+12-13,12-95
+40-84,84-84
+12-56,28-47
+3-96,1-39
+58-74,74-74
+24-32,24-32
+11-91,5-10
+41-69,36-97
+9-92,8-59
+40-51,39-52
+97-99,16-96
+34-96,33-69
+68-86,30-87
+45-96,44-98
+12-89,6-12
+5-81,32-89
+5-8,6-9
+4-42,1-2
+32-42,79-96
+5-96,4-95
+54-62,12-62
+30-86,86-86
+50-58,58-58
+41-61,40-62
+1-99,2-99
+21-52,20-20
+17-69,1-17
+3-97,2-96
+35-37,36-57
+8-32,9-11
+3-4,4-99
+92-96,72-92
+2-3,2-90
+34-40,41-69
+81-98,65-80
+12-57,58-58
+39-40,14-39
+47-77,78-93
+5-5,6-91
+24-87,86-93
+31-80,30-80
+32-82,33-55
+61-75,62-74
+16-98,16-99
+19-21,22-86
+54-54,16-53
+40-74,21-28
+20-28,28-76
+94-96,47-71
+25-74,74-75
+39-81,3-67
+5-97,2-52
+21-63,62-62
+7-53,6-84
+60-88,59-60
+23-61,24-61
+76-93,77-94
+17-30,30-86
+10-23,9-77
+6-90,5-96
+38-69,37-39
+1-3,4-94
+73-74,3-74
+70-83,41-84
+72-79,78-83
+56-76,15-67
+92-92,6-93
+2-90,89-89
+19-19,20-90
+18-79,17-80
+11-11,2-16
+95-95,57-95
+51-93,52-86
+47-52,53-96
+1-5,13-43
+44-63,62-64
+43-97,42-42
+46-54,45-53
+7-61,8-21
+18-79,41-80
+54-56,28-55
+7-54,11-54
+12-61,62-62
+80-81,80-94
+38-39,38-76
+8-94,26-83
+3-66,2-4
+6-27,7-26
+2-96,71-86
+67-99,66-98
+28-73,27-90
+2-93,1-93
+80-95,72-94
+88-90,24-89
+93-93,22-93
+36-86,51-92
+25-63,24-63
+90-91,12-84
+9-46,10-46
+31-31,17-31
+51-52,49-51
+14-18,2-12
+72-73,64-73
+6-82,10-81
+58-84,15-15
+51-78,52-68
+54-56,60-68
+78-79,6-78
+96-96,95-96
+28-81,43-82
+5-95,5-5
+2-17,1-99
+10-94,9-61
+85-87,3-91
+2-73,14-72
+95-95,21-94
+17-57,37-81
+95-95,4-95
+28-84,12-93
+4-98,1-1
+96-97,7-97
+60-99,61-99
+97-97,7-98
+73-74,5-74
+59-94,60-60
+83-85,84-91
+2-5,5-40
+29-79,28-78
+37-67,26-54
+28-39,10-41
+84-84,85-85
+19-69,12-68
+29-31,30-32
+58-77,57-59
+17-25,24-26
+37-80,36-81
+16-84,16-97
+3-97,1-96
+7-63,7-64
+7-54,6-54
+14-47,13-46
+13-64,55-67
+19-36,35-35
+67-80,67-79
+8-66,5-35
+56-93,44-55
+6-74,15-90
+64-85,21-71
+22-22,23-27
+16-87,87-88
+80-82,81-84
+3-89,2-89
+43-95,16-96
+67-69,3-88
+8-82,4-95
+28-93,28-93
+23-62,22-24
+73-98,73-73
+84-92,91-91
+55-81,54-55
+52-60,40-59
+19-20,20-95
+30-90,29-90
+57-72,23-71
+71-74,74-75
+9-88,38-92
+44-89,43-90
+17-80,79-85
+60-67,59-67
+44-51,31-84
+79-80,15-79
+79-84,68-85
+97-98,30-96
+22-94,23-95
+95-95,1-95
+11-98,11-99
+49-92,82-91
+43-52,44-51
+76-86,51-81
+23-68,32-69
+22-40,22-23
+65-94,81-94
+36-89,88-90
+7-96,4-97
+6-6,9-19
+82-85,33-85
+65-67,66-93
+94-95,67-89
+85-85,77-84
+60-89,83-90
+6-21,2-75
+20-91,16-19
+95-97,51-94
+21-82,8-8
+16-19,20-83
+96-97,8-81
+34-90,5-94
+94-95,70-94
+27-80,27-81
+12-83,13-13
+91-94,8-92
+6-80,5-79
+12-21,12-20
+29-64,28-63
+32-72,23-71
+54-56,54-57
+68-69,11-68
+5-99,4-95
+34-55,35-56
+42-71,42-72
+21-94,93-96
+8-8,8-96
+26-99,25-97
+30-75,2-29
+27-58,28-52
+29-75,28-76
+3-77,3-78
+11-35,11-36
+26-43,38-41
+51-56,33-57
+19-21,20-98
+48-93,47-48
+2-81,31-75
+17-75,16-16
+57-82,48-48
+24-74,25-65
+20-20,21-21
+78-96,77-79
+4-97,4-98
+4-30,19-31
+11-97,10-89
+21-64,1-64
+31-99,16-98
+38-47,40-40
+27-95,12-17
+51-93,51-92
+90-91,6-91
+26-27,16-26
+3-78,1-1
+51-51,52-92
+38-42,32-36
+36-46,10-67
+7-70,6-71
+52-81,51-81
+74-74,75-84
+28-64,29-29
+15-47,15-16
+4-94,95-95
+15-65,15-97
+98-98,1-99
+41-97,42-98
+84-94,90-95
+15-82,83-83
+3-10,10-73
+90-97,5-96
+29-81,29-45
+64-93,5-99
+26-95,25-26
+37-49,38-50
+32-96,10-33
+28-30,28-31
+18-75,19-75
+49-51,17-50
+16-46,15-17
+3-4,3-95
+7-30,30-31
+9-96,9-95
+22-38,18-39
+29-32,50-89
+98-99,1-99
+81-97,9-83
+32-38,64-69
+35-52,51-53
+17-96,17-98
+14-97,98-98
+10-66,11-65
+4-91,4-91
+52-76,73-74
+17-17,16-17
+6-73,7-74
+9-90,9-89
+42-74,42-84
+68-77,69-77
+42-79,40-51
+15-89,15-90
+4-86,3-3
+43-46,40-46
+3-97,2-98
+13-26,12-97
+91-93,15-92
+4-89,4-99
+41-66,14-40
+30-71,31-71
+57-61,38-60
+36-99,35-98
+36-91,20-36
+80-81,16-80
+1-99,4-96
+24-80,25-80
+1-98,2-99
+17-43,17-44
+4-99,2-2
+11-46,11-45
+70-92,69-86
+15-15,3-14
+5-80,7-81
+33-91,52-60
+62-68,4-62
+23-33,22-33
+21-71,7-72
+41-63,40-62
+19-20,20-26
+9-87,8-86
+90-90,91-96
+31-32,50-68
+21-35,31-85
+14-98,15-15
+95-96,46-95
+9-64,10-21
+92-98,30-66
+66-86,79-95
+1-71,34-71
+31-92,91-93
+21-25,8-17
+17-49,1-69
+3-88,2-98
+54-86,53-55
+29-79,95-96
+4-25,3-25
+2-44,3-61
+34-85,33-35
+8-10,8-11
+95-97,45-98
+63-92,62-93
+61-79,60-80
+36-85,20-36
+45-71,10-53
+56-85,52-84
+40-86,41-86
+6-83,4-78
+18-53,19-54
+69-73,69-72
+3-76,75-75
+28-88,19-60
+3-85,10-85
+36-69,35-69
+58-82,57-82
+16-98,15-99
+71-84,84-85
+7-68,42-67
+3-69,70-70
+2-10,7-11
+59-91,27-91
+4-99,5-94
+71-84,30-70
+28-28,12-27
+52-88,14-26
+91-91,42-90
+6-56,5-42
+15-37,17-53
+10-86,86-87
+11-91,4-92
+46-46,19-45
+37-92,37-96
+58-60,35-59
+6-33,5-33
+34-34,13-34
+3-62,1-1
+33-64,49-61
+37-45,36-52
+13-96,8-82
+3-99,2-3
+41-66,27-67
+85-87,20-86
+9-26,8-25
diff --git a/src/adventofcode2022/solutions/day04.py b/src/adventofcode2022/solutions/day04.py
new file mode 100644
index 00000000..65f4b3b8
--- /dev/null
+++ b/src/adventofcode2022/solutions/day04.py
@@ -0,0 +1,55 @@
+from adventofcode2022.utils.abstract import FileReaderSolution
+
+
+class Day04:
+    @staticmethod
+    def parse(lines) -> list[tuple[range, range]]:
+        ranges = []
+        for line in lines:
+            pair1, pair2 = line.split(",")
+            start1, stop1 = pair1.split("-")
+            start2, stop2 = pair2.split("-")
+            range1 = range(int(start1), int(stop1) + 1)
+            range2 = range(int(start2), int(stop2) + 1)
+            ranges.append((range1, range2))
+        return ranges
+
+
+class Day04PartA(Day04, FileReaderSolution):
+    @staticmethod
+    def fully_in_range(range1: range, range2: range) -> bool:
+        lst1 = list(range1)
+        lst2 = list(range2)
+        for i in lst1:
+            if i not in lst2:
+                return False
+        return True
+
+    def solve(self, input_data: str) -> int:
+        ranges = self.parse(input_data.splitlines())
+        total = 0
+        for range1, range2 in ranges:
+            if self.fully_in_range(range1, range2) or self.fully_in_range(
+                range2, range1
+            ):
+                total += 1
+        return total
+
+
+class Day04PartB(Day04, FileReaderSolution):
+    @staticmethod
+    def any_in_range(range1: range, range2: range) -> bool:
+        lst1 = list(range1)
+        lst2 = list(range2)
+        for i in lst1:
+            if i in lst2:
+                return True
+        return False
+
+    def solve(self, input_data: str) -> int:
+        ranges = self.parse(input_data.splitlines())
+        total = 0
+        for range1, range2 in ranges:
+            if self.any_in_range(range1, range2) or self.any_in_range(range2, range1):
+                total += 1
+        return total
diff --git a/tests/solutions/test_day04_a.py b/tests/solutions/test_day04_a.py
new file mode 100644
index 00000000..d30b898c
--- /dev/null
+++ b/tests/solutions/test_day04_a.py
@@ -0,0 +1,24 @@
+from textwrap import dedent
+
+from adventofcode2022.solutions.day04 import Day04PartA
+
+
+class TestDay04PartA:
+    def test_day04a_solve(self):
+        test_data = """\
+        2-4,6-8
+        2-3,4-5
+        5-7,7-9
+        2-8,3-7
+        6-6,4-6
+        2-6,4-8
+        """
+        solution = Day04PartA()
+        result = solution.solve(dedent(test_data))
+        assert result == 2
+
+    def test_day04a_data(self):
+        """Result we got when we did the real solution"""
+        solution = Day04PartA()
+        res = solution("day_04/day04.txt")
+        assert res == 444
diff --git a/tests/solutions/test_day04_b.py b/tests/solutions/test_day04_b.py
new file mode 100644
index 00000000..8bd7b95c
--- /dev/null
+++ b/tests/solutions/test_day04_b.py
@@ -0,0 +1,24 @@
+from textwrap import dedent
+
+from adventofcode2022.solutions.day04 import Day04PartB
+
+
+class TestDay04PartB:
+    def test_day04b_solve(self):
+        test_data = """\
+        2-4,6-8
+        2-3,4-5
+        5-7,7-9
+        2-8,3-7
+        6-6,4-6
+        2-6,4-8
+        """
+        solution = Day04PartB()
+        result = solution.solve(dedent(test_data))
+        assert result == 4
+
+    def test_day04b_data(self):
+        """Result we got when we did the real solution"""
+        solution = Day04PartB()
+        res = solution("day_04/day04.txt")
+        assert res == 801

From d583d6abe6137407e3d50ae8be509ed6417a4290 Mon Sep 17 00:00:00 2001
From: Roel Adriaans <roel.adriaans@ordina.nl>
Date: Sun, 4 Dec 2022 18:15:08 +0100
Subject: [PATCH 183/371] Simply at scale

---
 src/adventofcode2022/solutions/day04.py | 53 +++++++++----------------
 1 file changed, 18 insertions(+), 35 deletions(-)

diff --git a/src/adventofcode2022/solutions/day04.py b/src/adventofcode2022/solutions/day04.py
index 65f4b3b8..6d75f88f 100644
--- a/src/adventofcode2022/solutions/day04.py
+++ b/src/adventofcode2022/solutions/day04.py
@@ -1,7 +1,18 @@
 from adventofcode2022.utils.abstract import FileReaderSolution
 
 
-class Day04:
+class Day04(FileReaderSolution):
+    @staticmethod
+    def in_range(range1: range, range2: range) -> bool:
+        raise NotImplementedError
+
+    def solve(self, input_data: str) -> int:
+        ranges = self.parse(input_data.splitlines())
+        return sum(
+            self.in_range(range1, range2) or self.in_range(range2, range1)
+            for range1, range2 in ranges
+        )
+
     @staticmethod
     def parse(lines) -> list[tuple[range, range]]:
         ranges = []
@@ -15,41 +26,13 @@ def parse(lines) -> list[tuple[range, range]]:
         return ranges
 
 
-class Day04PartA(Day04, FileReaderSolution):
+class Day04PartA(Day04):
     @staticmethod
-    def fully_in_range(range1: range, range2: range) -> bool:
-        lst1 = list(range1)
-        lst2 = list(range2)
-        for i in lst1:
-            if i not in lst2:
-                return False
-        return True
-
-    def solve(self, input_data: str) -> int:
-        ranges = self.parse(input_data.splitlines())
-        total = 0
-        for range1, range2 in ranges:
-            if self.fully_in_range(range1, range2) or self.fully_in_range(
-                range2, range1
-            ):
-                total += 1
-        return total
+    def in_range(range1: range, range2: range) -> bool:
+        return all(i in range2 for i in range1)
 
 
-class Day04PartB(Day04, FileReaderSolution):
+class Day04PartB(Day04):
     @staticmethod
-    def any_in_range(range1: range, range2: range) -> bool:
-        lst1 = list(range1)
-        lst2 = list(range2)
-        for i in lst1:
-            if i in lst2:
-                return True
-        return False
-
-    def solve(self, input_data: str) -> int:
-        ranges = self.parse(input_data.splitlines())
-        total = 0
-        for range1, range2 in ranges:
-            if self.any_in_range(range1, range2) or self.any_in_range(range2, range1):
-                total += 1
-        return total
+    def in_range(range1: range, range2: range) -> bool:
+        return any(i in range2 for i in range1)

From e3f37558ea9f84d6c9eb444e7873e218264a7978 Mon Sep 17 00:00:00 2001
From: Roel Adriaans <roel.adriaans@ordina.nl>
Date: Sun, 4 Dec 2022 18:15:21 +0100
Subject: [PATCH 184/371] Remove flake8-colors, this is now implemented in
 flake8 itself

---
 tox.ini | 2 --
 1 file changed, 2 deletions(-)

diff --git a/tox.ini b/tox.ini
index 0188e1e1..c2fff107 100644
--- a/tox.ini
+++ b/tox.ini
@@ -27,7 +27,6 @@ exclude =
     build
     env
     .tox
-format = ${cyan}%(path)s${reset}:${yellow_bold}%(row)d${reset}:${green_bold}%(col)d${reset}: ${red_bold}%(code)s${reset} %(text)s
 
 [isort]
 multi_line_output = 3
@@ -68,7 +67,6 @@ commands =
 skip_install = true
 deps =
     flake8
-    flake8-colors
     pep8-naming
 commands =
     flake8 \

From 31ee75558b15568fc7f28e2ac98fa8b9d0a09bed Mon Sep 17 00:00:00 2001
From: Roel Adriaans <roel.adriaans@ordina.nl>
Date: Sun, 4 Dec 2022 19:37:03 +0100
Subject: [PATCH 185/371] Implement parse module

---
 mypy.ini                                |   3 +
 poetry.lock                             | 342 +++++-------------------
 pyproject.toml                          |   1 +
 src/adventofcode2022/solutions/day04.py |  12 +-
 4 files changed, 70 insertions(+), 288 deletions(-)

diff --git a/mypy.ini b/mypy.ini
index 733d3a49..1abd6dc6 100644
--- a/mypy.ini
+++ b/mypy.ini
@@ -18,3 +18,6 @@ ignore_missing_imports = True
 
 [mypy-bs4]
 ignore_missing_imports = True
+
+[mypy-parse]
+ignore_missing_imports = True
diff --git a/poetry.lock b/poetry.lock
index 38e8766a..e7c2a855 100644
--- a/poetry.lock
+++ b/poetry.lock
@@ -33,10 +33,10 @@ optional = false
 python-versions = ">=3.5"
 
 [package.extras]
-dev = ["cloudpickle", "coverage[toml] (>=5.0.2)", "furo", "hypothesis", "mypy (>=0.900,!=0.940)", "pre-commit", "pympler", "pytest (>=4.3.0)", "pytest-mypy-plugins", "sphinx", "sphinx-notfound-page", "zope.interface"]
-docs = ["furo", "sphinx", "sphinx-notfound-page", "zope.interface"]
-tests = ["cloudpickle", "coverage[toml] (>=5.0.2)", "hypothesis", "mypy (>=0.900,!=0.940)", "pympler", "pytest (>=4.3.0)", "pytest-mypy-plugins", "zope.interface"]
-tests_no_zope = ["cloudpickle", "coverage[toml] (>=5.0.2)", "hypothesis", "mypy (>=0.900,!=0.940)", "pympler", "pytest (>=4.3.0)", "pytest-mypy-plugins"]
+dev = ["coverage[toml] (>=5.0.2)", "hypothesis", "pympler", "pytest (>=4.3.0)", "mypy (>=0.900,!=0.940)", "pytest-mypy-plugins", "zope.interface", "furo", "sphinx", "sphinx-notfound-page", "pre-commit", "cloudpickle"]
+docs = ["furo", "sphinx", "zope.interface", "sphinx-notfound-page"]
+tests = ["coverage[toml] (>=5.0.2)", "hypothesis", "pympler", "pytest (>=4.3.0)", "mypy (>=0.900,!=0.940)", "pytest-mypy-plugins", "zope.interface", "cloudpickle"]
+tests_no_zope = ["coverage[toml] (>=5.0.2)", "hypothesis", "pympler", "pytest (>=4.3.0)", "mypy (>=0.900,!=0.940)", "pytest-mypy-plugins", "cloudpickle"]
 
 [[package]]
 name = "beautifulsoup4"
@@ -248,13 +248,13 @@ optional = false
 python-versions = ">=3.6.1,<4.0"
 
 [package.extras]
-colors = ["colorama (>=0.4.3,<0.5.0)"]
 pipfile_deprecated_finder = ["pipreqs", "requirementslib"]
+requirements_deprecated_finder = ["pipreqs", "pip-api"]
+colors = ["colorama (>=0.4.3,<0.5.0)"]
 plugins = ["setuptools"]
-requirements_deprecated_finder = ["pip-api", "pipreqs"]
 
 [[package]]
-name = "Jinja2"
+name = "jinja2"
 version = "3.1.2"
 description = "A very fast and expressive template engine."
 category = "dev"
@@ -280,7 +280,7 @@ arrow = "*"
 jinja2 = "*"
 
 [[package]]
-name = "MarkupSafe"
+name = "markupsafe"
 version = "2.1.1"
 description = "Safely add untrusted strings to HTML/XML markup."
 category = "dev"
@@ -303,9 +303,6 @@ category = "dev"
 optional = false
 python-versions = ">=2.7,!=3.0.*,!=3.1.*,!=3.2.*,!=3.3.*,!=3.4.*,!=3.5.*,!=3.6.*"
 
-[package.dependencies]
-setuptools = "*"
-
 [[package]]
 name = "packaging"
 version = "21.3"
@@ -317,6 +314,14 @@ python-versions = ">=3.6"
 [package.dependencies]
 pyparsing = ">=2.0.2,<3.0.5 || >3.0.5"
 
+[[package]]
+name = "parse"
+version = "1.19.0"
+description = "parse() is the opposite of format()"
+category = "main"
+optional = false
+python-versions = "*"
+
 [[package]]
 name = "pathspec"
 version = "0.10.2"
@@ -334,8 +339,8 @@ optional = false
 python-versions = ">=3.7"
 
 [package.extras]
-docs = ["furo (>=2022.9.29)", "proselint (>=0.13)", "sphinx (>=5.3)", "sphinx-autodoc-typehints (>=1.19.4)"]
-test = ["appdirs (==1.4.4)", "pytest (>=7.2)", "pytest-cov (>=4)", "pytest-mock (>=3.10)"]
+docs = ["furo (>=2022.9.29)", "proselint (>=0.13)", "sphinx-autodoc-typehints (>=1.19.4)", "sphinx (>=5.3)"]
+test = ["appdirs (==1.4.4)", "pytest-cov (>=4)", "pytest-mock (>=3.10)", "pytest (>=7.2)"]
 
 [[package]]
 name = "pluggy"
@@ -382,7 +387,7 @@ optional = false
 python-versions = ">=3.6.8"
 
 [package.extras]
-diagrams = ["jinja2", "railroad-diagrams"]
+diagrams = ["railroad-diagrams", "jinja2"]
 
 [[package]]
 name = "pytest"
@@ -417,7 +422,7 @@ coverage = {version = ">=5.2.1", extras = ["toml"]}
 pytest = ">=4.6"
 
 [package.extras]
-testing = ["fields", "hunter", "process-tests", "pytest-xdist", "six", "virtualenv"]
+testing = ["fields", "hunter", "process-tests", "six", "pytest-xdist", "virtualenv"]
 
 [[package]]
 name = "pytest-xdist"
@@ -473,7 +478,7 @@ text-unidecode = ">=1.3"
 unidecode = ["Unidecode (>=1.1.1)"]
 
 [[package]]
-name = "PyYAML"
+name = "pyyaml"
 version = "6.0"
 description = "YAML parser and emitter for Python"
 category = "dev"
@@ -498,19 +503,6 @@ urllib3 = ">=1.21.1,<1.27"
 socks = ["PySocks (>=1.5.6,!=1.5.7)"]
 use_chardet_on_py3 = ["chardet (>=3.0.2,<6)"]
 
-[[package]]
-name = "setuptools"
-version = "65.6.3"
-description = "Easily download, build, install, upgrade, and uninstall Python packages"
-category = "dev"
-optional = false
-python-versions = ">=3.7"
-
-[package.extras]
-docs = ["furo", "jaraco.packaging (>=9)", "jaraco.tidelift (>=1.4)", "pygments-github-lexers (==0.0.5)", "rst.linker (>=1.9)", "sphinx (>=3.5)", "sphinx-favicon", "sphinx-hoverxref (<2)", "sphinx-inline-tabs", "sphinx-notfound-page (==0.8.3)", "sphinx-reredirects", "sphinxcontrib-towncrier"]
-testing = ["build[virtualenv]", "filelock (>=3.4.0)", "flake8 (<5)", "flake8-2020", "ini2toml[lite] (>=0.9)", "jaraco.envs (>=2.2)", "jaraco.path (>=3.2.0)", "pip (>=19.1)", "pip-run (>=8.8)", "pytest (>=6)", "pytest-black (>=0.3.7)", "pytest-checkdocs (>=2.4)", "pytest-cov", "pytest-enabler (>=1.3)", "pytest-flake8", "pytest-mypy (>=0.9.1)", "pytest-perf", "pytest-timeout", "pytest-xdist", "tomli-w (>=1.0.0)", "virtualenv (>=13.0.0)", "wheel"]
-testing-integration = ["build[virtualenv]", "filelock (>=3.4.0)", "jaraco.envs (>=2.2)", "jaraco.path (>=3.2.0)", "pytest", "pytest-enabler", "pytest-xdist", "tomli", "virtualenv (>=13.0.0)", "wheel"]
-
 [[package]]
 name = "six"
 version = "1.16.0"
@@ -571,7 +563,7 @@ virtualenv = ">=16.0.0,<20.0.0 || >20.0.0,<20.0.1 || >20.0.1,<20.0.2 || >20.0.2,
 
 [package.extras]
 docs = ["pygments-github-lexers (>=0.0.5)", "sphinx (>=2.0.0)", "sphinxcontrib-autoprogram (>=0.1.5)", "towncrier (>=18.5.0)"]
-testing = ["flaky (>=3.4.0)", "freezegun (>=0.3.11)", "pathlib2 (>=2.3.3)", "psutil (>=5.6.1)", "pytest (>=4.0.0)", "pytest-cov (>=2.5.1)", "pytest-mock (>=1.10.0)", "pytest-randomly (>=1.0.0)"]
+testing = ["flaky (>=3.4.0)", "freezegun (>=0.3.11)", "pytest (>=4.0.0)", "pytest-cov (>=2.5.1)", "pytest-mock (>=1.10.0)", "pytest-randomly (>=1.0.0)", "psutil (>=5.6.1)", "pathlib2 (>=2.3.3)"]
 
 [[package]]
 name = "tqdm"
@@ -599,8 +591,8 @@ optional = false
 python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*, !=3.5.*"
 
 [package.extras]
-brotli = ["brotli (>=1.0.9)", "brotlicffi (>=0.8.0)", "brotlipy (>=0.6.0)"]
-secure = ["certifi", "cryptography (>=1.3.4)", "idna (>=2.0.0)", "ipaddress", "pyOpenSSL (>=0.14)", "urllib3-secure-extra"]
+brotli = ["brotlicffi (>=0.8.0)", "brotli (>=1.0.9)", "brotlipy (>=0.6.0)"]
+secure = ["pyOpenSSL (>=0.14)", "cryptography (>=1.3.4)", "idna (>=2.0.0)", "certifi", "urllib3-secure-extra", "ipaddress"]
 socks = ["PySocks (>=1.5.6,!=1.5.7,<2.0)"]
 
 [[package]]
@@ -623,156 +615,41 @@ testing = ["coverage (>=6.2)", "coverage-enable-subprocess (>=1)", "flaky (>=3.7
 [metadata]
 lock-version = "1.1"
 python-versions = "^3.10"
-content-hash = "f71be4e7f00d6dea92fe9e67fd4825e0e5bb84f7fd67158a4a3ef5218c79dcb7"
+content-hash = "dea495182ba7919f34c7622c800bd9361c93ad5f30d7e91708cca53e917c6a6c"
 
 [metadata.files]
 anytree = [
     {file = "anytree-2.8.0-py2.py3-none-any.whl", hash = "sha256:14c55ac77492b11532395049a03b773d14c7e30b22aa012e337b1e983de31521"},
     {file = "anytree-2.8.0.tar.gz", hash = "sha256:3f0f93f355a91bc3e6245319bf4c1d50e3416cc7a35cc1133c1ff38306bbccab"},
 ]
-arrow = [
-    {file = "arrow-1.2.3-py3-none-any.whl", hash = "sha256:5a49ab92e3b7b71d96cd6bfcc4df14efefc9dfa96ea19045815914a6ab6b1fe2"},
-    {file = "arrow-1.2.3.tar.gz", hash = "sha256:3934b30ca1b9f292376d9db15b19446088d12ec58629bc3f0da28fd55fb633a1"},
-]
-attrs = [
-    {file = "attrs-22.1.0-py2.py3-none-any.whl", hash = "sha256:86efa402f67bf2df34f51a335487cf46b1ec130d02b8d39fd248abfd30da551c"},
-    {file = "attrs-22.1.0.tar.gz", hash = "sha256:29adc2665447e5191d0e7c568fde78b21f9672d344281d0c6e1ab085429b22b6"},
-]
-beautifulsoup4 = [
-    {file = "beautifulsoup4-4.11.1-py3-none-any.whl", hash = "sha256:58d5c3d29f5a36ffeb94f02f0d786cd53014cf9b3b3951d42e0080d8a9498d30"},
-    {file = "beautifulsoup4-4.11.1.tar.gz", hash = "sha256:ad9aa55b65ef2808eb405f46cf74df7fcb7044d5cbc26487f96eb2ef2e436693"},
-]
+arrow = []
+attrs = []
+beautifulsoup4 = []
 binaryornot = [
     {file = "binaryornot-0.4.4-py2.py3-none-any.whl", hash = "sha256:b8b71173c917bddcd2c16070412e369c3ed7f0528926f70cac18a6c97fd563e4"},
     {file = "binaryornot-0.4.4.tar.gz", hash = "sha256:359501dfc9d40632edc9fac890e19542db1a287bbcfa58175b66658392018061"},
 ]
-black = [
-    {file = "black-22.10.0-1fixedarch-cp310-cp310-macosx_11_0_x86_64.whl", hash = "sha256:5cc42ca67989e9c3cf859e84c2bf014f6633db63d1cbdf8fdb666dcd9e77e3fa"},
-    {file = "black-22.10.0-1fixedarch-cp311-cp311-macosx_11_0_x86_64.whl", hash = "sha256:5d8f74030e67087b219b032aa33a919fae8806d49c867846bfacde57f43972ef"},
-    {file = "black-22.10.0-1fixedarch-cp37-cp37m-macosx_10_16_x86_64.whl", hash = "sha256:197df8509263b0b8614e1df1756b1dd41be6738eed2ba9e9769f3880c2b9d7b6"},
-    {file = "black-22.10.0-1fixedarch-cp38-cp38-macosx_10_16_x86_64.whl", hash = "sha256:2644b5d63633702bc2c5f3754b1b475378fbbfb481f62319388235d0cd104c2d"},
-    {file = "black-22.10.0-1fixedarch-cp39-cp39-macosx_11_0_x86_64.whl", hash = "sha256:e41a86c6c650bcecc6633ee3180d80a025db041a8e2398dcc059b3afa8382cd4"},
-    {file = "black-22.10.0-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:2039230db3c6c639bd84efe3292ec7b06e9214a2992cd9beb293d639c6402edb"},
-    {file = "black-22.10.0-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:14ff67aec0a47c424bc99b71005202045dc09270da44a27848d534600ac64fc7"},
-    {file = "black-22.10.0-cp310-cp310-win_amd64.whl", hash = "sha256:819dc789f4498ecc91438a7de64427c73b45035e2e3680c92e18795a839ebb66"},
-    {file = "black-22.10.0-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:5b9b29da4f564ba8787c119f37d174f2b69cdfdf9015b7d8c5c16121ddc054ae"},
-    {file = "black-22.10.0-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:b8b49776299fece66bffaafe357d929ca9451450f5466e997a7285ab0fe28e3b"},
-    {file = "black-22.10.0-cp311-cp311-win_amd64.whl", hash = "sha256:21199526696b8f09c3997e2b4db8d0b108d801a348414264d2eb8eb2532e540d"},
-    {file = "black-22.10.0-cp37-cp37m-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:1e464456d24e23d11fced2bc8c47ef66d471f845c7b7a42f3bd77bf3d1789650"},
-    {file = "black-22.10.0-cp37-cp37m-win_amd64.whl", hash = "sha256:9311e99228ae10023300ecac05be5a296f60d2fd10fff31cf5c1fa4ca4b1988d"},
-    {file = "black-22.10.0-cp38-cp38-macosx_11_0_arm64.whl", hash = "sha256:fba8a281e570adafb79f7755ac8721b6cf1bbf691186a287e990c7929c7692ff"},
-    {file = "black-22.10.0-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:915ace4ff03fdfff953962fa672d44be269deb2eaf88499a0f8805221bc68c87"},
-    {file = "black-22.10.0-cp38-cp38-win_amd64.whl", hash = "sha256:444ebfb4e441254e87bad00c661fe32df9969b2bf224373a448d8aca2132b395"},
-    {file = "black-22.10.0-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:974308c58d057a651d182208a484ce80a26dac0caef2895836a92dd6ebd725e0"},
-    {file = "black-22.10.0-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:72ef3925f30e12a184889aac03d77d031056860ccae8a1e519f6cbb742736383"},
-    {file = "black-22.10.0-cp39-cp39-win_amd64.whl", hash = "sha256:432247333090c8c5366e69627ccb363bc58514ae3e63f7fc75c54b1ea80fa7de"},
-    {file = "black-22.10.0-py3-none-any.whl", hash = "sha256:c957b2b4ea88587b46cf49d1dc17681c1e672864fd7af32fc1e9664d572b3458"},
-    {file = "black-22.10.0.tar.gz", hash = "sha256:f513588da599943e0cde4e32cc9879e825d58720d6557062d1098c5ad80080e1"},
-]
-certifi = [
-    {file = "certifi-2022.9.24-py3-none-any.whl", hash = "sha256:90c1a32f1d68f940488354e36370f6cca89f0f106db09518524c88d6ed83f382"},
-    {file = "certifi-2022.9.24.tar.gz", hash = "sha256:0d9c601124e5a6ba9712dbc60d9c53c21e34f5f641fe83002317394311bdce14"},
-]
+black = []
+certifi = []
 cfgv = [
     {file = "cfgv-3.3.1-py2.py3-none-any.whl", hash = "sha256:c6a0883f3917a037485059700b9e75da2464e6c27051014ad85ba6aaa5884426"},
     {file = "cfgv-3.3.1.tar.gz", hash = "sha256:f5a830efb9ce7a445376bb66ec94c638a9787422f96264c98edc6bdeed8ab736"},
 ]
-chardet = [
-    {file = "chardet-5.0.0-py3-none-any.whl", hash = "sha256:d3e64f022d254183001eccc5db4040520c0f23b1a3f33d6413e099eb7f126557"},
-    {file = "chardet-5.0.0.tar.gz", hash = "sha256:0368df2bfd78b5fc20572bb4e9bb7fb53e2c094f60ae9993339e8671d0afb8aa"},
-]
-charset-normalizer = [
-    {file = "charset-normalizer-2.1.1.tar.gz", hash = "sha256:5a3d016c7c547f69d6f81fb0db9449ce888b418b5b9952cc5e6e66843e9dd845"},
-    {file = "charset_normalizer-2.1.1-py3-none-any.whl", hash = "sha256:83e9a75d1911279afd89352c68b45348559d1fc0506b054b346651b5e7fee29f"},
-]
-click = [
-    {file = "click-8.1.3-py3-none-any.whl", hash = "sha256:bb4d8133cb15a609f44e8213d9b391b0809795062913b383c62be0ee95b1db48"},
-    {file = "click-8.1.3.tar.gz", hash = "sha256:7682dc8afb30297001674575ea00d1814d808d6a36af415a82bd481d37ba7b8e"},
-]
-colorama = [
-    {file = "colorama-0.4.6-py2.py3-none-any.whl", hash = "sha256:4f1d9991f5acc0ca119f9d443620b77f9d6b33703e51011c16baf57afb285fc6"},
-    {file = "colorama-0.4.6.tar.gz", hash = "sha256:08695f5cb7ed6e0531a20572697297273c47b8cae5a63ffc6d6ed5c201be6e44"},
-]
-cookiecutter = [
-    {file = "cookiecutter-2.1.1-py2.py3-none-any.whl", hash = "sha256:9f3ab027cec4f70916e28f03470bdb41e637a3ad354b4d65c765d93aad160022"},
-    {file = "cookiecutter-2.1.1.tar.gz", hash = "sha256:f3982be8d9c53dac1261864013fdec7f83afd2e42ede6f6dd069c5e149c540d5"},
-]
-coverage = [
-    {file = "coverage-6.5.0-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:ef8674b0ee8cc11e2d574e3e2998aea5df5ab242e012286824ea3c6970580e53"},
-    {file = "coverage-6.5.0-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:784f53ebc9f3fd0e2a3f6a78b2be1bd1f5575d7863e10c6e12504f240fd06660"},
-    {file = "coverage-6.5.0-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:b4a5be1748d538a710f87542f22c2cad22f80545a847ad91ce45e77417293eb4"},
-    {file = "coverage-6.5.0-cp310-cp310-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:83516205e254a0cb77d2d7bb3632ee019d93d9f4005de31dca0a8c3667d5bc04"},
-    {file = "coverage-6.5.0-cp310-cp310-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:af4fffaffc4067232253715065e30c5a7ec6faac36f8fc8d6f64263b15f74db0"},
-    {file = "coverage-6.5.0-cp310-cp310-musllinux_1_1_aarch64.whl", hash = "sha256:97117225cdd992a9c2a5515db1f66b59db634f59d0679ca1fa3fe8da32749cae"},
-    {file = "coverage-6.5.0-cp310-cp310-musllinux_1_1_i686.whl", hash = "sha256:a1170fa54185845505fbfa672f1c1ab175446c887cce8212c44149581cf2d466"},
-    {file = "coverage-6.5.0-cp310-cp310-musllinux_1_1_x86_64.whl", hash = "sha256:11b990d520ea75e7ee8dcab5bc908072aaada194a794db9f6d7d5cfd19661e5a"},
-    {file = "coverage-6.5.0-cp310-cp310-win32.whl", hash = "sha256:5dbec3b9095749390c09ab7c89d314727f18800060d8d24e87f01fb9cfb40b32"},
-    {file = "coverage-6.5.0-cp310-cp310-win_amd64.whl", hash = "sha256:59f53f1dc5b656cafb1badd0feb428c1e7bc19b867479ff72f7a9dd9b479f10e"},
-    {file = "coverage-6.5.0-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:4a5375e28c5191ac38cca59b38edd33ef4cc914732c916f2929029b4bfb50795"},
-    {file = "coverage-6.5.0-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:c4ed2820d919351f4167e52425e096af41bfabacb1857186c1ea32ff9983ed75"},
-    {file = "coverage-6.5.0-cp311-cp311-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:33a7da4376d5977fbf0a8ed91c4dffaaa8dbf0ddbf4c8eea500a2486d8bc4d7b"},
-    {file = "coverage-6.5.0-cp311-cp311-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:a8fb6cf131ac4070c9c5a3e21de0f7dc5a0fbe8bc77c9456ced896c12fcdad91"},
-    {file = "coverage-6.5.0-cp311-cp311-musllinux_1_1_aarch64.whl", hash = "sha256:a6b7d95969b8845250586f269e81e5dfdd8ff828ddeb8567a4a2eaa7313460c4"},
-    {file = "coverage-6.5.0-cp311-cp311-musllinux_1_1_i686.whl", hash = "sha256:1ef221513e6f68b69ee9e159506d583d31aa3567e0ae84eaad9d6ec1107dddaa"},
-    {file = "coverage-6.5.0-cp311-cp311-musllinux_1_1_x86_64.whl", hash = "sha256:cca4435eebea7962a52bdb216dec27215d0df64cf27fc1dd538415f5d2b9da6b"},
-    {file = "coverage-6.5.0-cp311-cp311-win32.whl", hash = "sha256:98e8a10b7a314f454d9eff4216a9a94d143a7ee65018dd12442e898ee2310578"},
-    {file = "coverage-6.5.0-cp311-cp311-win_amd64.whl", hash = "sha256:bc8ef5e043a2af066fa8cbfc6e708d58017024dc4345a1f9757b329a249f041b"},
-    {file = "coverage-6.5.0-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:4433b90fae13f86fafff0b326453dd42fc9a639a0d9e4eec4d366436d1a41b6d"},
-    {file = "coverage-6.5.0-cp37-cp37m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:f4f05d88d9a80ad3cac6244d36dd89a3c00abc16371769f1340101d3cb899fc3"},
-    {file = "coverage-6.5.0-cp37-cp37m-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:94e2565443291bd778421856bc975d351738963071e9b8839ca1fc08b42d4bef"},
-    {file = "coverage-6.5.0-cp37-cp37m-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:027018943386e7b942fa832372ebc120155fd970837489896099f5cfa2890f79"},
-    {file = "coverage-6.5.0-cp37-cp37m-musllinux_1_1_aarch64.whl", hash = "sha256:255758a1e3b61db372ec2736c8e2a1fdfaf563977eedbdf131de003ca5779b7d"},
-    {file = "coverage-6.5.0-cp37-cp37m-musllinux_1_1_i686.whl", hash = "sha256:851cf4ff24062c6aec510a454b2584f6e998cada52d4cb58c5e233d07172e50c"},
-    {file = "coverage-6.5.0-cp37-cp37m-musllinux_1_1_x86_64.whl", hash = "sha256:12adf310e4aafddc58afdb04d686795f33f4d7a6fa67a7a9d4ce7d6ae24d949f"},
-    {file = "coverage-6.5.0-cp37-cp37m-win32.whl", hash = "sha256:b5604380f3415ba69de87a289a2b56687faa4fe04dbee0754bfcae433489316b"},
-    {file = "coverage-6.5.0-cp37-cp37m-win_amd64.whl", hash = "sha256:4a8dbc1f0fbb2ae3de73eb0bdbb914180c7abfbf258e90b311dcd4f585d44bd2"},
-    {file = "coverage-6.5.0-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:d900bb429fdfd7f511f868cedd03a6bbb142f3f9118c09b99ef8dc9bf9643c3c"},
-    {file = "coverage-6.5.0-cp38-cp38-macosx_11_0_arm64.whl", hash = "sha256:2198ea6fc548de52adc826f62cb18554caedfb1d26548c1b7c88d8f7faa8f6ba"},
-    {file = "coverage-6.5.0-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:6c4459b3de97b75e3bd6b7d4b7f0db13f17f504f3d13e2a7c623786289dd670e"},
-    {file = "coverage-6.5.0-cp38-cp38-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:20c8ac5386253717e5ccc827caad43ed66fea0efe255727b1053a8154d952398"},
-    {file = "coverage-6.5.0-cp38-cp38-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:6b07130585d54fe8dff3d97b93b0e20290de974dc8177c320aeaf23459219c0b"},
-    {file = "coverage-6.5.0-cp38-cp38-musllinux_1_1_aarch64.whl", hash = "sha256:dbdb91cd8c048c2b09eb17713b0c12a54fbd587d79adcebad543bc0cd9a3410b"},
-    {file = "coverage-6.5.0-cp38-cp38-musllinux_1_1_i686.whl", hash = "sha256:de3001a203182842a4630e7b8d1a2c7c07ec1b45d3084a83d5d227a3806f530f"},
-    {file = "coverage-6.5.0-cp38-cp38-musllinux_1_1_x86_64.whl", hash = "sha256:e07f4a4a9b41583d6eabec04f8b68076ab3cd44c20bd29332c6572dda36f372e"},
-    {file = "coverage-6.5.0-cp38-cp38-win32.whl", hash = "sha256:6d4817234349a80dbf03640cec6109cd90cba068330703fa65ddf56b60223a6d"},
-    {file = "coverage-6.5.0-cp38-cp38-win_amd64.whl", hash = "sha256:7ccf362abd726b0410bf8911c31fbf97f09f8f1061f8c1cf03dfc4b6372848f6"},
-    {file = "coverage-6.5.0-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:633713d70ad6bfc49b34ead4060531658dc6dfc9b3eb7d8a716d5873377ab745"},
-    {file = "coverage-6.5.0-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:95203854f974e07af96358c0b261f1048d8e1083f2de9b1c565e1be4a3a48cfc"},
-    {file = "coverage-6.5.0-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:b9023e237f4c02ff739581ef35969c3739445fb059b060ca51771e69101efffe"},
-    {file = "coverage-6.5.0-cp39-cp39-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:265de0fa6778d07de30bcf4d9dc471c3dc4314a23a3c6603d356a3c9abc2dfcf"},
-    {file = "coverage-6.5.0-cp39-cp39-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:8f830ed581b45b82451a40faabb89c84e1a998124ee4212d440e9c6cf70083e5"},
-    {file = "coverage-6.5.0-cp39-cp39-musllinux_1_1_aarch64.whl", hash = "sha256:7b6be138d61e458e18d8e6ddcddd36dd96215edfe5f1168de0b1b32635839b62"},
-    {file = "coverage-6.5.0-cp39-cp39-musllinux_1_1_i686.whl", hash = "sha256:42eafe6778551cf006a7c43153af1211c3aaab658d4d66fa5fcc021613d02518"},
-    {file = "coverage-6.5.0-cp39-cp39-musllinux_1_1_x86_64.whl", hash = "sha256:723e8130d4ecc8f56e9a611e73b31219595baa3bb252d539206f7bbbab6ffc1f"},
-    {file = "coverage-6.5.0-cp39-cp39-win32.whl", hash = "sha256:d9ecf0829c6a62b9b573c7bb6d4dcd6ba8b6f80be9ba4fc7ed50bf4ac9aecd72"},
-    {file = "coverage-6.5.0-cp39-cp39-win_amd64.whl", hash = "sha256:fc2af30ed0d5ae0b1abdb4ebdce598eafd5b35397d4d75deb341a614d333d987"},
-    {file = "coverage-6.5.0-pp36.pp37.pp38-none-any.whl", hash = "sha256:1431986dac3923c5945271f169f59c45b8802a114c8f548d611f2015133df77a"},
-    {file = "coverage-6.5.0.tar.gz", hash = "sha256:f642e90754ee3e06b0e7e51bce3379590e76b7f76b708e1a71ff043f87025c84"},
-]
-distlib = [
-    {file = "distlib-0.3.6-py2.py3-none-any.whl", hash = "sha256:f35c4b692542ca110de7ef0bea44d73981caeb34ca0b9b6b2e6d7790dda8f80e"},
-    {file = "distlib-0.3.6.tar.gz", hash = "sha256:14bad2d9b04d3a36127ac97f30b12a19268f211063d8f8ee4f47108896e11b46"},
-]
-exceptiongroup = [
-    {file = "exceptiongroup-1.0.4-py3-none-any.whl", hash = "sha256:542adf9dea4055530d6e1279602fa5cb11dab2395fa650b8674eaec35fc4a828"},
-    {file = "exceptiongroup-1.0.4.tar.gz", hash = "sha256:bd14967b79cd9bdb54d97323216f8fdf533e278df937aa2a90089e7d6e06e5ec"},
-]
+chardet = []
+charset-normalizer = []
+click = []
+colorama = []
+cookiecutter = []
+coverage = []
+distlib = []
+exceptiongroup = []
 execnet = [
     {file = "execnet-1.9.0-py2.py3-none-any.whl", hash = "sha256:a295f7cc774947aac58dde7fdc85f4aa00c42adf5d8f5468fc630c1acf30a142"},
     {file = "execnet-1.9.0.tar.gz", hash = "sha256:8f694f3ba9cc92cab508b152dcfe322153975c29bda272e2fd7f3f00f36e47c5"},
 ]
-filelock = [
-    {file = "filelock-3.8.0-py3-none-any.whl", hash = "sha256:617eb4e5eedc82fc5f47b6d61e4d11cb837c56cb4544e39081099fa17ad109d4"},
-    {file = "filelock-3.8.0.tar.gz", hash = "sha256:55447caa666f2198c5b6b13a26d2084d26fa5b115c00d065664b2124680c4edc"},
-]
-identify = [
-    {file = "identify-2.5.9-py2.py3-none-any.whl", hash = "sha256:a390fb696e164dbddb047a0db26e57972ae52fbd037ae68797e5ae2f4492485d"},
-    {file = "identify-2.5.9.tar.gz", hash = "sha256:906036344ca769539610436e40a684e170c3648b552194980bb7b617a8daeb9f"},
-]
-idna = [
-    {file = "idna-3.4-py3-none-any.whl", hash = "sha256:90b77e79eaa3eba6de819a0c442c0b4ceefc341a7a2ab77d7562bf49f425c5c2"},
-    {file = "idna-3.4.tar.gz", hash = "sha256:814f528e8dead7d329833b91c5faa87d60bf71824cd12a7530b5526063d02cb4"},
-]
+filelock = []
+identify = []
+idna = []
 iniconfig = [
     {file = "iniconfig-1.1.1-py2.py3-none-any.whl", hash = "sha256:011e24c64b7f47f6ebd835bb12a743f2fbe9a26d4cecaa7f53bc4f35ee9da8b3"},
     {file = "iniconfig-1.1.1.tar.gz", hash = "sha256:bc3af051d7d14b2ee5ef9969666def0cd1a000e121eaea580d4a313df4b37f32"},
@@ -781,84 +658,29 @@ isort = [
     {file = "isort-5.10.1-py3-none-any.whl", hash = "sha256:6f62d78e2f89b4500b080fe3a81690850cd254227f27f75c3a0c491a1f351ba7"},
     {file = "isort-5.10.1.tar.gz", hash = "sha256:e8443a5e7a020e9d7f97f1d7d9cd17c88bcb3bc7e218bf9cf5095fe550be2951"},
 ]
-Jinja2 = [
-    {file = "Jinja2-3.1.2-py3-none-any.whl", hash = "sha256:6088930bfe239f0e6710546ab9c19c9ef35e29792895fed6e6e31a023a182a61"},
-    {file = "Jinja2-3.1.2.tar.gz", hash = "sha256:31351a702a408a9e7595a8fc6150fc3f43bb6bf7e319770cbc0db9df9437e852"},
-]
+jinja2 = []
 jinja2-time = [
     {file = "jinja2-time-0.2.0.tar.gz", hash = "sha256:d14eaa4d315e7688daa4969f616f226614350c48730bfa1692d2caebd8c90d40"},
     {file = "jinja2_time-0.2.0-py2.py3-none-any.whl", hash = "sha256:d3eab6605e3ec8b7a0863df09cc1d23714908fa61aa6986a845c20ba488b4efa"},
 ]
-MarkupSafe = [
-    {file = "MarkupSafe-2.1.1-cp310-cp310-macosx_10_9_universal2.whl", hash = "sha256:86b1f75c4e7c2ac2ccdaec2b9022845dbb81880ca318bb7a0a01fbf7813e3812"},
-    {file = "MarkupSafe-2.1.1-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:f121a1420d4e173a5d96e47e9a0c0dcff965afdf1626d28de1460815f7c4ee7a"},
-    {file = "MarkupSafe-2.1.1-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:a49907dd8420c5685cfa064a1335b6754b74541bbb3706c259c02ed65b644b3e"},
-    {file = "MarkupSafe-2.1.1-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:10c1bfff05d95783da83491be968e8fe789263689c02724e0c691933c52994f5"},
-    {file = "MarkupSafe-2.1.1-cp310-cp310-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:b7bd98b796e2b6553da7225aeb61f447f80a1ca64f41d83612e6139ca5213aa4"},
-    {file = "MarkupSafe-2.1.1-cp310-cp310-musllinux_1_1_aarch64.whl", hash = "sha256:b09bf97215625a311f669476f44b8b318b075847b49316d3e28c08e41a7a573f"},
-    {file = "MarkupSafe-2.1.1-cp310-cp310-musllinux_1_1_i686.whl", hash = "sha256:694deca8d702d5db21ec83983ce0bb4b26a578e71fbdbd4fdcd387daa90e4d5e"},
-    {file = "MarkupSafe-2.1.1-cp310-cp310-musllinux_1_1_x86_64.whl", hash = "sha256:efc1913fd2ca4f334418481c7e595c00aad186563bbc1ec76067848c7ca0a933"},
-    {file = "MarkupSafe-2.1.1-cp310-cp310-win32.whl", hash = "sha256:4a33dea2b688b3190ee12bd7cfa29d39c9ed176bda40bfa11099a3ce5d3a7ac6"},
-    {file = "MarkupSafe-2.1.1-cp310-cp310-win_amd64.whl", hash = "sha256:dda30ba7e87fbbb7eab1ec9f58678558fd9a6b8b853530e176eabd064da81417"},
-    {file = "MarkupSafe-2.1.1-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:671cd1187ed5e62818414afe79ed29da836dde67166a9fac6d435873c44fdd02"},
-    {file = "MarkupSafe-2.1.1-cp37-cp37m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:3799351e2336dc91ea70b034983ee71cf2f9533cdff7c14c90ea126bfd95d65a"},
-    {file = "MarkupSafe-2.1.1-cp37-cp37m-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:e72591e9ecd94d7feb70c1cbd7be7b3ebea3f548870aa91e2732960fa4d57a37"},
-    {file = "MarkupSafe-2.1.1-cp37-cp37m-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:6fbf47b5d3728c6aea2abb0589b5d30459e369baa772e0f37a0320185e87c980"},
-    {file = "MarkupSafe-2.1.1-cp37-cp37m-musllinux_1_1_aarch64.whl", hash = "sha256:d5ee4f386140395a2c818d149221149c54849dfcfcb9f1debfe07a8b8bd63f9a"},
-    {file = "MarkupSafe-2.1.1-cp37-cp37m-musllinux_1_1_i686.whl", hash = "sha256:bcb3ed405ed3222f9904899563d6fc492ff75cce56cba05e32eff40e6acbeaa3"},
-    {file = "MarkupSafe-2.1.1-cp37-cp37m-musllinux_1_1_x86_64.whl", hash = "sha256:e1c0b87e09fa55a220f058d1d49d3fb8df88fbfab58558f1198e08c1e1de842a"},
-    {file = "MarkupSafe-2.1.1-cp37-cp37m-win32.whl", hash = "sha256:8dc1c72a69aa7e082593c4a203dcf94ddb74bb5c8a731e4e1eb68d031e8498ff"},
-    {file = "MarkupSafe-2.1.1-cp37-cp37m-win_amd64.whl", hash = "sha256:97a68e6ada378df82bc9f16b800ab77cbf4b2fada0081794318520138c088e4a"},
-    {file = "MarkupSafe-2.1.1-cp38-cp38-macosx_10_9_universal2.whl", hash = "sha256:e8c843bbcda3a2f1e3c2ab25913c80a3c5376cd00c6e8c4a86a89a28c8dc5452"},
-    {file = "MarkupSafe-2.1.1-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:0212a68688482dc52b2d45013df70d169f542b7394fc744c02a57374a4207003"},
-    {file = "MarkupSafe-2.1.1-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:8e576a51ad59e4bfaac456023a78f6b5e6e7651dcd383bcc3e18d06f9b55d6d1"},
-    {file = "MarkupSafe-2.1.1-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:4b9fe39a2ccc108a4accc2676e77da025ce383c108593d65cc909add5c3bd601"},
-    {file = "MarkupSafe-2.1.1-cp38-cp38-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:96e37a3dc86e80bf81758c152fe66dbf60ed5eca3d26305edf01892257049925"},
-    {file = "MarkupSafe-2.1.1-cp38-cp38-musllinux_1_1_aarch64.whl", hash = "sha256:6d0072fea50feec76a4c418096652f2c3238eaa014b2f94aeb1d56a66b41403f"},
-    {file = "MarkupSafe-2.1.1-cp38-cp38-musllinux_1_1_i686.whl", hash = "sha256:089cf3dbf0cd6c100f02945abeb18484bd1ee57a079aefd52cffd17fba910b88"},
-    {file = "MarkupSafe-2.1.1-cp38-cp38-musllinux_1_1_x86_64.whl", hash = "sha256:6a074d34ee7a5ce3effbc526b7083ec9731bb3cbf921bbe1d3005d4d2bdb3a63"},
-    {file = "MarkupSafe-2.1.1-cp38-cp38-win32.whl", hash = "sha256:421be9fbf0ffe9ffd7a378aafebbf6f4602d564d34be190fc19a193232fd12b1"},
-    {file = "MarkupSafe-2.1.1-cp38-cp38-win_amd64.whl", hash = "sha256:fc7b548b17d238737688817ab67deebb30e8073c95749d55538ed473130ec0c7"},
-    {file = "MarkupSafe-2.1.1-cp39-cp39-macosx_10_9_universal2.whl", hash = "sha256:e04e26803c9c3851c931eac40c695602c6295b8d432cbe78609649ad9bd2da8a"},
-    {file = "MarkupSafe-2.1.1-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:b87db4360013327109564f0e591bd2a3b318547bcef31b468a92ee504d07ae4f"},
-    {file = "MarkupSafe-2.1.1-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:99a2a507ed3ac881b975a2976d59f38c19386d128e7a9a18b7df6fff1fd4c1d6"},
-    {file = "MarkupSafe-2.1.1-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:56442863ed2b06d19c37f94d999035e15ee982988920e12a5b4ba29b62ad1f77"},
-    {file = "MarkupSafe-2.1.1-cp39-cp39-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:3ce11ee3f23f79dbd06fb3d63e2f6af7b12db1d46932fe7bd8afa259a5996603"},
-    {file = "MarkupSafe-2.1.1-cp39-cp39-musllinux_1_1_aarch64.whl", hash = "sha256:33b74d289bd2f5e527beadcaa3f401e0df0a89927c1559c8566c066fa4248ab7"},
-    {file = "MarkupSafe-2.1.1-cp39-cp39-musllinux_1_1_i686.whl", hash = "sha256:43093fb83d8343aac0b1baa75516da6092f58f41200907ef92448ecab8825135"},
-    {file = "MarkupSafe-2.1.1-cp39-cp39-musllinux_1_1_x86_64.whl", hash = "sha256:8e3dcf21f367459434c18e71b2a9532d96547aef8a871872a5bd69a715c15f96"},
-    {file = "MarkupSafe-2.1.1-cp39-cp39-win32.whl", hash = "sha256:d4306c36ca495956b6d568d276ac11fdd9c30a36f1b6eb928070dc5360b22e1c"},
-    {file = "MarkupSafe-2.1.1-cp39-cp39-win_amd64.whl", hash = "sha256:46d00d6cfecdde84d40e572d63735ef81423ad31184100411e6e3388d405e247"},
-    {file = "MarkupSafe-2.1.1.tar.gz", hash = "sha256:7f91197cc9e48f989d12e4e6fbc46495c446636dfc81b9ccf50bb0ec74b91d4b"},
-]
+markupsafe = []
 mypy-extensions = [
     {file = "mypy_extensions-0.4.3-py2.py3-none-any.whl", hash = "sha256:090fedd75945a69ae91ce1303b5824f428daf5a028d2f6ab8a299250a846f15d"},
     {file = "mypy_extensions-0.4.3.tar.gz", hash = "sha256:2d82818f5bb3e369420cb3c4060a7970edba416647068eb4c5343488a6c604a8"},
 ]
-nodeenv = [
-    {file = "nodeenv-1.7.0-py2.py3-none-any.whl", hash = "sha256:27083a7b96a25f2f5e1d8cb4b6317ee8aeda3bdd121394e5ac54e498028a042e"},
-    {file = "nodeenv-1.7.0.tar.gz", hash = "sha256:e0e7f7dfb85fc5394c6fe1e8fa98131a2473e04311a45afb6508f7cf1836fa2b"},
-]
+nodeenv = []
 packaging = [
     {file = "packaging-21.3-py3-none-any.whl", hash = "sha256:ef103e05f519cdc783ae24ea4e2e0f508a9c99b2d4969652eed6a2e1ea5bd522"},
     {file = "packaging-21.3.tar.gz", hash = "sha256:dd47c42927d89ab911e606518907cc2d3a1f38bbd026385970643f9c5b8ecfeb"},
 ]
-pathspec = [
-    {file = "pathspec-0.10.2-py3-none-any.whl", hash = "sha256:88c2606f2c1e818b978540f73ecc908e13999c6c3a383daf3705652ae79807a5"},
-    {file = "pathspec-0.10.2.tar.gz", hash = "sha256:8f6bf73e5758fd365ef5d58ce09ac7c27d2833a8d7da51712eac6e27e35141b0"},
-]
-platformdirs = [
-    {file = "platformdirs-2.5.4-py3-none-any.whl", hash = "sha256:af0276409f9a02373d540bf8480021a048711d572745aef4b7842dad245eba10"},
-    {file = "platformdirs-2.5.4.tar.gz", hash = "sha256:1006647646d80f16130f052404c6b901e80ee4ed6bef6792e1f238a8969106f7"},
-]
+parse = []
+pathspec = []
+platformdirs = []
 pluggy = [
     {file = "pluggy-1.0.0-py2.py3-none-any.whl", hash = "sha256:74134bbf457f031a36d68416e1509f34bd5ccc019f0bcc952c7b909d06b37bd3"},
     {file = "pluggy-1.0.0.tar.gz", hash = "sha256:4224373bacce55f955a878bf9cfa763c1e360858e330072059e10bad68531159"},
 ]
-pre-commit = [
-    {file = "pre_commit-2.20.0-py2.py3-none-any.whl", hash = "sha256:51a5ba7c480ae8072ecdb6933df22d2f812dc897d5fe848778116129a681aac7"},
-    {file = "pre_commit-2.20.0.tar.gz", hash = "sha256:a978dac7bc9ec0bcee55c18a277d553b0f419d259dadb4b9418ff2d00eb43959"},
-]
+pre-commit = []
 py = [
     {file = "py-1.11.0-py2.py3-none-any.whl", hash = "sha256:607c53218732647dff4acdfcd50cb62615cedf612e72d1724fb1a0cc6405b378"},
     {file = "py-1.11.0.tar.gz", hash = "sha256:51c75c4126074b472f746a24399ad32f6053d1b34b68d2fa41e558e6f4a98719"},
@@ -867,31 +689,16 @@ pyparsing = [
     {file = "pyparsing-3.0.9-py3-none-any.whl", hash = "sha256:5026bae9a10eeaefb61dab2f09052b9f4307d44aee4eda64b309723d8d206bbc"},
     {file = "pyparsing-3.0.9.tar.gz", hash = "sha256:2b020ecf7d21b687f219b71ecad3631f644a47f01403fa1d1036b0c6416d70fb"},
 ]
-pytest = [
-    {file = "pytest-7.2.0-py3-none-any.whl", hash = "sha256:892f933d339f068883b6fd5a459f03d85bfcb355e4981e146d2c7616c21fef71"},
-    {file = "pytest-7.2.0.tar.gz", hash = "sha256:c4014eb40e10f11f355ad4e3c2fb2c6c6d1919c73f3b5a433de4708202cade59"},
-]
-pytest-cov = [
-    {file = "pytest-cov-4.0.0.tar.gz", hash = "sha256:996b79efde6433cdbd0088872dbc5fb3ed7fe1578b68cdbba634f14bb8dd0470"},
-    {file = "pytest_cov-4.0.0-py3-none-any.whl", hash = "sha256:2feb1b751d66a8bd934e5edfa2e961d11309dc37b73b0eabe73b5945fee20f6b"},
-]
-pytest-xdist = [
-    {file = "pytest-xdist-3.0.2.tar.gz", hash = "sha256:688da9b814370e891ba5de650c9327d1a9d861721a524eb917e620eec3e90291"},
-    {file = "pytest_xdist-3.0.2-py3-none-any.whl", hash = "sha256:9feb9a18e1790696ea23e1434fa73b325ed4998b0e9fcb221f16fd1945e6df1b"},
-]
+pytest = []
+pytest-cov = []
+pytest-xdist = []
 python-dateutil = [
     {file = "python-dateutil-2.8.2.tar.gz", hash = "sha256:0123cacc1627ae19ddf3c27a5de5bd67ee4586fbdd6440d9748f8abb483d3e86"},
     {file = "python_dateutil-2.8.2-py2.py3-none-any.whl", hash = "sha256:961d03dc3453ebbc59dbdea9e4e11c5651520a876d0f4db161e8674aae935da9"},
 ]
-python-dotenv = [
-    {file = "python-dotenv-0.21.0.tar.gz", hash = "sha256:b77d08274639e3d34145dfa6c7008e66df0f04b7be7a75fd0d5292c191d79045"},
-    {file = "python_dotenv-0.21.0-py3-none-any.whl", hash = "sha256:1684eb44636dd462b66c3ee016599815514527ad99965de77f43e0944634a7e5"},
-]
-python-slugify = [
-    {file = "python-slugify-7.0.0.tar.gz", hash = "sha256:7a0f21a39fa6c1c4bf2e5984c9b9ae944483fd10b54804cb0e23a3ccd4954f0b"},
-    {file = "python_slugify-7.0.0-py2.py3-none-any.whl", hash = "sha256:003aee64f9fd955d111549f96c4b58a3f40b9319383c70fad6277a4974bbf570"},
-]
-PyYAML = [
+python-dotenv = []
+python-slugify = []
+pyyaml = [
     {file = "PyYAML-6.0-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:d4db7c7aef085872ef65a8fd7d6d09a14ae91f691dec3e87ee5ee0539d516f53"},
     {file = "PyYAML-6.0-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:9df7ed3b3d2e0ecfe09e14741b857df43adb5a3ddadc919a2d94fbdf78fea53c"},
     {file = "PyYAML-6.0-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:77f396e6ef4c73fdc33a9157446466f1cff553d979bd00ecb64385760c6babdc"},
@@ -899,13 +706,6 @@ PyYAML = [
     {file = "PyYAML-6.0-cp310-cp310-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:f84fbc98b019fef2ee9a1cb3ce93e3187a6df0b2538a651bfb890254ba9f90b5"},
     {file = "PyYAML-6.0-cp310-cp310-win32.whl", hash = "sha256:2cd5df3de48857ed0544b34e2d40e9fac445930039f3cfe4bcc592a1f836d513"},
     {file = "PyYAML-6.0-cp310-cp310-win_amd64.whl", hash = "sha256:daf496c58a8c52083df09b80c860005194014c3698698d1a57cbcfa182142a3a"},
-    {file = "PyYAML-6.0-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:d4b0ba9512519522b118090257be113b9468d804b19d63c71dbcf4a48fa32358"},
-    {file = "PyYAML-6.0-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:81957921f441d50af23654aa6c5e5eaf9b06aba7f0a19c18a538dc7ef291c5a1"},
-    {file = "PyYAML-6.0-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:afa17f5bc4d1b10afd4466fd3a44dc0e245382deca5b3c353d8b757f9e3ecb8d"},
-    {file = "PyYAML-6.0-cp311-cp311-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:dbad0e9d368bb989f4515da330b88a057617d16b6a8245084f1b05400f24609f"},
-    {file = "PyYAML-6.0-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:432557aa2c09802be39460360ddffd48156e30721f5e8d917f01d31694216782"},
-    {file = "PyYAML-6.0-cp311-cp311-win32.whl", hash = "sha256:bfaef573a63ba8923503d27530362590ff4f576c626d86a9fed95822a8255fd7"},
-    {file = "PyYAML-6.0-cp311-cp311-win_amd64.whl", hash = "sha256:01b45c0191e6d66c470b6cf1b9531a771a83c1c4208272ead47a3ae4f2f603bf"},
     {file = "PyYAML-6.0-cp36-cp36m-macosx_10_9_x86_64.whl", hash = "sha256:897b80890765f037df3403d22bab41627ca8811ae55e9a722fd0392850ec4d86"},
     {file = "PyYAML-6.0-cp36-cp36m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:50602afada6d6cbfad699b0c7bb50d5ccffa7e46a3d738092afddc1f9758427f"},
     {file = "PyYAML-6.0-cp36-cp36m-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:48c346915c114f5fdb3ead70312bd042a953a8ce5c7106d5bfb1a5254e47da92"},
@@ -933,22 +733,12 @@ PyYAML = [
     {file = "PyYAML-6.0-cp39-cp39-win_amd64.whl", hash = "sha256:b3d267842bf12586ba6c734f89d1f5b871df0273157918b0ccefa29deb05c21c"},
     {file = "PyYAML-6.0.tar.gz", hash = "sha256:68fb519c14306fec9720a2a5b45bc9f0c8d1b9c72adf45c37baedfcd949c35a2"},
 ]
-requests = [
-    {file = "requests-2.28.1-py3-none-any.whl", hash = "sha256:8fefa2a1a1365bf5520aac41836fbee479da67864514bdb821f31ce07ce65349"},
-    {file = "requests-2.28.1.tar.gz", hash = "sha256:7c5599b102feddaa661c826c56ab4fee28bfd17f5abca1ebbe3e7f19d7c97983"},
-]
-setuptools = [
-    {file = "setuptools-65.6.3-py3-none-any.whl", hash = "sha256:57f6f22bde4e042978bcd50176fdb381d7c21a9efa4041202288d3737a0c6a54"},
-    {file = "setuptools-65.6.3.tar.gz", hash = "sha256:a7620757bf984b58deaf32fc8a4577a9bbc0850cf92c20e1ce41c38c19e5fb75"},
-]
+requests = []
 six = [
     {file = "six-1.16.0-py2.py3-none-any.whl", hash = "sha256:8abb2f1d86890a2dfb989f9a77cfcfd3e47c2a354b01111771326f8aa26e0254"},
     {file = "six-1.16.0.tar.gz", hash = "sha256:1e61c37477a1626458e36f7b1d82aa5c9b094fa4802892072e49de9c60c4c926"},
 ]
-soupsieve = [
-    {file = "soupsieve-2.3.2.post1-py3-none-any.whl", hash = "sha256:3b2503d3c7084a42b1ebd08116e5f81aadfaea95863628c80a3b774a11b7c759"},
-    {file = "soupsieve-2.3.2.post1.tar.gz", hash = "sha256:fc53893b3da2c33de295667a0e19f078c14bf86544af307354de5fcf12a3f30d"},
-]
+soupsieve = []
 text-unidecode = [
     {file = "text-unidecode-1.3.tar.gz", hash = "sha256:bad6603bb14d279193107714b288be206cac565dfa49aa5b105294dd5c4aab93"},
     {file = "text_unidecode-1.3-py2.py3-none-any.whl", hash = "sha256:1311f10e8b895935241623731c2ba64f4c455287888b18189350b67134a822e8"},
@@ -961,19 +751,7 @@ tomli = [
     {file = "tomli-2.0.1-py3-none-any.whl", hash = "sha256:939de3e7a6161af0c887ef91b7d41a53e7c5a1ca976325f429cb46ea9bc30ecc"},
     {file = "tomli-2.0.1.tar.gz", hash = "sha256:de526c12914f0c550d15924c62d72abc48d6fe7364aa87328337a31007fe8a4f"},
 ]
-tox = [
-    {file = "tox-3.27.1-py2.py3-none-any.whl", hash = "sha256:f52ca66eae115fcfef0e77ef81fd107133d295c97c52df337adedb8dfac6ab84"},
-    {file = "tox-3.27.1.tar.gz", hash = "sha256:b2a920e35a668cc06942ffd1cf3a4fb221a4d909ca72191fb6d84b0b18a7be04"},
-]
-tqdm = [
-    {file = "tqdm-4.64.1-py2.py3-none-any.whl", hash = "sha256:6fee160d6ffcd1b1c68c65f14c829c22832bc401726335ce92c52d395944a6a1"},
-    {file = "tqdm-4.64.1.tar.gz", hash = "sha256:5f4f682a004951c1b450bc753c710e9280c5746ce6ffedee253ddbcbf54cf1e4"},
-]
-urllib3 = [
-    {file = "urllib3-1.26.13-py2.py3-none-any.whl", hash = "sha256:47cc05d99aaa09c9e72ed5809b60e7ba354e64b59c9c173ac3018642d8bb41fc"},
-    {file = "urllib3-1.26.13.tar.gz", hash = "sha256:c083dd0dce68dbfbe1129d5271cb90f9447dea7d52097c6e0126120c521ddea8"},
-]
-virtualenv = [
-    {file = "virtualenv-20.16.7-py3-none-any.whl", hash = "sha256:efd66b00386fdb7dbe4822d172303f40cd05e50e01740b19ea42425cbe653e29"},
-    {file = "virtualenv-20.16.7.tar.gz", hash = "sha256:8691e3ff9387f743e00f6bb20f70121f5e4f596cae754531f2b3b3a1b1ac696e"},
-]
+tox = []
+tqdm = []
+urllib3 = []
+virtualenv = []
diff --git a/pyproject.toml b/pyproject.toml
index 5f8aaddd..355cb8c6 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -12,6 +12,7 @@ click = "^8.1.3"
 requests = "^2.28.1"
 beautifulsoup4 = "^4.11.1"
 tqdm = "^4.64.0"
+parse = "^1.19.0"
 
 [tool.poetry.dev-dependencies]
 black = "^22.10"
diff --git a/src/adventofcode2022/solutions/day04.py b/src/adventofcode2022/solutions/day04.py
index 6d75f88f..41635e3d 100644
--- a/src/adventofcode2022/solutions/day04.py
+++ b/src/adventofcode2022/solutions/day04.py
@@ -1,3 +1,5 @@
+from parse import parse
+
 from adventofcode2022.utils.abstract import FileReaderSolution
 
 
@@ -17,12 +19,10 @@ def solve(self, input_data: str) -> int:
     def parse(lines) -> list[tuple[range, range]]:
         ranges = []
         for line in lines:
-            pair1, pair2 = line.split(",")
-            start1, stop1 = pair1.split("-")
-            start2, stop2 = pair2.split("-")
-            range1 = range(int(start1), int(stop1) + 1)
-            range2 = range(int(start2), int(stop2) + 1)
-            ranges.append((range1, range2))
+            p = parse("{start1:d}-{stop1:d},{start2:d}-{stop2:d}", line)
+            ranges.append(
+                (range(p["start1"], p["stop1"] + 1), range(p["start2"], p["stop2"] + 1))
+            )
         return ranges
 
 

From ec67b8d89a3f7bfc79831195e59006737957bea9 Mon Sep 17 00:00:00 2001
From: Roel Adriaans <roel.adriaans@ordina.nl>
Date: Sun, 4 Dec 2022 21:53:18 +0100
Subject: [PATCH 186/371] Update deps

---
 .pre-commit-config.yaml |  2 +-
 poetry.lock             | 12 ++++++------
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index 586340da..14b5638f 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -31,7 +31,7 @@ repos:
       language_version: python3
 
   - repo: https://github.com/asottile/pyupgrade
-    rev: v3.2.2
+    rev: v3.3.0
     hooks:
     - id: pyupgrade
       args: [ "--py310-plus" ]
diff --git a/poetry.lock b/poetry.lock
index e7c2a855..7f93ddc3 100644
--- a/poetry.lock
+++ b/poetry.lock
@@ -103,11 +103,11 @@ python-versions = ">=3.6.1"
 
 [[package]]
 name = "chardet"
-version = "5.0.0"
+version = "5.1.0"
 description = "Universal encoding detector for Python 3"
 category = "dev"
 optional = false
-python-versions = ">=3.6"
+python-versions = ">=3.7"
 
 [[package]]
 name = "charset-normalizer"
@@ -426,11 +426,11 @@ testing = ["fields", "hunter", "process-tests", "six", "pytest-xdist", "virtuale
 
 [[package]]
 name = "pytest-xdist"
-version = "3.0.2"
-description = "pytest xdist plugin for distributed testing and loop-on-failing modes"
+version = "3.1.0"
+description = "pytest xdist plugin for distributed testing, most importantly across multiple CPUs"
 category = "dev"
 optional = false
-python-versions = ">=3.6"
+python-versions = ">=3.7"
 
 [package.dependencies]
 execnet = ">=1.1"
@@ -597,7 +597,7 @@ socks = ["PySocks (>=1.5.6,!=1.5.7,<2.0)"]
 
 [[package]]
 name = "virtualenv"
-version = "20.16.7"
+version = "20.17.0"
 description = "Virtual Python Environment builder"
 category = "dev"
 optional = false

From f001ea8166dbf2bb90207df8bbe512388e4e5a08 Mon Sep 17 00:00:00 2001
From: Roel Adriaans <roel.adriaans@ordina.nl>
Date: Mon, 5 Dec 2022 09:21:48 +0100
Subject: [PATCH 187/371] Implent day 5 with some stacks

---
 .../solutions/data/day_05/day05.txt           | 511 ++++++++++++++++++
 src/adventofcode2022/solutions/day05.py       |  82 +++
 tests/solutions/test_day05_a.py               |  27 +
 tests/solutions/test_day05_b.py               |  27 +
 4 files changed, 647 insertions(+)
 create mode 100644 src/adventofcode2022/solutions/data/day_05/day05.txt
 create mode 100644 src/adventofcode2022/solutions/day05.py
 create mode 100644 tests/solutions/test_day05_a.py
 create mode 100644 tests/solutions/test_day05_b.py

diff --git a/src/adventofcode2022/solutions/data/day_05/day05.txt b/src/adventofcode2022/solutions/data/day_05/day05.txt
new file mode 100644
index 00000000..af73d20e
--- /dev/null
+++ b/src/adventofcode2022/solutions/data/day_05/day05.txt
@@ -0,0 +1,511 @@
+[Q] [J]                         [H]
+[G] [S] [Q]     [Z]             [P]
+[P] [F] [M]     [F]     [F]     [S]
+[R] [R] [P] [F] [V]     [D]     [L]
+[L] [W] [W] [D] [W] [S] [V]     [G]
+[C] [H] [H] [T] [D] [L] [M] [B] [B]
+[T] [Q] [B] [S] [L] [C] [B] [J] [N]
+[F] [N] [F] [V] [Q] [Z] [Z] [T] [Q]
+ 1   2   3   4   5   6   7   8   9 
+
+move 1 from 8 to 1
+move 1 from 6 to 1
+move 3 from 7 to 4
+move 3 from 2 to 9
+move 11 from 9 to 3
+move 1 from 6 to 9
+move 15 from 3 to 9
+move 5 from 2 to 3
+move 3 from 7 to 5
+move 6 from 9 to 3
+move 6 from 1 to 6
+move 2 from 3 to 7
+move 5 from 4 to 5
+move 7 from 9 to 4
+move 2 from 9 to 5
+move 10 from 4 to 2
+move 6 from 5 to 4
+move 2 from 7 to 6
+move 10 from 2 to 3
+move 21 from 3 to 5
+move 1 from 3 to 6
+move 3 from 6 to 9
+move 1 from 8 to 9
+move 5 from 4 to 5
+move 4 from 9 to 3
+move 17 from 5 to 1
+move 1 from 6 to 2
+move 16 from 5 to 1
+move 3 from 3 to 6
+move 6 from 6 to 4
+move 1 from 2 to 4
+move 4 from 1 to 2
+move 2 from 6 to 2
+move 28 from 1 to 3
+move 1 from 9 to 7
+move 1 from 8 to 7
+move 1 from 5 to 4
+move 1 from 2 to 6
+move 1 from 3 to 1
+move 3 from 2 to 5
+move 1 from 6 to 3
+move 4 from 4 to 7
+move 5 from 5 to 2
+move 1 from 5 to 6
+move 6 from 1 to 3
+move 1 from 6 to 2
+move 26 from 3 to 6
+move 2 from 7 to 9
+move 4 from 7 to 3
+move 19 from 6 to 3
+move 6 from 2 to 4
+move 5 from 3 to 2
+move 1 from 9 to 7
+move 26 from 3 to 8
+move 6 from 4 to 3
+move 1 from 3 to 8
+move 1 from 6 to 7
+move 6 from 3 to 6
+move 6 from 6 to 4
+move 1 from 9 to 2
+move 2 from 4 to 9
+move 22 from 8 to 2
+move 2 from 6 to 5
+move 1 from 9 to 1
+move 1 from 6 to 5
+move 1 from 7 to 5
+move 3 from 6 to 7
+move 2 from 6 to 1
+move 1 from 1 to 5
+move 3 from 5 to 9
+move 4 from 8 to 4
+move 2 from 1 to 4
+move 18 from 2 to 1
+move 2 from 7 to 8
+move 3 from 9 to 5
+move 8 from 1 to 9
+move 5 from 9 to 3
+move 1 from 9 to 8
+move 2 from 9 to 4
+move 2 from 7 to 8
+move 5 from 5 to 7
+move 1 from 9 to 3
+move 4 from 8 to 4
+move 1 from 7 to 8
+move 4 from 4 to 3
+move 2 from 8 to 3
+move 1 from 8 to 9
+move 2 from 1 to 8
+move 3 from 4 to 5
+move 1 from 8 to 4
+move 1 from 9 to 3
+move 1 from 8 to 5
+move 8 from 1 to 8
+move 11 from 2 to 9
+move 12 from 3 to 5
+move 1 from 3 to 9
+move 1 from 8 to 5
+move 11 from 9 to 3
+move 4 from 5 to 9
+move 3 from 8 to 7
+move 3 from 7 to 8
+move 1 from 5 to 8
+move 7 from 4 to 3
+move 1 from 4 to 5
+move 1 from 2 to 8
+move 3 from 7 to 6
+move 3 from 4 to 8
+move 1 from 7 to 9
+move 2 from 4 to 7
+move 5 from 8 to 1
+move 3 from 6 to 5
+move 2 from 4 to 2
+move 1 from 9 to 4
+move 1 from 8 to 6
+move 1 from 2 to 9
+move 1 from 8 to 5
+move 3 from 8 to 4
+move 3 from 4 to 2
+move 4 from 3 to 9
+move 17 from 5 to 9
+move 9 from 9 to 6
+move 1 from 9 to 3
+move 5 from 6 to 3
+move 3 from 6 to 3
+move 8 from 9 to 5
+move 2 from 8 to 5
+move 1 from 4 to 8
+move 1 from 5 to 3
+move 1 from 8 to 5
+move 3 from 2 to 6
+move 3 from 1 to 4
+move 7 from 5 to 1
+move 1 from 2 to 6
+move 13 from 3 to 6
+move 2 from 7 to 8
+move 13 from 6 to 5
+move 3 from 5 to 7
+move 6 from 5 to 6
+move 1 from 7 to 6
+move 2 from 7 to 3
+move 1 from 6 to 8
+move 13 from 3 to 5
+move 9 from 5 to 9
+move 7 from 5 to 7
+move 17 from 9 to 2
+move 3 from 4 to 7
+move 9 from 2 to 9
+move 10 from 9 to 3
+move 8 from 7 to 8
+move 2 from 5 to 3
+move 4 from 2 to 6
+move 11 from 3 to 9
+move 9 from 6 to 5
+move 5 from 9 to 8
+move 1 from 3 to 1
+move 3 from 9 to 1
+move 2 from 5 to 2
+move 1 from 7 to 9
+move 2 from 9 to 4
+move 2 from 9 to 8
+move 13 from 1 to 8
+move 3 from 8 to 5
+move 27 from 8 to 1
+move 10 from 5 to 9
+move 1 from 7 to 2
+move 2 from 4 to 3
+move 10 from 9 to 6
+move 1 from 8 to 7
+move 15 from 1 to 9
+move 13 from 9 to 5
+move 15 from 5 to 7
+move 5 from 1 to 3
+move 8 from 7 to 1
+move 7 from 7 to 1
+move 16 from 1 to 8
+move 4 from 3 to 9
+move 4 from 1 to 7
+move 4 from 9 to 6
+move 5 from 2 to 7
+move 15 from 8 to 6
+move 1 from 9 to 1
+move 3 from 3 to 4
+move 1 from 9 to 7
+move 1 from 2 to 7
+move 1 from 2 to 7
+move 1 from 8 to 1
+move 3 from 4 to 8
+move 3 from 8 to 1
+move 8 from 6 to 8
+move 7 from 1 to 4
+move 11 from 6 to 8
+move 14 from 6 to 5
+move 13 from 8 to 7
+move 4 from 7 to 5
+move 15 from 7 to 4
+move 6 from 5 to 4
+move 2 from 5 to 9
+move 1 from 5 to 2
+move 3 from 8 to 5
+move 19 from 4 to 7
+move 10 from 5 to 8
+move 2 from 6 to 8
+move 1 from 4 to 8
+move 2 from 7 to 9
+move 9 from 7 to 4
+move 6 from 4 to 6
+move 11 from 4 to 8
+move 2 from 5 to 4
+move 5 from 6 to 4
+move 1 from 6 to 7
+move 3 from 9 to 5
+move 3 from 8 to 5
+move 3 from 7 to 6
+move 11 from 8 to 7
+move 1 from 9 to 5
+move 1 from 6 to 8
+move 1 from 2 to 1
+move 5 from 4 to 9
+move 2 from 4 to 1
+move 2 from 1 to 4
+move 1 from 1 to 9
+move 4 from 5 to 1
+move 1 from 4 to 6
+move 17 from 7 to 5
+move 9 from 8 to 7
+move 6 from 9 to 7
+move 3 from 1 to 9
+move 12 from 7 to 9
+move 12 from 9 to 5
+move 5 from 7 to 9
+move 17 from 5 to 3
+move 7 from 3 to 1
+move 5 from 1 to 5
+move 5 from 9 to 2
+move 4 from 3 to 5
+move 1 from 4 to 8
+move 5 from 2 to 1
+move 22 from 5 to 9
+move 3 from 7 to 6
+move 6 from 6 to 9
+move 2 from 5 to 4
+move 1 from 6 to 3
+move 2 from 4 to 1
+move 3 from 8 to 2
+move 1 from 3 to 4
+move 24 from 9 to 1
+move 4 from 3 to 9
+move 2 from 2 to 9
+move 2 from 3 to 1
+move 1 from 8 to 6
+move 1 from 6 to 9
+move 1 from 8 to 9
+move 2 from 7 to 4
+move 1 from 8 to 3
+move 1 from 4 to 7
+move 3 from 9 to 8
+move 1 from 2 to 1
+move 9 from 9 to 3
+move 1 from 8 to 7
+move 1 from 4 to 3
+move 2 from 9 to 7
+move 1 from 9 to 3
+move 2 from 8 to 4
+move 12 from 3 to 8
+move 2 from 1 to 7
+move 1 from 4 to 3
+move 30 from 1 to 5
+move 6 from 5 to 7
+move 12 from 7 to 2
+move 1 from 3 to 4
+move 2 from 1 to 3
+move 1 from 4 to 9
+move 10 from 5 to 7
+move 10 from 2 to 6
+move 8 from 8 to 3
+move 3 from 1 to 3
+move 5 from 6 to 3
+move 2 from 8 to 5
+move 1 from 9 to 2
+move 2 from 8 to 6
+move 4 from 7 to 2
+move 3 from 2 to 7
+move 2 from 7 to 5
+move 1 from 4 to 9
+move 11 from 3 to 1
+move 7 from 6 to 9
+move 3 from 2 to 3
+move 10 from 1 to 7
+move 14 from 7 to 5
+move 3 from 7 to 6
+move 5 from 9 to 7
+move 29 from 5 to 7
+move 6 from 3 to 9
+move 2 from 9 to 7
+move 15 from 7 to 5
+move 11 from 5 to 6
+move 5 from 9 to 5
+move 10 from 5 to 8
+move 1 from 2 to 4
+move 1 from 8 to 2
+move 2 from 4 to 3
+move 2 from 5 to 9
+move 8 from 8 to 9
+move 11 from 9 to 3
+move 1 from 1 to 8
+move 18 from 7 to 3
+move 1 from 9 to 3
+move 28 from 3 to 5
+move 12 from 6 to 7
+move 1 from 2 to 9
+move 15 from 7 to 2
+move 1 from 8 to 1
+move 10 from 2 to 9
+move 10 from 5 to 3
+move 2 from 2 to 3
+move 18 from 3 to 4
+move 6 from 9 to 4
+move 1 from 1 to 7
+move 1 from 6 to 4
+move 1 from 8 to 2
+move 1 from 9 to 4
+move 2 from 9 to 4
+move 19 from 4 to 3
+move 1 from 7 to 9
+move 1 from 9 to 7
+move 1 from 6 to 8
+move 3 from 2 to 8
+move 2 from 9 to 5
+move 15 from 3 to 1
+move 7 from 5 to 1
+move 3 from 4 to 9
+move 1 from 7 to 2
+move 3 from 3 to 1
+move 6 from 5 to 2
+move 3 from 3 to 9
+move 4 from 9 to 2
+move 5 from 5 to 3
+move 1 from 3 to 5
+move 3 from 5 to 7
+move 3 from 8 to 5
+move 1 from 7 to 5
+move 4 from 5 to 1
+move 4 from 4 to 2
+move 2 from 7 to 8
+move 12 from 1 to 6
+move 1 from 8 to 6
+move 6 from 2 to 3
+move 9 from 3 to 8
+move 1 from 3 to 4
+move 3 from 6 to 1
+move 2 from 9 to 2
+move 1 from 4 to 5
+move 2 from 8 to 3
+move 10 from 2 to 1
+move 2 from 4 to 7
+move 12 from 1 to 4
+move 1 from 5 to 1
+move 7 from 4 to 9
+move 2 from 3 to 2
+move 6 from 9 to 2
+move 1 from 9 to 1
+move 1 from 7 to 8
+move 5 from 6 to 7
+move 3 from 6 to 1
+move 6 from 2 to 3
+move 2 from 4 to 3
+move 1 from 6 to 8
+move 1 from 6 to 7
+move 8 from 3 to 9
+move 2 from 4 to 5
+move 3 from 2 to 4
+move 10 from 8 to 2
+move 22 from 1 to 9
+move 9 from 2 to 4
+move 1 from 1 to 3
+move 1 from 3 to 2
+move 3 from 2 to 4
+move 2 from 7 to 1
+move 14 from 4 to 2
+move 2 from 1 to 8
+move 2 from 4 to 5
+move 4 from 7 to 8
+move 24 from 9 to 6
+move 3 from 5 to 9
+move 1 from 9 to 8
+move 1 from 5 to 2
+move 1 from 6 to 7
+move 6 from 9 to 1
+move 1 from 7 to 3
+move 5 from 8 to 6
+move 9 from 6 to 3
+move 4 from 1 to 4
+move 2 from 1 to 2
+move 11 from 6 to 3
+move 13 from 3 to 2
+move 2 from 9 to 8
+move 8 from 3 to 8
+move 2 from 8 to 5
+move 1 from 7 to 5
+move 3 from 6 to 3
+move 11 from 8 to 5
+move 13 from 2 to 4
+move 10 from 5 to 2
+move 2 from 3 to 4
+move 2 from 5 to 7
+move 15 from 4 to 9
+move 2 from 7 to 4
+move 2 from 4 to 2
+move 2 from 4 to 9
+move 2 from 4 to 2
+move 1 from 3 to 8
+move 1 from 8 to 1
+move 1 from 1 to 2
+move 1 from 6 to 3
+move 7 from 2 to 4
+move 1 from 5 to 3
+move 7 from 9 to 1
+move 7 from 1 to 2
+move 4 from 6 to 9
+move 12 from 9 to 7
+move 6 from 7 to 5
+move 1 from 3 to 5
+move 7 from 4 to 7
+move 3 from 7 to 8
+move 3 from 8 to 6
+move 18 from 2 to 9
+move 7 from 2 to 3
+move 15 from 9 to 4
+move 3 from 3 to 9
+move 1 from 3 to 1
+move 3 from 5 to 4
+move 1 from 1 to 2
+move 1 from 9 to 2
+move 2 from 6 to 2
+move 5 from 7 to 6
+move 5 from 2 to 7
+move 3 from 3 to 4
+move 5 from 5 to 3
+move 6 from 7 to 4
+move 9 from 4 to 2
+move 18 from 4 to 9
+move 6 from 2 to 1
+move 1 from 1 to 9
+move 4 from 7 to 4
+move 7 from 2 to 4
+move 1 from 2 to 8
+move 1 from 4 to 2
+move 4 from 3 to 4
+move 16 from 9 to 5
+move 9 from 9 to 8
+move 1 from 9 to 7
+move 4 from 1 to 2
+move 2 from 5 to 4
+move 10 from 5 to 4
+move 4 from 2 to 1
+move 5 from 1 to 2
+move 1 from 8 to 5
+move 1 from 6 to 5
+move 4 from 8 to 5
+move 2 from 6 to 9
+move 3 from 6 to 2
+move 2 from 9 to 1
+move 1 from 7 to 6
+move 1 from 3 to 8
+move 9 from 5 to 9
+move 4 from 8 to 1
+move 2 from 8 to 2
+move 1 from 5 to 7
+move 9 from 9 to 8
+move 1 from 7 to 5
+move 9 from 8 to 2
+move 6 from 1 to 6
+move 6 from 2 to 6
+move 10 from 2 to 5
+move 5 from 2 to 1
+move 1 from 3 to 5
+move 8 from 5 to 4
+move 5 from 1 to 3
+move 10 from 6 to 8
+move 3 from 6 to 9
+move 4 from 3 to 1
+move 5 from 8 to 2
+move 4 from 5 to 9
+move 1 from 3 to 7
+move 1 from 7 to 3
+move 1 from 8 to 6
+move 1 from 6 to 1
+move 15 from 4 to 8
+move 5 from 9 to 2
+move 1 from 9 to 1
+move 1 from 1 to 3
+move 6 from 4 to 8
+move 12 from 8 to 7
+move 1 from 3 to 5
+move 3 from 1 to 9
+move 13 from 4 to 9
+move 5 from 7 to 2
+move 1 from 5 to 4
+move 8 from 9 to 5
+move 6 from 2 to 5
+move 2 from 5 to 6
diff --git a/src/adventofcode2022/solutions/day05.py b/src/adventofcode2022/solutions/day05.py
new file mode 100644
index 00000000..ffa32bc5
--- /dev/null
+++ b/src/adventofcode2022/solutions/day05.py
@@ -0,0 +1,82 @@
+from abc import abstractmethod
+from typing import NamedTuple
+
+from parse import parse
+
+from adventofcode2022.utils.abstract import FileReaderSolution
+from adventofcode2022.utils.stack import Stack
+
+
+class Instruction(NamedTuple):
+    moves: int
+    source: int
+    destination: int
+
+
+class Day05(FileReaderSolution):
+    stacks: dict[int, Stack]
+    moves = list[Instruction]
+
+    @staticmethod
+    def parse_start(start_lines: str) -> dict[int, Stack]:
+        lines = start_lines.splitlines()
+        # Get the range:
+        stack_range = int(max(lines[-1].split(" ")))
+        stacks = {}
+        for i in range(0, stack_range):
+            # Column i
+            column = 1 + (i * 4)
+            items = []
+            for j in range(0, len(lines) - 1):
+                if lines[j][column].strip():
+                    items.append(lines[j][column])
+            stack: Stack[str] = Stack()
+            for item in reversed(items):
+                stack.push(item)
+            stacks[i + 1] = stack
+
+        return stacks
+
+    @staticmethod
+    def parse_instructions(instructions: str) -> list[Instruction]:
+        instr = []
+        for line in instructions.splitlines():
+            res = parse("move {moves:d} from {source:d} to {destination:d}", line)
+            instr.append(Instruction(res["moves"], res["source"], res["destination"]))
+        return instr
+
+    @staticmethod
+    def get_tops(stacks: dict[int, Stack]) -> str:
+        tops = []
+        for stack in stacks.values():
+            tops.append(stack.pop())
+        return "".join(tops)
+
+    @abstractmethod
+    def perform_moves(self):
+        raise NotImplementedError
+
+    def solve(self, input_data: str) -> str:
+        start, instructions = input_data.split("\n\n")
+        self.stacks = self.parse_start(start)
+        self.moves = self.parse_instructions(instructions)
+        self.perform_moves()
+        return self.get_tops(self.stacks)
+
+
+class Day05PartA(Day05):
+    def perform_moves(self):
+        for move in self.moves:
+            for _ in range(0, move.moves):
+                self.stacks[move.destination].push(self.stacks[move.source].pop())
+
+
+class Day05PartB(Day05, FileReaderSolution):
+    def perform_moves(self):
+        for move in self.moves:
+            moved = []
+            for _ in range(0, move.moves):
+                moved.append(self.stacks[move.source].pop())
+
+            for item in reversed(moved):
+                self.stacks[move.destination].push(item)
diff --git a/tests/solutions/test_day05_a.py b/tests/solutions/test_day05_a.py
new file mode 100644
index 00000000..c21da224
--- /dev/null
+++ b/tests/solutions/test_day05_a.py
@@ -0,0 +1,27 @@
+from textwrap import dedent
+
+from adventofcode2022.solutions.day05 import Day05PartA
+
+
+class TestDay05PartA:
+    def test_day05a_solve(self):
+        test_data = """\
+            [D]    
+        [N] [C]    
+        [Z] [M] [P]
+         1   2   3 
+
+        move 1 from 2 to 1
+        move 3 from 1 to 3
+        move 2 from 2 to 1
+        move 1 from 1 to 2
+        """  # noqa
+        solution = Day05PartA()
+        result = solution.solve(dedent(test_data))
+        assert result == "CMZ"
+
+    def test_day05a_data(self):
+        """Result we got when we did the real solution"""
+        solution = Day05PartA()
+        res = solution("day_05/day05.txt")
+        assert res == "VGBBJCRMN"
diff --git a/tests/solutions/test_day05_b.py b/tests/solutions/test_day05_b.py
new file mode 100644
index 00000000..1bfd630c
--- /dev/null
+++ b/tests/solutions/test_day05_b.py
@@ -0,0 +1,27 @@
+from textwrap import dedent
+
+from adventofcode2022.solutions.day05 import Day05PartB
+
+
+class TestDay05PartB:
+    def test_day05b_solve(self):
+        test_data = """\
+            [D]    
+        [N] [C]    
+        [Z] [M] [P]
+         1   2   3 
+
+        move 1 from 2 to 1
+        move 3 from 1 to 3
+        move 2 from 2 to 1
+        move 1 from 1 to 2
+        """  # noqa
+        solution = Day05PartB()
+        result = solution.solve(dedent(test_data))
+        assert result == "MCD"
+
+    def test_day05b_data(self):
+        """Result we got when we did the real solution"""
+        solution = Day05PartB()
+        res = solution("day_05/day05.txt")
+        assert res == "LBBVJBRMH"

From 802ce8d94cc6a067c1b70b656bddad69433c846b Mon Sep 17 00:00:00 2001
From: Roel Adriaans <roel.adriaans@asml.com>
Date: Tue, 6 Dec 2022 19:39:48 +0100
Subject: [PATCH 188/371] Fix type annototion, was an assignment

---
 src/adventofcode2022/solutions/day05.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/adventofcode2022/solutions/day05.py b/src/adventofcode2022/solutions/day05.py
index ffa32bc5..77bc326e 100644
--- a/src/adventofcode2022/solutions/day05.py
+++ b/src/adventofcode2022/solutions/day05.py
@@ -15,7 +15,7 @@ class Instruction(NamedTuple):
 
 class Day05(FileReaderSolution):
     stacks: dict[int, Stack]
-    moves = list[Instruction]
+    moves: list[Instruction]
 
     @staticmethod
     def parse_start(start_lines: str) -> dict[int, Stack]:

From 228184ea05915ac91bd26f306aa444be53ef83d0 Mon Sep 17 00:00:00 2001
From: Roel Adriaans <roel.adriaans@asml.com>
Date: Tue, 6 Dec 2022 19:40:18 +0100
Subject: [PATCH 189/371] Day 6, part a. Reading was an issue, you read it char
 by char, not in blocks of 4

---
 .../solutions/data/day_06/day06.txt           |  1 +
 src/adventofcode2022/solutions/day06.py       | 24 +++++++++++++++++
 tests/solutions/test_day06_a.py               | 26 +++++++++++++++++++
 tests/solutions/test_day06_b.py               | 19 ++++++++++++++
 4 files changed, 70 insertions(+)
 create mode 100644 src/adventofcode2022/solutions/data/day_06/day06.txt
 create mode 100644 src/adventofcode2022/solutions/day06.py
 create mode 100644 tests/solutions/test_day06_a.py
 create mode 100644 tests/solutions/test_day06_b.py

diff --git a/src/adventofcode2022/solutions/data/day_06/day06.txt b/src/adventofcode2022/solutions/data/day_06/day06.txt
new file mode 100644
index 00000000..4e1db04b
--- /dev/null
+++ b/src/adventofcode2022/solutions/data/day_06/day06.txt
@@ -0,0 +1 @@
+zdnnfgfsgffgllwrwprwrgwwpssznzrnznllstszsttpdptdpdmdsdzsdscsmcmttdllbsbwwtwnwswcchshlhjhfhwfftcchnnfwwbqwqwrqqgmgzmmwzwfzwfzzzsmzzrczcmmhphzhbbbgdbgddmggwwbbttvmtvttfsfttjlttdfdsdqqczqzffbrfbbfbrrmdrrlslshllwzwrzrzzlqldqdjdjwjvjzjrjjcsszjjqfqnfqqsrqrccbhhwphwhbwwlzwwjwfjwfwzfwzffssvjsjddcsdslslrsrfsrffsggdffrcrcdcpprrzbrzbbtstvvqttbqqgfgsggtvtrvtvbbrqrsqrsqsvsbbzmbmgmvgmmrqrzzbbnjjlwjjfssdrdbrbffwrrrjjgcgtgvvjbjjjsqjsqqncntnndcdrcrhhsgstslldwdbwdbdtbdbggpnndhdvhhvrrlzzfjjffzszvvzgzhhqzqttdhdrrwdwzdwdbwwfsfwsfwfqqzwzbzmzwmmvgggvssvwswfwswhwzzqtqrtthhbbjggjppnpfnfmnnghgrhhtvtqtsttbpprzzwqqfhqfflttzffrprwpwspplzpztptgtltjlttwwsrsrprwrsswnwttcscqsqlsqqhshbhlblnnpznnzlnndrnrcncvcqcjqqvhvppjzjddzbzsztzqqlmlnlnblnlwnllswszwzrzddqhdqhqffhfhjjpbbhvbvmmfhmhcccjlclhcllbrlblddnpplggcmmvddmmqzzmqmppnjpjjjzllqjqccrwwhzhnnlmlhhbbtztvtltvtnvtvltlrtrllbttbzzfwfrrjzjbbmgghjhqhlljnjhhhjzjcjvcvwwzczwcwgcclflnnsvvcncbncnqqpjqjnjwjrrgqrrmqmfmmmjgjfgjfftggqdgqddgcdcdwdrdsswqqphpjhhdjjwswfwfnfqnqccvhvzvmzvzzplzljzjpzzhmzmqzqjjprpvrrhqqnbngnnpvpfvpvqvwwrhhdndqdppmcppzddbzzjcjdjfjnfnngqnnchcqqpllpwppgllcblcblbddzhhqsqbssjqqgmgbgzzvhvnhvnhvvpmpvvlddgppzrprmpmbpbjpbpfptpspddcgddqhdhhthrhjrhrvrlrffvbfbvfvbblssftfnfwwrwnnzdznnbwnbwnwlwttszzmmlzlhhpjhhjvvlvwwdnddzwdwgdgdssflfvfzvznzbzrbzzdssphhgttllcjcvcjjdrdqdhdnndlndldcllcnllslvlnvllmglgnnplpmpzzjwjtwtnntrtjtvjtjffhcfclltppftfwwprrwsrwwzdwzdztzccbmccfcfzczbcbsbqsstjtrrpnnfqqfmmchmmwmrwrwzwztzddgzdgzzfwzzrppcscrrgvgvgvtgtsslrsrvsrrdcdscscwcwqqsccwjcjgjvgvpvnvhhchrrgprpvrvsvsttgghdghhmphmmbvbcbsccdbcbnccbnnsjnjhnnzbnnpjbwdpczcvgjpgwfqrmnvwncflvnttwhfgmfqvngpdhbhvlglfhtdqmqtqcgjcqghzvbdghdgvjcsjrlpqvgcdnbpqrcrcvqqdlcpscqbfpsnhzcdbbcssslrjlzsqpprsbmtqhzblvwbswprhztmpcgfqfsgshchrhjmwwhpzsjzrmrvgdgwjrlwpgqhbzrmnmnnsnvzsrlhthgvlpljsjrpbhbzctdqgvdjcmrgtvqjqbcwsprnfmntzpbjcdtlchhjgwpmldmsstbtztfdbgbstgnlwbzrrzmvbrhnrlcwfgwwbfnntbjspqwngbjrvhdcnblqssgjlbcwbbgphhnmfcmdhqdhsnmvdjnwwwjlffswhsmwqrsprftjwtbtcvmpctgvfqvvcjpnwzqldglfbwfzpnqmdlrdpjmjptvwsctlmhmzzgvplglfgsvrfbqbmrhplczbvqpdjjhhvfqswhzhqfgzstwwpbtbsnnlgpshwqgppzbpsfpfvcntbbbzwdnfcgcwzbqwmhjrhpdfvpbzpmfnmllrcqlqhcbzfltzcgccwwqmtsmwchhvbqtdrnsbrchqqcmtfqpddcjplbvdhhtndrrmfdtmbpdvwthvgdccnrcqmpznlvzqzfjqmpvgjtfbtfjnrmlzhwhljrrqnbqzpfhcvncblfggrtbdfjqnlgpbrzmwcvrvjtjscfmcnfjgqzqsphldvhdbpvmghrvsdmvpmvvdmdhwdghtjltmlcmfhvrsvcvpblwhhfcfdqnrsjbcldgbwhtnjntmgvprhbjrcvsmhgtfphcwncpjtngqhvwrmgprstbtdstmttpzcntmzvncwslqlldpnjbtpmsfnwbpwpnlfgdvcqplvlqqjvfftnnvpcmwjrvwqhlrshftrbhcwnczzsnvtnjnrbzzgzfsqhnfwlcgzvvhqcgvqtmcpnhlvdlmwgsvtwbqgrdsrrddszvscbgtlpwpzjrbvwhjnrpprhtzmthbpfzvplzwfdtnwqwtctgjslmcczjvwplsqwgfnfbgdjbsdpwbgflttvvqlhzgmmpjsnwbqqtcdszfqbhgnmbbmrbrgnrzdmzwnjjzjqcwqcqfchjrzlspgbrchcbgwbhvggsqbvdpzbpnwdtqvcjwcwnbjdhsdfmbtwfbfhzwwtnqzhmtvtbfwrsqjzgssvlwszvlmvbslpncnhmsdhcqqfpftztpzbbhsgbnscddbjlgwgjjndgwbrhwmsfdmmsnlwgwdsdltwjfvwnczjrbgcvsfczppltdptlgcdfzgmqpjngstldqgmwhdmfrwwfqwdgswvfdrtsgtvttpcbnhzbscnchpvfjvbcszbwchnbmfrvsswslbzlhgwlvfchdbfthbpdbwwqtmlgwjqtjhzrjzzmrpdwnvfgrnqdcqmwtttmwjvgcmjsddvtlswldzhtppwvhmlghwlgblfttctnglwhtfvqgjmdjcnflsrjvpjwcjfftbdmmcbqvfwnnnzsltllncbstgnhtmpsltgztqzjbbrtqpcvdlnhpnhvmmztpfpplbqjlpqvfsdvhwvstdmqbtnpzrcbdhvdtghqwcppcfzjfjsfwvqrtfgcdzwgzjvrqqsjtnhlbjcmtjcnmtpffwcwhqqphwjsrhpqvnnhhrcnvztfdjzbjggwlgjprbpssgnmtcrvprwbsrfvvphrsgzgbrfnpgtqbbprhfphqntsglrmhzfnwqptlslnhtrhfprjpdcglcffsblnjwczmgwhmmtgsgwljmqlvdglqmzwmtqcvgcrmqjldlsnbssdvrrtltngvrsqbctqlsngqvcphjvhmwsssgwmvgzdctjcmjtpcjhvfcrfhbffdqfjjvpqwgvnlzhgfnfmlrrfvjrdvhzdcvdvmpncvtjbbnczpzmglfqnpbsrsjwgvszsnqvrnvlhmqjjnmsfngbdlpwbqllcptjtlbhrfdvhlrpdlznpvndjzjdtjflqqjdgjjpmnpmjgcglllgcqbfpvdtpbjdnvrclmnlfdrpbmwzgvdhgbzvbhwqfslhshbfcbwrnsjndgjgccllfbzgmcjqcmdnfftnccphqtwmgqgfqlvlwsrprctchqrscwvgpdrwgcfgzjwmzmmsmwzgtzsjtqfggcczcmghlqgnqqjvsrsfrrmwmnrnhbsszmwsqlrggsbdwzzfnhwcggjszfrlffplvcblvphqmzjnzwzdshhdprfrdbcrmbtztcfvgpzpmmgflswphvnvtwhbbhjwffsvqfjlfvzqmhmsmddwdwsqfnnplbqnptbvgjqgmflsbfdtpvdgbfnqmcqznhpqbpwtbfpqllvqwvcftdjjtlsvzbssbtcdzqqqvzlqhfpdthscqmvhpndmnztthvvzccqswswspnqcbncvszrgjshjhdsclrjdnjdczqmcjldbspclgrmwqdvcvpcsvjggfdqlrwlnzptfvcwjsgblpjzgcrrmjqptvdnwr
diff --git a/src/adventofcode2022/solutions/day06.py b/src/adventofcode2022/solutions/day06.py
new file mode 100644
index 00000000..c3540f2b
--- /dev/null
+++ b/src/adventofcode2022/solutions/day06.py
@@ -0,0 +1,24 @@
+from adventofcode2022.utils.abstract import FileReaderSolution
+
+
+class Day06:
+    pass
+
+
+class Day06PartA(Day06, FileReaderSolution):
+    def solve(self, input_data: str) -> int:
+        input_data = input_data.strip()
+        for start in range(0, len(input_data)):
+            packet = input_data[start : start + 4]
+            if len(set(packet)) != 4:
+                # Duplicated characters
+                continue
+            # We have something new, return starting position + 4 chars in this packet
+            return start + 4
+
+        return -1
+
+
+class Day06PartB(Day06, FileReaderSolution):
+    def solve(self, input_data: str) -> int:
+        raise NotImplementedError
diff --git a/tests/solutions/test_day06_a.py b/tests/solutions/test_day06_a.py
new file mode 100644
index 00000000..69edcdd8
--- /dev/null
+++ b/tests/solutions/test_day06_a.py
@@ -0,0 +1,26 @@
+import pytest
+
+from adventofcode2022.solutions.day06 import Day06PartA
+
+
+class TestDay06PartA:
+    @pytest.mark.parametrize(
+        ("input_data", "expected_result"),
+        [
+            ("mjqjpqmgbljsphdztnvjfqwrcgsmlb", 7),
+            ("bvwbjplbgvbhsrlpgdmjqwftvncz", 5),
+            ("nppdvjthqldpwncqszvftbrmjlhg", 6),
+            ("nznrnfrfntjfmvfwmzdfjlvtqnbhcprsg", 10),
+            ("zcfzfwzzqfrljwzlrfnpqdbhtmscgvjw", 11),
+        ],
+    )
+    def test_day06a_solve(self, input_data, expected_result):
+        solution = Day06PartA()
+        result = solution.solve(input_data)
+        assert result == expected_result
+
+    def test_day06a_data(self):
+        """Result we got when we did the real solution"""
+        solution = Day06PartA()
+        res = solution("day_06/day06.txt")
+        assert res == 1566
diff --git a/tests/solutions/test_day06_b.py b/tests/solutions/test_day06_b.py
new file mode 100644
index 00000000..6cf3dcf7
--- /dev/null
+++ b/tests/solutions/test_day06_b.py
@@ -0,0 +1,19 @@
+import pytest
+
+from adventofcode2022.solutions.day06 import Day06PartB
+
+
+class TestDay06PartB:
+    @pytest.mark.xfail(reason="Not yet implemented", raises=NotImplementedError)
+    @pytest.mark.parametrize(("input_data", "expected_result"), [("", ""), ("", "")])
+    def test_day06b_solve(self, input_data, expected_result):
+        solution = Day06PartB()
+        result = solution.solve(input_data)
+        assert result == expected_result
+
+    @pytest.mark.xfail(reason="Not yet implemented", raises=NotImplementedError)
+    def test_day06b_data(self):
+        """Result we got when we did the real solution"""
+        solution = Day06PartB()
+        res = solution("day_06/day06.txt")
+        assert res == 0

From e574ba2ac967738f0b522b5445dce45776110763 Mon Sep 17 00:00:00 2001
From: Roel Adriaans <roel.adriaans@asml.com>
Date: Tue, 6 Dec 2022 19:44:04 +0100
Subject: [PATCH 190/371] Day 6, copy/paste

---
 src/adventofcode2022/solutions/day06.py | 10 +++++++++-
 tests/solutions/test_day06_b.py         | 15 +++++++++++----
 2 files changed, 20 insertions(+), 5 deletions(-)

diff --git a/src/adventofcode2022/solutions/day06.py b/src/adventofcode2022/solutions/day06.py
index c3540f2b..0216b8fc 100644
--- a/src/adventofcode2022/solutions/day06.py
+++ b/src/adventofcode2022/solutions/day06.py
@@ -21,4 +21,12 @@ def solve(self, input_data: str) -> int:
 
 class Day06PartB(Day06, FileReaderSolution):
     def solve(self, input_data: str) -> int:
-        raise NotImplementedError
+        input_data = input_data.strip()
+        for start in range(0, len(input_data)):
+            packet = input_data[start : start + 14]
+            if len(set(packet)) != 14:
+                # Duplicated characters
+                continue
+            # We have something new, return starting position + 4 chars in this packet
+            return start + 14
+        return -1
diff --git a/tests/solutions/test_day06_b.py b/tests/solutions/test_day06_b.py
index 6cf3dcf7..55b47929 100644
--- a/tests/solutions/test_day06_b.py
+++ b/tests/solutions/test_day06_b.py
@@ -4,16 +4,23 @@
 
 
 class TestDay06PartB:
-    @pytest.mark.xfail(reason="Not yet implemented", raises=NotImplementedError)
-    @pytest.mark.parametrize(("input_data", "expected_result"), [("", ""), ("", "")])
+    @pytest.mark.parametrize(
+        ("input_data", "expected_result"),
+        [
+            ("mjqjpqmgbljsphdztnvjfqwrcgsmlb", 19),
+            ("bvwbjplbgvbhsrlpgdmjqwftvncz", 23),
+            ("nppdvjthqldpwncqszvftbrmjlhg", 23),
+            ("nznrnfrfntjfmvfwmzdfjlvtqnbhcprsg", 29),
+            ("zcfzfwzzqfrljwzlrfnpqdbhtmscgvjw", 26),
+        ],
+    )
     def test_day06b_solve(self, input_data, expected_result):
         solution = Day06PartB()
         result = solution.solve(input_data)
         assert result == expected_result
 
-    @pytest.mark.xfail(reason="Not yet implemented", raises=NotImplementedError)
     def test_day06b_data(self):
         """Result we got when we did the real solution"""
         solution = Day06PartB()
         res = solution("day_06/day06.txt")
-        assert res == 0
+        assert res == 2265

From dd4bf9a75f586092bd630395154fe787ba64c610 Mon Sep 17 00:00:00 2001
From: Roel Adriaans <roel.adriaans@asml.com>
Date: Tue, 6 Dec 2022 19:46:01 +0100
Subject: [PATCH 191/371] Day 6, simplyfied

---
 src/adventofcode2022/solutions/day06.py | 28 +++++++++----------------
 1 file changed, 10 insertions(+), 18 deletions(-)

diff --git a/src/adventofcode2022/solutions/day06.py b/src/adventofcode2022/solutions/day06.py
index 0216b8fc..2f2c7c30 100644
--- a/src/adventofcode2022/solutions/day06.py
+++ b/src/adventofcode2022/solutions/day06.py
@@ -2,31 +2,23 @@
 
 
 class Day06:
-    pass
-
-
-class Day06PartA(Day06, FileReaderSolution):
-    def solve(self, input_data: str) -> int:
+    @staticmethod
+    def parse_packets(input_data: str, length: int) -> int:
         input_data = input_data.strip()
         for start in range(0, len(input_data)):
-            packet = input_data[start : start + 4]
-            if len(set(packet)) != 4:
+            packet = input_data[start : start + length]
+            if len(set(packet)) != length:
                 # Duplicated characters
                 continue
             # We have something new, return starting position + 4 chars in this packet
-            return start + 4
+            return start + length
+
 
-        return -1
+class Day06PartA(Day06, FileReaderSolution):
+    def solve(self, input_data: str) -> int:
+        return self.parse_packets(input_data, 4)
 
 
 class Day06PartB(Day06, FileReaderSolution):
     def solve(self, input_data: str) -> int:
-        input_data = input_data.strip()
-        for start in range(0, len(input_data)):
-            packet = input_data[start : start + 14]
-            if len(set(packet)) != 14:
-                # Duplicated characters
-                continue
-            # We have something new, return starting position + 4 chars in this packet
-            return start + 14
-        return -1
+        return self.parse_packets(input_data, 14)

From 1df3325fd645823b44cbcd78cb9dd081fcbc98ed Mon Sep 17 00:00:00 2001
From: Roel Adriaans <roel.adriaans@asml.com>
Date: Tue, 6 Dec 2022 19:46:53 +0100
Subject: [PATCH 192/371] Update dependencies

---
 poetry.lock | 343 +++++++++++++++++++++++++++++++++++++++++++---------
 1 file changed, 288 insertions(+), 55 deletions(-)

diff --git a/poetry.lock b/poetry.lock
index 7f93ddc3..b56b8209 100644
--- a/poetry.lock
+++ b/poetry.lock
@@ -33,10 +33,10 @@ optional = false
 python-versions = ">=3.5"
 
 [package.extras]
-dev = ["coverage[toml] (>=5.0.2)", "hypothesis", "pympler", "pytest (>=4.3.0)", "mypy (>=0.900,!=0.940)", "pytest-mypy-plugins", "zope.interface", "furo", "sphinx", "sphinx-notfound-page", "pre-commit", "cloudpickle"]
-docs = ["furo", "sphinx", "zope.interface", "sphinx-notfound-page"]
-tests = ["coverage[toml] (>=5.0.2)", "hypothesis", "pympler", "pytest (>=4.3.0)", "mypy (>=0.900,!=0.940)", "pytest-mypy-plugins", "zope.interface", "cloudpickle"]
-tests_no_zope = ["coverage[toml] (>=5.0.2)", "hypothesis", "pympler", "pytest (>=4.3.0)", "mypy (>=0.900,!=0.940)", "pytest-mypy-plugins", "cloudpickle"]
+dev = ["cloudpickle", "coverage[toml] (>=5.0.2)", "furo", "hypothesis", "mypy (>=0.900,!=0.940)", "pre-commit", "pympler", "pytest (>=4.3.0)", "pytest-mypy-plugins", "sphinx", "sphinx-notfound-page", "zope.interface"]
+docs = ["furo", "sphinx", "sphinx-notfound-page", "zope.interface"]
+tests = ["cloudpickle", "coverage[toml] (>=5.0.2)", "hypothesis", "mypy (>=0.900,!=0.940)", "pympler", "pytest (>=4.3.0)", "pytest-mypy-plugins", "zope.interface"]
+tests_no_zope = ["cloudpickle", "coverage[toml] (>=5.0.2)", "hypothesis", "mypy (>=0.900,!=0.940)", "pympler", "pytest (>=4.3.0)", "pytest-mypy-plugins"]
 
 [[package]]
 name = "beautifulsoup4"
@@ -202,15 +202,15 @@ testing = ["pre-commit"]
 
 [[package]]
 name = "filelock"
-version = "3.8.0"
+version = "3.8.2"
 description = "A platform independent file lock."
 category = "dev"
 optional = false
 python-versions = ">=3.7"
 
 [package.extras]
-docs = ["furo (>=2022.6.21)", "sphinx (>=5.1.1)", "sphinx-autodoc-typehints (>=1.19.1)"]
-testing = ["covdefaults (>=2.2)", "coverage (>=6.4.2)", "pytest (>=7.1.2)", "pytest-cov (>=3)", "pytest-timeout (>=2.1)"]
+docs = ["furo (>=2022.9.29)", "sphinx (>=5.3)", "sphinx-autodoc-typehints (>=1.19.5)"]
+testing = ["covdefaults (>=2.2.2)", "coverage (>=6.5)", "pytest (>=7.2)", "pytest-cov (>=4)", "pytest-timeout (>=2.1)"]
 
 [[package]]
 name = "identify"
@@ -248,13 +248,13 @@ optional = false
 python-versions = ">=3.6.1,<4.0"
 
 [package.extras]
-pipfile_deprecated_finder = ["pipreqs", "requirementslib"]
-requirements_deprecated_finder = ["pipreqs", "pip-api"]
 colors = ["colorama (>=0.4.3,<0.5.0)"]
+pipfile_deprecated_finder = ["pipreqs", "requirementslib"]
 plugins = ["setuptools"]
+requirements_deprecated_finder = ["pip-api", "pipreqs"]
 
 [[package]]
-name = "jinja2"
+name = "Jinja2"
 version = "3.1.2"
 description = "A very fast and expressive template engine."
 category = "dev"
@@ -280,7 +280,7 @@ arrow = "*"
 jinja2 = "*"
 
 [[package]]
-name = "markupsafe"
+name = "MarkupSafe"
 version = "2.1.1"
 description = "Safely add untrusted strings to HTML/XML markup."
 category = "dev"
@@ -303,6 +303,9 @@ category = "dev"
 optional = false
 python-versions = ">=2.7,!=3.0.*,!=3.1.*,!=3.2.*,!=3.3.*,!=3.4.*,!=3.5.*,!=3.6.*"
 
+[package.dependencies]
+setuptools = "*"
+
 [[package]]
 name = "packaging"
 version = "21.3"
@@ -339,8 +342,8 @@ optional = false
 python-versions = ">=3.7"
 
 [package.extras]
-docs = ["furo (>=2022.9.29)", "proselint (>=0.13)", "sphinx-autodoc-typehints (>=1.19.4)", "sphinx (>=5.3)"]
-test = ["appdirs (==1.4.4)", "pytest-cov (>=4)", "pytest-mock (>=3.10)", "pytest (>=7.2)"]
+docs = ["furo (>=2022.9.29)", "proselint (>=0.13)", "sphinx (>=5.3)", "sphinx-autodoc-typehints (>=1.19.4)"]
+test = ["appdirs (==1.4.4)", "pytest (>=7.2)", "pytest-cov (>=4)", "pytest-mock (>=3.10)"]
 
 [[package]]
 name = "pluggy"
@@ -387,7 +390,7 @@ optional = false
 python-versions = ">=3.6.8"
 
 [package.extras]
-diagrams = ["railroad-diagrams", "jinja2"]
+diagrams = ["jinja2", "railroad-diagrams"]
 
 [[package]]
 name = "pytest"
@@ -422,7 +425,7 @@ coverage = {version = ">=5.2.1", extras = ["toml"]}
 pytest = ">=4.6"
 
 [package.extras]
-testing = ["fields", "hunter", "process-tests", "six", "pytest-xdist", "virtualenv"]
+testing = ["fields", "hunter", "process-tests", "pytest-xdist", "six", "virtualenv"]
 
 [[package]]
 name = "pytest-xdist"
@@ -478,7 +481,7 @@ text-unidecode = ">=1.3"
 unidecode = ["Unidecode (>=1.1.1)"]
 
 [[package]]
-name = "pyyaml"
+name = "PyYAML"
 version = "6.0"
 description = "YAML parser and emitter for Python"
 category = "dev"
@@ -503,6 +506,19 @@ urllib3 = ">=1.21.1,<1.27"
 socks = ["PySocks (>=1.5.6,!=1.5.7)"]
 use_chardet_on_py3 = ["chardet (>=3.0.2,<6)"]
 
+[[package]]
+name = "setuptools"
+version = "65.6.3"
+description = "Easily download, build, install, upgrade, and uninstall Python packages"
+category = "dev"
+optional = false
+python-versions = ">=3.7"
+
+[package.extras]
+docs = ["furo", "jaraco.packaging (>=9)", "jaraco.tidelift (>=1.4)", "pygments-github-lexers (==0.0.5)", "rst.linker (>=1.9)", "sphinx (>=3.5)", "sphinx-favicon", "sphinx-hoverxref (<2)", "sphinx-inline-tabs", "sphinx-notfound-page (==0.8.3)", "sphinx-reredirects", "sphinxcontrib-towncrier"]
+testing = ["build[virtualenv]", "filelock (>=3.4.0)", "flake8 (<5)", "flake8-2020", "ini2toml[lite] (>=0.9)", "jaraco.envs (>=2.2)", "jaraco.path (>=3.2.0)", "pip (>=19.1)", "pip-run (>=8.8)", "pytest (>=6)", "pytest-black (>=0.3.7)", "pytest-checkdocs (>=2.4)", "pytest-cov", "pytest-enabler (>=1.3)", "pytest-flake8", "pytest-mypy (>=0.9.1)", "pytest-perf", "pytest-timeout", "pytest-xdist", "tomli-w (>=1.0.0)", "virtualenv (>=13.0.0)", "wheel"]
+testing-integration = ["build[virtualenv]", "filelock (>=3.4.0)", "jaraco.envs (>=2.2)", "jaraco.path (>=3.2.0)", "pytest", "pytest-enabler", "pytest-xdist", "tomli", "virtualenv (>=13.0.0)", "wheel"]
+
 [[package]]
 name = "six"
 version = "1.16.0"
@@ -563,7 +579,7 @@ virtualenv = ">=16.0.0,<20.0.0 || >20.0.0,<20.0.1 || >20.0.1,<20.0.2 || >20.0.2,
 
 [package.extras]
 docs = ["pygments-github-lexers (>=0.0.5)", "sphinx (>=2.0.0)", "sphinxcontrib-autoprogram (>=0.1.5)", "towncrier (>=18.5.0)"]
-testing = ["flaky (>=3.4.0)", "freezegun (>=0.3.11)", "pytest (>=4.0.0)", "pytest-cov (>=2.5.1)", "pytest-mock (>=1.10.0)", "pytest-randomly (>=1.0.0)", "psutil (>=5.6.1)", "pathlib2 (>=2.3.3)"]
+testing = ["flaky (>=3.4.0)", "freezegun (>=0.3.11)", "pathlib2 (>=2.3.3)", "psutil (>=5.6.1)", "pytest (>=4.0.0)", "pytest-cov (>=2.5.1)", "pytest-mock (>=1.10.0)", "pytest-randomly (>=1.0.0)"]
 
 [[package]]
 name = "tqdm"
@@ -591,13 +607,13 @@ optional = false
 python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*, !=3.5.*"
 
 [package.extras]
-brotli = ["brotlicffi (>=0.8.0)", "brotli (>=1.0.9)", "brotlipy (>=0.6.0)"]
-secure = ["pyOpenSSL (>=0.14)", "cryptography (>=1.3.4)", "idna (>=2.0.0)", "certifi", "urllib3-secure-extra", "ipaddress"]
+brotli = ["brotli (>=1.0.9)", "brotlicffi (>=0.8.0)", "brotlipy (>=0.6.0)"]
+secure = ["certifi", "cryptography (>=1.3.4)", "idna (>=2.0.0)", "ipaddress", "pyOpenSSL (>=0.14)", "urllib3-secure-extra"]
 socks = ["PySocks (>=1.5.6,!=1.5.7,<2.0)"]
 
 [[package]]
 name = "virtualenv"
-version = "20.17.0"
+version = "20.17.1"
 description = "Virtual Python Environment builder"
 category = "dev"
 optional = false
@@ -622,34 +638,149 @@ anytree = [
     {file = "anytree-2.8.0-py2.py3-none-any.whl", hash = "sha256:14c55ac77492b11532395049a03b773d14c7e30b22aa012e337b1e983de31521"},
     {file = "anytree-2.8.0.tar.gz", hash = "sha256:3f0f93f355a91bc3e6245319bf4c1d50e3416cc7a35cc1133c1ff38306bbccab"},
 ]
-arrow = []
-attrs = []
-beautifulsoup4 = []
+arrow = [
+    {file = "arrow-1.2.3-py3-none-any.whl", hash = "sha256:5a49ab92e3b7b71d96cd6bfcc4df14efefc9dfa96ea19045815914a6ab6b1fe2"},
+    {file = "arrow-1.2.3.tar.gz", hash = "sha256:3934b30ca1b9f292376d9db15b19446088d12ec58629bc3f0da28fd55fb633a1"},
+]
+attrs = [
+    {file = "attrs-22.1.0-py2.py3-none-any.whl", hash = "sha256:86efa402f67bf2df34f51a335487cf46b1ec130d02b8d39fd248abfd30da551c"},
+    {file = "attrs-22.1.0.tar.gz", hash = "sha256:29adc2665447e5191d0e7c568fde78b21f9672d344281d0c6e1ab085429b22b6"},
+]
+beautifulsoup4 = [
+    {file = "beautifulsoup4-4.11.1-py3-none-any.whl", hash = "sha256:58d5c3d29f5a36ffeb94f02f0d786cd53014cf9b3b3951d42e0080d8a9498d30"},
+    {file = "beautifulsoup4-4.11.1.tar.gz", hash = "sha256:ad9aa55b65ef2808eb405f46cf74df7fcb7044d5cbc26487f96eb2ef2e436693"},
+]
 binaryornot = [
     {file = "binaryornot-0.4.4-py2.py3-none-any.whl", hash = "sha256:b8b71173c917bddcd2c16070412e369c3ed7f0528926f70cac18a6c97fd563e4"},
     {file = "binaryornot-0.4.4.tar.gz", hash = "sha256:359501dfc9d40632edc9fac890e19542db1a287bbcfa58175b66658392018061"},
 ]
-black = []
-certifi = []
+black = [
+    {file = "black-22.10.0-1fixedarch-cp310-cp310-macosx_11_0_x86_64.whl", hash = "sha256:5cc42ca67989e9c3cf859e84c2bf014f6633db63d1cbdf8fdb666dcd9e77e3fa"},
+    {file = "black-22.10.0-1fixedarch-cp311-cp311-macosx_11_0_x86_64.whl", hash = "sha256:5d8f74030e67087b219b032aa33a919fae8806d49c867846bfacde57f43972ef"},
+    {file = "black-22.10.0-1fixedarch-cp37-cp37m-macosx_10_16_x86_64.whl", hash = "sha256:197df8509263b0b8614e1df1756b1dd41be6738eed2ba9e9769f3880c2b9d7b6"},
+    {file = "black-22.10.0-1fixedarch-cp38-cp38-macosx_10_16_x86_64.whl", hash = "sha256:2644b5d63633702bc2c5f3754b1b475378fbbfb481f62319388235d0cd104c2d"},
+    {file = "black-22.10.0-1fixedarch-cp39-cp39-macosx_11_0_x86_64.whl", hash = "sha256:e41a86c6c650bcecc6633ee3180d80a025db041a8e2398dcc059b3afa8382cd4"},
+    {file = "black-22.10.0-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:2039230db3c6c639bd84efe3292ec7b06e9214a2992cd9beb293d639c6402edb"},
+    {file = "black-22.10.0-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:14ff67aec0a47c424bc99b71005202045dc09270da44a27848d534600ac64fc7"},
+    {file = "black-22.10.0-cp310-cp310-win_amd64.whl", hash = "sha256:819dc789f4498ecc91438a7de64427c73b45035e2e3680c92e18795a839ebb66"},
+    {file = "black-22.10.0-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:5b9b29da4f564ba8787c119f37d174f2b69cdfdf9015b7d8c5c16121ddc054ae"},
+    {file = "black-22.10.0-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:b8b49776299fece66bffaafe357d929ca9451450f5466e997a7285ab0fe28e3b"},
+    {file = "black-22.10.0-cp311-cp311-win_amd64.whl", hash = "sha256:21199526696b8f09c3997e2b4db8d0b108d801a348414264d2eb8eb2532e540d"},
+    {file = "black-22.10.0-cp37-cp37m-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:1e464456d24e23d11fced2bc8c47ef66d471f845c7b7a42f3bd77bf3d1789650"},
+    {file = "black-22.10.0-cp37-cp37m-win_amd64.whl", hash = "sha256:9311e99228ae10023300ecac05be5a296f60d2fd10fff31cf5c1fa4ca4b1988d"},
+    {file = "black-22.10.0-cp38-cp38-macosx_11_0_arm64.whl", hash = "sha256:fba8a281e570adafb79f7755ac8721b6cf1bbf691186a287e990c7929c7692ff"},
+    {file = "black-22.10.0-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:915ace4ff03fdfff953962fa672d44be269deb2eaf88499a0f8805221bc68c87"},
+    {file = "black-22.10.0-cp38-cp38-win_amd64.whl", hash = "sha256:444ebfb4e441254e87bad00c661fe32df9969b2bf224373a448d8aca2132b395"},
+    {file = "black-22.10.0-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:974308c58d057a651d182208a484ce80a26dac0caef2895836a92dd6ebd725e0"},
+    {file = "black-22.10.0-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:72ef3925f30e12a184889aac03d77d031056860ccae8a1e519f6cbb742736383"},
+    {file = "black-22.10.0-cp39-cp39-win_amd64.whl", hash = "sha256:432247333090c8c5366e69627ccb363bc58514ae3e63f7fc75c54b1ea80fa7de"},
+    {file = "black-22.10.0-py3-none-any.whl", hash = "sha256:c957b2b4ea88587b46cf49d1dc17681c1e672864fd7af32fc1e9664d572b3458"},
+    {file = "black-22.10.0.tar.gz", hash = "sha256:f513588da599943e0cde4e32cc9879e825d58720d6557062d1098c5ad80080e1"},
+]
+certifi = [
+    {file = "certifi-2022.9.24-py3-none-any.whl", hash = "sha256:90c1a32f1d68f940488354e36370f6cca89f0f106db09518524c88d6ed83f382"},
+    {file = "certifi-2022.9.24.tar.gz", hash = "sha256:0d9c601124e5a6ba9712dbc60d9c53c21e34f5f641fe83002317394311bdce14"},
+]
 cfgv = [
     {file = "cfgv-3.3.1-py2.py3-none-any.whl", hash = "sha256:c6a0883f3917a037485059700b9e75da2464e6c27051014ad85ba6aaa5884426"},
     {file = "cfgv-3.3.1.tar.gz", hash = "sha256:f5a830efb9ce7a445376bb66ec94c638a9787422f96264c98edc6bdeed8ab736"},
 ]
-chardet = []
-charset-normalizer = []
-click = []
-colorama = []
-cookiecutter = []
-coverage = []
-distlib = []
-exceptiongroup = []
+chardet = [
+    {file = "chardet-5.1.0-py3-none-any.whl", hash = "sha256:362777fb014af596ad31334fde1e8c327dfdb076e1960d1694662d46a6917ab9"},
+    {file = "chardet-5.1.0.tar.gz", hash = "sha256:0d62712b956bc154f85fb0a266e2a3c5913c2967e00348701b32411d6def31e5"},
+]
+charset-normalizer = [
+    {file = "charset-normalizer-2.1.1.tar.gz", hash = "sha256:5a3d016c7c547f69d6f81fb0db9449ce888b418b5b9952cc5e6e66843e9dd845"},
+    {file = "charset_normalizer-2.1.1-py3-none-any.whl", hash = "sha256:83e9a75d1911279afd89352c68b45348559d1fc0506b054b346651b5e7fee29f"},
+]
+click = [
+    {file = "click-8.1.3-py3-none-any.whl", hash = "sha256:bb4d8133cb15a609f44e8213d9b391b0809795062913b383c62be0ee95b1db48"},
+    {file = "click-8.1.3.tar.gz", hash = "sha256:7682dc8afb30297001674575ea00d1814d808d6a36af415a82bd481d37ba7b8e"},
+]
+colorama = [
+    {file = "colorama-0.4.6-py2.py3-none-any.whl", hash = "sha256:4f1d9991f5acc0ca119f9d443620b77f9d6b33703e51011c16baf57afb285fc6"},
+    {file = "colorama-0.4.6.tar.gz", hash = "sha256:08695f5cb7ed6e0531a20572697297273c47b8cae5a63ffc6d6ed5c201be6e44"},
+]
+cookiecutter = [
+    {file = "cookiecutter-2.1.1-py2.py3-none-any.whl", hash = "sha256:9f3ab027cec4f70916e28f03470bdb41e637a3ad354b4d65c765d93aad160022"},
+    {file = "cookiecutter-2.1.1.tar.gz", hash = "sha256:f3982be8d9c53dac1261864013fdec7f83afd2e42ede6f6dd069c5e149c540d5"},
+]
+coverage = [
+    {file = "coverage-6.5.0-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:ef8674b0ee8cc11e2d574e3e2998aea5df5ab242e012286824ea3c6970580e53"},
+    {file = "coverage-6.5.0-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:784f53ebc9f3fd0e2a3f6a78b2be1bd1f5575d7863e10c6e12504f240fd06660"},
+    {file = "coverage-6.5.0-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:b4a5be1748d538a710f87542f22c2cad22f80545a847ad91ce45e77417293eb4"},
+    {file = "coverage-6.5.0-cp310-cp310-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:83516205e254a0cb77d2d7bb3632ee019d93d9f4005de31dca0a8c3667d5bc04"},
+    {file = "coverage-6.5.0-cp310-cp310-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:af4fffaffc4067232253715065e30c5a7ec6faac36f8fc8d6f64263b15f74db0"},
+    {file = "coverage-6.5.0-cp310-cp310-musllinux_1_1_aarch64.whl", hash = "sha256:97117225cdd992a9c2a5515db1f66b59db634f59d0679ca1fa3fe8da32749cae"},
+    {file = "coverage-6.5.0-cp310-cp310-musllinux_1_1_i686.whl", hash = "sha256:a1170fa54185845505fbfa672f1c1ab175446c887cce8212c44149581cf2d466"},
+    {file = "coverage-6.5.0-cp310-cp310-musllinux_1_1_x86_64.whl", hash = "sha256:11b990d520ea75e7ee8dcab5bc908072aaada194a794db9f6d7d5cfd19661e5a"},
+    {file = "coverage-6.5.0-cp310-cp310-win32.whl", hash = "sha256:5dbec3b9095749390c09ab7c89d314727f18800060d8d24e87f01fb9cfb40b32"},
+    {file = "coverage-6.5.0-cp310-cp310-win_amd64.whl", hash = "sha256:59f53f1dc5b656cafb1badd0feb428c1e7bc19b867479ff72f7a9dd9b479f10e"},
+    {file = "coverage-6.5.0-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:4a5375e28c5191ac38cca59b38edd33ef4cc914732c916f2929029b4bfb50795"},
+    {file = "coverage-6.5.0-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:c4ed2820d919351f4167e52425e096af41bfabacb1857186c1ea32ff9983ed75"},
+    {file = "coverage-6.5.0-cp311-cp311-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:33a7da4376d5977fbf0a8ed91c4dffaaa8dbf0ddbf4c8eea500a2486d8bc4d7b"},
+    {file = "coverage-6.5.0-cp311-cp311-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:a8fb6cf131ac4070c9c5a3e21de0f7dc5a0fbe8bc77c9456ced896c12fcdad91"},
+    {file = "coverage-6.5.0-cp311-cp311-musllinux_1_1_aarch64.whl", hash = "sha256:a6b7d95969b8845250586f269e81e5dfdd8ff828ddeb8567a4a2eaa7313460c4"},
+    {file = "coverage-6.5.0-cp311-cp311-musllinux_1_1_i686.whl", hash = "sha256:1ef221513e6f68b69ee9e159506d583d31aa3567e0ae84eaad9d6ec1107dddaa"},
+    {file = "coverage-6.5.0-cp311-cp311-musllinux_1_1_x86_64.whl", hash = "sha256:cca4435eebea7962a52bdb216dec27215d0df64cf27fc1dd538415f5d2b9da6b"},
+    {file = "coverage-6.5.0-cp311-cp311-win32.whl", hash = "sha256:98e8a10b7a314f454d9eff4216a9a94d143a7ee65018dd12442e898ee2310578"},
+    {file = "coverage-6.5.0-cp311-cp311-win_amd64.whl", hash = "sha256:bc8ef5e043a2af066fa8cbfc6e708d58017024dc4345a1f9757b329a249f041b"},
+    {file = "coverage-6.5.0-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:4433b90fae13f86fafff0b326453dd42fc9a639a0d9e4eec4d366436d1a41b6d"},
+    {file = "coverage-6.5.0-cp37-cp37m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:f4f05d88d9a80ad3cac6244d36dd89a3c00abc16371769f1340101d3cb899fc3"},
+    {file = "coverage-6.5.0-cp37-cp37m-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:94e2565443291bd778421856bc975d351738963071e9b8839ca1fc08b42d4bef"},
+    {file = "coverage-6.5.0-cp37-cp37m-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:027018943386e7b942fa832372ebc120155fd970837489896099f5cfa2890f79"},
+    {file = "coverage-6.5.0-cp37-cp37m-musllinux_1_1_aarch64.whl", hash = "sha256:255758a1e3b61db372ec2736c8e2a1fdfaf563977eedbdf131de003ca5779b7d"},
+    {file = "coverage-6.5.0-cp37-cp37m-musllinux_1_1_i686.whl", hash = "sha256:851cf4ff24062c6aec510a454b2584f6e998cada52d4cb58c5e233d07172e50c"},
+    {file = "coverage-6.5.0-cp37-cp37m-musllinux_1_1_x86_64.whl", hash = "sha256:12adf310e4aafddc58afdb04d686795f33f4d7a6fa67a7a9d4ce7d6ae24d949f"},
+    {file = "coverage-6.5.0-cp37-cp37m-win32.whl", hash = "sha256:b5604380f3415ba69de87a289a2b56687faa4fe04dbee0754bfcae433489316b"},
+    {file = "coverage-6.5.0-cp37-cp37m-win_amd64.whl", hash = "sha256:4a8dbc1f0fbb2ae3de73eb0bdbb914180c7abfbf258e90b311dcd4f585d44bd2"},
+    {file = "coverage-6.5.0-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:d900bb429fdfd7f511f868cedd03a6bbb142f3f9118c09b99ef8dc9bf9643c3c"},
+    {file = "coverage-6.5.0-cp38-cp38-macosx_11_0_arm64.whl", hash = "sha256:2198ea6fc548de52adc826f62cb18554caedfb1d26548c1b7c88d8f7faa8f6ba"},
+    {file = "coverage-6.5.0-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:6c4459b3de97b75e3bd6b7d4b7f0db13f17f504f3d13e2a7c623786289dd670e"},
+    {file = "coverage-6.5.0-cp38-cp38-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:20c8ac5386253717e5ccc827caad43ed66fea0efe255727b1053a8154d952398"},
+    {file = "coverage-6.5.0-cp38-cp38-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:6b07130585d54fe8dff3d97b93b0e20290de974dc8177c320aeaf23459219c0b"},
+    {file = "coverage-6.5.0-cp38-cp38-musllinux_1_1_aarch64.whl", hash = "sha256:dbdb91cd8c048c2b09eb17713b0c12a54fbd587d79adcebad543bc0cd9a3410b"},
+    {file = "coverage-6.5.0-cp38-cp38-musllinux_1_1_i686.whl", hash = "sha256:de3001a203182842a4630e7b8d1a2c7c07ec1b45d3084a83d5d227a3806f530f"},
+    {file = "coverage-6.5.0-cp38-cp38-musllinux_1_1_x86_64.whl", hash = "sha256:e07f4a4a9b41583d6eabec04f8b68076ab3cd44c20bd29332c6572dda36f372e"},
+    {file = "coverage-6.5.0-cp38-cp38-win32.whl", hash = "sha256:6d4817234349a80dbf03640cec6109cd90cba068330703fa65ddf56b60223a6d"},
+    {file = "coverage-6.5.0-cp38-cp38-win_amd64.whl", hash = "sha256:7ccf362abd726b0410bf8911c31fbf97f09f8f1061f8c1cf03dfc4b6372848f6"},
+    {file = "coverage-6.5.0-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:633713d70ad6bfc49b34ead4060531658dc6dfc9b3eb7d8a716d5873377ab745"},
+    {file = "coverage-6.5.0-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:95203854f974e07af96358c0b261f1048d8e1083f2de9b1c565e1be4a3a48cfc"},
+    {file = "coverage-6.5.0-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:b9023e237f4c02ff739581ef35969c3739445fb059b060ca51771e69101efffe"},
+    {file = "coverage-6.5.0-cp39-cp39-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:265de0fa6778d07de30bcf4d9dc471c3dc4314a23a3c6603d356a3c9abc2dfcf"},
+    {file = "coverage-6.5.0-cp39-cp39-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:8f830ed581b45b82451a40faabb89c84e1a998124ee4212d440e9c6cf70083e5"},
+    {file = "coverage-6.5.0-cp39-cp39-musllinux_1_1_aarch64.whl", hash = "sha256:7b6be138d61e458e18d8e6ddcddd36dd96215edfe5f1168de0b1b32635839b62"},
+    {file = "coverage-6.5.0-cp39-cp39-musllinux_1_1_i686.whl", hash = "sha256:42eafe6778551cf006a7c43153af1211c3aaab658d4d66fa5fcc021613d02518"},
+    {file = "coverage-6.5.0-cp39-cp39-musllinux_1_1_x86_64.whl", hash = "sha256:723e8130d4ecc8f56e9a611e73b31219595baa3bb252d539206f7bbbab6ffc1f"},
+    {file = "coverage-6.5.0-cp39-cp39-win32.whl", hash = "sha256:d9ecf0829c6a62b9b573c7bb6d4dcd6ba8b6f80be9ba4fc7ed50bf4ac9aecd72"},
+    {file = "coverage-6.5.0-cp39-cp39-win_amd64.whl", hash = "sha256:fc2af30ed0d5ae0b1abdb4ebdce598eafd5b35397d4d75deb341a614d333d987"},
+    {file = "coverage-6.5.0-pp36.pp37.pp38-none-any.whl", hash = "sha256:1431986dac3923c5945271f169f59c45b8802a114c8f548d611f2015133df77a"},
+    {file = "coverage-6.5.0.tar.gz", hash = "sha256:f642e90754ee3e06b0e7e51bce3379590e76b7f76b708e1a71ff043f87025c84"},
+]
+distlib = [
+    {file = "distlib-0.3.6-py2.py3-none-any.whl", hash = "sha256:f35c4b692542ca110de7ef0bea44d73981caeb34ca0b9b6b2e6d7790dda8f80e"},
+    {file = "distlib-0.3.6.tar.gz", hash = "sha256:14bad2d9b04d3a36127ac97f30b12a19268f211063d8f8ee4f47108896e11b46"},
+]
+exceptiongroup = [
+    {file = "exceptiongroup-1.0.4-py3-none-any.whl", hash = "sha256:542adf9dea4055530d6e1279602fa5cb11dab2395fa650b8674eaec35fc4a828"},
+    {file = "exceptiongroup-1.0.4.tar.gz", hash = "sha256:bd14967b79cd9bdb54d97323216f8fdf533e278df937aa2a90089e7d6e06e5ec"},
+]
 execnet = [
     {file = "execnet-1.9.0-py2.py3-none-any.whl", hash = "sha256:a295f7cc774947aac58dde7fdc85f4aa00c42adf5d8f5468fc630c1acf30a142"},
     {file = "execnet-1.9.0.tar.gz", hash = "sha256:8f694f3ba9cc92cab508b152dcfe322153975c29bda272e2fd7f3f00f36e47c5"},
 ]
-filelock = []
-identify = []
-idna = []
+filelock = [
+    {file = "filelock-3.8.2-py3-none-any.whl", hash = "sha256:8df285554452285f79c035efb0c861eb33a4bcfa5b7a137016e32e6a90f9792c"},
+    {file = "filelock-3.8.2.tar.gz", hash = "sha256:7565f628ea56bfcd8e54e42bdc55da899c85c1abfe1b5bcfd147e9188cebb3b2"},
+]
+identify = [
+    {file = "identify-2.5.9-py2.py3-none-any.whl", hash = "sha256:a390fb696e164dbddb047a0db26e57972ae52fbd037ae68797e5ae2f4492485d"},
+    {file = "identify-2.5.9.tar.gz", hash = "sha256:906036344ca769539610436e40a684e170c3648b552194980bb7b617a8daeb9f"},
+]
+idna = [
+    {file = "idna-3.4-py3-none-any.whl", hash = "sha256:90b77e79eaa3eba6de819a0c442c0b4ceefc341a7a2ab77d7562bf49f425c5c2"},
+    {file = "idna-3.4.tar.gz", hash = "sha256:814f528e8dead7d329833b91c5faa87d60bf71824cd12a7530b5526063d02cb4"},
+]
 iniconfig = [
     {file = "iniconfig-1.1.1-py2.py3-none-any.whl", hash = "sha256:011e24c64b7f47f6ebd835bb12a743f2fbe9a26d4cecaa7f53bc4f35ee9da8b3"},
     {file = "iniconfig-1.1.1.tar.gz", hash = "sha256:bc3af051d7d14b2ee5ef9969666def0cd1a000e121eaea580d4a313df4b37f32"},
@@ -658,29 +789,87 @@ isort = [
     {file = "isort-5.10.1-py3-none-any.whl", hash = "sha256:6f62d78e2f89b4500b080fe3a81690850cd254227f27f75c3a0c491a1f351ba7"},
     {file = "isort-5.10.1.tar.gz", hash = "sha256:e8443a5e7a020e9d7f97f1d7d9cd17c88bcb3bc7e218bf9cf5095fe550be2951"},
 ]
-jinja2 = []
+Jinja2 = [
+    {file = "Jinja2-3.1.2-py3-none-any.whl", hash = "sha256:6088930bfe239f0e6710546ab9c19c9ef35e29792895fed6e6e31a023a182a61"},
+    {file = "Jinja2-3.1.2.tar.gz", hash = "sha256:31351a702a408a9e7595a8fc6150fc3f43bb6bf7e319770cbc0db9df9437e852"},
+]
 jinja2-time = [
     {file = "jinja2-time-0.2.0.tar.gz", hash = "sha256:d14eaa4d315e7688daa4969f616f226614350c48730bfa1692d2caebd8c90d40"},
     {file = "jinja2_time-0.2.0-py2.py3-none-any.whl", hash = "sha256:d3eab6605e3ec8b7a0863df09cc1d23714908fa61aa6986a845c20ba488b4efa"},
 ]
-markupsafe = []
+MarkupSafe = [
+    {file = "MarkupSafe-2.1.1-cp310-cp310-macosx_10_9_universal2.whl", hash = "sha256:86b1f75c4e7c2ac2ccdaec2b9022845dbb81880ca318bb7a0a01fbf7813e3812"},
+    {file = "MarkupSafe-2.1.1-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:f121a1420d4e173a5d96e47e9a0c0dcff965afdf1626d28de1460815f7c4ee7a"},
+    {file = "MarkupSafe-2.1.1-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:a49907dd8420c5685cfa064a1335b6754b74541bbb3706c259c02ed65b644b3e"},
+    {file = "MarkupSafe-2.1.1-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:10c1bfff05d95783da83491be968e8fe789263689c02724e0c691933c52994f5"},
+    {file = "MarkupSafe-2.1.1-cp310-cp310-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:b7bd98b796e2b6553da7225aeb61f447f80a1ca64f41d83612e6139ca5213aa4"},
+    {file = "MarkupSafe-2.1.1-cp310-cp310-musllinux_1_1_aarch64.whl", hash = "sha256:b09bf97215625a311f669476f44b8b318b075847b49316d3e28c08e41a7a573f"},
+    {file = "MarkupSafe-2.1.1-cp310-cp310-musllinux_1_1_i686.whl", hash = "sha256:694deca8d702d5db21ec83983ce0bb4b26a578e71fbdbd4fdcd387daa90e4d5e"},
+    {file = "MarkupSafe-2.1.1-cp310-cp310-musllinux_1_1_x86_64.whl", hash = "sha256:efc1913fd2ca4f334418481c7e595c00aad186563bbc1ec76067848c7ca0a933"},
+    {file = "MarkupSafe-2.1.1-cp310-cp310-win32.whl", hash = "sha256:4a33dea2b688b3190ee12bd7cfa29d39c9ed176bda40bfa11099a3ce5d3a7ac6"},
+    {file = "MarkupSafe-2.1.1-cp310-cp310-win_amd64.whl", hash = "sha256:dda30ba7e87fbbb7eab1ec9f58678558fd9a6b8b853530e176eabd064da81417"},
+    {file = "MarkupSafe-2.1.1-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:671cd1187ed5e62818414afe79ed29da836dde67166a9fac6d435873c44fdd02"},
+    {file = "MarkupSafe-2.1.1-cp37-cp37m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:3799351e2336dc91ea70b034983ee71cf2f9533cdff7c14c90ea126bfd95d65a"},
+    {file = "MarkupSafe-2.1.1-cp37-cp37m-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:e72591e9ecd94d7feb70c1cbd7be7b3ebea3f548870aa91e2732960fa4d57a37"},
+    {file = "MarkupSafe-2.1.1-cp37-cp37m-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:6fbf47b5d3728c6aea2abb0589b5d30459e369baa772e0f37a0320185e87c980"},
+    {file = "MarkupSafe-2.1.1-cp37-cp37m-musllinux_1_1_aarch64.whl", hash = "sha256:d5ee4f386140395a2c818d149221149c54849dfcfcb9f1debfe07a8b8bd63f9a"},
+    {file = "MarkupSafe-2.1.1-cp37-cp37m-musllinux_1_1_i686.whl", hash = "sha256:bcb3ed405ed3222f9904899563d6fc492ff75cce56cba05e32eff40e6acbeaa3"},
+    {file = "MarkupSafe-2.1.1-cp37-cp37m-musllinux_1_1_x86_64.whl", hash = "sha256:e1c0b87e09fa55a220f058d1d49d3fb8df88fbfab58558f1198e08c1e1de842a"},
+    {file = "MarkupSafe-2.1.1-cp37-cp37m-win32.whl", hash = "sha256:8dc1c72a69aa7e082593c4a203dcf94ddb74bb5c8a731e4e1eb68d031e8498ff"},
+    {file = "MarkupSafe-2.1.1-cp37-cp37m-win_amd64.whl", hash = "sha256:97a68e6ada378df82bc9f16b800ab77cbf4b2fada0081794318520138c088e4a"},
+    {file = "MarkupSafe-2.1.1-cp38-cp38-macosx_10_9_universal2.whl", hash = "sha256:e8c843bbcda3a2f1e3c2ab25913c80a3c5376cd00c6e8c4a86a89a28c8dc5452"},
+    {file = "MarkupSafe-2.1.1-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:0212a68688482dc52b2d45013df70d169f542b7394fc744c02a57374a4207003"},
+    {file = "MarkupSafe-2.1.1-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:8e576a51ad59e4bfaac456023a78f6b5e6e7651dcd383bcc3e18d06f9b55d6d1"},
+    {file = "MarkupSafe-2.1.1-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:4b9fe39a2ccc108a4accc2676e77da025ce383c108593d65cc909add5c3bd601"},
+    {file = "MarkupSafe-2.1.1-cp38-cp38-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:96e37a3dc86e80bf81758c152fe66dbf60ed5eca3d26305edf01892257049925"},
+    {file = "MarkupSafe-2.1.1-cp38-cp38-musllinux_1_1_aarch64.whl", hash = "sha256:6d0072fea50feec76a4c418096652f2c3238eaa014b2f94aeb1d56a66b41403f"},
+    {file = "MarkupSafe-2.1.1-cp38-cp38-musllinux_1_1_i686.whl", hash = "sha256:089cf3dbf0cd6c100f02945abeb18484bd1ee57a079aefd52cffd17fba910b88"},
+    {file = "MarkupSafe-2.1.1-cp38-cp38-musllinux_1_1_x86_64.whl", hash = "sha256:6a074d34ee7a5ce3effbc526b7083ec9731bb3cbf921bbe1d3005d4d2bdb3a63"},
+    {file = "MarkupSafe-2.1.1-cp38-cp38-win32.whl", hash = "sha256:421be9fbf0ffe9ffd7a378aafebbf6f4602d564d34be190fc19a193232fd12b1"},
+    {file = "MarkupSafe-2.1.1-cp38-cp38-win_amd64.whl", hash = "sha256:fc7b548b17d238737688817ab67deebb30e8073c95749d55538ed473130ec0c7"},
+    {file = "MarkupSafe-2.1.1-cp39-cp39-macosx_10_9_universal2.whl", hash = "sha256:e04e26803c9c3851c931eac40c695602c6295b8d432cbe78609649ad9bd2da8a"},
+    {file = "MarkupSafe-2.1.1-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:b87db4360013327109564f0e591bd2a3b318547bcef31b468a92ee504d07ae4f"},
+    {file = "MarkupSafe-2.1.1-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:99a2a507ed3ac881b975a2976d59f38c19386d128e7a9a18b7df6fff1fd4c1d6"},
+    {file = "MarkupSafe-2.1.1-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:56442863ed2b06d19c37f94d999035e15ee982988920e12a5b4ba29b62ad1f77"},
+    {file = "MarkupSafe-2.1.1-cp39-cp39-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:3ce11ee3f23f79dbd06fb3d63e2f6af7b12db1d46932fe7bd8afa259a5996603"},
+    {file = "MarkupSafe-2.1.1-cp39-cp39-musllinux_1_1_aarch64.whl", hash = "sha256:33b74d289bd2f5e527beadcaa3f401e0df0a89927c1559c8566c066fa4248ab7"},
+    {file = "MarkupSafe-2.1.1-cp39-cp39-musllinux_1_1_i686.whl", hash = "sha256:43093fb83d8343aac0b1baa75516da6092f58f41200907ef92448ecab8825135"},
+    {file = "MarkupSafe-2.1.1-cp39-cp39-musllinux_1_1_x86_64.whl", hash = "sha256:8e3dcf21f367459434c18e71b2a9532d96547aef8a871872a5bd69a715c15f96"},
+    {file = "MarkupSafe-2.1.1-cp39-cp39-win32.whl", hash = "sha256:d4306c36ca495956b6d568d276ac11fdd9c30a36f1b6eb928070dc5360b22e1c"},
+    {file = "MarkupSafe-2.1.1-cp39-cp39-win_amd64.whl", hash = "sha256:46d00d6cfecdde84d40e572d63735ef81423ad31184100411e6e3388d405e247"},
+    {file = "MarkupSafe-2.1.1.tar.gz", hash = "sha256:7f91197cc9e48f989d12e4e6fbc46495c446636dfc81b9ccf50bb0ec74b91d4b"},
+]
 mypy-extensions = [
     {file = "mypy_extensions-0.4.3-py2.py3-none-any.whl", hash = "sha256:090fedd75945a69ae91ce1303b5824f428daf5a028d2f6ab8a299250a846f15d"},
     {file = "mypy_extensions-0.4.3.tar.gz", hash = "sha256:2d82818f5bb3e369420cb3c4060a7970edba416647068eb4c5343488a6c604a8"},
 ]
-nodeenv = []
+nodeenv = [
+    {file = "nodeenv-1.7.0-py2.py3-none-any.whl", hash = "sha256:27083a7b96a25f2f5e1d8cb4b6317ee8aeda3bdd121394e5ac54e498028a042e"},
+    {file = "nodeenv-1.7.0.tar.gz", hash = "sha256:e0e7f7dfb85fc5394c6fe1e8fa98131a2473e04311a45afb6508f7cf1836fa2b"},
+]
 packaging = [
     {file = "packaging-21.3-py3-none-any.whl", hash = "sha256:ef103e05f519cdc783ae24ea4e2e0f508a9c99b2d4969652eed6a2e1ea5bd522"},
     {file = "packaging-21.3.tar.gz", hash = "sha256:dd47c42927d89ab911e606518907cc2d3a1f38bbd026385970643f9c5b8ecfeb"},
 ]
-parse = []
-pathspec = []
-platformdirs = []
+parse = [
+    {file = "parse-1.19.0.tar.gz", hash = "sha256:9ff82852bcb65d139813e2a5197627a94966245c897796760a3a2a8eb66f020b"},
+]
+pathspec = [
+    {file = "pathspec-0.10.2-py3-none-any.whl", hash = "sha256:88c2606f2c1e818b978540f73ecc908e13999c6c3a383daf3705652ae79807a5"},
+    {file = "pathspec-0.10.2.tar.gz", hash = "sha256:8f6bf73e5758fd365ef5d58ce09ac7c27d2833a8d7da51712eac6e27e35141b0"},
+]
+platformdirs = [
+    {file = "platformdirs-2.5.4-py3-none-any.whl", hash = "sha256:af0276409f9a02373d540bf8480021a048711d572745aef4b7842dad245eba10"},
+    {file = "platformdirs-2.5.4.tar.gz", hash = "sha256:1006647646d80f16130f052404c6b901e80ee4ed6bef6792e1f238a8969106f7"},
+]
 pluggy = [
     {file = "pluggy-1.0.0-py2.py3-none-any.whl", hash = "sha256:74134bbf457f031a36d68416e1509f34bd5ccc019f0bcc952c7b909d06b37bd3"},
     {file = "pluggy-1.0.0.tar.gz", hash = "sha256:4224373bacce55f955a878bf9cfa763c1e360858e330072059e10bad68531159"},
 ]
-pre-commit = []
+pre-commit = [
+    {file = "pre_commit-2.20.0-py2.py3-none-any.whl", hash = "sha256:51a5ba7c480ae8072ecdb6933df22d2f812dc897d5fe848778116129a681aac7"},
+    {file = "pre_commit-2.20.0.tar.gz", hash = "sha256:a978dac7bc9ec0bcee55c18a277d553b0f419d259dadb4b9418ff2d00eb43959"},
+]
 py = [
     {file = "py-1.11.0-py2.py3-none-any.whl", hash = "sha256:607c53218732647dff4acdfcd50cb62615cedf612e72d1724fb1a0cc6405b378"},
     {file = "py-1.11.0.tar.gz", hash = "sha256:51c75c4126074b472f746a24399ad32f6053d1b34b68d2fa41e558e6f4a98719"},
@@ -689,16 +878,31 @@ pyparsing = [
     {file = "pyparsing-3.0.9-py3-none-any.whl", hash = "sha256:5026bae9a10eeaefb61dab2f09052b9f4307d44aee4eda64b309723d8d206bbc"},
     {file = "pyparsing-3.0.9.tar.gz", hash = "sha256:2b020ecf7d21b687f219b71ecad3631f644a47f01403fa1d1036b0c6416d70fb"},
 ]
-pytest = []
-pytest-cov = []
-pytest-xdist = []
+pytest = [
+    {file = "pytest-7.2.0-py3-none-any.whl", hash = "sha256:892f933d339f068883b6fd5a459f03d85bfcb355e4981e146d2c7616c21fef71"},
+    {file = "pytest-7.2.0.tar.gz", hash = "sha256:c4014eb40e10f11f355ad4e3c2fb2c6c6d1919c73f3b5a433de4708202cade59"},
+]
+pytest-cov = [
+    {file = "pytest-cov-4.0.0.tar.gz", hash = "sha256:996b79efde6433cdbd0088872dbc5fb3ed7fe1578b68cdbba634f14bb8dd0470"},
+    {file = "pytest_cov-4.0.0-py3-none-any.whl", hash = "sha256:2feb1b751d66a8bd934e5edfa2e961d11309dc37b73b0eabe73b5945fee20f6b"},
+]
+pytest-xdist = [
+    {file = "pytest-xdist-3.1.0.tar.gz", hash = "sha256:40fdb8f3544921c5dfcd486ac080ce22870e71d82ced6d2e78fa97c2addd480c"},
+    {file = "pytest_xdist-3.1.0-py3-none-any.whl", hash = "sha256:70a76f191d8a1d2d6be69fc440cdf85f3e4c03c08b520fd5dc5d338d6cf07d89"},
+]
 python-dateutil = [
     {file = "python-dateutil-2.8.2.tar.gz", hash = "sha256:0123cacc1627ae19ddf3c27a5de5bd67ee4586fbdd6440d9748f8abb483d3e86"},
     {file = "python_dateutil-2.8.2-py2.py3-none-any.whl", hash = "sha256:961d03dc3453ebbc59dbdea9e4e11c5651520a876d0f4db161e8674aae935da9"},
 ]
-python-dotenv = []
-python-slugify = []
-pyyaml = [
+python-dotenv = [
+    {file = "python-dotenv-0.21.0.tar.gz", hash = "sha256:b77d08274639e3d34145dfa6c7008e66df0f04b7be7a75fd0d5292c191d79045"},
+    {file = "python_dotenv-0.21.0-py3-none-any.whl", hash = "sha256:1684eb44636dd462b66c3ee016599815514527ad99965de77f43e0944634a7e5"},
+]
+python-slugify = [
+    {file = "python-slugify-7.0.0.tar.gz", hash = "sha256:7a0f21a39fa6c1c4bf2e5984c9b9ae944483fd10b54804cb0e23a3ccd4954f0b"},
+    {file = "python_slugify-7.0.0-py2.py3-none-any.whl", hash = "sha256:003aee64f9fd955d111549f96c4b58a3f40b9319383c70fad6277a4974bbf570"},
+]
+PyYAML = [
     {file = "PyYAML-6.0-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:d4db7c7aef085872ef65a8fd7d6d09a14ae91f691dec3e87ee5ee0539d516f53"},
     {file = "PyYAML-6.0-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:9df7ed3b3d2e0ecfe09e14741b857df43adb5a3ddadc919a2d94fbdf78fea53c"},
     {file = "PyYAML-6.0-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:77f396e6ef4c73fdc33a9157446466f1cff553d979bd00ecb64385760c6babdc"},
@@ -706,6 +910,13 @@ pyyaml = [
     {file = "PyYAML-6.0-cp310-cp310-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:f84fbc98b019fef2ee9a1cb3ce93e3187a6df0b2538a651bfb890254ba9f90b5"},
     {file = "PyYAML-6.0-cp310-cp310-win32.whl", hash = "sha256:2cd5df3de48857ed0544b34e2d40e9fac445930039f3cfe4bcc592a1f836d513"},
     {file = "PyYAML-6.0-cp310-cp310-win_amd64.whl", hash = "sha256:daf496c58a8c52083df09b80c860005194014c3698698d1a57cbcfa182142a3a"},
+    {file = "PyYAML-6.0-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:d4b0ba9512519522b118090257be113b9468d804b19d63c71dbcf4a48fa32358"},
+    {file = "PyYAML-6.0-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:81957921f441d50af23654aa6c5e5eaf9b06aba7f0a19c18a538dc7ef291c5a1"},
+    {file = "PyYAML-6.0-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:afa17f5bc4d1b10afd4466fd3a44dc0e245382deca5b3c353d8b757f9e3ecb8d"},
+    {file = "PyYAML-6.0-cp311-cp311-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:dbad0e9d368bb989f4515da330b88a057617d16b6a8245084f1b05400f24609f"},
+    {file = "PyYAML-6.0-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:432557aa2c09802be39460360ddffd48156e30721f5e8d917f01d31694216782"},
+    {file = "PyYAML-6.0-cp311-cp311-win32.whl", hash = "sha256:bfaef573a63ba8923503d27530362590ff4f576c626d86a9fed95822a8255fd7"},
+    {file = "PyYAML-6.0-cp311-cp311-win_amd64.whl", hash = "sha256:01b45c0191e6d66c470b6cf1b9531a771a83c1c4208272ead47a3ae4f2f603bf"},
     {file = "PyYAML-6.0-cp36-cp36m-macosx_10_9_x86_64.whl", hash = "sha256:897b80890765f037df3403d22bab41627ca8811ae55e9a722fd0392850ec4d86"},
     {file = "PyYAML-6.0-cp36-cp36m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:50602afada6d6cbfad699b0c7bb50d5ccffa7e46a3d738092afddc1f9758427f"},
     {file = "PyYAML-6.0-cp36-cp36m-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:48c346915c114f5fdb3ead70312bd042a953a8ce5c7106d5bfb1a5254e47da92"},
@@ -733,12 +944,22 @@ pyyaml = [
     {file = "PyYAML-6.0-cp39-cp39-win_amd64.whl", hash = "sha256:b3d267842bf12586ba6c734f89d1f5b871df0273157918b0ccefa29deb05c21c"},
     {file = "PyYAML-6.0.tar.gz", hash = "sha256:68fb519c14306fec9720a2a5b45bc9f0c8d1b9c72adf45c37baedfcd949c35a2"},
 ]
-requests = []
+requests = [
+    {file = "requests-2.28.1-py3-none-any.whl", hash = "sha256:8fefa2a1a1365bf5520aac41836fbee479da67864514bdb821f31ce07ce65349"},
+    {file = "requests-2.28.1.tar.gz", hash = "sha256:7c5599b102feddaa661c826c56ab4fee28bfd17f5abca1ebbe3e7f19d7c97983"},
+]
+setuptools = [
+    {file = "setuptools-65.6.3-py3-none-any.whl", hash = "sha256:57f6f22bde4e042978bcd50176fdb381d7c21a9efa4041202288d3737a0c6a54"},
+    {file = "setuptools-65.6.3.tar.gz", hash = "sha256:a7620757bf984b58deaf32fc8a4577a9bbc0850cf92c20e1ce41c38c19e5fb75"},
+]
 six = [
     {file = "six-1.16.0-py2.py3-none-any.whl", hash = "sha256:8abb2f1d86890a2dfb989f9a77cfcfd3e47c2a354b01111771326f8aa26e0254"},
     {file = "six-1.16.0.tar.gz", hash = "sha256:1e61c37477a1626458e36f7b1d82aa5c9b094fa4802892072e49de9c60c4c926"},
 ]
-soupsieve = []
+soupsieve = [
+    {file = "soupsieve-2.3.2.post1-py3-none-any.whl", hash = "sha256:3b2503d3c7084a42b1ebd08116e5f81aadfaea95863628c80a3b774a11b7c759"},
+    {file = "soupsieve-2.3.2.post1.tar.gz", hash = "sha256:fc53893b3da2c33de295667a0e19f078c14bf86544af307354de5fcf12a3f30d"},
+]
 text-unidecode = [
     {file = "text-unidecode-1.3.tar.gz", hash = "sha256:bad6603bb14d279193107714b288be206cac565dfa49aa5b105294dd5c4aab93"},
     {file = "text_unidecode-1.3-py2.py3-none-any.whl", hash = "sha256:1311f10e8b895935241623731c2ba64f4c455287888b18189350b67134a822e8"},
@@ -751,7 +972,19 @@ tomli = [
     {file = "tomli-2.0.1-py3-none-any.whl", hash = "sha256:939de3e7a6161af0c887ef91b7d41a53e7c5a1ca976325f429cb46ea9bc30ecc"},
     {file = "tomli-2.0.1.tar.gz", hash = "sha256:de526c12914f0c550d15924c62d72abc48d6fe7364aa87328337a31007fe8a4f"},
 ]
-tox = []
-tqdm = []
-urllib3 = []
-virtualenv = []
+tox = [
+    {file = "tox-3.27.1-py2.py3-none-any.whl", hash = "sha256:f52ca66eae115fcfef0e77ef81fd107133d295c97c52df337adedb8dfac6ab84"},
+    {file = "tox-3.27.1.tar.gz", hash = "sha256:b2a920e35a668cc06942ffd1cf3a4fb221a4d909ca72191fb6d84b0b18a7be04"},
+]
+tqdm = [
+    {file = "tqdm-4.64.1-py2.py3-none-any.whl", hash = "sha256:6fee160d6ffcd1b1c68c65f14c829c22832bc401726335ce92c52d395944a6a1"},
+    {file = "tqdm-4.64.1.tar.gz", hash = "sha256:5f4f682a004951c1b450bc753c710e9280c5746ce6ffedee253ddbcbf54cf1e4"},
+]
+urllib3 = [
+    {file = "urllib3-1.26.13-py2.py3-none-any.whl", hash = "sha256:47cc05d99aaa09c9e72ed5809b60e7ba354e64b59c9c173ac3018642d8bb41fc"},
+    {file = "urllib3-1.26.13.tar.gz", hash = "sha256:c083dd0dce68dbfbe1129d5271cb90f9447dea7d52097c6e0126120c521ddea8"},
+]
+virtualenv = [
+    {file = "virtualenv-20.17.1-py3-none-any.whl", hash = "sha256:ce3b1684d6e1a20a3e5ed36795a97dfc6af29bc3970ca8dab93e11ac6094b3c4"},
+    {file = "virtualenv-20.17.1.tar.gz", hash = "sha256:f8b927684efc6f1cc206c9db297a570ab9ad0e51c16fa9e45487d36d1905c058"},
+]

From a081323f580b7e3fcaa5ee467747f4e4c2723769 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 6 Dec 2022 20:36:36 +0100
Subject: [PATCH 193/371] Bump pytest-xdist from 3.0.2 to 3.1.0 (#90)

Bumps [pytest-xdist](https://github.com/pytest-dev/pytest-xdist) from 3.0.2 to 3.1.0.
- [Release notes](https://github.com/pytest-dev/pytest-xdist/releases)
- [Changelog](https://github.com/pytest-dev/pytest-xdist/blob/master/CHANGELOG.rst)
- [Commits](https://github.com/pytest-dev/pytest-xdist/compare/v3.0.2...v3.1.0)

---
updated-dependencies:
- dependency-name: pytest-xdist
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 poetry.lock    | 12 ++++++------
 pyproject.toml |  2 +-
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/poetry.lock b/poetry.lock
index 4c431c33..e57c519d 100644
--- a/poetry.lock
+++ b/poetry.lock
@@ -421,11 +421,11 @@ testing = ["fields", "hunter", "process-tests", "pytest-xdist", "six", "virtuale
 
 [[package]]
 name = "pytest-xdist"
-version = "3.0.2"
-description = "pytest xdist plugin for distributed testing and loop-on-failing modes"
+version = "3.1.0"
+description = "pytest xdist plugin for distributed testing, most importantly across multiple CPUs"
 category = "dev"
 optional = false
-python-versions = ">=3.6"
+python-versions = ">=3.7"
 
 [package.dependencies]
 execnet = ">=1.1"
@@ -623,7 +623,7 @@ testing = ["coverage (>=6.2)", "coverage-enable-subprocess (>=1)", "flaky (>=3.7
 [metadata]
 lock-version = "1.1"
 python-versions = "^3.10"
-content-hash = "f71be4e7f00d6dea92fe9e67fd4825e0e5bb84f7fd67158a4a3ef5218c79dcb7"
+content-hash = "4a6daa0d612aad0f823056788f13e724de16f2101b8a99ccb0a9afe76f4beb45"
 
 [metadata.files]
 anytree = [
@@ -876,8 +876,8 @@ pytest-cov = [
     {file = "pytest_cov-4.0.0-py3-none-any.whl", hash = "sha256:2feb1b751d66a8bd934e5edfa2e961d11309dc37b73b0eabe73b5945fee20f6b"},
 ]
 pytest-xdist = [
-    {file = "pytest-xdist-3.0.2.tar.gz", hash = "sha256:688da9b814370e891ba5de650c9327d1a9d861721a524eb917e620eec3e90291"},
-    {file = "pytest_xdist-3.0.2-py3-none-any.whl", hash = "sha256:9feb9a18e1790696ea23e1434fa73b325ed4998b0e9fcb221f16fd1945e6df1b"},
+    {file = "pytest-xdist-3.1.0.tar.gz", hash = "sha256:40fdb8f3544921c5dfcd486ac080ce22870e71d82ced6d2e78fa97c2addd480c"},
+    {file = "pytest_xdist-3.1.0-py3-none-any.whl", hash = "sha256:70a76f191d8a1d2d6be69fc440cdf85f3e4c03c08b520fd5dc5d338d6cf07d89"},
 ]
 python-dateutil = [
     {file = "python-dateutil-2.8.2.tar.gz", hash = "sha256:0123cacc1627ae19ddf3c27a5de5bd67ee4586fbdd6440d9748f8abb483d3e86"},
diff --git a/pyproject.toml b/pyproject.toml
index 0c5c1139..d2d6c52d 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -18,7 +18,7 @@ black = "^22.10"
 cookiecutter = "^2.1.1"
 pytest = "^7.2.0"
 pytest-cov = "^4.0.0"
-pytest-xdist = "^3.0.2"
+pytest-xdist = "^3.1.0"
 python-dotenv = "^0.21.0"
 tox = "^3.27.1"
 pre-commit = "^2.19.0"

From fc47ceac7a4be342cb406af6ed222482c23d6dc0 Mon Sep 17 00:00:00 2001
From: Roel Adriaans <roel.adriaans@ordina.nl>
Date: Tue, 6 Dec 2022 21:42:40 +0100
Subject: [PATCH 194/371] Implement day 6 with more_itertools.sliding_window

---
 mypy.ini                                |   3 +
 poetry.lock                             | 346 +++++-------------------
 pyproject.toml                          |   1 +
 src/adventofcode2022/solutions/day06.py |   9 +-
 4 files changed, 71 insertions(+), 288 deletions(-)

diff --git a/mypy.ini b/mypy.ini
index 1abd6dc6..149fb220 100644
--- a/mypy.ini
+++ b/mypy.ini
@@ -21,3 +21,6 @@ ignore_missing_imports = True
 
 [mypy-parse]
 ignore_missing_imports = True
+
+[mypy-more_itertools]
+ignore_missing_imports = True
diff --git a/poetry.lock b/poetry.lock
index b56b8209..dc8c8662 100644
--- a/poetry.lock
+++ b/poetry.lock
@@ -33,10 +33,10 @@ optional = false
 python-versions = ">=3.5"
 
 [package.extras]
-dev = ["cloudpickle", "coverage[toml] (>=5.0.2)", "furo", "hypothesis", "mypy (>=0.900,!=0.940)", "pre-commit", "pympler", "pytest (>=4.3.0)", "pytest-mypy-plugins", "sphinx", "sphinx-notfound-page", "zope.interface"]
-docs = ["furo", "sphinx", "sphinx-notfound-page", "zope.interface"]
-tests = ["cloudpickle", "coverage[toml] (>=5.0.2)", "hypothesis", "mypy (>=0.900,!=0.940)", "pympler", "pytest (>=4.3.0)", "pytest-mypy-plugins", "zope.interface"]
-tests_no_zope = ["cloudpickle", "coverage[toml] (>=5.0.2)", "hypothesis", "mypy (>=0.900,!=0.940)", "pympler", "pytest (>=4.3.0)", "pytest-mypy-plugins"]
+dev = ["coverage[toml] (>=5.0.2)", "hypothesis", "pympler", "pytest (>=4.3.0)", "mypy (>=0.900,!=0.940)", "pytest-mypy-plugins", "zope.interface", "furo", "sphinx", "sphinx-notfound-page", "pre-commit", "cloudpickle"]
+docs = ["furo", "sphinx", "zope.interface", "sphinx-notfound-page"]
+tests = ["coverage[toml] (>=5.0.2)", "hypothesis", "pympler", "pytest (>=4.3.0)", "mypy (>=0.900,!=0.940)", "pytest-mypy-plugins", "zope.interface", "cloudpickle"]
+tests_no_zope = ["coverage[toml] (>=5.0.2)", "hypothesis", "pympler", "pytest (>=4.3.0)", "mypy (>=0.900,!=0.940)", "pytest-mypy-plugins", "cloudpickle"]
 
 [[package]]
 name = "beautifulsoup4"
@@ -248,13 +248,13 @@ optional = false
 python-versions = ">=3.6.1,<4.0"
 
 [package.extras]
-colors = ["colorama (>=0.4.3,<0.5.0)"]
 pipfile_deprecated_finder = ["pipreqs", "requirementslib"]
+requirements_deprecated_finder = ["pipreqs", "pip-api"]
+colors = ["colorama (>=0.4.3,<0.5.0)"]
 plugins = ["setuptools"]
-requirements_deprecated_finder = ["pip-api", "pipreqs"]
 
 [[package]]
-name = "Jinja2"
+name = "jinja2"
 version = "3.1.2"
 description = "A very fast and expressive template engine."
 category = "dev"
@@ -280,13 +280,21 @@ arrow = "*"
 jinja2 = "*"
 
 [[package]]
-name = "MarkupSafe"
+name = "markupsafe"
 version = "2.1.1"
 description = "Safely add untrusted strings to HTML/XML markup."
 category = "dev"
 optional = false
 python-versions = ">=3.7"
 
+[[package]]
+name = "more-itertools"
+version = "9.0.0"
+description = "More routines for operating on iterables, beyond itertools"
+category = "main"
+optional = false
+python-versions = ">=3.7"
+
 [[package]]
 name = "mypy-extensions"
 version = "0.4.3"
@@ -303,9 +311,6 @@ category = "dev"
 optional = false
 python-versions = ">=2.7,!=3.0.*,!=3.1.*,!=3.2.*,!=3.3.*,!=3.4.*,!=3.5.*,!=3.6.*"
 
-[package.dependencies]
-setuptools = "*"
-
 [[package]]
 name = "packaging"
 version = "21.3"
@@ -342,8 +347,8 @@ optional = false
 python-versions = ">=3.7"
 
 [package.extras]
-docs = ["furo (>=2022.9.29)", "proselint (>=0.13)", "sphinx (>=5.3)", "sphinx-autodoc-typehints (>=1.19.4)"]
-test = ["appdirs (==1.4.4)", "pytest (>=7.2)", "pytest-cov (>=4)", "pytest-mock (>=3.10)"]
+docs = ["furo (>=2022.9.29)", "proselint (>=0.13)", "sphinx-autodoc-typehints (>=1.19.4)", "sphinx (>=5.3)"]
+test = ["appdirs (==1.4.4)", "pytest-cov (>=4)", "pytest-mock (>=3.10)", "pytest (>=7.2)"]
 
 [[package]]
 name = "pluggy"
@@ -390,7 +395,7 @@ optional = false
 python-versions = ">=3.6.8"
 
 [package.extras]
-diagrams = ["jinja2", "railroad-diagrams"]
+diagrams = ["railroad-diagrams", "jinja2"]
 
 [[package]]
 name = "pytest"
@@ -425,7 +430,7 @@ coverage = {version = ">=5.2.1", extras = ["toml"]}
 pytest = ">=4.6"
 
 [package.extras]
-testing = ["fields", "hunter", "process-tests", "pytest-xdist", "six", "virtualenv"]
+testing = ["fields", "hunter", "process-tests", "six", "pytest-xdist", "virtualenv"]
 
 [[package]]
 name = "pytest-xdist"
@@ -481,7 +486,7 @@ text-unidecode = ">=1.3"
 unidecode = ["Unidecode (>=1.1.1)"]
 
 [[package]]
-name = "PyYAML"
+name = "pyyaml"
 version = "6.0"
 description = "YAML parser and emitter for Python"
 category = "dev"
@@ -506,19 +511,6 @@ urllib3 = ">=1.21.1,<1.27"
 socks = ["PySocks (>=1.5.6,!=1.5.7)"]
 use_chardet_on_py3 = ["chardet (>=3.0.2,<6)"]
 
-[[package]]
-name = "setuptools"
-version = "65.6.3"
-description = "Easily download, build, install, upgrade, and uninstall Python packages"
-category = "dev"
-optional = false
-python-versions = ">=3.7"
-
-[package.extras]
-docs = ["furo", "jaraco.packaging (>=9)", "jaraco.tidelift (>=1.4)", "pygments-github-lexers (==0.0.5)", "rst.linker (>=1.9)", "sphinx (>=3.5)", "sphinx-favicon", "sphinx-hoverxref (<2)", "sphinx-inline-tabs", "sphinx-notfound-page (==0.8.3)", "sphinx-reredirects", "sphinxcontrib-towncrier"]
-testing = ["build[virtualenv]", "filelock (>=3.4.0)", "flake8 (<5)", "flake8-2020", "ini2toml[lite] (>=0.9)", "jaraco.envs (>=2.2)", "jaraco.path (>=3.2.0)", "pip (>=19.1)", "pip-run (>=8.8)", "pytest (>=6)", "pytest-black (>=0.3.7)", "pytest-checkdocs (>=2.4)", "pytest-cov", "pytest-enabler (>=1.3)", "pytest-flake8", "pytest-mypy (>=0.9.1)", "pytest-perf", "pytest-timeout", "pytest-xdist", "tomli-w (>=1.0.0)", "virtualenv (>=13.0.0)", "wheel"]
-testing-integration = ["build[virtualenv]", "filelock (>=3.4.0)", "jaraco.envs (>=2.2)", "jaraco.path (>=3.2.0)", "pytest", "pytest-enabler", "pytest-xdist", "tomli", "virtualenv (>=13.0.0)", "wheel"]
-
 [[package]]
 name = "six"
 version = "1.16.0"
@@ -579,7 +571,7 @@ virtualenv = ">=16.0.0,<20.0.0 || >20.0.0,<20.0.1 || >20.0.1,<20.0.2 || >20.0.2,
 
 [package.extras]
 docs = ["pygments-github-lexers (>=0.0.5)", "sphinx (>=2.0.0)", "sphinxcontrib-autoprogram (>=0.1.5)", "towncrier (>=18.5.0)"]
-testing = ["flaky (>=3.4.0)", "freezegun (>=0.3.11)", "pathlib2 (>=2.3.3)", "psutil (>=5.6.1)", "pytest (>=4.0.0)", "pytest-cov (>=2.5.1)", "pytest-mock (>=1.10.0)", "pytest-randomly (>=1.0.0)"]
+testing = ["flaky (>=3.4.0)", "freezegun (>=0.3.11)", "pytest (>=4.0.0)", "pytest-cov (>=2.5.1)", "pytest-mock (>=1.10.0)", "pytest-randomly (>=1.0.0)", "psutil (>=5.6.1)", "pathlib2 (>=2.3.3)"]
 
 [[package]]
 name = "tqdm"
@@ -607,8 +599,8 @@ optional = false
 python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*, !=3.5.*"
 
 [package.extras]
-brotli = ["brotli (>=1.0.9)", "brotlicffi (>=0.8.0)", "brotlipy (>=0.6.0)"]
-secure = ["certifi", "cryptography (>=1.3.4)", "idna (>=2.0.0)", "ipaddress", "pyOpenSSL (>=0.14)", "urllib3-secure-extra"]
+brotli = ["brotlicffi (>=0.8.0)", "brotli (>=1.0.9)", "brotlipy (>=0.6.0)"]
+secure = ["pyOpenSSL (>=0.14)", "cryptography (>=1.3.4)", "idna (>=2.0.0)", "certifi", "urllib3-secure-extra", "ipaddress"]
 socks = ["PySocks (>=1.5.6,!=1.5.7,<2.0)"]
 
 [[package]]
@@ -631,156 +623,41 @@ testing = ["coverage (>=6.2)", "coverage-enable-subprocess (>=1)", "flaky (>=3.7
 [metadata]
 lock-version = "1.1"
 python-versions = "^3.10"
-content-hash = "dea495182ba7919f34c7622c800bd9361c93ad5f30d7e91708cca53e917c6a6c"
+content-hash = "12d50d7762a6708e25eb707f686084c81683802cb22144a3167f5552a6a2b335"
 
 [metadata.files]
 anytree = [
     {file = "anytree-2.8.0-py2.py3-none-any.whl", hash = "sha256:14c55ac77492b11532395049a03b773d14c7e30b22aa012e337b1e983de31521"},
     {file = "anytree-2.8.0.tar.gz", hash = "sha256:3f0f93f355a91bc3e6245319bf4c1d50e3416cc7a35cc1133c1ff38306bbccab"},
 ]
-arrow = [
-    {file = "arrow-1.2.3-py3-none-any.whl", hash = "sha256:5a49ab92e3b7b71d96cd6bfcc4df14efefc9dfa96ea19045815914a6ab6b1fe2"},
-    {file = "arrow-1.2.3.tar.gz", hash = "sha256:3934b30ca1b9f292376d9db15b19446088d12ec58629bc3f0da28fd55fb633a1"},
-]
-attrs = [
-    {file = "attrs-22.1.0-py2.py3-none-any.whl", hash = "sha256:86efa402f67bf2df34f51a335487cf46b1ec130d02b8d39fd248abfd30da551c"},
-    {file = "attrs-22.1.0.tar.gz", hash = "sha256:29adc2665447e5191d0e7c568fde78b21f9672d344281d0c6e1ab085429b22b6"},
-]
-beautifulsoup4 = [
-    {file = "beautifulsoup4-4.11.1-py3-none-any.whl", hash = "sha256:58d5c3d29f5a36ffeb94f02f0d786cd53014cf9b3b3951d42e0080d8a9498d30"},
-    {file = "beautifulsoup4-4.11.1.tar.gz", hash = "sha256:ad9aa55b65ef2808eb405f46cf74df7fcb7044d5cbc26487f96eb2ef2e436693"},
-]
+arrow = []
+attrs = []
+beautifulsoup4 = []
 binaryornot = [
     {file = "binaryornot-0.4.4-py2.py3-none-any.whl", hash = "sha256:b8b71173c917bddcd2c16070412e369c3ed7f0528926f70cac18a6c97fd563e4"},
     {file = "binaryornot-0.4.4.tar.gz", hash = "sha256:359501dfc9d40632edc9fac890e19542db1a287bbcfa58175b66658392018061"},
 ]
-black = [
-    {file = "black-22.10.0-1fixedarch-cp310-cp310-macosx_11_0_x86_64.whl", hash = "sha256:5cc42ca67989e9c3cf859e84c2bf014f6633db63d1cbdf8fdb666dcd9e77e3fa"},
-    {file = "black-22.10.0-1fixedarch-cp311-cp311-macosx_11_0_x86_64.whl", hash = "sha256:5d8f74030e67087b219b032aa33a919fae8806d49c867846bfacde57f43972ef"},
-    {file = "black-22.10.0-1fixedarch-cp37-cp37m-macosx_10_16_x86_64.whl", hash = "sha256:197df8509263b0b8614e1df1756b1dd41be6738eed2ba9e9769f3880c2b9d7b6"},
-    {file = "black-22.10.0-1fixedarch-cp38-cp38-macosx_10_16_x86_64.whl", hash = "sha256:2644b5d63633702bc2c5f3754b1b475378fbbfb481f62319388235d0cd104c2d"},
-    {file = "black-22.10.0-1fixedarch-cp39-cp39-macosx_11_0_x86_64.whl", hash = "sha256:e41a86c6c650bcecc6633ee3180d80a025db041a8e2398dcc059b3afa8382cd4"},
-    {file = "black-22.10.0-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:2039230db3c6c639bd84efe3292ec7b06e9214a2992cd9beb293d639c6402edb"},
-    {file = "black-22.10.0-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:14ff67aec0a47c424bc99b71005202045dc09270da44a27848d534600ac64fc7"},
-    {file = "black-22.10.0-cp310-cp310-win_amd64.whl", hash = "sha256:819dc789f4498ecc91438a7de64427c73b45035e2e3680c92e18795a839ebb66"},
-    {file = "black-22.10.0-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:5b9b29da4f564ba8787c119f37d174f2b69cdfdf9015b7d8c5c16121ddc054ae"},
-    {file = "black-22.10.0-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:b8b49776299fece66bffaafe357d929ca9451450f5466e997a7285ab0fe28e3b"},
-    {file = "black-22.10.0-cp311-cp311-win_amd64.whl", hash = "sha256:21199526696b8f09c3997e2b4db8d0b108d801a348414264d2eb8eb2532e540d"},
-    {file = "black-22.10.0-cp37-cp37m-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:1e464456d24e23d11fced2bc8c47ef66d471f845c7b7a42f3bd77bf3d1789650"},
-    {file = "black-22.10.0-cp37-cp37m-win_amd64.whl", hash = "sha256:9311e99228ae10023300ecac05be5a296f60d2fd10fff31cf5c1fa4ca4b1988d"},
-    {file = "black-22.10.0-cp38-cp38-macosx_11_0_arm64.whl", hash = "sha256:fba8a281e570adafb79f7755ac8721b6cf1bbf691186a287e990c7929c7692ff"},
-    {file = "black-22.10.0-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:915ace4ff03fdfff953962fa672d44be269deb2eaf88499a0f8805221bc68c87"},
-    {file = "black-22.10.0-cp38-cp38-win_amd64.whl", hash = "sha256:444ebfb4e441254e87bad00c661fe32df9969b2bf224373a448d8aca2132b395"},
-    {file = "black-22.10.0-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:974308c58d057a651d182208a484ce80a26dac0caef2895836a92dd6ebd725e0"},
-    {file = "black-22.10.0-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:72ef3925f30e12a184889aac03d77d031056860ccae8a1e519f6cbb742736383"},
-    {file = "black-22.10.0-cp39-cp39-win_amd64.whl", hash = "sha256:432247333090c8c5366e69627ccb363bc58514ae3e63f7fc75c54b1ea80fa7de"},
-    {file = "black-22.10.0-py3-none-any.whl", hash = "sha256:c957b2b4ea88587b46cf49d1dc17681c1e672864fd7af32fc1e9664d572b3458"},
-    {file = "black-22.10.0.tar.gz", hash = "sha256:f513588da599943e0cde4e32cc9879e825d58720d6557062d1098c5ad80080e1"},
-]
-certifi = [
-    {file = "certifi-2022.9.24-py3-none-any.whl", hash = "sha256:90c1a32f1d68f940488354e36370f6cca89f0f106db09518524c88d6ed83f382"},
-    {file = "certifi-2022.9.24.tar.gz", hash = "sha256:0d9c601124e5a6ba9712dbc60d9c53c21e34f5f641fe83002317394311bdce14"},
-]
+black = []
+certifi = []
 cfgv = [
     {file = "cfgv-3.3.1-py2.py3-none-any.whl", hash = "sha256:c6a0883f3917a037485059700b9e75da2464e6c27051014ad85ba6aaa5884426"},
     {file = "cfgv-3.3.1.tar.gz", hash = "sha256:f5a830efb9ce7a445376bb66ec94c638a9787422f96264c98edc6bdeed8ab736"},
 ]
-chardet = [
-    {file = "chardet-5.1.0-py3-none-any.whl", hash = "sha256:362777fb014af596ad31334fde1e8c327dfdb076e1960d1694662d46a6917ab9"},
-    {file = "chardet-5.1.0.tar.gz", hash = "sha256:0d62712b956bc154f85fb0a266e2a3c5913c2967e00348701b32411d6def31e5"},
-]
-charset-normalizer = [
-    {file = "charset-normalizer-2.1.1.tar.gz", hash = "sha256:5a3d016c7c547f69d6f81fb0db9449ce888b418b5b9952cc5e6e66843e9dd845"},
-    {file = "charset_normalizer-2.1.1-py3-none-any.whl", hash = "sha256:83e9a75d1911279afd89352c68b45348559d1fc0506b054b346651b5e7fee29f"},
-]
-click = [
-    {file = "click-8.1.3-py3-none-any.whl", hash = "sha256:bb4d8133cb15a609f44e8213d9b391b0809795062913b383c62be0ee95b1db48"},
-    {file = "click-8.1.3.tar.gz", hash = "sha256:7682dc8afb30297001674575ea00d1814d808d6a36af415a82bd481d37ba7b8e"},
-]
-colorama = [
-    {file = "colorama-0.4.6-py2.py3-none-any.whl", hash = "sha256:4f1d9991f5acc0ca119f9d443620b77f9d6b33703e51011c16baf57afb285fc6"},
-    {file = "colorama-0.4.6.tar.gz", hash = "sha256:08695f5cb7ed6e0531a20572697297273c47b8cae5a63ffc6d6ed5c201be6e44"},
-]
-cookiecutter = [
-    {file = "cookiecutter-2.1.1-py2.py3-none-any.whl", hash = "sha256:9f3ab027cec4f70916e28f03470bdb41e637a3ad354b4d65c765d93aad160022"},
-    {file = "cookiecutter-2.1.1.tar.gz", hash = "sha256:f3982be8d9c53dac1261864013fdec7f83afd2e42ede6f6dd069c5e149c540d5"},
-]
-coverage = [
-    {file = "coverage-6.5.0-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:ef8674b0ee8cc11e2d574e3e2998aea5df5ab242e012286824ea3c6970580e53"},
-    {file = "coverage-6.5.0-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:784f53ebc9f3fd0e2a3f6a78b2be1bd1f5575d7863e10c6e12504f240fd06660"},
-    {file = "coverage-6.5.0-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:b4a5be1748d538a710f87542f22c2cad22f80545a847ad91ce45e77417293eb4"},
-    {file = "coverage-6.5.0-cp310-cp310-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:83516205e254a0cb77d2d7bb3632ee019d93d9f4005de31dca0a8c3667d5bc04"},
-    {file = "coverage-6.5.0-cp310-cp310-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:af4fffaffc4067232253715065e30c5a7ec6faac36f8fc8d6f64263b15f74db0"},
-    {file = "coverage-6.5.0-cp310-cp310-musllinux_1_1_aarch64.whl", hash = "sha256:97117225cdd992a9c2a5515db1f66b59db634f59d0679ca1fa3fe8da32749cae"},
-    {file = "coverage-6.5.0-cp310-cp310-musllinux_1_1_i686.whl", hash = "sha256:a1170fa54185845505fbfa672f1c1ab175446c887cce8212c44149581cf2d466"},
-    {file = "coverage-6.5.0-cp310-cp310-musllinux_1_1_x86_64.whl", hash = "sha256:11b990d520ea75e7ee8dcab5bc908072aaada194a794db9f6d7d5cfd19661e5a"},
-    {file = "coverage-6.5.0-cp310-cp310-win32.whl", hash = "sha256:5dbec3b9095749390c09ab7c89d314727f18800060d8d24e87f01fb9cfb40b32"},
-    {file = "coverage-6.5.0-cp310-cp310-win_amd64.whl", hash = "sha256:59f53f1dc5b656cafb1badd0feb428c1e7bc19b867479ff72f7a9dd9b479f10e"},
-    {file = "coverage-6.5.0-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:4a5375e28c5191ac38cca59b38edd33ef4cc914732c916f2929029b4bfb50795"},
-    {file = "coverage-6.5.0-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:c4ed2820d919351f4167e52425e096af41bfabacb1857186c1ea32ff9983ed75"},
-    {file = "coverage-6.5.0-cp311-cp311-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:33a7da4376d5977fbf0a8ed91c4dffaaa8dbf0ddbf4c8eea500a2486d8bc4d7b"},
-    {file = "coverage-6.5.0-cp311-cp311-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:a8fb6cf131ac4070c9c5a3e21de0f7dc5a0fbe8bc77c9456ced896c12fcdad91"},
-    {file = "coverage-6.5.0-cp311-cp311-musllinux_1_1_aarch64.whl", hash = "sha256:a6b7d95969b8845250586f269e81e5dfdd8ff828ddeb8567a4a2eaa7313460c4"},
-    {file = "coverage-6.5.0-cp311-cp311-musllinux_1_1_i686.whl", hash = "sha256:1ef221513e6f68b69ee9e159506d583d31aa3567e0ae84eaad9d6ec1107dddaa"},
-    {file = "coverage-6.5.0-cp311-cp311-musllinux_1_1_x86_64.whl", hash = "sha256:cca4435eebea7962a52bdb216dec27215d0df64cf27fc1dd538415f5d2b9da6b"},
-    {file = "coverage-6.5.0-cp311-cp311-win32.whl", hash = "sha256:98e8a10b7a314f454d9eff4216a9a94d143a7ee65018dd12442e898ee2310578"},
-    {file = "coverage-6.5.0-cp311-cp311-win_amd64.whl", hash = "sha256:bc8ef5e043a2af066fa8cbfc6e708d58017024dc4345a1f9757b329a249f041b"},
-    {file = "coverage-6.5.0-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:4433b90fae13f86fafff0b326453dd42fc9a639a0d9e4eec4d366436d1a41b6d"},
-    {file = "coverage-6.5.0-cp37-cp37m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:f4f05d88d9a80ad3cac6244d36dd89a3c00abc16371769f1340101d3cb899fc3"},
-    {file = "coverage-6.5.0-cp37-cp37m-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:94e2565443291bd778421856bc975d351738963071e9b8839ca1fc08b42d4bef"},
-    {file = "coverage-6.5.0-cp37-cp37m-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:027018943386e7b942fa832372ebc120155fd970837489896099f5cfa2890f79"},
-    {file = "coverage-6.5.0-cp37-cp37m-musllinux_1_1_aarch64.whl", hash = "sha256:255758a1e3b61db372ec2736c8e2a1fdfaf563977eedbdf131de003ca5779b7d"},
-    {file = "coverage-6.5.0-cp37-cp37m-musllinux_1_1_i686.whl", hash = "sha256:851cf4ff24062c6aec510a454b2584f6e998cada52d4cb58c5e233d07172e50c"},
-    {file = "coverage-6.5.0-cp37-cp37m-musllinux_1_1_x86_64.whl", hash = "sha256:12adf310e4aafddc58afdb04d686795f33f4d7a6fa67a7a9d4ce7d6ae24d949f"},
-    {file = "coverage-6.5.0-cp37-cp37m-win32.whl", hash = "sha256:b5604380f3415ba69de87a289a2b56687faa4fe04dbee0754bfcae433489316b"},
-    {file = "coverage-6.5.0-cp37-cp37m-win_amd64.whl", hash = "sha256:4a8dbc1f0fbb2ae3de73eb0bdbb914180c7abfbf258e90b311dcd4f585d44bd2"},
-    {file = "coverage-6.5.0-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:d900bb429fdfd7f511f868cedd03a6bbb142f3f9118c09b99ef8dc9bf9643c3c"},
-    {file = "coverage-6.5.0-cp38-cp38-macosx_11_0_arm64.whl", hash = "sha256:2198ea6fc548de52adc826f62cb18554caedfb1d26548c1b7c88d8f7faa8f6ba"},
-    {file = "coverage-6.5.0-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:6c4459b3de97b75e3bd6b7d4b7f0db13f17f504f3d13e2a7c623786289dd670e"},
-    {file = "coverage-6.5.0-cp38-cp38-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:20c8ac5386253717e5ccc827caad43ed66fea0efe255727b1053a8154d952398"},
-    {file = "coverage-6.5.0-cp38-cp38-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:6b07130585d54fe8dff3d97b93b0e20290de974dc8177c320aeaf23459219c0b"},
-    {file = "coverage-6.5.0-cp38-cp38-musllinux_1_1_aarch64.whl", hash = "sha256:dbdb91cd8c048c2b09eb17713b0c12a54fbd587d79adcebad543bc0cd9a3410b"},
-    {file = "coverage-6.5.0-cp38-cp38-musllinux_1_1_i686.whl", hash = "sha256:de3001a203182842a4630e7b8d1a2c7c07ec1b45d3084a83d5d227a3806f530f"},
-    {file = "coverage-6.5.0-cp38-cp38-musllinux_1_1_x86_64.whl", hash = "sha256:e07f4a4a9b41583d6eabec04f8b68076ab3cd44c20bd29332c6572dda36f372e"},
-    {file = "coverage-6.5.0-cp38-cp38-win32.whl", hash = "sha256:6d4817234349a80dbf03640cec6109cd90cba068330703fa65ddf56b60223a6d"},
-    {file = "coverage-6.5.0-cp38-cp38-win_amd64.whl", hash = "sha256:7ccf362abd726b0410bf8911c31fbf97f09f8f1061f8c1cf03dfc4b6372848f6"},
-    {file = "coverage-6.5.0-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:633713d70ad6bfc49b34ead4060531658dc6dfc9b3eb7d8a716d5873377ab745"},
-    {file = "coverage-6.5.0-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:95203854f974e07af96358c0b261f1048d8e1083f2de9b1c565e1be4a3a48cfc"},
-    {file = "coverage-6.5.0-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:b9023e237f4c02ff739581ef35969c3739445fb059b060ca51771e69101efffe"},
-    {file = "coverage-6.5.0-cp39-cp39-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:265de0fa6778d07de30bcf4d9dc471c3dc4314a23a3c6603d356a3c9abc2dfcf"},
-    {file = "coverage-6.5.0-cp39-cp39-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:8f830ed581b45b82451a40faabb89c84e1a998124ee4212d440e9c6cf70083e5"},
-    {file = "coverage-6.5.0-cp39-cp39-musllinux_1_1_aarch64.whl", hash = "sha256:7b6be138d61e458e18d8e6ddcddd36dd96215edfe5f1168de0b1b32635839b62"},
-    {file = "coverage-6.5.0-cp39-cp39-musllinux_1_1_i686.whl", hash = "sha256:42eafe6778551cf006a7c43153af1211c3aaab658d4d66fa5fcc021613d02518"},
-    {file = "coverage-6.5.0-cp39-cp39-musllinux_1_1_x86_64.whl", hash = "sha256:723e8130d4ecc8f56e9a611e73b31219595baa3bb252d539206f7bbbab6ffc1f"},
-    {file = "coverage-6.5.0-cp39-cp39-win32.whl", hash = "sha256:d9ecf0829c6a62b9b573c7bb6d4dcd6ba8b6f80be9ba4fc7ed50bf4ac9aecd72"},
-    {file = "coverage-6.5.0-cp39-cp39-win_amd64.whl", hash = "sha256:fc2af30ed0d5ae0b1abdb4ebdce598eafd5b35397d4d75deb341a614d333d987"},
-    {file = "coverage-6.5.0-pp36.pp37.pp38-none-any.whl", hash = "sha256:1431986dac3923c5945271f169f59c45b8802a114c8f548d611f2015133df77a"},
-    {file = "coverage-6.5.0.tar.gz", hash = "sha256:f642e90754ee3e06b0e7e51bce3379590e76b7f76b708e1a71ff043f87025c84"},
-]
-distlib = [
-    {file = "distlib-0.3.6-py2.py3-none-any.whl", hash = "sha256:f35c4b692542ca110de7ef0bea44d73981caeb34ca0b9b6b2e6d7790dda8f80e"},
-    {file = "distlib-0.3.6.tar.gz", hash = "sha256:14bad2d9b04d3a36127ac97f30b12a19268f211063d8f8ee4f47108896e11b46"},
-]
-exceptiongroup = [
-    {file = "exceptiongroup-1.0.4-py3-none-any.whl", hash = "sha256:542adf9dea4055530d6e1279602fa5cb11dab2395fa650b8674eaec35fc4a828"},
-    {file = "exceptiongroup-1.0.4.tar.gz", hash = "sha256:bd14967b79cd9bdb54d97323216f8fdf533e278df937aa2a90089e7d6e06e5ec"},
-]
+chardet = []
+charset-normalizer = []
+click = []
+colorama = []
+cookiecutter = []
+coverage = []
+distlib = []
+exceptiongroup = []
 execnet = [
     {file = "execnet-1.9.0-py2.py3-none-any.whl", hash = "sha256:a295f7cc774947aac58dde7fdc85f4aa00c42adf5d8f5468fc630c1acf30a142"},
     {file = "execnet-1.9.0.tar.gz", hash = "sha256:8f694f3ba9cc92cab508b152dcfe322153975c29bda272e2fd7f3f00f36e47c5"},
 ]
-filelock = [
-    {file = "filelock-3.8.2-py3-none-any.whl", hash = "sha256:8df285554452285f79c035efb0c861eb33a4bcfa5b7a137016e32e6a90f9792c"},
-    {file = "filelock-3.8.2.tar.gz", hash = "sha256:7565f628ea56bfcd8e54e42bdc55da899c85c1abfe1b5bcfd147e9188cebb3b2"},
-]
-identify = [
-    {file = "identify-2.5.9-py2.py3-none-any.whl", hash = "sha256:a390fb696e164dbddb047a0db26e57972ae52fbd037ae68797e5ae2f4492485d"},
-    {file = "identify-2.5.9.tar.gz", hash = "sha256:906036344ca769539610436e40a684e170c3648b552194980bb7b617a8daeb9f"},
-]
-idna = [
-    {file = "idna-3.4-py3-none-any.whl", hash = "sha256:90b77e79eaa3eba6de819a0c442c0b4ceefc341a7a2ab77d7562bf49f425c5c2"},
-    {file = "idna-3.4.tar.gz", hash = "sha256:814f528e8dead7d329833b91c5faa87d60bf71824cd12a7530b5526063d02cb4"},
-]
+filelock = []
+identify = []
+idna = []
 iniconfig = [
     {file = "iniconfig-1.1.1-py2.py3-none-any.whl", hash = "sha256:011e24c64b7f47f6ebd835bb12a743f2fbe9a26d4cecaa7f53bc4f35ee9da8b3"},
     {file = "iniconfig-1.1.1.tar.gz", hash = "sha256:bc3af051d7d14b2ee5ef9969666def0cd1a000e121eaea580d4a313df4b37f32"},
@@ -789,87 +666,30 @@ isort = [
     {file = "isort-5.10.1-py3-none-any.whl", hash = "sha256:6f62d78e2f89b4500b080fe3a81690850cd254227f27f75c3a0c491a1f351ba7"},
     {file = "isort-5.10.1.tar.gz", hash = "sha256:e8443a5e7a020e9d7f97f1d7d9cd17c88bcb3bc7e218bf9cf5095fe550be2951"},
 ]
-Jinja2 = [
-    {file = "Jinja2-3.1.2-py3-none-any.whl", hash = "sha256:6088930bfe239f0e6710546ab9c19c9ef35e29792895fed6e6e31a023a182a61"},
-    {file = "Jinja2-3.1.2.tar.gz", hash = "sha256:31351a702a408a9e7595a8fc6150fc3f43bb6bf7e319770cbc0db9df9437e852"},
-]
+jinja2 = []
 jinja2-time = [
     {file = "jinja2-time-0.2.0.tar.gz", hash = "sha256:d14eaa4d315e7688daa4969f616f226614350c48730bfa1692d2caebd8c90d40"},
     {file = "jinja2_time-0.2.0-py2.py3-none-any.whl", hash = "sha256:d3eab6605e3ec8b7a0863df09cc1d23714908fa61aa6986a845c20ba488b4efa"},
 ]
-MarkupSafe = [
-    {file = "MarkupSafe-2.1.1-cp310-cp310-macosx_10_9_universal2.whl", hash = "sha256:86b1f75c4e7c2ac2ccdaec2b9022845dbb81880ca318bb7a0a01fbf7813e3812"},
-    {file = "MarkupSafe-2.1.1-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:f121a1420d4e173a5d96e47e9a0c0dcff965afdf1626d28de1460815f7c4ee7a"},
-    {file = "MarkupSafe-2.1.1-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:a49907dd8420c5685cfa064a1335b6754b74541bbb3706c259c02ed65b644b3e"},
-    {file = "MarkupSafe-2.1.1-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:10c1bfff05d95783da83491be968e8fe789263689c02724e0c691933c52994f5"},
-    {file = "MarkupSafe-2.1.1-cp310-cp310-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:b7bd98b796e2b6553da7225aeb61f447f80a1ca64f41d83612e6139ca5213aa4"},
-    {file = "MarkupSafe-2.1.1-cp310-cp310-musllinux_1_1_aarch64.whl", hash = "sha256:b09bf97215625a311f669476f44b8b318b075847b49316d3e28c08e41a7a573f"},
-    {file = "MarkupSafe-2.1.1-cp310-cp310-musllinux_1_1_i686.whl", hash = "sha256:694deca8d702d5db21ec83983ce0bb4b26a578e71fbdbd4fdcd387daa90e4d5e"},
-    {file = "MarkupSafe-2.1.1-cp310-cp310-musllinux_1_1_x86_64.whl", hash = "sha256:efc1913fd2ca4f334418481c7e595c00aad186563bbc1ec76067848c7ca0a933"},
-    {file = "MarkupSafe-2.1.1-cp310-cp310-win32.whl", hash = "sha256:4a33dea2b688b3190ee12bd7cfa29d39c9ed176bda40bfa11099a3ce5d3a7ac6"},
-    {file = "MarkupSafe-2.1.1-cp310-cp310-win_amd64.whl", hash = "sha256:dda30ba7e87fbbb7eab1ec9f58678558fd9a6b8b853530e176eabd064da81417"},
-    {file = "MarkupSafe-2.1.1-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:671cd1187ed5e62818414afe79ed29da836dde67166a9fac6d435873c44fdd02"},
-    {file = "MarkupSafe-2.1.1-cp37-cp37m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:3799351e2336dc91ea70b034983ee71cf2f9533cdff7c14c90ea126bfd95d65a"},
-    {file = "MarkupSafe-2.1.1-cp37-cp37m-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:e72591e9ecd94d7feb70c1cbd7be7b3ebea3f548870aa91e2732960fa4d57a37"},
-    {file = "MarkupSafe-2.1.1-cp37-cp37m-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:6fbf47b5d3728c6aea2abb0589b5d30459e369baa772e0f37a0320185e87c980"},
-    {file = "MarkupSafe-2.1.1-cp37-cp37m-musllinux_1_1_aarch64.whl", hash = "sha256:d5ee4f386140395a2c818d149221149c54849dfcfcb9f1debfe07a8b8bd63f9a"},
-    {file = "MarkupSafe-2.1.1-cp37-cp37m-musllinux_1_1_i686.whl", hash = "sha256:bcb3ed405ed3222f9904899563d6fc492ff75cce56cba05e32eff40e6acbeaa3"},
-    {file = "MarkupSafe-2.1.1-cp37-cp37m-musllinux_1_1_x86_64.whl", hash = "sha256:e1c0b87e09fa55a220f058d1d49d3fb8df88fbfab58558f1198e08c1e1de842a"},
-    {file = "MarkupSafe-2.1.1-cp37-cp37m-win32.whl", hash = "sha256:8dc1c72a69aa7e082593c4a203dcf94ddb74bb5c8a731e4e1eb68d031e8498ff"},
-    {file = "MarkupSafe-2.1.1-cp37-cp37m-win_amd64.whl", hash = "sha256:97a68e6ada378df82bc9f16b800ab77cbf4b2fada0081794318520138c088e4a"},
-    {file = "MarkupSafe-2.1.1-cp38-cp38-macosx_10_9_universal2.whl", hash = "sha256:e8c843bbcda3a2f1e3c2ab25913c80a3c5376cd00c6e8c4a86a89a28c8dc5452"},
-    {file = "MarkupSafe-2.1.1-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:0212a68688482dc52b2d45013df70d169f542b7394fc744c02a57374a4207003"},
-    {file = "MarkupSafe-2.1.1-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:8e576a51ad59e4bfaac456023a78f6b5e6e7651dcd383bcc3e18d06f9b55d6d1"},
-    {file = "MarkupSafe-2.1.1-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:4b9fe39a2ccc108a4accc2676e77da025ce383c108593d65cc909add5c3bd601"},
-    {file = "MarkupSafe-2.1.1-cp38-cp38-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:96e37a3dc86e80bf81758c152fe66dbf60ed5eca3d26305edf01892257049925"},
-    {file = "MarkupSafe-2.1.1-cp38-cp38-musllinux_1_1_aarch64.whl", hash = "sha256:6d0072fea50feec76a4c418096652f2c3238eaa014b2f94aeb1d56a66b41403f"},
-    {file = "MarkupSafe-2.1.1-cp38-cp38-musllinux_1_1_i686.whl", hash = "sha256:089cf3dbf0cd6c100f02945abeb18484bd1ee57a079aefd52cffd17fba910b88"},
-    {file = "MarkupSafe-2.1.1-cp38-cp38-musllinux_1_1_x86_64.whl", hash = "sha256:6a074d34ee7a5ce3effbc526b7083ec9731bb3cbf921bbe1d3005d4d2bdb3a63"},
-    {file = "MarkupSafe-2.1.1-cp38-cp38-win32.whl", hash = "sha256:421be9fbf0ffe9ffd7a378aafebbf6f4602d564d34be190fc19a193232fd12b1"},
-    {file = "MarkupSafe-2.1.1-cp38-cp38-win_amd64.whl", hash = "sha256:fc7b548b17d238737688817ab67deebb30e8073c95749d55538ed473130ec0c7"},
-    {file = "MarkupSafe-2.1.1-cp39-cp39-macosx_10_9_universal2.whl", hash = "sha256:e04e26803c9c3851c931eac40c695602c6295b8d432cbe78609649ad9bd2da8a"},
-    {file = "MarkupSafe-2.1.1-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:b87db4360013327109564f0e591bd2a3b318547bcef31b468a92ee504d07ae4f"},
-    {file = "MarkupSafe-2.1.1-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:99a2a507ed3ac881b975a2976d59f38c19386d128e7a9a18b7df6fff1fd4c1d6"},
-    {file = "MarkupSafe-2.1.1-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:56442863ed2b06d19c37f94d999035e15ee982988920e12a5b4ba29b62ad1f77"},
-    {file = "MarkupSafe-2.1.1-cp39-cp39-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:3ce11ee3f23f79dbd06fb3d63e2f6af7b12db1d46932fe7bd8afa259a5996603"},
-    {file = "MarkupSafe-2.1.1-cp39-cp39-musllinux_1_1_aarch64.whl", hash = "sha256:33b74d289bd2f5e527beadcaa3f401e0df0a89927c1559c8566c066fa4248ab7"},
-    {file = "MarkupSafe-2.1.1-cp39-cp39-musllinux_1_1_i686.whl", hash = "sha256:43093fb83d8343aac0b1baa75516da6092f58f41200907ef92448ecab8825135"},
-    {file = "MarkupSafe-2.1.1-cp39-cp39-musllinux_1_1_x86_64.whl", hash = "sha256:8e3dcf21f367459434c18e71b2a9532d96547aef8a871872a5bd69a715c15f96"},
-    {file = "MarkupSafe-2.1.1-cp39-cp39-win32.whl", hash = "sha256:d4306c36ca495956b6d568d276ac11fdd9c30a36f1b6eb928070dc5360b22e1c"},
-    {file = "MarkupSafe-2.1.1-cp39-cp39-win_amd64.whl", hash = "sha256:46d00d6cfecdde84d40e572d63735ef81423ad31184100411e6e3388d405e247"},
-    {file = "MarkupSafe-2.1.1.tar.gz", hash = "sha256:7f91197cc9e48f989d12e4e6fbc46495c446636dfc81b9ccf50bb0ec74b91d4b"},
-]
+markupsafe = []
+more-itertools = []
 mypy-extensions = [
     {file = "mypy_extensions-0.4.3-py2.py3-none-any.whl", hash = "sha256:090fedd75945a69ae91ce1303b5824f428daf5a028d2f6ab8a299250a846f15d"},
     {file = "mypy_extensions-0.4.3.tar.gz", hash = "sha256:2d82818f5bb3e369420cb3c4060a7970edba416647068eb4c5343488a6c604a8"},
 ]
-nodeenv = [
-    {file = "nodeenv-1.7.0-py2.py3-none-any.whl", hash = "sha256:27083a7b96a25f2f5e1d8cb4b6317ee8aeda3bdd121394e5ac54e498028a042e"},
-    {file = "nodeenv-1.7.0.tar.gz", hash = "sha256:e0e7f7dfb85fc5394c6fe1e8fa98131a2473e04311a45afb6508f7cf1836fa2b"},
-]
+nodeenv = []
 packaging = [
     {file = "packaging-21.3-py3-none-any.whl", hash = "sha256:ef103e05f519cdc783ae24ea4e2e0f508a9c99b2d4969652eed6a2e1ea5bd522"},
     {file = "packaging-21.3.tar.gz", hash = "sha256:dd47c42927d89ab911e606518907cc2d3a1f38bbd026385970643f9c5b8ecfeb"},
 ]
-parse = [
-    {file = "parse-1.19.0.tar.gz", hash = "sha256:9ff82852bcb65d139813e2a5197627a94966245c897796760a3a2a8eb66f020b"},
-]
-pathspec = [
-    {file = "pathspec-0.10.2-py3-none-any.whl", hash = "sha256:88c2606f2c1e818b978540f73ecc908e13999c6c3a383daf3705652ae79807a5"},
-    {file = "pathspec-0.10.2.tar.gz", hash = "sha256:8f6bf73e5758fd365ef5d58ce09ac7c27d2833a8d7da51712eac6e27e35141b0"},
-]
-platformdirs = [
-    {file = "platformdirs-2.5.4-py3-none-any.whl", hash = "sha256:af0276409f9a02373d540bf8480021a048711d572745aef4b7842dad245eba10"},
-    {file = "platformdirs-2.5.4.tar.gz", hash = "sha256:1006647646d80f16130f052404c6b901e80ee4ed6bef6792e1f238a8969106f7"},
-]
+parse = []
+pathspec = []
+platformdirs = []
 pluggy = [
     {file = "pluggy-1.0.0-py2.py3-none-any.whl", hash = "sha256:74134bbf457f031a36d68416e1509f34bd5ccc019f0bcc952c7b909d06b37bd3"},
     {file = "pluggy-1.0.0.tar.gz", hash = "sha256:4224373bacce55f955a878bf9cfa763c1e360858e330072059e10bad68531159"},
 ]
-pre-commit = [
-    {file = "pre_commit-2.20.0-py2.py3-none-any.whl", hash = "sha256:51a5ba7c480ae8072ecdb6933df22d2f812dc897d5fe848778116129a681aac7"},
-    {file = "pre_commit-2.20.0.tar.gz", hash = "sha256:a978dac7bc9ec0bcee55c18a277d553b0f419d259dadb4b9418ff2d00eb43959"},
-]
+pre-commit = []
 py = [
     {file = "py-1.11.0-py2.py3-none-any.whl", hash = "sha256:607c53218732647dff4acdfcd50cb62615cedf612e72d1724fb1a0cc6405b378"},
     {file = "py-1.11.0.tar.gz", hash = "sha256:51c75c4126074b472f746a24399ad32f6053d1b34b68d2fa41e558e6f4a98719"},
@@ -878,31 +698,16 @@ pyparsing = [
     {file = "pyparsing-3.0.9-py3-none-any.whl", hash = "sha256:5026bae9a10eeaefb61dab2f09052b9f4307d44aee4eda64b309723d8d206bbc"},
     {file = "pyparsing-3.0.9.tar.gz", hash = "sha256:2b020ecf7d21b687f219b71ecad3631f644a47f01403fa1d1036b0c6416d70fb"},
 ]
-pytest = [
-    {file = "pytest-7.2.0-py3-none-any.whl", hash = "sha256:892f933d339f068883b6fd5a459f03d85bfcb355e4981e146d2c7616c21fef71"},
-    {file = "pytest-7.2.0.tar.gz", hash = "sha256:c4014eb40e10f11f355ad4e3c2fb2c6c6d1919c73f3b5a433de4708202cade59"},
-]
-pytest-cov = [
-    {file = "pytest-cov-4.0.0.tar.gz", hash = "sha256:996b79efde6433cdbd0088872dbc5fb3ed7fe1578b68cdbba634f14bb8dd0470"},
-    {file = "pytest_cov-4.0.0-py3-none-any.whl", hash = "sha256:2feb1b751d66a8bd934e5edfa2e961d11309dc37b73b0eabe73b5945fee20f6b"},
-]
-pytest-xdist = [
-    {file = "pytest-xdist-3.1.0.tar.gz", hash = "sha256:40fdb8f3544921c5dfcd486ac080ce22870e71d82ced6d2e78fa97c2addd480c"},
-    {file = "pytest_xdist-3.1.0-py3-none-any.whl", hash = "sha256:70a76f191d8a1d2d6be69fc440cdf85f3e4c03c08b520fd5dc5d338d6cf07d89"},
-]
+pytest = []
+pytest-cov = []
+pytest-xdist = []
 python-dateutil = [
     {file = "python-dateutil-2.8.2.tar.gz", hash = "sha256:0123cacc1627ae19ddf3c27a5de5bd67ee4586fbdd6440d9748f8abb483d3e86"},
     {file = "python_dateutil-2.8.2-py2.py3-none-any.whl", hash = "sha256:961d03dc3453ebbc59dbdea9e4e11c5651520a876d0f4db161e8674aae935da9"},
 ]
-python-dotenv = [
-    {file = "python-dotenv-0.21.0.tar.gz", hash = "sha256:b77d08274639e3d34145dfa6c7008e66df0f04b7be7a75fd0d5292c191d79045"},
-    {file = "python_dotenv-0.21.0-py3-none-any.whl", hash = "sha256:1684eb44636dd462b66c3ee016599815514527ad99965de77f43e0944634a7e5"},
-]
-python-slugify = [
-    {file = "python-slugify-7.0.0.tar.gz", hash = "sha256:7a0f21a39fa6c1c4bf2e5984c9b9ae944483fd10b54804cb0e23a3ccd4954f0b"},
-    {file = "python_slugify-7.0.0-py2.py3-none-any.whl", hash = "sha256:003aee64f9fd955d111549f96c4b58a3f40b9319383c70fad6277a4974bbf570"},
-]
-PyYAML = [
+python-dotenv = []
+python-slugify = []
+pyyaml = [
     {file = "PyYAML-6.0-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:d4db7c7aef085872ef65a8fd7d6d09a14ae91f691dec3e87ee5ee0539d516f53"},
     {file = "PyYAML-6.0-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:9df7ed3b3d2e0ecfe09e14741b857df43adb5a3ddadc919a2d94fbdf78fea53c"},
     {file = "PyYAML-6.0-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:77f396e6ef4c73fdc33a9157446466f1cff553d979bd00ecb64385760c6babdc"},
@@ -910,13 +715,6 @@ PyYAML = [
     {file = "PyYAML-6.0-cp310-cp310-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:f84fbc98b019fef2ee9a1cb3ce93e3187a6df0b2538a651bfb890254ba9f90b5"},
     {file = "PyYAML-6.0-cp310-cp310-win32.whl", hash = "sha256:2cd5df3de48857ed0544b34e2d40e9fac445930039f3cfe4bcc592a1f836d513"},
     {file = "PyYAML-6.0-cp310-cp310-win_amd64.whl", hash = "sha256:daf496c58a8c52083df09b80c860005194014c3698698d1a57cbcfa182142a3a"},
-    {file = "PyYAML-6.0-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:d4b0ba9512519522b118090257be113b9468d804b19d63c71dbcf4a48fa32358"},
-    {file = "PyYAML-6.0-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:81957921f441d50af23654aa6c5e5eaf9b06aba7f0a19c18a538dc7ef291c5a1"},
-    {file = "PyYAML-6.0-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:afa17f5bc4d1b10afd4466fd3a44dc0e245382deca5b3c353d8b757f9e3ecb8d"},
-    {file = "PyYAML-6.0-cp311-cp311-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:dbad0e9d368bb989f4515da330b88a057617d16b6a8245084f1b05400f24609f"},
-    {file = "PyYAML-6.0-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:432557aa2c09802be39460360ddffd48156e30721f5e8d917f01d31694216782"},
-    {file = "PyYAML-6.0-cp311-cp311-win32.whl", hash = "sha256:bfaef573a63ba8923503d27530362590ff4f576c626d86a9fed95822a8255fd7"},
-    {file = "PyYAML-6.0-cp311-cp311-win_amd64.whl", hash = "sha256:01b45c0191e6d66c470b6cf1b9531a771a83c1c4208272ead47a3ae4f2f603bf"},
     {file = "PyYAML-6.0-cp36-cp36m-macosx_10_9_x86_64.whl", hash = "sha256:897b80890765f037df3403d22bab41627ca8811ae55e9a722fd0392850ec4d86"},
     {file = "PyYAML-6.0-cp36-cp36m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:50602afada6d6cbfad699b0c7bb50d5ccffa7e46a3d738092afddc1f9758427f"},
     {file = "PyYAML-6.0-cp36-cp36m-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:48c346915c114f5fdb3ead70312bd042a953a8ce5c7106d5bfb1a5254e47da92"},
@@ -944,22 +742,12 @@ PyYAML = [
     {file = "PyYAML-6.0-cp39-cp39-win_amd64.whl", hash = "sha256:b3d267842bf12586ba6c734f89d1f5b871df0273157918b0ccefa29deb05c21c"},
     {file = "PyYAML-6.0.tar.gz", hash = "sha256:68fb519c14306fec9720a2a5b45bc9f0c8d1b9c72adf45c37baedfcd949c35a2"},
 ]
-requests = [
-    {file = "requests-2.28.1-py3-none-any.whl", hash = "sha256:8fefa2a1a1365bf5520aac41836fbee479da67864514bdb821f31ce07ce65349"},
-    {file = "requests-2.28.1.tar.gz", hash = "sha256:7c5599b102feddaa661c826c56ab4fee28bfd17f5abca1ebbe3e7f19d7c97983"},
-]
-setuptools = [
-    {file = "setuptools-65.6.3-py3-none-any.whl", hash = "sha256:57f6f22bde4e042978bcd50176fdb381d7c21a9efa4041202288d3737a0c6a54"},
-    {file = "setuptools-65.6.3.tar.gz", hash = "sha256:a7620757bf984b58deaf32fc8a4577a9bbc0850cf92c20e1ce41c38c19e5fb75"},
-]
+requests = []
 six = [
     {file = "six-1.16.0-py2.py3-none-any.whl", hash = "sha256:8abb2f1d86890a2dfb989f9a77cfcfd3e47c2a354b01111771326f8aa26e0254"},
     {file = "six-1.16.0.tar.gz", hash = "sha256:1e61c37477a1626458e36f7b1d82aa5c9b094fa4802892072e49de9c60c4c926"},
 ]
-soupsieve = [
-    {file = "soupsieve-2.3.2.post1-py3-none-any.whl", hash = "sha256:3b2503d3c7084a42b1ebd08116e5f81aadfaea95863628c80a3b774a11b7c759"},
-    {file = "soupsieve-2.3.2.post1.tar.gz", hash = "sha256:fc53893b3da2c33de295667a0e19f078c14bf86544af307354de5fcf12a3f30d"},
-]
+soupsieve = []
 text-unidecode = [
     {file = "text-unidecode-1.3.tar.gz", hash = "sha256:bad6603bb14d279193107714b288be206cac565dfa49aa5b105294dd5c4aab93"},
     {file = "text_unidecode-1.3-py2.py3-none-any.whl", hash = "sha256:1311f10e8b895935241623731c2ba64f4c455287888b18189350b67134a822e8"},
@@ -972,19 +760,7 @@ tomli = [
     {file = "tomli-2.0.1-py3-none-any.whl", hash = "sha256:939de3e7a6161af0c887ef91b7d41a53e7c5a1ca976325f429cb46ea9bc30ecc"},
     {file = "tomli-2.0.1.tar.gz", hash = "sha256:de526c12914f0c550d15924c62d72abc48d6fe7364aa87328337a31007fe8a4f"},
 ]
-tox = [
-    {file = "tox-3.27.1-py2.py3-none-any.whl", hash = "sha256:f52ca66eae115fcfef0e77ef81fd107133d295c97c52df337adedb8dfac6ab84"},
-    {file = "tox-3.27.1.tar.gz", hash = "sha256:b2a920e35a668cc06942ffd1cf3a4fb221a4d909ca72191fb6d84b0b18a7be04"},
-]
-tqdm = [
-    {file = "tqdm-4.64.1-py2.py3-none-any.whl", hash = "sha256:6fee160d6ffcd1b1c68c65f14c829c22832bc401726335ce92c52d395944a6a1"},
-    {file = "tqdm-4.64.1.tar.gz", hash = "sha256:5f4f682a004951c1b450bc753c710e9280c5746ce6ffedee253ddbcbf54cf1e4"},
-]
-urllib3 = [
-    {file = "urllib3-1.26.13-py2.py3-none-any.whl", hash = "sha256:47cc05d99aaa09c9e72ed5809b60e7ba354e64b59c9c173ac3018642d8bb41fc"},
-    {file = "urllib3-1.26.13.tar.gz", hash = "sha256:c083dd0dce68dbfbe1129d5271cb90f9447dea7d52097c6e0126120c521ddea8"},
-]
-virtualenv = [
-    {file = "virtualenv-20.17.1-py3-none-any.whl", hash = "sha256:ce3b1684d6e1a20a3e5ed36795a97dfc6af29bc3970ca8dab93e11ac6094b3c4"},
-    {file = "virtualenv-20.17.1.tar.gz", hash = "sha256:f8b927684efc6f1cc206c9db297a570ab9ad0e51c16fa9e45487d36d1905c058"},
-]
+tox = []
+tqdm = []
+urllib3 = []
+virtualenv = []
diff --git a/pyproject.toml b/pyproject.toml
index 355cb8c6..7064df21 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -13,6 +13,7 @@ requests = "^2.28.1"
 beautifulsoup4 = "^4.11.1"
 tqdm = "^4.64.0"
 parse = "^1.19.0"
+more-itertools = "^9.0.0"
 
 [tool.poetry.dev-dependencies]
 black = "^22.10"
diff --git a/src/adventofcode2022/solutions/day06.py b/src/adventofcode2022/solutions/day06.py
index 2f2c7c30..a83e2c08 100644
--- a/src/adventofcode2022/solutions/day06.py
+++ b/src/adventofcode2022/solutions/day06.py
@@ -1,3 +1,5 @@
+from more_itertools import sliding_window
+
 from adventofcode2022.utils.abstract import FileReaderSolution
 
 
@@ -5,13 +7,14 @@ class Day06:
     @staticmethod
     def parse_packets(input_data: str, length: int) -> int:
         input_data = input_data.strip()
-        for start in range(0, len(input_data)):
-            packet = input_data[start : start + length]
+        for idx, packet in enumerate(sliding_window(input_data, length)):
             if len(set(packet)) != length:
                 # Duplicated characters
                 continue
             # We have something new, return starting position + 4 chars in this packet
-            return start + length
+            return idx + length
+
+        raise ValueError("No package found for length %s", length)
 
 
 class Day06PartA(Day06, FileReaderSolution):

From aaca512aa694050933d36b130e8c96deed91b995 Mon Sep 17 00:00:00 2001
From: Roel Adriaans <roel.adriaans@asml.com>
Date: Wed, 7 Dec 2022 17:13:03 +0100
Subject: [PATCH 195/371] [WIP] Day 07

---
 .../solutions/data/day_07/day07.txt           | 986 ++++++++++++++++++
 src/adventofcode2022/solutions/day07.py       |  96 ++
 tests/solutions/test_day07_a.py               |  50 +
 tests/solutions/test_day07_b.py               |  19 +
 4 files changed, 1151 insertions(+)
 create mode 100644 src/adventofcode2022/solutions/data/day_07/day07.txt
 create mode 100644 src/adventofcode2022/solutions/day07.py
 create mode 100644 tests/solutions/test_day07_a.py
 create mode 100644 tests/solutions/test_day07_b.py

diff --git a/src/adventofcode2022/solutions/data/day_07/day07.txt b/src/adventofcode2022/solutions/data/day_07/day07.txt
new file mode 100644
index 00000000..659f8b07
--- /dev/null
+++ b/src/adventofcode2022/solutions/data/day_07/day07.txt
@@ -0,0 +1,986 @@
+$ cd /
+$ ls
+dir bnl
+dir dmpsnhdh
+272080 dncdssn.hdr
+dir fcnqg
+6067 hjpmqrq
+dir jvwtm
+dir ldztz
+dir lmmw
+dir wthvqw
+dir zpdnprb
+$ cd bnl
+$ ls
+dir dhw
+dir dmpsnhdh
+dir lmw
+dir vgbqbrst
+$ cd dhw
+$ ls
+237421 vccwmhl
+$ cd ..
+$ cd dmpsnhdh
+$ ls
+dir chf
+dir mjpbhjm
+dir zwhpwp
+$ cd chf
+$ ls
+4679 lmw.wmp
+217367 wwnfv.qqr
+dir zfgznbz
+$ cd zfgznbz
+$ ls
+179409 cnj.gdn
+171574 vglqg
+$ cd ..
+$ cd ..
+$ cd mjpbhjm
+$ ls
+dir crf
+dir hqnj
+dir lmw
+18783 lmw.rwr
+302608 twpq
+166891 vqczlg
+$ cd crf
+$ ls
+32183 dltmqht
+240428 frqqdsr.hbf
+224910 sgtnrvrt
+$ cd ..
+$ cd hqnj
+$ ls
+261723 cgstb
+77979 dmpsnhdh.cmd
+$ cd ..
+$ cd lmw
+$ ls
+50307 fcqrwd
+$ cd ..
+$ cd ..
+$ cd zwhpwp
+$ ls
+141133 gdngm.mps
+$ cd ..
+$ cd ..
+$ cd lmw
+$ ls
+dir dvv
+267473 jmqgrh.dlz
+295139 rrqjwpm
+$ cd dvv
+$ ls
+114536 gmlmbrrw.wdm
+102061 lmw
+$ cd ..
+$ cd ..
+$ cd vgbqbrst
+$ ls
+105102 dmpsnhdh.bgl
+269054 gmwgjf.fzz
+dir jbdtpnw
+245266 jzsjvgl
+216220 lmw.gtb
+dir rflp
+dir twpq
+$ cd jbdtpnw
+$ ls
+27543 cjvvmzp
+$ cd ..
+$ cd rflp
+$ ls
+137601 frqqdsr.hbf
+83444 rrqjwpm
+$ cd ..
+$ cd twpq
+$ ls
+dir rlbsdj
+36846 tnrqzjdd
+$ cd rlbsdj
+$ ls
+56078 bvndq
+$ cd ..
+$ cd ..
+$ cd ..
+$ cd ..
+$ cd dmpsnhdh
+$ ls
+dir fnpwwhtj
+dir lmw
+9090 mgjpsvl.jlh
+186374 pbb.zln
+$ cd fnpwwhtj
+$ ls
+dir cgp
+$ cd cgp
+$ ls
+81938 hjpmqrq
+281971 jvszf
+151057 wmr.bnf
+$ cd ..
+$ cd ..
+$ cd lmw
+$ ls
+dir bfbv
+56929 pbb.zln
+dir rrqjwpm
+dir sngm
+$ cd bfbv
+$ ls
+92667 qrrttb.jgp
+$ cd ..
+$ cd rrqjwpm
+$ ls
+25739 cqljn.zqw
+91325 dncdssn.hdr
+$ cd ..
+$ cd sngm
+$ ls
+282163 jgrj
+dir lmw
+237524 lmw.dff
+153497 lmw.ntg
+dir lqd
+dir szn
+143535 tvpvc.qpr
+98326 vbfgh
+$ cd lmw
+$ ls
+32484 dncdssn.hdr
+dir glwr
+$ cd glwr
+$ ls
+144719 frqqdsr.hbf
+$ cd ..
+$ cd ..
+$ cd lqd
+$ ls
+231401 dncdssn.hdr
+dir jnjqmvg
+dir lmw
+199704 rrqjwpm
+$ cd jnjqmvg
+$ ls
+104947 trpsrfjz.brg
+$ cd ..
+$ cd lmw
+$ ls
+230298 rrqjwpm.nnv
+158947 wfv.qrb
+$ cd ..
+$ cd ..
+$ cd szn
+$ ls
+197974 frqqdsr.hbf
+$ cd ..
+$ cd ..
+$ cd ..
+$ cd ..
+$ cd fcnqg
+$ ls
+251609 dncdssn.hdr
+289497 jdjmftqs
+228459 qbmthcq
+$ cd ..
+$ cd jvwtm
+$ ls
+dir dmpsnhdh
+47959 pbb.zln
+dir tlr
+dir twpq
+dir wbgcsw
+dir zjmldjdh
+$ cd dmpsnhdh
+$ ls
+247567 bnl
+102471 bnl.wdm
+80054 fhqvp.hfm
+dir llhp
+dir mnsbh
+dir mpplsfjp
+20844 mtvl.lmp
+$ cd llhp
+$ ls
+180255 dmpsnhdh
+$ cd ..
+$ cd mnsbh
+$ ls
+267627 dmpsnhdh
+$ cd ..
+$ cd mpplsfjp
+$ ls
+dir bnl
+233742 tcnpvqc.tdr
+$ cd bnl
+$ ls
+243223 fcqrwd
+$ cd ..
+$ cd ..
+$ cd ..
+$ cd tlr
+$ ls
+dir vcsngm
+dir wndmt
+$ cd vcsngm
+$ ls
+36434 czs.dnv
+$ cd ..
+$ cd wndmt
+$ ls
+dir fvmtfcqd
+dir nvdb
+dir nwqqgl
+dir sbspgnpm
+$ cd fvmtfcqd
+$ ls
+237025 nzttjt.rzh
+$ cd ..
+$ cd nvdb
+$ ls
+235328 dnrqwqtp.vfc
+51984 rhblt.mfz
+51332 rjhvhw
+$ cd ..
+$ cd nwqqgl
+$ ls
+203534 cjghw
+dir cljbrh
+$ cd cljbrh
+$ ls
+133820 lmw.dnd
+$ cd ..
+$ cd ..
+$ cd sbspgnpm
+$ ls
+270010 hjpmqrq
+$ cd ..
+$ cd ..
+$ cd ..
+$ cd twpq
+$ ls
+dir dmpsnhdh
+dir hbchdjjp
+247649 hjpmqrq
+29891 rrqjwpm
+72407 twpq.crb
+$ cd dmpsnhdh
+$ ls
+251490 dncdssn.hdr
+222231 hjpmqrq
+102058 pbb.zln
+$ cd ..
+$ cd hbchdjjp
+$ ls
+70058 dprrmd.qcd
+230958 tsdbl.bnq
+$ cd ..
+$ cd ..
+$ cd wbgcsw
+$ ls
+292028 bhtfcf
+dir bnl
+dir bqq
+dir ctnlpgt
+247888 hblhfvwj
+dir hbqm
+277949 pbb.zln
+106225 rrqjwpm
+125927 ssqpmlfb.gwm
+dir zqmjwsgz
+dir zwwphs
+$ cd bnl
+$ ls
+dir fbbr
+240500 frqqdsr.hbf
+dir mzfrdl
+25137 srqlww.mcj
+dir tqgrdz
+dir ztrnq
+$ cd fbbr
+$ ls
+84414 mjbw.dhs
+$ cd ..
+$ cd mzfrdl
+$ ls
+135647 bccwgn
+dir cjdptqgh
+dir hwdnrqns
+dir prq
+$ cd cjdptqgh
+$ ls
+147946 mdgl.drz
+11972 pbb.zln
+$ cd ..
+$ cd hwdnrqns
+$ ls
+dir dmpsnhdh
+$ cd dmpsnhdh
+$ ls
+254432 phthmn
+$ cd ..
+$ cd ..
+$ cd prq
+$ ls
+75827 dmpsnhdh.rtl
+$ cd ..
+$ cd ..
+$ cd tqgrdz
+$ ls
+251475 bjwnll.rlw
+$ cd ..
+$ cd ztrnq
+$ ls
+208497 bnl.dtr
+179376 gqnbswcj.hht
+$ cd ..
+$ cd ..
+$ cd bqq
+$ ls
+202201 bnl.lbm
+$ cd ..
+$ cd ctnlpgt
+$ ls
+269484 vsfvzrpr
+$ cd ..
+$ cd hbqm
+$ ls
+74455 bvnfz
+42748 pbb.zln
+$ cd ..
+$ cd zqmjwsgz
+$ ls
+146194 pbb.zln
+$ cd ..
+$ cd zwwphs
+$ ls
+209587 mtbzd.nwb
+$ cd ..
+$ cd ..
+$ cd zjmldjdh
+$ ls
+dir cdq
+dir mdclfbs
+dir tfc
+132043 wrm
+$ cd cdq
+$ ls
+289173 twpq.mrn
+$ cd ..
+$ cd mdclfbs
+$ ls
+64639 bnl.jwf
+dir hpdgt
+72868 hznfj.nmj
+159467 lmw.bfz
+$ cd hpdgt
+$ ls
+52760 fcqrwd
+54661 tzgt.hvh
+$ cd ..
+$ cd ..
+$ cd tfc
+$ ls
+185481 bwntlh
+18925 fcqrwd
+$ cd ..
+$ cd ..
+$ cd ..
+$ cd ldztz
+$ ls
+128430 bwz.fcz
+dir dmpsnhdh
+dir lbqgz
+dir znrnj
+$ cd dmpsnhdh
+$ ls
+238193 dncdssn.hdr
+285939 hwfngq.dpw
+$ cd ..
+$ cd lbqgz
+$ ls
+171931 vgrp
+$ cd ..
+$ cd znrnj
+$ ls
+153738 vmwwbjqd
+$ cd ..
+$ cd ..
+$ cd lmmw
+$ ls
+dir bqqnsfdj
+163303 fcqrwd
+43453 frqqdsr.hbf
+33319 hjpmqrq
+dir rlpcqtzg
+$ cd bqqnsfdj
+$ ls
+dir bnl
+2251 hjpmqrq
+14707 rrqjwpm
+dir tlnbvhdl
+$ cd bnl
+$ ls
+33357 bnl.fqp
+151237 bnl.vbs
+40294 dmpsnhdh.hwz
+76455 dncdssn.hdr
+290341 hjpmqrq
+dir lmw
+dir nqw
+$ cd lmw
+$ ls
+dir sfj
+$ cd sfj
+$ ls
+156532 fcqrwd
+$ cd ..
+$ cd ..
+$ cd nqw
+$ ls
+59928 dncdssn.hdr
+$ cd ..
+$ cd ..
+$ cd tlnbvhdl
+$ ls
+183301 hjpmqrq
+$ cd ..
+$ cd ..
+$ cd rlpcqtzg
+$ ls
+258638 dqt.mlc
+$ cd ..
+$ cd ..
+$ cd wthvqw
+$ ls
+224501 pbb.zln
+$ cd ..
+$ cd zpdnprb
+$ ls
+dir bnl
+dir ffg
+dir jljlwpsv
+212081 lrzc.lhj
+dir rrqjwpm
+dir twpq
+dir vlgsrtm
+$ cd bnl
+$ ls
+124009 hjgjf
+74860 hjpmqrq
+84996 lrdl.swf
+dir pnzmp
+$ cd pnzmp
+$ ls
+dir btbtlrs
+128636 nfzf
+$ cd btbtlrs
+$ ls
+107651 hhzbwd.wzj
+$ cd ..
+$ cd ..
+$ cd ..
+$ cd ffg
+$ ls
+57918 jwzbs.tnt
+$ cd ..
+$ cd jljlwpsv
+$ ls
+188175 dmpsnhdh.nnb
+46693 fcqrwd
+111557 pbb.zln
+$ cd ..
+$ cd rrqjwpm
+$ ls
+dir bftw
+dir ccsfws
+87225 mccw
+290654 pbb.zln
+147394 twzqc.pbz
+52983 wsvgf
+dir wwfgbzqh
+$ cd bftw
+$ ls
+dir brl
+167154 crs
+dir lmw
+dir rrqjwpm
+dir twpq
+174963 twpq.wjl
+dir vnfhb
+dir wcldzp
+$ cd brl
+$ ls
+297937 wspcnp
+$ cd ..
+$ cd lmw
+$ ls
+166695 mcjql.jrv
+$ cd ..
+$ cd rrqjwpm
+$ ls
+198762 mwn
+$ cd ..
+$ cd twpq
+$ ls
+141835 jlwf.hcd
+$ cd ..
+$ cd vnfhb
+$ ls
+128626 tvmwhq.wfn
+$ cd ..
+$ cd wcldzp
+$ ls
+dir ncq
+dir twpq
+$ cd ncq
+$ ls
+dir wrtw
+$ cd wrtw
+$ ls
+133331 fcqrwd
+$ cd ..
+$ cd ..
+$ cd twpq
+$ ls
+151811 fcqrwd
+$ cd ..
+$ cd ..
+$ cd ..
+$ cd ccsfws
+$ ls
+100548 twpq.ppm
+$ cd ..
+$ cd wwfgbzqh
+$ ls
+dir lmw
+dir mfms
+dir pjbjgbcl
+204154 qtflzwm
+226500 vdmjj.htj
+dir wzqbwr
+$ cd lmw
+$ ls
+dir bgl
+95150 dncdssn.hdr
+119653 frqqdsr.hbf
+97941 hjpmqrq
+dir jqthwzj
+$ cd bgl
+$ ls
+dir lmw
+dir rrqjwpm
+$ cd lmw
+$ ls
+233655 wmdldvbz
+$ cd ..
+$ cd rrqjwpm
+$ ls
+242918 frqqdsr.hbf
+227581 hjpmqrq
+dir hsvnmlp
+dir nsch
+25524 pbb.zln
+dir qlgg
+dir twpq
+67453 twpq.fms
+$ cd hsvnmlp
+$ ls
+264517 pbb.zln
+$ cd ..
+$ cd nsch
+$ ls
+7898 cmsdzh
+233270 dmpsnhdh.bsq
+101256 frl
+133902 jzvh.vdv
+dir lmw
+dir sgjsg
+130245 wcftvft
+$ cd lmw
+$ ls
+69572 bnjnc.csp
+$ cd ..
+$ cd sgjsg
+$ ls
+38856 tnzpz.tbq
+$ cd ..
+$ cd ..
+$ cd qlgg
+$ ls
+276013 frbstg.pzb
+$ cd ..
+$ cd twpq
+$ ls
+136454 fhwz.bqb
+94099 rglp
+114026 tsrt.cbd
+26252 zhclpzm.rqf
+$ cd ..
+$ cd ..
+$ cd ..
+$ cd jqthwzj
+$ ls
+128200 lmw.btl
+$ cd ..
+$ cd ..
+$ cd mfms
+$ ls
+274935 dmpsnhdh
+76547 lchwq.dsd
+215701 pbb.zln
+dir rmwtvjt
+$ cd rmwtvjt
+$ ls
+74490 hjpmqrq
+$ cd ..
+$ cd ..
+$ cd pjbjgbcl
+$ ls
+231757 cjcpwwc.wbf
+dir cswvftzs
+dir jtvtg
+dir lmw
+dir tnctbjr
+dir tqsrfhdr
+$ cd cswvftzs
+$ ls
+dir dchqnbns
+dir smf
+$ cd dchqnbns
+$ ls
+94111 szl.hqs
+$ cd ..
+$ cd smf
+$ ls
+dir dlnsgvl
+dir zglt
+$ cd dlnsgvl
+$ ls
+dir dsz
+$ cd dsz
+$ ls
+156473 hjpmqrq
+$ cd ..
+$ cd ..
+$ cd zglt
+$ ls
+295383 frgg.sdp
+$ cd ..
+$ cd ..
+$ cd ..
+$ cd jtvtg
+$ ls
+202254 bftv.rqb
+58419 lmw
+$ cd ..
+$ cd lmw
+$ ls
+8097 fcqrwd
+$ cd ..
+$ cd tnctbjr
+$ ls
+250830 frqqdsr.hbf
+dir gzrcqr
+$ cd gzrcqr
+$ ls
+dir fnzgsnv
+$ cd fnzgsnv
+$ ls
+117215 hjpmqrq
+$ cd ..
+$ cd ..
+$ cd ..
+$ cd tqsrfhdr
+$ ls
+96381 lmw
+$ cd ..
+$ cd ..
+$ cd wzqbwr
+$ ls
+149066 dmpsnhdh.vnd
+dir dpbcgfdr
+dir swp
+14495 twpq.gsb
+dir zhj
+$ cd dpbcgfdr
+$ ls
+12909 dmpsnhdh
+dir jvn
+173491 mnhpr.lpr
+222018 rfqfjmd.jqq
+205077 wbbdrpr.hzj
+dir wzpbbbhm
+$ cd jvn
+$ ls
+117656 vqddrqlq.nfd
+233109 vqqvh.swz
+$ cd ..
+$ cd wzpbbbhm
+$ ls
+143534 pbb.zln
+$ cd ..
+$ cd ..
+$ cd swp
+$ ls
+131295 pbb.zln
+$ cd ..
+$ cd zhj
+$ ls
+166268 pbb.zln
+33734 rrqjwpm.blg
+$ cd ..
+$ cd ..
+$ cd ..
+$ cd ..
+$ cd twpq
+$ ls
+dir bppvlwqs
+dir bvh
+dir rmcdr
+dir tdn
+2230 whb.lfb
+dir wwtwnvh
+$ cd bppvlwqs
+$ ls
+195026 hvlhgsw
+279259 rrqjwpm
+$ cd ..
+$ cd bvh
+$ ls
+dir lmw
+$ cd lmw
+$ ls
+66958 pdqnd
+$ cd ..
+$ cd ..
+$ cd rmcdr
+$ ls
+dir dmpsnhdh
+182930 grj
+dir pmrdhrth
+119725 qpcqclqh
+77890 sjgfjz
+142855 twpq
+dir zbmcrvbh
+$ cd dmpsnhdh
+$ ls
+dir rrqjwpm
+188474 zgjzpbl.vgv
+$ cd rrqjwpm
+$ ls
+dir bnl
+dir lmw
+7598 vsntvs.pdv
+$ cd bnl
+$ ls
+245600 lmw.mgf
+$ cd ..
+$ cd lmw
+$ ls
+73396 hjpmqrq
+$ cd ..
+$ cd ..
+$ cd ..
+$ cd pmrdhrth
+$ ls
+173155 rrqjwpm.pjw
+178530 smgpzs.qtj
+$ cd ..
+$ cd zbmcrvbh
+$ ls
+124201 fcqrwd
+135578 hjpmqrq
+54356 hnztplsp.qlh
+dir lmw
+58350 pbb.zln
+dir qfrvdm
+dir rcg
+15267 rwbzjpt.djn
+$ cd lmw
+$ ls
+dir bbbll
+28362 bfgfwlf.wvg
+229637 dmpndms.fln
+146121 dncdssn.hdr
+131039 frqqdsr.hbf
+152805 hjpmqrq
+dir mlz
+$ cd bbbll
+$ ls
+169940 dncdssn.hdr
+216888 pbb.zln
+248369 tjpmlr.vmf
+$ cd ..
+$ cd mlz
+$ ls
+115167 bhfv.fts
+$ cd ..
+$ cd ..
+$ cd qfrvdm
+$ ls
+284564 pbb.zln
+$ cd ..
+$ cd rcg
+$ ls
+dir sqzjz
+$ cd sqzjz
+$ ls
+116435 jrstpcpl.zsq
+$ cd ..
+$ cd ..
+$ cd ..
+$ cd ..
+$ cd tdn
+$ ls
+143971 cmg
+133317 fcqrwd
+dir pstpclp
+133161 tddv
+$ cd pstpclp
+$ ls
+267351 hjpmqrq
+86930 rrqjwpm.dvl
+$ cd ..
+$ cd ..
+$ cd wwtwnvh
+$ ls
+256584 frqqdsr.hbf
+114564 twpq.wrd
+$ cd ..
+$ cd ..
+$ cd vlgsrtm
+$ ls
+148089 bnl.jzj
+119796 cjfphsfw.hnd
+197668 cpw
+dir dmpsnhdh
+dir fjsglr
+dir lmw
+dir lqgrft
+9231 pltdltrs
+dir rmdp
+109777 rncfff.fll
+dir vgjzqjpq
+dir ztnqnfnq
+$ cd dmpsnhdh
+$ ls
+dir lltnrdtv
+dir scthsg
+$ cd lltnrdtv
+$ ls
+179511 pcvmpz
+90913 tbr
+$ cd ..
+$ cd scthsg
+$ ls
+dir rrqjwpm
+$ cd rrqjwpm
+$ ls
+188629 fcqrwd
+$ cd ..
+$ cd ..
+$ cd ..
+$ cd fjsglr
+$ ls
+139754 fcqrwd
+dir pnsjwfzc
+$ cd pnsjwfzc
+$ ls
+113848 lmw
+$ cd ..
+$ cd ..
+$ cd lmw
+$ ls
+54999 dmpsnhdh
+dir ffhcf
+251476 frqqdsr.hbf
+dir jpgqspqw
+198972 nhfclq.pbh
+180380 nqmjnvc.fvr
+dir pfsjwmbc
+213768 rcvccgcd
+$ cd ffhcf
+$ ls
+40478 svmwstq.sjj
+$ cd ..
+$ cd jpgqspqw
+$ ls
+22181 hjpmqrq
+$ cd ..
+$ cd pfsjwmbc
+$ ls
+dir bcvchw
+$ cd bcvchw
+$ ls
+225892 bnl.nwc
+$ cd ..
+$ cd ..
+$ cd ..
+$ cd lqgrft
+$ ls
+dir rrqjwpm
+dir twpq
+$ cd rrqjwpm
+$ ls
+54786 fcqrwd
+3053 tthhqjm.ntd
+$ cd ..
+$ cd twpq
+$ ls
+109355 bnl
+dir lmw
+dir mhgqt
+301291 rrqjwpm.lrm
+271233 twpq.srp
+$ cd lmw
+$ ls
+dir lmw
+dir lngbszqm
+$ cd lmw
+$ ls
+139640 pbb.zln
+$ cd ..
+$ cd lngbszqm
+$ ls
+98279 mqvq.gsj
+283599 rvjd.dvt
+$ cd ..
+$ cd ..
+$ cd mhgqt
+$ ls
+208165 fcqrwd
+$ cd ..
+$ cd ..
+$ cd ..
+$ cd rmdp
+$ ls
+dir bqn
+170956 fcqrwd
+90954 snnttp.gld
+$ cd bqn
+$ ls
+75628 hdrgbrpc
+$ cd ..
+$ cd ..
+$ cd vgjzqjpq
+$ ls
+dir bnl
+dir wpfw
+$ cd bnl
+$ ls
+25911 pbb.zln
+$ cd ..
+$ cd wpfw
+$ ls
+247784 bzll.ltc
+$ cd ..
+$ cd ..
+$ cd ztnqnfnq
+$ ls
+dir dtpzsrfc
+214055 srgzhp.nlr
+$ cd dtpzsrfc
+$ ls
+142652 bhgwj
diff --git a/src/adventofcode2022/solutions/day07.py b/src/adventofcode2022/solutions/day07.py
new file mode 100644
index 00000000..4fd62c93
--- /dev/null
+++ b/src/adventofcode2022/solutions/day07.py
@@ -0,0 +1,96 @@
+from __future__ import annotations
+
+from enum import Enum
+
+from adventofcode2022.utils.abstract import FileReaderSolution
+
+
+class Type(str, Enum):
+    root = "root"
+    file = "file"
+    directory = "directory"
+
+
+class Node:
+    name: str
+    node_type: Type
+    size: int | None
+    contains: list[Node]
+    parent: Node | None
+
+    def __init__(self, name, node_type: Type, size=0, parent=None):
+        self.name = name
+        self.node_type = node_type
+        self.size = size
+        self.contains = []
+        self.parent = parent
+
+    def __repr__(self):
+        return (
+            f"Node-{self.node_type}({self.name}, {self.size=}, "
+            f"Content: {';'.join(repr(child) for child in self.contains)})"
+        )
+
+    def add_subdirectory(self, name) -> Node:
+        """Create a new subdirectory, add it to the list of folders and return it"""
+        new_dir = Node(name=name, node_type=Type.directory, parent=self)
+        self.contains.append(new_dir)
+
+        return new_dir
+
+    def add_file(self, name: str, size: int) -> Node:
+        """Create a new file in this subdirectory"""
+        new_file = Node(name=name, node_type=Type.file, size=size, parent=self)
+        self.contains.append(new_file)
+        return new_file
+
+    def find_subdirectory(self, name) -> Node:
+        """Find a subdirectory in this node"""
+        for node in self.contains:
+            if node.name == name and node.node_type == Type.directory:
+                return node
+        raise KeyError("%s not found!", name)
+
+    def total_size(self) -> int:
+        if self.node_type == Type.file:
+            return self.size
+        else:
+            return sum(item.size for item in self.contains)
+
+
+class Day07:
+    def parse_input(self, input_data: str) -> Node:
+        """Parse the input data and return the root node"""
+        root_node = Node(name="root", node_type=Type.root)
+        current_folder = root_node
+        for line in input_data.splitlines():
+            parts = line.split()
+
+            if line == "$ cd /":
+                current_folder = root_node
+            elif parts[0] == "$" and parts[1] == "cd" and parts[2] != "..":
+                # Going into a directory
+                current_folder = current_folder.find_subdirectory(parts[2])
+            elif parts[0] == "$" and parts[1] == "cd" and parts[2] == "..":
+                # Going up
+                current_folder = current_folder.parent
+            elif parts[0] == "$" and parts[1] == "ls":
+                continue
+            elif parts[0] == "dir":
+                current_folder.add_subdirectory(parts[1])
+            else:
+                # This must be a file
+                current_folder.add_file(name=parts[1], size=int(parts[0]))
+
+        return root_node
+
+
+class Day07PartA(Day07, FileReaderSolution):
+    def solve(self, input_data: str) -> int:
+        root_node = self.parse_input(input_data)
+        return -1
+
+
+class Day07PartB(Day07, FileReaderSolution):
+    def solve(self, input_data: str) -> int:
+        raise NotImplementedError
diff --git a/tests/solutions/test_day07_a.py b/tests/solutions/test_day07_a.py
new file mode 100644
index 00000000..0e62d67b
--- /dev/null
+++ b/tests/solutions/test_day07_a.py
@@ -0,0 +1,50 @@
+from textwrap import dedent
+
+import pytest
+
+from adventofcode2022.solutions.day07 import Day07PartA
+
+
+class TestDay07PartA:
+    test_data = """\
+    $ cd /
+    $ ls
+    dir a
+    14848514 b.txt
+    8504156 c.dat
+    dir d
+    $ cd a
+    $ ls
+    dir e
+    29116 f
+    2557 g
+    62596 h.lst
+    $ cd e
+    $ ls
+    584 i
+    $ cd ..
+    $ cd ..
+    $ cd d
+    $ ls
+    4060174 j
+    8033020 d.log
+    5626152 d.ext
+    7214296 k
+    """
+
+    def test_day07(self):
+        solution = Day07PartA()
+        root_node = solution.parse_input(dedent(self.test_data))
+        assert root_node.total_size() == 48381165
+
+    def test_day07a_solve(self):
+        solution = Day07PartA()
+        result = solution.solve(dedent(self.test_data))
+        assert result == 95437
+
+    @pytest.mark.xfail(reason="Not yet implemented", raises=NotImplementedError)
+    def test_day07a_data(self):
+        """Result we got when we did the real solution"""
+        solution = Day07PartA()
+        res = solution("day_07/day07.txt")
+        assert res == 0
diff --git a/tests/solutions/test_day07_b.py b/tests/solutions/test_day07_b.py
new file mode 100644
index 00000000..f14b7086
--- /dev/null
+++ b/tests/solutions/test_day07_b.py
@@ -0,0 +1,19 @@
+import pytest
+
+from adventofcode2022.solutions.day07 import Day07PartB
+
+
+class TestDay07PartB:
+    @pytest.mark.xfail(reason="Not yet implemented", raises=NotImplementedError)
+    @pytest.mark.parametrize(("input_data", "expected_result"), [("", ""), ("", "")])
+    def test_day07b_solve(self, input_data, expected_result):
+        solution = Day07PartB()
+        result = solution.solve(input_data)
+        assert result == expected_result
+
+    @pytest.mark.xfail(reason="Not yet implemented", raises=NotImplementedError)
+    def test_day07b_data(self):
+        """Result we got when we did the real solution"""
+        solution = Day07PartB()
+        res = solution("day_07/day07.txt")
+        assert res == 0

From 6422bc86ebbb64f76e0ea0a5e1745441ee4eaaa0 Mon Sep 17 00:00:00 2001
From: Roel Adriaans <roel.adriaans@ordina.nl>
Date: Wed, 7 Dec 2022 19:28:22 +0100
Subject: [PATCH 196/371] Implement part 2

---
 src/adventofcode2022/solutions/day07.py | 61 +++++++++++++++++++++++--
 tests/solutions/test_day07_a.py         |  3 +-
 tests/solutions/test_day07_b.py         | 39 ++++++++++++----
 3 files changed, 89 insertions(+), 14 deletions(-)

diff --git a/src/adventofcode2022/solutions/day07.py b/src/adventofcode2022/solutions/day07.py
index 4fd62c93..d810ba50 100644
--- a/src/adventofcode2022/solutions/day07.py
+++ b/src/adventofcode2022/solutions/day07.py
@@ -1,9 +1,13 @@
 from __future__ import annotations
 
+import logging
+from collections import Counter
 from enum import Enum
 
 from adventofcode2022.utils.abstract import FileReaderSolution
 
+logger = logging.getLogger(__name__)
+
 
 class Type(str, Enum):
     root = "root"
@@ -55,13 +59,13 @@ def total_size(self) -> int:
         if self.node_type == Type.file:
             return self.size
         else:
-            return sum(item.size for item in self.contains)
+            return sum(item.total_size() for item in self.contains)
 
 
 class Day07:
     def parse_input(self, input_data: str) -> Node:
         """Parse the input data and return the root node"""
-        root_node = Node(name="root", node_type=Type.root)
+        root_node = Node(name="/", node_type=Type.root)
         current_folder = root_node
         for line in input_data.splitlines():
             parts = line.split()
@@ -86,11 +90,60 @@ def parse_input(self, input_data: str) -> Node:
 
 
 class Day07PartA(Day07, FileReaderSolution):
+    @staticmethod
+    def calculate_directory_size(root_node) -> int:
+        to_check: list[Node] = [root_node]
+        total = 0
+        while to_check:
+            node = to_check.pop()
+            logger.info(f"Checking node {node.name}")
+            for child in node.contains:
+                if child.node_type == Type.directory:
+                    to_check.append(child)
+
+            if node.total_size() <= 100000:
+                total += node.total_size()
+
+        return total
+
     def solve(self, input_data: str) -> int:
+        logger.info("Start parsing")
         root_node = self.parse_input(input_data)
-        return -1
+        logger.info("Parsing done")
+
+        return self.calculate_directory_size(root_node)
 
 
 class Day07PartB(Day07, FileReaderSolution):
+    def calculate_directory_sizes(self, root_node:Node)->dict[str, int]:
+        to_check: list[Node] = [root_node]
+        dir_sizes = {}
+
+        while to_check:
+            node = to_check.pop()
+            logger.info(f"Checking node {node.name}")
+            for child in node.contains:
+                if child.node_type == Type.directory:
+                    to_check.append(child)
+            dir_sizes[node.name] = node.total_size()
+
+        return dir_sizes
+
+
     def solve(self, input_data: str) -> int:
-        raise NotImplementedError
+        logger.info("Start parsing")
+        root_node = self.parse_input(input_data)
+        logger.info("Parsing done")
+
+        sizes = self.calculate_directory_sizes(root_node)
+        sorted_sizes = dict(sorted(sizes.items(), key=lambda item: item[1]))
+        total_size = 70_000_000
+        required_free_space = 30_000_000
+        total_used = sizes["/"]
+        unused = total_size - total_used
+        # We have `unused` unused free space, we need required_free_space;
+        still_required = required_free_space - unused
+        for name, size in sorted_sizes.items():
+            if size > still_required:
+                return size
+        return -1
\ No newline at end of file
diff --git a/tests/solutions/test_day07_a.py b/tests/solutions/test_day07_a.py
index 0e62d67b..71513f20 100644
--- a/tests/solutions/test_day07_a.py
+++ b/tests/solutions/test_day07_a.py
@@ -42,9 +42,8 @@ def test_day07a_solve(self):
         result = solution.solve(dedent(self.test_data))
         assert result == 95437
 
-    @pytest.mark.xfail(reason="Not yet implemented", raises=NotImplementedError)
     def test_day07a_data(self):
         """Result we got when we did the real solution"""
         solution = Day07PartA()
         res = solution("day_07/day07.txt")
-        assert res == 0
+        assert res == 1444896
diff --git a/tests/solutions/test_day07_b.py b/tests/solutions/test_day07_b.py
index f14b7086..06ee0e3c 100644
--- a/tests/solutions/test_day07_b.py
+++ b/tests/solutions/test_day07_b.py
@@ -1,19 +1,42 @@
-import pytest
+from textwrap import dedent
 
 from adventofcode2022.solutions.day07 import Day07PartB
 
 
 class TestDay07PartB:
-    @pytest.mark.xfail(reason="Not yet implemented", raises=NotImplementedError)
-    @pytest.mark.parametrize(("input_data", "expected_result"), [("", ""), ("", "")])
-    def test_day07b_solve(self, input_data, expected_result):
+    test_data = """\
+    $ cd /
+    $ ls
+    dir a
+    14848514 b.txt
+    8504156 c.dat
+    dir d
+    $ cd a
+    $ ls
+    dir e
+    29116 f
+    2557 g
+    62596 h.lst
+    $ cd e
+    $ ls
+    584 i
+    $ cd ..
+    $ cd ..
+    $ cd d
+    $ ls
+    4060174 j
+    8033020 d.log
+    5626152 d.ext
+    7214296 k
+    """
+
+    def test_day07b_solve(self):
         solution = Day07PartB()
-        result = solution.solve(input_data)
-        assert result == expected_result
+        result = solution.solve(dedent(self.test_data))
+        assert result == 24933642
 
-    @pytest.mark.xfail(reason="Not yet implemented", raises=NotImplementedError)
     def test_day07b_data(self):
         """Result we got when we did the real solution"""
         solution = Day07PartB()
         res = solution("day_07/day07.txt")
-        assert res == 0
+        assert res == 404395

From 9fdd00baf3862b68746a4c856b9307df90b90498 Mon Sep 17 00:00:00 2001
From: Roel Adriaans <roel.adriaans@ordina.nl>
Date: Wed, 7 Dec 2022 19:41:01 +0100
Subject: [PATCH 197/371] Use Counter to remove a weird sort, typing fix

---
 src/adventofcode2022/solutions/day07.py | 14 ++++++--------
 tests/solutions/test_day07_a.py         |  2 --
 2 files changed, 6 insertions(+), 10 deletions(-)

diff --git a/src/adventofcode2022/solutions/day07.py b/src/adventofcode2022/solutions/day07.py
index d810ba50..f9540c41 100644
--- a/src/adventofcode2022/solutions/day07.py
+++ b/src/adventofcode2022/solutions/day07.py
@@ -18,9 +18,9 @@ class Type(str, Enum):
 class Node:
     name: str
     node_type: Type
-    size: int | None
+    size: int
     contains: list[Node]
-    parent: Node | None
+    parent: Node
 
     def __init__(self, name, node_type: Type, size=0, parent=None):
         self.name = name
@@ -115,9 +115,9 @@ def solve(self, input_data: str) -> int:
 
 
 class Day07PartB(Day07, FileReaderSolution):
-    def calculate_directory_sizes(self, root_node:Node)->dict[str, int]:
+    def calculate_directory_sizes(self, root_node: Node) -> Counter[str]:
         to_check: list[Node] = [root_node]
-        dir_sizes = {}
+        dir_sizes: Counter[str] = Counter()
 
         while to_check:
             node = to_check.pop()
@@ -129,21 +129,19 @@ def calculate_directory_sizes(self, root_node:Node)->dict[str, int]:
 
         return dir_sizes
 
-
     def solve(self, input_data: str) -> int:
         logger.info("Start parsing")
         root_node = self.parse_input(input_data)
         logger.info("Parsing done")
 
         sizes = self.calculate_directory_sizes(root_node)
-        sorted_sizes = dict(sorted(sizes.items(), key=lambda item: item[1]))
         total_size = 70_000_000
         required_free_space = 30_000_000
         total_used = sizes["/"]
         unused = total_size - total_used
         # We have `unused` unused free space, we need required_free_space;
         still_required = required_free_space - unused
-        for name, size in sorted_sizes.items():
+        for name, size in reversed(sizes.most_common()):
             if size > still_required:
                 return size
-        return -1
\ No newline at end of file
+        return -1
diff --git a/tests/solutions/test_day07_a.py b/tests/solutions/test_day07_a.py
index 71513f20..68f449f1 100644
--- a/tests/solutions/test_day07_a.py
+++ b/tests/solutions/test_day07_a.py
@@ -1,7 +1,5 @@
 from textwrap import dedent
 
-import pytest
-
 from adventofcode2022.solutions.day07 import Day07PartA
 
 

From e54752e9902622b381908db1238166015785c1db Mon Sep 17 00:00:00 2001
From: Roel Adriaans <roel.adriaans@ordina.nl>
Date: Thu, 8 Dec 2022 07:57:36 +0100
Subject: [PATCH 198/371] Add points

---
 src/adventofcode2022/utils/point.py | 25 +++++++++++
 tests/test_point.py                 | 66 +++++++++++++++++++++++++++++
 2 files changed, 91 insertions(+)
 create mode 100644 src/adventofcode2022/utils/point.py
 create mode 100644 tests/test_point.py

diff --git a/src/adventofcode2022/utils/point.py b/src/adventofcode2022/utils/point.py
new file mode 100644
index 00000000..445e2322
--- /dev/null
+++ b/src/adventofcode2022/utils/point.py
@@ -0,0 +1,25 @@
+from typing import NamedTuple
+
+
+class XYZPoint(NamedTuple):
+    x: int
+    y: int
+    z: int
+
+    def __add__(self, other):
+        if not issubclass(type(other), XYZPoint):
+            raise ValueError("Cannot add incompatible types together")
+        return XYZPoint(x=self.x + other.x, y=self.y + other.y, z=self.z + other.z)
+
+    def distance(self, other):
+        return abs(self.x - other.x) + abs(self.y - other.y) + abs(self.z - other.z)
+
+
+class XYPoint(NamedTuple):
+    x: int
+    y: int
+
+    def __add__(self, other):
+        if not issubclass(type(other), XYPoint):
+            raise ValueError("Cannot add incompatible types together")
+        return XYPoint(x=self.x + other.x, y=self.y + other.y)
diff --git a/tests/test_point.py b/tests/test_point.py
new file mode 100644
index 00000000..08a860f6
--- /dev/null
+++ b/tests/test_point.py
@@ -0,0 +1,66 @@
+import pytest
+
+from adventofcode2022.utils import point
+
+
+def test_xyzpoint():
+    p1 = point.XYZPoint(1, 2, 3)
+    assert p1.x == 1
+    assert p1.y == 2
+    assert p1.z == 3
+
+    assert repr(p1) == "XYZPoint(x=1, y=2, z=3)"
+
+    p2 = point.XYZPoint(6, 7, 8)
+
+    total = p1 + p2
+    assert total.x == 7
+    assert total.y == 9
+    assert total.z == 11
+
+    p1_same = point.XYZPoint(1, 2, 3)
+    assert p1 == p1_same
+    assert p1 != p2
+
+    # Since it's a named tuple, we can also get the values from it:
+    x, y, z = p1
+    assert x == 1
+    assert y == 2
+    assert z == 3
+
+
+def test_xyzdistance():
+    p1 = point.XYZPoint(1105, -1205, 1229)
+    p2 = point.XYZPoint(-92, -2380, -20)
+
+    assert p1.distance(p2) == 3621
+
+
+def test_xypoint():
+    p1 = point.XYPoint(1, 2)
+    assert p1.x == 1
+    assert p1.y == 2
+
+    assert repr(p1) == "XYPoint(x=1, y=2)"
+
+    p2 = point.XYPoint(6, 7)
+
+    total = p1 + p2
+    assert total.x == 7
+    assert total.y == 9
+
+    p1_same = point.XYPoint(1, 2)
+    assert p1 == p1_same
+    assert p1 != p2
+
+
+def test_invalid_together():
+    xy = point.XYPoint(1, 2)
+    xyz = point.XYZPoint(6, 7, 8)
+
+    with pytest.raises(ValueError):
+        xyz + xy
+    with pytest.raises(ValueError):
+        xy + xyz
+
+    assert xy != xyz

From 02a78b02d4a80562514e1a563c7d3e20a01b9e85 Mon Sep 17 00:00:00 2001
From: Roel Adriaans <roel.adriaans@asml.com>
Date: Thu, 8 Dec 2022 09:01:17 +0100
Subject: [PATCH 199/371] Print some output

---
 src/adventofcode2022/main.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/adventofcode2022/main.py b/src/adventofcode2022/main.py
index 68062cb5..6467065e 100644
--- a/src/adventofcode2022/main.py
+++ b/src/adventofcode2022/main.py
@@ -171,6 +171,8 @@ def download_input_data(year: str, day: str):
         f.write(r.content)
 
     logger.info(f"Input data writen to {filename}")
+    print("First lines:")
+    print(r.content.decode("utf-8")[:300])
 
 
 def run_solution(day, timeit_, part, submit):

From 912c001ad42c1a016db23f1d9710531e4e49bc94 Mon Sep 17 00:00:00 2001
From: Roel Adriaans <roel.adriaans@asml.com>
Date: Thu, 8 Dec 2022 09:50:07 +0100
Subject: [PATCH 200/371] Day 8, part a, verbose

---
 .../solutions/data/day_08/day08.txt           | 99 +++++++++++++++++++
 src/adventofcode2022/solutions/day08.py       | 74 ++++++++++++++
 tests/solutions/test_day08_a.py               | 40 ++++++++
 tests/solutions/test_day08_b.py               | 19 ++++
 4 files changed, 232 insertions(+)
 create mode 100644 src/adventofcode2022/solutions/data/day_08/day08.txt
 create mode 100644 src/adventofcode2022/solutions/day08.py
 create mode 100644 tests/solutions/test_day08_a.py
 create mode 100644 tests/solutions/test_day08_b.py

diff --git a/src/adventofcode2022/solutions/data/day_08/day08.txt b/src/adventofcode2022/solutions/data/day_08/day08.txt
new file mode 100644
index 00000000..4a5b0fef
--- /dev/null
+++ b/src/adventofcode2022/solutions/data/day_08/day08.txt
@@ -0,0 +1,99 @@
+000110211310120301121312200301013204213433321324454125534120411314221421432204213123312010120220212
+020012220322312203320423330100141123432232555552131513413333243201041414120414404222300212031212210
+012220223030033030244430211234220045555352514254335343332514243345202201013120303123003031322301122
+122212123203002004034001203313232515112543525251445353434224414533524014020242242322320223010131111
+221102333103333221411324203034235135343455415425134251221521352512445343444242410343133031022213111
+012230110220232130043321130142424543415542352534155145434324432553532253510101043422110311302133322
+121211332110331222432012225134422432341112144421535153351545122134242232152130110334114400332212301
+021003020222222304114022552315552411255554221162455263643351112333322235214353424140101110301013303
+211101331332303134320025235254523341134225246335554356533426415514344521433235223100024100322012213
+333121033001133202211331144545334545442426462335662255342342626524313432432255113203322322002312200
+010322322141333044304115552115413253563353625666244464226452656243424545525555553333333441121311231
+032330304041422420432124324244236264255242536445626642464646454324353143112245143242140134012131113
+113222323414023431235314252222246225364232452564335525523344525664226653522112244131121334130320322
+121002342323322351314412423235433523643565644552335525522462425253643354453342113152132444223043001
+303334322134140123154241513636446642663346536533667552624355222224332425555525121255313000110224301
+220002230431013514545542433426226364623335746773567356566543235364324426533313525143244100121033121
+000021230222223532342154546526322562455734556753354636566447345465225625536633243334425112234211423
+100240131421551532143146364665353436655665676767645757767765365733656436442643144352144332403323231
+231322213332442222125662224633422364634335777574764763343776757435645252662432644231412254011230044
+120320134105242421434423353553635756666465645446464476746533434474737333355643266531333324433212400
+040301032133333254244335264252755376435754666436667554445363634375377335452223443455551432333010144
+122213043542434415443363356663454534757746355453573654756377543673443533255466446625122132310014334
+404243133333412213345434336533364653576735676667576876848337555643553537554265552455111211141430132
+443341301142235415336322424546477554637688787745866488887577434344636437734332223546335121555322312
+010101032453544354452355447644336446437444776676584487868688446743777537543333245666541212524431033
+130342114125121245655353346445355733446776587588784546588474685553536367574445523434254125522412333
+201242125553223436463223777745535566487874456667845657466784588644655657455355352552555444112241410
+234243354255336642454256767534444878687668756444875858587854778474484437455656353656253411335452400
+314411514514125254223353563444477554768588585448654748855456656667558676453446723446433551542333323
+320425133145356325256655577477467888556845884576957768675647786647464447677575756555366251552252023
+402024545131232242524557435777674845786545558766585956759687647846545584454443736545244555225513404
+221122211244626363325464534767668748756767978988996968588875755867566656577763547532353323245443324
+241532435425235552535674564444576465866975867987658575886697775645646467874734565535246546512244511
+003324252512442566553463345787864877859757886699855979689556865965885747456343365533654353244413223
+212315155352232566544737454548674574998798699555866589956966599795788486474536636336336342425134412
+415441242523246256336374766665674457785867567956675565789686897696764587674446666642422423644424325
+003554554162525244354667375865755578679858897996697678587867758755877644755534673566366364215111142
+125233324364265264545556378688676958976975966767698999896779575577774547466453456456443363332524521
+133515233335323373765654467667486986756665797876767877886899897979969475847765767637544446523515551
+423321431443554355375376748446757899656688998798978687676986796699688855776746674753723255464344423
+135533214666522656775554775567665797957679899988997898976779768787598768878445373375735633533152423
+424233114545442654745646856857767575855668667669968786879669768579688844877458655735443652256255431
+122311356255465443775736754747756597959866677969777897778796669799996864878444747533472262262432453
+444412515423634374457557568574698568569796689667999968899788697787968667768664344766546653236143151
+152311513646633365333568844555559779697686687699777998989779788768756594585758837374575424224211225
+432411444656462746443756865787956975798986999787977978996987778795768586656655473453364365634145515
+512553242524235344467755668868885977997876879978998878787888776866887566586456466377353633526612112
+115351124324666765477575484768566785899876668997898988879879687896986577677786744336653645225533134
+521325356522544377445774755666867759866698988779997998778687879779588576866784766376455535443334445
+433451166554445354353554886675567598968878879979777887878988976979689787756548837435743345242455141
+251112342434644676347767747746557587886869778877788877789787767787779598548856756754774536542212331
+255533535452264557543768667886686886969966689777797988888776799775755889645756557644656535253352415
+324425154344254736457678866646677886667896679787789878898879666995998757877665757356457366362624453
+133124434355236446553476678549686757888986787979777777777688968798699766877778645555763233323653111
+222452162524456534544666745659767986569977869888798889797967869896588579678645466757742223536551125
+424113153224246464437444666655586769888767899997999998888899787785789988565667547344466324245444121
+342222535222265477673374467445978889589796696777887788896778866766575958886864746654456432465143345
+343222443646553344666565758455597897568767997897989877768698886656896987444854633767335332566315312
+031554353342263455343465844688566996587977697767668887776787776985778754456646747553435562222553224
+433344426223464443364358688754655656655796979887796696799797776855755885854676557736723432655514323
+013424132332422364434378758577758958968878668787687777668989797955778846555856344635566224523432451
+425553255655633236466566556555858699675969687978968799698978595977567446657483654746364253324544543
+432514124535636275635556647685849565689989686678799779666769657669586678877883365364425535653142315
+234213331454244233774547658465845955685598696976697898886596997865578648447647767565654326321345225
+033142335256632253667547655784646566787758855877679696866998778855965474867574633636266434253231343
+433312355254243222736457466486484557878576698897857857878667659897748755645557367664665624322214245
+414352553244643424464634565857556876595979575859559697897855757678648446474443347476454343621315123
+142445323134524455344767565745845466776955777775867689676669795765547875554364474423523255433452550
+420122443552465225677645453567777645666955697588578797786675779777688864467444476525625534353143351
+013443533555256553426677376778475746848576769888786588999657647784787744733675443533555552342334414
+041143134325455654456573473653567744748677959966765568889765584875786654736746477425243323345412331
+432143141143446546334633656476476747668864878778688989957788768655568457357565474424624643255141123
+433102225554544652566677347757675544755546776854548575485655786465456345347635444252452425412221021
+323443424115135364655624436464533765445864646766688454775574785855547635756475456566323553413444404
+040133323452356462366536677466667655766665575477656846545868855587636377637445452653223313533353431
+112321424255322325434562636744647576545484488884676746485886457756657434733352222326531315442212112
+414000041225332224365336457576353475444476854684468466666787764643346356664452563552325454125532334
+333211225554233356326636546733667664766764488678465547455847554453346674333644366565122142144303010
+201332104431213354534342624674574463634343535468776645455555777363557644444632234452452514524001241
+221121011452151314652546563557737463367364573534653347663557476557753774362253653622553112413343020
+301020124355152323443536262535766773343757377576554465333456475773466764562232455333212154220142002
+322244112312155113454636553224336764436375336773533577673334677767346562553664626122341142230310021
+023103242244551224134442622342463557736536665447475654776476664656746264566536561531213151202033312
+000241244142514451335326646524645362354365656733573556434643567466354436652444155224421243124420312
+211134103233321112311333366243566524426453645455335474755773645624422266326533321441535122300041202
+010100412012005141235135226623364644564632374554665337675444336522352336344211133431343203034321031
+120100431404011341421515543345452262445624345326474644544443332326425454424431513314250240023131303
+302230432233042151414231553363365325522333634334265345542443426352642445554145124343411121104121203
+303233311431323211311335332253563563355242335445366433543356662343656654554132224132234403131422203
+113031120441440344151555331254253525425556245652343434526624622453624343111341315343030233140303323
+113030023221043232305142142324135442534246224522233522334666345254334253143442354430224400423233033
+031102021123340100023323433221314345163424223524353422623255522232122453215412122243144210131021220
+123100111112040244104314311535251111141234335442354234236235354514311422435123332031213231120131013
+221222103112033302010413133424335241315253243263446652241133155434215112225523013040443233102021312
+000012122130221202130324443534215451343511144224113442315342555214421524454224402343214132100123030
+112012230223002044203111222225321532514541153222214115443212344354545231533442344002011210202230120
+221200232013222231032340233141433354514311213113224441111332422254143133440204220101431230200002121
+211212213121303211020441232042142451254444244521121152121224435112515234204202321124222332312210022
+202120032200122003044340422223002041534554215334252122413441432141223402244034330212233311001312221
diff --git a/src/adventofcode2022/solutions/day08.py b/src/adventofcode2022/solutions/day08.py
new file mode 100644
index 00000000..98b84b4a
--- /dev/null
+++ b/src/adventofcode2022/solutions/day08.py
@@ -0,0 +1,74 @@
+from adventofcode2022.utils.abstract import FileReaderSolution
+from adventofcode2022.utils.point import XYPoint as Point
+
+
+class Day08:
+    grid: dict[Point, int]
+    max_x: int
+    min_x: int
+    max_y: int
+    min_y: int
+
+    def parse(self, input_data: str):
+        self.grid = {}
+        for x, line in enumerate(input_data.splitlines()):
+            for y, char in enumerate(line):
+                self.grid[Point(x, y)] = int(char)
+        self.max_x, self.min_x, self.max_y, self.min_y = self.min_max_values()
+
+    def min_max_values(self) -> tuple[int, int, int, int]:
+        """Return max_x, min_x, max_y, min_y for image"""
+        values = [pnt for pnt in self.grid.keys()]
+        max_x = max(pnt.x for pnt in values)
+        min_x = min(pnt.x for pnt in values)
+        max_y = max(pnt.y for pnt in values)
+        min_y = min(pnt.y for pnt in values)
+        return max_x, min_x, max_y, min_y
+
+
+class Day08PartA(Day08, FileReaderSolution):
+    def is_visible_point(self, point: Point) -> bool:
+        for dx, dy in ((1, 0), (-1, 0), (0, 1), (0, -1)):
+            if self.is_visible_point_for_direction(point, dx, dy):
+                return True
+        return False
+
+    def is_visible_point_for_direction(self, point: Point, dx: int, dy: int) -> bool:
+        """Is this point visible from this direction?"""
+        value = self.grid[point]
+
+        test_x = point.x + dx
+        test_y = point.y + dy
+        while True:
+            test_value = self.grid.get(Point(test_x, test_y), -1)
+            if test_value == -1:
+                # On the edge, we did not find any higher points
+                return True
+            elif test_value >= value:
+                return False
+            test_x += dx
+            test_y += dy
+
+    def count_visible(self) -> int:
+        """Count the visible trees"""
+        visible = 0
+
+        for x in range(self.min_x, self.max_x + 1):
+            for y in range(self.min_y, self.max_y + 1):
+                if x == 0 or x == self.max_x or y == 0 or y == self.max_y:
+                    # Are we on an edge? Always count this.
+                    visible += 1
+                    continue
+                # Check if there is a tree lower than `value` in all directions
+                if self.is_visible_point(Point(x, y)):
+                    visible += 1
+        return visible
+
+    def solve(self, input_data: str) -> int:
+        self.parse(input_data)
+        return self.count_visible()
+
+
+class Day08PartB(Day08, FileReaderSolution):
+    def solve(self, input_data: str) -> int:
+        raise NotImplementedError
diff --git a/tests/solutions/test_day08_a.py b/tests/solutions/test_day08_a.py
new file mode 100644
index 00000000..58c8cbfe
--- /dev/null
+++ b/tests/solutions/test_day08_a.py
@@ -0,0 +1,40 @@
+from textwrap import dedent
+
+import pytest
+
+from adventofcode2022.solutions.day08 import Day08PartA
+from adventofcode2022.utils.point import XYPoint as Point
+
+
+class TestDay08PartA:
+    test_data = """\
+    30373
+    25512
+    65332
+    33549
+    35390
+    """
+
+    @pytest.mark.parametrize(
+        ("point", "is_visible"),
+        [
+            (Point(1, 1), True),  # First 5
+            (Point(1, 2), True),  # Second 5
+            (Point(1, 3), False),  # 1 on second row
+        ],
+    )
+    def test_valid_points(self, point, is_visible):
+        solution = Day08PartA()
+        solution.parse(dedent(self.test_data))
+        assert solution.is_visible_point(point) == is_visible
+
+    def test_day08a_solve(self):
+        solution = Day08PartA()
+        result = solution.solve(dedent(self.test_data))
+        assert result == 21
+
+    def test_day08a_data(self):
+        """Result we got when we did the real solution"""
+        solution = Day08PartA()
+        res = solution("day_08/day08.txt")
+        assert res == 1779
diff --git a/tests/solutions/test_day08_b.py b/tests/solutions/test_day08_b.py
new file mode 100644
index 00000000..6e29f09d
--- /dev/null
+++ b/tests/solutions/test_day08_b.py
@@ -0,0 +1,19 @@
+import pytest
+
+from adventofcode2022.solutions.day08 import Day08PartB
+
+
+class TestDay08PartB:
+    @pytest.mark.xfail(reason="Not yet implemented", raises=NotImplementedError)
+    @pytest.mark.parametrize(("input_data", "expected_result"), [("", ""), ("", "")])
+    def test_day08b_solve(self, input_data, expected_result):
+        solution = Day08PartB()
+        result = solution.solve(input_data)
+        assert result == expected_result
+
+    @pytest.mark.xfail(reason="Not yet implemented", raises=NotImplementedError)
+    def test_day08b_data(self):
+        """Result we got when we did the real solution"""
+        solution = Day08PartB()
+        res = solution("day_08/day08.txt")
+        assert res == 0

From 33ec7a86503109177fb6d3d7df7de51288d09db7 Mon Sep 17 00:00:00 2001
From: Roel Adriaans <roel.adriaans@asml.com>
Date: Thu, 8 Dec 2022 10:12:25 +0100
Subject: [PATCH 201/371] Day 08, part b

---
 src/adventofcode2022/solutions/day08.py | 43 ++++++++++++++++++++++++-
 tests/solutions/test_day08_b.py         | 34 ++++++++++++++-----
 2 files changed, 68 insertions(+), 9 deletions(-)

diff --git a/src/adventofcode2022/solutions/day08.py b/src/adventofcode2022/solutions/day08.py
index 98b84b4a..35f7a591 100644
--- a/src/adventofcode2022/solutions/day08.py
+++ b/src/adventofcode2022/solutions/day08.py
@@ -1,3 +1,5 @@
+import math
+
 from adventofcode2022.utils.abstract import FileReaderSolution
 from adventofcode2022.utils.point import XYPoint as Point
 
@@ -70,5 +72,44 @@ def solve(self, input_data: str) -> int:
 
 
 class Day08PartB(Day08, FileReaderSolution):
+    def visible_trees(self, point: Point) -> int:
+        """Count how many trees are visible from this position,
+        and multiply their numbers together."""
+        return math.prod(
+            self.visible_points_for_direction(point, dx, dy)
+            for dx, dy in ((1, 0), (-1, 0), (0, 1), (0, -1))
+        )
+
+    def visible_points_for_direction(self, point: Point, dx: int, dy: int) -> int:
+        """How many points are visible from this direction?"""
+        value = self.grid[point]
+
+        test_x = point.x + dx
+        test_y = point.y + dy
+        visible = 0
+        while True:
+            test_value = self.grid.get(Point(test_x, test_y), -1)
+            if test_value == -1:
+                # On the edge, we did not find any higher points
+                # There is nothing beyond the edge, to not count
+                return visible
+            elif test_value >= value:
+                # We are now looking at a higher tree. Also count this tree
+                return visible + 1
+            test_x += dx
+            test_y += dy
+            visible += 1
+
+    def count_visible(self) -> int:
+        """Count the visible trees"""
+        max_visible = 0
+
+        for x in range(self.min_x, self.max_x + 1):
+            for y in range(self.min_y, self.max_y + 1):
+                # Check if there is a tree lower than `value` in all directions
+                max_visible = max(max_visible, self.visible_trees(Point(x, y)))
+        return max_visible
+
     def solve(self, input_data: str) -> int:
-        raise NotImplementedError
+        self.parse(input_data)
+        return self.count_visible()
diff --git a/tests/solutions/test_day08_b.py b/tests/solutions/test_day08_b.py
index 6e29f09d..3d5c3da8 100644
--- a/tests/solutions/test_day08_b.py
+++ b/tests/solutions/test_day08_b.py
@@ -1,19 +1,37 @@
-import pytest
+from textwrap import dedent
 
 from adventofcode2022.solutions.day08 import Day08PartB
+from adventofcode2022.utils.point import XYPoint as Point
 
 
 class TestDay08PartB:
-    @pytest.mark.xfail(reason="Not yet implemented", raises=NotImplementedError)
-    @pytest.mark.parametrize(("input_data", "expected_result"), [("", ""), ("", "")])
-    def test_day08b_solve(self, input_data, expected_result):
+    test_data = """\
+    30373
+    25512
+    65332
+    33549
+    35390
+    """
+
+    def test_day08b_for_point(self):
+        solution = Day08PartB()
+        solution.parse(dedent(self.test_data))
+        # Point 5 has a store of 4
+        tree = Point(1, 2)
+        assert solution.visible_points_for_direction(tree, 0, -1) == 1  # Left
+        assert solution.visible_points_for_direction(tree, 0, 1) == 2  # Right
+        assert solution.visible_points_for_direction(tree, -1, 0) == 1  # Up
+        assert solution.visible_points_for_direction(tree, 1, 0) == 2  # Down
+        # And 1 * 1 * 2 * 2 == 4
+        assert solution.visible_trees(tree) == 4
+
+    def test_day08b_solve(self):
         solution = Day08PartB()
-        result = solution.solve(input_data)
-        assert result == expected_result
+        result = solution.solve(dedent(self.test_data))
+        assert result == 8
 
-    @pytest.mark.xfail(reason="Not yet implemented", raises=NotImplementedError)
     def test_day08b_data(self):
         """Result we got when we did the real solution"""
         solution = Day08PartB()
         res = solution("day_08/day08.txt")
-        assert res == 0
+        assert res == 172224

From 9175046ff6b7f6829af9d28432b7fbb99f0222df Mon Sep 17 00:00:00 2001
From: Roel Adriaans <roel.adriaans@asml.com>
Date: Fri, 9 Dec 2022 14:17:05 +0100
Subject: [PATCH 202/371] WIP day 9

---
 .../solutions/data/day_09/day09.txt           | 2000 +++++++++++++++++
 src/adventofcode2022/solutions/day09.py       |   65 +
 src/adventofcode2022/utils/point.py           |    7 +-
 tests/solutions/test_day09_a.py               |   28 +
 tests/solutions/test_day09_b.py               |   19 +
 5 files changed, 2117 insertions(+), 2 deletions(-)
 create mode 100644 src/adventofcode2022/solutions/data/day_09/day09.txt
 create mode 100644 src/adventofcode2022/solutions/day09.py
 create mode 100644 tests/solutions/test_day09_a.py
 create mode 100644 tests/solutions/test_day09_b.py

diff --git a/src/adventofcode2022/solutions/data/day_09/day09.txt b/src/adventofcode2022/solutions/data/day_09/day09.txt
new file mode 100644
index 00000000..1e4437a0
--- /dev/null
+++ b/src/adventofcode2022/solutions/data/day_09/day09.txt
@@ -0,0 +1,2000 @@
+R 1
+U 1
+D 2
+L 2
+D 1
+U 1
+R 2
+D 2
+R 2
+U 1
+L 1
+U 2
+R 1
+L 1
+R 1
+L 1
+R 1
+U 1
+L 1
+U 1
+R 2
+U 2
+L 1
+R 1
+L 1
+U 2
+R 2
+D 1
+R 2
+U 2
+L 1
+U 2
+D 2
+L 1
+U 2
+R 2
+L 2
+U 1
+D 1
+L 1
+R 1
+L 1
+U 1
+L 1
+U 1
+R 2
+L 1
+R 1
+D 2
+L 2
+R 2
+U 2
+D 1
+L 1
+U 2
+R 2
+D 1
+U 1
+D 2
+U 1
+L 1
+D 2
+U 1
+R 1
+L 1
+U 2
+R 2
+U 1
+D 2
+R 1
+L 2
+D 2
+L 1
+D 2
+L 1
+R 1
+U 1
+R 2
+L 2
+U 2
+L 2
+R 1
+L 1
+D 1
+L 1
+R 1
+L 1
+R 1
+U 2
+D 1
+L 1
+R 1
+L 2
+U 2
+D 1
+U 1
+R 1
+U 1
+L 2
+U 2
+R 2
+U 2
+L 1
+U 1
+R 1
+U 2
+R 2
+U 1
+L 2
+U 2
+L 1
+D 1
+U 1
+R 3
+D 3
+L 2
+D 2
+R 2
+U 3
+L 3
+D 2
+L 1
+D 3
+L 2
+R 3
+D 1
+U 1
+D 3
+R 2
+D 3
+R 3
+D 1
+U 3
+D 1
+R 1
+U 1
+D 1
+R 3
+D 1
+U 3
+L 2
+D 2
+U 2
+L 3
+D 1
+R 3
+U 2
+D 2
+U 2
+R 3
+L 2
+R 2
+U 2
+L 3
+R 3
+U 1
+L 1
+D 1
+R 2
+L 3
+D 1
+U 3
+R 1
+D 3
+L 1
+U 1
+L 3
+U 1
+R 2
+L 3
+D 1
+R 2
+L 1
+U 3
+D 2
+L 1
+U 1
+L 3
+D 1
+U 1
+R 2
+U 1
+R 1
+U 2
+D 2
+U 1
+D 1
+L 1
+D 2
+U 2
+L 3
+D 3
+U 1
+R 2
+U 3
+D 1
+U 1
+R 2
+L 1
+U 2
+D 3
+R 1
+U 2
+R 1
+L 1
+D 1
+U 3
+D 1
+R 1
+L 2
+D 2
+R 2
+L 1
+D 3
+R 3
+L 1
+D 1
+R 2
+U 1
+R 3
+U 1
+L 2
+R 2
+L 2
+D 3
+L 4
+D 3
+L 4
+D 3
+R 4
+U 4
+L 4
+U 4
+R 2
+L 4
+D 2
+U 1
+R 2
+D 2
+R 3
+L 3
+R 4
+U 2
+D 3
+L 4
+R 2
+L 1
+R 3
+L 3
+U 4
+D 2
+L 2
+R 1
+U 1
+R 1
+U 3
+R 2
+D 2
+U 3
+R 2
+U 4
+R 4
+U 3
+D 4
+L 2
+R 4
+D 1
+U 3
+R 1
+D 4
+L 2
+D 2
+R 3
+D 3
+U 1
+L 2
+U 2
+L 4
+U 3
+R 3
+L 2
+R 3
+U 1
+L 1
+D 2
+U 1
+D 1
+U 1
+D 2
+U 3
+D 3
+R 4
+L 4
+D 1
+U 3
+R 4
+U 4
+D 2
+R 1
+U 2
+D 4
+U 1
+R 1
+L 4
+R 3
+U 1
+L 2
+R 3
+L 2
+U 3
+R 2
+D 2
+R 1
+D 2
+U 4
+L 4
+U 2
+R 2
+U 4
+L 3
+R 1
+D 4
+R 2
+D 3
+R 1
+L 3
+D 3
+L 4
+U 2
+R 1
+L 3
+D 4
+L 2
+U 3
+L 1
+U 5
+L 1
+U 3
+D 2
+U 2
+D 3
+R 3
+L 5
+U 1
+D 2
+L 1
+R 5
+D 4
+R 1
+D 2
+R 5
+U 5
+D 1
+R 3
+D 5
+R 5
+U 2
+L 1
+D 1
+R 2
+D 2
+U 5
+D 2
+R 3
+L 4
+D 5
+U 3
+L 4
+R 4
+D 5
+L 2
+R 5
+D 1
+R 2
+L 5
+D 2
+U 3
+D 3
+L 3
+U 3
+R 1
+D 4
+L 1
+U 2
+L 3
+U 2
+R 3
+L 1
+U 4
+L 5
+R 4
+U 4
+R 2
+L 4
+U 2
+R 4
+D 2
+U 2
+D 3
+L 3
+R 1
+U 1
+L 1
+R 5
+U 1
+D 4
+L 4
+R 5
+D 4
+L 3
+D 1
+L 4
+U 3
+R 5
+L 2
+R 4
+L 1
+R 2
+U 3
+D 1
+L 2
+U 2
+R 2
+U 1
+R 2
+U 5
+L 4
+D 1
+U 5
+R 1
+D 1
+U 2
+D 5
+U 5
+L 3
+U 3
+L 1
+D 5
+U 5
+D 1
+L 5
+D 4
+U 4
+L 3
+U 3
+L 6
+D 4
+R 5
+U 4
+R 3
+D 3
+U 3
+D 5
+R 4
+D 5
+R 6
+U 3
+L 3
+R 3
+D 3
+R 5
+L 2
+D 5
+L 3
+U 2
+D 3
+U 1
+D 1
+U 6
+D 4
+R 6
+D 4
+L 4
+D 6
+R 2
+L 3
+R 4
+U 5
+R 5
+D 4
+U 5
+L 3
+R 1
+U 4
+R 1
+D 5
+U 6
+D 6
+U 6
+D 4
+L 6
+R 5
+L 1
+U 6
+L 6
+D 3
+R 3
+D 2
+U 3
+L 5
+D 6
+U 3
+L 3
+D 3
+U 3
+D 4
+R 3
+L 5
+U 5
+D 5
+R 1
+U 4
+D 2
+R 6
+D 2
+L 3
+R 2
+D 1
+U 4
+R 6
+D 6
+U 3
+L 3
+D 1
+R 2
+D 4
+R 5
+L 6
+D 2
+U 6
+L 1
+U 5
+R 4
+U 6
+D 1
+L 4
+U 4
+D 1
+R 6
+L 4
+U 2
+R 3
+U 3
+L 2
+D 6
+R 4
+D 4
+L 6
+R 1
+D 2
+L 4
+R 2
+U 6
+L 1
+R 3
+D 3
+U 4
+L 1
+U 6
+D 1
+L 5
+R 6
+L 1
+D 5
+U 5
+R 4
+U 6
+L 5
+D 4
+R 1
+L 6
+U 7
+L 1
+D 3
+L 5
+R 4
+L 2
+D 4
+U 4
+L 4
+D 2
+R 4
+L 1
+U 1
+R 3
+U 2
+L 4
+R 2
+L 6
+R 1
+D 5
+L 6
+U 6
+D 1
+R 2
+L 2
+R 2
+D 6
+R 7
+D 5
+R 5
+D 1
+R 2
+U 3
+R 7
+U 6
+R 1
+U 2
+L 1
+R 3
+L 2
+R 2
+U 5
+R 1
+L 7
+U 6
+D 1
+L 2
+R 5
+D 5
+R 2
+U 7
+R 5
+U 3
+R 3
+U 1
+R 4
+D 2
+U 7
+D 7
+R 1
+U 4
+R 7
+D 4
+R 7
+L 5
+D 3
+R 2
+L 6
+U 1
+L 5
+R 7
+U 5
+D 5
+L 1
+D 5
+L 3
+U 5
+D 2
+R 7
+L 7
+R 7
+D 4
+R 1
+U 5
+D 3
+U 4
+L 5
+R 6
+U 6
+L 6
+U 3
+D 6
+U 7
+L 1
+U 1
+R 2
+D 4
+U 2
+D 2
+U 4
+R 2
+L 3
+R 5
+U 6
+L 8
+R 7
+D 1
+L 1
+D 3
+L 4
+R 3
+U 7
+D 1
+R 4
+D 5
+R 7
+D 5
+U 2
+D 6
+U 2
+R 3
+D 6
+L 3
+U 5
+L 7
+D 6
+U 5
+D 6
+L 8
+U 2
+R 8
+D 6
+U 8
+R 1
+L 3
+R 7
+L 5
+R 8
+U 1
+D 6
+U 8
+L 4
+R 6
+D 2
+R 2
+D 8
+U 7
+D 7
+L 2
+U 7
+D 3
+L 2
+U 7
+R 3
+U 2
+D 7
+R 1
+L 2
+D 7
+L 2
+R 5
+U 6
+L 6
+R 1
+L 3
+R 5
+D 3
+R 3
+D 6
+U 1
+D 4
+U 4
+L 2
+R 7
+D 5
+L 3
+R 3
+D 2
+U 3
+D 4
+L 3
+U 8
+L 4
+D 1
+L 2
+U 3
+L 8
+R 5
+L 8
+U 1
+D 4
+U 3
+L 6
+R 7
+L 5
+D 5
+L 2
+R 4
+L 6
+D 5
+L 7
+U 1
+L 5
+R 8
+D 6
+R 8
+L 7
+U 5
+D 2
+L 8
+U 2
+R 6
+L 4
+D 6
+L 6
+D 8
+R 1
+L 5
+U 9
+R 6
+L 2
+U 2
+D 6
+L 9
+R 6
+D 5
+R 1
+U 4
+L 2
+R 7
+U 7
+D 3
+R 4
+D 9
+R 2
+L 7
+U 1
+L 6
+R 2
+D 3
+R 9
+D 2
+U 5
+L 3
+R 4
+D 7
+L 8
+U 2
+D 2
+R 1
+L 7
+R 5
+U 1
+L 6
+U 3
+L 1
+U 2
+D 1
+U 5
+L 2
+U 9
+L 5
+D 1
+L 8
+R 2
+L 5
+R 2
+U 1
+D 7
+L 2
+R 7
+U 6
+R 8
+L 7
+R 8
+U 3
+D 6
+U 4
+R 2
+U 2
+L 4
+D 5
+L 4
+R 1
+U 4
+R 7
+D 8
+L 6
+U 6
+D 3
+R 8
+D 4
+R 4
+D 7
+R 9
+D 7
+R 8
+U 4
+D 1
+L 7
+U 9
+R 3
+L 9
+U 2
+D 6
+U 5
+R 5
+U 3
+R 4
+D 7
+L 2
+U 1
+L 1
+U 7
+L 5
+U 5
+R 4
+D 9
+R 9
+D 5
+L 10
+R 6
+D 7
+L 9
+D 1
+L 10
+D 9
+L 7
+R 2
+D 5
+L 2
+U 6
+L 4
+U 2
+L 7
+D 7
+L 2
+R 1
+L 4
+D 2
+R 9
+D 3
+U 4
+D 6
+R 2
+D 7
+L 7
+U 10
+D 6
+L 4
+R 3
+U 9
+R 3
+L 10
+U 8
+D 1
+U 5
+R 2
+U 5
+L 3
+U 7
+R 1
+U 8
+D 4
+L 7
+D 10
+L 8
+U 9
+R 6
+L 8
+D 4
+R 5
+D 9
+U 2
+R 4
+D 4
+U 3
+R 7
+D 1
+L 1
+U 6
+L 2
+U 1
+L 5
+D 1
+L 2
+R 7
+D 8
+R 4
+U 2
+R 10
+U 3
+L 3
+D 1
+L 1
+U 10
+L 10
+U 5
+D 2
+R 6
+L 8
+R 2
+L 5
+U 2
+D 8
+L 1
+D 4
+U 9
+R 6
+D 2
+L 3
+R 4
+D 4
+U 4
+L 2
+R 9
+U 8
+L 10
+D 1
+R 6
+D 2
+R 6
+U 7
+L 7
+U 6
+D 6
+R 3
+D 1
+U 5
+R 3
+D 1
+U 5
+L 9
+R 8
+U 11
+L 11
+U 6
+D 7
+L 7
+R 8
+U 10
+D 10
+L 11
+U 1
+L 5
+R 3
+D 8
+L 8
+D 5
+L 6
+U 7
+D 8
+U 9
+D 11
+U 7
+D 9
+U 11
+L 9
+R 9
+U 1
+L 11
+U 6
+R 1
+U 9
+D 9
+U 1
+R 6
+L 9
+R 11
+D 5
+L 10
+R 2
+D 10
+L 7
+R 2
+L 5
+D 5
+R 9
+L 11
+U 4
+D 2
+U 10
+R 5
+U 10
+L 5
+U 2
+D 6
+U 5
+L 6
+U 8
+R 9
+U 9
+D 8
+R 6
+D 1
+R 2
+L 7
+U 11
+D 8
+L 4
+U 2
+R 3
+D 9
+U 5
+R 7
+L 4
+D 3
+U 11
+L 6
+U 6
+D 5
+U 10
+R 11
+U 5
+L 2
+U 7
+R 11
+D 2
+R 2
+L 10
+D 8
+R 10
+L 10
+U 4
+L 5
+D 7
+L 8
+R 8
+D 4
+L 6
+U 7
+R 9
+U 4
+R 9
+D 4
+R 3
+U 9
+R 6
+D 8
+U 6
+D 2
+U 3
+R 2
+L 9
+U 3
+D 11
+U 10
+D 1
+U 2
+D 7
+R 4
+U 5
+D 12
+L 4
+R 12
+L 3
+R 4
+L 7
+R 2
+D 9
+R 3
+U 2
+L 10
+D 4
+R 9
+L 4
+D 11
+L 3
+U 8
+L 11
+D 12
+U 8
+L 11
+R 4
+D 8
+R 10
+U 1
+D 2
+U 12
+D 6
+R 6
+D 2
+U 5
+R 2
+L 7
+U 4
+R 2
+U 10
+L 8
+D 3
+R 8
+L 4
+R 5
+D 7
+L 12
+U 12
+D 3
+L 10
+R 4
+L 12
+U 3
+L 6
+D 6
+U 5
+L 1
+U 5
+L 12
+R 9
+U 11
+L 11
+R 7
+L 5
+R 8
+U 12
+R 10
+U 7
+L 2
+R 5
+U 2
+D 3
+L 7
+R 5
+U 9
+R 9
+U 10
+D 10
+U 12
+L 2
+R 2
+L 1
+U 6
+R 8
+U 9
+R 1
+L 9
+D 2
+L 1
+R 11
+D 1
+U 4
+L 10
+R 9
+D 12
+R 4
+D 5
+U 6
+R 7
+D 8
+R 5
+D 11
+L 3
+D 11
+U 4
+L 6
+U 4
+L 10
+U 2
+L 4
+U 5
+R 2
+U 4
+R 2
+D 6
+R 13
+U 4
+D 2
+L 12
+D 6
+R 6
+U 5
+D 2
+R 12
+D 2
+R 1
+L 6
+D 6
+U 11
+L 11
+D 3
+L 10
+U 2
+R 13
+D 6
+U 3
+L 3
+R 1
+U 7
+R 11
+D 2
+L 6
+D 5
+L 11
+R 9
+U 13
+R 6
+U 4
+D 6
+U 5
+R 4
+L 3
+R 10
+L 10
+D 5
+U 10
+L 13
+U 3
+D 6
+U 1
+L 11
+R 13
+L 1
+D 7
+R 3
+U 7
+D 8
+R 12
+D 10
+R 10
+L 11
+R 10
+D 1
+L 13
+R 1
+L 3
+R 11
+U 6
+L 1
+D 11
+U 11
+D 7
+L 5
+R 2
+U 7
+L 13
+R 13
+U 12
+R 2
+U 5
+R 3
+U 12
+L 5
+D 13
+L 11
+R 7
+L 2
+D 5
+R 6
+D 5
+L 6
+D 5
+U 13
+L 9
+D 11
+R 9
+D 11
+L 9
+R 11
+U 5
+R 10
+L 7
+R 10
+D 5
+L 9
+U 12
+L 10
+U 9
+L 14
+R 3
+L 4
+D 3
+L 4
+R 4
+D 5
+R 3
+L 10
+R 12
+D 4
+R 13
+U 7
+L 11
+D 2
+L 2
+U 11
+R 4
+D 14
+U 9
+R 9
+L 5
+D 2
+U 6
+D 2
+L 1
+R 3
+D 7
+R 4
+U 9
+D 8
+U 5
+L 12
+U 3
+L 12
+R 14
+U 5
+L 10
+R 1
+D 6
+U 10
+L 2
+U 8
+R 5
+L 9
+R 8
+L 6
+D 8
+U 11
+R 6
+L 7
+D 10
+R 6
+L 9
+U 6
+D 6
+L 3
+R 13
+D 10
+R 11
+L 10
+R 6
+L 9
+D 6
+R 14
+L 2
+U 7
+D 4
+L 11
+U 12
+L 11
+D 7
+L 12
+U 8
+D 9
+U 7
+D 4
+L 9
+R 12
+U 10
+D 12
+U 8
+R 9
+U 4
+D 2
+R 9
+D 1
+L 14
+U 4
+L 13
+R 8
+D 7
+R 6
+L 6
+D 11
+R 11
+D 4
+L 12
+R 4
+D 6
+L 1
+D 10
+R 3
+U 6
+L 6
+R 6
+L 4
+R 1
+U 3
+L 10
+R 3
+U 11
+R 5
+U 12
+D 9
+U 12
+L 5
+R 5
+L 3
+D 11
+U 1
+R 7
+U 4
+D 11
+R 14
+L 1
+U 6
+D 9
+U 4
+R 8
+D 8
+U 13
+D 1
+U 5
+R 9
+U 3
+L 2
+R 11
+U 8
+D 14
+U 4
+R 14
+U 3
+D 11
+U 11
+R 8
+L 4
+R 11
+L 13
+R 13
+D 9
+U 10
+D 12
+U 15
+L 3
+R 9
+L 6
+R 10
+U 13
+L 6
+D 2
+L 10
+D 8
+U 4
+R 9
+D 12
+L 5
+R 13
+U 8
+D 4
+R 10
+D 2
+U 15
+L 13
+U 9
+L 1
+R 3
+U 13
+R 3
+D 7
+L 6
+D 15
+R 12
+U 7
+D 10
+L 5
+U 14
+L 1
+U 3
+D 2
+R 14
+U 9
+R 11
+U 15
+L 9
+U 8
+L 1
+D 13
+R 1
+U 12
+L 11
+U 12
+R 9
+U 10
+L 9
+R 6
+L 6
+U 12
+R 14
+D 10
+L 12
+R 13
+D 8
+L 12
+D 12
+U 3
+L 11
+R 6
+U 15
+D 7
+R 10
+L 1
+U 12
+L 15
+U 12
+L 5
+D 8
+R 8
+L 4
+D 13
+R 3
+D 7
+R 13
+L 9
+R 7
+U 7
+L 16
+D 4
+U 3
+D 1
+U 7
+L 5
+R 1
+D 8
+R 2
+L 8
+R 12
+D 12
+U 14
+R 9
+D 6
+R 4
+U 9
+R 10
+L 10
+D 3
+L 13
+U 1
+D 7
+U 8
+R 14
+L 8
+R 14
+L 5
+U 16
+D 8
+R 6
+U 6
+R 14
+L 16
+R 14
+D 5
+R 14
+D 10
+U 16
+R 1
+D 10
+U 12
+D 12
+R 14
+D 16
+U 2
+L 3
+U 2
+R 9
+U 15
+R 7
+L 16
+U 2
+R 1
+D 11
+U 11
+L 15
+D 8
+L 12
+R 3
+U 1
+R 10
+D 9
+L 15
+U 6
+D 13
+L 16
+R 6
+D 7
+L 8
+D 3
+R 13
+L 2
+D 6
+L 13
+D 16
+U 6
+D 11
+U 15
+D 10
+U 15
+L 11
+R 13
+L 9
+U 2
+D 15
+U 1
+L 8
+R 3
+U 15
+D 2
+R 4
+L 10
+U 15
+R 17
+D 13
+L 15
+U 8
+L 12
+U 13
+L 15
+R 10
+D 11
+L 14
+U 16
+R 4
+D 1
+R 4
+D 17
+U 8
+D 17
+R 9
+U 17
+D 9
+R 13
+D 15
+R 4
+D 17
+R 3
+D 2
+U 15
+L 8
+D 17
+U 1
+L 4
+U 5
+D 17
+U 3
+R 10
+D 10
+R 9
+L 17
+R 4
+D 6
+U 1
+D 12
+U 11
+L 13
+R 3
+U 5
+R 5
+D 7
+R 6
+U 8
+D 5
+R 8
+L 10
+R 4
+U 17
+R 7
+D 16
+U 17
+L 11
+U 13
+R 6
+D 8
+R 15
+L 10
+R 9
+L 6
+R 13
+D 17
+U 7
+R 11
+D 9
+R 13
+L 15
+R 5
+D 3
+L 4
+U 14
+L 17
+U 17
+D 1
+U 3
+L 9
+D 11
+U 14
+L 2
+D 14
+U 9
+R 2
+D 15
+R 16
+D 17
+L 16
+U 8
+D 1
+R 2
+L 6
+U 14
+R 7
+L 15
+D 14
+L 3
+R 5
+U 5
+R 15
+D 15
+U 7
+D 11
+U 13
+R 16
+L 17
+U 11
+R 13
+U 10
+L 7
+U 8
+L 3
+D 3
+L 1
+D 2
+L 2
+D 4
+L 15
+R 14
+U 13
+R 15
+U 15
+L 2
+R 10
+U 4
+D 11
+U 12
+L 1
+R 7
+L 4
+R 12
+D 1
+L 10
+R 8
+L 4
+R 13
+U 6
+R 10
+D 17
+R 14
+D 4
+R 11
+D 13
+L 16
+U 8
+D 1
+R 16
+U 11
+D 15
+U 1
+D 14
+L 9
+D 5
+R 1
+U 2
+L 9
+D 15
+R 18
+D 6
+R 11
+U 7
+R 5
+U 1
+L 13
+D 7
+U 15
+D 9
+R 11
+D 18
+U 11
+D 13
+L 7
+R 18
+U 13
+L 3
+U 18
+R 15
+U 9
+D 6
+U 7
+R 3
+L 6
+D 1
+U 5
+L 16
+R 7
+L 14
+D 6
+L 4
+R 16
+U 3
+L 6
+U 8
+R 2
+U 13
+R 18
+L 10
+D 15
+U 3
+R 12
+U 13
+L 14
+U 15
+R 11
+L 17
+U 2
+R 18
+L 16
+R 6
+D 17
+L 11
+R 16
+D 4
+U 6
+R 18
+D 15
+U 18
+R 5
+D 8
+L 10
+D 7
+L 19
+R 19
+L 10
+D 1
+R 2
+U 5
+D 6
+U 2
+L 11
+R 14
+D 13
+L 15
+U 11
+R 7
+L 5
+U 15
+L 4
+R 3
+L 13
+U 17
+L 3
+U 15
+R 11
+L 17
+U 8
+R 8
+D 10
+L 9
+D 17
+L 14
+R 2
+L 19
+R 3
+D 3
+U 18
+D 15
+L 3
+R 18
+U 5
+D 17
+L 15
+R 7
+D 10
+U 11
+R 8
+U 14
+D 16
+R 10
+U 14
+R 11
+L 7
+R 1
+U 16
+L 6
+D 13
+L 9
+U 7
+R 19
+L 1
+D 11
+L 18
+D 19
+U 15
+R 18
+U 8
+R 4
+D 18
+R 12
+D 18
+R 8
+U 2
+L 2
+U 2
+L 12
+U 18
+R 12
+L 17
+R 2
+U 12
+D 19
+U 12
+L 8
+U 2
+L 12
+U 19
+R 11
+D 9
+R 10
+U 17
+L 19
+D 15
+L 3
+R 13
+U 2
+L 13
+R 6
+D 4
+U 18
+R 11
+U 7
+D 2
+R 4
+L 13
+U 11
+D 10
+U 17
+D 3
+U 10
diff --git a/src/adventofcode2022/solutions/day09.py b/src/adventofcode2022/solutions/day09.py
new file mode 100644
index 00000000..c42c1196
--- /dev/null
+++ b/src/adventofcode2022/solutions/day09.py
@@ -0,0 +1,65 @@
+from adventofcode2022.utils.abstract import FileReaderSolution
+from adventofcode2022.utils.point import XYPoint as Point
+
+
+class Day09:
+    moves: list[tuple[str, int]]
+
+    def parse(self, input_data: str):
+        self.moves = []
+        for line in input_data.splitlines():
+            p = line.split(" ")
+            self.moves.append((p[0], int(p[1])))
+
+    def simulate(self) -> int:
+        tail_positions: set[tuple[int, int]] = set()
+
+        head = Point(0, 0)
+        tail = Point(0, 0)
+        tail_positions.add((tail.x, tail.y))
+        for move, steps in self.moves:
+            for n in range(steps):
+                if move == "R":
+                    head.x += 1
+                elif move == "L":
+                    head.x -= 1
+                elif move == "D":
+                    head.y -= 1
+                elif move == "U":
+                    head.y += 1
+
+                # Define steps for the tail to move:
+                horizontal_move = head.x == tail.x or head.y == tail.y
+                if horizontal_move and tail.x > head.x and tail.y == head.y:
+                    tail.x -= 1
+                elif horizontal_move and tail.x < head.x and tail.y == head.y:
+                    tail.x += 1
+                elif horizontal_move and tail.y > head.y and tail.x == head.x:
+                    tail.y -= 1
+                elif horizontal_move and tail.y < head.y and tail.x == head.x:
+                    tail.y += 1
+                elif not horizontal_move and tail.x > head.x and tail.y > head.y:
+                    tail.x += 1
+                    tail.y += 1
+                elif not horizontal_move and tail.x > head.x and tail.y < head.y:
+                    tail.x += 1
+                    tail.y -= 1
+                elif not horizontal_move and tail.x < head.x and tail.y > head.y:
+                    tail.x -= 1
+                    tail.y -= 1
+                elif not horizontal_move and tail.x < head.x and tail.y < head.y:
+                    tail.x += 1
+                    tail.y -= 1
+
+                tail_positions.add((tail.x, tail.y))
+        return len(tail_positions)
+
+class Day09PartA(Day09, FileReaderSolution):
+    def solve(self, input_data: str) -> int:
+        self.parse(input_data)
+        return self.simulate()
+
+
+class Day09PartB(Day09, FileReaderSolution):
+    def solve(self, input_data: str) -> int:
+        raise NotImplementedError
diff --git a/src/adventofcode2022/utils/point.py b/src/adventofcode2022/utils/point.py
index 445e2322..16a34aea 100644
--- a/src/adventofcode2022/utils/point.py
+++ b/src/adventofcode2022/utils/point.py
@@ -1,7 +1,9 @@
 from typing import NamedTuple
+from dataclasses import dataclass
 
 
-class XYZPoint(NamedTuple):
+@dataclass
+class XYZPoint:
     x: int
     y: int
     z: int
@@ -15,7 +17,8 @@ def distance(self, other):
         return abs(self.x - other.x) + abs(self.y - other.y) + abs(self.z - other.z)
 
 
-class XYPoint(NamedTuple):
+@dataclass
+class XYPoint:
     x: int
     y: int
 
diff --git a/tests/solutions/test_day09_a.py b/tests/solutions/test_day09_a.py
new file mode 100644
index 00000000..e18f2ef6
--- /dev/null
+++ b/tests/solutions/test_day09_a.py
@@ -0,0 +1,28 @@
+import pytest
+from textwrap import dedent
+from adventofcode2022.solutions.day09 import Day09PartA
+
+
+class TestDay09PartA:
+
+    def test_day09a_solve(self):
+        test_data = """\
+        R 4
+        U 4
+        L 3
+        D 1
+        R 4
+        D 1
+        L 5
+        R 2
+        """
+        solution = Day09PartA()
+        result = solution.solve(dedent(test_data))
+        assert result == 13
+
+    @pytest.mark.xfail(reason="Not yet implemented", raises=NotImplementedError)
+    def test_day09a_data(self):
+        """Result we got when we did the real solution"""
+        solution = Day09PartA()
+        res = solution("day_09/day09.txt")
+        assert res == 0
diff --git a/tests/solutions/test_day09_b.py b/tests/solutions/test_day09_b.py
new file mode 100644
index 00000000..63192d9c
--- /dev/null
+++ b/tests/solutions/test_day09_b.py
@@ -0,0 +1,19 @@
+import pytest
+
+from adventofcode2022.solutions.day09 import Day09PartB
+
+
+class TestDay09PartB:
+    @pytest.mark.xfail(reason="Not yet implemented", raises=NotImplementedError)
+    @pytest.mark.parametrize(("input_data", "expected_result"), [("", ""), ("", "")])
+    def test_day09b_solve(self, input_data, expected_result):
+        solution = Day09PartB()
+        result = solution.solve(input_data)
+        assert result == expected_result
+
+    @pytest.mark.xfail(reason="Not yet implemented", raises=NotImplementedError)
+    def test_day09b_data(self):
+        """Result we got when we did the real solution"""
+        solution = Day09PartB()
+        res = solution("day_09/day09.txt")
+        assert res == 0

From e344b91e05c8e3e7bdb3a01fa2227de871aac3db Mon Sep 17 00:00:00 2001
From: Roel Adriaans <roel.adriaans@ordina.nl>
Date: Sat, 10 Dec 2022 14:52:31 +0100
Subject: [PATCH 203/371] WIP day 9

---
 src/adventofcode2022/solutions/day09.py | 35 ++++++++++++++++++++++---
 src/adventofcode2022/utils/point.py     | 12 +++++++++
 2 files changed, 44 insertions(+), 3 deletions(-)

diff --git a/src/adventofcode2022/solutions/day09.py b/src/adventofcode2022/solutions/day09.py
index c42c1196..2241b3ba 100644
--- a/src/adventofcode2022/solutions/day09.py
+++ b/src/adventofcode2022/solutions/day09.py
@@ -24,13 +24,15 @@ def simulate(self) -> int:
                 elif move == "L":
                     head.x -= 1
                 elif move == "D":
-                    head.y -= 1
-                elif move == "U":
                     head.y += 1
+                elif move == "U":
+                    head.y -= 1
 
                 # Define steps for the tail to move:
                 horizontal_move = head.x == tail.x or head.y == tail.y
-                if horizontal_move and tail.x > head.x and tail.y == head.y:
+                if tail.distance(head)== 1:
+                    pass
+                elif horizontal_move and tail.x > head.x and tail.y == head.y:
                     tail.x -= 1
                 elif horizontal_move and tail.x < head.x and tail.y == head.y:
                     tail.x += 1
@@ -52,8 +54,35 @@ def simulate(self) -> int:
                     tail.y -= 1
 
                 tail_positions.add((tail.x, tail.y))
+                self.print(head, tail, tail_positions)
+
         return len(tail_positions)
 
+    @staticmethod
+    def print(head: Point, tail: Point, tail_positions: set[tuple[int, int]]):
+        min_x = min(head.x, tail.x)
+        min_y = min(head.y, tail.y)
+        max_x = max(head.x, tail.x)
+        max_y = max(head.y, tail.y)
+        line = "\n\n"
+        for y in range(min_y, max_y + 1):
+            for x in range(min_x, max_x + 1):
+                pnt = Point(x, y)
+                if head == tail == pnt:
+                    line += "*"
+                elif head == pnt and head != tail:
+                    line += "H"
+                elif tail == pnt and head != tail:
+                    line += "T"
+                elif (x, y) in tail_positions:
+                    line += "#"
+                else:
+                    line += "."
+            line += "\n"
+        line += "\n\n"
+        print(line)
+
+
 class Day09PartA(Day09, FileReaderSolution):
     def solve(self, input_data: str) -> int:
         self.parse(input_data)
diff --git a/src/adventofcode2022/utils/point.py b/src/adventofcode2022/utils/point.py
index 16a34aea..3f68b89d 100644
--- a/src/adventofcode2022/utils/point.py
+++ b/src/adventofcode2022/utils/point.py
@@ -13,6 +13,11 @@ def __add__(self, other):
             raise ValueError("Cannot add incompatible types together")
         return XYZPoint(x=self.x + other.x, y=self.y + other.y, z=self.z + other.z)
 
+    def __iter__(self):
+        yield self.x
+        yield self.y
+        yield self.z
+
     def distance(self, other):
         return abs(self.x - other.x) + abs(self.y - other.y) + abs(self.z - other.z)
 
@@ -26,3 +31,10 @@ def __add__(self, other):
         if not issubclass(type(other), XYPoint):
             raise ValueError("Cannot add incompatible types together")
         return XYPoint(x=self.x + other.x, y=self.y + other.y)
+
+    def __iter__(self):
+        yield self.x
+        yield self.y
+
+    def distance(self, other):
+        return abs(self.x - other.x) + abs(self.y - other.y)

From ff4e72c4785feed3971597d07679f45c1ea30c6b Mon Sep 17 00:00:00 2001
From: Roel Adriaans <roel.adriaans@ordina.nl>
Date: Sat, 10 Dec 2022 23:01:35 +0100
Subject: [PATCH 204/371] Implement day 9, part a. Screwing up the directions

---
 src/adventofcode2022/solutions/day09.py | 98 +++++++++++--------------
 src/adventofcode2022/utils/point.py     |  5 +-
 tests/solutions/test_day09_a.py         |  6 +-
 tests/test_point.py                     |  6 ++
 4 files changed, 51 insertions(+), 64 deletions(-)

diff --git a/src/adventofcode2022/solutions/day09.py b/src/adventofcode2022/solutions/day09.py
index 2241b3ba..a7d1ec62 100644
--- a/src/adventofcode2022/solutions/day09.py
+++ b/src/adventofcode2022/solutions/day09.py
@@ -4,6 +4,9 @@
 
 class Day09:
     moves: list[tuple[str, int]]
+    tail_positions: set[tuple[int, int]]
+    head: Point
+    tail: Point
 
     def parse(self, input_data: str):
         self.moves = []
@@ -12,75 +15,56 @@ def parse(self, input_data: str):
             self.moves.append((p[0], int(p[1])))
 
     def simulate(self) -> int:
-        tail_positions: set[tuple[int, int]] = set()
+        self.tail_positions = set()
 
-        head = Point(0, 0)
-        tail = Point(0, 0)
-        tail_positions.add((tail.x, tail.y))
+        self.head = Point(0, 0)
+        self.tail = Point(0, 0)
+        self.tail_positions.add((self.tail.x, self.tail.y))
         for move, steps in self.moves:
             for n in range(steps):
                 if move == "R":
-                    head.x += 1
+                    self.head.x += 1
                 elif move == "L":
-                    head.x -= 1
+                    self.head.x -= 1
                 elif move == "D":
-                    head.y += 1
+                    self.head.y += 1
                 elif move == "U":
-                    head.y -= 1
+                    self.head.y -= 1
 
                 # Define steps for the tail to move:
-                horizontal_move = head.x == tail.x or head.y == tail.y
-                if tail.distance(head)== 1:
-                    pass
-                elif horizontal_move and tail.x > head.x and tail.y == head.y:
-                    tail.x -= 1
-                elif horizontal_move and tail.x < head.x and tail.y == head.y:
-                    tail.x += 1
-                elif horizontal_move and tail.y > head.y and tail.x == head.x:
-                    tail.y -= 1
-                elif horizontal_move and tail.y < head.y and tail.x == head.x:
-                    tail.y += 1
-                elif not horizontal_move and tail.x > head.x and tail.y > head.y:
-                    tail.x += 1
-                    tail.y += 1
-                elif not horizontal_move and tail.x > head.x and tail.y < head.y:
-                    tail.x += 1
-                    tail.y -= 1
-                elif not horizontal_move and tail.x < head.x and tail.y > head.y:
-                    tail.x -= 1
-                    tail.y -= 1
-                elif not horizontal_move and tail.x < head.x and tail.y < head.y:
-                    tail.x += 1
-                    tail.y -= 1
+                self.tail = self.move_tail(self.head, self.tail)
+                self.tail_positions.add((self.tail.x, self.tail.y))
 
-                tail_positions.add((tail.x, tail.y))
-                self.print(head, tail, tail_positions)
-
-        return len(tail_positions)
+        return len(self.tail_positions)
 
     @staticmethod
-    def print(head: Point, tail: Point, tail_positions: set[tuple[int, int]]):
-        min_x = min(head.x, tail.x)
-        min_y = min(head.y, tail.y)
-        max_x = max(head.x, tail.x)
-        max_y = max(head.y, tail.y)
-        line = "\n\n"
-        for y in range(min_y, max_y + 1):
-            for x in range(min_x, max_x + 1):
-                pnt = Point(x, y)
-                if head == tail == pnt:
-                    line += "*"
-                elif head == pnt and head != tail:
-                    line += "H"
-                elif tail == pnt and head != tail:
-                    line += "T"
-                elif (x, y) in tail_positions:
-                    line += "#"
-                else:
-                    line += "."
-            line += "\n"
-        line += "\n\n"
-        print(line)
+    def move_tail(head, tail) -> Point:
+        horizontal_move = head.x == tail.x or head.y == tail.y
+        if horizontal_move and tail.distance(head) == 1:
+            return tail
+        if not horizontal_move and tail.distance(head) == 2:
+            return tail
+        elif horizontal_move and tail.x > head.x and tail.y == head.y:
+            tail.x -= 1
+        elif horizontal_move and tail.x < head.x and tail.y == head.y:
+            tail.x += 1
+        elif horizontal_move and tail.y > head.y and tail.x == head.x:
+            tail.y -= 1
+        elif horizontal_move and tail.y < head.y and tail.x == head.x:
+            tail.y += 1
+        elif not horizontal_move and tail.x > head.x and tail.y > head.y:
+            tail.x -= 1
+            tail.y -= 1
+        elif not horizontal_move and tail.x > head.x and tail.y < head.y:
+            tail.x -= 1
+            tail.y += 1
+        elif not horizontal_move and tail.x < head.x and tail.y > head.y:
+            tail.x += 1
+            tail.y -= 1
+        elif not horizontal_move and tail.x < head.x and tail.y < head.y:
+            tail.x += 1
+            tail.y += 1
+        return tail
 
 
 class Day09PartA(Day09, FileReaderSolution):
diff --git a/src/adventofcode2022/utils/point.py b/src/adventofcode2022/utils/point.py
index 3f68b89d..982972a9 100644
--- a/src/adventofcode2022/utils/point.py
+++ b/src/adventofcode2022/utils/point.py
@@ -1,8 +1,7 @@
-from typing import NamedTuple
 from dataclasses import dataclass
 
 
-@dataclass
+@dataclass(unsafe_hash=True)
 class XYZPoint:
     x: int
     y: int
@@ -22,7 +21,7 @@ def distance(self, other):
         return abs(self.x - other.x) + abs(self.y - other.y) + abs(self.z - other.z)
 
 
-@dataclass
+@dataclass(unsafe_hash=True)
 class XYPoint:
     x: int
     y: int
diff --git a/tests/solutions/test_day09_a.py b/tests/solutions/test_day09_a.py
index e18f2ef6..e30207e0 100644
--- a/tests/solutions/test_day09_a.py
+++ b/tests/solutions/test_day09_a.py
@@ -1,10 +1,9 @@
-import pytest
 from textwrap import dedent
+
 from adventofcode2022.solutions.day09 import Day09PartA
 
 
 class TestDay09PartA:
-
     def test_day09a_solve(self):
         test_data = """\
         R 4
@@ -20,9 +19,8 @@ def test_day09a_solve(self):
         result = solution.solve(dedent(test_data))
         assert result == 13
 
-    @pytest.mark.xfail(reason="Not yet implemented", raises=NotImplementedError)
     def test_day09a_data(self):
         """Result we got when we did the real solution"""
         solution = Day09PartA()
         res = solution("day_09/day09.txt")
-        assert res == 0
+        assert res == 6057
diff --git a/tests/test_point.py b/tests/test_point.py
index 08a860f6..f2b0f9c1 100644
--- a/tests/test_point.py
+++ b/tests/test_point.py
@@ -64,3 +64,9 @@ def test_invalid_together():
         xy + xyz
 
     assert xy != xyz
+
+
+def test_hashing():
+    p1 = point.XYPoint(1, 2)
+    p2 = point.XYPoint(2, 1)
+    assert p1.__hash__() != p2.__hash__()

From a29b84c488ce11d49695a892a42692e11b3bcbb3 Mon Sep 17 00:00:00 2001
From: Roel Adriaans <roel.adriaans@ordina.nl>
Date: Sun, 11 Dec 2022 22:06:42 +0100
Subject: [PATCH 205/371] Day 9, part b is simple if you can have the moving of
 the tails part seperated :)

---
 src/adventofcode2022/solutions/day09.py | 26 ++++++++++++++++---------
 tests/solutions/test_day09_b.py         | 24 +++++++++++++++--------
 2 files changed, 33 insertions(+), 17 deletions(-)

diff --git a/src/adventofcode2022/solutions/day09.py b/src/adventofcode2022/solutions/day09.py
index a7d1ec62..b8ff9cec 100644
--- a/src/adventofcode2022/solutions/day09.py
+++ b/src/adventofcode2022/solutions/day09.py
@@ -1,3 +1,5 @@
+import more_itertools
+
 from adventofcode2022.utils.abstract import FileReaderSolution
 from adventofcode2022.utils.point import XYPoint as Point
 
@@ -6,7 +8,7 @@ class Day09:
     moves: list[tuple[str, int]]
     tail_positions: set[tuple[int, int]]
     head: Point
-    tail: Point
+    tails: list[Point]
 
     def parse(self, input_data: str):
         self.moves = []
@@ -14,12 +16,12 @@ def parse(self, input_data: str):
             p = line.split(" ")
             self.moves.append((p[0], int(p[1])))
 
-    def simulate(self) -> int:
+    def simulate(self, no_heads: int) -> int:
         self.tail_positions = set()
 
         self.head = Point(0, 0)
-        self.tail = Point(0, 0)
-        self.tail_positions.add((self.tail.x, self.tail.y))
+        self.tails = [Point(0, 0) for _ in range(no_heads)]
+        self.tail_positions.add((self.tails[-1].x, self.tails[-1].y))
         for move, steps in self.moves:
             for n in range(steps):
                 if move == "R":
@@ -31,12 +33,17 @@ def simulate(self) -> int:
                 elif move == "U":
                     self.head.y -= 1
 
-                # Define steps for the tail to move:
-                self.tail = self.move_tail(self.head, self.tail)
-                self.tail_positions.add((self.tail.x, self.tail.y))
+                # Define steps for the tails to move:
+                self.move_tails()
+                self.tail_positions.add((self.tails[-1].x, self.tails[-1].y))
 
         return len(self.tail_positions)
 
+    def move_tails(self):
+        to_move = [self.head] + self.tails
+        for head, tail in more_itertools.sliding_window(to_move, 2):
+            self.move_tail(head, tail)
+
     @staticmethod
     def move_tail(head, tail) -> Point:
         horizontal_move = head.x == tail.x or head.y == tail.y
@@ -70,9 +77,10 @@ def move_tail(head, tail) -> Point:
 class Day09PartA(Day09, FileReaderSolution):
     def solve(self, input_data: str) -> int:
         self.parse(input_data)
-        return self.simulate()
+        return self.simulate(1)
 
 
 class Day09PartB(Day09, FileReaderSolution):
     def solve(self, input_data: str) -> int:
-        raise NotImplementedError
+        self.parse(input_data)
+        return self.simulate(9)
diff --git a/tests/solutions/test_day09_b.py b/tests/solutions/test_day09_b.py
index 63192d9c..d738ef76 100644
--- a/tests/solutions/test_day09_b.py
+++ b/tests/solutions/test_day09_b.py
@@ -1,19 +1,27 @@
-import pytest
+from textwrap import dedent
 
 from adventofcode2022.solutions.day09 import Day09PartB
 
 
 class TestDay09PartB:
-    @pytest.mark.xfail(reason="Not yet implemented", raises=NotImplementedError)
-    @pytest.mark.parametrize(("input_data", "expected_result"), [("", ""), ("", "")])
-    def test_day09b_solve(self, input_data, expected_result):
+    def test_day09b_solve(self):
+        test_data = """\
+        R 5
+        U 8
+        L 8
+        D 3
+        R 17
+        D 10
+        L 25
+        U 20
+        """
         solution = Day09PartB()
-        result = solution.solve(input_data)
-        assert result == expected_result
+        result = solution.solve(dedent(test_data))
+        assert result == 36
 
-    @pytest.mark.xfail(reason="Not yet implemented", raises=NotImplementedError)
     def test_day09b_data(self):
         """Result we got when we did the real solution"""
         solution = Day09PartB()
         res = solution("day_09/day09.txt")
-        assert res == 0
+        assert res > 2342
+        assert res == 2514

From 083d4ef5028c0af09ad2856d4d72b17bf7b913b6 Mon Sep 17 00:00:00 2001
From: Roel Adriaans <roel.adriaans@ordina.nl>
Date: Sun, 11 Dec 2022 22:42:27 +0100
Subject: [PATCH 206/371] Day 10, part 1, off-by-one

---
 .../solutions/data/day_10/day10.txt           | 139 +++++++++++++++++
 .../solutions/data/day_10/day10_test.txt      | 146 ++++++++++++++++++
 src/adventofcode2022/solutions/day10.py       |  73 +++++++++
 tests/solutions/test_day10_a.py               |  57 +++++++
 tests/solutions/test_day10_b.py               |  19 +++
 5 files changed, 434 insertions(+)
 create mode 100644 src/adventofcode2022/solutions/data/day_10/day10.txt
 create mode 100644 src/adventofcode2022/solutions/data/day_10/day10_test.txt
 create mode 100644 src/adventofcode2022/solutions/day10.py
 create mode 100644 tests/solutions/test_day10_a.py
 create mode 100644 tests/solutions/test_day10_b.py

diff --git a/src/adventofcode2022/solutions/data/day_10/day10.txt b/src/adventofcode2022/solutions/data/day_10/day10.txt
new file mode 100644
index 00000000..ab8f5105
--- /dev/null
+++ b/src/adventofcode2022/solutions/data/day_10/day10.txt
@@ -0,0 +1,139 @@
+noop
+noop
+addx 5
+addx 31
+addx -30
+addx 2
+addx 7
+noop
+noop
+addx -4
+addx 5
+addx 6
+noop
+addx -1
+addx 5
+addx -1
+addx 5
+addx 1
+noop
+addx 5
+noop
+addx -1
+addx -35
+addx 3
+noop
+addx 2
+addx 3
+addx -2
+addx 2
+noop
+addx 8
+addx -3
+addx 5
+addx -17
+addx 22
+addx -2
+addx 2
+addx 5
+addx -2
+addx -26
+addx 31
+addx 2
+addx 5
+addx -40
+addx 30
+addx -27
+addx 4
+addx 2
+addx 3
+addx -3
+addx 8
+noop
+noop
+addx 2
+addx 21
+addx -15
+addx -2
+addx 2
+noop
+addx 15
+addx -16
+addx 8
+noop
+addx 3
+addx 5
+addx -38
+noop
+noop
+noop
+addx 5
+addx -5
+addx 6
+addx 2
+addx 7
+noop
+noop
+addx 4
+addx -3
+noop
+noop
+addx 7
+addx 2
+addx 2
+addx -1
+noop
+addx 3
+addx 6
+noop
+addx 1
+noop
+noop
+addx -38
+noop
+noop
+addx 7
+addx 3
+noop
+addx 2
+addx -2
+addx 7
+addx -2
+addx 5
+addx 2
+addx 5
+addx -4
+addx 2
+addx 5
+addx 2
+addx -21
+addx 9
+addx 15
+noop
+addx 3
+addx -38
+addx 7
+noop
+noop
+addx 18
+addx -17
+addx 4
+noop
+addx 1
+addx 2
+addx 5
+addx 3
+noop
+noop
+addx 14
+addx -9
+noop
+noop
+addx 4
+addx 1
+noop
+addx 4
+addx 3
+noop
+addx -8
+noop
diff --git a/src/adventofcode2022/solutions/data/day_10/day10_test.txt b/src/adventofcode2022/solutions/data/day_10/day10_test.txt
new file mode 100644
index 00000000..37ee8ee1
--- /dev/null
+++ b/src/adventofcode2022/solutions/data/day_10/day10_test.txt
@@ -0,0 +1,146 @@
+addx 15
+addx -11
+addx 6
+addx -3
+addx 5
+addx -1
+addx -8
+addx 13
+addx 4
+noop
+addx -1
+addx 5
+addx -1
+addx 5
+addx -1
+addx 5
+addx -1
+addx 5
+addx -1
+addx -35
+addx 1
+addx 24
+addx -19
+addx 1
+addx 16
+addx -11
+noop
+noop
+addx 21
+addx -15
+noop
+noop
+addx -3
+addx 9
+addx 1
+addx -3
+addx 8
+addx 1
+addx 5
+noop
+noop
+noop
+noop
+noop
+addx -36
+noop
+addx 1
+addx 7
+noop
+noop
+noop
+addx 2
+addx 6
+noop
+noop
+noop
+noop
+noop
+addx 1
+noop
+noop
+addx 7
+addx 1
+noop
+addx -13
+addx 13
+addx 7
+noop
+addx 1
+addx -33
+noop
+noop
+noop
+addx 2
+noop
+noop
+noop
+addx 8
+noop
+addx -1
+addx 2
+addx 1
+noop
+addx 17
+addx -9
+addx 1
+addx 1
+addx -3
+addx 11
+noop
+noop
+addx 1
+noop
+addx 1
+noop
+noop
+addx -13
+addx -19
+addx 1
+addx 3
+addx 26
+addx -30
+addx 12
+addx -1
+addx 3
+addx 1
+noop
+noop
+noop
+addx -9
+addx 18
+addx 1
+addx 2
+noop
+noop
+addx 9
+noop
+noop
+noop
+addx -1
+addx 2
+addx -37
+addx 1
+addx 3
+noop
+addx 15
+addx -21
+addx 22
+addx -6
+addx 1
+noop
+addx 2
+addx 1
+noop
+addx -10
+noop
+noop
+addx 20
+addx 1
+addx 2
+addx 2
+addx -6
+addx -11
+noop
+noop
+noop
diff --git a/src/adventofcode2022/solutions/day10.py b/src/adventofcode2022/solutions/day10.py
new file mode 100644
index 00000000..7f237317
--- /dev/null
+++ b/src/adventofcode2022/solutions/day10.py
@@ -0,0 +1,73 @@
+from typing import NamedTuple
+
+from adventofcode2022.utils.abstract import FileReaderSolution
+
+
+class Instruction(NamedTuple):
+    instruction: str
+    value: int | None
+
+
+class CPU:
+    x: int
+    instructions: list[Instruction]
+    program_counter: int
+    current_step: int
+
+    def __init__(self, instructions: list[Instruction]):
+        self.instructions = instructions
+
+        self.x = 1
+        self.program_counter = 0
+        self.current_step = 0
+
+    def cycle(self):
+        current_instruction = self.instructions[self.program_counter]
+        # Single cycle instructions
+        if current_instruction.instruction == "noop":
+            self.program_counter += 1
+            self.current_step = 0
+        elif current_instruction.instruction == "addx" and self.current_step == 0:
+            self.current_step += 1
+        elif current_instruction.instruction == "addx" and self.current_step == 1:
+            self.program_counter += 1
+            self.current_step = 0
+            self.x += current_instruction.value
+
+        else:
+            raise ValueError("Invalid instruction %s", current_instruction)
+
+
+class Day10:
+    @staticmethod
+    def parse(input_data: str) -> list[Instruction]:
+        instructions = []
+        for line in input_data.splitlines():
+            parts = line.split()
+            if len(parts) == 1:
+                instructions.append(Instruction(instruction=parts[0], value=None))
+            else:
+                instructions.append(
+                    Instruction(instruction=parts[0], value=int(parts[1]))
+                )
+
+        return instructions
+
+
+class Day10PartA(Day10, FileReaderSolution):
+    def solve(self, input_data: str) -> int:
+        instructions = self.parse(input_data=input_data)
+        cpu = CPU(instructions)
+
+        cycles = [20, 60, 100, 140, 180, 220]
+        total_sums = []
+        for i in range(1, max(cycles) + 1):
+            cpu.cycle()
+            if i + 1 in cycles:
+                total_sums.append(cpu.x * (i + 1))
+        return sum(total_sums)
+
+
+class Day10PartB(Day10, FileReaderSolution):
+    def solve(self, input_data: str) -> int:
+        raise NotImplementedError
diff --git a/tests/solutions/test_day10_a.py b/tests/solutions/test_day10_a.py
new file mode 100644
index 00000000..c139e111
--- /dev/null
+++ b/tests/solutions/test_day10_a.py
@@ -0,0 +1,57 @@
+import pathlib
+
+import pytest
+
+from adventofcode2022.solutions.day10 import CPU, Day10PartA
+
+
+class TestDay10PartA:
+    @staticmethod
+    def load_testdata():
+        test_path = (
+            pathlib.Path(__file__).parent.parent.parent
+            / "src"
+            / "adventofcode2022"
+            / "solutions"
+            / "data"
+            / "day_10"
+            / "day10_test.txt"
+        )
+        with open(test_path) as f:
+            test_data = f.read()
+        return test_data
+
+    def test_day10_simple(self):
+        program = "noop\naddx 3\naddx -5\n"
+        instructions = Day10PartA.parse(program)
+        assert len(instructions) == 3
+        assert instructions[2].value == -5
+
+        cpu = CPU(instructions=instructions)
+        assert cpu.x == 1
+        cpu.cycle()  # Perform noop
+        assert cpu.x == 1
+        # Perform 1 step of addx 3
+        cpu.cycle()
+        assert cpu.x == 1
+        # Perform 2 stop of addx 3
+        cpu.cycle()
+        assert cpu.x == 4
+        # Begin instruction addx -5
+        cpu.cycle()
+        assert cpu.x == 4
+        cpu.cycle()
+        assert cpu.x == -1
+
+    def test_day10a_solve(self):
+        solution = Day10PartA()
+        result = solution.solve(self.load_testdata())
+        assert result == 13140
+
+    @pytest.mark.xfail(reason="Not yet implemented", raises=NotImplementedError)
+    def test_day10a_data(self):
+        """Result we got when we did the real solution"""
+        solution = Day10PartA()
+        res = solution("day_10/day10.txt")
+        assert res < 15480
+        assert res == 15360
diff --git a/tests/solutions/test_day10_b.py b/tests/solutions/test_day10_b.py
new file mode 100644
index 00000000..9ba21f91
--- /dev/null
+++ b/tests/solutions/test_day10_b.py
@@ -0,0 +1,19 @@
+import pytest
+
+from adventofcode2022.solutions.day10 import Day10PartB
+
+
+class TestDay10PartB:
+    @pytest.mark.xfail(reason="Not yet implemented", raises=NotImplementedError)
+    @pytest.mark.parametrize(("input_data", "expected_result"), [("", ""), ("", "")])
+    def test_day10b_solve(self, input_data, expected_result):
+        solution = Day10PartB()
+        result = solution.solve(input_data)
+        assert result == expected_result
+
+    @pytest.mark.xfail(reason="Not yet implemented", raises=NotImplementedError)
+    def test_day10b_data(self):
+        """Result we got when we did the real solution"""
+        solution = Day10PartB()
+        res = solution("day_10/day10.txt")
+        assert res == 0

From e0131cf656d9d6465c8fe2fee6b732dea4862296 Mon Sep 17 00:00:00 2001
From: Roel Adriaans <roel.adriaans@asml.com>
Date: Tue, 13 Dec 2022 01:29:08 +0100
Subject: [PATCH 207/371] Day 10, implement ram, pre-calculate everything and
 draw

---
 src/adventofcode2022/solutions/day10.py | 57 ++++++++++++++++++++-----
 tests/solutions/test_day10_a.py         |  3 --
 tests/solutions/test_day10_b.py         | 43 +++++++++++++++----
 3 files changed, 81 insertions(+), 22 deletions(-)

diff --git a/src/adventofcode2022/solutions/day10.py b/src/adventofcode2022/solutions/day10.py
index 7f237317..f15a6efd 100644
--- a/src/adventofcode2022/solutions/day10.py
+++ b/src/adventofcode2022/solutions/day10.py
@@ -8,6 +8,10 @@ class Instruction(NamedTuple):
     value: int | None
 
 
+class ProgramEnded(Exception):  # noqa: N818
+    """Signal that the program has ended"""
+
+
 class CPU:
     x: int
     instructions: list[Instruction]
@@ -22,6 +26,9 @@ def __init__(self, instructions: list[Instruction]):
         self.current_step = 0
 
     def cycle(self):
+        if self.program_counter >= len(self.instructions):
+            raise ProgramEnded
+
         current_instruction = self.instructions[self.program_counter]
         # Single cycle instructions
         if current_instruction.instruction == "noop":
@@ -32,7 +39,8 @@ def cycle(self):
         elif current_instruction.instruction == "addx" and self.current_step == 1:
             self.program_counter += 1
             self.current_step = 0
-            self.x += current_instruction.value
+            if current_instruction.value:
+                self.x += current_instruction.value
 
         else:
             raise ValueError("Invalid instruction %s", current_instruction)
@@ -53,21 +61,48 @@ def parse(input_data: str) -> list[Instruction]:
 
         return instructions
 
+    @staticmethod
+    def fill_buffer(instructions: list[Instruction]) -> list[int]:
+        cpu = CPU(instructions)
+        frame_buffer = []
+        while True:
+            frame_buffer.append(cpu.x)
+            try:
+                cpu.cycle()
+            except ProgramEnded:
+                break
+        return frame_buffer
+
 
 class Day10PartA(Day10, FileReaderSolution):
     def solve(self, input_data: str) -> int:
         instructions = self.parse(input_data=input_data)
-        cpu = CPU(instructions)
+        frame_buffer = self.fill_buffer(instructions)
+        total = 0
+        for cycle in (20, 60, 100, 140, 180, 220):
+            total += cycle * frame_buffer[cycle - 1]
+
+        return total
 
-        cycles = [20, 60, 100, 140, 180, 220]
-        total_sums = []
-        for i in range(1, max(cycles) + 1):
-            cpu.cycle()
-            if i + 1 in cycles:
-                total_sums.append(cpu.x * (i + 1))
-        return sum(total_sums)
+
+ON = "#"
+OFF = "."
 
 
 class Day10PartB(Day10, FileReaderSolution):
-    def solve(self, input_data: str) -> int:
-        raise NotImplementedError
+    def solve(self, input_data: str) -> str:
+        instructions = self.parse(input_data=input_data)
+
+        frame_buffer = self.fill_buffer(instructions)
+
+        screen = [[OFF] * 40 for _ in range(6)]
+
+        for row in range(6):
+            for col in range(40):
+                counter = row * 40 + col
+                if abs(frame_buffer[counter] - col) <= 1:
+                    screen[row][col] = ON
+                else:
+                    screen[row][col] = OFF
+
+        return "\n".join("".join(line) for line in screen)
diff --git a/tests/solutions/test_day10_a.py b/tests/solutions/test_day10_a.py
index c139e111..4f16181c 100644
--- a/tests/solutions/test_day10_a.py
+++ b/tests/solutions/test_day10_a.py
@@ -1,7 +1,5 @@
 import pathlib
 
-import pytest
-
 from adventofcode2022.solutions.day10 import CPU, Day10PartA
 
 
@@ -48,7 +46,6 @@ def test_day10a_solve(self):
         result = solution.solve(self.load_testdata())
         assert result == 13140
 
-    @pytest.mark.xfail(reason="Not yet implemented", raises=NotImplementedError)
     def test_day10a_data(self):
         """Result we got when we did the real solution"""
         solution = Day10PartA()
diff --git a/tests/solutions/test_day10_b.py b/tests/solutions/test_day10_b.py
index 9ba21f91..46ac0565 100644
--- a/tests/solutions/test_day10_b.py
+++ b/tests/solutions/test_day10_b.py
@@ -1,19 +1,46 @@
-import pytest
+import pathlib
+from textwrap import dedent
 
 from adventofcode2022.solutions.day10 import Day10PartB
 
 
 class TestDay10PartB:
-    @pytest.mark.xfail(reason="Not yet implemented", raises=NotImplementedError)
-    @pytest.mark.parametrize(("input_data", "expected_result"), [("", ""), ("", "")])
-    def test_day10b_solve(self, input_data, expected_result):
+    @staticmethod
+    def load_testdata():
+        test_path = (
+            pathlib.Path(__file__).parent.parent.parent
+            / "src"
+            / "adventofcode2022"
+            / "solutions"
+            / "data"
+            / "day_10"
+            / "day10_test.txt"
+        )
+        with open(test_path) as f:
+            test_data = f.read()
+        return test_data
+
+    def test_day10b_solve(self):
+        expected_output = """\
+        ##..##..##..##..##..##..##..##..##..##..
+        ###...###...###...###...###...###...###.
+        ####....####....####....####....####....
+        #####.....#####.....#####.....#####.....
+        ######......######......######......####
+        #######.......#######.......#######....."""
         solution = Day10PartB()
-        result = solution.solve(input_data)
-        assert result == expected_result
+        result = solution.solve(self.load_testdata())
+        assert result == dedent(expected_output)
 
-    @pytest.mark.xfail(reason="Not yet implemented", raises=NotImplementedError)
     def test_day10b_data(self):
         """Result we got when we did the real solution"""
         solution = Day10PartB()
         res = solution("day_10/day10.txt")
-        assert res == 0
+        expected_output = """\
+        ###..#..#.#....#..#...##..##..####..##..
+        #..#.#..#.#....#..#....#.#..#....#.#..#.
+        #..#.####.#....####....#.#......#..#..#.
+        ###..#..#.#....#..#....#.#.##..#...####.
+        #....#..#.#....#..#.#..#.#..#.#....#..#.
+        #....#..#.####.#..#..##...###.####.#..#."""
+        assert res == dedent(expected_output)

From f6c3cf127668e1dbb1c8395f82a28e9fce207c24 Mon Sep 17 00:00:00 2001
From: Roel Adriaans <roel.adriaans@asml.com>
Date: Tue, 13 Dec 2022 11:01:35 +0100
Subject: [PATCH 208/371] Everything is already off

---
 src/adventofcode2022/solutions/day10.py | 2 --
 1 file changed, 2 deletions(-)

diff --git a/src/adventofcode2022/solutions/day10.py b/src/adventofcode2022/solutions/day10.py
index f15a6efd..67d24ea9 100644
--- a/src/adventofcode2022/solutions/day10.py
+++ b/src/adventofcode2022/solutions/day10.py
@@ -102,7 +102,5 @@ def solve(self, input_data: str) -> str:
                 counter = row * 40 + col
                 if abs(frame_buffer[counter] - col) <= 1:
                     screen[row][col] = ON
-                else:
-                    screen[row][col] = OFF
 
         return "\n".join("".join(line) for line in screen)

From 3b069b5079f89046686977b222521375c604b536 Mon Sep 17 00:00:00 2001
From: Roel Adriaans <roel.adriaans@asml.com>
Date: Tue, 13 Dec 2022 11:39:34 +0100
Subject: [PATCH 209/371] Add a fixture for loading testdata

---
 tests/solutions/conftest.py     | 27 +++++++++++++++++++++++++++
 tests/solutions/test_day10_a.py | 21 ++-------------------
 tests/solutions/test_day10_b.py | 20 ++------------------
 3 files changed, 31 insertions(+), 37 deletions(-)
 create mode 100644 tests/solutions/conftest.py

diff --git a/tests/solutions/conftest.py b/tests/solutions/conftest.py
new file mode 100644
index 00000000..72c55462
--- /dev/null
+++ b/tests/solutions/conftest.py
@@ -0,0 +1,27 @@
+import pathlib
+
+import pytest
+
+
+@pytest.fixture
+def testdata(request) -> str:
+    """Load data from a testfile.
+    If `filename` is given, this file is loaded, otherwise the default `daynn_test.txt`
+    file is used.
+    """
+
+    # Parse the class name, eg
+    day = int("".join(x for x in request.keywords.parent.name if x.isdigit()))
+
+    test_path = (
+        pathlib.Path(__file__).parent.parent.parent
+        / "src"
+        / "adventofcode2022"
+        / "solutions"
+        / "data"
+        / f"day_{day:02}"
+        / f"day{day:02}_test.txt"
+    )
+    with open(test_path) as f:
+        test_data = f.read()
+    return test_data
diff --git a/tests/solutions/test_day10_a.py b/tests/solutions/test_day10_a.py
index 4f16181c..f4b3bddc 100644
--- a/tests/solutions/test_day10_a.py
+++ b/tests/solutions/test_day10_a.py
@@ -1,24 +1,7 @@
-import pathlib
-
 from adventofcode2022.solutions.day10 import CPU, Day10PartA
 
 
 class TestDay10PartA:
-    @staticmethod
-    def load_testdata():
-        test_path = (
-            pathlib.Path(__file__).parent.parent.parent
-            / "src"
-            / "adventofcode2022"
-            / "solutions"
-            / "data"
-            / "day_10"
-            / "day10_test.txt"
-        )
-        with open(test_path) as f:
-            test_data = f.read()
-        return test_data
-
     def test_day10_simple(self):
         program = "noop\naddx 3\naddx -5\n"
         instructions = Day10PartA.parse(program)
@@ -41,9 +24,9 @@ def test_day10_simple(self):
         cpu.cycle()
         assert cpu.x == -1
 
-    def test_day10a_solve(self):
+    def test_day10a_solve(self, testdata):
         solution = Day10PartA()
-        result = solution.solve(self.load_testdata())
+        result = solution.solve(testdata)
         assert result == 13140
 
     def test_day10a_data(self):
diff --git a/tests/solutions/test_day10_b.py b/tests/solutions/test_day10_b.py
index 46ac0565..d4ea6630 100644
--- a/tests/solutions/test_day10_b.py
+++ b/tests/solutions/test_day10_b.py
@@ -1,26 +1,10 @@
-import pathlib
 from textwrap import dedent
 
 from adventofcode2022.solutions.day10 import Day10PartB
 
 
 class TestDay10PartB:
-    @staticmethod
-    def load_testdata():
-        test_path = (
-            pathlib.Path(__file__).parent.parent.parent
-            / "src"
-            / "adventofcode2022"
-            / "solutions"
-            / "data"
-            / "day_10"
-            / "day10_test.txt"
-        )
-        with open(test_path) as f:
-            test_data = f.read()
-        return test_data
-
-    def test_day10b_solve(self):
+    def test_day10b_solve(self, testdata):
         expected_output = """\
         ##..##..##..##..##..##..##..##..##..##..
         ###...###...###...###...###...###...###.
@@ -29,7 +13,7 @@ def test_day10b_solve(self):
         ######......######......######......####
         #######.......#######.......#######....."""
         solution = Day10PartB()
-        result = solution.solve(self.load_testdata())
+        result = solution.solve(testdata)
         assert result == dedent(expected_output)
 
     def test_day10b_data(self):

From 1b54a55a71cf8809f1754ff080f1169e0d42ffe9 Mon Sep 17 00:00:00 2001
From: Roel Adriaans <roel.adriaans@asml.com>
Date: Tue, 13 Dec 2022 16:07:37 +0100
Subject: [PATCH 210/371] [WIP] day 11

---
 .../solutions/data/day_11/day11.txt           | 55 +++++++++++++++++++
 .../solutions/data/day_11/day11_test.txt      | 27 +++++++++
 src/adventofcode2022/solutions/day11.py       | 53 ++++++++++++++++++
 tests/solutions/test_day11_a.py               | 38 +++++++++++++
 tests/solutions/test_day11_b.py               | 19 +++++++
 5 files changed, 192 insertions(+)
 create mode 100644 src/adventofcode2022/solutions/data/day_11/day11.txt
 create mode 100644 src/adventofcode2022/solutions/data/day_11/day11_test.txt
 create mode 100644 src/adventofcode2022/solutions/day11.py
 create mode 100644 tests/solutions/test_day11_a.py
 create mode 100644 tests/solutions/test_day11_b.py

diff --git a/src/adventofcode2022/solutions/data/day_11/day11.txt b/src/adventofcode2022/solutions/data/day_11/day11.txt
new file mode 100644
index 00000000..419cb88b
--- /dev/null
+++ b/src/adventofcode2022/solutions/data/day_11/day11.txt
@@ -0,0 +1,55 @@
+Monkey 0:
+  Starting items: 89, 74
+  Operation: new = old * 5
+  Test: divisible by 17
+    If true: throw to monkey 4
+    If false: throw to monkey 7
+
+Monkey 1:
+  Starting items: 75, 69, 87, 57, 84, 90, 66, 50
+  Operation: new = old + 3
+  Test: divisible by 7
+    If true: throw to monkey 3
+    If false: throw to monkey 2
+
+Monkey 2:
+  Starting items: 55
+  Operation: new = old + 7
+  Test: divisible by 13
+    If true: throw to monkey 0
+    If false: throw to monkey 7
+
+Monkey 3:
+  Starting items: 69, 82, 69, 56, 68
+  Operation: new = old + 5
+  Test: divisible by 2
+    If true: throw to monkey 0
+    If false: throw to monkey 2
+
+Monkey 4:
+  Starting items: 72, 97, 50
+  Operation: new = old + 2
+  Test: divisible by 19
+    If true: throw to monkey 6
+    If false: throw to monkey 5
+
+Monkey 5:
+  Starting items: 90, 84, 56, 92, 91, 91
+  Operation: new = old * 19
+  Test: divisible by 3
+    If true: throw to monkey 6
+    If false: throw to monkey 1
+
+Monkey 6:
+  Starting items: 63, 93, 55, 53
+  Operation: new = old * old
+  Test: divisible by 5
+    If true: throw to monkey 3
+    If false: throw to monkey 1
+
+Monkey 7:
+  Starting items: 50, 61, 52, 58, 86, 68, 97
+  Operation: new = old + 4
+  Test: divisible by 11
+    If true: throw to monkey 5
+    If false: throw to monkey 4
diff --git a/src/adventofcode2022/solutions/data/day_11/day11_test.txt b/src/adventofcode2022/solutions/data/day_11/day11_test.txt
new file mode 100644
index 00000000..30e09e50
--- /dev/null
+++ b/src/adventofcode2022/solutions/data/day_11/day11_test.txt
@@ -0,0 +1,27 @@
+Monkey 0:
+  Starting items: 79, 98
+  Operation: new = old * 19
+  Test: divisible by 23
+    If true: throw to monkey 2
+    If false: throw to monkey 3
+
+Monkey 1:
+  Starting items: 54, 65, 75, 74
+  Operation: new = old + 6
+  Test: divisible by 19
+    If true: throw to monkey 2
+    If false: throw to monkey 0
+
+Monkey 2:
+  Starting items: 79, 60, 97
+  Operation: new = old * old
+  Test: divisible by 13
+    If true: throw to monkey 1
+    If false: throw to monkey 3
+
+Monkey 3:
+  Starting items: 74
+  Operation: new = old + 3
+  Test: divisible by 17
+    If true: throw to monkey 0
+    If false: throw to monkey 1
diff --git a/src/adventofcode2022/solutions/day11.py b/src/adventofcode2022/solutions/day11.py
new file mode 100644
index 00000000..6b63f9a4
--- /dev/null
+++ b/src/adventofcode2022/solutions/day11.py
@@ -0,0 +1,53 @@
+from __future__ import annotations
+
+import parse
+
+from adventofcode2022.utils.abstract import FileReaderSolution
+
+
+class Monkey:
+    monkid: int
+    items: list[int]
+    operation: str
+
+    test_division: int
+    true_to: int
+    false_to: int
+
+    def __init__(self):
+        self.items = []
+
+    def __repr__(self):
+        return f"Monkey(id:{self.monkid}, items[{', '.join(str(i) for i in self.items)}])"
+
+    @staticmethod
+    def from_string(data: str) -> Monkey:
+        lines = [line.strip() for line in data.splitlines()]
+        monkey = Monkey()
+
+        monkey.monkid = parse.parse("Monkey {:d}:", lines[0])[0]
+        monkey.items = [q[0] for q in parse.findall("{:d}", lines[1])]
+        monkey.operation = lines[2].split("=")[1].strip()
+
+        return monkey
+
+
+class Day11:
+    monkeys: list[Monkey]
+
+    @staticmethod
+    def parse(input_data: str) -> list[Monkey]:
+        monkeys = [Monkey.from_string(string) for string in input_data.split("\n\n")]
+        return monkeys
+
+
+class Day11PartA(Day11, FileReaderSolution):
+    def solve(self, input_data: str) -> int:
+        self.monkeys = self.parse(input_data)
+
+        return -1
+
+
+class Day11PartB(Day11, FileReaderSolution):
+    def solve(self, input_data: str) -> int:
+        raise NotImplementedError
diff --git a/tests/solutions/test_day11_a.py b/tests/solutions/test_day11_a.py
new file mode 100644
index 00000000..8c2f3b56
--- /dev/null
+++ b/tests/solutions/test_day11_a.py
@@ -0,0 +1,38 @@
+from textwrap import dedent
+
+import pytest
+
+from adventofcode2022.solutions.day11 import Day11PartA, Monkey
+
+
+class TestDay11PartA:
+    def test_monkey(self):
+        test_string = dedent("""\
+        Monkey 0:
+          Starting items: 79, 98
+          Operation: new = old * 19
+          Test: divisible by 23
+            If true: throw to monkey 2
+            If false: throw to monkey 3
+        """)
+
+        monkey = Monkey.from_string(test_string)
+        assert monkey.monkid == 0
+        assert monkey.items == [79, 98]
+        assert monkey.operation == "old * 19"
+        assert monkey.true_to == 2
+        assert monkey.false_to == 3
+        assert monkey.test_division == 23
+
+
+    def test_day11a_solve(self, testdata):
+        solution = Day11PartA()
+        result = solution.solve(testdata)
+        assert result == 10605
+
+    @pytest.mark.xfail(reason="Not yet implemented", raises=NotImplementedError)
+    def test_day11a_data(self):
+        """Result we got when we did the real solution"""
+        solution = Day11PartA()
+        res = solution("day_11/day11.txt")
+        assert res == 0
diff --git a/tests/solutions/test_day11_b.py b/tests/solutions/test_day11_b.py
new file mode 100644
index 00000000..d7cb5d25
--- /dev/null
+++ b/tests/solutions/test_day11_b.py
@@ -0,0 +1,19 @@
+import pytest
+
+from adventofcode2022.solutions.day11 import Day11PartB
+
+
+class TestDay11PartB:
+    @pytest.mark.xfail(reason="Not yet implemented", raises=NotImplementedError)
+    @pytest.mark.parametrize(("input_data", "expected_result"), [("", ""), ("", "")])
+    def test_day11b_solve(self, input_data, expected_result):
+        solution = Day11PartB()
+        result = solution.solve(input_data)
+        assert result == expected_result
+
+    @pytest.mark.xfail(reason="Not yet implemented", raises=NotImplementedError)
+    def test_day11b_data(self):
+        """Result we got when we did the real solution"""
+        solution = Day11PartB()
+        res = solution("day_11/day11.txt")
+        assert res == 0

From 308c66f571bd0ceef44f73445d9e897299636e93 Mon Sep 17 00:00:00 2001
From: Roel Adriaans <roel.adriaans@ordina.nl>
Date: Tue, 13 Dec 2022 21:41:01 +0100
Subject: [PATCH 211/371] Implement day 11, part 1

---
 src/adventofcode2022/solutions/day11.py | 68 ++++++++++++++++++++++---
 tests/solutions/test_day11_a.py         | 12 ++---
 2 files changed, 65 insertions(+), 15 deletions(-)

diff --git a/src/adventofcode2022/solutions/day11.py b/src/adventofcode2022/solutions/day11.py
index 6b63f9a4..fbd64eb0 100644
--- a/src/adventofcode2022/solutions/day11.py
+++ b/src/adventofcode2022/solutions/day11.py
@@ -1,24 +1,39 @@
 from __future__ import annotations
 
+import math
+from typing import NamedTuple
+
 import parse
 
 from adventofcode2022.utils.abstract import FileReaderSolution
+from adventofcode2022.utils.queue import Queue
+
+
+class Throw(NamedTuple):
+    monkid: int
+    worry_level: int
 
 
 class Monkey:
     monkid: int
-    items: list[int]
+    items: Queue[int]
     operation: str
 
     test_division: int
     true_to: int
     false_to: int
 
+    inspections: int
+
     def __init__(self):
-        self.items = []
+        self.items = Queue()
+        self.inspections = 0
 
     def __repr__(self):
-        return f"Monkey(id:{self.monkid}, items[{', '.join(str(i) for i in self.items)}])"
+        return (
+            f"Monkey(id:{self.monkid}, inspections:{self.inspections}, "
+            f"items[{repr(self.items)}])"
+        )
 
     @staticmethod
     def from_string(data: str) -> Monkey:
@@ -26,11 +41,36 @@ def from_string(data: str) -> Monkey:
         monkey = Monkey()
 
         monkey.monkid = parse.parse("Monkey {:d}:", lines[0])[0]
-        monkey.items = [q[0] for q in parse.findall("{:d}", lines[1])]
-        monkey.operation = lines[2].split("=")[1].strip()
+        for item in parse.findall("{:d}", lines[1]):
+            monkey.items.push(item[0])
 
+        monkey.operation = lines[2].split("=")[1].strip()
+        monkey.test_division = parse.parse("Test: divisible by {:d}", lines[3])[0]
+        monkey.true_to = parse.parse("If true: throw to monkey {:d}", lines[4])[0]
+        monkey.false_to = parse.parse("If false: throw to monkey {:d}", lines[5])[0]
         return monkey
 
+    def inspect(self) -> list[Throw]:
+        """Inspect the items we have. Returns a list of Throw's"""
+        throws: list[Throw] = []
+        while self.items:
+            self.inspections += 1
+            item = self.items.pop()
+            # Inspect an item
+            # Appla operation
+            new = self._apply_operation(item)
+            # Divide by 3
+            new //= 3
+            if new % self.test_division == 0:
+                throws.append(Throw(self.true_to, new))
+            else:
+                throws.append(Throw(self.false_to, new))
+        return throws
+
+    def _apply_operation(self, item):
+        action = self.operation.replace("old", str(item))
+        return eval(action)
+
 
 class Day11:
     monkeys: list[Monkey]
@@ -40,12 +80,26 @@ def parse(input_data: str) -> list[Monkey]:
         monkeys = [Monkey.from_string(string) for string in input_data.split("\n\n")]
         return monkeys
 
+    def play_rounds(self, rounds: int):
+        for i in range(rounds):
+            self.play()
+
+    def play(self):
+        for monkey in self.monkeys:
+            throws = monkey.inspect()
+            # And now distribute the throws around
+            for throw in throws:
+                self.monkeys[throw.monkid].items.push(throw.worry_level)
+
+    def compute_score(self):
+        return math.prod(sorted(list(m.inspections for m in self.monkeys))[-2:])
+
 
 class Day11PartA(Day11, FileReaderSolution):
     def solve(self, input_data: str) -> int:
         self.monkeys = self.parse(input_data)
-
-        return -1
+        self.play_rounds(20)
+        return self.compute_score()
 
 
 class Day11PartB(Day11, FileReaderSolution):
diff --git a/tests/solutions/test_day11_a.py b/tests/solutions/test_day11_a.py
index 8c2f3b56..17a23e26 100644
--- a/tests/solutions/test_day11_a.py
+++ b/tests/solutions/test_day11_a.py
@@ -1,22 +1,20 @@
 from textwrap import dedent
 
-import pytest
-
 from adventofcode2022.solutions.day11 import Day11PartA, Monkey
 
 
 class TestDay11PartA:
     def test_monkey(self):
-        test_string = dedent("""\
+        test_string = """\
         Monkey 0:
           Starting items: 79, 98
           Operation: new = old * 19
           Test: divisible by 23
             If true: throw to monkey 2
             If false: throw to monkey 3
-        """)
+        """
 
-        monkey = Monkey.from_string(test_string)
+        monkey = Monkey.from_string(dedent(test_string))
         assert monkey.monkid == 0
         assert monkey.items == [79, 98]
         assert monkey.operation == "old * 19"
@@ -24,15 +22,13 @@ def test_monkey(self):
         assert monkey.false_to == 3
         assert monkey.test_division == 23
 
-
     def test_day11a_solve(self, testdata):
         solution = Day11PartA()
         result = solution.solve(testdata)
         assert result == 10605
 
-    @pytest.mark.xfail(reason="Not yet implemented", raises=NotImplementedError)
     def test_day11a_data(self):
         """Result we got when we did the real solution"""
         solution = Day11PartA()
         res = solution("day_11/day11.txt")
-        assert res == 0
+        assert res == 120056

From c626405a5b8375c9a21bfd2db5a02d2d592a1f25 Mon Sep 17 00:00:00 2001
From: Roel Adriaans <roel.adriaans@ordina.nl>
Date: Tue, 13 Dec 2022 22:31:45 +0100
Subject: [PATCH 212/371] Implement some mod magic

---
 src/adventofcode2022/solutions/day11.py | 39 +++++++++++++++++++------
 tests/solutions/test_day11_a.py         |  4 +--
 tests/solutions/test_day11_b.py         | 13 +++------
 3 files changed, 36 insertions(+), 20 deletions(-)

diff --git a/src/adventofcode2022/solutions/day11.py b/src/adventofcode2022/solutions/day11.py
index fbd64eb0..693e53bf 100644
--- a/src/adventofcode2022/solutions/day11.py
+++ b/src/adventofcode2022/solutions/day11.py
@@ -19,15 +19,19 @@ class Monkey:
     items: Queue[int]
     operation: str
 
+    perform_modulo: bool
+    modulo_factor: int
+
     test_division: int
     true_to: int
     false_to: int
 
     inspections: int
 
-    def __init__(self):
+    def __init__(self, perform_modulo: bool = True):
         self.items = Queue()
         self.inspections = 0
+        self.perform_modulo = perform_modulo
 
     def __repr__(self):
         return (
@@ -36,9 +40,9 @@ def __repr__(self):
         )
 
     @staticmethod
-    def from_string(data: str) -> Monkey:
+    def from_string(data: str, perform_modulo: bool) -> Monkey:
         lines = [line.strip() for line in data.splitlines()]
-        monkey = Monkey()
+        monkey = Monkey(perform_modulo=perform_modulo)
 
         monkey.monkid = parse.parse("Monkey {:d}:", lines[0])[0]
         for item in parse.findall("{:d}", lines[1]):
@@ -59,8 +63,13 @@ def inspect(self) -> list[Throw]:
             # Inspect an item
             # Appla operation
             new = self._apply_operation(item)
-            # Divide by 3
-            new //= 3
+
+            if self.perform_modulo:
+                new = new % self.modulo_factor
+            else:
+                # Divide by 3
+                new //= 3
+
             if new % self.test_division == 0:
                 throws.append(Throw(self.true_to, new))
             else:
@@ -76,8 +85,18 @@ class Day11:
     monkeys: list[Monkey]
 
     @staticmethod
-    def parse(input_data: str) -> list[Monkey]:
-        monkeys = [Monkey.from_string(string) for string in input_data.split("\n\n")]
+    def parse(input_data: str, perform_modulo: bool) -> list[Monkey]:
+        monkeys = [
+            Monkey.from_string(string, perform_modulo)
+            for string in input_data.split("\n\n")
+        ]
+
+        if perform_modulo:
+            # Now that we have all the monkeys, we can our modulo factor.
+            # This means getting the product of all the test_division tests.
+            mod_factor = math.prod(m.test_division for m in monkeys)
+            for monkey in monkeys:
+                monkey.modulo_factor = mod_factor
         return monkeys
 
     def play_rounds(self, rounds: int):
@@ -97,11 +116,13 @@ def compute_score(self):
 
 class Day11PartA(Day11, FileReaderSolution):
     def solve(self, input_data: str) -> int:
-        self.monkeys = self.parse(input_data)
+        self.monkeys = self.parse(input_data, perform_modulo=False)
         self.play_rounds(20)
         return self.compute_score()
 
 
 class Day11PartB(Day11, FileReaderSolution):
     def solve(self, input_data: str) -> int:
-        raise NotImplementedError
+        self.monkeys = self.parse(input_data, perform_modulo=True)
+        self.play_rounds(10000)
+        return self.compute_score()
diff --git a/tests/solutions/test_day11_a.py b/tests/solutions/test_day11_a.py
index 17a23e26..ec98813b 100644
--- a/tests/solutions/test_day11_a.py
+++ b/tests/solutions/test_day11_a.py
@@ -14,9 +14,9 @@ def test_monkey(self):
             If false: throw to monkey 3
         """
 
-        monkey = Monkey.from_string(dedent(test_string))
+        monkey = Monkey.from_string(dedent(test_string), perform_modulo=False)
         assert monkey.monkid == 0
-        assert monkey.items == [79, 98]
+        assert repr(monkey.items) == "deque([79, 98])"
         assert monkey.operation == "old * 19"
         assert monkey.true_to == 2
         assert monkey.false_to == 3
diff --git a/tests/solutions/test_day11_b.py b/tests/solutions/test_day11_b.py
index d7cb5d25..e2de2719 100644
--- a/tests/solutions/test_day11_b.py
+++ b/tests/solutions/test_day11_b.py
@@ -1,19 +1,14 @@
-import pytest
-
 from adventofcode2022.solutions.day11 import Day11PartB
 
 
 class TestDay11PartB:
-    @pytest.mark.xfail(reason="Not yet implemented", raises=NotImplementedError)
-    @pytest.mark.parametrize(("input_data", "expected_result"), [("", ""), ("", "")])
-    def test_day11b_solve(self, input_data, expected_result):
+    def test_day11b_solve(self, testdata):
         solution = Day11PartB()
-        result = solution.solve(input_data)
-        assert result == expected_result
+        result = solution.solve(testdata)
+        assert result == 2713310158
 
-    @pytest.mark.xfail(reason="Not yet implemented", raises=NotImplementedError)
     def test_day11b_data(self):
         """Result we got when we did the real solution"""
         solution = Day11PartB()
         res = solution("day_11/day11.txt")
-        assert res == 0
+        assert res == 21816744824

From 31dfff6be740e5aba6efe0ceb276e00c42650ba3 Mon Sep 17 00:00:00 2001
From: Roel Adriaans <roel.adriaans@ordina.nl>
Date: Tue, 13 Dec 2022 22:39:17 +0100
Subject: [PATCH 213/371] Replace eval with python code, to make it a lot
 faster:

From: Average running time: 6.461925 seconds (10 iterations)
To: Average running time: 1.068471 seconds (10 iterations)
---
 src/adventofcode2022/solutions/day11.py | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

diff --git a/src/adventofcode2022/solutions/day11.py b/src/adventofcode2022/solutions/day11.py
index 693e53bf..8ed1afbc 100644
--- a/src/adventofcode2022/solutions/day11.py
+++ b/src/adventofcode2022/solutions/day11.py
@@ -76,9 +76,18 @@ def inspect(self) -> list[Throw]:
                 throws.append(Throw(self.false_to, new))
         return throws
 
-    def _apply_operation(self, item):
-        action = self.operation.replace("old", str(item))
-        return eval(action)
+    def _apply_operation(self, item: str) -> int:
+        left, op, right = self.operation.split(" ")
+        if left == "old":
+            left = item
+
+        if right == "old":
+            right = item
+
+        if op == "*":
+            return int(left) * int(right)
+        elif op == "+":
+            return int(left) + int(right)
 
 
 class Day11:

From be81b5677641b02717c3fddf98b73ed03144acc3 Mon Sep 17 00:00:00 2001
From: Roel Adriaans <roel.adriaans@asml.com>
Date: Wed, 14 Dec 2022 19:30:17 +0100
Subject: [PATCH 214/371] Update pre-commit stuff

---
 .pre-commit-config.yaml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index 14b5638f..0f977e30 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -2,7 +2,7 @@
 
 repos:
   - repo: https://github.com/ambv/black
-    rev: 22.10.0
+    rev: 22.12.0
     hooks:
     - id: black
       language_version: 'python3.10'
@@ -14,7 +14,7 @@ repos:
       args: ["--ignore", "E203,W503"]
 
   - repo: https://github.com/PyCQA/isort
-    rev: 5.10.1
+    rev: 5.11.2
     hooks:
     - id: isort
 
@@ -31,7 +31,7 @@ repos:
       language_version: python3
 
   - repo: https://github.com/asottile/pyupgrade
-    rev: v3.3.0
+    rev: v3.3.1
     hooks:
     - id: pyupgrade
       args: [ "--py310-plus" ]

From 0a97277312853167b0631091319f202ac2e3d510 Mon Sep 17 00:00:00 2001
From: Roel Adriaans <roel.adriaans@asml.com>
Date: Wed, 14 Dec 2022 19:32:46 +0100
Subject: [PATCH 215/371] Day 12, with dfs/bfs. Seems to work, result is too
 low?

---
 .../solutions/data/day_12/day12.txt           |  41 +++++++
 .../solutions/data/day_12/day12_test.txt      |   5 +
 src/adventofcode2022/solutions/day12.py       | 110 ++++++++++++++++++
 src/adventofcode2022/utils/generic_search.py  | 106 +++++++++++++++++
 tests/solutions/test_day12_a.py               |  19 +++
 tests/solutions/test_day12_b.py               |  19 +++
 tests/test_generic_search.py                  |   0
 7 files changed, 300 insertions(+)
 create mode 100644 src/adventofcode2022/solutions/data/day_12/day12.txt
 create mode 100644 src/adventofcode2022/solutions/data/day_12/day12_test.txt
 create mode 100644 src/adventofcode2022/solutions/day12.py
 create mode 100644 src/adventofcode2022/utils/generic_search.py
 create mode 100644 tests/solutions/test_day12_a.py
 create mode 100644 tests/solutions/test_day12_b.py
 create mode 100644 tests/test_generic_search.py

diff --git a/src/adventofcode2022/solutions/data/day_12/day12.txt b/src/adventofcode2022/solutions/data/day_12/day12.txt
new file mode 100644
index 00000000..2e02b7cb
--- /dev/null
+++ b/src/adventofcode2022/solutions/data/day_12/day12.txt
@@ -0,0 +1,41 @@
+abcccccaaaccccaacaaccaaaaaaaaaaaaaaaaaaaaccccccccccccccccccccccccccccccccccaaaaaa
+abcccccaaaacccaaaaaccaaaaaaaaaaaaaaaaaaaaacccccccccccccccccccccccccccccccccccaaaa
+abcccccaaaaccaaaaaccccaaaccaaaaaacccacaaaaccccccccccccccccaaaccccccccccccccccaaaa
+abcccccaaacccaaaaaaccccccccaaaaaacccccaaccccccccccccccccccaaaccccccccccccccccaaaa
+abcccccccccccccaaaacccccccaaaaaaaaccccccccccccccccccccccccaaacccccccccccccccaaaaa
+abccccccaacccccaacccccccccaaaaaaaaccccccccccccccccccccccccaaaaccaaacccccccccccccc
+abccccccaacccccccccccccccaaacccaaaacccaacaaccccccccccacaccaaacaajaacccccccccccccc
+abcccaaaaaaaaccccacccccccaaaccccaaacccaaaaaccccccccccaaaaaaajjjjkkkccccccaacccccc
+abcccaaaaaaaacaaaacccccccccccccccccccaaaaaccccccccciiiijjjjjjjjjkkkkcaaaaaacccccc
+abcccccaaaacccaaaaaacccccccccccccccccaaaaaacccccciiiiiijjjjjjjrrrkkkkaaaaaaaacccc
+abcccccaaaaacccaaaacccccccccaacccccccccaaaaccccciiiiiiiijjjjrrrrrsskkaaaaaaaacccc
+abccccaaaaaaccaaaaacccccccccaaaacccccccaccccccciiiiqqqqrrrrrrrrrssskkkaaaaaaacccc
+abaaccaaccaaccaacaacccccccaaaaaaccccccccccccccciiiqqqqqrrrrrrruussskkkaaaaacccccc
+abaaaacccccccccccccccccccccaaaaccccccccaaaccccciiqqqqqttrrrruuuuussskkaaaaacccccc
+abaaaacccccccccccccccccccccaaaaaccccccccaaaaccchiqqqtttttuuuuuuuussskkcccaacccccc
+abaaacccccaaaccacccccccccccaacaaccccccaaaaaaccchhqqqtttttuuuuxxuussslllcccccccccc
+abaaaaccccaaaaaacaaccccccaccccccccccccaaaaacccchhqqqttxxxxuuxxyyusssllllccccccccc
+abacaaccccaaaaaacaaaaaaaaaaccccccccccccaaaaaccchhqqqttxxxxxxxxyuusssslllccccccccc
+abcccccccaaaaaaacaaaaaaaaaccccaacccccccaaccaccchhhqqtttxxxxxxyyvvvsssslllcccccccc
+abcccccccaaaaaaaaaaaaaaaaaccccaaaaccccccccccccchhhppqttxxxxxyyyvvvvsqqqlllccccccc
+SbcccaaccaaaaaaaaaaaaaaaaaacaaaaaacccccccccccchhhhpptttxxxEzzyyyyvvvqqqqlllcccccc
+abcccaaccccaaacaaaaaaaaaaaaacaaaaccccccccccccchhhppptttxxxyyyyyyyyvvvqqqlllcccccc
+abaaaaaaaacaaacaaaaaaaaaaaaacaaaaacaaccccccccchhpppsssxxyyyyyyyyvvvvvqqqlllcccccc
+abaaaaaaaaccccccccaaacaaaccccaacaaaaaccccccaagggpppsswwwwwwyyyvvvvvvqqqmmmmcccccc
+abccaaaaccccaacaacaaacaaacccccccccaaacaaaccaagggppssswwwwwwyyywvvqqqqqqmmmccccccc
+abcaaaaaccccaaaaacaaccaaccaaaccaaaaaaaaaaaaaagggppsssswwwswwyywvrqqqqmmmmcccccccc
+abcaaaaaaccaaaaacccccccccaaaaccaaaaaaaaaacaaagggpppssssssswwwwwwrrqmmmmmccccccccc
+abcaacaaaccaaaaaaccccccccaaaaccccaaaaaacccaaagggppppssssssrwwwwrrrmmmmmdccccccccc
+abccccaaaccaaaaaaccccccccaaaaccccaaaaaacccaacggggpooooooosrrwwwrrnmmmddddcacccccc
+abccccaaaaaaaacccccccccccccccccccaaaaaaaccccccggggoooooooorrrrrrrnnmdddddaaaacccc
+abcccccaaaaaaccccccccccccccccccccaaacaaacccccccggggfffooooorrrrrrnnddddaaaaaacccc
+abccaaaaaaaacccccccccccccccccccccaccccccccccccccggffffffooonrrrrnnndddaaaaaaacccc
+abccaaaaaaaaaccccaacccccccccccccccccccccccccccccccfffffffoonnnnnnndddcaaaaacccccc
+abccaaaaaaaaaacccaaccccccccccccccaccccccccccccccccccccffffnnnnnnnedddaaaaaacccccc
+abcccccaaaaaaaaaaaacccccccaccccaaacccccccccccccccccccccfffeennnneeedcccccaacccccc
+abcccccaaacccaaaaaaaaccccaaacccaaaccacccccccccccccccccccafeeeeeeeeecccccccccccccc
+abcccccaaccccaaaaaaaaacccaaaaaaaaaaaaccccccaaaccccccccccaaeeeeeeeeeccccccccccccca
+abaccccccccccaaaaaaaaacccaaaaaaaaaaacccccccaaaaacccccccaaaaceeeeecccccccccccaccca
+abaccccccccccaaaaaaaaccaaaaaaaaaaaaaacccccaaaaaccccccccaaaccccaaacccccccccccaaaaa
+abaccccccccccaaaaaaacccaaaaaaaaaaaaaacccccaaaaacccccccccccccccccccccccccccccaaaaa
+abaccccccccccaccaaaacccaaaaaaaaaaaaaaccccccaaaaaccccccccccccccccccccccccccccaaaaa
diff --git a/src/adventofcode2022/solutions/data/day_12/day12_test.txt b/src/adventofcode2022/solutions/data/day_12/day12_test.txt
new file mode 100644
index 00000000..86e9cac3
--- /dev/null
+++ b/src/adventofcode2022/solutions/data/day_12/day12_test.txt
@@ -0,0 +1,5 @@
+Sabqponm
+abcryxxl
+accszExk
+acctuvwj
+abdefghi
diff --git a/src/adventofcode2022/solutions/day12.py b/src/adventofcode2022/solutions/day12.py
new file mode 100644
index 00000000..09e3b56c
--- /dev/null
+++ b/src/adventofcode2022/solutions/day12.py
@@ -0,0 +1,110 @@
+from copy import deepcopy
+
+from adventofcode2022.utils.abstract import FileReaderSolution
+from adventofcode2022.utils.generic_search import BFS
+from adventofcode2022.utils.node import Node
+from adventofcode2022.utils.point import XYPoint as Point
+
+
+class Day12:
+    grid: dict[Point, int]
+    max_x: int
+    max_y: int
+    start_position: Point
+    end_position: Point
+
+    def parse(self, input_lines: str):
+        self.grid = {}
+
+        for x, line in enumerate(input_lines.splitlines()):
+            for y, char in enumerate(line):
+                pnt = Point(x, y)
+                if char == "S":
+                    self.start_position = pnt
+                    int_value = 0
+                elif char == "E":
+                    self.end_position = pnt
+                    int_value = 27
+                else:
+                    int_value = ord(char) - ord("a") + 1
+                self.grid[pnt] = int_value
+        self.max_x = max(point.x for point in self.grid.keys())
+        self.max_y = max(point.y for point in self.grid.keys())
+
+
+class Day12PartA(Day12, FileReaderSolution):
+    def goal_test(self, pnt: Point) -> bool:
+        return pnt == self.end_position
+
+    def neighbours(self, pnt: Point) -> list[Point]:
+        neighbours = []
+        for dx in (-1, 0, 1):
+            for dy in (-1, 0, 1):
+                if dx == dy:
+                    continue
+                new_point = Point(dx, dy) + pnt
+                if (
+                    new_point.x < 0
+                    or new_point.y < 0
+                    or new_point.x > self.max_x
+                    or new_point.y > self.max_y
+                ):
+                    continue
+                current_value = self.grid[pnt]
+                if (
+                    self.grid[new_point] <= current_value
+                    or self.grid[new_point] == current_value + 1
+                ):
+                    neighbours.append(new_point)
+        return neighbours
+
+    def find_sortest_path(self):
+        shortest_node = BFS().search(
+            initial=self.start_position,
+            goal_test=self.goal_test,
+            successors=self.neighbours,
+        )
+        if shortest_node:
+            path = Node.node_to_path(shortest_node)
+            self.print_path(path)
+            # Subtract the start and ending node
+            return len(path) - 1
+        else:
+            raise ValueError("No Path found!")
+
+    def print_path(self, path: list[Point]):
+        local_grid = {}
+        for pnt, value in self.grid.items():
+            local_grid[pnt] = "   " + chr(value + ord("a") - 1)
+
+        for idx, pnt in enumerate(path):
+            local_grid[pnt] = f" {idx:03}"
+
+        lines = []
+        for x in range(self.max_x + 1):
+            line = []
+            for y in range(self.max_y + 1):
+                line.append(local_grid[Point(x, y)])
+            lines.append("".join(line))
+        print()
+        print("\n".join(lines))
+
+    def solve(self, input_data: str) -> int:
+        self.parse(input_data)
+
+        lines = []
+        for x in range(self.max_x + 1):
+            line = []
+            for y in range(self.max_y + 1):
+                char = chr(self.grid[Point(x, y)] + +ord("a") - 1)
+                line.append(f"{char}")
+            lines.append("".join(line))
+        print()
+        print("\n".join(lines))
+        return -1
+        return self.find_sortest_path()
+
+
+class Day12PartB(Day12, FileReaderSolution):
+    def solve(self, input_data: str) -> int:
+        raise NotImplementedError
diff --git a/src/adventofcode2022/utils/generic_search.py b/src/adventofcode2022/utils/generic_search.py
new file mode 100644
index 00000000..b93f310e
--- /dev/null
+++ b/src/adventofcode2022/utils/generic_search.py
@@ -0,0 +1,106 @@
+from __future__ import annotations
+
+from abc import ABC, abstractmethod
+from collections.abc import Callable
+from typing import TypeVar
+
+from adventofcode2022.utils.node import Node
+from adventofcode2022.utils.priority_queue import PriorityQueue
+from adventofcode2022.utils.queue import Queue
+from adventofcode2022.utils.stack import Stack
+
+T = TypeVar("T")
+
+# @TODO: Make the container a protocol?
+Container = Queue | Stack
+
+
+class Search(ABC):
+    @abstractmethod
+    def _get_container(self) -> Container:
+        """Return the base container for this class"""
+        raise NotImplementedError
+
+    def search(
+        self,
+        initial: T,
+        goal_test: Callable[[T], bool],
+        successors: Callable[[T], list[T]],
+    ) -> Node[T] | None:
+        # frontier is where we've yet to go
+        # @TODO This is ugly, the base class has knowledge of
+        #   the container implementation
+        frontier: Queue[Node[T]] | Stack[Node[T]] = self._get_container()
+        frontier.push(Node(initial, None))
+
+        # explored is where we've been
+        explored: set[T] = {initial}
+
+        # keep going while there is more to explore
+        while not frontier.empty:
+            current_node: Node[T] = frontier.pop()
+            current_state: T = current_node.state
+
+            # if we found the goal, we're done
+            if goal_test(current_state):
+                return current_node
+
+            # check where we can go next and haven't explored
+            for child in successors(current_state):
+                if child in explored:
+                    # skip children we already explored
+                    continue
+                explored.add(child)
+                frontier.push(Node(child, current_node))
+
+        # went through everything and never found goal
+        return None
+
+
+class DFS(Search):
+    """Perform a Depth-first search (DFS)"""
+
+    def _get_container(self) -> Container:
+        return Stack()
+
+
+class BFS(Search):
+    """Perform a Breadth-first search (BFS)"""
+
+    def _get_container(self) -> Container:
+        return Queue()
+
+
+class Astar:
+    @staticmethod
+    def astar(
+        initial: T,
+        goal_test: Callable[[T], bool],
+        successors: Callable[[T], list[T]],
+        heuristic: Callable[[T], float],
+    ) -> Node[T] | None:
+        # frontier is where we've yet to go
+        frontier: PriorityQueue[Node[T]] = PriorityQueue()
+        frontier.push(Node(initial, None, 0.0, heuristic(initial)))
+
+        # explored is where we've been
+        explored: dict[T, float] = {initial: 0.0}
+
+        # keep going while there is more to explore
+        while not frontier.empty:
+            current_node: Node[T] = frontier.pop()
+            current_state: T = current_node.state
+            # if we found the goal, we're done
+            if goal_test(current_state):
+                return current_node
+            # check where we can go next and haven't explored
+            for child in successors(current_state):
+                # 1 assumes a grid, need a cost function for more sophisticated apps
+                new_cost: float = current_node.cost + 1
+
+                if child not in explored or explored[child] > new_cost:
+                    explored[child] = new_cost
+                    frontier.push(Node(child, current_node, new_cost, heuristic(child)))
+
+        # went through everything and never found goal
+        return None
diff --git a/tests/solutions/test_day12_a.py b/tests/solutions/test_day12_a.py
new file mode 100644
index 00000000..d32a28e0
--- /dev/null
+++ b/tests/solutions/test_day12_a.py
@@ -0,0 +1,19 @@
+import pytest
+
+from adventofcode2022.solutions.day12 import Day12PartA
+
+
+class TestDay12PartA:
+    def test_day12a_solve(self, testdata):
+        solution = Day12PartA()
+        result = solution.solve(testdata)
+        assert result == 31
+
+    def test_day12a_data(self):
+        """Result we got when we did the real solution"""
+        solution = Day12PartA()
+        res = solution("day_12/day12.txt")
+        assert res > 311
+        assert res != 312
+        assert res < 459
+        assert res == 0
diff --git a/tests/solutions/test_day12_b.py b/tests/solutions/test_day12_b.py
new file mode 100644
index 00000000..da644b6a
--- /dev/null
+++ b/tests/solutions/test_day12_b.py
@@ -0,0 +1,19 @@
+import pytest
+
+from adventofcode2022.solutions.day12 import Day12PartB
+
+
+class TestDay12PartB:
+    @pytest.mark.xfail(reason="Not yet implemented", raises=NotImplementedError)
+    @pytest.mark.parametrize(("input_data", "expected_result"), [("", ""), ("", "")])
+    def test_day12b_solve(self, input_data, expected_result):
+        solution = Day12PartB()
+        result = solution.solve(input_data)
+        assert result == expected_result
+
+    @pytest.mark.xfail(reason="Not yet implemented", raises=NotImplementedError)
+    def test_day12b_data(self):
+        """Result we got when we did the real solution"""
+        solution = Day12PartB()
+        res = solution("day_12/day12.txt")
+        assert res == 0
diff --git a/tests/test_generic_search.py b/tests/test_generic_search.py
new file mode 100644
index 00000000..e69de29b

From 307efb4764ec516cb66c2b80b2a6e2b92eb6c66b Mon Sep 17 00:00:00 2001
From: Roel Adriaans <roel.adriaans@asml.com>
Date: Wed, 14 Dec 2022 20:23:51 +0100
Subject: [PATCH 216/371] Make day 12 mypy happy

---
 src/adventofcode2022/solutions/day11.py | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)

diff --git a/src/adventofcode2022/solutions/day11.py b/src/adventofcode2022/solutions/day11.py
index 8ed1afbc..971435b3 100644
--- a/src/adventofcode2022/solutions/day11.py
+++ b/src/adventofcode2022/solutions/day11.py
@@ -61,7 +61,7 @@ def inspect(self) -> list[Throw]:
             self.inspections += 1
             item = self.items.pop()
             # Inspect an item
-            # Appla operation
+            # Apply operation
             new = self._apply_operation(item)
 
             if self.perform_modulo:
@@ -76,18 +76,24 @@ def inspect(self) -> list[Throw]:
                 throws.append(Throw(self.false_to, new))
         return throws
 
-    def _apply_operation(self, item: str) -> int:
+    def _apply_operation(self, item: int) -> int:
         left, op, right = self.operation.split(" ")
         if left == "old":
-            left = item
+            left_op = int(item)
+        else:
+            left_op = int(left)
 
         if right == "old":
-            right = item
+            right_op = int(item)
+        else:
+            right_op = int(right)
 
         if op == "*":
-            return int(left) * int(right)
+            return left_op * right_op
         elif op == "+":
-            return int(left) + int(right)
+            return left_op + right_op
+        else:
+            raise ValueError("Invalid op %s", op)
 
 
 class Day11:

From 97aba6b1ed07085fce90e3227abc8aecb254d8ea Mon Sep 17 00:00:00 2001
From: Roel Adriaans <roel.adriaans@asml.com>
Date: Wed, 14 Dec 2022 20:24:50 +0100
Subject: [PATCH 217/371] Fix day 12: issues: Direction was wrong (Only
 horizontal required, but diagonal was done), test for end state was not
 correct

---
 src/adventofcode2022/solutions/day12.py | 60 +++++++++++--------------
 tests/solutions/test_day12_a.py         |  4 +-
 2 files changed, 28 insertions(+), 36 deletions(-)

diff --git a/src/adventofcode2022/solutions/day12.py b/src/adventofcode2022/solutions/day12.py
index 09e3b56c..5b2b672e 100644
--- a/src/adventofcode2022/solutions/day12.py
+++ b/src/adventofcode2022/solutions/day12.py
@@ -1,5 +1,3 @@
-from copy import deepcopy
-
 from adventofcode2022.utils.abstract import FileReaderSolution
 from adventofcode2022.utils.generic_search import BFS
 from adventofcode2022.utils.node import Node
@@ -24,7 +22,7 @@ def parse(self, input_lines: str):
                     int_value = 0
                 elif char == "E":
                     self.end_position = pnt
-                    int_value = 27
+                    int_value = 26
                 else:
                     int_value = ord(char) - ord("a") + 1
                 self.grid[pnt] = int_value
@@ -36,26 +34,28 @@ class Day12PartA(Day12, FileReaderSolution):
     def goal_test(self, pnt: Point) -> bool:
         return pnt == self.end_position
 
+    def heuristic(self, pnt: Point) -> float:
+        distance = self.end_position.distance(pnt)
+        return distance
+
     def neighbours(self, pnt: Point) -> list[Point]:
         neighbours = []
-        for dx in (-1, 0, 1):
-            for dy in (-1, 0, 1):
-                if dx == dy:
-                    continue
-                new_point = Point(dx, dy) + pnt
-                if (
-                    new_point.x < 0
-                    or new_point.y < 0
-                    or new_point.x > self.max_x
-                    or new_point.y > self.max_y
-                ):
-                    continue
-                current_value = self.grid[pnt]
-                if (
-                    self.grid[new_point] <= current_value
-                    or self.grid[new_point] == current_value + 1
-                ):
-                    neighbours.append(new_point)
+        for dx, dy in ((-1, 0), (1, 0), (0, 1), (0, -1)):
+            new_point = Point(dx, dy) + pnt
+            if (
+                new_point.x < 0
+                or new_point.y < 0
+                or new_point.x > self.max_x
+                or new_point.y > self.max_y
+            ):
+                continue
+            current_value = self.grid[pnt]
+            if (
+                self.grid[new_point] <= current_value
+                or self.grid[new_point] == current_value + 1
+                or self.grid[new_point] == self.end_position
+            ):
+                neighbours.append(new_point)
         return neighbours
 
     def find_sortest_path(self):
@@ -64,9 +64,14 @@ def find_sortest_path(self):
             goal_test=self.goal_test,
             successors=self.neighbours,
         )
+        # shortest_node = Astar.astar(
+        #     initial=self.start_position,
+        #     goal_test=self.goal_test,
+        #     successors=self.neighbours,
+        #     heuristic=self.heuristic,
+        # )
         if shortest_node:
             path = Node.node_to_path(shortest_node)
-            self.print_path(path)
             # Subtract the start and ending node
             return len(path) - 1
         else:
@@ -91,17 +96,6 @@ def print_path(self, path: list[Point]):
 
     def solve(self, input_data: str) -> int:
         self.parse(input_data)
-
-        lines = []
-        for x in range(self.max_x + 1):
-            line = []
-            for y in range(self.max_y + 1):
-                char = chr(self.grid[Point(x, y)] + +ord("a") - 1)
-                line.append(f"{char}")
-            lines.append("".join(line))
-        print()
-        print("\n".join(lines))
-        return -1
         return self.find_sortest_path()
 
 
diff --git a/tests/solutions/test_day12_a.py b/tests/solutions/test_day12_a.py
index d32a28e0..5ef39aae 100644
--- a/tests/solutions/test_day12_a.py
+++ b/tests/solutions/test_day12_a.py
@@ -1,5 +1,3 @@
-import pytest
-
 from adventofcode2022.solutions.day12 import Day12PartA
 
 
@@ -16,4 +14,4 @@ def test_day12a_data(self):
         assert res > 311
         assert res != 312
         assert res < 459
-        assert res == 0
+        assert res == 350

From e0b7d8f247c343d61769889244d6339e0b4ef65a Mon Sep 17 00:00:00 2001
From: Roel Adriaans <roel.adriaans@asml.com>
Date: Wed, 14 Dec 2022 20:38:54 +0100
Subject: [PATCH 218/371] Implement part b. If we modified BFS we could quit
 early, but meh

---
 src/adventofcode2022/solutions/day12.py | 31 ++++++++++++++++++-------
 tests/solutions/test_day12_b.py         | 13 ++++-------
 2 files changed, 26 insertions(+), 18 deletions(-)

diff --git a/src/adventofcode2022/solutions/day12.py b/src/adventofcode2022/solutions/day12.py
index 5b2b672e..1111d798 100644
--- a/src/adventofcode2022/solutions/day12.py
+++ b/src/adventofcode2022/solutions/day12.py
@@ -29,8 +29,6 @@ def parse(self, input_lines: str):
         self.max_x = max(point.x for point in self.grid.keys())
         self.max_y = max(point.y for point in self.grid.keys())
 
-
-class Day12PartA(Day12, FileReaderSolution):
     def goal_test(self, pnt: Point) -> bool:
         return pnt == self.end_position
 
@@ -58,18 +56,14 @@ def neighbours(self, pnt: Point) -> list[Point]:
                 neighbours.append(new_point)
         return neighbours
 
+
+class Day12PartA(Day12, FileReaderSolution):
     def find_sortest_path(self):
         shortest_node = BFS().search(
             initial=self.start_position,
             goal_test=self.goal_test,
             successors=self.neighbours,
         )
-        # shortest_node = Astar.astar(
-        #     initial=self.start_position,
-        #     goal_test=self.goal_test,
-        #     successors=self.neighbours,
-        #     heuristic=self.heuristic,
-        # )
         if shortest_node:
             path = Node.node_to_path(shortest_node)
             # Subtract the start and ending node
@@ -100,5 +94,24 @@ def solve(self, input_data: str) -> int:
 
 
 class Day12PartB(Day12, FileReaderSolution):
+    def find_sortest_path(self):
+        # Find all the possible starting positions
+        start_points = [point for point, value in self.grid.items() if value == 1]
+        shortest = 9999
+
+        for point in start_points:
+            shortest_node = BFS().search(
+                initial=point,
+                goal_test=self.goal_test,
+                successors=self.neighbours,
+            )
+
+            if shortest_node:
+                path = Node.node_to_path(shortest_node)
+                # Subtract the start and ending node, and compute the minimum value
+                shortest = min(len(path) - 1, shortest)
+        return shortest
+
     def solve(self, input_data: str) -> int:
-        raise NotImplementedError
+        self.parse(input_data)
+        return self.find_sortest_path()
diff --git a/tests/solutions/test_day12_b.py b/tests/solutions/test_day12_b.py
index da644b6a..56a09af4 100644
--- a/tests/solutions/test_day12_b.py
+++ b/tests/solutions/test_day12_b.py
@@ -1,19 +1,14 @@
-import pytest
-
 from adventofcode2022.solutions.day12 import Day12PartB
 
 
 class TestDay12PartB:
-    @pytest.mark.xfail(reason="Not yet implemented", raises=NotImplementedError)
-    @pytest.mark.parametrize(("input_data", "expected_result"), [("", ""), ("", "")])
-    def test_day12b_solve(self, input_data, expected_result):
+    def test_day12b_solve(self, testdata):
         solution = Day12PartB()
-        result = solution.solve(input_data)
-        assert result == expected_result
+        result = solution.solve(testdata)
+        assert result == 29
 
-    @pytest.mark.xfail(reason="Not yet implemented", raises=NotImplementedError)
     def test_day12b_data(self):
         """Result we got when we did the real solution"""
         solution = Day12PartB()
         res = solution("day_12/day12.txt")
-        assert res == 0
+        assert res == 349

From bb7bf4439a2ab6e90583408e69ae693bcd74e22d Mon Sep 17 00:00:00 2001
From: Roel Adriaans <roel.adriaans@asml.com>
Date: Thu, 15 Dec 2022 20:53:42 +0100
Subject: [PATCH 219/371] [WIP] Day 13 work in progress

---
 .../solutions/data/day_13/day13.txt           | 449 ++++++++++++++++++
 .../solutions/data/day_13/day13_test.txt      |  23 +
 src/adventofcode2022/solutions/day13.py       | 102 ++++
 tests/solutions/test_day13_a.py               |  53 +++
 tests/solutions/test_day13_b.py               |  19 +
 5 files changed, 646 insertions(+)
 create mode 100644 src/adventofcode2022/solutions/data/day_13/day13.txt
 create mode 100644 src/adventofcode2022/solutions/data/day_13/day13_test.txt
 create mode 100644 src/adventofcode2022/solutions/day13.py
 create mode 100644 tests/solutions/test_day13_a.py
 create mode 100644 tests/solutions/test_day13_b.py

diff --git a/src/adventofcode2022/solutions/data/day_13/day13.txt b/src/adventofcode2022/solutions/data/day_13/day13.txt
new file mode 100644
index 00000000..fe5c5ae1
--- /dev/null
+++ b/src/adventofcode2022/solutions/data/day_13/day13.txt
@@ -0,0 +1,449 @@
+[[[[4,7,7],0,4,[6,3,3,7,10],2],2,[[3]]],[]]
+[[[[1,4,8],[3,3,1,4]]]]
+
+[[7,6],[],[[5],0,10,[7,9,[7],0]]]
+[[[[6,9,0]],0]]
+
+[[7,7,[[5,1,4,9,4],8,[8],[1,1,6,2]],[[],3,6,[],[]]],[],[10,2,7],[0,[1,2,4,1,0],[1,[],0],5,[]],[4,[[],[],[]],[]]]
+[[3,6],[[9,6,[]],8,[8,8,3,[8,2,3,10],[6,5]],[6,4,[8,5],8]]]
+
+[[[[4,8,1,3,4],[2,4,10,5,4],[7,7],7],[[9,8,4,7,0]],8,[3,1]],[[],[[9,3],5],[],7,[[],8,8,[6,0,3,10,2],[0,8,7,0]]],[9,[4],7,3]]
+[[5],[[[],[],[7,10]],3,6],[[[],4,[8,6,3,1],0,[5,1,0,4]],[],[[9,5]],4]]
+
+[[6,10,9,[],[[2]]],[9,[10,[3,5,0],[6,5]]],[],[[8,[2,2,3]],6]]
+[[],[[],9,[9,2,[6,8,10,3],2],9,3]]
+
+[[[[3],[]],5],[[],[7,[3,3,3],2,[1],[6,7,9]],[],8,1],[9,[0,0,[5,3,5,1],[2],2],3],[2,[0,4]]]
+[[[]],[[[],10,[8,0,5,5],[5,4,8,10,1],[6,8,0,3,5]],2,[9,[5],[9,2],[]],[8,[]]]]
+
+[[3],[[8],6,5],[]]
+[[],[0],[],[3,0],[]]
+
+[[0,[[9],[],[6,10,9,9,6],[1,1,10,6],[1,2,6]]],[]]
+[[[3,[5,3,7,10,5],[9,2,1]],[[3,7,0,6]],[[]],[4,[1]],[8,8,[2,4,8,3]]],[[5,6],[]],[[],5],[]]
+
+[[3,4,[[1,6,10],[10],[1],[]],8,[[4,10,3]]],[9,8,0,0]]
+[[0,[9],[],9,0],[6],[[0,7],0,[[10],[8,5],[3,3,6,2,7]]],[[[2,7],1,10,6],[]]]
+
+[[[],5,10,[7,0,[3,0,1,0]],6],[[[7,10,3,9],2,[5,6],3,[4,0]]],[[],[6,[3],[5,0,8,2],[0,9,10,5,5]]]]
+[[9,1,0,4],[]]
+
+[[0,0,2,6,[[3],[3,4,7],[10,8,7,9],[4],4]],[[3,[]],8,[[10],8,3,[4,4,8],[0,2,9,7]]],[]]
+[[[4,1],4,8]]
+
+[[[[1,9,4,3,8]],[[2,8,0,9,0],0,4,5,[2,9,5,1,8]],8,3],[[[4],1,8,[5,8],[4,0]]],[[0,7,[8,1,4,0,5],7],[[8],[],[0,8,5,7,5],6],0,[[4]]],[[],9,4,[6,[],[1,2,3,10],1],[[6,0],[8],5,6]]]
+[[[5,[]],[],0],[[5,4]]]
+
+[[[6],[],1],[0,[7,1]]]
+[[[6],5,4,10],[8],[[[6,0,1,4,4],7,[],6]],[10,4],[[[3],[0,0,1],3]]]
+
+[[[6,[9,10]],[[],3,[8,3],3,[3]]]]
+[[[7,0,9,[8]],[[3,2,9,6,1],6,[4]]],[[[5,2,2],1,0,9],8,4,10]]
+
+[[2],[]]
+[[5],[[[4,3,5],[5,9,10,6,7],[5],4,[9,7,6,2]],2,[]]]
+
+[[2,0,[[]]]]
+[[[[8,2,8,8,6]]],[7,[[4,0,8,9,9],10,3,[],[5,7,6]],9,3,9],[7,[1,9],[6,[],3],10,1],[[]]]
+
+[[[2,10,7,[8]]]]
+[[3,[[2,5,2]],[8],[],[[]]],[]]
+
+[[[5,7,4,0,[3,9,0,7,4]],[]],[7,4],[2],[[[5]]],[[[3,7]],[9],[5,[4,0],4,3,8]]]
+[[9,[8,[],[2,3],[9,2,10]],[]],[1,1,[9,7,[0],[8,10,7,10,4]],8,[]],[7],[[7,[10,1,5,7,7],8,[3]]]]
+
+[[],[[[5,4,7,10,3]],0],[],[[4]],[[],[2,0],1,[[4,0,6,9,1],[5,5,0,8,9],[4],[]]]]
+[[[],6,[7,8],1,0]]
+
+[[[4,[7,1,9,4,0],[10,8,8,3],[7,10,4,3,9]],2,[3]],[[[]],[9,[10],8,0,10],4],[],[[1,4,7,[]],3],[[[4,1],[4,0]],[[10,3],[10,7],1],3,[9,[3,6,10,4,3]],0]]
+[[[0,[0,10]]],[[],[],[0,[],[1,0,5,3],1,7],[7,4],2],[[7],8],[[[7,8],[10,2,0,5,1],[8,6]]],[[6,[7],[1,5,1,5],9]]]
+
+[[[5,[7,8,0,6],0,4],[[6],1],[1,[0,0,6,9]],[10,[5,4,4],[8,9,7,8,1],[9,8,3]],[[6,7,5],10]],[[2]]]
+[[[[4,4,1,0],[1,5,7,7]],[9,[6,7,6,7],7,[0]],2,[[3,1,4,4,5],[0,4],[3,5,7]]],[[3,5],4,5,3,6],[1,9,[[9,10,2,10],5,[9,9],[3,0,0],7],0],[5,5]]
+
+[[2,3]]
+[[],[8,5],[[[7,4,4,10,8],[],[10,6,10]],8,4,1]]
+
+[[[[],8],[10,2,[],4,[5,9,4,3]],[[0,1]]],[1,10],[5,6,10,[10,[3,10],[]]],[9,[2,[0,7,1,8],5],[6],1]]
+[[3,[8],3,[4,10,[5,10],3,10]]]
+
+[[0],[0,[[1,6,10],[5,3,10],1,[7,10]],1]]
+[[],[5,0],[[4,[1,8,4],[8],[3,1]],6,[9,[3],10,8,[1,8,2,1,6]],3,[[8],0,4,6]],[[[10,1,1,9],0],[1,[],[1,6,8,9],[0,5,6,8,1],[2]],[9,[2],[9,0,4,6],[4,0,6,4]],[[9,9,5,9],1]],[2,[],[5,[2,1],7,[],10]]]
+
+[[10,1,9,6,[[8],5,1,[5,4],[5,0]]],[[[7,6,1],10,10,[2,8,5,3,1],5],7,[[2,5,6,7,1],5,[]]]]
+[[6,[[10],[7,9,2,0],8],2,3,[]]]
+
+[[],[0,5,8,3,[]],[[5,5,[],[10,10,4]]],[8],[8]]
+[[5],[7,2,5]]
+
+[[],[],[5],[]]
+[[],[[2,[0],8],[[9,0,6,6,1],2,2,[0],[]],5,9],[[],3,7]]
+
+[[5,[[8],5,[5],[5,5],[10,5,9]],[[5,1],[1,10,6,8]],8,[[2,9]]],[[[0,8,5],10,[9,6,4],2,8],5,7,0]]
+[[8,[8,[5,1,2,5],[5,10,6,5,3],0],6,10,1]]
+
+[[8,6,[[],[6,3],10,9],7]]
+[[[4,[7,6,7,2,5]],[[10,4,8,10]],6,[[4,5,2,10,7]]],[[[1,9,10,6]],[9,[],[8,0,4,1]],10,6],[],[10,[[6,0],[1,9,9,10,5],[8,9],6,7],[1,9]],[0,[[6,3],8,[3],[],1],[[1,1],[],6,1,[10]]]]
+
+[[10,9,[4,[7,6,3],5,[]],[],[3,0,2,3,[10,6,10]]],[2,[[1,10],6,[9,5],[4],8]],[[[2],[2,8]],[2,1],6,[],4]]
+[[5],[9]]
+
+[[[],[[0,4,6,4],2],0,5],[6,[[],5,2,2,[]],[0,[9,0,5]]]]
+[[1,6,2,7],[2,5,0,2,[7,2]],[[9,9,2,[6,0,6,3,9]],[],[],0,8]]
+
+[[[4],5,[],3],[[[],5,5,[9,4,7,3]],[],3],[],[[2,4,[0,0],10,[]]]]
+[[],[[[7,0,8],[6,9,0,0,2],[5,6,10,7]]],[4,8],[8,7],[[0,[0,10],[5],0,[1]],[5,0,[9,3,4,9]]]]
+
+[[[1],3],[],[]]
+[[10,[[2,2],[6],[8],5]],[8,4]]
+
+[[9,[],8,[[9,4,10],5,3,[7,6,0,6]],2],[],[[3],4,[5],[8,[0,0,9,3],10,[],[]],[[7,6,7],9,[4,2,6],[0,7]]]]
+[[],[3,2,[1,7,[3,1,10],[6,3,1,5,1],2]]]
+
+[[[3,[4,2,7,9],[8,7,2,10,8],[5,3,10],[9]],[[1,2,5],10,[5,4,7],[2,0,7,5],[1,4,3]],[2,[],3,[]]],[],[],[[5,10],6]]
+[[[[5,10]],[[10],2,[9,6],[6,9]],1],[[[0,2,7,6,0],[3,4],[5,2],2,4],[],[2,[],[7,10,4],2],[[3]]],[[],[1,8,[7,0,1]],8,8],[[[8,1],[1,5,10]],[[2,0,8,4,2],2,4,7,[4,0]],9,[7,10,1],8],[5]]
+
+[[[4],[],[8],1],[[],4,0,4,[[2,5,7],0,[1,9,6,6],[6,2,0,0]]]]
+[[1,[[3]],[2,3,6,[4,5,3,4]],8],[[],2],[5,0,[[8],[4,0,4,9]],[3],1],[10],[3,2,3,5,[10,9,[2,6,4]]]]
+
+[[1,[[5,8],[0,5,4],[1,8],9],9,[[5,4],[0,1,4,2,7],[7,1,8,5,8],[3,6,8],9]],[[[2,7,9,3],4,[6,2,1],7],4,10],[6,1,2]]
+[[5,0,[[9],[10],[2,7,5],[7,6,6,5],2]],[4],[2,10,1,[[],4],[[],0,[0,4,8,7]]],[[[],8],5,[10],[4,[],7]],[]]
+
+[[[1,[4,6,6,5]],[[8,1,2,2,4],2,[1]],7,5,2],[8,2,3,2],[[],[5,10,4,[]]]]
+[[3],[[]],[[10]],[[0,[3,9,10],9,6],10,6,6,1],[[4,8,2,2,[10]],[[]],[2,6],[0,[2],2,[8,0,1,2],3],5]]
+
+[[[[7,4,7,8,10]],[[10,7,8,5],[1,6,7,4,2],3,[5,7,2,4,2],4]],[4,10,6,1,[[8,0,5,8],1,[2,3,0,9,4],[6,10,1,9,10],[9,0,9]]],[1,9,5]]
+[[[3,5,5],10,5,[],[[1,0,2],7,[1,1,2,9,2]]],[[],[[2,3,7,9],[],2,4,4],8,10],[],[5,[[2,1],3]]]
+
+[[7,9,9,[[7,6],8],5],[0,10,[3,5,1,[0,10,1,8]]],[[[10]],[8,[2,0,10,9,1],7,[8,1,7],[0,8,3]]],[[9,[0,0,9,3],[5,0,10,7,10]],[],[10,7],[],[[10,6,10],[10,3,4,8],1,[]]],[3,[],[[],[7,10],0],[]]]
+[[[7]]]
+
+[[4,[4,[2,10,7,1,9]],5],[9,3,[[6,7,2,5],[4,7],[10,7,5],[5,9,5,9]]],[5,[],[10,[2,9],8,[]]],[[[6],8,3],8]]
+[[9,[2,10,6,7],5],[7,[7,[6,10,2],[6,4,3,4]],8]]
+
+[[3,[3,[2,8,4,3],9,10,[]],[4]],[8],[[2,[8,0,0,9],9,5,0],9]]
+[[[],8,[5,[0,0,10],8,0]],[[0,[5,4,8,5,10],10,[10,0],9]],[10,3,6,6,[]],[6],[9,7,[3,10,6,[3,2]],0,[3,[6,0,2]]]]
+
+[[7,[5,[3],2],1,2,[8,8,[1],3]]]
+[[5,6,[[2],4,3],[9,2,3,9]]]
+
+[[],[6,8,2,7,3],[[[3,5,0,5,4],[0,0,3,8],[2,8,3,4],0],[],[[5,5]]],[9,[3,[],6,9,6],[5,[10,4,9,1,3],9]],[5,[],10]]
+[[8],[1],[[],5,[[4,5],[],3],6,[[4,10,2,0],1,[4,7,8,10,10],[5,0,10]]],[2],[[5,[],[10],6,[2]],[[9,10]],[0,2,5],3,9]]
+
+[[6,3,6,2]]
+[[],[[8,[7,3,4,3]],[[7,1],[2,0,9,3],3],9],[3,[[8,3,7,3],[2,4,3,0],5,[5,4,6,5]],2,0,7],[4,[5],[[],[],3],7,4]]
+
+[[[],6,[],[[9,8,2,3,8],4,[5],[1,0],[5,4,2,9,7]],[1]],[3,[]],[[[1,4],[4,8,7],[5,1,1]],[[9,9,0,5,4]],[9,[]]]]
+[[[]],[[[3],9,4,[]],[[2,6,3,10],[5,8,9,5,8],[5,5,2,7,1],10,[2,8,0,4,10]]],[],[[[2,5,10,7],10,3],6,[[10]],[[5,3,0,7,1],6],4]]
+
+[[]]
+[]
+
+[[8],[[[1,10],2,[5],5],[]],[[[8,5,2],[8,5],[5,10,4],[9,9,10],9]],[[[]],1],[4,[],[3,[],[10],3,[8,8]],[[9,4]]]]
+[[[[8,8],[7,1,8,4],[8,2,1],[4,5,4],9],9,[],1],[[5,1],[[3],9,1],9,7],[[0,10,8,4,[0]],[[2,0,9,9,6]],0,3,10]]
+
+[[9,[[6,2,10],10,[6],[7,3]],4,8,[[1,1,9,2]]]]
+[[[],[7,9],4,[[1,9,8,10],[5,1,5,4],[9],[0,0,10]]],[3,3,9,[[7],10]],[[[],5,0,5,9],[[10],1,[],1,[7,6]],9,1],[[[2,9,4,1]],4,4,[7,7,[7,3,9,8],[2,6,7,9,2]],[5,[],2,8,3]]]
+
+[[[[3,10,6,6,6],0,[1,2,3,3,9]],2]]
+[[10,3,[]],[3,2,[]],[[10,[2]],5,8],[3,3],[[4,[],6,4,6],6,1,7,[3,4,3,[4,9,6,2]]]]
+
+[[5],[[6,8]],[7,0]]
+[[[],[0,6,[],9],[[4,1,3,1],7,0],[6,[4,6],[]],[4,3]],[],[[8,[3,9],[],[5,10,4],[4,0,4]],[[7,4,10,4,2],[5,7,5],[5,1],0,[6]]],[4,[[2,3,0,0,6]],2]]
+
+[[8,6],[[5,[9,2,5,7,9]],[[5,9],[5,6,3,10],5],[[5,10,6,3,6],[3,1,4,1],[8,7]]],[[],[0,10,[1,3,5,6]]],[]]
+[[8,[6,1,8,[],6],3,[7]]]
+
+[[1,8,3,[[2,2,0,4],3,[],8,5]],[5,[[6,3,1,9],6,9,[7,6]],5,9]]
+[[[[2,8,2],9,[9],2],2,2,[],[6,6]],[[[],[4],[6,5,1,0,7],[9,5,5,1],[2,6,2]],[4,[0,3,3,5]],[]],[6]]
+
+[[[[3,7,10],1,[6,2,1,10],[2],6],5],[]]
+[[3,3,3,[9,6,[],[10,8,9]],9],[10,[[8,9,8,6],[10,2],[2,7,2,0,1],3],[0,8,[]],10,7]]
+
+[[[9,7],[0,4,7,7,7],[[3,6,8,7,2],[],5,[2]],5]]
+[[],[[[]],4,[[5],8,[],[],[10,1]],[],[3,2,[],9]]]
+
+[[],[5,1,9,1]]
+[[5,[10,[10,4,10],[4,6],8,[5]],5,5],[[[]],1,1,[]],[3,5,3]]
+
+[[],[3,10,[3,[5],9,[]],[0]]]
+[[[7,1],[[6,5],5]],[10,[5,7,[5,1],[]]],[[1],[4]],[6]]
+
+[[[[0,5,2],[6],[3,9]],[[10,3,2],3,[1,1,5]],9,[8,9,[9],10]],[[[1,9],0,9],1,[0,4,6],2],[[],4,[[],5]],[4,[6,[8],10],[],[[],[9],[1],[0,3,5,6],7]],[]]
+[[3,[6,7,[],1,5],[8],[3]],[10],[1,6,10,6,[7,6]],[10,[[2]],7]]
+
+[[0],[],[2,4,2,[7,[7,2,0,1],5,1],0]]
+[[[[1,7,3],6,3],9,9,[[0],4,5,[2,3,2,1],[6,4]]]]
+
+[[0,[3,[9,3,2],[7,9,10,4],[7,6,6,10]],[4,[5,7,0],5,1,6],10,[4,[9,2,9],0]],[5,[[10,9,4,0],1,[6],6],[2,9,[],[5,9],[]],[10,[],[],[1,4]]],[[7,9,[7,8]]]]
+[[5,[10,2,[4,7],[]],[0,0,[7,4]]]]
+
+[[],[[8,[6,10,7],4],0],[],[4,0,[4,0],7,1],[4,10,[[9,7,3],[7,4,9,9,7],5,5]]]
+[[[3]]]
+
+[[],[[1,5,[9,0,7,6,2],10,0],[]]]
+[[[10,[10,8],[2,0]],6,4,10],[],[8],[]]
+
+[[3],[[6,[6,4,4,7,7],[5,4,6,4,7],[0]],[[9,4,10]]],[10,[10,[7,9,2,4],8,9,7],10]]
+[[[[7],[7,2,4,8]],[3,[5],8,5],[[7,7,2,8,2],[1,10,8,2,10],[2]],6,[[9,6],10,[4]]],[5,[],[]]]
+
+[[5,[6,7,6,6],8,4],[[],1],[5,9],[[],5,6,7,[[6,8],10]]]
+[[],[[],8],[4,6]]
+
+[[4],[]]
+[[],[],[1],[[[7,7,1],[1]]],[[[1,9,5,0],4,5],1,[8,0,[7,4,8,1]],[[9,0,9],9,[4,5]],[0]]]
+
+[[[[],8,9,[6,5,7]]],[[[8,10],[0,9,8],5,4],[[10,8,8,3]],[[3,4,1,5],9,[],[4,10,10],3],8],[0,9],[[9,[8,1,10,1],[10,1,4],[3,1,10]],[7,9]]]
+[[[1,[6],1],[[],4],3,9,5]]
+
+[[1,6,[],4,[7,10,1,[7,9,7,1],5]],[10,6],[0,6]]
+[[[[3,7,9,5,7],7,4,10,4],4],[],[[[10,4,1,2,4],6,[1],7,[]],[[5,8,5]],8,[[5],[],[10,3,1],[6,7,6,5,10]],[8,[7,4,5],[2,8,10],[]]],[3,9,[[8],3,[0],2],7,[2,[0,3,7,5,4],4,8]]]
+
+[[[],[[6,7,3],[5,6],7,[7,1,8,3,10],[5,6,8,4]],8],[[[10],[5],[6,0,10],9]],[[[],[9,8,8,9,2],[2,5],[4,6,7,5]],10]]
+[[[1,1,0,[9,6,3,10,7],2],2,10,[8,8,3,[10,10,5,4,7],[]]],[10],[5,[6,3],3,6,1],[[2,[6,10,10,9],[2,7],8,[2,0,7,10]],7,[],[5,[2],[],4,9],[1,[10,3],[]]]]
+
+[[[[0,1,7,7],9],8,4,[],[]]]
+[[[7,[10,3]],[8,1]],[10,9,7,[[1],[6,9,2],8,1,[5,7,3,5,10]],[[]]],[[[9,3,9,10,9],0,[6]],1,[2,[5,8,4,5,5],9,[4,10],2],0,[4,[0,1],10,[6,9,9]]]]
+
+[[[3,7,[1,9,9,1,7],4],[],[[6,10,1,1],9,[9,9],8,0],4,[[],[7,8,0],9,[7,6,4,0,9]]],[[9,7,3],[[2,6,5,5],[]],[[9],[7,5,0,8],[9,9,1,1,0]],7,3],[5]]
+[[[[10,2],10],7,6,[[10],[5,4],0,4,[8,5,4]],[[],1]],[4,8,[3,1,[0,8],[3],6],[[3,4,3],[6],[4,5,4]]]]
+
+[[[0,[9,6,6,8],0,[3,7]],[[3,2,0],[3],[4],[6]],4,3,[7]],[7,[[],[],8],6,3],[],[1],[5,9]]
+[[[7,[6,4,7]],[[2,5],10,[6]],[[],[]],[1,[9],6,9,[0,7,4,3]],1],[1,[8,[7,8,1,9],[10,3,3,4]],[[4,7,3,0,3]],[[1,6,6],6,5]],[]]
+
+[[6,[5,6],5,8],[[[5,8,4,9],9,[1,8],3,[9,5]],[]]]
+[[3],[1,[10,0,[2,7,3,8,2],[10,3,9,4,2]]],[[[10],[8,2,10],5,2],3,[3,[8,0],3,5,4],[],3],[],[[9,8,9]]]
+
+[[[5],7,[[5,8],[3,9,3]],[[4,5,3,3],[4,5,1,2],4,9]]]
+[[7,[2,[3,3,0,5,3],10]],[6,5]]
+
+[[[3],[[9,1,2]],6,5],[8],[10,[[1,5,2,10,7],[],[10]],5,6]]
+[[7,10],[[],5],[],[10,[6],[10],[[],10,9,[1,2],[0]],6],[6,0,[7,[3],[8,9,2],5,3]]]
+
+[[[[0,2,2,0,8],1],1]]
+[[[],[[1,1,6,10,3],9,1],[[2,2],8,3,1],[[9,0,6,1,0],[3,3],7]],[],[[7,[1],[3,4,9,0,0],8],7,[9,[],[8,0,8],10],[[3,8],6,[8,0,10],[9,0,1,0,8],5]],[[[2,10,5,3,2],[2,5,7,9],[3,4,4,3]],0,2,[[]],3]]
+
+[[1,7,[[6,7,7],1,[4,3,10,1],3],0,3],[2,[]],[],[7,[[0,4],[5,8],7],[[7,10,3,9,5],[6,5,1,6,6],10],[2,0,[6]]],[]]
+[[[[7],5,[]],8],[3,4,7],[[],[2,[6,7,7,0],[5,0,1],[7,5,1]]]]
+
+[[0,[],1],[[[10,0],[5,2],6],9,[[10,8,2,7,3],[4,8],[2,5,3,7,2],[9,4,3,9,9]],3,9],[]]
+[[],[[[],[1,3,3,6]],[4,[2,6],4,[8,5]],[5],7],[[],[[],0]],[3,[[0,2],[1,4],0],6,3],[[],[[9,7],[],[7,3],[],7]]]
+
+[[[7,[2,3,3],5,8,9],[[1,8,6,7]],6,[8,[0,8,0,7,10],[8],[6,9,1],1],9]]
+[[7,4],[[[8,7],3],[0,8,9],6],[8,[3,[],5,[10,0],2],[1,2,[9,4],0]],[[],[],10,[[3],4,2]],[10,[8,7],4,[[3,3,5,6],[],[9,8,4,1],[0],10],[]]]
+
+[[],[[[5],[3,7,7,0],[4,9,6,6]]]]
+[[[[],[5,5,10,4]],8]]
+
+[[4,9,[],4]]
+[[8,3,10],[[[1,1,1],[10,3],[9,1,10,3,4]],10,10,4],[[[]]]]
+
+[[1,[6,4,6],[],0,[[],[]]],[8,3,[2],7,8]]
+[[8],[1,[],[2,[4,9,3],5,3,7]],[],[[[9,6,1,4],[9],0,8]]]
+
+[[[[9,7],[0,4,5,7,3],[10,8]],[[10,6,9,4],0,3,[9,2,5,8],[5]]],[[0],9]]
+[[[[5,7,1,1,7],5,[],2],[3,[4],7,[9,0,9,1,0]],[[8],[10,3,10],[1,1],10,[5,3,7]],10],[[6],1],[[[],[4]],3,10],[]]
+
+[[[2,8,4,[8,7,6,5]],5],[10],[7,[]],[[9,7,10,0]],[5,9,[],[10,2,[2,2,7,0]],4]]
+[[[[10,7,6,1],[]],[2,[],10,2,1],0,[[2,9,9,9,1],3,8,[9,7,6,3],2]],[4,[[3],9],8,[10,[6,9],[6,6,6,8,7],2,6]],[7,[[6,7,8],[5,2,8,7,9],[],8],0]]
+
+[[[4,10],8,10,8],[3,1,[2,7,[7,10]],2],[[2,0,3]]]
+[[6,8],[10,[[1],7,7,10]]]
+
+[[[],[10,9,8,0,5],4,[],0],[[[1,8,6],8,[2,10,9,8],7],[7]],[2,[[9,8,5,4],8,[],[]],[[]],9,[2,4,[3,3,9,10]]],[]]
+[[2],[[[6],[3,2,0],[3,8],[3,8,8,3,0]],6],[2,[10,[],9,[],[7,3,9,2,4]],3,2,1],[8,3]]
+
+[[4,[9],[[9,10,4,7,2],8,[1,9,0]],[3,6,9,9],[[3]]],[]]
+[[[8],[7],[1,1,[7,10,7,5,2]],[[4,5],[9,10]]],[[],2]]
+
+[[[[7,9],[0,6,8],8,5,[1]],4,[6,1,[1,2,3,3,9]],10,7],[4,[[],3,5],7,[10],0],[4,1,5],[0,9,[[10,5],[0],9,[0,7,4,2,10]],5,9]]
+[[[[9,9],1,10,[9,7]]],[1,[[1],[2,4,9,0]],[4,0],7],[[3,[1,3,4,7],5],2,[[]],[[5,4]]],[1,4,9,10]]
+
+[[[6],[[2,4,10,8,1],[0,5,1,10],2],[0,1],[[8]]],[[2,[4,0]],[[]],[3,2,0,[8,8],[0,5,10,6]],1],[2,9,4,6,[[8],[9],10,[5,5],[5,5,9,8]]]]
+[[[[6],6,[4,9,4,9,4],[7],[1,0]],[]],[[[],3],[[0,3,3,2],6,[2,6,6,8]],[[6,10],8,4],6],[1,5],[[],10,[]],[[[6,7,5],[4],[]],2,0,[[],[10,3,2],1,2]]]
+
+[[10,[[1,3,1,1]],3],[7,[[4,9],[5,4],3],10]]
+[[[[],1,[9,7,2,10,6],10,6]],[1,[0,[3,8,0],1,2,[8,6,4]],2,[[7,5]],[[],[3,8,7,1],[],2]],[[],4,1],[[[6,2],[7,0,2],1,[10],[3]],[],[0,[10],[2,2],0,2],[0,[7,8]],2],[[2,2,[5,10,10],[0],[]],0,0,[[],1,[8,10]],5]]
+
+[[7,[8],8,5,[8]],[],[1,[[3,7],10,6],[7,2],1,[[1,3,1,7],10,[7,3,10,2],5]],[],[]]
+[[8,3,8,[5,10],4],[[[],[2,3,8,1,6],2,[0,10,2,3,7]],4,1,10]]
+
+[[[5,9,6,1],[10]],[[2,5,[6,4,4],[2,4,2],[8,5]],7,[4,5,[0],4]],[3]]
+[[8,[],2,[[10,5,2,5,5]]],[[[],[1,9,0,8,2],5],1,[7,[8,7,3],[5,0,5],[6,2,3],2],[1,10,0]],[6]]
+
+[[2,6,[[9,3,4,7],[9,3,9,1,2],3,4,0],2],[[[],[9,10,7,0],[]],[[2,6],[7,9,9],2,[7,3,2,7,8],[9,5,5,6]]]]
+[[8,[[2,0],7,[7,4,9,10],7],[5],[2,[4,5],5],4]]
+
+[[0,10,3,9],[[[3,5,3,0,4],[5,8,5,3],9,[0,3,4,3]],10,6],[3],[5,0,10,[[2,1],6]],[3,[2],[[4,1,1,7,9],[3],3]]]
+[[9,[1,6,1,4],3,2,[[],3,[6,8],[3,4,8,0,8]]],[10,[9],8],[3,3,7,2,[]],[9,[[7,0,6,9,7],[0,1,9,2,9],[4,6],9,[9]],[]]]
+
+[[[[4,5],9],[[],6,2,5,[0,7,0,1,8]],[5],4],[[[3,7,10,9,3],[],[],3]],[0]]
+[[[[],7,[3,9,5],9],0],[[3,[],8],[6],3,5],[1],[[[],[]]],[[5,10,[2,9],[1,8,9],[4,3,1,1]],1,[[],[2,10,9],9,6],[[3,7,9,3],[0],[5,0,5],[2,7,3,5],[0]],[3,[],[5,10,0],9,[7]]]]
+
+[[8,2,[],[5,7]],[4],[[[8],7,6]]]
+[[5,[[0,10,5,9],4,[0,10]],0,5,10]]
+
+[8,4,9,3,2]
+[8,4,9,3]
+
+[[[[5]]],[[1,0,8,6],7],[7,1],[4,6],[[9,2,[0]],[[4]],[7,1,0,[10,10],10]]]
+[[0,[[10,0,5,5,2],1],9],[[[1,4,3,3,5],[6],0,[2,4,9,8],[4,8,4]],[10,[0,2,7],[9,8,5],[],9],[3,[],1]]]
+
+[[[1,7,[1,1,1,9]],[4,1,[8,4,2,1]],[],[]]]
+[[[],[[],[7,9,7,2,6],9],[[6,6,3],[8],3,0,3],7,[3,[0,2,3,4,0],[5,7]]],[8,[1,6,5,7]],[[7,[],[4]],[8,[],[8,6,7,4],4,6],[],[9,[2,2,6,7,6],7],9],[[[],8],10,[[],[8,2,8],8,[5,1,8]],[],[3,5]],[2,1,[7,[0,6,5,6,6],[5,7,4],[5,0,4,5,10]]]]
+
+[[],[[[3,7],4]],[],[],[[[2,0]],[5,9]]]
+[[[6,4,[10],8,5],5,[7,[4,4,0]],[6],5],[2,10,[[2,10,5,8,5],[10,5,7,2,8],4,[8,5,5]],8,[[3,3],[6]]],[3,[[0,8]],1]]
+
+[[0,5],[[],4,8],[],[],[[1,[]],5,1,[[]],0]]
+[[[]]]
+
+[[],[],[8],[],[6,10]]
+[[3,3,6,8]]
+
+[[[0],[9],9],[[10,10],[7,[6,3,1,10,7],[5,7],[6,2,5],2]],[5,[2,[7,3]],6,3]]
+[[],[9,[[4,9,9,9,6],[],[10,5,6]]],[[[1,7,0],[5],4,[],0]]]
+
+[[2,[5,10,[2,8,5,1,5],[9,0,8,0],8],[[8,8,10]],8],[2,[8,10,[],[1,5]],5,[[7],[4,2,1,1,8],0,1,[10,8,2]],2],[10,[[8,8,4,7,5],[5,7],10,[8,0]],5,[[4,4,2],[2,4,3,0,1],[7,8]]],[6]]
+[[9]]
+
+[[4,[4,[0,7,0],[1,5,10,5],[2,10,7]],[5],[[2,4,2],[3,8,7,6],6]]]
+[[7,7,5,[[4,8,10,6]],5],[2,4,10,1],[[[10],[10,9,2]]],[],[[[3,1,3,1],[],[0,0,9]],9,[2,[2,5,10,1,5],9],5,[2,[5,1,4,2],10]]]
+
+[[3],[8],[8,[4,[2,10],9,[4,10]],[],[],8]]
+[[[[],[10,10]],[3,[5,3,4,5],8],9,[2,5],8]]
+
+[[],[],[[[8,8,4],2,[],5,3],[],[[2,2,0,0,10],[1,2],[1,1],8],[[10,6,1,6]]]]
+[[[[1,0,4,7,8],[2,5],[3,1]],9,9,[[10,9]],[[2]]],[[[],[3,3,10],[8,7,5,4,9],6,0],2,[8,10,4,[8,3,3,9,2]],[[7,10,10,0,0],[4,3,8,3]]],[[1,0],0,6]]
+
+[[[]],[2,[[9],1,[6]],6],[[[10,0,0,9,2],[1,8,4],9,[10,6,5,2],[3,0,0,8]]],[5,[[],1,[4],[]],0,10,[2]]]
+[[9],[],[[0,3,9,[]],[2,[1,9,0,0,4],[9,10,1,9,4],[]],[10,3,2],9]]
+
+[[[2],[1,1,[6],[8,6,9,6,7],3]],[[],8,[[6,6],[5,8,10],[],[9],8],[]],[]]
+[[1,9,2,[6],[0,0,3]],[]]
+
+[[10,5],[],[[[]],7],[10,8,8,9,[[],[1,3,9,2,8],[9,4,2,6,7],[8,6],7]]]
+[[[5,[2,8,0,6],[0,7],0],[[],[]],2,[6]],[[],4,6,[[],[4,8,8,7,5],7,[],[]],7],[4]]
+
+[[10,[[4,10],[8,1,10],[4,9,8,1,5],3,[4,9,1,1,6]]],[],[[7]],[[[],0,4,[7,6,4]],2,[[4],10],2,0]]
+[[[],5],[2,[],7],[9],[]]
+
+[[],[],[7],[10],[]]
+[[2,[[3,0,4,8,10],1,5,[]],[4,[9,4,10,7,2]],3],[8],[[[6],4,[3,7,5,9]],8,6,[10],8]]
+
+[[],[6]]
+[[[[9,9,3,10],[5],9,6,3],[8,7,4,0],[],[[5,9,9,0],[],[1],[2,4,8]]],[10,[[9,6,4,1],1],0],[[9,[],7,7,6],[9],6]]
+
+[[[10,[5,10,0,7,2],[2],8]],[[9,9,[],1,8],[[],[1]],[5,[3,3],1]]]
+[[],[3,1,[10,[2,2,10,0],[4,3,3,6,7],8],8],[[[8],2,4],[[],[],10,2,[]],6,8,8],[[7,0,8,[]]]]
+
+[[[4],7,[10]],[[[3],1],2,[9]],[[4,7],[[3,8],[2,5,5,4],5,[9,6,2,2,9]],2,[[4,5,8,6]],[0,6,7,[4,2,1,7],2]],[6,5]]
+[[[9,1,3],[[9],8,[5,1,7],[9,8,9]],5,[[1,1,10],3],2],[[5],7],[]]
+
+[[3,[0,5,[8],[],[]],8,7,9]]
+[[8,[[2],3,[],7,7],3],[[[2],[7,9],[8]],[6]],[[[],[6,5,0,5,2],[6,4,4],[5,9]],[[0,2],[10,8],[6,2,1],[4,10,6,8],6],[[1,1,8],9,5,5,[3]],[],[0,[],[1],[2,5,10]]],[[],5],[[[8,0,7,1,4],3,[],4],9]]
+
+[[],[9],[5,[[2,0,0,10,6],3,7,3,[9,9,2]],7]]
+[[[],9],[],[6,6,[9,2,[3,6]],[[3,2,6,2],[9,0],0],1],[[9],10,[9,7],[9,[10,6],0]],[[[8,0],8,[1,10,2,9]],8,5]]
+
+[10,8,0,10]
+[10,8,0,10,6]
+
+[[[[7,10,2],7,[]],[[],[1,0],[],[],3],9,2],[[[],4,9],0],[3,3,[],2],[[3,[7,1,1],3],10,10,9],[[6,0,3,[],[3,6]],[[9,10],[9,1,7,3],10,9],10,1]]
+[[],[6,9,[0,3,3,0,[7,9,8]]],[[3,[8]],[8,[6,3]],2]]
+
+[[[2,[7,10,4,7,3],[9],0,4],1,[2,9,8,2,6],9,0],[],[3,0,[[5,4,4,2]],2]]
+[[[[3,0],[5,9,9],[2,5,0],2,3]],[2,[6,[5]],[[10,3],8,9,[9,5,10,8,2]],8],[]]
+
+[[0,[[10],7],2,2,1],[[[0,2,5],2,7],[10,[],[8],7],5,[[2],0]]]
+[[],[3],[10,[4,[5,2,7,3],9,5],3,3,6],[[7,[]]],[[[10,7,6,6,4],[4,2],8,6,[3,5,0]]]]
+
+[[0,[0,[],[]],5,0,9],[[7,9,[],[1,6,0]],[[10,6],3,[3,1,10,5,8],[]],7,6],[4,6,[],0,2],[5]]
+[[[5],[8,0,5],[7,[1,3,9],3]],[2,7,0],[],[4,[4,8,4,[5,9,0]],[]],[[[10,7,6,1],[4,5,8,7],9]]]
+
+[[[9],1],[[4,[5,6],[4],5],10,6,[7],6],[[[5,4],[8],[7,4],[6,2,9,8],[4,0]],1,[[]],3,[10,0,1,[3,2,3,5],4]]]
+[[7],[4,[3,[4,3,1,9,6],1,[]],[1,[6],[0,3]],0,10]]
+
+[[[0,3],[3,[1],[],6,[]]],[8,[],6,[],4]]
+[[[[4],5,[9,1,7,9,9]],[2,5]],[[[10,8,5,10,2],7,[0,6,10,3],10],3,[6,0,[3,5,0,5],[8,9,3,5]],3],[[[0,4],[10,6,7,5],7,[10]],[1],[[8,10],2],[[],10,9,0]]]
+
+[[6,[[1]],1,[[],2,[6,10],6,1]],[[7,3],3,6,[3,3,10,[0]]],[6,[[6,7],5,1,[4,2,0,1]],10],[9,[[9],[2,6,5,1],0],[7]],[[[5],[],7,9,[10]],[[7,0]],[[]]]]
+[[4,1,4,[[5,4],[9],[],[3,8,5]]],[2,8,[[6,6,4,6]],[4,1],1],[[2,0,[7,7,2,1,4],[0,8,3,8],9],5,0]]
+
+[[[6,10,9,[1],8]],[4,0,[[8,1,9,7,0]],[[3,7,10],9,[10,9,2],[6,10],[5,9,5,10]]],[5,5,8,1,2],[]]
+[[7,2],[2,7,2,5,[[1,4,7,10,10]]],[8,4,[[9,8,10],[0],2,[3]],1,7],[2,0,[0,4,0],5,[]],[[[6,8,9],[2,4,3,4,10],10],2,9]]
+
+[[5,8,[],[[8,6,3,10],[1,1,4,7,5],[1,8,0,5,2],6,5]],[],[]]
+[[],[],[[[5,9,6],2,10,[9,1],4],4,3,[1,[9]],6]]
+
+[[2,[2,[7,8],[7,2,0]]]]
+[[0],[[],7],[],[],[1,[7,[4,6,9]],4]]
+
+[[[[9,6,7,5],2]]]
+[[[],8,[3,0,5],1,8],[[[3,5,7,7,7],[6,3,7,7],[1,1,2,1]],0,4,[0,5]],[],[2],[[7,[6,4,8,7],[8,8,10,5],1,10],10,8,[[8,1],[8,5,5],3,[8,0]],6]]
+
+[[10,4]]
+[[],[0,[],[[],[8,1,0],[10],[0,6,6,9],8],2],[[[9],1,[]],[[2,0,8,10]],6,[[2,1,10,3],[],8]],[2,[[8,4,0,5],0,9,5,[1]],[]]]
+
+[[10,0,10,9]]
+[[[2,[10,3,6],4],[[6,5,10,3],8,[0,0,9,7,2],[10,4,5,4,4],[1]],[1],[[3,7,4,10,1],[8,10,4]],9],[10],[[5,5,[1,7,10],9,4],[],3]]
+
+[[7,4,1,[6,8,4],10],[5,10,7,[9,10,6,7]],[4,3]]
+[[[4,[9],[7,1,3],5,[]],2],[8,0],[[[9,0,5,4],[4,0,8,5],1],7,[8,3,[],9],0],[]]
+
+[[[1,3]],[[[1,3,4],0,[9],[0],[8,5,8]],[[7,4],0,[2],[2,1,0,0]]],[[],[[2,1,3,3],6],[3],[[1,6,8]]],[9,2,[[],[4,7,7],[7,2,10,6,3]]]]
+[[10]]
+
+[[[],[]],[6,[5,6,[1],0]],[10],[[10],1,[8],7,8],[[[],8,4],3,3,[1,[2,7]],1]]
+[[[7,8,[1],2],7,[[0,6,4],3,[6,8,7,6,5],[2,10,6,4,4],1],[[6,6,9,2,9],[6]]],[6,[]],[[1,[],[6,5,8]]]]
+
+[[[[8],4,[0,10],[],[5,5,8]],10],[],[7,[],[],[[2,10,1,4],[9,9,4],1,7,[8,5]]]]
+[[7],[[],[[10,3,1,4,3],6,[5,9],[0]],1],[4,0,[[7]],0,3],[10,5],[[8]]]
+
+[[[],3]]
+[[1,3,[[8,7,9,5],[],7,[],6],[9,[]],8],[[[1],[4,3,1],6,[9],[6,4,0,4]],[[8],1,[0,10,5],7,6],7,[2,[6,9,5,9,1]]]]
+
+[[[9,[0],[9,0],0,9],[],[[],[1,1],[5,7,7,5,7],[]],1],[[8,5,7],8]]
+[[6,[],[0,2,1],[3],2],[7,7],[6,[],[],2]]
+
+[[5,4,[[7,8,3,0],[3,9,7,1,10],[10],6],1],[]]
+[[8,6,[[2,2,6,8],[1,2,2,7],[],[],7],2,6]]
+
+[[[[],[5],[],9,3]],[],[7,[],0,[[8,8,10,8],10]]]
+[[5,10,2,7,5],[6,5,3],[2,[[3,1,2],2,[]],1],[4]]
+
+[[],[],[]]
+[[[[4,2],[7,1,1],6,9,[9,5,8,2]]],[[],[[7,10,9,1,0]]],[[[8,8,8],1,[7,10,3],10],2,1,[[5,4,5],[10,4,0],4,5]],[4,2,[]]]
+
+[[[[],3],[[10,6,10,6,4],2,[9,9,2,0]],[6,[],[10,8,2,6,10],[8,8]]]]
+[[[[1,5,10],[7,0,4,2],7,[]],0],[2,[8],10,1,6],[7,[[5,5,4,7]],6],[[[8,7,7],8,[0,5,6,10,9],10],7,[2,6],[],6],[1]]
+
+[[[[4,0,6,6],[5,6,7],[10]]],[7,9]]
+[[[7,8,[0,8,10,1],4,10],10,[[8,1],1,[],3,6]],[]]
+
+[[9],[[],5],[8,[4,0,[9,7,0,3,8]],[]],[5,6,9,[1,[1,10,3,1,6],10,2]],[[],[],5,[[7,5,4,7,7],5,6,[10,9,1,9,2],0],[]]]
+[[[[9],10,[9,0,9],5],10,4,6],[0,[1,6],2,3,1],[3],[[],[[0,7,0],[7,1],4,3]],[3,9,[],8]]
+
+[[1,2,6,2]]
+[[[[5,1,0]],10,[10,[],[9,0,5,4],1],[5,6],[[9,6,6],0,3,[0,4],6]]]
+
+[[[0,[7,8,3,10,1]],6,2],[8,[[1,5,3,1,10],[0,1,9]],5,[10,1],2],[[[7,8,1,0],0,[10,7,3,3],[4]],7]]
+[[0,2,[[10,1,3],2,4,0]]]
+
+[[[6,[5,2,3,6,8]],[[9,7],[6,10,8],4,3,[3,1,9,4]]],[3,[[7,8]]],[7,0,[6],1]]
+[[[],6,7,[4,1],[6,[],[4,7,0,0,6],[9,2,7,9],0]]]
+
+[[[4,[9,6,8,9,7],[10],[4,6],[2,10,7]],[],[[],4,6,2,0],6,[[6,5,3,10,2]]],[9,10,0]]
+[[4,[6,[0,1,5],5]],[8],[4],[[],[0,[2,5,4],[]],[[0,5],[0,2]]],[[3,[10],[6]],4,[],3,[[2,1],9,1,8]]]
+
+[[[],4],[0,2],[[[7,2,3,5,7],[3,3,9,5,0],[1,8,3],2],[[10,10,5,7,10],[],[5,10,10,1,3],[4,9],[3,5]]],[],[9,3,[2,3,[1,7]]]]
+[[9,2,8,3],[[[1,6,9],9,9,[],[6,7,9]],9,0],[1,8,[[]],5],[[[3,7,0,9],[2,3,4,6,2],3,[3,3,0]],3,[3,2,1,[8,4]],[4,[10],4],[[5,10]]],[]]
+
+[[[6,8],9,6,9,5],[9,2,[]]]
+[[[7,6],[]],[0,[[2],5,4,[]]],[8,6,7],[[[],[4,2,3],[0,3,2,7,5],[0,2,4,1],0],3],[5,7,[[8],5]]]
+
+[[6],[[3,4,[1,1,4],6]],[[[]],[],[10]],[2,6,[10,9,1,8,[0,5]],6],[5,7,[[6,10,2,3]]]]
+[[[[2,4,0],9],4,8,[[],[9,4]]],[]]
+
+[[[[9,6,3,8],10,4],[10,[0,4,10,0,2],[6,7,10,1]],[[],[6,9,6,9,8],[],5],3,[4,4]],[[[],[9],[],5,5]],[]]
+[[6],[3,[9,0,6,[9,6]],[[2,5]],[]],[[[7,7,6],[0,1],0,[]],5,1,3],[8]]
diff --git a/src/adventofcode2022/solutions/data/day_13/day13_test.txt b/src/adventofcode2022/solutions/data/day_13/day13_test.txt
new file mode 100644
index 00000000..af73fbbb
--- /dev/null
+++ b/src/adventofcode2022/solutions/data/day_13/day13_test.txt
@@ -0,0 +1,23 @@
+[1,1,3,1,1]
+[1,1,5,1,1]
+
+[[1],[2,3,4]]
+[[1],4]
+
+[9]
+[[8,7,6]]
+
+[[4,4],4,4]
+[[4,4],4,4,4]
+
+[7,7,7,7]
+[7,7,7]
+
+[]
+[3]
+
+[[[]]]
+[[]]
+
+[1,[2,[3,[4,[5,6,7]]]],8,9]
+[1,[2,[3,[4,[5,6,0]]]],8,9]
diff --git a/src/adventofcode2022/solutions/day13.py b/src/adventofcode2022/solutions/day13.py
new file mode 100644
index 00000000..3f32c6b0
--- /dev/null
+++ b/src/adventofcode2022/solutions/day13.py
@@ -0,0 +1,102 @@
+from __future__ import annotations
+
+from certifi import contents
+
+from adventofcode2022.utils.abstract import FileReaderSolution
+from collections import deque
+
+
+class Pair:
+    left: Packet
+    right: Packet
+
+    def __init__(self, left: Packet, right: Packet):
+        self.left = left
+        self.right = right
+
+    def is_valid(self) -> bool:
+        """Validate if a packet is has valid pairs"""
+        return False
+
+
+class Packet:
+    parent: Packet
+    left: Packet
+    right: Packet
+    content: list[int]
+
+    def __init__(self, left: Packet = None, right: Packet = None, content=None):
+        self.left = left
+        self.right = right
+        if content is None:
+            self.content = []
+        else:
+            self.content = content
+
+    def __repr__(self):
+        if len(self.content) > 1:
+            return ",".join(str(i) for i in self.content)
+
+        left = repr(self.left) if self.left else None
+        right = repr(self.right) if self.right else None
+        if left and right:
+            return f"[{left},{right}]"
+        else:
+            return f"[{left or right}]"
+
+
+class Day13:
+    def parse(self, queue: deque[str]) -> Packet:
+        if queue[0] == "[":
+            # Remove [
+            queue.popleft()
+            left = self.parse(queue)
+            # Remove ]
+            queue.popleft()
+            right = self.parse(queue)
+            # Remove ]
+            queue.popleft()
+
+            # Create a new Packet
+            new_packet = Packet(left=left, right=right)
+            left.parent = new_packet
+            right.parent = new_packet
+            return new_packet
+        else:
+            # Next digit is one, or more, numbers
+            digits = []
+            while queue:
+                current_digit = []
+                while queue[0].isdigit():
+                    current_digit.append(queue.popleft())
+                if current_digit:
+                    digit = int("".join(map(str, current_digit)))
+                    digits.append(digit)
+
+                if queue[0] == "]":
+                    # We have reached the end of the digits
+                    break
+                if queue[0] == ",":
+                    queue.popleft()
+
+            return Packet(content=digits)
+
+
+class Day13PartA(Day13, FileReaderSolution):
+    def solve(self, input_data: str) -> int:
+        pairs: list[Pair] = []
+
+        for input_pair in input_data.split("\n\n"):
+            left = Packet(self.parse(deque(input_pair[0])))
+            right = Packet(self.parse(deque(input_pair[1])))
+            pair = Pair(left=left, right=right)
+            pairs.append(pair)
+
+        valid_pairs = sum(p.is_valid() for p in pairs)
+
+        return valid_pairs
+
+
+class Day13PartB(Day13, FileReaderSolution):
+    def solve(self, input_data: str) -> int:
+        raise NotImplementedError
diff --git a/tests/solutions/test_day13_a.py b/tests/solutions/test_day13_a.py
new file mode 100644
index 00000000..0fe00a02
--- /dev/null
+++ b/tests/solutions/test_day13_a.py
@@ -0,0 +1,53 @@
+import pytest
+from collections import deque
+from adventofcode2022.solutions.day13 import Day13PartA
+
+
+class TestDay13PartA:
+    @pytest.mark.parametrize(
+        "input_string",
+        (
+            "[[1,2],[3,4]]",
+            # "[]",
+            # "[9]",
+            # "[9]",
+            # "[1, 1, 3, 1, 1]",
+            # "[[1],[2,3,4]]",
+            # "[1,[2,[3,[4,[5,6,7]]]],8,9]",
+        ),
+    )
+    def test_day13a_parsing(self, input_string):
+        solution = Day13PartA()
+        assert repr(solution.parse(deque(input_string))) == input_string
+
+    @pytest.mark.parametrize(
+        ("pair", "valid"),
+        [
+            (1, True),
+            (2, True),
+            (3, False),
+            (4, True),
+            (5, False),
+            (6, True),
+            (7, False),
+            (8, False),
+        ],
+    )
+    def test_day13a_individual_pairs(self, testdata, pair, valid):
+        pairs = testdata.split("\n\n")
+
+        solution = Day13PartA()
+        result = solution.solve(pairs[pair - 1])
+        assert result == valid
+
+    def test_day13a_solve(self, testdata):
+        solution = Day13PartA()
+        result = solution.solve(testdata)
+        assert result == 13
+
+    @pytest.mark.xfail(reason="Not yet implemented", raises=NotImplementedError)
+    def test_day13a_data(self):
+        """Result we got when we did the real solution"""
+        solution = Day13PartA()
+        res = solution("day_13/day13.txt")
+        assert res == 0
diff --git a/tests/solutions/test_day13_b.py b/tests/solutions/test_day13_b.py
new file mode 100644
index 00000000..1b91fca1
--- /dev/null
+++ b/tests/solutions/test_day13_b.py
@@ -0,0 +1,19 @@
+import pytest
+
+from adventofcode2022.solutions.day13 import Day13PartB
+
+
+class TestDay13PartB:
+    @pytest.mark.xfail(reason="Not yet implemented", raises=NotImplementedError)
+    @pytest.mark.parametrize(("input_data", "expected_result"), [("", ""), ("", "")])
+    def test_day13b_solve(self, input_data, expected_result):
+        solution = Day13PartB()
+        result = solution.solve(input_data)
+        assert result == expected_result
+
+    @pytest.mark.xfail(reason="Not yet implemented", raises=NotImplementedError)
+    def test_day13b_data(self):
+        """Result we got when we did the real solution"""
+        solution = Day13PartB()
+        res = solution("day_13/day13.txt")
+        assert res == 0

From 39cc76eef02ca5470cab65830be1584f43079c49 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 19 Dec 2022 04:27:42 +0000
Subject: [PATCH 220/371] Bump isort from 5.10.1 to 5.11.3

Bumps [isort](https://github.com/pycqa/isort) from 5.10.1 to 5.11.3.
- [Release notes](https://github.com/pycqa/isort/releases)
- [Changelog](https://github.com/PyCQA/isort/blob/main/CHANGELOG.md)
- [Commits](https://github.com/pycqa/isort/compare/5.10.1...5.11.3)

---
updated-dependencies:
- dependency-name: isort
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 poetry.lock    | 10 +++++-----
 pyproject.toml |  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/poetry.lock b/poetry.lock
index e57c519d..003367a8 100644
--- a/poetry.lock
+++ b/poetry.lock
@@ -241,11 +241,11 @@ python-versions = "*"
 
 [[package]]
 name = "isort"
-version = "5.10.1"
+version = "5.11.3"
 description = "A Python utility / library to sort Python imports."
 category = "dev"
 optional = false
-python-versions = ">=3.6.1,<4.0"
+python-versions = ">=3.7.0"
 
 [package.extras]
 colors = ["colorama (>=0.4.3,<0.5.0)"]
@@ -623,7 +623,7 @@ testing = ["coverage (>=6.2)", "coverage-enable-subprocess (>=1)", "flaky (>=3.7
 [metadata]
 lock-version = "1.1"
 python-versions = "^3.10"
-content-hash = "4a6daa0d612aad0f823056788f13e724de16f2101b8a99ccb0a9afe76f4beb45"
+content-hash = "e73128d2a1b540e71f6c74cb63b1dccddc571a7bcd0f231ce7f1980df7041e91"
 
 [metadata.files]
 anytree = [
@@ -778,8 +778,8 @@ iniconfig = [
     {file = "iniconfig-1.1.1.tar.gz", hash = "sha256:bc3af051d7d14b2ee5ef9969666def0cd1a000e121eaea580d4a313df4b37f32"},
 ]
 isort = [
-    {file = "isort-5.10.1-py3-none-any.whl", hash = "sha256:6f62d78e2f89b4500b080fe3a81690850cd254227f27f75c3a0c491a1f351ba7"},
-    {file = "isort-5.10.1.tar.gz", hash = "sha256:e8443a5e7a020e9d7f97f1d7d9cd17c88bcb3bc7e218bf9cf5095fe550be2951"},
+    {file = "isort-5.11.3-py3-none-any.whl", hash = "sha256:83155ffa936239d986b0f190347a3f2285f42a9b9e1725c89d865b27dd0627e5"},
+    {file = "isort-5.11.3.tar.gz", hash = "sha256:a8ca25fbfad0f7d5d8447a4314837298d9f6b23aed8618584c894574f626b64b"},
 ]
 jinja2 = [
     {file = "Jinja2-3.1.2-py3-none-any.whl", hash = "sha256:6088930bfe239f0e6710546ab9c19c9ef35e29792895fed6e6e31a023a182a61"},
diff --git a/pyproject.toml b/pyproject.toml
index d2d6c52d..a1eb586b 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -22,7 +22,7 @@ pytest-xdist = "^3.1.0"
 python-dotenv = "^0.21.0"
 tox = "^3.27.1"
 pre-commit = "^2.19.0"
-isort = "^5.10.1"
+isort = "^5.11.3"
 
 [tool.poetry.scripts]
 adventofcode = "adventofcode2021.main:main"

From 55bc23b1c499dea66c9a0d0c0fca8875ac425c11 Mon Sep 17 00:00:00 2001
From: Roel Adriaans <roel.adriaans@ordina.nl>
Date: Tue, 20 Dec 2022 20:41:02 +0100
Subject: [PATCH 221/371] Removed random import?

---
 src/adventofcode2022/solutions/day13.py | 2 --
 1 file changed, 2 deletions(-)

diff --git a/src/adventofcode2022/solutions/day13.py b/src/adventofcode2022/solutions/day13.py
index 3f32c6b0..0cbbd393 100644
--- a/src/adventofcode2022/solutions/day13.py
+++ b/src/adventofcode2022/solutions/day13.py
@@ -1,7 +1,5 @@
 from __future__ import annotations
 
-from certifi import contents
-
 from adventofcode2022.utils.abstract import FileReaderSolution
 from collections import deque
 

From 7af4d26d8679409007f9576c4f6d04654db469a7 Mon Sep 17 00:00:00 2001
From: Roel Adriaans <roel.adriaans@ordina.nl>
Date: Tue, 20 Dec 2022 20:41:33 +0100
Subject: [PATCH 222/371] Removed random import?

---
 src/adventofcode2022/solutions/day13.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/adventofcode2022/solutions/day13.py b/src/adventofcode2022/solutions/day13.py
index 0cbbd393..d6ce062f 100644
--- a/src/adventofcode2022/solutions/day13.py
+++ b/src/adventofcode2022/solutions/day13.py
@@ -1,8 +1,9 @@
 from __future__ import annotations
 
-from adventofcode2022.utils.abstract import FileReaderSolution
 from collections import deque
 
+from adventofcode2022.utils.abstract import FileReaderSolution
+
 
 class Pair:
     left: Packet

From 93d3a5be3baa78950d41169ecb5ec763afb448e2 Mon Sep 17 00:00:00 2001
From: Roel Adriaans <roel.adriaans@ordina.nl>
Date: Tue, 20 Dec 2022 20:49:20 +0100
Subject: [PATCH 223/371] Fix some minor type and other issues

---
 src/adventofcode2022/solutions/day13.py | 8 +++++---
 tests/solutions/test_day13_a.py         | 4 +++-
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/src/adventofcode2022/solutions/day13.py b/src/adventofcode2022/solutions/day13.py
index d6ce062f..e4a9f0eb 100644
--- a/src/adventofcode2022/solutions/day13.py
+++ b/src/adventofcode2022/solutions/day13.py
@@ -20,11 +20,13 @@ def is_valid(self) -> bool:
 
 class Packet:
     parent: Packet
-    left: Packet
-    right: Packet
+    left: Packet | None
+    right: Packet | None
     content: list[int]
 
-    def __init__(self, left: Packet = None, right: Packet = None, content=None):
+    def __init__(
+        self, left: Packet | None = None, right: Packet | None = None, content=None
+    ):
         self.left = left
         self.right = right
         if content is None:
diff --git a/tests/solutions/test_day13_a.py b/tests/solutions/test_day13_a.py
index 0fe00a02..7e1997f4 100644
--- a/tests/solutions/test_day13_a.py
+++ b/tests/solutions/test_day13_a.py
@@ -1,5 +1,7 @@
-import pytest
 from collections import deque
+
+import pytest
+
 from adventofcode2022.solutions.day13 import Day13PartA
 
 

From 8297cb454216a75ba95049c7e37ee62ae1df6d9f Mon Sep 17 00:00:00 2001
From: Roel Adriaans <roel.adriaans@ordina.nl>
Date: Tue, 20 Dec 2022 20:53:17 +0100
Subject: [PATCH 224/371] Upgrade to tox4

---
 poetry.lock    | 424 ++++++++++++++++++++++++++++++++++++++-----------
 pyproject.toml |   2 +-
 tox.ini        |   1 -
 3 files changed, 329 insertions(+), 98 deletions(-)

diff --git a/poetry.lock b/poetry.lock
index dc8c8662..f7e573f8 100644
--- a/poetry.lock
+++ b/poetry.lock
@@ -33,10 +33,10 @@ optional = false
 python-versions = ">=3.5"
 
 [package.extras]
-dev = ["coverage[toml] (>=5.0.2)", "hypothesis", "pympler", "pytest (>=4.3.0)", "mypy (>=0.900,!=0.940)", "pytest-mypy-plugins", "zope.interface", "furo", "sphinx", "sphinx-notfound-page", "pre-commit", "cloudpickle"]
-docs = ["furo", "sphinx", "zope.interface", "sphinx-notfound-page"]
-tests = ["coverage[toml] (>=5.0.2)", "hypothesis", "pympler", "pytest (>=4.3.0)", "mypy (>=0.900,!=0.940)", "pytest-mypy-plugins", "zope.interface", "cloudpickle"]
-tests_no_zope = ["coverage[toml] (>=5.0.2)", "hypothesis", "pympler", "pytest (>=4.3.0)", "mypy (>=0.900,!=0.940)", "pytest-mypy-plugins", "cloudpickle"]
+dev = ["cloudpickle", "coverage[toml] (>=5.0.2)", "furo", "hypothesis", "mypy (>=0.900,!=0.940)", "pre-commit", "pympler", "pytest (>=4.3.0)", "pytest-mypy-plugins", "sphinx", "sphinx-notfound-page", "zope.interface"]
+docs = ["furo", "sphinx", "sphinx-notfound-page", "zope.interface"]
+tests = ["cloudpickle", "coverage[toml] (>=5.0.2)", "hypothesis", "mypy (>=0.900,!=0.940)", "pympler", "pytest (>=4.3.0)", "pytest-mypy-plugins", "zope.interface"]
+tests-no-zope = ["cloudpickle", "coverage[toml] (>=5.0.2)", "hypothesis", "mypy (>=0.900,!=0.940)", "pympler", "pytest (>=4.3.0)", "pytest-mypy-plugins"]
 
 [[package]]
 name = "beautifulsoup4"
@@ -66,7 +66,7 @@ chardet = ">=3.0.2"
 
 [[package]]
 name = "black"
-version = "22.10.0"
+version = "22.12.0"
 description = "The uncompromising code formatter."
 category = "dev"
 optional = false
@@ -85,9 +85,17 @@ d = ["aiohttp (>=3.7.4)"]
 jupyter = ["ipython (>=7.8.0)", "tokenize-rt (>=3.2.0)"]
 uvloop = ["uvloop (>=0.15.2)"]
 
+[[package]]
+name = "cachetools"
+version = "5.2.0"
+description = "Extensible memoizing collections and decorators"
+category = "dev"
+optional = false
+python-versions = "~=3.7"
+
 [[package]]
 name = "certifi"
-version = "2022.9.24"
+version = "2022.12.7"
 description = "Python package for providing Mozilla's CA Bundle."
 category = "main"
 optional = false
@@ -118,7 +126,7 @@ optional = false
 python-versions = ">=3.6.0"
 
 [package.extras]
-unicode_backport = ["unicodedata2"]
+unicode-backport = ["unicodedata2"]
 
 [[package]]
 name = "click"
@@ -158,7 +166,7 @@ requests = ">=2.23.0"
 
 [[package]]
 name = "coverage"
-version = "6.5.0"
+version = "7.0.0"
 description = "Code coverage measurement for Python"
 category = "dev"
 optional = false
@@ -214,7 +222,7 @@ testing = ["covdefaults (>=2.2.2)", "coverage (>=6.5)", "pytest (>=7.2)", "pytes
 
 [[package]]
 name = "identify"
-version = "2.5.9"
+version = "2.5.11"
 description = "File identification library for Python"
 category = "dev"
 optional = false
@@ -241,17 +249,17 @@ python-versions = "*"
 
 [[package]]
 name = "isort"
-version = "5.10.1"
+version = "5.11.3"
 description = "A Python utility / library to sort Python imports."
 category = "dev"
 optional = false
-python-versions = ">=3.6.1,<4.0"
+python-versions = ">=3.7.0"
 
 [package.extras]
-pipfile_deprecated_finder = ["pipreqs", "requirementslib"]
-requirements_deprecated_finder = ["pipreqs", "pip-api"]
 colors = ["colorama (>=0.4.3,<0.5.0)"]
+pipfile-deprecated-finder = ["pipreqs", "requirementslib"]
 plugins = ["setuptools"]
+requirements-deprecated-finder = ["pip-api", "pipreqs"]
 
 [[package]]
 name = "jinja2"
@@ -311,16 +319,16 @@ category = "dev"
 optional = false
 python-versions = ">=2.7,!=3.0.*,!=3.1.*,!=3.2.*,!=3.3.*,!=3.4.*,!=3.5.*,!=3.6.*"
 
+[package.dependencies]
+setuptools = "*"
+
 [[package]]
 name = "packaging"
-version = "21.3"
+version = "22.0"
 description = "Core utilities for Python packages"
 category = "dev"
 optional = false
-python-versions = ">=3.6"
-
-[package.dependencies]
-pyparsing = ">=2.0.2,<3.0.5 || >3.0.5"
+python-versions = ">=3.7"
 
 [[package]]
 name = "parse"
@@ -332,7 +340,7 @@ python-versions = "*"
 
 [[package]]
 name = "pathspec"
-version = "0.10.2"
+version = "0.10.3"
 description = "Utility library for gitignore style pattern matching of file paths."
 category = "dev"
 optional = false
@@ -340,15 +348,15 @@ python-versions = ">=3.7"
 
 [[package]]
 name = "platformdirs"
-version = "2.5.4"
+version = "2.6.0"
 description = "A small Python package for determining appropriate platform-specific dirs, e.g. a \"user data dir\"."
 category = "dev"
 optional = false
 python-versions = ">=3.7"
 
 [package.extras]
-docs = ["furo (>=2022.9.29)", "proselint (>=0.13)", "sphinx-autodoc-typehints (>=1.19.4)", "sphinx (>=5.3)"]
-test = ["appdirs (==1.4.4)", "pytest-cov (>=4)", "pytest-mock (>=3.10)", "pytest (>=7.2)"]
+docs = ["furo (>=2022.9.29)", "proselint (>=0.13)", "sphinx (>=5.3)", "sphinx-autodoc-typehints (>=1.19.4)"]
+test = ["appdirs (==1.4.4)", "pytest (>=7.2)", "pytest-cov (>=4)", "pytest-mock (>=3.10)"]
 
 [[package]]
 name = "pluggy"
@@ -379,23 +387,20 @@ toml = "*"
 virtualenv = ">=20.0.8"
 
 [[package]]
-name = "py"
-version = "1.11.0"
-description = "library with cross-python path, ini-parsing, io, code, log facilities"
+name = "pyproject-api"
+version = "1.2.1"
+description = "API to interact with the python pyproject.toml based projects"
 category = "dev"
 optional = false
-python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*"
+python-versions = ">=3.7"
 
-[[package]]
-name = "pyparsing"
-version = "3.0.9"
-description = "pyparsing module - Classes and methods to define and execute parsing grammars"
-category = "dev"
-optional = false
-python-versions = ">=3.6.8"
+[package.dependencies]
+packaging = ">=21.3"
+tomli = {version = ">=2.0.1", markers = "python_version < \"3.11\""}
 
 [package.extras]
-diagrams = ["railroad-diagrams", "jinja2"]
+docs = ["furo (>=2022.9.29)", "sphinx (>=5.3)", "sphinx-autodoc-typehints (>=1.19.5)"]
+testing = ["covdefaults (>=2.2.2)", "importlib-metadata (>=5.1)", "pytest (>=7.2)", "pytest-cov (>=4)", "pytest-mock (>=3.10)", "virtualenv (>=20.17)", "wheel (>=0.38.4)"]
 
 [[package]]
 name = "pytest"
@@ -430,7 +435,7 @@ coverage = {version = ">=5.2.1", extras = ["toml"]}
 pytest = ">=4.6"
 
 [package.extras]
-testing = ["fields", "hunter", "process-tests", "six", "pytest-xdist", "virtualenv"]
+testing = ["fields", "hunter", "process-tests", "pytest-xdist", "six", "virtualenv"]
 
 [[package]]
 name = "pytest-xdist"
@@ -509,7 +514,20 @@ urllib3 = ">=1.21.1,<1.27"
 
 [package.extras]
 socks = ["PySocks (>=1.5.6,!=1.5.7)"]
-use_chardet_on_py3 = ["chardet (>=3.0.2,<6)"]
+use-chardet-on-py3 = ["chardet (>=3.0.2,<6)"]
+
+[[package]]
+name = "setuptools"
+version = "65.6.3"
+description = "Easily download, build, install, upgrade, and uninstall Python packages"
+category = "dev"
+optional = false
+python-versions = ">=3.7"
+
+[package.extras]
+docs = ["furo", "jaraco.packaging (>=9)", "jaraco.tidelift (>=1.4)", "pygments-github-lexers (==0.0.5)", "rst.linker (>=1.9)", "sphinx (>=3.5)", "sphinx-favicon", "sphinx-hoverxref (<2)", "sphinx-inline-tabs", "sphinx-notfound-page (==0.8.3)", "sphinx-reredirects", "sphinxcontrib-towncrier"]
+testing = ["build[virtualenv]", "filelock (>=3.4.0)", "flake8 (<5)", "flake8-2020", "ini2toml[lite] (>=0.9)", "jaraco.envs (>=2.2)", "jaraco.path (>=3.2.0)", "pip (>=19.1)", "pip-run (>=8.8)", "pytest (>=6)", "pytest-black (>=0.3.7)", "pytest-checkdocs (>=2.4)", "pytest-cov", "pytest-enabler (>=1.3)", "pytest-flake8", "pytest-mypy (>=0.9.1)", "pytest-perf", "pytest-timeout", "pytest-xdist", "tomli-w (>=1.0.0)", "virtualenv (>=13.0.0)", "wheel"]
+testing-integration = ["build[virtualenv]", "filelock (>=3.4.0)", "jaraco.envs (>=2.2)", "jaraco.path (>=3.2.0)", "pytest", "pytest-enabler", "pytest-xdist", "tomli", "virtualenv (>=13.0.0)", "wheel"]
 
 [[package]]
 name = "six"
@@ -553,25 +571,27 @@ python-versions = ">=3.7"
 
 [[package]]
 name = "tox"
-version = "3.27.1"
+version = "4.0.16"
 description = "tox is a generic virtualenv management and test command line tool"
 category = "dev"
 optional = false
-python-versions = "!=3.0.*,!=3.1.*,!=3.2.*,!=3.3.*,!=3.4.*,>=2.7"
+python-versions = ">=3.7"
 
 [package.dependencies]
-colorama = {version = ">=0.4.1", markers = "platform_system == \"Windows\""}
-filelock = ">=3.0.0"
-packaging = ">=14"
-pluggy = ">=0.12.0"
-py = ">=1.4.17"
-six = ">=1.14.0"
-tomli = {version = ">=2.0.1", markers = "python_version >= \"3.7\" and python_version < \"3.11\""}
-virtualenv = ">=16.0.0,<20.0.0 || >20.0.0,<20.0.1 || >20.0.1,<20.0.2 || >20.0.2,<20.0.3 || >20.0.3,<20.0.4 || >20.0.4,<20.0.5 || >20.0.5,<20.0.6 || >20.0.6,<20.0.7 || >20.0.7"
+cachetools = ">=5.2"
+chardet = ">=5.1"
+colorama = ">=0.4.6"
+filelock = ">=3.8.2"
+packaging = ">=22"
+platformdirs = ">=2.6"
+pluggy = ">=1"
+pyproject-api = ">=1.2.1"
+tomli = {version = ">=2.0.1", markers = "python_version < \"3.11\""}
+virtualenv = ">=20.17.1"
 
 [package.extras]
-docs = ["pygments-github-lexers (>=0.0.5)", "sphinx (>=2.0.0)", "sphinxcontrib-autoprogram (>=0.1.5)", "towncrier (>=18.5.0)"]
-testing = ["flaky (>=3.4.0)", "freezegun (>=0.3.11)", "pytest (>=4.0.0)", "pytest-cov (>=2.5.1)", "pytest-mock (>=1.10.0)", "pytest-randomly (>=1.0.0)", "psutil (>=5.6.1)", "pathlib2 (>=2.3.3)"]
+docs = ["furo (>=2022.12.7)", "sphinx (>=5.3)", "sphinx-argparse-cli (>=1.10)", "sphinx-autodoc-typehints (>=1.19.5)", "sphinx-copybutton (>=0.5.1)", "sphinx-inline-tabs (>=2022.1.2b11)", "sphinxcontrib-towncrier (>=0.2.1a0)", "towncrier (>=22.8)"]
+testing = ["build[virtualenv] (>=0.9)", "covdefaults (>=2.2.2)", "devpi-process (>=0.3)", "diff-cover (>=7.3)", "distlib (>=0.3.6)", "flaky (>=3.7)", "hatch-vcs (>=0.3)", "hatchling (>=1.11.1)", "psutil (>=5.9.4)", "pytest (>=7.2)", "pytest-cov (>=4)", "pytest-mock (>=3.10)", "pytest-xdist (>=3.1)", "re-assert (>=1.1)", "time-machine (>=2.8.2)"]
 
 [[package]]
 name = "tqdm"
@@ -599,8 +619,8 @@ optional = false
 python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*, !=3.5.*"
 
 [package.extras]
-brotli = ["brotlicffi (>=0.8.0)", "brotli (>=1.0.9)", "brotlipy (>=0.6.0)"]
-secure = ["pyOpenSSL (>=0.14)", "cryptography (>=1.3.4)", "idna (>=2.0.0)", "certifi", "urllib3-secure-extra", "ipaddress"]
+brotli = ["brotli (>=1.0.9)", "brotlicffi (>=0.8.0)", "brotlipy (>=0.6.0)"]
+secure = ["certifi", "cryptography (>=1.3.4)", "idna (>=2.0.0)", "ipaddress", "pyOpenSSL (>=0.14)", "urllib3-secure-extra"]
 socks = ["PySocks (>=1.5.6,!=1.5.7,<2.0)"]
 
 [[package]]
@@ -623,90 +643,273 @@ testing = ["coverage (>=6.2)", "coverage-enable-subprocess (>=1)", "flaky (>=3.7
 [metadata]
 lock-version = "1.1"
 python-versions = "^3.10"
-content-hash = "12d50d7762a6708e25eb707f686084c81683802cb22144a3167f5552a6a2b335"
+content-hash = "4a94a048c8201b5047f377213ccce84ad5ed85725539c4fcdc1b769966fc26eb"
 
 [metadata.files]
 anytree = [
     {file = "anytree-2.8.0-py2.py3-none-any.whl", hash = "sha256:14c55ac77492b11532395049a03b773d14c7e30b22aa012e337b1e983de31521"},
     {file = "anytree-2.8.0.tar.gz", hash = "sha256:3f0f93f355a91bc3e6245319bf4c1d50e3416cc7a35cc1133c1ff38306bbccab"},
 ]
-arrow = []
-attrs = []
-beautifulsoup4 = []
+arrow = [
+    {file = "arrow-1.2.3-py3-none-any.whl", hash = "sha256:5a49ab92e3b7b71d96cd6bfcc4df14efefc9dfa96ea19045815914a6ab6b1fe2"},
+    {file = "arrow-1.2.3.tar.gz", hash = "sha256:3934b30ca1b9f292376d9db15b19446088d12ec58629bc3f0da28fd55fb633a1"},
+]
+attrs = [
+    {file = "attrs-22.1.0-py2.py3-none-any.whl", hash = "sha256:86efa402f67bf2df34f51a335487cf46b1ec130d02b8d39fd248abfd30da551c"},
+    {file = "attrs-22.1.0.tar.gz", hash = "sha256:29adc2665447e5191d0e7c568fde78b21f9672d344281d0c6e1ab085429b22b6"},
+]
+beautifulsoup4 = [
+    {file = "beautifulsoup4-4.11.1-py3-none-any.whl", hash = "sha256:58d5c3d29f5a36ffeb94f02f0d786cd53014cf9b3b3951d42e0080d8a9498d30"},
+    {file = "beautifulsoup4-4.11.1.tar.gz", hash = "sha256:ad9aa55b65ef2808eb405f46cf74df7fcb7044d5cbc26487f96eb2ef2e436693"},
+]
 binaryornot = [
     {file = "binaryornot-0.4.4-py2.py3-none-any.whl", hash = "sha256:b8b71173c917bddcd2c16070412e369c3ed7f0528926f70cac18a6c97fd563e4"},
     {file = "binaryornot-0.4.4.tar.gz", hash = "sha256:359501dfc9d40632edc9fac890e19542db1a287bbcfa58175b66658392018061"},
 ]
-black = []
-certifi = []
+black = [
+    {file = "black-22.12.0-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:9eedd20838bd5d75b80c9f5487dbcb06836a43833a37846cf1d8c1cc01cef59d"},
+    {file = "black-22.12.0-cp310-cp310-win_amd64.whl", hash = "sha256:159a46a4947f73387b4d83e87ea006dbb2337eab6c879620a3ba52699b1f4351"},
+    {file = "black-22.12.0-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:d30b212bffeb1e252b31dd269dfae69dd17e06d92b87ad26e23890f3efea366f"},
+    {file = "black-22.12.0-cp311-cp311-win_amd64.whl", hash = "sha256:7412e75863aa5c5411886804678b7d083c7c28421210180d67dfd8cf1221e1f4"},
+    {file = "black-22.12.0-cp37-cp37m-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:c116eed0efb9ff870ded8b62fe9f28dd61ef6e9ddd28d83d7d264a38417dcee2"},
+    {file = "black-22.12.0-cp37-cp37m-win_amd64.whl", hash = "sha256:1f58cbe16dfe8c12b7434e50ff889fa479072096d79f0a7f25e4ab8e94cd8350"},
+    {file = "black-22.12.0-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:77d86c9f3db9b1bf6761244bc0b3572a546f5fe37917a044e02f3166d5aafa7d"},
+    {file = "black-22.12.0-cp38-cp38-win_amd64.whl", hash = "sha256:82d9fe8fee3401e02e79767016b4907820a7dc28d70d137eb397b92ef3cc5bfc"},
+    {file = "black-22.12.0-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:101c69b23df9b44247bd88e1d7e90154336ac4992502d4197bdac35dd7ee3320"},
+    {file = "black-22.12.0-cp39-cp39-win_amd64.whl", hash = "sha256:559c7a1ba9a006226f09e4916060982fd27334ae1998e7a38b3f33a37f7a2148"},
+    {file = "black-22.12.0-py3-none-any.whl", hash = "sha256:436cc9167dd28040ad90d3b404aec22cedf24a6e4d7de221bec2730ec0c97bcf"},
+    {file = "black-22.12.0.tar.gz", hash = "sha256:229351e5a18ca30f447bf724d007f890f97e13af070bb6ad4c0a441cd7596a2f"},
+]
+cachetools = [
+    {file = "cachetools-5.2.0-py3-none-any.whl", hash = "sha256:f9f17d2aec496a9aa6b76f53e3b614c965223c061982d434d160f930c698a9db"},
+    {file = "cachetools-5.2.0.tar.gz", hash = "sha256:6a94c6402995a99c3970cc7e4884bb60b4a8639938157eeed436098bf9831757"},
+]
+certifi = [
+    {file = "certifi-2022.12.7-py3-none-any.whl", hash = "sha256:4ad3232f5e926d6718ec31cfc1fcadfde020920e278684144551c91769c7bc18"},
+    {file = "certifi-2022.12.7.tar.gz", hash = "sha256:35824b4c3a97115964b408844d64aa14db1cc518f6562e8d7261699d1350a9e3"},
+]
 cfgv = [
     {file = "cfgv-3.3.1-py2.py3-none-any.whl", hash = "sha256:c6a0883f3917a037485059700b9e75da2464e6c27051014ad85ba6aaa5884426"},
     {file = "cfgv-3.3.1.tar.gz", hash = "sha256:f5a830efb9ce7a445376bb66ec94c638a9787422f96264c98edc6bdeed8ab736"},
 ]
-chardet = []
-charset-normalizer = []
-click = []
-colorama = []
-cookiecutter = []
-coverage = []
-distlib = []
-exceptiongroup = []
+chardet = [
+    {file = "chardet-5.1.0-py3-none-any.whl", hash = "sha256:362777fb014af596ad31334fde1e8c327dfdb076e1960d1694662d46a6917ab9"},
+    {file = "chardet-5.1.0.tar.gz", hash = "sha256:0d62712b956bc154f85fb0a266e2a3c5913c2967e00348701b32411d6def31e5"},
+]
+charset-normalizer = [
+    {file = "charset-normalizer-2.1.1.tar.gz", hash = "sha256:5a3d016c7c547f69d6f81fb0db9449ce888b418b5b9952cc5e6e66843e9dd845"},
+    {file = "charset_normalizer-2.1.1-py3-none-any.whl", hash = "sha256:83e9a75d1911279afd89352c68b45348559d1fc0506b054b346651b5e7fee29f"},
+]
+click = [
+    {file = "click-8.1.3-py3-none-any.whl", hash = "sha256:bb4d8133cb15a609f44e8213d9b391b0809795062913b383c62be0ee95b1db48"},
+    {file = "click-8.1.3.tar.gz", hash = "sha256:7682dc8afb30297001674575ea00d1814d808d6a36af415a82bd481d37ba7b8e"},
+]
+colorama = [
+    {file = "colorama-0.4.6-py2.py3-none-any.whl", hash = "sha256:4f1d9991f5acc0ca119f9d443620b77f9d6b33703e51011c16baf57afb285fc6"},
+    {file = "colorama-0.4.6.tar.gz", hash = "sha256:08695f5cb7ed6e0531a20572697297273c47b8cae5a63ffc6d6ed5c201be6e44"},
+]
+cookiecutter = [
+    {file = "cookiecutter-2.1.1-py2.py3-none-any.whl", hash = "sha256:9f3ab027cec4f70916e28f03470bdb41e637a3ad354b4d65c765d93aad160022"},
+    {file = "cookiecutter-2.1.1.tar.gz", hash = "sha256:f3982be8d9c53dac1261864013fdec7f83afd2e42ede6f6dd069c5e149c540d5"},
+]
+coverage = [
+    {file = "coverage-7.0.0-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:f2569682d6ea9628da8d6ba38579a48b1e53081226ec7a6c82b5024b3ce5009f"},
+    {file = "coverage-7.0.0-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:3ec256a592b497f26054195f7d7148892aca8c4cdcc064a7cc66ef7a0455b811"},
+    {file = "coverage-7.0.0-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:5885a4ceb6dde34271bb0adafa4a248a7f589c89821e9da3110c39f92f41e21b"},
+    {file = "coverage-7.0.0-cp310-cp310-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:d43d406a4d73aa7f855fa44fa77ff47e739b565b2af3844600cdc016d01e46b9"},
+    {file = "coverage-7.0.0-cp310-cp310-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:b18df11efa615b79b9ecc13035a712957ff6283f7b244e57684e1c092869f541"},
+    {file = "coverage-7.0.0-cp310-cp310-musllinux_1_1_aarch64.whl", hash = "sha256:f6a4bf5bdee93f6817797beba7086292c2ebde6df0d5822e0c33f8b05415c339"},
+    {file = "coverage-7.0.0-cp310-cp310-musllinux_1_1_i686.whl", hash = "sha256:33efe89cd0efef016db19d8d05aa46631f76793de90a61b6717acb202b36fe60"},
+    {file = "coverage-7.0.0-cp310-cp310-musllinux_1_1_x86_64.whl", hash = "sha256:96b5b1f1079e48f56bfccf103bcf44d48b9eb5163f1ea523fad580f15d3fe5e0"},
+    {file = "coverage-7.0.0-cp310-cp310-win32.whl", hash = "sha256:fb85b7a7a4b204bd59d6d0b0c8d87d9ffa820da225e691dfaffc3137dc05b5f6"},
+    {file = "coverage-7.0.0-cp310-cp310-win_amd64.whl", hash = "sha256:793dcd9d42035746fc7637df4336f7581df19d33c5c5253cf988c99d8e93a8ba"},
+    {file = "coverage-7.0.0-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:d564142a03d3bc8913499a458e931b52ddfe952f69b6cd4b24d810fd2959044a"},
+    {file = "coverage-7.0.0-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:0a8b0e86bede874bf5da566b02194fbb12dd14ce3585cabd58452007f272ba81"},
+    {file = "coverage-7.0.0-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:e645c73cbfc4577d93747d3f793115acf6f907a7eb9208fa807fdcf2da1964a4"},
+    {file = "coverage-7.0.0-cp311-cp311-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:de06e7585abe88c6d38c1b73ce4c3cb4c1a79fbb0da0d0f8e8689ef5729ec60d"},
+    {file = "coverage-7.0.0-cp311-cp311-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:a30b646fbdd5bc52f506e149fa4fbdef82432baf6b81774e61ec4e3b43b9cbde"},
+    {file = "coverage-7.0.0-cp311-cp311-musllinux_1_1_aarch64.whl", hash = "sha256:db8141856dc9be0917413df7200f53accf1d84c8b156868e6af058a1ea8e903a"},
+    {file = "coverage-7.0.0-cp311-cp311-musllinux_1_1_i686.whl", hash = "sha256:59e71912c7fc78d08a567ee65656123878f49ca1b5672e660ea70bf8dfbebf8f"},
+    {file = "coverage-7.0.0-cp311-cp311-musllinux_1_1_x86_64.whl", hash = "sha256:b8f7cd942dda3795fc9eadf303cc53a422ac057e3b70c2ad6d4276ec6a83a541"},
+    {file = "coverage-7.0.0-cp311-cp311-win32.whl", hash = "sha256:bf437a04b9790d3c9cd5b48e9ce9aa84229040e3ae7d6c670a55118906113c5a"},
+    {file = "coverage-7.0.0-cp311-cp311-win_amd64.whl", hash = "sha256:a7e1bb36b4e57a2d304322021b35d4e4a25fa0d501ba56e8e51efaebf4480556"},
+    {file = "coverage-7.0.0-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:215f40ef86f1958a1151fa7fad2b4f2f99534c4e10a34a1e065eba3f19ef8868"},
+    {file = "coverage-7.0.0-cp37-cp37m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:ae088eb1cbdad8206931b1bf3f11dee644e038a9300be84d3e705e29356e5b1d"},
+    {file = "coverage-7.0.0-cp37-cp37m-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:f9071e197faa24837b967bc9aa0b9ef961f805a75f1ee3ea1f3367f55cd46c3c"},
+    {file = "coverage-7.0.0-cp37-cp37m-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:8f1e6d9c70d45a960d3f3d781ea62b167fdf2e0e1f6bb282b96feea653adb923"},
+    {file = "coverage-7.0.0-cp37-cp37m-musllinux_1_1_aarch64.whl", hash = "sha256:9fadd15f9fcfd7b16d9cccce9f5e6ec6f9b8df860633ad9aa62c2b14c259560f"},
+    {file = "coverage-7.0.0-cp37-cp37m-musllinux_1_1_i686.whl", hash = "sha256:10b6246cae61896ab4c7568e498e492cbb73a2dfa4c3af79141c43cf806f929a"},
+    {file = "coverage-7.0.0-cp37-cp37m-musllinux_1_1_x86_64.whl", hash = "sha256:a8785791c2120af114ea7a06137f7778632e568a5aa2bbfc3b46c573b702af74"},
+    {file = "coverage-7.0.0-cp37-cp37m-win32.whl", hash = "sha256:30220518dd89c4878908d73f5f3d1269f86e9e045354436534587a18c7b9da85"},
+    {file = "coverage-7.0.0-cp37-cp37m-win_amd64.whl", hash = "sha256:bc904aa96105d73357de03de76336b1e3db28e2b12067d36625fd9646ab043fd"},
+    {file = "coverage-7.0.0-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:2331b7bd84a1be79bd17ca8e103ce38db8cbf7cb354dc56e651ba489cf849212"},
+    {file = "coverage-7.0.0-cp38-cp38-macosx_11_0_arm64.whl", hash = "sha256:e907db8bdd0ad1253a33c20fdc5f0f6209d271114a9c6f1fcdf96617343f7ca0"},
+    {file = "coverage-7.0.0-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:3c0deee68e0dae1d6e3fe6943c76d7e66fbeb6519bd08e4e5366bcc28a8a9aca"},
+    {file = "coverage-7.0.0-cp38-cp38-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:a6fff0f08bc5ffd0d78db821971472b4adc2ee876b86f743e46d634fb8e3c22f"},
+    {file = "coverage-7.0.0-cp38-cp38-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:a290b7921c1c05787b953e5854d394e887df40696f21381cc33c4e2179bf50ac"},
+    {file = "coverage-7.0.0-cp38-cp38-musllinux_1_1_aarch64.whl", hash = "sha256:100546219af59d2ad82d4575de03a303eb27b75ea36ffbd1677371924d50bcbc"},
+    {file = "coverage-7.0.0-cp38-cp38-musllinux_1_1_i686.whl", hash = "sha256:c1ba6e63b831112b9484ff5905370d89e43d4316bac76d403031f60d61597466"},
+    {file = "coverage-7.0.0-cp38-cp38-musllinux_1_1_x86_64.whl", hash = "sha256:c685fc17d6f4f1a3833e9dac27d0b931f7ccb52be6c30d269374203c7d0204a2"},
+    {file = "coverage-7.0.0-cp38-cp38-win32.whl", hash = "sha256:8938f3a10f45019b502020ba9567b97b6ecc8c76b664b421705c5406d4f92fe8"},
+    {file = "coverage-7.0.0-cp38-cp38-win_amd64.whl", hash = "sha256:c4b63888bef2928d0eca12cbce0760cfb696acb4fe226eb55178b6a2a039328a"},
+    {file = "coverage-7.0.0-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:cda63459eb20652b22e038729a8f5063862c189a3963cb042a764b753172f75e"},
+    {file = "coverage-7.0.0-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:e06abac1a4aec1ff989131e43ca917fc7bd296f34bf0cfe86cbf74343b21566d"},
+    {file = "coverage-7.0.0-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:32b94ad926e933976627f040f96dd1d9b0ac91f8d27e868c30a28253b9b6ac2d"},
+    {file = "coverage-7.0.0-cp39-cp39-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:d6b4af31fb49a2ae8de1cd505fa66c403bfcc5066e845ac19d8904dcfc9d40da"},
+    {file = "coverage-7.0.0-cp39-cp39-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:36b62f0220459e528ad5806cc7dede71aa716e067d2cb10cb4a09686b8791fba"},
+    {file = "coverage-7.0.0-cp39-cp39-musllinux_1_1_aarch64.whl", hash = "sha256:43ec1935c6d6caab4f3bc126d20bd709c0002a175d62208ebe745be37a826a41"},
+    {file = "coverage-7.0.0-cp39-cp39-musllinux_1_1_i686.whl", hash = "sha256:8593c9baf1f0f273afa22f5b45508b76adc7b8e94e17e7d98fbe1e3cd5812af2"},
+    {file = "coverage-7.0.0-cp39-cp39-musllinux_1_1_x86_64.whl", hash = "sha256:fee283cd36c3f14422d9c1b51da24ddbb5e1eed89ad2480f6a9f115df38b5df8"},
+    {file = "coverage-7.0.0-cp39-cp39-win32.whl", hash = "sha256:97c0b001ff15b8e8882995fc07ac0a08c8baf8b13c1145f3f12e0587bbb0e335"},
+    {file = "coverage-7.0.0-cp39-cp39-win_amd64.whl", hash = "sha256:8dbf83a4611c591b5de65069b6fd4dd3889200ed270cd2f7f5ac765d3842889f"},
+    {file = "coverage-7.0.0-pp36.pp37.pp38-none-any.whl", hash = "sha256:bcaf18e46668057051a312c714a4548b81f7e8fb3454116ad97be7562d2a99e4"},
+    {file = "coverage-7.0.0.tar.gz", hash = "sha256:9a175da2a7320e18fc3ee1d147639a2b3a8f037e508c96aa2da160294eb50e17"},
+]
+distlib = [
+    {file = "distlib-0.3.6-py2.py3-none-any.whl", hash = "sha256:f35c4b692542ca110de7ef0bea44d73981caeb34ca0b9b6b2e6d7790dda8f80e"},
+    {file = "distlib-0.3.6.tar.gz", hash = "sha256:14bad2d9b04d3a36127ac97f30b12a19268f211063d8f8ee4f47108896e11b46"},
+]
+exceptiongroup = [
+    {file = "exceptiongroup-1.0.4-py3-none-any.whl", hash = "sha256:542adf9dea4055530d6e1279602fa5cb11dab2395fa650b8674eaec35fc4a828"},
+    {file = "exceptiongroup-1.0.4.tar.gz", hash = "sha256:bd14967b79cd9bdb54d97323216f8fdf533e278df937aa2a90089e7d6e06e5ec"},
+]
 execnet = [
     {file = "execnet-1.9.0-py2.py3-none-any.whl", hash = "sha256:a295f7cc774947aac58dde7fdc85f4aa00c42adf5d8f5468fc630c1acf30a142"},
     {file = "execnet-1.9.0.tar.gz", hash = "sha256:8f694f3ba9cc92cab508b152dcfe322153975c29bda272e2fd7f3f00f36e47c5"},
 ]
-filelock = []
-identify = []
-idna = []
+filelock = [
+    {file = "filelock-3.8.2-py3-none-any.whl", hash = "sha256:8df285554452285f79c035efb0c861eb33a4bcfa5b7a137016e32e6a90f9792c"},
+    {file = "filelock-3.8.2.tar.gz", hash = "sha256:7565f628ea56bfcd8e54e42bdc55da899c85c1abfe1b5bcfd147e9188cebb3b2"},
+]
+identify = [
+    {file = "identify-2.5.11-py2.py3-none-any.whl", hash = "sha256:e7db36b772b188099616aaf2accbee122949d1c6a1bac4f38196720d6f9f06db"},
+    {file = "identify-2.5.11.tar.gz", hash = "sha256:14b7076b29c99b1b0b8b08e96d448c7b877a9b07683cd8cfda2ea06af85ffa1c"},
+]
+idna = [
+    {file = "idna-3.4-py3-none-any.whl", hash = "sha256:90b77e79eaa3eba6de819a0c442c0b4ceefc341a7a2ab77d7562bf49f425c5c2"},
+    {file = "idna-3.4.tar.gz", hash = "sha256:814f528e8dead7d329833b91c5faa87d60bf71824cd12a7530b5526063d02cb4"},
+]
 iniconfig = [
     {file = "iniconfig-1.1.1-py2.py3-none-any.whl", hash = "sha256:011e24c64b7f47f6ebd835bb12a743f2fbe9a26d4cecaa7f53bc4f35ee9da8b3"},
     {file = "iniconfig-1.1.1.tar.gz", hash = "sha256:bc3af051d7d14b2ee5ef9969666def0cd1a000e121eaea580d4a313df4b37f32"},
 ]
 isort = [
-    {file = "isort-5.10.1-py3-none-any.whl", hash = "sha256:6f62d78e2f89b4500b080fe3a81690850cd254227f27f75c3a0c491a1f351ba7"},
-    {file = "isort-5.10.1.tar.gz", hash = "sha256:e8443a5e7a020e9d7f97f1d7d9cd17c88bcb3bc7e218bf9cf5095fe550be2951"},
+    {file = "isort-5.11.3-py3-none-any.whl", hash = "sha256:83155ffa936239d986b0f190347a3f2285f42a9b9e1725c89d865b27dd0627e5"},
+    {file = "isort-5.11.3.tar.gz", hash = "sha256:a8ca25fbfad0f7d5d8447a4314837298d9f6b23aed8618584c894574f626b64b"},
+]
+jinja2 = [
+    {file = "Jinja2-3.1.2-py3-none-any.whl", hash = "sha256:6088930bfe239f0e6710546ab9c19c9ef35e29792895fed6e6e31a023a182a61"},
+    {file = "Jinja2-3.1.2.tar.gz", hash = "sha256:31351a702a408a9e7595a8fc6150fc3f43bb6bf7e319770cbc0db9df9437e852"},
 ]
-jinja2 = []
 jinja2-time = [
     {file = "jinja2-time-0.2.0.tar.gz", hash = "sha256:d14eaa4d315e7688daa4969f616f226614350c48730bfa1692d2caebd8c90d40"},
     {file = "jinja2_time-0.2.0-py2.py3-none-any.whl", hash = "sha256:d3eab6605e3ec8b7a0863df09cc1d23714908fa61aa6986a845c20ba488b4efa"},
 ]
-markupsafe = []
-more-itertools = []
+markupsafe = [
+    {file = "MarkupSafe-2.1.1-cp310-cp310-macosx_10_9_universal2.whl", hash = "sha256:86b1f75c4e7c2ac2ccdaec2b9022845dbb81880ca318bb7a0a01fbf7813e3812"},
+    {file = "MarkupSafe-2.1.1-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:f121a1420d4e173a5d96e47e9a0c0dcff965afdf1626d28de1460815f7c4ee7a"},
+    {file = "MarkupSafe-2.1.1-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:a49907dd8420c5685cfa064a1335b6754b74541bbb3706c259c02ed65b644b3e"},
+    {file = "MarkupSafe-2.1.1-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:10c1bfff05d95783da83491be968e8fe789263689c02724e0c691933c52994f5"},
+    {file = "MarkupSafe-2.1.1-cp310-cp310-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:b7bd98b796e2b6553da7225aeb61f447f80a1ca64f41d83612e6139ca5213aa4"},
+    {file = "MarkupSafe-2.1.1-cp310-cp310-musllinux_1_1_aarch64.whl", hash = "sha256:b09bf97215625a311f669476f44b8b318b075847b49316d3e28c08e41a7a573f"},
+    {file = "MarkupSafe-2.1.1-cp310-cp310-musllinux_1_1_i686.whl", hash = "sha256:694deca8d702d5db21ec83983ce0bb4b26a578e71fbdbd4fdcd387daa90e4d5e"},
+    {file = "MarkupSafe-2.1.1-cp310-cp310-musllinux_1_1_x86_64.whl", hash = "sha256:efc1913fd2ca4f334418481c7e595c00aad186563bbc1ec76067848c7ca0a933"},
+    {file = "MarkupSafe-2.1.1-cp310-cp310-win32.whl", hash = "sha256:4a33dea2b688b3190ee12bd7cfa29d39c9ed176bda40bfa11099a3ce5d3a7ac6"},
+    {file = "MarkupSafe-2.1.1-cp310-cp310-win_amd64.whl", hash = "sha256:dda30ba7e87fbbb7eab1ec9f58678558fd9a6b8b853530e176eabd064da81417"},
+    {file = "MarkupSafe-2.1.1-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:671cd1187ed5e62818414afe79ed29da836dde67166a9fac6d435873c44fdd02"},
+    {file = "MarkupSafe-2.1.1-cp37-cp37m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:3799351e2336dc91ea70b034983ee71cf2f9533cdff7c14c90ea126bfd95d65a"},
+    {file = "MarkupSafe-2.1.1-cp37-cp37m-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:e72591e9ecd94d7feb70c1cbd7be7b3ebea3f548870aa91e2732960fa4d57a37"},
+    {file = "MarkupSafe-2.1.1-cp37-cp37m-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:6fbf47b5d3728c6aea2abb0589b5d30459e369baa772e0f37a0320185e87c980"},
+    {file = "MarkupSafe-2.1.1-cp37-cp37m-musllinux_1_1_aarch64.whl", hash = "sha256:d5ee4f386140395a2c818d149221149c54849dfcfcb9f1debfe07a8b8bd63f9a"},
+    {file = "MarkupSafe-2.1.1-cp37-cp37m-musllinux_1_1_i686.whl", hash = "sha256:bcb3ed405ed3222f9904899563d6fc492ff75cce56cba05e32eff40e6acbeaa3"},
+    {file = "MarkupSafe-2.1.1-cp37-cp37m-musllinux_1_1_x86_64.whl", hash = "sha256:e1c0b87e09fa55a220f058d1d49d3fb8df88fbfab58558f1198e08c1e1de842a"},
+    {file = "MarkupSafe-2.1.1-cp37-cp37m-win32.whl", hash = "sha256:8dc1c72a69aa7e082593c4a203dcf94ddb74bb5c8a731e4e1eb68d031e8498ff"},
+    {file = "MarkupSafe-2.1.1-cp37-cp37m-win_amd64.whl", hash = "sha256:97a68e6ada378df82bc9f16b800ab77cbf4b2fada0081794318520138c088e4a"},
+    {file = "MarkupSafe-2.1.1-cp38-cp38-macosx_10_9_universal2.whl", hash = "sha256:e8c843bbcda3a2f1e3c2ab25913c80a3c5376cd00c6e8c4a86a89a28c8dc5452"},
+    {file = "MarkupSafe-2.1.1-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:0212a68688482dc52b2d45013df70d169f542b7394fc744c02a57374a4207003"},
+    {file = "MarkupSafe-2.1.1-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:8e576a51ad59e4bfaac456023a78f6b5e6e7651dcd383bcc3e18d06f9b55d6d1"},
+    {file = "MarkupSafe-2.1.1-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:4b9fe39a2ccc108a4accc2676e77da025ce383c108593d65cc909add5c3bd601"},
+    {file = "MarkupSafe-2.1.1-cp38-cp38-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:96e37a3dc86e80bf81758c152fe66dbf60ed5eca3d26305edf01892257049925"},
+    {file = "MarkupSafe-2.1.1-cp38-cp38-musllinux_1_1_aarch64.whl", hash = "sha256:6d0072fea50feec76a4c418096652f2c3238eaa014b2f94aeb1d56a66b41403f"},
+    {file = "MarkupSafe-2.1.1-cp38-cp38-musllinux_1_1_i686.whl", hash = "sha256:089cf3dbf0cd6c100f02945abeb18484bd1ee57a079aefd52cffd17fba910b88"},
+    {file = "MarkupSafe-2.1.1-cp38-cp38-musllinux_1_1_x86_64.whl", hash = "sha256:6a074d34ee7a5ce3effbc526b7083ec9731bb3cbf921bbe1d3005d4d2bdb3a63"},
+    {file = "MarkupSafe-2.1.1-cp38-cp38-win32.whl", hash = "sha256:421be9fbf0ffe9ffd7a378aafebbf6f4602d564d34be190fc19a193232fd12b1"},
+    {file = "MarkupSafe-2.1.1-cp38-cp38-win_amd64.whl", hash = "sha256:fc7b548b17d238737688817ab67deebb30e8073c95749d55538ed473130ec0c7"},
+    {file = "MarkupSafe-2.1.1-cp39-cp39-macosx_10_9_universal2.whl", hash = "sha256:e04e26803c9c3851c931eac40c695602c6295b8d432cbe78609649ad9bd2da8a"},
+    {file = "MarkupSafe-2.1.1-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:b87db4360013327109564f0e591bd2a3b318547bcef31b468a92ee504d07ae4f"},
+    {file = "MarkupSafe-2.1.1-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:99a2a507ed3ac881b975a2976d59f38c19386d128e7a9a18b7df6fff1fd4c1d6"},
+    {file = "MarkupSafe-2.1.1-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:56442863ed2b06d19c37f94d999035e15ee982988920e12a5b4ba29b62ad1f77"},
+    {file = "MarkupSafe-2.1.1-cp39-cp39-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:3ce11ee3f23f79dbd06fb3d63e2f6af7b12db1d46932fe7bd8afa259a5996603"},
+    {file = "MarkupSafe-2.1.1-cp39-cp39-musllinux_1_1_aarch64.whl", hash = "sha256:33b74d289bd2f5e527beadcaa3f401e0df0a89927c1559c8566c066fa4248ab7"},
+    {file = "MarkupSafe-2.1.1-cp39-cp39-musllinux_1_1_i686.whl", hash = "sha256:43093fb83d8343aac0b1baa75516da6092f58f41200907ef92448ecab8825135"},
+    {file = "MarkupSafe-2.1.1-cp39-cp39-musllinux_1_1_x86_64.whl", hash = "sha256:8e3dcf21f367459434c18e71b2a9532d96547aef8a871872a5bd69a715c15f96"},
+    {file = "MarkupSafe-2.1.1-cp39-cp39-win32.whl", hash = "sha256:d4306c36ca495956b6d568d276ac11fdd9c30a36f1b6eb928070dc5360b22e1c"},
+    {file = "MarkupSafe-2.1.1-cp39-cp39-win_amd64.whl", hash = "sha256:46d00d6cfecdde84d40e572d63735ef81423ad31184100411e6e3388d405e247"},
+    {file = "MarkupSafe-2.1.1.tar.gz", hash = "sha256:7f91197cc9e48f989d12e4e6fbc46495c446636dfc81b9ccf50bb0ec74b91d4b"},
+]
+more-itertools = [
+    {file = "more-itertools-9.0.0.tar.gz", hash = "sha256:5a6257e40878ef0520b1803990e3e22303a41b5714006c32a3fd8304b26ea1ab"},
+    {file = "more_itertools-9.0.0-py3-none-any.whl", hash = "sha256:250e83d7e81d0c87ca6bd942e6aeab8cc9daa6096d12c5308f3f92fa5e5c1f41"},
+]
 mypy-extensions = [
     {file = "mypy_extensions-0.4.3-py2.py3-none-any.whl", hash = "sha256:090fedd75945a69ae91ce1303b5824f428daf5a028d2f6ab8a299250a846f15d"},
     {file = "mypy_extensions-0.4.3.tar.gz", hash = "sha256:2d82818f5bb3e369420cb3c4060a7970edba416647068eb4c5343488a6c604a8"},
 ]
-nodeenv = []
+nodeenv = [
+    {file = "nodeenv-1.7.0-py2.py3-none-any.whl", hash = "sha256:27083a7b96a25f2f5e1d8cb4b6317ee8aeda3bdd121394e5ac54e498028a042e"},
+    {file = "nodeenv-1.7.0.tar.gz", hash = "sha256:e0e7f7dfb85fc5394c6fe1e8fa98131a2473e04311a45afb6508f7cf1836fa2b"},
+]
 packaging = [
-    {file = "packaging-21.3-py3-none-any.whl", hash = "sha256:ef103e05f519cdc783ae24ea4e2e0f508a9c99b2d4969652eed6a2e1ea5bd522"},
-    {file = "packaging-21.3.tar.gz", hash = "sha256:dd47c42927d89ab911e606518907cc2d3a1f38bbd026385970643f9c5b8ecfeb"},
+    {file = "packaging-22.0-py3-none-any.whl", hash = "sha256:957e2148ba0e1a3b282772e791ef1d8083648bc131c8ab0c1feba110ce1146c3"},
+    {file = "packaging-22.0.tar.gz", hash = "sha256:2198ec20bd4c017b8f9717e00f0c8714076fc2fd93816750ab48e2c41de2cfd3"},
+]
+parse = [
+    {file = "parse-1.19.0.tar.gz", hash = "sha256:9ff82852bcb65d139813e2a5197627a94966245c897796760a3a2a8eb66f020b"},
+]
+pathspec = [
+    {file = "pathspec-0.10.3-py3-none-any.whl", hash = "sha256:3c95343af8b756205e2aba76e843ba9520a24dd84f68c22b9f93251507509dd6"},
+    {file = "pathspec-0.10.3.tar.gz", hash = "sha256:56200de4077d9d0791465aa9095a01d421861e405b5096955051deefd697d6f6"},
+]
+platformdirs = [
+    {file = "platformdirs-2.6.0-py3-none-any.whl", hash = "sha256:1a89a12377800c81983db6be069ec068eee989748799b946cce2a6e80dcc54ca"},
+    {file = "platformdirs-2.6.0.tar.gz", hash = "sha256:b46ffafa316e6b83b47489d240ce17173f123a9b9c83282141c3daf26ad9ac2e"},
 ]
-parse = []
-pathspec = []
-platformdirs = []
 pluggy = [
     {file = "pluggy-1.0.0-py2.py3-none-any.whl", hash = "sha256:74134bbf457f031a36d68416e1509f34bd5ccc019f0bcc952c7b909d06b37bd3"},
     {file = "pluggy-1.0.0.tar.gz", hash = "sha256:4224373bacce55f955a878bf9cfa763c1e360858e330072059e10bad68531159"},
 ]
-pre-commit = []
-py = [
-    {file = "py-1.11.0-py2.py3-none-any.whl", hash = "sha256:607c53218732647dff4acdfcd50cb62615cedf612e72d1724fb1a0cc6405b378"},
-    {file = "py-1.11.0.tar.gz", hash = "sha256:51c75c4126074b472f746a24399ad32f6053d1b34b68d2fa41e558e6f4a98719"},
+pre-commit = [
+    {file = "pre_commit-2.20.0-py2.py3-none-any.whl", hash = "sha256:51a5ba7c480ae8072ecdb6933df22d2f812dc897d5fe848778116129a681aac7"},
+    {file = "pre_commit-2.20.0.tar.gz", hash = "sha256:a978dac7bc9ec0bcee55c18a277d553b0f419d259dadb4b9418ff2d00eb43959"},
+]
+pyproject-api = [
+    {file = "pyproject_api-1.2.1-py3-none-any.whl", hash = "sha256:155d5623453173b7b4e9379a3146ccef2d52335234eb2d03d6ba730e7dad179c"},
+    {file = "pyproject_api-1.2.1.tar.gz", hash = "sha256:093c047d192ceadcab7afd6b501276bf2ce44adf41cb9c313234518cddd20818"},
 ]
-pyparsing = [
-    {file = "pyparsing-3.0.9-py3-none-any.whl", hash = "sha256:5026bae9a10eeaefb61dab2f09052b9f4307d44aee4eda64b309723d8d206bbc"},
-    {file = "pyparsing-3.0.9.tar.gz", hash = "sha256:2b020ecf7d21b687f219b71ecad3631f644a47f01403fa1d1036b0c6416d70fb"},
+pytest = [
+    {file = "pytest-7.2.0-py3-none-any.whl", hash = "sha256:892f933d339f068883b6fd5a459f03d85bfcb355e4981e146d2c7616c21fef71"},
+    {file = "pytest-7.2.0.tar.gz", hash = "sha256:c4014eb40e10f11f355ad4e3c2fb2c6c6d1919c73f3b5a433de4708202cade59"},
+]
+pytest-cov = [
+    {file = "pytest-cov-4.0.0.tar.gz", hash = "sha256:996b79efde6433cdbd0088872dbc5fb3ed7fe1578b68cdbba634f14bb8dd0470"},
+    {file = "pytest_cov-4.0.0-py3-none-any.whl", hash = "sha256:2feb1b751d66a8bd934e5edfa2e961d11309dc37b73b0eabe73b5945fee20f6b"},
+]
+pytest-xdist = [
+    {file = "pytest-xdist-3.1.0.tar.gz", hash = "sha256:40fdb8f3544921c5dfcd486ac080ce22870e71d82ced6d2e78fa97c2addd480c"},
+    {file = "pytest_xdist-3.1.0-py3-none-any.whl", hash = "sha256:70a76f191d8a1d2d6be69fc440cdf85f3e4c03c08b520fd5dc5d338d6cf07d89"},
 ]
-pytest = []
-pytest-cov = []
-pytest-xdist = []
 python-dateutil = [
     {file = "python-dateutil-2.8.2.tar.gz", hash = "sha256:0123cacc1627ae19ddf3c27a5de5bd67ee4586fbdd6440d9748f8abb483d3e86"},
     {file = "python_dateutil-2.8.2-py2.py3-none-any.whl", hash = "sha256:961d03dc3453ebbc59dbdea9e4e11c5651520a876d0f4db161e8674aae935da9"},
 ]
-python-dotenv = []
-python-slugify = []
+python-dotenv = [
+    {file = "python-dotenv-0.21.0.tar.gz", hash = "sha256:b77d08274639e3d34145dfa6c7008e66df0f04b7be7a75fd0d5292c191d79045"},
+    {file = "python_dotenv-0.21.0-py3-none-any.whl", hash = "sha256:1684eb44636dd462b66c3ee016599815514527ad99965de77f43e0944634a7e5"},
+]
+python-slugify = [
+    {file = "python-slugify-7.0.0.tar.gz", hash = "sha256:7a0f21a39fa6c1c4bf2e5984c9b9ae944483fd10b54804cb0e23a3ccd4954f0b"},
+    {file = "python_slugify-7.0.0-py2.py3-none-any.whl", hash = "sha256:003aee64f9fd955d111549f96c4b58a3f40b9319383c70fad6277a4974bbf570"},
+]
 pyyaml = [
     {file = "PyYAML-6.0-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:d4db7c7aef085872ef65a8fd7d6d09a14ae91f691dec3e87ee5ee0539d516f53"},
     {file = "PyYAML-6.0-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:9df7ed3b3d2e0ecfe09e14741b857df43adb5a3ddadc919a2d94fbdf78fea53c"},
@@ -715,6 +918,13 @@ pyyaml = [
     {file = "PyYAML-6.0-cp310-cp310-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:f84fbc98b019fef2ee9a1cb3ce93e3187a6df0b2538a651bfb890254ba9f90b5"},
     {file = "PyYAML-6.0-cp310-cp310-win32.whl", hash = "sha256:2cd5df3de48857ed0544b34e2d40e9fac445930039f3cfe4bcc592a1f836d513"},
     {file = "PyYAML-6.0-cp310-cp310-win_amd64.whl", hash = "sha256:daf496c58a8c52083df09b80c860005194014c3698698d1a57cbcfa182142a3a"},
+    {file = "PyYAML-6.0-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:d4b0ba9512519522b118090257be113b9468d804b19d63c71dbcf4a48fa32358"},
+    {file = "PyYAML-6.0-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:81957921f441d50af23654aa6c5e5eaf9b06aba7f0a19c18a538dc7ef291c5a1"},
+    {file = "PyYAML-6.0-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:afa17f5bc4d1b10afd4466fd3a44dc0e245382deca5b3c353d8b757f9e3ecb8d"},
+    {file = "PyYAML-6.0-cp311-cp311-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:dbad0e9d368bb989f4515da330b88a057617d16b6a8245084f1b05400f24609f"},
+    {file = "PyYAML-6.0-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:432557aa2c09802be39460360ddffd48156e30721f5e8d917f01d31694216782"},
+    {file = "PyYAML-6.0-cp311-cp311-win32.whl", hash = "sha256:bfaef573a63ba8923503d27530362590ff4f576c626d86a9fed95822a8255fd7"},
+    {file = "PyYAML-6.0-cp311-cp311-win_amd64.whl", hash = "sha256:01b45c0191e6d66c470b6cf1b9531a771a83c1c4208272ead47a3ae4f2f603bf"},
     {file = "PyYAML-6.0-cp36-cp36m-macosx_10_9_x86_64.whl", hash = "sha256:897b80890765f037df3403d22bab41627ca8811ae55e9a722fd0392850ec4d86"},
     {file = "PyYAML-6.0-cp36-cp36m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:50602afada6d6cbfad699b0c7bb50d5ccffa7e46a3d738092afddc1f9758427f"},
     {file = "PyYAML-6.0-cp36-cp36m-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:48c346915c114f5fdb3ead70312bd042a953a8ce5c7106d5bfb1a5254e47da92"},
@@ -742,12 +952,22 @@ pyyaml = [
     {file = "PyYAML-6.0-cp39-cp39-win_amd64.whl", hash = "sha256:b3d267842bf12586ba6c734f89d1f5b871df0273157918b0ccefa29deb05c21c"},
     {file = "PyYAML-6.0.tar.gz", hash = "sha256:68fb519c14306fec9720a2a5b45bc9f0c8d1b9c72adf45c37baedfcd949c35a2"},
 ]
-requests = []
+requests = [
+    {file = "requests-2.28.1-py3-none-any.whl", hash = "sha256:8fefa2a1a1365bf5520aac41836fbee479da67864514bdb821f31ce07ce65349"},
+    {file = "requests-2.28.1.tar.gz", hash = "sha256:7c5599b102feddaa661c826c56ab4fee28bfd17f5abca1ebbe3e7f19d7c97983"},
+]
+setuptools = [
+    {file = "setuptools-65.6.3-py3-none-any.whl", hash = "sha256:57f6f22bde4e042978bcd50176fdb381d7c21a9efa4041202288d3737a0c6a54"},
+    {file = "setuptools-65.6.3.tar.gz", hash = "sha256:a7620757bf984b58deaf32fc8a4577a9bbc0850cf92c20e1ce41c38c19e5fb75"},
+]
 six = [
     {file = "six-1.16.0-py2.py3-none-any.whl", hash = "sha256:8abb2f1d86890a2dfb989f9a77cfcfd3e47c2a354b01111771326f8aa26e0254"},
     {file = "six-1.16.0.tar.gz", hash = "sha256:1e61c37477a1626458e36f7b1d82aa5c9b094fa4802892072e49de9c60c4c926"},
 ]
-soupsieve = []
+soupsieve = [
+    {file = "soupsieve-2.3.2.post1-py3-none-any.whl", hash = "sha256:3b2503d3c7084a42b1ebd08116e5f81aadfaea95863628c80a3b774a11b7c759"},
+    {file = "soupsieve-2.3.2.post1.tar.gz", hash = "sha256:fc53893b3da2c33de295667a0e19f078c14bf86544af307354de5fcf12a3f30d"},
+]
 text-unidecode = [
     {file = "text-unidecode-1.3.tar.gz", hash = "sha256:bad6603bb14d279193107714b288be206cac565dfa49aa5b105294dd5c4aab93"},
     {file = "text_unidecode-1.3-py2.py3-none-any.whl", hash = "sha256:1311f10e8b895935241623731c2ba64f4c455287888b18189350b67134a822e8"},
@@ -760,7 +980,19 @@ tomli = [
     {file = "tomli-2.0.1-py3-none-any.whl", hash = "sha256:939de3e7a6161af0c887ef91b7d41a53e7c5a1ca976325f429cb46ea9bc30ecc"},
     {file = "tomli-2.0.1.tar.gz", hash = "sha256:de526c12914f0c550d15924c62d72abc48d6fe7364aa87328337a31007fe8a4f"},
 ]
-tox = []
-tqdm = []
-urllib3 = []
-virtualenv = []
+tox = [
+    {file = "tox-4.0.16-py3-none-any.whl", hash = "sha256:1ba98d4a67b815403e616cf6ded707aeb0fadff10702928f9b990274c9703e9f"},
+    {file = "tox-4.0.16.tar.gz", hash = "sha256:968fc4e27110defdf15972893cb15fe1669f338c8408d8835077462fb07e07fe"},
+]
+tqdm = [
+    {file = "tqdm-4.64.1-py2.py3-none-any.whl", hash = "sha256:6fee160d6ffcd1b1c68c65f14c829c22832bc401726335ce92c52d395944a6a1"},
+    {file = "tqdm-4.64.1.tar.gz", hash = "sha256:5f4f682a004951c1b450bc753c710e9280c5746ce6ffedee253ddbcbf54cf1e4"},
+]
+urllib3 = [
+    {file = "urllib3-1.26.13-py2.py3-none-any.whl", hash = "sha256:47cc05d99aaa09c9e72ed5809b60e7ba354e64b59c9c173ac3018642d8bb41fc"},
+    {file = "urllib3-1.26.13.tar.gz", hash = "sha256:c083dd0dce68dbfbe1129d5271cb90f9447dea7d52097c6e0126120c521ddea8"},
+]
+virtualenv = [
+    {file = "virtualenv-20.17.1-py3-none-any.whl", hash = "sha256:ce3b1684d6e1a20a3e5ed36795a97dfc6af29bc3970ca8dab93e11ac6094b3c4"},
+    {file = "virtualenv-20.17.1.tar.gz", hash = "sha256:f8b927684efc6f1cc206c9db297a570ab9ad0e51c16fa9e45487d36d1905c058"},
+]
diff --git a/pyproject.toml b/pyproject.toml
index 7064df21..ad68c055 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -22,7 +22,7 @@ pytest = "^7.2.0"
 pytest-cov = "^4.0.0"
 pytest-xdist = "^3.0.2"
 python-dotenv = "^0.21.0"
-tox = "^3.27.1"
+tox = "^4.0.16"
 pre-commit = "^2.19.0"
 isort = "^5.10.1"
 
diff --git a/tox.ini b/tox.ini
index c2fff107..5aaca0b3 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,5 +1,4 @@
 [tox]
-isolated_build = True
 envlist =
     linters
     py

From 676e7f4d0f045eab4d91b7d66d52aa208a1688c0 Mon Sep 17 00:00:00 2001
From: Roel Adriaans <roel.adriaans@ordina.nl>
Date: Tue, 20 Dec 2022 20:56:33 +0100
Subject: [PATCH 225/371] Skip tests that are not yet working

---
 tests/solutions/test_day13_a.py | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/tests/solutions/test_day13_a.py b/tests/solutions/test_day13_a.py
index 7e1997f4..e70b274c 100644
--- a/tests/solutions/test_day13_a.py
+++ b/tests/solutions/test_day13_a.py
@@ -18,6 +18,7 @@ class TestDay13PartA:
             # "[1,[2,[3,[4,[5,6,7]]]],8,9]",
         ),
     )
+    @pytest.mark.skip(reason="Not yet implemented")
     def test_day13a_parsing(self, input_string):
         solution = Day13PartA()
         assert repr(solution.parse(deque(input_string))) == input_string
@@ -35,6 +36,7 @@ def test_day13a_parsing(self, input_string):
             (8, False),
         ],
     )
+    @pytest.mark.skip(reason="Not yet implemented")
     def test_day13a_individual_pairs(self, testdata, pair, valid):
         pairs = testdata.split("\n\n")
 
@@ -42,6 +44,7 @@ def test_day13a_individual_pairs(self, testdata, pair, valid):
         result = solution.solve(pairs[pair - 1])
         assert result == valid
 
+    @pytest.mark.skip(reason="Not yet implemented")
     def test_day13a_solve(self, testdata):
         solution = Day13PartA()
         result = solution.solve(testdata)

From ccf3a28f7a893ec840e34c0d85c38b0aed9ce510 Mon Sep 17 00:00:00 2001
From: Roel Adriaans <roel.adriaans@ordina.nl>
Date: Tue, 20 Dec 2022 21:00:44 +0100
Subject: [PATCH 226/371] Also skip the data one for now

---
 tests/solutions/test_day13_a.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/solutions/test_day13_a.py b/tests/solutions/test_day13_a.py
index e70b274c..087230c8 100644
--- a/tests/solutions/test_day13_a.py
+++ b/tests/solutions/test_day13_a.py
@@ -50,7 +50,7 @@ def test_day13a_solve(self, testdata):
         result = solution.solve(testdata)
         assert result == 13
 
-    @pytest.mark.xfail(reason="Not yet implemented", raises=NotImplementedError)
+    @pytest.mark.skip(reason="Not yet implemented")
     def test_day13a_data(self):
         """Result we got when we did the real solution"""
         solution = Day13PartA()

From 2daee145be669760df5e044b1e1f3fcf9bfd27e7 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 20 Dec 2022 20:14:31 +0000
Subject: [PATCH 227/371] Bump black from 22.10.0 to 22.12.0

Bumps [black](https://github.com/psf/black) from 22.10.0 to 22.12.0.
- [Release notes](https://github.com/psf/black/releases)
- [Changelog](https://github.com/psf/black/blob/main/CHANGES.md)
- [Commits](https://github.com/psf/black/compare/22.10.0...22.12.0)

---
updated-dependencies:
- dependency-name: black
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 poetry.lock    | 37 ++++++++++++++-----------------------
 pyproject.toml |  2 +-
 2 files changed, 15 insertions(+), 24 deletions(-)

diff --git a/poetry.lock b/poetry.lock
index 003367a8..addee056 100644
--- a/poetry.lock
+++ b/poetry.lock
@@ -66,7 +66,7 @@ chardet = ">=3.0.2"
 
 [[package]]
 name = "black"
-version = "22.10.0"
+version = "22.12.0"
 description = "The uncompromising code formatter."
 category = "dev"
 optional = false
@@ -623,7 +623,7 @@ testing = ["coverage (>=6.2)", "coverage-enable-subprocess (>=1)", "flaky (>=3.7
 [metadata]
 lock-version = "1.1"
 python-versions = "^3.10"
-content-hash = "e73128d2a1b540e71f6c74cb63b1dccddc571a7bcd0f231ce7f1980df7041e91"
+content-hash = "e0d93cf499ba11c3f9427acaf51f843e552024f20239550869797ab1c7160e10"
 
 [metadata.files]
 anytree = [
@@ -647,27 +647,18 @@ binaryornot = [
     {file = "binaryornot-0.4.4.tar.gz", hash = "sha256:359501dfc9d40632edc9fac890e19542db1a287bbcfa58175b66658392018061"},
 ]
 black = [
-    {file = "black-22.10.0-1fixedarch-cp310-cp310-macosx_11_0_x86_64.whl", hash = "sha256:5cc42ca67989e9c3cf859e84c2bf014f6633db63d1cbdf8fdb666dcd9e77e3fa"},
-    {file = "black-22.10.0-1fixedarch-cp311-cp311-macosx_11_0_x86_64.whl", hash = "sha256:5d8f74030e67087b219b032aa33a919fae8806d49c867846bfacde57f43972ef"},
-    {file = "black-22.10.0-1fixedarch-cp37-cp37m-macosx_10_16_x86_64.whl", hash = "sha256:197df8509263b0b8614e1df1756b1dd41be6738eed2ba9e9769f3880c2b9d7b6"},
-    {file = "black-22.10.0-1fixedarch-cp38-cp38-macosx_10_16_x86_64.whl", hash = "sha256:2644b5d63633702bc2c5f3754b1b475378fbbfb481f62319388235d0cd104c2d"},
-    {file = "black-22.10.0-1fixedarch-cp39-cp39-macosx_11_0_x86_64.whl", hash = "sha256:e41a86c6c650bcecc6633ee3180d80a025db041a8e2398dcc059b3afa8382cd4"},
-    {file = "black-22.10.0-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:2039230db3c6c639bd84efe3292ec7b06e9214a2992cd9beb293d639c6402edb"},
-    {file = "black-22.10.0-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:14ff67aec0a47c424bc99b71005202045dc09270da44a27848d534600ac64fc7"},
-    {file = "black-22.10.0-cp310-cp310-win_amd64.whl", hash = "sha256:819dc789f4498ecc91438a7de64427c73b45035e2e3680c92e18795a839ebb66"},
-    {file = "black-22.10.0-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:5b9b29da4f564ba8787c119f37d174f2b69cdfdf9015b7d8c5c16121ddc054ae"},
-    {file = "black-22.10.0-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:b8b49776299fece66bffaafe357d929ca9451450f5466e997a7285ab0fe28e3b"},
-    {file = "black-22.10.0-cp311-cp311-win_amd64.whl", hash = "sha256:21199526696b8f09c3997e2b4db8d0b108d801a348414264d2eb8eb2532e540d"},
-    {file = "black-22.10.0-cp37-cp37m-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:1e464456d24e23d11fced2bc8c47ef66d471f845c7b7a42f3bd77bf3d1789650"},
-    {file = "black-22.10.0-cp37-cp37m-win_amd64.whl", hash = "sha256:9311e99228ae10023300ecac05be5a296f60d2fd10fff31cf5c1fa4ca4b1988d"},
-    {file = "black-22.10.0-cp38-cp38-macosx_11_0_arm64.whl", hash = "sha256:fba8a281e570adafb79f7755ac8721b6cf1bbf691186a287e990c7929c7692ff"},
-    {file = "black-22.10.0-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:915ace4ff03fdfff953962fa672d44be269deb2eaf88499a0f8805221bc68c87"},
-    {file = "black-22.10.0-cp38-cp38-win_amd64.whl", hash = "sha256:444ebfb4e441254e87bad00c661fe32df9969b2bf224373a448d8aca2132b395"},
-    {file = "black-22.10.0-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:974308c58d057a651d182208a484ce80a26dac0caef2895836a92dd6ebd725e0"},
-    {file = "black-22.10.0-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:72ef3925f30e12a184889aac03d77d031056860ccae8a1e519f6cbb742736383"},
-    {file = "black-22.10.0-cp39-cp39-win_amd64.whl", hash = "sha256:432247333090c8c5366e69627ccb363bc58514ae3e63f7fc75c54b1ea80fa7de"},
-    {file = "black-22.10.0-py3-none-any.whl", hash = "sha256:c957b2b4ea88587b46cf49d1dc17681c1e672864fd7af32fc1e9664d572b3458"},
-    {file = "black-22.10.0.tar.gz", hash = "sha256:f513588da599943e0cde4e32cc9879e825d58720d6557062d1098c5ad80080e1"},
+    {file = "black-22.12.0-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:9eedd20838bd5d75b80c9f5487dbcb06836a43833a37846cf1d8c1cc01cef59d"},
+    {file = "black-22.12.0-cp310-cp310-win_amd64.whl", hash = "sha256:159a46a4947f73387b4d83e87ea006dbb2337eab6c879620a3ba52699b1f4351"},
+    {file = "black-22.12.0-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:d30b212bffeb1e252b31dd269dfae69dd17e06d92b87ad26e23890f3efea366f"},
+    {file = "black-22.12.0-cp311-cp311-win_amd64.whl", hash = "sha256:7412e75863aa5c5411886804678b7d083c7c28421210180d67dfd8cf1221e1f4"},
+    {file = "black-22.12.0-cp37-cp37m-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:c116eed0efb9ff870ded8b62fe9f28dd61ef6e9ddd28d83d7d264a38417dcee2"},
+    {file = "black-22.12.0-cp37-cp37m-win_amd64.whl", hash = "sha256:1f58cbe16dfe8c12b7434e50ff889fa479072096d79f0a7f25e4ab8e94cd8350"},
+    {file = "black-22.12.0-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:77d86c9f3db9b1bf6761244bc0b3572a546f5fe37917a044e02f3166d5aafa7d"},
+    {file = "black-22.12.0-cp38-cp38-win_amd64.whl", hash = "sha256:82d9fe8fee3401e02e79767016b4907820a7dc28d70d137eb397b92ef3cc5bfc"},
+    {file = "black-22.12.0-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:101c69b23df9b44247bd88e1d7e90154336ac4992502d4197bdac35dd7ee3320"},
+    {file = "black-22.12.0-cp39-cp39-win_amd64.whl", hash = "sha256:559c7a1ba9a006226f09e4916060982fd27334ae1998e7a38b3f33a37f7a2148"},
+    {file = "black-22.12.0-py3-none-any.whl", hash = "sha256:436cc9167dd28040ad90d3b404aec22cedf24a6e4d7de221bec2730ec0c97bcf"},
+    {file = "black-22.12.0.tar.gz", hash = "sha256:229351e5a18ca30f447bf724d007f890f97e13af070bb6ad4c0a441cd7596a2f"},
 ]
 certifi = [
     {file = "certifi-2022.9.24-py3-none-any.whl", hash = "sha256:90c1a32f1d68f940488354e36370f6cca89f0f106db09518524c88d6ed83f382"},
diff --git a/pyproject.toml b/pyproject.toml
index a1eb586b..9549c190 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -14,7 +14,7 @@ beautifulsoup4 = "^4.11.1"
 tqdm = "^4.64.0"
 
 [tool.poetry.dev-dependencies]
-black = "^22.10"
+black = "^22.12"
 cookiecutter = "^2.1.1"
 pytest = "^7.2.0"
 pytest-cov = "^4.0.0"

From 7082a4d3a007eb7290a83e0f8a7bda0b44029bce Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 21 Dec 2022 09:35:05 +0000
Subject: [PATCH 228/371] Bump tox from 3.27.1 to 4.0.15 (#102)

* Bump tox from 3.27.1 to 4.0.15

Bumps [tox](https://github.com/tox-dev/tox) from 3.27.1 to 4.0.15.
- [Release notes](https://github.com/tox-dev/tox/releases)
- [Changelog](https://github.com/tox-dev/tox/blob/main/docs/changelog.rst)
- [Commits](https://github.com/tox-dev/tox/compare/3.27.1...4.0.15)

---
updated-dependencies:
- dependency-name: tox
  dependency-type: direct:development
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>

* Update tox.ini

isolated build is the default now

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Roel Adriaans <roel@adriaans.org>
---
 poetry.lock    | 116 +++++++++++++++++++++++++------------------------
 pyproject.toml |   2 +-
 tox.ini        |   1 -
 3 files changed, 61 insertions(+), 58 deletions(-)

diff --git a/poetry.lock b/poetry.lock
index addee056..a251910b 100644
--- a/poetry.lock
+++ b/poetry.lock
@@ -85,6 +85,14 @@ d = ["aiohttp (>=3.7.4)"]
 jupyter = ["ipython (>=7.8.0)", "tokenize-rt (>=3.2.0)"]
 uvloop = ["uvloop (>=0.15.2)"]
 
+[[package]]
+name = "cachetools"
+version = "5.2.0"
+description = "Extensible memoizing collections and decorators"
+category = "dev"
+optional = false
+python-versions = "~=3.7"
+
 [[package]]
 name = "certifi"
 version = "2022.9.24"
@@ -103,11 +111,11 @@ python-versions = ">=3.6.1"
 
 [[package]]
 name = "chardet"
-version = "5.0.0"
+version = "5.1.0"
 description = "Universal encoding detector for Python 3"
 category = "dev"
 optional = false
-python-versions = ">=3.6"
+python-versions = ">=3.7"
 
 [[package]]
 name = "charset-normalizer"
@@ -202,15 +210,15 @@ testing = ["pre-commit"]
 
 [[package]]
 name = "filelock"
-version = "3.8.0"
+version = "3.8.2"
 description = "A platform independent file lock."
 category = "dev"
 optional = false
 python-versions = ">=3.7"
 
 [package.extras]
-docs = ["furo (>=2022.6.21)", "sphinx (>=5.1.1)", "sphinx-autodoc-typehints (>=1.19.1)"]
-testing = ["covdefaults (>=2.2)", "coverage (>=6.4.2)", "pytest (>=7.1.2)", "pytest-cov (>=3)", "pytest-timeout (>=2.1)"]
+docs = ["furo (>=2022.9.29)", "sphinx (>=5.3)", "sphinx-autodoc-typehints (>=1.19.5)"]
+testing = ["covdefaults (>=2.2.2)", "coverage (>=6.5)", "pytest (>=7.2)", "pytest-cov (>=4)", "pytest-timeout (>=2.1)"]
 
 [[package]]
 name = "identify"
@@ -308,14 +316,11 @@ setuptools = "*"
 
 [[package]]
 name = "packaging"
-version = "21.3"
+version = "22.0"
 description = "Core utilities for Python packages"
 category = "dev"
 optional = false
-python-versions = ">=3.6"
-
-[package.dependencies]
-pyparsing = ">=2.0.2,<3.0.5 || >3.0.5"
+python-versions = ">=3.7"
 
 [[package]]
 name = "pathspec"
@@ -327,7 +332,7 @@ python-versions = ">=3.7"
 
 [[package]]
 name = "platformdirs"
-version = "2.5.3"
+version = "2.6.0"
 description = "A small Python package for determining appropriate platform-specific dirs, e.g. a \"user data dir\"."
 category = "dev"
 optional = false
@@ -366,23 +371,20 @@ toml = "*"
 virtualenv = ">=20.0.8"
 
 [[package]]
-name = "py"
-version = "1.11.0"
-description = "library with cross-python path, ini-parsing, io, code, log facilities"
+name = "pyproject-api"
+version = "1.2.1"
+description = "API to interact with the python pyproject.toml based projects"
 category = "dev"
 optional = false
-python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*"
+python-versions = ">=3.7"
 
-[[package]]
-name = "pyparsing"
-version = "3.0.9"
-description = "pyparsing module - Classes and methods to define and execute parsing grammars"
-category = "dev"
-optional = false
-python-versions = ">=3.6.8"
+[package.dependencies]
+packaging = ">=21.3"
+tomli = {version = ">=2.0.1", markers = "python_version < \"3.11\""}
 
 [package.extras]
-diagrams = ["jinja2", "railroad-diagrams"]
+docs = ["furo (>=2022.9.29)", "sphinx (>=5.3)", "sphinx-autodoc-typehints (>=1.19.5)"]
+testing = ["covdefaults (>=2.2.2)", "importlib-metadata (>=5.1)", "pytest (>=7.2)", "pytest-cov (>=4)", "pytest-mock (>=3.10)", "virtualenv (>=20.17)", "wheel (>=0.38.4)"]
 
 [[package]]
 name = "pytest"
@@ -553,25 +555,27 @@ python-versions = ">=3.7"
 
 [[package]]
 name = "tox"
-version = "3.27.1"
+version = "4.0.15"
 description = "tox is a generic virtualenv management and test command line tool"
 category = "dev"
 optional = false
-python-versions = "!=3.0.*,!=3.1.*,!=3.2.*,!=3.3.*,!=3.4.*,>=2.7"
+python-versions = ">=3.7"
 
 [package.dependencies]
-colorama = {version = ">=0.4.1", markers = "platform_system == \"Windows\""}
-filelock = ">=3.0.0"
-packaging = ">=14"
-pluggy = ">=0.12.0"
-py = ">=1.4.17"
-six = ">=1.14.0"
-tomli = {version = ">=2.0.1", markers = "python_version >= \"3.7\" and python_version < \"3.11\""}
-virtualenv = ">=16.0.0,<20.0.0 || >20.0.0,<20.0.1 || >20.0.1,<20.0.2 || >20.0.2,<20.0.3 || >20.0.3,<20.0.4 || >20.0.4,<20.0.5 || >20.0.5,<20.0.6 || >20.0.6,<20.0.7 || >20.0.7"
+cachetools = ">=5.2"
+chardet = ">=5.1"
+colorama = ">=0.4.6"
+filelock = ">=3.8.2"
+packaging = ">=22"
+platformdirs = ">=2.6"
+pluggy = ">=1"
+pyproject-api = ">=1.2.1"
+tomli = {version = ">=2.0.1", markers = "python_version < \"3.11\""}
+virtualenv = ">=20.17.1"
 
 [package.extras]
-docs = ["pygments-github-lexers (>=0.0.5)", "sphinx (>=2.0.0)", "sphinxcontrib-autoprogram (>=0.1.5)", "towncrier (>=18.5.0)"]
-testing = ["flaky (>=3.4.0)", "freezegun (>=0.3.11)", "pathlib2 (>=2.3.3)", "psutil (>=5.6.1)", "pytest (>=4.0.0)", "pytest-cov (>=2.5.1)", "pytest-mock (>=1.10.0)", "pytest-randomly (>=1.0.0)"]
+docs = ["furo (>=2022.12.7)", "sphinx (>=5.3)", "sphinx-argparse-cli (>=1.10)", "sphinx-autodoc-typehints (>=1.19.5)", "sphinx-copybutton (>=0.5.1)", "sphinx-inline-tabs (>=2022.1.2b11)", "sphinxcontrib-towncrier (>=0.2.1a0)", "towncrier (>=22.8)"]
+testing = ["build[virtualenv] (>=0.9)", "covdefaults (>=2.2.2)", "devpi-process (>=0.3)", "diff-cover (>=7.3)", "distlib (>=0.3.6)", "flaky (>=3.7)", "hatch-vcs (>=0.2.1)", "hatchling (>=1.11.1)", "psutil (>=5.9.4)", "pytest (>=7.2)", "pytest-cov (>=4)", "pytest-mock (>=3.10)", "pytest-xdist (>=3.1)", "re-assert (>=1.1)", "time-machine (>=2.8.2)"]
 
 [[package]]
 name = "tqdm"
@@ -605,7 +609,7 @@ socks = ["PySocks (>=1.5.6,!=1.5.7,<2.0)"]
 
 [[package]]
 name = "virtualenv"
-version = "20.16.6"
+version = "20.17.1"
 description = "Virtual Python Environment builder"
 category = "dev"
 optional = false
@@ -623,7 +627,7 @@ testing = ["coverage (>=6.2)", "coverage-enable-subprocess (>=1)", "flaky (>=3.7
 [metadata]
 lock-version = "1.1"
 python-versions = "^3.10"
-content-hash = "e0d93cf499ba11c3f9427acaf51f843e552024f20239550869797ab1c7160e10"
+content-hash = "541db991678f31a71d738e8e5b567be0f69ed6842a24d4a197dddfb1fc09b702"
 
 [metadata.files]
 anytree = [
@@ -660,6 +664,10 @@ black = [
     {file = "black-22.12.0-py3-none-any.whl", hash = "sha256:436cc9167dd28040ad90d3b404aec22cedf24a6e4d7de221bec2730ec0c97bcf"},
     {file = "black-22.12.0.tar.gz", hash = "sha256:229351e5a18ca30f447bf724d007f890f97e13af070bb6ad4c0a441cd7596a2f"},
 ]
+cachetools = [
+    {file = "cachetools-5.2.0-py3-none-any.whl", hash = "sha256:f9f17d2aec496a9aa6b76f53e3b614c965223c061982d434d160f930c698a9db"},
+    {file = "cachetools-5.2.0.tar.gz", hash = "sha256:6a94c6402995a99c3970cc7e4884bb60b4a8639938157eeed436098bf9831757"},
+]
 certifi = [
     {file = "certifi-2022.9.24-py3-none-any.whl", hash = "sha256:90c1a32f1d68f940488354e36370f6cca89f0f106db09518524c88d6ed83f382"},
     {file = "certifi-2022.9.24.tar.gz", hash = "sha256:0d9c601124e5a6ba9712dbc60d9c53c21e34f5f641fe83002317394311bdce14"},
@@ -669,8 +677,8 @@ cfgv = [
     {file = "cfgv-3.3.1.tar.gz", hash = "sha256:f5a830efb9ce7a445376bb66ec94c638a9787422f96264c98edc6bdeed8ab736"},
 ]
 chardet = [
-    {file = "chardet-5.0.0-py3-none-any.whl", hash = "sha256:d3e64f022d254183001eccc5db4040520c0f23b1a3f33d6413e099eb7f126557"},
-    {file = "chardet-5.0.0.tar.gz", hash = "sha256:0368df2bfd78b5fc20572bb4e9bb7fb53e2c094f60ae9993339e8671d0afb8aa"},
+    {file = "chardet-5.1.0-py3-none-any.whl", hash = "sha256:362777fb014af596ad31334fde1e8c327dfdb076e1960d1694662d46a6917ab9"},
+    {file = "chardet-5.1.0.tar.gz", hash = "sha256:0d62712b956bc154f85fb0a266e2a3c5913c2967e00348701b32411d6def31e5"},
 ]
 charset-normalizer = [
     {file = "charset-normalizer-2.1.1.tar.gz", hash = "sha256:5a3d016c7c547f69d6f81fb0db9449ce888b418b5b9952cc5e6e66843e9dd845"},
@@ -753,8 +761,8 @@ execnet = [
     {file = "execnet-1.9.0.tar.gz", hash = "sha256:8f694f3ba9cc92cab508b152dcfe322153975c29bda272e2fd7f3f00f36e47c5"},
 ]
 filelock = [
-    {file = "filelock-3.8.0-py3-none-any.whl", hash = "sha256:617eb4e5eedc82fc5f47b6d61e4d11cb837c56cb4544e39081099fa17ad109d4"},
-    {file = "filelock-3.8.0.tar.gz", hash = "sha256:55447caa666f2198c5b6b13a26d2084d26fa5b115c00d065664b2124680c4edc"},
+    {file = "filelock-3.8.2-py3-none-any.whl", hash = "sha256:8df285554452285f79c035efb0c861eb33a4bcfa5b7a137016e32e6a90f9792c"},
+    {file = "filelock-3.8.2.tar.gz", hash = "sha256:7565f628ea56bfcd8e54e42bdc55da899c85c1abfe1b5bcfd147e9188cebb3b2"},
 ]
 identify = [
     {file = "identify-2.5.8-py2.py3-none-any.whl", hash = "sha256:48b7925fe122720088aeb7a6c34f17b27e706b72c61070f27fe3789094233440"},
@@ -831,16 +839,16 @@ nodeenv = [
     {file = "nodeenv-1.7.0.tar.gz", hash = "sha256:e0e7f7dfb85fc5394c6fe1e8fa98131a2473e04311a45afb6508f7cf1836fa2b"},
 ]
 packaging = [
-    {file = "packaging-21.3-py3-none-any.whl", hash = "sha256:ef103e05f519cdc783ae24ea4e2e0f508a9c99b2d4969652eed6a2e1ea5bd522"},
-    {file = "packaging-21.3.tar.gz", hash = "sha256:dd47c42927d89ab911e606518907cc2d3a1f38bbd026385970643f9c5b8ecfeb"},
+    {file = "packaging-22.0-py3-none-any.whl", hash = "sha256:957e2148ba0e1a3b282772e791ef1d8083648bc131c8ab0c1feba110ce1146c3"},
+    {file = "packaging-22.0.tar.gz", hash = "sha256:2198ec20bd4c017b8f9717e00f0c8714076fc2fd93816750ab48e2c41de2cfd3"},
 ]
 pathspec = [
     {file = "pathspec-0.10.1-py3-none-any.whl", hash = "sha256:46846318467efc4556ccfd27816e004270a9eeeeb4d062ce5e6fc7a87c573f93"},
     {file = "pathspec-0.10.1.tar.gz", hash = "sha256:7ace6161b621d31e7902eb6b5ae148d12cfd23f4a249b9ffb6b9fee12084323d"},
 ]
 platformdirs = [
-    {file = "platformdirs-2.5.3-py3-none-any.whl", hash = "sha256:0cb405749187a194f444c25c82ef7225232f11564721eabffc6ec70df83b11cb"},
-    {file = "platformdirs-2.5.3.tar.gz", hash = "sha256:6e52c21afff35cb659c6e52d8b4d61b9bd544557180440538f255d9382c8cbe0"},
+    {file = "platformdirs-2.6.0-py3-none-any.whl", hash = "sha256:1a89a12377800c81983db6be069ec068eee989748799b946cce2a6e80dcc54ca"},
+    {file = "platformdirs-2.6.0.tar.gz", hash = "sha256:b46ffafa316e6b83b47489d240ce17173f123a9b9c83282141c3daf26ad9ac2e"},
 ]
 pluggy = [
     {file = "pluggy-1.0.0-py2.py3-none-any.whl", hash = "sha256:74134bbf457f031a36d68416e1509f34bd5ccc019f0bcc952c7b909d06b37bd3"},
@@ -850,13 +858,9 @@ pre-commit = [
     {file = "pre_commit-2.20.0-py2.py3-none-any.whl", hash = "sha256:51a5ba7c480ae8072ecdb6933df22d2f812dc897d5fe848778116129a681aac7"},
     {file = "pre_commit-2.20.0.tar.gz", hash = "sha256:a978dac7bc9ec0bcee55c18a277d553b0f419d259dadb4b9418ff2d00eb43959"},
 ]
-py = [
-    {file = "py-1.11.0-py2.py3-none-any.whl", hash = "sha256:607c53218732647dff4acdfcd50cb62615cedf612e72d1724fb1a0cc6405b378"},
-    {file = "py-1.11.0.tar.gz", hash = "sha256:51c75c4126074b472f746a24399ad32f6053d1b34b68d2fa41e558e6f4a98719"},
-]
-pyparsing = [
-    {file = "pyparsing-3.0.9-py3-none-any.whl", hash = "sha256:5026bae9a10eeaefb61dab2f09052b9f4307d44aee4eda64b309723d8d206bbc"},
-    {file = "pyparsing-3.0.9.tar.gz", hash = "sha256:2b020ecf7d21b687f219b71ecad3631f644a47f01403fa1d1036b0c6416d70fb"},
+pyproject-api = [
+    {file = "pyproject_api-1.2.1-py3-none-any.whl", hash = "sha256:155d5623453173b7b4e9379a3146ccef2d52335234eb2d03d6ba730e7dad179c"},
+    {file = "pyproject_api-1.2.1.tar.gz", hash = "sha256:093c047d192ceadcab7afd6b501276bf2ce44adf41cb9c313234518cddd20818"},
 ]
 pytest = [
     {file = "pytest-7.2.0-py3-none-any.whl", hash = "sha256:892f933d339f068883b6fd5a459f03d85bfcb355e4981e146d2c7616c21fef71"},
@@ -953,8 +957,8 @@ tomli = [
     {file = "tomli-2.0.1.tar.gz", hash = "sha256:de526c12914f0c550d15924c62d72abc48d6fe7364aa87328337a31007fe8a4f"},
 ]
 tox = [
-    {file = "tox-3.27.1-py2.py3-none-any.whl", hash = "sha256:f52ca66eae115fcfef0e77ef81fd107133d295c97c52df337adedb8dfac6ab84"},
-    {file = "tox-3.27.1.tar.gz", hash = "sha256:b2a920e35a668cc06942ffd1cf3a4fb221a4d909ca72191fb6d84b0b18a7be04"},
+    {file = "tox-4.0.15-py3-none-any.whl", hash = "sha256:2ecb6acee1a9e84fbc83c6aa5a8554b8c6e4048f07f4136b5e2669e5566429b1"},
+    {file = "tox-4.0.15.tar.gz", hash = "sha256:5017f6717b2199d7864addee5b6f4381517f64b669efe05753e61c80f0f324e9"},
 ]
 tqdm = [
     {file = "tqdm-4.64.1-py2.py3-none-any.whl", hash = "sha256:6fee160d6ffcd1b1c68c65f14c829c22832bc401726335ce92c52d395944a6a1"},
@@ -965,6 +969,6 @@ urllib3 = [
     {file = "urllib3-1.26.12.tar.gz", hash = "sha256:3fa96cf423e6987997fc326ae8df396db2a8b7c667747d47ddd8ecba91f4a74e"},
 ]
 virtualenv = [
-    {file = "virtualenv-20.16.6-py3-none-any.whl", hash = "sha256:186ca84254abcbde98180fd17092f9628c5fe742273c02724972a1d8a2035108"},
-    {file = "virtualenv-20.16.6.tar.gz", hash = "sha256:530b850b523c6449406dfba859d6345e48ef19b8439606c5d74d7d3c9e14d76e"},
+    {file = "virtualenv-20.17.1-py3-none-any.whl", hash = "sha256:ce3b1684d6e1a20a3e5ed36795a97dfc6af29bc3970ca8dab93e11ac6094b3c4"},
+    {file = "virtualenv-20.17.1.tar.gz", hash = "sha256:f8b927684efc6f1cc206c9db297a570ab9ad0e51c16fa9e45487d36d1905c058"},
 ]
diff --git a/pyproject.toml b/pyproject.toml
index 9549c190..81ad21e2 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -20,7 +20,7 @@ pytest = "^7.2.0"
 pytest-cov = "^4.0.0"
 pytest-xdist = "^3.1.0"
 python-dotenv = "^0.21.0"
-tox = "^3.27.1"
+tox = "^4.0.15"
 pre-commit = "^2.19.0"
 isort = "^5.11.3"
 
diff --git a/tox.ini b/tox.ini
index 5e7c3a60..4f77c7d5 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,5 +1,4 @@
 [tox]
-isolated_build = True
 envlist =
     linters
     py

From ddec5d4e5ac2e1dc30d5676a4f4fc4c21043f54f Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 21 Dec 2022 10:30:11 +0000
Subject: [PATCH 229/371] Bump certifi from 2022.9.24 to 2022.12.7 (#93)

Bumps [certifi](https://github.com/certifi/python-certifi) from 2022.9.24 to 2022.12.7.
- [Release notes](https://github.com/certifi/python-certifi/releases)
- [Commits](https://github.com/certifi/python-certifi/compare/2022.09.24...2022.12.07)

---
updated-dependencies:
- dependency-name: certifi
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 poetry.lock | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/poetry.lock b/poetry.lock
index a251910b..11ec107c 100644
--- a/poetry.lock
+++ b/poetry.lock
@@ -95,7 +95,7 @@ python-versions = "~=3.7"
 
 [[package]]
 name = "certifi"
-version = "2022.9.24"
+version = "2022.12.7"
 description = "Python package for providing Mozilla's CA Bundle."
 category = "main"
 optional = false
@@ -627,7 +627,7 @@ testing = ["coverage (>=6.2)", "coverage-enable-subprocess (>=1)", "flaky (>=3.7
 [metadata]
 lock-version = "1.1"
 python-versions = "^3.10"
-content-hash = "541db991678f31a71d738e8e5b567be0f69ed6842a24d4a197dddfb1fc09b702"
+content-hash = "1a5f55a0a6d83c476f8a0da559e6e8b4648915d39e7325c6a5efa4d751c87d9c"
 
 [metadata.files]
 anytree = [
@@ -669,8 +669,8 @@ cachetools = [
     {file = "cachetools-5.2.0.tar.gz", hash = "sha256:6a94c6402995a99c3970cc7e4884bb60b4a8639938157eeed436098bf9831757"},
 ]
 certifi = [
-    {file = "certifi-2022.9.24-py3-none-any.whl", hash = "sha256:90c1a32f1d68f940488354e36370f6cca89f0f106db09518524c88d6ed83f382"},
-    {file = "certifi-2022.9.24.tar.gz", hash = "sha256:0d9c601124e5a6ba9712dbc60d9c53c21e34f5f641fe83002317394311bdce14"},
+    {file = "certifi-2022.12.7-py3-none-any.whl", hash = "sha256:4ad3232f5e926d6718ec31cfc1fcadfde020920e278684144551c91769c7bc18"},
+    {file = "certifi-2022.12.7.tar.gz", hash = "sha256:35824b4c3a97115964b408844d64aa14db1cc518f6562e8d7261699d1350a9e3"},
 ]
 cfgv = [
     {file = "cfgv-3.3.1-py2.py3-none-any.whl", hash = "sha256:c6a0883f3917a037485059700b9e75da2464e6c27051014ad85ba6aaa5884426"},

From 516bfd1197ef20e12c08330424550295aabefce4 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 22 Dec 2022 04:51:15 +0000
Subject: [PATCH 230/371] Bump isort from 5.11.3 to 5.11.4

Bumps [isort](https://github.com/pycqa/isort) from 5.11.3 to 5.11.4.
- [Release notes](https://github.com/pycqa/isort/releases)
- [Changelog](https://github.com/PyCQA/isort/blob/main/CHANGELOG.md)
- [Commits](https://github.com/pycqa/isort/compare/5.11.3...5.11.4)

---
updated-dependencies:
- dependency-name: isort
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 poetry.lock    | 8 ++++----
 pyproject.toml | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/poetry.lock b/poetry.lock
index f7e573f8..36d6d378 100644
--- a/poetry.lock
+++ b/poetry.lock
@@ -249,7 +249,7 @@ python-versions = "*"
 
 [[package]]
 name = "isort"
-version = "5.11.3"
+version = "5.11.4"
 description = "A Python utility / library to sort Python imports."
 category = "dev"
 optional = false
@@ -643,7 +643,7 @@ testing = ["coverage (>=6.2)", "coverage-enable-subprocess (>=1)", "flaky (>=3.7
 [metadata]
 lock-version = "1.1"
 python-versions = "^3.10"
-content-hash = "4a94a048c8201b5047f377213ccce84ad5ed85725539c4fcdc1b769966fc26eb"
+content-hash = "04f28d61c21c95e14f991f8fcbd4a12016158e8adc54fd9567bc105dd2eea625"
 
 [metadata.files]
 anytree = [
@@ -794,8 +794,8 @@ iniconfig = [
     {file = "iniconfig-1.1.1.tar.gz", hash = "sha256:bc3af051d7d14b2ee5ef9969666def0cd1a000e121eaea580d4a313df4b37f32"},
 ]
 isort = [
-    {file = "isort-5.11.3-py3-none-any.whl", hash = "sha256:83155ffa936239d986b0f190347a3f2285f42a9b9e1725c89d865b27dd0627e5"},
-    {file = "isort-5.11.3.tar.gz", hash = "sha256:a8ca25fbfad0f7d5d8447a4314837298d9f6b23aed8618584c894574f626b64b"},
+    {file = "isort-5.11.4-py3-none-any.whl", hash = "sha256:c033fd0edb91000a7f09527fe5c75321878f98322a77ddcc81adbd83724afb7b"},
+    {file = "isort-5.11.4.tar.gz", hash = "sha256:6db30c5ded9815d813932c04c2f85a360bcdd35fed496f4d8f35495ef0a261b6"},
 ]
 jinja2 = [
     {file = "Jinja2-3.1.2-py3-none-any.whl", hash = "sha256:6088930bfe239f0e6710546ab9c19c9ef35e29792895fed6e6e31a023a182a61"},
diff --git a/pyproject.toml b/pyproject.toml
index ad68c055..a512a1a4 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -24,7 +24,7 @@ pytest-xdist = "^3.0.2"
 python-dotenv = "^0.21.0"
 tox = "^4.0.16"
 pre-commit = "^2.19.0"
-isort = "^5.10.1"
+isort = "^5.11.4"
 
 [tool.poetry.scripts]
 adventofcode = "adventofcode2022.main:main"

From 4246ed8e8544821f67f7ae3c1a2d1f4bf7800355 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 22 Dec 2022 08:11:36 +0100
Subject: [PATCH 231/371] Bump tox from 4.0.15 to 4.0.16 (#104)

Bumps [tox](https://github.com/tox-dev/tox) from 4.0.15 to 4.0.16.
- [Release notes](https://github.com/tox-dev/tox/releases)
- [Changelog](https://github.com/tox-dev/tox/blob/main/docs/changelog.rst)
- [Commits](https://github.com/tox-dev/tox/compare/4.0.15...4.0.16)

---
updated-dependencies:
- dependency-name: tox
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 poetry.lock    | 10 +++++-----
 pyproject.toml |  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/poetry.lock b/poetry.lock
index 11ec107c..bf40e982 100644
--- a/poetry.lock
+++ b/poetry.lock
@@ -555,7 +555,7 @@ python-versions = ">=3.7"
 
 [[package]]
 name = "tox"
-version = "4.0.15"
+version = "4.0.16"
 description = "tox is a generic virtualenv management and test command line tool"
 category = "dev"
 optional = false
@@ -575,7 +575,7 @@ virtualenv = ">=20.17.1"
 
 [package.extras]
 docs = ["furo (>=2022.12.7)", "sphinx (>=5.3)", "sphinx-argparse-cli (>=1.10)", "sphinx-autodoc-typehints (>=1.19.5)", "sphinx-copybutton (>=0.5.1)", "sphinx-inline-tabs (>=2022.1.2b11)", "sphinxcontrib-towncrier (>=0.2.1a0)", "towncrier (>=22.8)"]
-testing = ["build[virtualenv] (>=0.9)", "covdefaults (>=2.2.2)", "devpi-process (>=0.3)", "diff-cover (>=7.3)", "distlib (>=0.3.6)", "flaky (>=3.7)", "hatch-vcs (>=0.2.1)", "hatchling (>=1.11.1)", "psutil (>=5.9.4)", "pytest (>=7.2)", "pytest-cov (>=4)", "pytest-mock (>=3.10)", "pytest-xdist (>=3.1)", "re-assert (>=1.1)", "time-machine (>=2.8.2)"]
+testing = ["build[virtualenv] (>=0.9)", "covdefaults (>=2.2.2)", "devpi-process (>=0.3)", "diff-cover (>=7.3)", "distlib (>=0.3.6)", "flaky (>=3.7)", "hatch-vcs (>=0.3)", "hatchling (>=1.11.1)", "psutil (>=5.9.4)", "pytest (>=7.2)", "pytest-cov (>=4)", "pytest-mock (>=3.10)", "pytest-xdist (>=3.1)", "re-assert (>=1.1)", "time-machine (>=2.8.2)"]
 
 [[package]]
 name = "tqdm"
@@ -627,7 +627,7 @@ testing = ["coverage (>=6.2)", "coverage-enable-subprocess (>=1)", "flaky (>=3.7
 [metadata]
 lock-version = "1.1"
 python-versions = "^3.10"
-content-hash = "1a5f55a0a6d83c476f8a0da559e6e8b4648915d39e7325c6a5efa4d751c87d9c"
+content-hash = "276757b286250dd5f039f4f39aaa1a0f078a67d4a4ab37f81dd599765dce1976"
 
 [metadata.files]
 anytree = [
@@ -957,8 +957,8 @@ tomli = [
     {file = "tomli-2.0.1.tar.gz", hash = "sha256:de526c12914f0c550d15924c62d72abc48d6fe7364aa87328337a31007fe8a4f"},
 ]
 tox = [
-    {file = "tox-4.0.15-py3-none-any.whl", hash = "sha256:2ecb6acee1a9e84fbc83c6aa5a8554b8c6e4048f07f4136b5e2669e5566429b1"},
-    {file = "tox-4.0.15.tar.gz", hash = "sha256:5017f6717b2199d7864addee5b6f4381517f64b669efe05753e61c80f0f324e9"},
+    {file = "tox-4.0.16-py3-none-any.whl", hash = "sha256:1ba98d4a67b815403e616cf6ded707aeb0fadff10702928f9b990274c9703e9f"},
+    {file = "tox-4.0.16.tar.gz", hash = "sha256:968fc4e27110defdf15972893cb15fe1669f338c8408d8835077462fb07e07fe"},
 ]
 tqdm = [
     {file = "tqdm-4.64.1-py2.py3-none-any.whl", hash = "sha256:6fee160d6ffcd1b1c68c65f14c829c22832bc401726335ce92c52d395944a6a1"},
diff --git a/pyproject.toml b/pyproject.toml
index 81ad21e2..34f6d1da 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -20,7 +20,7 @@ pytest = "^7.2.0"
 pytest-cov = "^4.0.0"
 pytest-xdist = "^3.1.0"
 python-dotenv = "^0.21.0"
-tox = "^4.0.15"
+tox = "^4.0.16"
 pre-commit = "^2.19.0"
 isort = "^5.11.3"
 

From 1ea84da51a139d82c28116c6f09f94a99f773719 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 22 Dec 2022 07:18:23 +0000
Subject: [PATCH 232/371] Bump isort from 5.11.3 to 5.11.4 (#103)

Bumps [isort](https://github.com/pycqa/isort) from 5.11.3 to 5.11.4.
- [Release notes](https://github.com/pycqa/isort/releases)
- [Changelog](https://github.com/PyCQA/isort/blob/main/CHANGELOG.md)
- [Commits](https://github.com/pycqa/isort/compare/5.11.3...5.11.4)

---
updated-dependencies:
- dependency-name: isort
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 poetry.lock    | 8 ++++----
 pyproject.toml | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/poetry.lock b/poetry.lock
index bf40e982..1654a6a5 100644
--- a/poetry.lock
+++ b/poetry.lock
@@ -249,7 +249,7 @@ python-versions = "*"
 
 [[package]]
 name = "isort"
-version = "5.11.3"
+version = "5.11.4"
 description = "A Python utility / library to sort Python imports."
 category = "dev"
 optional = false
@@ -627,7 +627,7 @@ testing = ["coverage (>=6.2)", "coverage-enable-subprocess (>=1)", "flaky (>=3.7
 [metadata]
 lock-version = "1.1"
 python-versions = "^3.10"
-content-hash = "276757b286250dd5f039f4f39aaa1a0f078a67d4a4ab37f81dd599765dce1976"
+content-hash = "4c54f06c3a10bc654e45e1fc9440a8a9e109492d34d0d0a3a4d771c5bbb94f39"
 
 [metadata.files]
 anytree = [
@@ -777,8 +777,8 @@ iniconfig = [
     {file = "iniconfig-1.1.1.tar.gz", hash = "sha256:bc3af051d7d14b2ee5ef9969666def0cd1a000e121eaea580d4a313df4b37f32"},
 ]
 isort = [
-    {file = "isort-5.11.3-py3-none-any.whl", hash = "sha256:83155ffa936239d986b0f190347a3f2285f42a9b9e1725c89d865b27dd0627e5"},
-    {file = "isort-5.11.3.tar.gz", hash = "sha256:a8ca25fbfad0f7d5d8447a4314837298d9f6b23aed8618584c894574f626b64b"},
+    {file = "isort-5.11.4-py3-none-any.whl", hash = "sha256:c033fd0edb91000a7f09527fe5c75321878f98322a77ddcc81adbd83724afb7b"},
+    {file = "isort-5.11.4.tar.gz", hash = "sha256:6db30c5ded9815d813932c04c2f85a360bcdd35fed496f4d8f35495ef0a261b6"},
 ]
 jinja2 = [
     {file = "Jinja2-3.1.2-py3-none-any.whl", hash = "sha256:6088930bfe239f0e6710546ab9c19c9ef35e29792895fed6e6e31a023a182a61"},
diff --git a/pyproject.toml b/pyproject.toml
index 34f6d1da..3266ebe8 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -22,7 +22,7 @@ pytest-xdist = "^3.1.0"
 python-dotenv = "^0.21.0"
 tox = "^4.0.16"
 pre-commit = "^2.19.0"
-isort = "^5.11.3"
+isort = "^5.11.4"
 
 [tool.poetry.scripts]
 adventofcode = "adventofcode2021.main:main"

From cd252fbf959aded53c57a1c4d3e9212253a00511 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 26 Dec 2022 04:25:12 +0000
Subject: [PATCH 233/371] Bump pre-commit from 2.20.0 to 2.21.0

Bumps [pre-commit](https://github.com/pre-commit/pre-commit) from 2.20.0 to 2.21.0.
- [Release notes](https://github.com/pre-commit/pre-commit/releases)
- [Changelog](https://github.com/pre-commit/pre-commit/blob/main/CHANGELOG.md)
- [Commits](https://github.com/pre-commit/pre-commit/compare/v2.20.0...v2.21.0)

---
updated-dependencies:
- dependency-name: pre-commit
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 poetry.lock    | 23 +++++------------------
 pyproject.toml |  2 +-
 2 files changed, 6 insertions(+), 19 deletions(-)

diff --git a/poetry.lock b/poetry.lock
index 36d6d378..62b66a25 100644
--- a/poetry.lock
+++ b/poetry.lock
@@ -372,7 +372,7 @@ testing = ["pytest", "pytest-benchmark"]
 
 [[package]]
 name = "pre-commit"
-version = "2.20.0"
+version = "2.21.0"
 description = "A framework for managing and maintaining multi-language pre-commit hooks."
 category = "dev"
 optional = false
@@ -383,8 +383,7 @@ cfgv = ">=2.0.0"
 identify = ">=1.0.0"
 nodeenv = ">=0.11.1"
 pyyaml = ">=5.1"
-toml = "*"
-virtualenv = ">=20.0.8"
+virtualenv = ">=20.10.0"
 
 [[package]]
 name = "pyproject-api"
@@ -553,14 +552,6 @@ category = "dev"
 optional = false
 python-versions = "*"
 
-[[package]]
-name = "toml"
-version = "0.10.2"
-description = "Python Library for Tom's Obvious, Minimal Language"
-category = "dev"
-optional = false
-python-versions = ">=2.6, !=3.0.*, !=3.1.*, !=3.2.*"
-
 [[package]]
 name = "tomli"
 version = "2.0.1"
@@ -643,7 +634,7 @@ testing = ["coverage (>=6.2)", "coverage-enable-subprocess (>=1)", "flaky (>=3.7
 [metadata]
 lock-version = "1.1"
 python-versions = "^3.10"
-content-hash = "04f28d61c21c95e14f991f8fcbd4a12016158e8adc54fd9567bc105dd2eea625"
+content-hash = "dff0456752f8e284a969fff4a103e41830681a75eb935d4c086db30113433904"
 
 [metadata.files]
 anytree = [
@@ -879,8 +870,8 @@ pluggy = [
     {file = "pluggy-1.0.0.tar.gz", hash = "sha256:4224373bacce55f955a878bf9cfa763c1e360858e330072059e10bad68531159"},
 ]
 pre-commit = [
-    {file = "pre_commit-2.20.0-py2.py3-none-any.whl", hash = "sha256:51a5ba7c480ae8072ecdb6933df22d2f812dc897d5fe848778116129a681aac7"},
-    {file = "pre_commit-2.20.0.tar.gz", hash = "sha256:a978dac7bc9ec0bcee55c18a277d553b0f419d259dadb4b9418ff2d00eb43959"},
+    {file = "pre_commit-2.21.0-py2.py3-none-any.whl", hash = "sha256:e2f91727039fc39a92f58a588a25b87f936de6567eed4f0e673e0507edc75bad"},
+    {file = "pre_commit-2.21.0.tar.gz", hash = "sha256:31ef31af7e474a8d8995027fefdfcf509b5c913ff31f2015b4ec4beb26a6f658"},
 ]
 pyproject-api = [
     {file = "pyproject_api-1.2.1-py3-none-any.whl", hash = "sha256:155d5623453173b7b4e9379a3146ccef2d52335234eb2d03d6ba730e7dad179c"},
@@ -972,10 +963,6 @@ text-unidecode = [
     {file = "text-unidecode-1.3.tar.gz", hash = "sha256:bad6603bb14d279193107714b288be206cac565dfa49aa5b105294dd5c4aab93"},
     {file = "text_unidecode-1.3-py2.py3-none-any.whl", hash = "sha256:1311f10e8b895935241623731c2ba64f4c455287888b18189350b67134a822e8"},
 ]
-toml = [
-    {file = "toml-0.10.2-py2.py3-none-any.whl", hash = "sha256:806143ae5bfb6a3c6e736a764057db0e6a0e05e338b5630894a5f779cabb4f9b"},
-    {file = "toml-0.10.2.tar.gz", hash = "sha256:b3bda1d108d5dd99f4a20d24d9c348e91c4db7ab1b749200bded2f839ccbe68f"},
-]
 tomli = [
     {file = "tomli-2.0.1-py3-none-any.whl", hash = "sha256:939de3e7a6161af0c887ef91b7d41a53e7c5a1ca976325f429cb46ea9bc30ecc"},
     {file = "tomli-2.0.1.tar.gz", hash = "sha256:de526c12914f0c550d15924c62d72abc48d6fe7364aa87328337a31007fe8a4f"},
diff --git a/pyproject.toml b/pyproject.toml
index a512a1a4..04054f1c 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -23,7 +23,7 @@ pytest-cov = "^4.0.0"
 pytest-xdist = "^3.0.2"
 python-dotenv = "^0.21.0"
 tox = "^4.0.16"
-pre-commit = "^2.19.0"
+pre-commit = "^2.21.0"
 isort = "^5.11.4"
 
 [tool.poetry.scripts]

From fed3540ee60fdc59c99ea2f1d1606a3b93148008 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 27 Dec 2022 10:47:42 +0100
Subject: [PATCH 234/371] Bump tox from 4.0.16 to 4.0.18 (#107)

Bumps [tox](https://github.com/tox-dev/tox) from 4.0.16 to 4.0.18.
- [Release notes](https://github.com/tox-dev/tox/releases)
- [Changelog](https://github.com/tox-dev/tox/blob/main/docs/changelog.rst)
- [Commits](https://github.com/tox-dev/tox/compare/4.0.16...4.0.18)

---
updated-dependencies:
- dependency-name: tox
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 poetry.lock    | 10 +++++-----
 pyproject.toml |  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/poetry.lock b/poetry.lock
index 1654a6a5..22b0f803 100644
--- a/poetry.lock
+++ b/poetry.lock
@@ -555,7 +555,7 @@ python-versions = ">=3.7"
 
 [[package]]
 name = "tox"
-version = "4.0.16"
+version = "4.0.18"
 description = "tox is a generic virtualenv management and test command line tool"
 category = "dev"
 optional = false
@@ -574,7 +574,7 @@ tomli = {version = ">=2.0.1", markers = "python_version < \"3.11\""}
 virtualenv = ">=20.17.1"
 
 [package.extras]
-docs = ["furo (>=2022.12.7)", "sphinx (>=5.3)", "sphinx-argparse-cli (>=1.10)", "sphinx-autodoc-typehints (>=1.19.5)", "sphinx-copybutton (>=0.5.1)", "sphinx-inline-tabs (>=2022.1.2b11)", "sphinxcontrib-towncrier (>=0.2.1a0)", "towncrier (>=22.8)"]
+docs = ["furo (>=2022.12.7)", "sphinx (>=5.3)", "sphinx-argparse-cli (>=1.10)", "sphinx-autodoc-typehints (>=1.19.5)", "sphinx-copybutton (>=0.5.1)", "sphinx-inline-tabs (>=2022.1.2b11)", "sphinxcontrib-towncrier (>=0.2.1a0)", "towncrier (>=22.12)"]
 testing = ["build[virtualenv] (>=0.9)", "covdefaults (>=2.2.2)", "devpi-process (>=0.3)", "diff-cover (>=7.3)", "distlib (>=0.3.6)", "flaky (>=3.7)", "hatch-vcs (>=0.3)", "hatchling (>=1.11.1)", "psutil (>=5.9.4)", "pytest (>=7.2)", "pytest-cov (>=4)", "pytest-mock (>=3.10)", "pytest-xdist (>=3.1)", "re-assert (>=1.1)", "time-machine (>=2.8.2)"]
 
 [[package]]
@@ -627,7 +627,7 @@ testing = ["coverage (>=6.2)", "coverage-enable-subprocess (>=1)", "flaky (>=3.7
 [metadata]
 lock-version = "1.1"
 python-versions = "^3.10"
-content-hash = "4c54f06c3a10bc654e45e1fc9440a8a9e109492d34d0d0a3a4d771c5bbb94f39"
+content-hash = "221b7854442ce4f3e3efe00fe8bd0f133b10a174df8e3cf7815b120e5681155f"
 
 [metadata.files]
 anytree = [
@@ -957,8 +957,8 @@ tomli = [
     {file = "tomli-2.0.1.tar.gz", hash = "sha256:de526c12914f0c550d15924c62d72abc48d6fe7364aa87328337a31007fe8a4f"},
 ]
 tox = [
-    {file = "tox-4.0.16-py3-none-any.whl", hash = "sha256:1ba98d4a67b815403e616cf6ded707aeb0fadff10702928f9b990274c9703e9f"},
-    {file = "tox-4.0.16.tar.gz", hash = "sha256:968fc4e27110defdf15972893cb15fe1669f338c8408d8835077462fb07e07fe"},
+    {file = "tox-4.0.18-py3-none-any.whl", hash = "sha256:2e3fa6d1b5cc09a971848e36d33bea64120dba9009cad5bff1fa8f6a5f367373"},
+    {file = "tox-4.0.18.tar.gz", hash = "sha256:e862abf5b75aa2d84e087a2f9696b97faf01dff8836515216f0453e951745eee"},
 ]
 tqdm = [
     {file = "tqdm-4.64.1-py2.py3-none-any.whl", hash = "sha256:6fee160d6ffcd1b1c68c65f14c829c22832bc401726335ce92c52d395944a6a1"},
diff --git a/pyproject.toml b/pyproject.toml
index 3266ebe8..80e6f937 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -20,7 +20,7 @@ pytest = "^7.2.0"
 pytest-cov = "^4.0.0"
 pytest-xdist = "^3.1.0"
 python-dotenv = "^0.21.0"
-tox = "^4.0.16"
+tox = "^4.0.18"
 pre-commit = "^2.19.0"
 isort = "^5.11.4"
 

From 380cfb6a8b4b03058617f807238e018f96305442 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 27 Dec 2022 09:49:00 +0000
Subject: [PATCH 235/371] Bump pre-commit from 2.20.0 to 2.21.0

Bumps [pre-commit](https://github.com/pre-commit/pre-commit) from 2.20.0 to 2.21.0.
- [Release notes](https://github.com/pre-commit/pre-commit/releases)
- [Changelog](https://github.com/pre-commit/pre-commit/blob/main/CHANGELOG.md)
- [Commits](https://github.com/pre-commit/pre-commit/compare/v2.20.0...v2.21.0)

---
updated-dependencies:
- dependency-name: pre-commit
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 poetry.lock    | 23 +++++------------------
 pyproject.toml |  2 +-
 2 files changed, 6 insertions(+), 19 deletions(-)

diff --git a/poetry.lock b/poetry.lock
index 22b0f803..65e9a787 100644
--- a/poetry.lock
+++ b/poetry.lock
@@ -356,7 +356,7 @@ testing = ["pytest", "pytest-benchmark"]
 
 [[package]]
 name = "pre-commit"
-version = "2.20.0"
+version = "2.21.0"
 description = "A framework for managing and maintaining multi-language pre-commit hooks."
 category = "dev"
 optional = false
@@ -367,8 +367,7 @@ cfgv = ">=2.0.0"
 identify = ">=1.0.0"
 nodeenv = ">=0.11.1"
 pyyaml = ">=5.1"
-toml = "*"
-virtualenv = ">=20.0.8"
+virtualenv = ">=20.10.0"
 
 [[package]]
 name = "pyproject-api"
@@ -537,14 +536,6 @@ category = "dev"
 optional = false
 python-versions = "*"
 
-[[package]]
-name = "toml"
-version = "0.10.2"
-description = "Python Library for Tom's Obvious, Minimal Language"
-category = "dev"
-optional = false
-python-versions = ">=2.6, !=3.0.*, !=3.1.*, !=3.2.*"
-
 [[package]]
 name = "tomli"
 version = "2.0.1"
@@ -627,7 +618,7 @@ testing = ["coverage (>=6.2)", "coverage-enable-subprocess (>=1)", "flaky (>=3.7
 [metadata]
 lock-version = "1.1"
 python-versions = "^3.10"
-content-hash = "221b7854442ce4f3e3efe00fe8bd0f133b10a174df8e3cf7815b120e5681155f"
+content-hash = "0b8ebd85b2f8f2e851138d534580fb6fefec70574c164c56f574c8dc6a9f1b88"
 
 [metadata.files]
 anytree = [
@@ -855,8 +846,8 @@ pluggy = [
     {file = "pluggy-1.0.0.tar.gz", hash = "sha256:4224373bacce55f955a878bf9cfa763c1e360858e330072059e10bad68531159"},
 ]
 pre-commit = [
-    {file = "pre_commit-2.20.0-py2.py3-none-any.whl", hash = "sha256:51a5ba7c480ae8072ecdb6933df22d2f812dc897d5fe848778116129a681aac7"},
-    {file = "pre_commit-2.20.0.tar.gz", hash = "sha256:a978dac7bc9ec0bcee55c18a277d553b0f419d259dadb4b9418ff2d00eb43959"},
+    {file = "pre_commit-2.21.0-py2.py3-none-any.whl", hash = "sha256:e2f91727039fc39a92f58a588a25b87f936de6567eed4f0e673e0507edc75bad"},
+    {file = "pre_commit-2.21.0.tar.gz", hash = "sha256:31ef31af7e474a8d8995027fefdfcf509b5c913ff31f2015b4ec4beb26a6f658"},
 ]
 pyproject-api = [
     {file = "pyproject_api-1.2.1-py3-none-any.whl", hash = "sha256:155d5623453173b7b4e9379a3146ccef2d52335234eb2d03d6ba730e7dad179c"},
@@ -948,10 +939,6 @@ text-unidecode = [
     {file = "text-unidecode-1.3.tar.gz", hash = "sha256:bad6603bb14d279193107714b288be206cac565dfa49aa5b105294dd5c4aab93"},
     {file = "text_unidecode-1.3-py2.py3-none-any.whl", hash = "sha256:1311f10e8b895935241623731c2ba64f4c455287888b18189350b67134a822e8"},
 ]
-toml = [
-    {file = "toml-0.10.2-py2.py3-none-any.whl", hash = "sha256:806143ae5bfb6a3c6e736a764057db0e6a0e05e338b5630894a5f779cabb4f9b"},
-    {file = "toml-0.10.2.tar.gz", hash = "sha256:b3bda1d108d5dd99f4a20d24d9c348e91c4db7ab1b749200bded2f839ccbe68f"},
-]
 tomli = [
     {file = "tomli-2.0.1-py3-none-any.whl", hash = "sha256:939de3e7a6161af0c887ef91b7d41a53e7c5a1ca976325f429cb46ea9bc30ecc"},
     {file = "tomli-2.0.1.tar.gz", hash = "sha256:de526c12914f0c550d15924c62d72abc48d6fe7364aa87328337a31007fe8a4f"},
diff --git a/pyproject.toml b/pyproject.toml
index 80e6f937..8b4fd2ad 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -21,7 +21,7 @@ pytest-cov = "^4.0.0"
 pytest-xdist = "^3.1.0"
 python-dotenv = "^0.21.0"
 tox = "^4.0.18"
-pre-commit = "^2.19.0"
+pre-commit = "^2.21.0"
 isort = "^5.11.4"
 
 [tool.poetry.scripts]

From cfb663899d2ce270ca1c8bb4de66ae050dd5e7f3 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 28 Dec 2022 14:00:26 +0000
Subject: [PATCH 236/371] Bump tox from 4.0.16 to 4.0.18

Bumps [tox](https://github.com/tox-dev/tox) from 4.0.16 to 4.0.18.
- [Release notes](https://github.com/tox-dev/tox/releases)
- [Changelog](https://github.com/tox-dev/tox/blob/main/docs/changelog.rst)
- [Commits](https://github.com/tox-dev/tox/compare/4.0.16...4.0.18)

---
updated-dependencies:
- dependency-name: tox
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 poetry.lock    | 10 +++++-----
 pyproject.toml |  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/poetry.lock b/poetry.lock
index 62b66a25..8e728656 100644
--- a/poetry.lock
+++ b/poetry.lock
@@ -562,7 +562,7 @@ python-versions = ">=3.7"
 
 [[package]]
 name = "tox"
-version = "4.0.16"
+version = "4.0.18"
 description = "tox is a generic virtualenv management and test command line tool"
 category = "dev"
 optional = false
@@ -581,7 +581,7 @@ tomli = {version = ">=2.0.1", markers = "python_version < \"3.11\""}
 virtualenv = ">=20.17.1"
 
 [package.extras]
-docs = ["furo (>=2022.12.7)", "sphinx (>=5.3)", "sphinx-argparse-cli (>=1.10)", "sphinx-autodoc-typehints (>=1.19.5)", "sphinx-copybutton (>=0.5.1)", "sphinx-inline-tabs (>=2022.1.2b11)", "sphinxcontrib-towncrier (>=0.2.1a0)", "towncrier (>=22.8)"]
+docs = ["furo (>=2022.12.7)", "sphinx (>=5.3)", "sphinx-argparse-cli (>=1.10)", "sphinx-autodoc-typehints (>=1.19.5)", "sphinx-copybutton (>=0.5.1)", "sphinx-inline-tabs (>=2022.1.2b11)", "sphinxcontrib-towncrier (>=0.2.1a0)", "towncrier (>=22.12)"]
 testing = ["build[virtualenv] (>=0.9)", "covdefaults (>=2.2.2)", "devpi-process (>=0.3)", "diff-cover (>=7.3)", "distlib (>=0.3.6)", "flaky (>=3.7)", "hatch-vcs (>=0.3)", "hatchling (>=1.11.1)", "psutil (>=5.9.4)", "pytest (>=7.2)", "pytest-cov (>=4)", "pytest-mock (>=3.10)", "pytest-xdist (>=3.1)", "re-assert (>=1.1)", "time-machine (>=2.8.2)"]
 
 [[package]]
@@ -634,7 +634,7 @@ testing = ["coverage (>=6.2)", "coverage-enable-subprocess (>=1)", "flaky (>=3.7
 [metadata]
 lock-version = "1.1"
 python-versions = "^3.10"
-content-hash = "dff0456752f8e284a969fff4a103e41830681a75eb935d4c086db30113433904"
+content-hash = "55ab3436d51db5efcbb2d3a1ac3bbc3c4428c24992e4a9fadb6a3682606f2be9"
 
 [metadata.files]
 anytree = [
@@ -968,8 +968,8 @@ tomli = [
     {file = "tomli-2.0.1.tar.gz", hash = "sha256:de526c12914f0c550d15924c62d72abc48d6fe7364aa87328337a31007fe8a4f"},
 ]
 tox = [
-    {file = "tox-4.0.16-py3-none-any.whl", hash = "sha256:1ba98d4a67b815403e616cf6ded707aeb0fadff10702928f9b990274c9703e9f"},
-    {file = "tox-4.0.16.tar.gz", hash = "sha256:968fc4e27110defdf15972893cb15fe1669f338c8408d8835077462fb07e07fe"},
+    {file = "tox-4.0.18-py3-none-any.whl", hash = "sha256:2e3fa6d1b5cc09a971848e36d33bea64120dba9009cad5bff1fa8f6a5f367373"},
+    {file = "tox-4.0.18.tar.gz", hash = "sha256:e862abf5b75aa2d84e087a2f9696b97faf01dff8836515216f0453e951745eee"},
 ]
 tqdm = [
     {file = "tqdm-4.64.1-py2.py3-none-any.whl", hash = "sha256:6fee160d6ffcd1b1c68c65f14c829c22832bc401726335ce92c52d395944a6a1"},
diff --git a/pyproject.toml b/pyproject.toml
index 04054f1c..e50ca466 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -22,7 +22,7 @@ pytest = "^7.2.0"
 pytest-cov = "^4.0.0"
 pytest-xdist = "^3.0.2"
 python-dotenv = "^0.21.0"
-tox = "^4.0.16"
+tox = "^4.0.18"
 pre-commit = "^2.21.0"
 isort = "^5.11.4"
 

From a63fa0b6989bd57c4250ebb79b61468d8ed95825 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 29 Dec 2022 04:25:47 +0000
Subject: [PATCH 237/371] Bump tox from 4.0.18 to 4.0.19

Bumps [tox](https://github.com/tox-dev/tox) from 4.0.18 to 4.0.19.
- [Release notes](https://github.com/tox-dev/tox/releases)
- [Changelog](https://github.com/tox-dev/tox/blob/main/docs/changelog.rst)
- [Commits](https://github.com/tox-dev/tox/compare/4.0.18...4.0.19)

---
updated-dependencies:
- dependency-name: tox
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 poetry.lock    | 8 ++++----
 pyproject.toml | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/poetry.lock b/poetry.lock
index 8e728656..016e3e2d 100644
--- a/poetry.lock
+++ b/poetry.lock
@@ -562,7 +562,7 @@ python-versions = ">=3.7"
 
 [[package]]
 name = "tox"
-version = "4.0.18"
+version = "4.0.19"
 description = "tox is a generic virtualenv management and test command line tool"
 category = "dev"
 optional = false
@@ -634,7 +634,7 @@ testing = ["coverage (>=6.2)", "coverage-enable-subprocess (>=1)", "flaky (>=3.7
 [metadata]
 lock-version = "1.1"
 python-versions = "^3.10"
-content-hash = "55ab3436d51db5efcbb2d3a1ac3bbc3c4428c24992e4a9fadb6a3682606f2be9"
+content-hash = "ed8bda15b70c7a4bb97af11401c6b61d774d8f4705e3cc7332755984b3ddbc92"
 
 [metadata.files]
 anytree = [
@@ -968,8 +968,8 @@ tomli = [
     {file = "tomli-2.0.1.tar.gz", hash = "sha256:de526c12914f0c550d15924c62d72abc48d6fe7364aa87328337a31007fe8a4f"},
 ]
 tox = [
-    {file = "tox-4.0.18-py3-none-any.whl", hash = "sha256:2e3fa6d1b5cc09a971848e36d33bea64120dba9009cad5bff1fa8f6a5f367373"},
-    {file = "tox-4.0.18.tar.gz", hash = "sha256:e862abf5b75aa2d84e087a2f9696b97faf01dff8836515216f0453e951745eee"},
+    {file = "tox-4.0.19-py3-none-any.whl", hash = "sha256:2a51d4fd98a93b24819abbe9327fd759d39da73fb13aec3da954e8cd11f902ff"},
+    {file = "tox-4.0.19.tar.gz", hash = "sha256:31d95663dc66f8d53fdf0825f1fc931404b1db5380482c5449628f49db767047"},
 ]
 tqdm = [
     {file = "tqdm-4.64.1-py2.py3-none-any.whl", hash = "sha256:6fee160d6ffcd1b1c68c65f14c829c22832bc401726335ce92c52d395944a6a1"},
diff --git a/pyproject.toml b/pyproject.toml
index e50ca466..8660a19a 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -22,7 +22,7 @@ pytest = "^7.2.0"
 pytest-cov = "^4.0.0"
 pytest-xdist = "^3.0.2"
 python-dotenv = "^0.21.0"
-tox = "^4.0.18"
+tox = "^4.0.19"
 pre-commit = "^2.21.0"
 isort = "^5.11.4"
 

From 45a4563a4ce872ce1244b6a41784190a82c592e1 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 29 Dec 2022 12:03:54 +0100
Subject: [PATCH 238/371] Bump tox from 4.0.18 to 4.0.19 (#108)

Bumps [tox](https://github.com/tox-dev/tox) from 4.0.18 to 4.0.19.
- [Release notes](https://github.com/tox-dev/tox/releases)
- [Changelog](https://github.com/tox-dev/tox/blob/main/docs/changelog.rst)
- [Commits](https://github.com/tox-dev/tox/compare/4.0.18...4.0.19)

---
updated-dependencies:
- dependency-name: tox
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 poetry.lock    | 8 ++++----
 pyproject.toml | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/poetry.lock b/poetry.lock
index 65e9a787..6e992acc 100644
--- a/poetry.lock
+++ b/poetry.lock
@@ -546,7 +546,7 @@ python-versions = ">=3.7"
 
 [[package]]
 name = "tox"
-version = "4.0.18"
+version = "4.0.19"
 description = "tox is a generic virtualenv management and test command line tool"
 category = "dev"
 optional = false
@@ -618,7 +618,7 @@ testing = ["coverage (>=6.2)", "coverage-enable-subprocess (>=1)", "flaky (>=3.7
 [metadata]
 lock-version = "1.1"
 python-versions = "^3.10"
-content-hash = "0b8ebd85b2f8f2e851138d534580fb6fefec70574c164c56f574c8dc6a9f1b88"
+content-hash = "ad9c89b5063f46e68a0857ee806bad193e881ac78979e83be29ce3971111d139"
 
 [metadata.files]
 anytree = [
@@ -944,8 +944,8 @@ tomli = [
     {file = "tomli-2.0.1.tar.gz", hash = "sha256:de526c12914f0c550d15924c62d72abc48d6fe7364aa87328337a31007fe8a4f"},
 ]
 tox = [
-    {file = "tox-4.0.18-py3-none-any.whl", hash = "sha256:2e3fa6d1b5cc09a971848e36d33bea64120dba9009cad5bff1fa8f6a5f367373"},
-    {file = "tox-4.0.18.tar.gz", hash = "sha256:e862abf5b75aa2d84e087a2f9696b97faf01dff8836515216f0453e951745eee"},
+    {file = "tox-4.0.19-py3-none-any.whl", hash = "sha256:2a51d4fd98a93b24819abbe9327fd759d39da73fb13aec3da954e8cd11f902ff"},
+    {file = "tox-4.0.19.tar.gz", hash = "sha256:31d95663dc66f8d53fdf0825f1fc931404b1db5380482c5449628f49db767047"},
 ]
 tqdm = [
     {file = "tqdm-4.64.1-py2.py3-none-any.whl", hash = "sha256:6fee160d6ffcd1b1c68c65f14c829c22832bc401726335ce92c52d395944a6a1"},
diff --git a/pyproject.toml b/pyproject.toml
index 8b4fd2ad..a7fccfc8 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -20,7 +20,7 @@ pytest = "^7.2.0"
 pytest-cov = "^4.0.0"
 pytest-xdist = "^3.1.0"
 python-dotenv = "^0.21.0"
-tox = "^4.0.18"
+tox = "^4.0.19"
 pre-commit = "^2.21.0"
 isort = "^5.11.4"
 

From 5bf2749782ccf368e5a2d582fa059f3f9498da49 Mon Sep 17 00:00:00 2001
From: Roel Adriaans <roel.adriaans@ordina.nl>
Date: Thu, 29 Dec 2022 23:05:08 +0100
Subject: [PATCH 239/371] Solve day 13, part 1

---
 src/adventofcode2022/solutions/day13.py | 133 +++++++++++-------------
 tests/solutions/test_day13_a.py         |  28 +----
 2 files changed, 67 insertions(+), 94 deletions(-)

diff --git a/src/adventofcode2022/solutions/day13.py b/src/adventofcode2022/solutions/day13.py
index e4a9f0eb..38bb7923 100644
--- a/src/adventofcode2022/solutions/day13.py
+++ b/src/adventofcode2022/solutions/day13.py
@@ -1,99 +1,90 @@
 from __future__ import annotations
 
-from collections import deque
+from ast import literal_eval
 
 from adventofcode2022.utils.abstract import FileReaderSolution
 
+Packet = list[int | list]
+
 
 class Pair:
     left: Packet
     right: Packet
+    index: int
 
-    def __init__(self, left: Packet, right: Packet):
+    def __init__(self, left: Packet, right: Packet, index: int):
         self.left = left
         self.right = right
+        self.index = index
 
     def is_valid(self) -> bool:
         """Validate if a packet is has valid pairs"""
-        return False
-
-
-class Packet:
-    parent: Packet
-    left: Packet | None
-    right: Packet | None
-    content: list[int]
-
-    def __init__(
-        self, left: Packet | None = None, right: Packet | None = None, content=None
-    ):
-        self.left = left
-        self.right = right
-        if content is None:
-            self.content = []
-        else:
-            self.content = content
-
-    def __repr__(self):
-        if len(self.content) > 1:
-            return ",".join(str(i) for i in self.content)
-
-        left = repr(self.left) if self.left else None
-        right = repr(self.right) if self.right else None
-        if left and right:
-            return f"[{left},{right}]"
-        else:
-            return f"[{left or right}]"
+        return self._compare(self.left, self.right) == 1
+
+    def _compare(self, left: Packet | int, right: Packet | int) -> int:
+        # Convert to list if needed
+        if isinstance(right, int) and isinstance(left, int):
+            if left < right:
+                # Right Order
+                return 1
+            if left == right:
+                # Same, continue checking
+                return 0
+            if left > right:
+                # Not right
+                return -1
+
+        if isinstance(left, int):
+            left = [left]
+        if isinstance(right, int):
+            right = [right]
+
+        # Let's dive into this! left and right have now both been turned
+        # into lists
+        for idx, left_value in enumerate(left):
+            try:
+                right_value = right[idx]
+            except IndexError:
+                # Until now, all the values have been the same.
+                # Right side ran out of items,
+                # so inputs are not in the right order
+                return -1
+
+            res = self._compare(left_value, right_value)
+            if res != 0:
+                return res
+
+        # All the values are the same, we have to dive deeper
+        if len(left) == len(right):
+            # Left and right arrays are the same length, and we did not find
+            # any wrong digits. Return 0 to contue comparing
+            return 0
+        # If the left list runs out of items first, the inputs are in
+        # the right order
+        if len(left) < len(right):
+            return 1
+
+        # If we are here, and all has failed, just return 0
+        return 0
 
 
 class Day13:
-    def parse(self, queue: deque[str]) -> Packet:
-        if queue[0] == "[":
-            # Remove [
-            queue.popleft()
-            left = self.parse(queue)
-            # Remove ]
-            queue.popleft()
-            right = self.parse(queue)
-            # Remove ]
-            queue.popleft()
-
-            # Create a new Packet
-            new_packet = Packet(left=left, right=right)
-            left.parent = new_packet
-            right.parent = new_packet
-            return new_packet
-        else:
-            # Next digit is one, or more, numbers
-            digits = []
-            while queue:
-                current_digit = []
-                while queue[0].isdigit():
-                    current_digit.append(queue.popleft())
-                if current_digit:
-                    digit = int("".join(map(str, current_digit)))
-                    digits.append(digit)
-
-                if queue[0] == "]":
-                    # We have reached the end of the digits
-                    break
-                if queue[0] == ",":
-                    queue.popleft()
-
-            return Packet(content=digits)
+    def parse(self, string_pair: str, index: int) -> Pair:
+        p1, p2 = string_pair.splitlines()
+        left: Packet = literal_eval(p1)
+        right: Packet = literal_eval(p2)
+
+        return Pair(left=left, right=right, index=index)
 
 
 class Day13PartA(Day13, FileReaderSolution):
     def solve(self, input_data: str) -> int:
         pairs: list[Pair] = []
 
-        for input_pair in input_data.split("\n\n"):
-            left = Packet(self.parse(deque(input_pair[0])))
-            right = Packet(self.parse(deque(input_pair[1])))
-            pair = Pair(left=left, right=right)
-            pairs.append(pair)
+        for index, input_pair in enumerate(input_data.split("\n\n"), start=1):
+            pairs.append(self.parse(input_pair, index))
 
-        valid_pairs = sum(p.is_valid() for p in pairs)
+        valid_pairs = sum(p.index for p in pairs if p.is_valid())
 
         return valid_pairs
 
diff --git a/tests/solutions/test_day13_a.py b/tests/solutions/test_day13_a.py
index 087230c8..f766f7c0 100644
--- a/tests/solutions/test_day13_a.py
+++ b/tests/solutions/test_day13_a.py
@@ -1,28 +1,9 @@
-from collections import deque
-
 import pytest
 
 from adventofcode2022.solutions.day13 import Day13PartA
 
 
 class TestDay13PartA:
-    @pytest.mark.parametrize(
-        "input_string",
-        (
-            "[[1,2],[3,4]]",
-            # "[]",
-            # "[9]",
-            # "[9]",
-            # "[1, 1, 3, 1, 1]",
-            # "[[1],[2,3,4]]",
-            # "[1,[2,[3,[4,[5,6,7]]]],8,9]",
-        ),
-    )
-    @pytest.mark.skip(reason="Not yet implemented")
-    def test_day13a_parsing(self, input_string):
-        solution = Day13PartA()
-        assert repr(solution.parse(deque(input_string))) == input_string
-
     @pytest.mark.parametrize(
         ("pair", "valid"),
         [
@@ -36,7 +17,6 @@ def test_day13a_parsing(self, input_string):
             (8, False),
         ],
     )
-    @pytest.mark.skip(reason="Not yet implemented")
     def test_day13a_individual_pairs(self, testdata, pair, valid):
         pairs = testdata.split("\n\n")
 
@@ -44,15 +24,17 @@ def test_day13a_individual_pairs(self, testdata, pair, valid):
         result = solution.solve(pairs[pair - 1])
         assert result == valid
 
-    @pytest.mark.skip(reason="Not yet implemented")
     def test_day13a_solve(self, testdata):
         solution = Day13PartA()
         result = solution.solve(testdata)
         assert result == 13
 
-    @pytest.mark.skip(reason="Not yet implemented")
     def test_day13a_data(self):
         """Result we got when we did the real solution"""
         solution = Day13PartA()
         res = solution("day_13/day13.txt")
-        assert res == 0
+        assert res > 1008
+        assert res > 3364
+        assert res != 5738
+        assert res < 7750
+        assert res == 6420

From cd46f9713cd1d00f1055ecdb032e0275ff77990b Mon Sep 17 00:00:00 2001
From: Roel Adriaans <roel.adriaans@ordina.nl>
Date: Thu, 29 Dec 2022 23:40:17 +0100
Subject: [PATCH 240/371] Implement part 2. Just a bit dirty, we creat the
 pairs and then rip the packets out of them..

---
 src/adventofcode2022/solutions/day13.py | 25 +++++++++++++++++++++----
 tests/solutions/test_day13_b.py         | 13 ++++---------
 2 files changed, 25 insertions(+), 13 deletions(-)

diff --git a/src/adventofcode2022/solutions/day13.py b/src/adventofcode2022/solutions/day13.py
index 38bb7923..98026d6b 100644
--- a/src/adventofcode2022/solutions/day13.py
+++ b/src/adventofcode2022/solutions/day13.py
@@ -1,6 +1,7 @@
 from __future__ import annotations
 
 from ast import literal_eval
+from functools import cmp_to_key
 
 from adventofcode2022.utils.abstract import FileReaderSolution
 
@@ -19,9 +20,10 @@ def __init__(self, left: Packet, right: Packet, index: int):
 
     def is_valid(self) -> bool:
         """Validate if a packet is has valid pairs"""
-        return self._compare(self.left, self.right) == 1
+        return self.compare(self.left, self.right) == 1
 
-    def _compare(self, left: Packet | int, right: Packet | int) -> int:
+    @classmethod
+    def compare(cls, left: Packet | int, right: Packet | int) -> int:
         # Convert to list if needed
         if isinstance(right, int) and isinstance(left, int):
             if left < right:
@@ -50,7 +52,7 @@ def _compare(self, left: Packet | int, right: Packet | int) -> int:
                 # so inputs are not in the right order
                 return -1
 
-            res = self._compare(left_value, right_value)
+            res = cls.compare(left_value, right_value)
             if res != 0:
                 return res
 
@@ -91,4 +93,19 @@ def solve(self, input_data: str) -> int:
 
 class Day13PartB(Day13, FileReaderSolution):
     def solve(self, input_data: str) -> int:
-        raise NotImplementedError
+        pairs: list[Pair] = []
+
+        for index, input_pair in enumerate(input_data.split("\n\n"), start=1):
+            pairs.append(self.parse(input_pair, index))
+
+        # Add the divider packets:
+        divider_packets = "[[2]]\n[[6]]"
+        pairs.append(self.parse(divider_packets, 0))
+
+        # Now, extract all the packets into a list:
+        packets = [p.left for p in pairs] + [p.right for p in pairs]
+
+        sorted_packets = sorted(packets, key=cmp_to_key(Pair.compare), reverse=True)
+        i1 = sorted_packets.index([[2]]) + 1
+        i2 = sorted_packets.index([[6]]) + 1
+        return i1 * i2
diff --git a/tests/solutions/test_day13_b.py b/tests/solutions/test_day13_b.py
index 1b91fca1..e47be3e3 100644
--- a/tests/solutions/test_day13_b.py
+++ b/tests/solutions/test_day13_b.py
@@ -1,19 +1,14 @@
-import pytest
-
 from adventofcode2022.solutions.day13 import Day13PartB
 
 
 class TestDay13PartB:
-    @pytest.mark.xfail(reason="Not yet implemented", raises=NotImplementedError)
-    @pytest.mark.parametrize(("input_data", "expected_result"), [("", ""), ("", "")])
-    def test_day13b_solve(self, input_data, expected_result):
+    def test_day13b_solve(self, testdata):
         solution = Day13PartB()
-        result = solution.solve(input_data)
-        assert result == expected_result
+        result = solution.solve(testdata)
+        assert result == 140
 
-    @pytest.mark.xfail(reason="Not yet implemented", raises=NotImplementedError)
     def test_day13b_data(self):
         """Result we got when we did the real solution"""
         solution = Day13PartB()
         res = solution("day_13/day13.txt")
-        assert res == 0
+        assert res == 22000

From 92b35f26eacfef48be37b357f9490cc5715eb590 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 30 Dec 2022 04:20:51 +0000
Subject: [PATCH 241/371] Bump tox from 4.0.19 to 4.1.1

Bumps [tox](https://github.com/tox-dev/tox) from 4.0.19 to 4.1.1.
- [Release notes](https://github.com/tox-dev/tox/releases)
- [Changelog](https://github.com/tox-dev/tox/blob/main/docs/changelog.rst)
- [Commits](https://github.com/tox-dev/tox/compare/4.0.19...4.1.1)

---
updated-dependencies:
- dependency-name: tox
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 poetry.lock    | 8 ++++----
 pyproject.toml | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/poetry.lock b/poetry.lock
index 016e3e2d..98f5b9a4 100644
--- a/poetry.lock
+++ b/poetry.lock
@@ -562,7 +562,7 @@ python-versions = ">=3.7"
 
 [[package]]
 name = "tox"
-version = "4.0.19"
+version = "4.1.1"
 description = "tox is a generic virtualenv management and test command line tool"
 category = "dev"
 optional = false
@@ -634,7 +634,7 @@ testing = ["coverage (>=6.2)", "coverage-enable-subprocess (>=1)", "flaky (>=3.7
 [metadata]
 lock-version = "1.1"
 python-versions = "^3.10"
-content-hash = "ed8bda15b70c7a4bb97af11401c6b61d774d8f4705e3cc7332755984b3ddbc92"
+content-hash = "3ce6e42d773194f487221fa79baa8d0f2218c7e90499e5bb12626b712333885a"
 
 [metadata.files]
 anytree = [
@@ -968,8 +968,8 @@ tomli = [
     {file = "tomli-2.0.1.tar.gz", hash = "sha256:de526c12914f0c550d15924c62d72abc48d6fe7364aa87328337a31007fe8a4f"},
 ]
 tox = [
-    {file = "tox-4.0.19-py3-none-any.whl", hash = "sha256:2a51d4fd98a93b24819abbe9327fd759d39da73fb13aec3da954e8cd11f902ff"},
-    {file = "tox-4.0.19.tar.gz", hash = "sha256:31d95663dc66f8d53fdf0825f1fc931404b1db5380482c5449628f49db767047"},
+    {file = "tox-4.1.1-py3-none-any.whl", hash = "sha256:d6b9f9f77796fcb1260d46f12dd4d6ebcc16bb73e72f7a683421b365491a912e"},
+    {file = "tox-4.1.1.tar.gz", hash = "sha256:5d214ce3e480e3b2cce72dbc9e832296387e7311f76b70de4a649636d02e34c9"},
 ]
 tqdm = [
     {file = "tqdm-4.64.1-py2.py3-none-any.whl", hash = "sha256:6fee160d6ffcd1b1c68c65f14c829c22832bc401726335ce92c52d395944a6a1"},
diff --git a/pyproject.toml b/pyproject.toml
index 8660a19a..1cbf401d 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -22,7 +22,7 @@ pytest = "^7.2.0"
 pytest-cov = "^4.0.0"
 pytest-xdist = "^3.0.2"
 python-dotenv = "^0.21.0"
-tox = "^4.0.19"
+tox = "^4.1.1"
 pre-commit = "^2.21.0"
 isort = "^5.11.4"
 

From c75329d86d548399ca11e4d3c7cb7f9179150f10 Mon Sep 17 00:00:00 2001
From: Roel Adriaans <roel.adriaans@ordina.nl>
Date: Fri, 30 Dec 2022 14:59:32 +0100
Subject: [PATCH 242/371] Implement a more natural sort, lowest to higest like
 it should do

---
 src/adventofcode2022/solutions/day13.py | 30 +++++--------------------
 1 file changed, 5 insertions(+), 25 deletions(-)

diff --git a/src/adventofcode2022/solutions/day13.py b/src/adventofcode2022/solutions/day13.py
index 98026d6b..720b49b5 100644
--- a/src/adventofcode2022/solutions/day13.py
+++ b/src/adventofcode2022/solutions/day13.py
@@ -20,22 +20,13 @@ def __init__(self, left: Packet, right: Packet, index: int):
 
     def is_valid(self) -> bool:
         """Validate if a packet is has valid pairs"""
-        return self.compare(self.left, self.right) == 1
+        return self.compare(self.left, self.right) < 0
 
     @classmethod
     def compare(cls, left: Packet | int, right: Packet | int) -> int:
         # Convert to list if needed
         if isinstance(right, int) and isinstance(left, int):
-            if left < right:
-                # Right Order
-                return 1
-            if left == right:
-                # Same, continue checking
-                return 0
-            if left > right:
-                # Not right
-                return -1
-
+            return left - right
         if isinstance(left, int):
             left = [left]
         if isinstance(right, int):
@@ -50,24 +41,13 @@ def compare(cls, left: Packet | int, right: Packet | int) -> int:
                 # Until now, all the values have been the same.
                 # Right side ran out of items,
                 # so inputs are not in the right order
-                return -1
+                return 1
 
             res = cls.compare(left_value, right_value)
             if res != 0:
                 return res
 
-        # All the values are the same, we have to dive deeper
-        if len(left) == len(right):
-            # Left and right arrays are the same length, and we did not find
-            # any wrong digits. Return 0 to contue comparing
-            return 0
-        # If the left list runs out of items first, the inputs are in
-        # the right order
-        if len(left) < len(right):
-            return 1
-
-        # If we are here, and all has failed, just return 0
-        return 0
+        return len(left) - len(right)
 
 
 class Day13:
@@ -105,7 +85,7 @@ def solve(self, input_data: str) -> int:
         # Now, extract all the packets into a list:
         packets = [p.left for p in pairs] + [p.right for p in pairs]
 
-        sorted_packets = sorted(packets, key=cmp_to_key(Pair.compare), reverse=True)
+        sorted_packets = sorted(packets, key=cmp_to_key(Pair.compare))
         i1 = sorted_packets.index([[2]]) + 1
         i2 = sorted_packets.index([[6]]) + 1
         return i1 * i2

From 0c0746d6f68b78917b70794e3f6855b94b7013c3 Mon Sep 17 00:00:00 2001
From: Roel Adriaans <roel.adriaans@ordina.nl>
Date: Fri, 30 Dec 2022 22:22:12 +0100
Subject: [PATCH 243/371] Parse Day 14

---
 .../solutions/data/day_14/day14.txt           | 163 ++++++++++++++++++
 .../solutions/data/day_14/day14_test.txt      |   2 +
 src/adventofcode2022/solutions/day14.py       |  68 ++++++++
 tests/solutions/test_day14_a.py               |  17 ++
 tests/solutions/test_day14_b.py               |  19 ++
 5 files changed, 269 insertions(+)
 create mode 100644 src/adventofcode2022/solutions/data/day_14/day14.txt
 create mode 100644 src/adventofcode2022/solutions/data/day_14/day14_test.txt
 create mode 100644 src/adventofcode2022/solutions/day14.py
 create mode 100644 tests/solutions/test_day14_a.py
 create mode 100644 tests/solutions/test_day14_b.py

diff --git a/src/adventofcode2022/solutions/data/day_14/day14.txt b/src/adventofcode2022/solutions/data/day_14/day14.txt
new file mode 100644
index 00000000..20b8c10e
--- /dev/null
+++ b/src/adventofcode2022/solutions/data/day_14/day14.txt
@@ -0,0 +1,163 @@
+534,150 -> 534,145 -> 534,150 -> 536,150 -> 536,147 -> 536,150 -> 538,150 -> 538,146 -> 538,150 -> 540,150 -> 540,146 -> 540,150 -> 542,150 -> 542,146 -> 542,150 -> 544,150 -> 544,144 -> 544,150 -> 546,150 -> 546,141 -> 546,150 -> 548,150 -> 548,143 -> 548,150 -> 550,150 -> 550,143 -> 550,150 -> 552,150 -> 552,141 -> 552,150
+544,163 -> 544,161 -> 544,163 -> 546,163 -> 546,153 -> 546,163 -> 548,163 -> 548,158 -> 548,163 -> 550,163 -> 550,159 -> 550,163 -> 552,163 -> 552,161 -> 552,163 -> 554,163 -> 554,159 -> 554,163 -> 556,163 -> 556,158 -> 556,163 -> 558,163 -> 558,156 -> 558,163 -> 560,163 -> 560,156 -> 560,163
+533,137 -> 533,135 -> 533,137 -> 535,137 -> 535,131 -> 535,137 -> 537,137 -> 537,128 -> 537,137 -> 539,137 -> 539,130 -> 539,137 -> 541,137 -> 541,135 -> 541,137 -> 543,137 -> 543,135 -> 543,137
+544,163 -> 544,161 -> 544,163 -> 546,163 -> 546,153 -> 546,163 -> 548,163 -> 548,158 -> 548,163 -> 550,163 -> 550,159 -> 550,163 -> 552,163 -> 552,161 -> 552,163 -> 554,163 -> 554,159 -> 554,163 -> 556,163 -> 556,158 -> 556,163 -> 558,163 -> 558,156 -> 558,163 -> 560,163 -> 560,156 -> 560,163
+544,163 -> 544,161 -> 544,163 -> 546,163 -> 546,153 -> 546,163 -> 548,163 -> 548,158 -> 548,163 -> 550,163 -> 550,159 -> 550,163 -> 552,163 -> 552,161 -> 552,163 -> 554,163 -> 554,159 -> 554,163 -> 556,163 -> 556,158 -> 556,163 -> 558,163 -> 558,156 -> 558,163 -> 560,163 -> 560,156 -> 560,163
+533,137 -> 533,135 -> 533,137 -> 535,137 -> 535,131 -> 535,137 -> 537,137 -> 537,128 -> 537,137 -> 539,137 -> 539,130 -> 539,137 -> 541,137 -> 541,135 -> 541,137 -> 543,137 -> 543,135 -> 543,137
+544,163 -> 544,161 -> 544,163 -> 546,163 -> 546,153 -> 546,163 -> 548,163 -> 548,158 -> 548,163 -> 550,163 -> 550,159 -> 550,163 -> 552,163 -> 552,161 -> 552,163 -> 554,163 -> 554,159 -> 554,163 -> 556,163 -> 556,158 -> 556,163 -> 558,163 -> 558,156 -> 558,163 -> 560,163 -> 560,156 -> 560,163
+491,32 -> 495,32
+502,89 -> 502,79 -> 502,89 -> 504,89 -> 504,84 -> 504,89 -> 506,89 -> 506,85 -> 506,89 -> 508,89 -> 508,86 -> 508,89 -> 510,89 -> 510,88 -> 510,89 -> 512,89 -> 512,85 -> 512,89
+515,103 -> 515,107 -> 512,107 -> 512,115 -> 523,115 -> 523,107 -> 520,107 -> 520,103
+534,150 -> 534,145 -> 534,150 -> 536,150 -> 536,147 -> 536,150 -> 538,150 -> 538,146 -> 538,150 -> 540,150 -> 540,146 -> 540,150 -> 542,150 -> 542,146 -> 542,150 -> 544,150 -> 544,144 -> 544,150 -> 546,150 -> 546,141 -> 546,150 -> 548,150 -> 548,143 -> 548,150 -> 550,150 -> 550,143 -> 550,150 -> 552,150 -> 552,141 -> 552,150
+556,167 -> 556,168 -> 566,168 -> 566,167
+544,163 -> 544,161 -> 544,163 -> 546,163 -> 546,153 -> 546,163 -> 548,163 -> 548,158 -> 548,163 -> 550,163 -> 550,159 -> 550,163 -> 552,163 -> 552,161 -> 552,163 -> 554,163 -> 554,159 -> 554,163 -> 556,163 -> 556,158 -> 556,163 -> 558,163 -> 558,156 -> 558,163 -> 560,163 -> 560,156 -> 560,163
+544,163 -> 544,161 -> 544,163 -> 546,163 -> 546,153 -> 546,163 -> 548,163 -> 548,158 -> 548,163 -> 550,163 -> 550,159 -> 550,163 -> 552,163 -> 552,161 -> 552,163 -> 554,163 -> 554,159 -> 554,163 -> 556,163 -> 556,158 -> 556,163 -> 558,163 -> 558,156 -> 558,163 -> 560,163 -> 560,156 -> 560,163
+483,23 -> 498,23
+544,163 -> 544,161 -> 544,163 -> 546,163 -> 546,153 -> 546,163 -> 548,163 -> 548,158 -> 548,163 -> 550,163 -> 550,159 -> 550,163 -> 552,163 -> 552,161 -> 552,163 -> 554,163 -> 554,159 -> 554,163 -> 556,163 -> 556,158 -> 556,163 -> 558,163 -> 558,156 -> 558,163 -> 560,163 -> 560,156 -> 560,163
+485,38 -> 489,38
+502,89 -> 502,79 -> 502,89 -> 504,89 -> 504,84 -> 504,89 -> 506,89 -> 506,85 -> 506,89 -> 508,89 -> 508,86 -> 508,89 -> 510,89 -> 510,88 -> 510,89 -> 512,89 -> 512,85 -> 512,89
+534,150 -> 534,145 -> 534,150 -> 536,150 -> 536,147 -> 536,150 -> 538,150 -> 538,146 -> 538,150 -> 540,150 -> 540,146 -> 540,150 -> 542,150 -> 542,146 -> 542,150 -> 544,150 -> 544,144 -> 544,150 -> 546,150 -> 546,141 -> 546,150 -> 548,150 -> 548,143 -> 548,150 -> 550,150 -> 550,143 -> 550,150 -> 552,150 -> 552,141 -> 552,150
+557,171 -> 557,172 -> 573,172 -> 573,171
+480,47 -> 480,50 -> 472,50 -> 472,56 -> 489,56 -> 489,50 -> 483,50 -> 483,47
+500,74 -> 504,74
+533,137 -> 533,135 -> 533,137 -> 535,137 -> 535,131 -> 535,137 -> 537,137 -> 537,128 -> 537,137 -> 539,137 -> 539,130 -> 539,137 -> 541,137 -> 541,135 -> 541,137 -> 543,137 -> 543,135 -> 543,137
+497,26 -> 501,26
+534,150 -> 534,145 -> 534,150 -> 536,150 -> 536,147 -> 536,150 -> 538,150 -> 538,146 -> 538,150 -> 540,150 -> 540,146 -> 540,150 -> 542,150 -> 542,146 -> 542,150 -> 544,150 -> 544,144 -> 544,150 -> 546,150 -> 546,141 -> 546,150 -> 548,150 -> 548,143 -> 548,150 -> 550,150 -> 550,143 -> 550,150 -> 552,150 -> 552,141 -> 552,150
+497,76 -> 501,76
+534,150 -> 534,145 -> 534,150 -> 536,150 -> 536,147 -> 536,150 -> 538,150 -> 538,146 -> 538,150 -> 540,150 -> 540,146 -> 540,150 -> 542,150 -> 542,146 -> 542,150 -> 544,150 -> 544,144 -> 544,150 -> 546,150 -> 546,141 -> 546,150 -> 548,150 -> 548,143 -> 548,150 -> 550,150 -> 550,143 -> 550,150 -> 552,150 -> 552,141 -> 552,150
+491,76 -> 495,76
+502,89 -> 502,79 -> 502,89 -> 504,89 -> 504,84 -> 504,89 -> 506,89 -> 506,85 -> 506,89 -> 508,89 -> 508,86 -> 508,89 -> 510,89 -> 510,88 -> 510,89 -> 512,89 -> 512,85 -> 512,89
+502,89 -> 502,79 -> 502,89 -> 504,89 -> 504,84 -> 504,89 -> 506,89 -> 506,85 -> 506,89 -> 508,89 -> 508,86 -> 508,89 -> 510,89 -> 510,88 -> 510,89 -> 512,89 -> 512,85 -> 512,89
+534,150 -> 534,145 -> 534,150 -> 536,150 -> 536,147 -> 536,150 -> 538,150 -> 538,146 -> 538,150 -> 540,150 -> 540,146 -> 540,150 -> 542,150 -> 542,146 -> 542,150 -> 544,150 -> 544,144 -> 544,150 -> 546,150 -> 546,141 -> 546,150 -> 548,150 -> 548,143 -> 548,150 -> 550,150 -> 550,143 -> 550,150 -> 552,150 -> 552,141 -> 552,150
+534,150 -> 534,145 -> 534,150 -> 536,150 -> 536,147 -> 536,150 -> 538,150 -> 538,146 -> 538,150 -> 540,150 -> 540,146 -> 540,150 -> 542,150 -> 542,146 -> 542,150 -> 544,150 -> 544,144 -> 544,150 -> 546,150 -> 546,141 -> 546,150 -> 548,150 -> 548,143 -> 548,150 -> 550,150 -> 550,143 -> 550,150 -> 552,150 -> 552,141 -> 552,150
+533,137 -> 533,135 -> 533,137 -> 535,137 -> 535,131 -> 535,137 -> 537,137 -> 537,128 -> 537,137 -> 539,137 -> 539,130 -> 539,137 -> 541,137 -> 541,135 -> 541,137 -> 543,137 -> 543,135 -> 543,137
+515,103 -> 515,107 -> 512,107 -> 512,115 -> 523,115 -> 523,107 -> 520,107 -> 520,103
+556,167 -> 556,168 -> 566,168 -> 566,167
+544,163 -> 544,161 -> 544,163 -> 546,163 -> 546,153 -> 546,163 -> 548,163 -> 548,158 -> 548,163 -> 550,163 -> 550,159 -> 550,163 -> 552,163 -> 552,161 -> 552,163 -> 554,163 -> 554,159 -> 554,163 -> 556,163 -> 556,158 -> 556,163 -> 558,163 -> 558,156 -> 558,163 -> 560,163 -> 560,156 -> 560,163
+502,89 -> 502,79 -> 502,89 -> 504,89 -> 504,84 -> 504,89 -> 506,89 -> 506,85 -> 506,89 -> 508,89 -> 508,86 -> 508,89 -> 510,89 -> 510,88 -> 510,89 -> 512,89 -> 512,85 -> 512,89
+494,35 -> 498,35
+544,163 -> 544,161 -> 544,163 -> 546,163 -> 546,153 -> 546,163 -> 548,163 -> 548,158 -> 548,163 -> 550,163 -> 550,159 -> 550,163 -> 552,163 -> 552,161 -> 552,163 -> 554,163 -> 554,159 -> 554,163 -> 556,163 -> 556,158 -> 556,163 -> 558,163 -> 558,156 -> 558,163 -> 560,163 -> 560,156 -> 560,163
+544,163 -> 544,161 -> 544,163 -> 546,163 -> 546,153 -> 546,163 -> 548,163 -> 548,158 -> 548,163 -> 550,163 -> 550,159 -> 550,163 -> 552,163 -> 552,161 -> 552,163 -> 554,163 -> 554,159 -> 554,163 -> 556,163 -> 556,158 -> 556,163 -> 558,163 -> 558,156 -> 558,163 -> 560,163 -> 560,156 -> 560,163
+497,38 -> 501,38
+533,137 -> 533,135 -> 533,137 -> 535,137 -> 535,131 -> 535,137 -> 537,137 -> 537,128 -> 537,137 -> 539,137 -> 539,130 -> 539,137 -> 541,137 -> 541,135 -> 541,137 -> 543,137 -> 543,135 -> 543,137
+488,35 -> 492,35
+502,89 -> 502,79 -> 502,89 -> 504,89 -> 504,84 -> 504,89 -> 506,89 -> 506,85 -> 506,89 -> 508,89 -> 508,86 -> 508,89 -> 510,89 -> 510,88 -> 510,89 -> 512,89 -> 512,85 -> 512,89
+522,122 -> 527,122
+534,150 -> 534,145 -> 534,150 -> 536,150 -> 536,147 -> 536,150 -> 538,150 -> 538,146 -> 538,150 -> 540,150 -> 540,146 -> 540,150 -> 542,150 -> 542,146 -> 542,150 -> 544,150 -> 544,144 -> 544,150 -> 546,150 -> 546,141 -> 546,150 -> 548,150 -> 548,143 -> 548,150 -> 550,150 -> 550,143 -> 550,150 -> 552,150 -> 552,141 -> 552,150
+544,163 -> 544,161 -> 544,163 -> 546,163 -> 546,153 -> 546,163 -> 548,163 -> 548,158 -> 548,163 -> 550,163 -> 550,159 -> 550,163 -> 552,163 -> 552,161 -> 552,163 -> 554,163 -> 554,159 -> 554,163 -> 556,163 -> 556,158 -> 556,163 -> 558,163 -> 558,156 -> 558,163 -> 560,163 -> 560,156 -> 560,163
+544,163 -> 544,161 -> 544,163 -> 546,163 -> 546,153 -> 546,163 -> 548,163 -> 548,158 -> 548,163 -> 550,163 -> 550,159 -> 550,163 -> 552,163 -> 552,161 -> 552,163 -> 554,163 -> 554,159 -> 554,163 -> 556,163 -> 556,158 -> 556,163 -> 558,163 -> 558,156 -> 558,163 -> 560,163 -> 560,156 -> 560,163
+534,150 -> 534,145 -> 534,150 -> 536,150 -> 536,147 -> 536,150 -> 538,150 -> 538,146 -> 538,150 -> 540,150 -> 540,146 -> 540,150 -> 542,150 -> 542,146 -> 542,150 -> 544,150 -> 544,144 -> 544,150 -> 546,150 -> 546,141 -> 546,150 -> 548,150 -> 548,143 -> 548,150 -> 550,150 -> 550,143 -> 550,150 -> 552,150 -> 552,141 -> 552,150
+534,150 -> 534,145 -> 534,150 -> 536,150 -> 536,147 -> 536,150 -> 538,150 -> 538,146 -> 538,150 -> 540,150 -> 540,146 -> 540,150 -> 542,150 -> 542,146 -> 542,150 -> 544,150 -> 544,144 -> 544,150 -> 546,150 -> 546,141 -> 546,150 -> 548,150 -> 548,143 -> 548,150 -> 550,150 -> 550,143 -> 550,150 -> 552,150 -> 552,141 -> 552,150
+544,163 -> 544,161 -> 544,163 -> 546,163 -> 546,153 -> 546,163 -> 548,163 -> 548,158 -> 548,163 -> 550,163 -> 550,159 -> 550,163 -> 552,163 -> 552,161 -> 552,163 -> 554,163 -> 554,159 -> 554,163 -> 556,163 -> 556,158 -> 556,163 -> 558,163 -> 558,156 -> 558,163 -> 560,163 -> 560,156 -> 560,163
+480,47 -> 480,50 -> 472,50 -> 472,56 -> 489,56 -> 489,50 -> 483,50 -> 483,47
+533,137 -> 533,135 -> 533,137 -> 535,137 -> 535,131 -> 535,137 -> 537,137 -> 537,128 -> 537,137 -> 539,137 -> 539,130 -> 539,137 -> 541,137 -> 541,135 -> 541,137 -> 543,137 -> 543,135 -> 543,137
+503,76 -> 507,76
+511,92 -> 511,95 -> 507,95 -> 507,100 -> 517,100 -> 517,95 -> 514,95 -> 514,92
+502,89 -> 502,79 -> 502,89 -> 504,89 -> 504,84 -> 504,89 -> 506,89 -> 506,85 -> 506,89 -> 508,89 -> 508,86 -> 508,89 -> 510,89 -> 510,88 -> 510,89 -> 512,89 -> 512,85 -> 512,89
+515,103 -> 515,107 -> 512,107 -> 512,115 -> 523,115 -> 523,107 -> 520,107 -> 520,103
+533,137 -> 533,135 -> 533,137 -> 535,137 -> 535,131 -> 535,137 -> 537,137 -> 537,128 -> 537,137 -> 539,137 -> 539,130 -> 539,137 -> 541,137 -> 541,135 -> 541,137 -> 543,137 -> 543,135 -> 543,137
+488,59 -> 488,61 -> 485,61 -> 485,69 -> 498,69 -> 498,61 -> 493,61 -> 493,59
+534,150 -> 534,145 -> 534,150 -> 536,150 -> 536,147 -> 536,150 -> 538,150 -> 538,146 -> 538,150 -> 540,150 -> 540,146 -> 540,150 -> 542,150 -> 542,146 -> 542,150 -> 544,150 -> 544,144 -> 544,150 -> 546,150 -> 546,141 -> 546,150 -> 548,150 -> 548,143 -> 548,150 -> 550,150 -> 550,143 -> 550,150 -> 552,150 -> 552,141 -> 552,150
+544,163 -> 544,161 -> 544,163 -> 546,163 -> 546,153 -> 546,163 -> 548,163 -> 548,158 -> 548,163 -> 550,163 -> 550,159 -> 550,163 -> 552,163 -> 552,161 -> 552,163 -> 554,163 -> 554,159 -> 554,163 -> 556,163 -> 556,158 -> 556,163 -> 558,163 -> 558,156 -> 558,163 -> 560,163 -> 560,156 -> 560,163
+544,163 -> 544,161 -> 544,163 -> 546,163 -> 546,153 -> 546,163 -> 548,163 -> 548,158 -> 548,163 -> 550,163 -> 550,159 -> 550,163 -> 552,163 -> 552,161 -> 552,163 -> 554,163 -> 554,159 -> 554,163 -> 556,163 -> 556,158 -> 556,163 -> 558,163 -> 558,156 -> 558,163 -> 560,163 -> 560,156 -> 560,163
+534,150 -> 534,145 -> 534,150 -> 536,150 -> 536,147 -> 536,150 -> 538,150 -> 538,146 -> 538,150 -> 540,150 -> 540,146 -> 540,150 -> 542,150 -> 542,146 -> 542,150 -> 544,150 -> 544,144 -> 544,150 -> 546,150 -> 546,141 -> 546,150 -> 548,150 -> 548,143 -> 548,150 -> 550,150 -> 550,143 -> 550,150 -> 552,150 -> 552,141 -> 552,150
+519,124 -> 524,124
+502,89 -> 502,79 -> 502,89 -> 504,89 -> 504,84 -> 504,89 -> 506,89 -> 506,85 -> 506,89 -> 508,89 -> 508,86 -> 508,89 -> 510,89 -> 510,88 -> 510,89 -> 512,89 -> 512,85 -> 512,89
+502,89 -> 502,79 -> 502,89 -> 504,89 -> 504,84 -> 504,89 -> 506,89 -> 506,85 -> 506,89 -> 508,89 -> 508,86 -> 508,89 -> 510,89 -> 510,88 -> 510,89 -> 512,89 -> 512,85 -> 512,89
+494,74 -> 498,74
+525,120 -> 530,120
+480,47 -> 480,50 -> 472,50 -> 472,56 -> 489,56 -> 489,50 -> 483,50 -> 483,47
+544,163 -> 544,161 -> 544,163 -> 546,163 -> 546,153 -> 546,163 -> 548,163 -> 548,158 -> 548,163 -> 550,163 -> 550,159 -> 550,163 -> 552,163 -> 552,161 -> 552,163 -> 554,163 -> 554,159 -> 554,163 -> 556,163 -> 556,158 -> 556,163 -> 558,163 -> 558,156 -> 558,163 -> 560,163 -> 560,156 -> 560,163
+534,150 -> 534,145 -> 534,150 -> 536,150 -> 536,147 -> 536,150 -> 538,150 -> 538,146 -> 538,150 -> 540,150 -> 540,146 -> 540,150 -> 542,150 -> 542,146 -> 542,150 -> 544,150 -> 544,144 -> 544,150 -> 546,150 -> 546,141 -> 546,150 -> 548,150 -> 548,143 -> 548,150 -> 550,150 -> 550,143 -> 550,150 -> 552,150 -> 552,141 -> 552,150
+502,89 -> 502,79 -> 502,89 -> 504,89 -> 504,84 -> 504,89 -> 506,89 -> 506,85 -> 506,89 -> 508,89 -> 508,86 -> 508,89 -> 510,89 -> 510,88 -> 510,89 -> 512,89 -> 512,85 -> 512,89
+534,150 -> 534,145 -> 534,150 -> 536,150 -> 536,147 -> 536,150 -> 538,150 -> 538,146 -> 538,150 -> 540,150 -> 540,146 -> 540,150 -> 542,150 -> 542,146 -> 542,150 -> 544,150 -> 544,144 -> 544,150 -> 546,150 -> 546,141 -> 546,150 -> 548,150 -> 548,143 -> 548,150 -> 550,150 -> 550,143 -> 550,150 -> 552,150 -> 552,141 -> 552,150
+480,47 -> 480,50 -> 472,50 -> 472,56 -> 489,56 -> 489,50 -> 483,50 -> 483,47
+502,89 -> 502,79 -> 502,89 -> 504,89 -> 504,84 -> 504,89 -> 506,89 -> 506,85 -> 506,89 -> 508,89 -> 508,86 -> 508,89 -> 510,89 -> 510,88 -> 510,89 -> 512,89 -> 512,85 -> 512,89
+509,38 -> 513,38
+533,124 -> 538,124
+488,59 -> 488,61 -> 485,61 -> 485,69 -> 498,69 -> 498,61 -> 493,61 -> 493,59
+480,47 -> 480,50 -> 472,50 -> 472,56 -> 489,56 -> 489,50 -> 483,50 -> 483,47
+544,163 -> 544,161 -> 544,163 -> 546,163 -> 546,153 -> 546,163 -> 548,163 -> 548,158 -> 548,163 -> 550,163 -> 550,159 -> 550,163 -> 552,163 -> 552,161 -> 552,163 -> 554,163 -> 554,159 -> 554,163 -> 556,163 -> 556,158 -> 556,163 -> 558,163 -> 558,156 -> 558,163 -> 560,163 -> 560,156 -> 560,163
+533,137 -> 533,135 -> 533,137 -> 535,137 -> 535,131 -> 535,137 -> 537,137 -> 537,128 -> 537,137 -> 539,137 -> 539,130 -> 539,137 -> 541,137 -> 541,135 -> 541,137 -> 543,137 -> 543,135 -> 543,137
+533,137 -> 533,135 -> 533,137 -> 535,137 -> 535,131 -> 535,137 -> 537,137 -> 537,128 -> 537,137 -> 539,137 -> 539,130 -> 539,137 -> 541,137 -> 541,135 -> 541,137 -> 543,137 -> 543,135 -> 543,137
+534,150 -> 534,145 -> 534,150 -> 536,150 -> 536,147 -> 536,150 -> 538,150 -> 538,146 -> 538,150 -> 540,150 -> 540,146 -> 540,150 -> 542,150 -> 542,146 -> 542,150 -> 544,150 -> 544,144 -> 544,150 -> 546,150 -> 546,141 -> 546,150 -> 548,150 -> 548,143 -> 548,150 -> 550,150 -> 550,143 -> 550,150 -> 552,150 -> 552,141 -> 552,150
+488,59 -> 488,61 -> 485,61 -> 485,69 -> 498,69 -> 498,61 -> 493,61 -> 493,59
+534,150 -> 534,145 -> 534,150 -> 536,150 -> 536,147 -> 536,150 -> 538,150 -> 538,146 -> 538,150 -> 540,150 -> 540,146 -> 540,150 -> 542,150 -> 542,146 -> 542,150 -> 544,150 -> 544,144 -> 544,150 -> 546,150 -> 546,141 -> 546,150 -> 548,150 -> 548,143 -> 548,150 -> 550,150 -> 550,143 -> 550,150 -> 552,150 -> 552,141 -> 552,150
+494,29 -> 498,29
+482,43 -> 482,44 -> 487,44
+515,103 -> 515,107 -> 512,107 -> 512,115 -> 523,115 -> 523,107 -> 520,107 -> 520,103
+533,137 -> 533,135 -> 533,137 -> 535,137 -> 535,131 -> 535,137 -> 537,137 -> 537,128 -> 537,137 -> 539,137 -> 539,130 -> 539,137 -> 541,137 -> 541,135 -> 541,137 -> 543,137 -> 543,135 -> 543,137
+521,118 -> 526,118
+502,89 -> 502,79 -> 502,89 -> 504,89 -> 504,84 -> 504,89 -> 506,89 -> 506,85 -> 506,89 -> 508,89 -> 508,86 -> 508,89 -> 510,89 -> 510,88 -> 510,89 -> 512,89 -> 512,85 -> 512,89
+502,89 -> 502,79 -> 502,89 -> 504,89 -> 504,84 -> 504,89 -> 506,89 -> 506,85 -> 506,89 -> 508,89 -> 508,86 -> 508,89 -> 510,89 -> 510,88 -> 510,89 -> 512,89 -> 512,85 -> 512,89
+515,103 -> 515,107 -> 512,107 -> 512,115 -> 523,115 -> 523,107 -> 520,107 -> 520,103
+515,122 -> 520,122
+544,163 -> 544,161 -> 544,163 -> 546,163 -> 546,153 -> 546,163 -> 548,163 -> 548,158 -> 548,163 -> 550,163 -> 550,159 -> 550,163 -> 552,163 -> 552,161 -> 552,163 -> 554,163 -> 554,159 -> 554,163 -> 556,163 -> 556,158 -> 556,163 -> 558,163 -> 558,156 -> 558,163 -> 560,163 -> 560,156 -> 560,163
+502,89 -> 502,79 -> 502,89 -> 504,89 -> 504,84 -> 504,89 -> 506,89 -> 506,85 -> 506,89 -> 508,89 -> 508,86 -> 508,89 -> 510,89 -> 510,88 -> 510,89 -> 512,89 -> 512,85 -> 512,89
+544,163 -> 544,161 -> 544,163 -> 546,163 -> 546,153 -> 546,163 -> 548,163 -> 548,158 -> 548,163 -> 550,163 -> 550,159 -> 550,163 -> 552,163 -> 552,161 -> 552,163 -> 554,163 -> 554,159 -> 554,163 -> 556,163 -> 556,158 -> 556,163 -> 558,163 -> 558,156 -> 558,163 -> 560,163 -> 560,156 -> 560,163
+533,137 -> 533,135 -> 533,137 -> 535,137 -> 535,131 -> 535,137 -> 537,137 -> 537,128 -> 537,137 -> 539,137 -> 539,130 -> 539,137 -> 541,137 -> 541,135 -> 541,137 -> 543,137 -> 543,135 -> 543,137
+557,171 -> 557,172 -> 573,172 -> 573,171
+533,137 -> 533,135 -> 533,137 -> 535,137 -> 535,131 -> 535,137 -> 537,137 -> 537,128 -> 537,137 -> 539,137 -> 539,130 -> 539,137 -> 541,137 -> 541,135 -> 541,137 -> 543,137 -> 543,135 -> 543,137
+488,59 -> 488,61 -> 485,61 -> 485,69 -> 498,69 -> 498,61 -> 493,61 -> 493,59
+511,92 -> 511,95 -> 507,95 -> 507,100 -> 517,100 -> 517,95 -> 514,95 -> 514,92
+480,47 -> 480,50 -> 472,50 -> 472,56 -> 489,56 -> 489,50 -> 483,50 -> 483,47
+534,150 -> 534,145 -> 534,150 -> 536,150 -> 536,147 -> 536,150 -> 538,150 -> 538,146 -> 538,150 -> 540,150 -> 540,146 -> 540,150 -> 542,150 -> 542,146 -> 542,150 -> 544,150 -> 544,144 -> 544,150 -> 546,150 -> 546,141 -> 546,150 -> 548,150 -> 548,143 -> 548,150 -> 550,150 -> 550,143 -> 550,150 -> 552,150 -> 552,141 -> 552,150
+518,120 -> 523,120
+534,150 -> 534,145 -> 534,150 -> 536,150 -> 536,147 -> 536,150 -> 538,150 -> 538,146 -> 538,150 -> 540,150 -> 540,146 -> 540,150 -> 542,150 -> 542,146 -> 542,150 -> 544,150 -> 544,144 -> 544,150 -> 546,150 -> 546,141 -> 546,150 -> 548,150 -> 548,143 -> 548,150 -> 550,150 -> 550,143 -> 550,150 -> 552,150 -> 552,141 -> 552,150
+534,150 -> 534,145 -> 534,150 -> 536,150 -> 536,147 -> 536,150 -> 538,150 -> 538,146 -> 538,150 -> 540,150 -> 540,146 -> 540,150 -> 542,150 -> 542,146 -> 542,150 -> 544,150 -> 544,144 -> 544,150 -> 546,150 -> 546,141 -> 546,150 -> 548,150 -> 548,143 -> 548,150 -> 550,150 -> 550,143 -> 550,150 -> 552,150 -> 552,141 -> 552,150
+488,59 -> 488,61 -> 485,61 -> 485,69 -> 498,69 -> 498,61 -> 493,61 -> 493,59
+533,137 -> 533,135 -> 533,137 -> 535,137 -> 535,131 -> 535,137 -> 537,137 -> 537,128 -> 537,137 -> 539,137 -> 539,130 -> 539,137 -> 541,137 -> 541,135 -> 541,137 -> 543,137 -> 543,135 -> 543,137
+533,137 -> 533,135 -> 533,137 -> 535,137 -> 535,131 -> 535,137 -> 537,137 -> 537,128 -> 537,137 -> 539,137 -> 539,130 -> 539,137 -> 541,137 -> 541,135 -> 541,137 -> 543,137 -> 543,135 -> 543,137
+544,163 -> 544,161 -> 544,163 -> 546,163 -> 546,153 -> 546,163 -> 548,163 -> 548,158 -> 548,163 -> 550,163 -> 550,159 -> 550,163 -> 552,163 -> 552,161 -> 552,163 -> 554,163 -> 554,159 -> 554,163 -> 556,163 -> 556,158 -> 556,163 -> 558,163 -> 558,156 -> 558,163 -> 560,163 -> 560,156 -> 560,163
+498,19 -> 502,19
+501,16 -> 505,16
+511,92 -> 511,95 -> 507,95 -> 507,100 -> 517,100 -> 517,95 -> 514,95 -> 514,92
+488,59 -> 488,61 -> 485,61 -> 485,69 -> 498,69 -> 498,61 -> 493,61 -> 493,59
+515,103 -> 515,107 -> 512,107 -> 512,115 -> 523,115 -> 523,107 -> 520,107 -> 520,103
+482,43 -> 482,44 -> 487,44
+502,89 -> 502,79 -> 502,89 -> 504,89 -> 504,84 -> 504,89 -> 506,89 -> 506,85 -> 506,89 -> 508,89 -> 508,86 -> 508,89 -> 510,89 -> 510,88 -> 510,89 -> 512,89 -> 512,85 -> 512,89
+480,47 -> 480,50 -> 472,50 -> 472,56 -> 489,56 -> 489,50 -> 483,50 -> 483,47
+534,150 -> 534,145 -> 534,150 -> 536,150 -> 536,147 -> 536,150 -> 538,150 -> 538,146 -> 538,150 -> 540,150 -> 540,146 -> 540,150 -> 542,150 -> 542,146 -> 542,150 -> 544,150 -> 544,144 -> 544,150 -> 546,150 -> 546,141 -> 546,150 -> 548,150 -> 548,143 -> 548,150 -> 550,150 -> 550,143 -> 550,150 -> 552,150 -> 552,141 -> 552,150
+503,38 -> 507,38
+544,163 -> 544,161 -> 544,163 -> 546,163 -> 546,153 -> 546,163 -> 548,163 -> 548,158 -> 548,163 -> 550,163 -> 550,159 -> 550,163 -> 552,163 -> 552,161 -> 552,163 -> 554,163 -> 554,159 -> 554,163 -> 556,163 -> 556,158 -> 556,163 -> 558,163 -> 558,156 -> 558,163 -> 560,163 -> 560,156 -> 560,163
+506,35 -> 510,35
+556,167 -> 556,168 -> 566,168 -> 566,167
+544,163 -> 544,161 -> 544,163 -> 546,163 -> 546,153 -> 546,163 -> 548,163 -> 548,158 -> 548,163 -> 550,163 -> 550,159 -> 550,163 -> 552,163 -> 552,161 -> 552,163 -> 554,163 -> 554,159 -> 554,163 -> 556,163 -> 556,158 -> 556,163 -> 558,163 -> 558,156 -> 558,163 -> 560,163 -> 560,156 -> 560,163
+504,19 -> 508,19
+492,19 -> 496,19
+544,163 -> 544,161 -> 544,163 -> 546,163 -> 546,153 -> 546,163 -> 548,163 -> 548,158 -> 548,163 -> 550,163 -> 550,159 -> 550,163 -> 552,163 -> 552,161 -> 552,163 -> 554,163 -> 554,159 -> 554,163 -> 556,163 -> 556,158 -> 556,163 -> 558,163 -> 558,156 -> 558,163 -> 560,163 -> 560,156 -> 560,163
+534,150 -> 534,145 -> 534,150 -> 536,150 -> 536,147 -> 536,150 -> 538,150 -> 538,146 -> 538,150 -> 540,150 -> 540,146 -> 540,150 -> 542,150 -> 542,146 -> 542,150 -> 544,150 -> 544,144 -> 544,150 -> 546,150 -> 546,141 -> 546,150 -> 548,150 -> 548,143 -> 548,150 -> 550,150 -> 550,143 -> 550,150 -> 552,150 -> 552,141 -> 552,150
+544,163 -> 544,161 -> 544,163 -> 546,163 -> 546,153 -> 546,163 -> 548,163 -> 548,158 -> 548,163 -> 550,163 -> 550,159 -> 550,163 -> 552,163 -> 552,161 -> 552,163 -> 554,163 -> 554,159 -> 554,163 -> 556,163 -> 556,158 -> 556,163 -> 558,163 -> 558,156 -> 558,163 -> 560,163 -> 560,156 -> 560,163
+500,35 -> 504,35
+495,16 -> 499,16
+534,150 -> 534,145 -> 534,150 -> 536,150 -> 536,147 -> 536,150 -> 538,150 -> 538,146 -> 538,150 -> 540,150 -> 540,146 -> 540,150 -> 542,150 -> 542,146 -> 542,150 -> 544,150 -> 544,144 -> 544,150 -> 546,150 -> 546,141 -> 546,150 -> 548,150 -> 548,143 -> 548,150 -> 550,150 -> 550,143 -> 550,150 -> 552,150 -> 552,141 -> 552,150
+534,150 -> 534,145 -> 534,150 -> 536,150 -> 536,147 -> 536,150 -> 538,150 -> 538,146 -> 538,150 -> 540,150 -> 540,146 -> 540,150 -> 542,150 -> 542,146 -> 542,150 -> 544,150 -> 544,144 -> 544,150 -> 546,150 -> 546,141 -> 546,150 -> 548,150 -> 548,143 -> 548,150 -> 550,150 -> 550,143 -> 550,150 -> 552,150 -> 552,141 -> 552,150
+502,89 -> 502,79 -> 502,89 -> 504,89 -> 504,84 -> 504,89 -> 506,89 -> 506,85 -> 506,89 -> 508,89 -> 508,86 -> 508,89 -> 510,89 -> 510,88 -> 510,89 -> 512,89 -> 512,85 -> 512,89
+534,150 -> 534,145 -> 534,150 -> 536,150 -> 536,147 -> 536,150 -> 538,150 -> 538,146 -> 538,150 -> 540,150 -> 540,146 -> 540,150 -> 542,150 -> 542,146 -> 542,150 -> 544,150 -> 544,144 -> 544,150 -> 546,150 -> 546,141 -> 546,150 -> 548,150 -> 548,143 -> 548,150 -> 550,150 -> 550,143 -> 550,150 -> 552,150 -> 552,141 -> 552,150
+500,29 -> 504,29
+534,150 -> 534,145 -> 534,150 -> 536,150 -> 536,147 -> 536,150 -> 538,150 -> 538,146 -> 538,150 -> 540,150 -> 540,146 -> 540,150 -> 542,150 -> 542,146 -> 542,150 -> 544,150 -> 544,144 -> 544,150 -> 546,150 -> 546,141 -> 546,150 -> 548,150 -> 548,143 -> 548,150 -> 550,150 -> 550,143 -> 550,150 -> 552,150 -> 552,141 -> 552,150
+511,92 -> 511,95 -> 507,95 -> 507,100 -> 517,100 -> 517,95 -> 514,95 -> 514,92
+534,150 -> 534,145 -> 534,150 -> 536,150 -> 536,147 -> 536,150 -> 538,150 -> 538,146 -> 538,150 -> 540,150 -> 540,146 -> 540,150 -> 542,150 -> 542,146 -> 542,150 -> 544,150 -> 544,144 -> 544,150 -> 546,150 -> 546,141 -> 546,150 -> 548,150 -> 548,143 -> 548,150 -> 550,150 -> 550,143 -> 550,150 -> 552,150 -> 552,141 -> 552,150
+511,92 -> 511,95 -> 507,95 -> 507,100 -> 517,100 -> 517,95 -> 514,95 -> 514,92
+534,150 -> 534,145 -> 534,150 -> 536,150 -> 536,147 -> 536,150 -> 538,150 -> 538,146 -> 538,150 -> 540,150 -> 540,146 -> 540,150 -> 542,150 -> 542,146 -> 542,150 -> 544,150 -> 544,144 -> 544,150 -> 546,150 -> 546,141 -> 546,150 -> 548,150 -> 548,143 -> 548,150 -> 550,150 -> 550,143 -> 550,150 -> 552,150 -> 552,141 -> 552,150
+512,124 -> 517,124
+557,171 -> 557,172 -> 573,172 -> 573,171
+544,163 -> 544,161 -> 544,163 -> 546,163 -> 546,153 -> 546,163 -> 548,163 -> 548,158 -> 548,163 -> 550,163 -> 550,159 -> 550,163 -> 552,163 -> 552,161 -> 552,163 -> 554,163 -> 554,159 -> 554,163 -> 556,163 -> 556,158 -> 556,163 -> 558,163 -> 558,156 -> 558,163 -> 560,163 -> 560,156 -> 560,163
+511,92 -> 511,95 -> 507,95 -> 507,100 -> 517,100 -> 517,95 -> 514,95 -> 514,92
+529,122 -> 534,122
+533,137 -> 533,135 -> 533,137 -> 535,137 -> 535,131 -> 535,137 -> 537,137 -> 537,128 -> 537,137 -> 539,137 -> 539,130 -> 539,137 -> 541,137 -> 541,135 -> 541,137 -> 543,137 -> 543,135 -> 543,137
+534,150 -> 534,145 -> 534,150 -> 536,150 -> 536,147 -> 536,150 -> 538,150 -> 538,146 -> 538,150 -> 540,150 -> 540,146 -> 540,150 -> 542,150 -> 542,146 -> 542,150 -> 544,150 -> 544,144 -> 544,150 -> 546,150 -> 546,141 -> 546,150 -> 548,150 -> 548,143 -> 548,150 -> 550,150 -> 550,143 -> 550,150 -> 552,150 -> 552,141 -> 552,150
+503,32 -> 507,32
+491,38 -> 495,38
+497,32 -> 501,32
+526,124 -> 531,124
+515,103 -> 515,107 -> 512,107 -> 512,115 -> 523,115 -> 523,107 -> 520,107 -> 520,103
+533,137 -> 533,135 -> 533,137 -> 535,137 -> 535,131 -> 535,137 -> 537,137 -> 537,128 -> 537,137 -> 539,137 -> 539,130 -> 539,137 -> 541,137 -> 541,135 -> 541,137 -> 543,137 -> 543,135 -> 543,137
+511,92 -> 511,95 -> 507,95 -> 507,100 -> 517,100 -> 517,95 -> 514,95 -> 514,92
+544,163 -> 544,161 -> 544,163 -> 546,163 -> 546,153 -> 546,163 -> 548,163 -> 548,158 -> 548,163 -> 550,163 -> 550,159 -> 550,163 -> 552,163 -> 552,161 -> 552,163 -> 554,163 -> 554,159 -> 554,163 -> 556,163 -> 556,158 -> 556,163 -> 558,163 -> 558,156 -> 558,163 -> 560,163 -> 560,156 -> 560,163
+534,150 -> 534,145 -> 534,150 -> 536,150 -> 536,147 -> 536,150 -> 538,150 -> 538,146 -> 538,150 -> 540,150 -> 540,146 -> 540,150 -> 542,150 -> 542,146 -> 542,150 -> 544,150 -> 544,144 -> 544,150 -> 546,150 -> 546,141 -> 546,150 -> 548,150 -> 548,143 -> 548,150 -> 550,150 -> 550,143 -> 550,150 -> 552,150 -> 552,141 -> 552,150
+497,72 -> 501,72
+498,13 -> 502,13
+533,137 -> 533,135 -> 533,137 -> 535,137 -> 535,131 -> 535,137 -> 537,137 -> 537,128 -> 537,137 -> 539,137 -> 539,130 -> 539,137 -> 541,137 -> 541,135 -> 541,137 -> 543,137 -> 543,135 -> 543,137
+488,59 -> 488,61 -> 485,61 -> 485,69 -> 498,69 -> 498,61 -> 493,61 -> 493,59
+502,89 -> 502,79 -> 502,89 -> 504,89 -> 504,84 -> 504,89 -> 506,89 -> 506,85 -> 506,89 -> 508,89 -> 508,86 -> 508,89 -> 510,89 -> 510,88 -> 510,89 -> 512,89 -> 512,85 -> 512,89
diff --git a/src/adventofcode2022/solutions/data/day_14/day14_test.txt b/src/adventofcode2022/solutions/data/day_14/day14_test.txt
new file mode 100644
index 00000000..4e87bb53
--- /dev/null
+++ b/src/adventofcode2022/solutions/data/day_14/day14_test.txt
@@ -0,0 +1,2 @@
+498,4 -> 498,6 -> 496,6
+503,4 -> 502,4 -> 502,9 -> 494,9
diff --git a/src/adventofcode2022/solutions/day14.py b/src/adventofcode2022/solutions/day14.py
new file mode 100644
index 00000000..58adbf54
--- /dev/null
+++ b/src/adventofcode2022/solutions/day14.py
@@ -0,0 +1,68 @@
+from collections import defaultdict
+from enum import StrEnum
+
+from adventofcode2022.utils.abstract import FileReaderSolution
+from adventofcode2022.utils.point import XYPoint as Point
+
+
+class Pixel(StrEnum):
+    ROCK = "#"
+    AIR = "."
+    SAND = "o"
+    SPROUT = "v"
+
+
+class Day14:
+    grid: defaultdict[Point, Pixel.AIR]
+
+    def parse(self, input_lines: list[str]):
+        self.grid = defaultdict(lambda: Pixel.AIR)
+
+        for line in input_lines:
+            points = [
+                Point(*map(int, p.split(",")))
+                for p in [lp.strip() for lp in line.split("->")]
+            ]
+            start = points[0]
+            for end in points[1:]:
+                # Draw a line between start and end
+                start_x, end_x = min(start.x, end.x), max(start.x, end.x)
+                start_y, end_y = min(start.y, end.y), max(start.y, end.y)
+                for x in range(start_x, end_x + 1):
+                    for y in range(start_y, end_y + 1):
+                        self.grid[Point(x, y)] = Pixel.ROCK
+                start = end
+
+    def min_max_values(self) -> tuple[int, int, int, int]:
+        """Return max_x, min_x, max_y, min_y for image"""
+        values = [pnt for pnt in self.grid.keys()]
+        max_x = max(pnt.x for pnt in values)
+        min_x = min(pnt.x for pnt in values)
+        max_y = max(pnt.y for pnt in values)
+        min_y = min(pnt.y for pnt in values)
+        return max_x, min_x, max_y, min_y
+
+    def repr_grid(self) -> str:
+        max_x, min_x, max_y, min_y = self.min_max_values()
+        min_y = min(0, min_y)
+        lines = []
+        for y in range(min_y, max_y + 1):
+            line = [f"{y:03} "]
+            for x in range(min_x, max_x + 1):
+                line.append(str(self.grid[Point(x, y)]))
+            lines.append("".join(line))
+        return "\n".join(lines)
+
+
+class Day14PartA(Day14, FileReaderSolution):
+    def solve(self, input_data: str) -> int:
+        self.parse(input_data.splitlines())
+        print()
+        print(self.repr_grid())
+        print()
+        return -1
+
+
+class Day14PartB(Day14, FileReaderSolution):
+    def solve(self, input_data: str) -> int:
+        raise NotImplementedError
diff --git a/tests/solutions/test_day14_a.py b/tests/solutions/test_day14_a.py
new file mode 100644
index 00000000..a9dcf3d7
--- /dev/null
+++ b/tests/solutions/test_day14_a.py
@@ -0,0 +1,17 @@
+import pytest
+
+from adventofcode2022.solutions.day14 import Day14PartA
+
+
+class TestDay14PartA:
+    def test_day14a_solve(self, testdata):
+        solution = Day14PartA()
+        result = solution.solve(testdata)
+        assert result == -1
+
+    @pytest.mark.xfail(reason="Not yet implemented", raises=NotImplementedError)
+    def test_day14a_data(self):
+        """Result we got when we did the real solution"""
+        solution = Day14PartA()
+        res = solution("day_14/day14.txt")
+        assert res == 0
diff --git a/tests/solutions/test_day14_b.py b/tests/solutions/test_day14_b.py
new file mode 100644
index 00000000..f72657ee
--- /dev/null
+++ b/tests/solutions/test_day14_b.py
@@ -0,0 +1,19 @@
+import pytest
+
+from adventofcode2022.solutions.day14 import Day14PartB
+
+
+class TestDay14PartB:
+    @pytest.mark.xfail(reason="Not yet implemented", raises=NotImplementedError)
+    @pytest.mark.parametrize(("input_data", "expected_result"), [("", ""), ("", "")])
+    def test_day14b_solve(self, input_data, expected_result):
+        solution = Day14PartB()
+        result = solution.solve(input_data)
+        assert result == expected_result
+
+    @pytest.mark.xfail(reason="Not yet implemented", raises=NotImplementedError)
+    def test_day14b_data(self):
+        """Result we got when we did the real solution"""
+        solution = Day14PartB()
+        res = solution("day_14/day14.txt")
+        assert res == 0

From 20e146c7053179ddf1c9b9546e80964b068723c4 Mon Sep 17 00:00:00 2001
From: Roel Adriaans <roel.adriaans@ordina.nl>
Date: Fri, 30 Dec 2022 22:28:24 +0100
Subject: [PATCH 244/371] Update isort in pre-commit

---
 .pre-commit-config.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index 0f977e30..fbd22a9b 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -14,7 +14,7 @@ repos:
       args: ["--ignore", "E203,W503"]
 
   - repo: https://github.com/PyCQA/isort
-    rev: 5.11.2
+    rev: 5.11.4
     hooks:
     - id: isort
 

From f3a1fc9461da14ff47978404c17f8b68654e2aa2 Mon Sep 17 00:00:00 2001
From: Roel Adriaans <roel.adriaans@ordina.nl>
Date: Sat, 31 Dec 2022 18:53:02 +0100
Subject: [PATCH 245/371] Show the sprout

---
 src/adventofcode2022/solutions/day14.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/adventofcode2022/solutions/day14.py b/src/adventofcode2022/solutions/day14.py
index 58adbf54..ac6142ae 100644
--- a/src/adventofcode2022/solutions/day14.py
+++ b/src/adventofcode2022/solutions/day14.py
@@ -9,7 +9,7 @@ class Pixel(StrEnum):
     ROCK = "#"
     AIR = "."
     SAND = "o"
-    SPROUT = "v"
+    SPROUT = "+"
 
 
 class Day14:
@@ -17,6 +17,7 @@ class Day14:
 
     def parse(self, input_lines: list[str]):
         self.grid = defaultdict(lambda: Pixel.AIR)
+        self.grid[Point(500, 0)] = Pixel.SPROUT
 
         for line in input_lines:
             points = [
@@ -35,6 +36,7 @@ def parse(self, input_lines: list[str]):
 
     def min_max_values(self) -> tuple[int, int, int, int]:
         """Return max_x, min_x, max_y, min_y for image"""
+
         values = [pnt for pnt in self.grid.keys()]
         max_x = max(pnt.x for pnt in values)
         min_x = min(pnt.x for pnt in values)

From 48f52dc5e24161662e68c1486506fc16a5dab54f Mon Sep 17 00:00:00 2001
From: Roel Adriaans <roel.adriaans@ordina.nl>
Date: Sun, 1 Jan 2023 19:23:15 +0100
Subject: [PATCH 246/371] Solve day 14, part 1

---
 src/adventofcode2022/solutions/day14.py | 56 +++++++++++++++++++++----
 tests/solutions/test_day14_a.py         |  7 +---
 2 files changed, 50 insertions(+), 13 deletions(-)

diff --git a/src/adventofcode2022/solutions/day14.py b/src/adventofcode2022/solutions/day14.py
index ac6142ae..9808bb25 100644
--- a/src/adventofcode2022/solutions/day14.py
+++ b/src/adventofcode2022/solutions/day14.py
@@ -9,15 +9,15 @@ class Pixel(StrEnum):
     ROCK = "#"
     AIR = "."
     SAND = "o"
-    SPROUT = "+"
+    SOURCE = "+"
 
 
 class Day14:
-    grid: defaultdict[Point, Pixel.AIR]
+    grid: defaultdict[Point, Pixel]
 
     def parse(self, input_lines: list[str]):
         self.grid = defaultdict(lambda: Pixel.AIR)
-        self.grid[Point(500, 0)] = Pixel.SPROUT
+        self.grid[Point(500, 0)] = Pixel.SOURCE
 
         for line in input_lines:
             points = [
@@ -47,7 +47,8 @@ def min_max_values(self) -> tuple[int, int, int, int]:
     def repr_grid(self) -> str:
         max_x, min_x, max_y, min_y = self.min_max_values()
         min_y = min(0, min_y)
-        lines = []
+        clear = chr(27) + "[2J"
+        lines = [clear]
         for y in range(min_y, max_y + 1):
             line = [f"{y:03} "]
             for x in range(min_x, max_x + 1):
@@ -55,14 +56,53 @@ def repr_grid(self) -> str:
             lines.append("".join(line))
         return "\n".join(lines)
 
+    def count_sand_left(self) -> int:
+        return len([p for p in self.grid.values() if p == Pixel.SAND])
+
 
 class Day14PartA(Day14, FileReaderSolution):
+    def move_sand(self, sand: Point) -> Point | bool:
+        """Move a grain of salt, one step at a time.
+        Returns false if no moves are possible"""
+        # Check down
+        down_location = Point(0, 1) + sand
+        if self.grid[down_location] == Pixel.AIR:
+            return down_location
+
+        # We cannot move down, check down, left
+        down_left = Point(-1, 1) + sand
+        if self.grid[down_left] == Pixel.AIR:
+            return down_left
+
+        down_right = Point(1, 1) + sand
+        if self.grid[down_right] == Pixel.AIR:
+            return down_right
+
+        # No valid moves left,
+        return False
+
+    def loop(self, start):
+        """Let sand fall until a grain of salt falls off"""
+        # Define the bottom
+        _, _, max_y, _ = self.min_max_values()
+        bottom = max_y + 1
+        while True:
+            sand = Point(*start)
+            while True:
+                new_location = self.move_sand(sand)
+                if not new_location:
+                    # We cannot move anymore
+                    self.grid[sand] = Pixel.SAND
+                    break
+                else:
+                    sand = new_location  # type: ignore
+                if sand.y > bottom:
+                    return
+
     def solve(self, input_data: str) -> int:
         self.parse(input_data.splitlines())
-        print()
-        print(self.repr_grid())
-        print()
-        return -1
+        self.loop(start=Point(500, 0))
+        return self.count_sand_left()
 
 
 class Day14PartB(Day14, FileReaderSolution):
diff --git a/tests/solutions/test_day14_a.py b/tests/solutions/test_day14_a.py
index a9dcf3d7..c45220b0 100644
--- a/tests/solutions/test_day14_a.py
+++ b/tests/solutions/test_day14_a.py
@@ -1,5 +1,3 @@
-import pytest
-
 from adventofcode2022.solutions.day14 import Day14PartA
 
 
@@ -7,11 +5,10 @@ class TestDay14PartA:
     def test_day14a_solve(self, testdata):
         solution = Day14PartA()
         result = solution.solve(testdata)
-        assert result == -1
+        assert result == 24
 
-    @pytest.mark.xfail(reason="Not yet implemented", raises=NotImplementedError)
     def test_day14a_data(self):
         """Result we got when we did the real solution"""
         solution = Day14PartA()
         res = solution("day_14/day14.txt")
-        assert res == 0
+        assert res == 885

From 3473e4c80fdd88523dffabb0988ea1eaef8d64a4 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 2 Jan 2023 07:31:21 +0100
Subject: [PATCH 247/371] Bump tox from 4.0.19 to 4.1.2 (#110)

Bumps [tox](https://github.com/tox-dev/tox) from 4.0.19 to 4.1.2.
- [Release notes](https://github.com/tox-dev/tox/releases)
- [Changelog](https://github.com/tox-dev/tox/blob/main/docs/changelog.rst)
- [Commits](https://github.com/tox-dev/tox/compare/4.0.19...4.1.2)

---
updated-dependencies:
- dependency-name: tox
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 poetry.lock    | 36 ++++++++++++++++++------------------
 pyproject.toml |  2 +-
 2 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/poetry.lock b/poetry.lock
index 6e992acc..9ef29789 100644
--- a/poetry.lock
+++ b/poetry.lock
@@ -210,15 +210,15 @@ testing = ["pre-commit"]
 
 [[package]]
 name = "filelock"
-version = "3.8.2"
+version = "3.9.0"
 description = "A platform independent file lock."
 category = "dev"
 optional = false
 python-versions = ">=3.7"
 
 [package.extras]
-docs = ["furo (>=2022.9.29)", "sphinx (>=5.3)", "sphinx-autodoc-typehints (>=1.19.5)"]
-testing = ["covdefaults (>=2.2.2)", "coverage (>=6.5)", "pytest (>=7.2)", "pytest-cov (>=4)", "pytest-timeout (>=2.1)"]
+docs = ["furo (>=2022.12.7)", "sphinx (>=5.3)", "sphinx-autodoc-typehints (>=1.19.5)"]
+testing = ["covdefaults (>=2.2.2)", "coverage (>=7.0.1)", "pytest (>=7.2)", "pytest-cov (>=4)", "pytest-timeout (>=2.1)"]
 
 [[package]]
 name = "identify"
@@ -332,15 +332,15 @@ python-versions = ">=3.7"
 
 [[package]]
 name = "platformdirs"
-version = "2.6.0"
+version = "2.6.2"
 description = "A small Python package for determining appropriate platform-specific dirs, e.g. a \"user data dir\"."
 category = "dev"
 optional = false
 python-versions = ">=3.7"
 
 [package.extras]
-docs = ["furo (>=2022.9.29)", "proselint (>=0.13)", "sphinx (>=5.3)", "sphinx-autodoc-typehints (>=1.19.4)"]
-test = ["appdirs (==1.4.4)", "pytest (>=7.2)", "pytest-cov (>=4)", "pytest-mock (>=3.10)"]
+docs = ["furo (>=2022.12.7)", "proselint (>=0.13)", "sphinx (>=5.3)", "sphinx-autodoc-typehints (>=1.19.5)"]
+test = ["appdirs (==1.4.4)", "covdefaults (>=2.2.2)", "pytest (>=7.2)", "pytest-cov (>=4)", "pytest-mock (>=3.10)"]
 
 [[package]]
 name = "pluggy"
@@ -546,7 +546,7 @@ python-versions = ">=3.7"
 
 [[package]]
 name = "tox"
-version = "4.0.19"
+version = "4.1.2"
 description = "tox is a generic virtualenv management and test command line tool"
 category = "dev"
 optional = false
@@ -556,17 +556,17 @@ python-versions = ">=3.7"
 cachetools = ">=5.2"
 chardet = ">=5.1"
 colorama = ">=0.4.6"
-filelock = ">=3.8.2"
+filelock = ">=3.9"
 packaging = ">=22"
-platformdirs = ">=2.6"
+platformdirs = ">=2.6.2"
 pluggy = ">=1"
 pyproject-api = ">=1.2.1"
 tomli = {version = ">=2.0.1", markers = "python_version < \"3.11\""}
 virtualenv = ">=20.17.1"
 
 [package.extras]
-docs = ["furo (>=2022.12.7)", "sphinx (>=5.3)", "sphinx-argparse-cli (>=1.10)", "sphinx-autodoc-typehints (>=1.19.5)", "sphinx-copybutton (>=0.5.1)", "sphinx-inline-tabs (>=2022.1.2b11)", "sphinxcontrib-towncrier (>=0.2.1a0)", "towncrier (>=22.12)"]
-testing = ["build[virtualenv] (>=0.9)", "covdefaults (>=2.2.2)", "devpi-process (>=0.3)", "diff-cover (>=7.3)", "distlib (>=0.3.6)", "flaky (>=3.7)", "hatch-vcs (>=0.3)", "hatchling (>=1.11.1)", "psutil (>=5.9.4)", "pytest (>=7.2)", "pytest-cov (>=4)", "pytest-mock (>=3.10)", "pytest-xdist (>=3.1)", "re-assert (>=1.1)", "time-machine (>=2.8.2)"]
+docs = ["furo (>=2022.12.7)", "sphinx (>=6)", "sphinx-argparse-cli (>=1.10)", "sphinx-autodoc-typehints (>=1.19.5)", "sphinx-copybutton (>=0.5.1)", "sphinx-inline-tabs (>=2022.1.2b11)", "sphinxcontrib-towncrier (>=0.2.1a0)", "towncrier (>=22.12)"]
+testing = ["build[virtualenv] (>=0.9)", "covdefaults (>=2.2.2)", "devpi-process (>=0.3)", "diff-cover (>=7.3)", "distlib (>=0.3.6)", "flaky (>=3.7)", "hatch-vcs (>=0.3)", "hatchling (>=1.12)", "psutil (>=5.9.4)", "pytest (>=7.2)", "pytest-cov (>=4)", "pytest-mock (>=3.10)", "pytest-xdist (>=3.1)", "re-assert (>=1.1)", "time-machine (>=2.8.2)"]
 
 [[package]]
 name = "tqdm"
@@ -618,7 +618,7 @@ testing = ["coverage (>=6.2)", "coverage-enable-subprocess (>=1)", "flaky (>=3.7
 [metadata]
 lock-version = "1.1"
 python-versions = "^3.10"
-content-hash = "ad9c89b5063f46e68a0857ee806bad193e881ac78979e83be29ce3971111d139"
+content-hash = "f7984e04893aa1edb78908842aaf6758854c73f430de26b50f4bcceb794fb26e"
 
 [metadata.files]
 anytree = [
@@ -752,8 +752,8 @@ execnet = [
     {file = "execnet-1.9.0.tar.gz", hash = "sha256:8f694f3ba9cc92cab508b152dcfe322153975c29bda272e2fd7f3f00f36e47c5"},
 ]
 filelock = [
-    {file = "filelock-3.8.2-py3-none-any.whl", hash = "sha256:8df285554452285f79c035efb0c861eb33a4bcfa5b7a137016e32e6a90f9792c"},
-    {file = "filelock-3.8.2.tar.gz", hash = "sha256:7565f628ea56bfcd8e54e42bdc55da899c85c1abfe1b5bcfd147e9188cebb3b2"},
+    {file = "filelock-3.9.0-py3-none-any.whl", hash = "sha256:f58d535af89bb9ad5cd4df046f741f8553a418c01a7856bf0d173bbc9f6bd16d"},
+    {file = "filelock-3.9.0.tar.gz", hash = "sha256:7b319f24340b51f55a2bf7a12ac0755a9b03e718311dac567a0f4f7fabd2f5de"},
 ]
 identify = [
     {file = "identify-2.5.8-py2.py3-none-any.whl", hash = "sha256:48b7925fe122720088aeb7a6c34f17b27e706b72c61070f27fe3789094233440"},
@@ -838,8 +838,8 @@ pathspec = [
     {file = "pathspec-0.10.1.tar.gz", hash = "sha256:7ace6161b621d31e7902eb6b5ae148d12cfd23f4a249b9ffb6b9fee12084323d"},
 ]
 platformdirs = [
-    {file = "platformdirs-2.6.0-py3-none-any.whl", hash = "sha256:1a89a12377800c81983db6be069ec068eee989748799b946cce2a6e80dcc54ca"},
-    {file = "platformdirs-2.6.0.tar.gz", hash = "sha256:b46ffafa316e6b83b47489d240ce17173f123a9b9c83282141c3daf26ad9ac2e"},
+    {file = "platformdirs-2.6.2-py3-none-any.whl", hash = "sha256:83c8f6d04389165de7c9b6f0c682439697887bca0aa2f1c87ef1826be3584490"},
+    {file = "platformdirs-2.6.2.tar.gz", hash = "sha256:e1fea1fe471b9ff8332e229df3cb7de4f53eeea4998d3b6bfff542115e998bd2"},
 ]
 pluggy = [
     {file = "pluggy-1.0.0-py2.py3-none-any.whl", hash = "sha256:74134bbf457f031a36d68416e1509f34bd5ccc019f0bcc952c7b909d06b37bd3"},
@@ -944,8 +944,8 @@ tomli = [
     {file = "tomli-2.0.1.tar.gz", hash = "sha256:de526c12914f0c550d15924c62d72abc48d6fe7364aa87328337a31007fe8a4f"},
 ]
 tox = [
-    {file = "tox-4.0.19-py3-none-any.whl", hash = "sha256:2a51d4fd98a93b24819abbe9327fd759d39da73fb13aec3da954e8cd11f902ff"},
-    {file = "tox-4.0.19.tar.gz", hash = "sha256:31d95663dc66f8d53fdf0825f1fc931404b1db5380482c5449628f49db767047"},
+    {file = "tox-4.1.2-py3-none-any.whl", hash = "sha256:aa1c07530f07265d025d534715f5e8d522606db71568cf6acbf7eadc30a8d0ed"},
+    {file = "tox-4.1.2.tar.gz", hash = "sha256:3910e7ddf260de9004738a416f2efdbca21ad7f35d279f8a323117256696535f"},
 ]
 tqdm = [
     {file = "tqdm-4.64.1-py2.py3-none-any.whl", hash = "sha256:6fee160d6ffcd1b1c68c65f14c829c22832bc401726335ce92c52d395944a6a1"},
diff --git a/pyproject.toml b/pyproject.toml
index a7fccfc8..bcaf2366 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -20,7 +20,7 @@ pytest = "^7.2.0"
 pytest-cov = "^4.0.0"
 pytest-xdist = "^3.1.0"
 python-dotenv = "^0.21.0"
-tox = "^4.0.19"
+tox = "^4.1.2"
 pre-commit = "^2.21.0"
 isort = "^5.11.4"
 

From d1760a94af3e5f8d55fb4d9f2ddf944d4d23fa82 Mon Sep 17 00:00:00 2001
From: Roel Adriaans <roel.adriaans@ordina.nl>
Date: Tue, 3 Jan 2023 21:39:14 +0100
Subject: [PATCH 248/371] Fix day 11, part 2. Takes ages, but it works :)

---
 src/adventofcode2022/solutions/day14.py | 41 ++++++++++++++++++++++---
 tests/solutions/test_day14_b.py         | 13 +++-----
 tox.ini                                 |  2 +-
 3 files changed, 42 insertions(+), 14 deletions(-)

diff --git a/src/adventofcode2022/solutions/day14.py b/src/adventofcode2022/solutions/day14.py
index 9808bb25..ffed8506 100644
--- a/src/adventofcode2022/solutions/day14.py
+++ b/src/adventofcode2022/solutions/day14.py
@@ -17,7 +17,6 @@ class Day14:
 
     def parse(self, input_lines: list[str]):
         self.grid = defaultdict(lambda: Pixel.AIR)
-        self.grid[Point(500, 0)] = Pixel.SOURCE
 
         for line in input_lines:
             points = [
@@ -59,8 +58,6 @@ def repr_grid(self) -> str:
     def count_sand_left(self) -> int:
         return len([p for p in self.grid.values() if p == Pixel.SAND])
 
-
-class Day14PartA(Day14, FileReaderSolution):
     def move_sand(self, sand: Point) -> Point | bool:
         """Move a grain of salt, one step at a time.
         Returns false if no moves are possible"""
@@ -81,8 +78,16 @@ def move_sand(self, sand: Point) -> Point | bool:
         # No valid moves left,
         return False
 
+    def print(self):
+        # print(self.repr_grid())
+        print(f"Count currently is: {self.count_sand_left()}")
+
+
+class Day14PartA(Day14, FileReaderSolution):
     def loop(self, start):
         """Let sand fall until a grain of salt falls off"""
+        self.grid[start] = Pixel.SOURCE
+
         # Define the bottom
         _, _, max_y, _ = self.min_max_values()
         bottom = max_y + 1
@@ -106,5 +111,33 @@ def solve(self, input_data: str) -> int:
 
 
 class Day14PartB(Day14, FileReaderSolution):
+    def loop(self, start):
+        """Let sand fall until a grain of salt falls off"""
+        self.grid[start] = Pixel.SOURCE
+
+        # Define the bottom
+        _, _, max_y, _ = self.min_max_values()
+        bottom = max_y + 2
+
+        while True:
+            sand = Point(*start)
+            first = True
+            while True:
+                new_location = self.move_sand(sand)
+                # If the first iteration is false, we know that we have filled the whole
+                # thing. Let's add the grain of salt at the start, and return
+                if first and not new_location:
+                    self.grid[start] = Pixel.SAND
+                    return
+                first = False
+                if not new_location or new_location.y == bottom:  # type: ignore
+                    # We cannot move anymore
+                    self.grid[sand] = Pixel.SAND
+                    break
+                else:
+                    sand = new_location  # type: ignore
+
     def solve(self, input_data: str) -> int:
-        raise NotImplementedError
+        self.parse(input_data.splitlines())
+        self.loop(start=Point(500, 0))
+        return self.count_sand_left()
diff --git a/tests/solutions/test_day14_b.py b/tests/solutions/test_day14_b.py
index f72657ee..d3627f0b 100644
--- a/tests/solutions/test_day14_b.py
+++ b/tests/solutions/test_day14_b.py
@@ -1,19 +1,14 @@
-import pytest
-
 from adventofcode2022.solutions.day14 import Day14PartB
 
 
 class TestDay14PartB:
-    @pytest.mark.xfail(reason="Not yet implemented", raises=NotImplementedError)
-    @pytest.mark.parametrize(("input_data", "expected_result"), [("", ""), ("", "")])
-    def test_day14b_solve(self, input_data, expected_result):
+    def test_day14b_solve(self, testdata):
         solution = Day14PartB()
-        result = solution.solve(input_data)
-        assert result == expected_result
+        result = solution.solve(testdata)
+        assert result == 93
 
-    @pytest.mark.xfail(reason="Not yet implemented", raises=NotImplementedError)
     def test_day14b_data(self):
         """Result we got when we did the real solution"""
         solution = Day14PartB()
         res = solution("day_14/day14.txt")
-        assert res == 0
+        assert res == 28691
diff --git a/tox.ini b/tox.ini
index 5aaca0b3..bae46176 100644
--- a/tox.ini
+++ b/tox.ini
@@ -79,7 +79,7 @@ skip_install = true
 deps =
     black
 commands =
-    black --target-version py310 --check --diff src/ tests/
+    black --target-version py311 --check --diff src/ tests/
 
 [testenv:mypy]
 skip_install = true

From c6f1807e872f69ae5acf9af83dcf16abd0229c8d Mon Sep 17 00:00:00 2001
From: Roel Adriaans <roel.adriaans@ordina.nl>
Date: Tue, 3 Jan 2023 21:43:01 +0100
Subject: [PATCH 249/371] Py to 3.11

---
 tox.ini | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tox.ini b/tox.ini
index bae46176..83b799ee 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,7 +1,7 @@
 [tox]
 envlist =
     linters
-    py
+    py311
 
 [pytest]
 # Makes all warnings be fatal

From 589f812a20972090299cae2d252403bbabae2e03 Mon Sep 17 00:00:00 2001
From: Roel Adriaans <roel.adriaans@ordina.nl>
Date: Tue, 3 Jan 2023 21:45:41 +0100
Subject: [PATCH 250/371] Update to ubuntu 22.04, python 3.11

---
 .github/workflows/tox.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/tox.yml b/.github/workflows/tox.yml
index 4c6111b3..d9a764d4 100644
--- a/.github/workflows/tox.yml
+++ b/.github/workflows/tox.yml
@@ -5,11 +5,11 @@ on: pull_request
 jobs:
   build:
     name: Python Tests
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     strategy:
       max-parallel: 4
       matrix:
-        python-version: ['3.10']
+        python-version: ['3.11']
 
     steps:
     - uses: actions/checkout@v3

From 7929726f189e7491ad6fe4c289306f35c5d2959c Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 3 Jan 2023 20:55:05 +0000
Subject: [PATCH 251/371] Bump tox from 4.1.1 to 4.1.3

Bumps [tox](https://github.com/tox-dev/tox) from 4.1.1 to 4.1.3.
- [Release notes](https://github.com/tox-dev/tox/releases)
- [Changelog](https://github.com/tox-dev/tox/blob/main/docs/changelog.rst)
- [Commits](https://github.com/tox-dev/tox/compare/4.1.1...4.1.3)

---
updated-dependencies:
- dependency-name: tox
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 poetry.lock    | 36 ++++++++++++++++++------------------
 pyproject.toml |  2 +-
 2 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/poetry.lock b/poetry.lock
index 98f5b9a4..f3ce53e6 100644
--- a/poetry.lock
+++ b/poetry.lock
@@ -210,15 +210,15 @@ testing = ["pre-commit"]
 
 [[package]]
 name = "filelock"
-version = "3.8.2"
+version = "3.9.0"
 description = "A platform independent file lock."
 category = "dev"
 optional = false
 python-versions = ">=3.7"
 
 [package.extras]
-docs = ["furo (>=2022.9.29)", "sphinx (>=5.3)", "sphinx-autodoc-typehints (>=1.19.5)"]
-testing = ["covdefaults (>=2.2.2)", "coverage (>=6.5)", "pytest (>=7.2)", "pytest-cov (>=4)", "pytest-timeout (>=2.1)"]
+docs = ["furo (>=2022.12.7)", "sphinx (>=5.3)", "sphinx-autodoc-typehints (>=1.19.5)"]
+testing = ["covdefaults (>=2.2.2)", "coverage (>=7.0.1)", "pytest (>=7.2)", "pytest-cov (>=4)", "pytest-timeout (>=2.1)"]
 
 [[package]]
 name = "identify"
@@ -348,15 +348,15 @@ python-versions = ">=3.7"
 
 [[package]]
 name = "platformdirs"
-version = "2.6.0"
+version = "2.6.2"
 description = "A small Python package for determining appropriate platform-specific dirs, e.g. a \"user data dir\"."
 category = "dev"
 optional = false
 python-versions = ">=3.7"
 
 [package.extras]
-docs = ["furo (>=2022.9.29)", "proselint (>=0.13)", "sphinx (>=5.3)", "sphinx-autodoc-typehints (>=1.19.4)"]
-test = ["appdirs (==1.4.4)", "pytest (>=7.2)", "pytest-cov (>=4)", "pytest-mock (>=3.10)"]
+docs = ["furo (>=2022.12.7)", "proselint (>=0.13)", "sphinx (>=5.3)", "sphinx-autodoc-typehints (>=1.19.5)"]
+test = ["appdirs (==1.4.4)", "covdefaults (>=2.2.2)", "pytest (>=7.2)", "pytest-cov (>=4)", "pytest-mock (>=3.10)"]
 
 [[package]]
 name = "pluggy"
@@ -562,7 +562,7 @@ python-versions = ">=3.7"
 
 [[package]]
 name = "tox"
-version = "4.1.1"
+version = "4.1.3"
 description = "tox is a generic virtualenv management and test command line tool"
 category = "dev"
 optional = false
@@ -572,17 +572,17 @@ python-versions = ">=3.7"
 cachetools = ">=5.2"
 chardet = ">=5.1"
 colorama = ">=0.4.6"
-filelock = ">=3.8.2"
+filelock = ">=3.9"
 packaging = ">=22"
-platformdirs = ">=2.6"
+platformdirs = ">=2.6.2"
 pluggy = ">=1"
 pyproject-api = ">=1.2.1"
 tomli = {version = ">=2.0.1", markers = "python_version < \"3.11\""}
 virtualenv = ">=20.17.1"
 
 [package.extras]
-docs = ["furo (>=2022.12.7)", "sphinx (>=5.3)", "sphinx-argparse-cli (>=1.10)", "sphinx-autodoc-typehints (>=1.19.5)", "sphinx-copybutton (>=0.5.1)", "sphinx-inline-tabs (>=2022.1.2b11)", "sphinxcontrib-towncrier (>=0.2.1a0)", "towncrier (>=22.12)"]
-testing = ["build[virtualenv] (>=0.9)", "covdefaults (>=2.2.2)", "devpi-process (>=0.3)", "diff-cover (>=7.3)", "distlib (>=0.3.6)", "flaky (>=3.7)", "hatch-vcs (>=0.3)", "hatchling (>=1.11.1)", "psutil (>=5.9.4)", "pytest (>=7.2)", "pytest-cov (>=4)", "pytest-mock (>=3.10)", "pytest-xdist (>=3.1)", "re-assert (>=1.1)", "time-machine (>=2.8.2)"]
+docs = ["furo (>=2022.12.7)", "sphinx (>=6)", "sphinx-argparse-cli (>=1.10)", "sphinx-autodoc-typehints (>=1.19.5)", "sphinx-copybutton (>=0.5.1)", "sphinx-inline-tabs (>=2022.1.2b11)", "sphinxcontrib-towncrier (>=0.2.1a0)", "towncrier (>=22.12)"]
+testing = ["build[virtualenv] (>=0.9)", "covdefaults (>=2.2.2)", "devpi-process (>=0.3)", "diff-cover (>=7.3)", "distlib (>=0.3.6)", "flaky (>=3.7)", "hatch-vcs (>=0.3)", "hatchling (>=1.12)", "psutil (>=5.9.4)", "pytest (>=7.2)", "pytest-cov (>=4)", "pytest-mock (>=3.10)", "pytest-xdist (>=3.1)", "re-assert (>=1.1)", "time-machine (>=2.8.2)"]
 
 [[package]]
 name = "tqdm"
@@ -634,7 +634,7 @@ testing = ["coverage (>=6.2)", "coverage-enable-subprocess (>=1)", "flaky (>=3.7
 [metadata]
 lock-version = "1.1"
 python-versions = "^3.10"
-content-hash = "3ce6e42d773194f487221fa79baa8d0f2218c7e90499e5bb12626b712333885a"
+content-hash = "a059f89d220e8af85c85aaf59c1542ec32a90aa498cba3ac537b967249518edb"
 
 [metadata.files]
 anytree = [
@@ -769,8 +769,8 @@ execnet = [
     {file = "execnet-1.9.0.tar.gz", hash = "sha256:8f694f3ba9cc92cab508b152dcfe322153975c29bda272e2fd7f3f00f36e47c5"},
 ]
 filelock = [
-    {file = "filelock-3.8.2-py3-none-any.whl", hash = "sha256:8df285554452285f79c035efb0c861eb33a4bcfa5b7a137016e32e6a90f9792c"},
-    {file = "filelock-3.8.2.tar.gz", hash = "sha256:7565f628ea56bfcd8e54e42bdc55da899c85c1abfe1b5bcfd147e9188cebb3b2"},
+    {file = "filelock-3.9.0-py3-none-any.whl", hash = "sha256:f58d535af89bb9ad5cd4df046f741f8553a418c01a7856bf0d173bbc9f6bd16d"},
+    {file = "filelock-3.9.0.tar.gz", hash = "sha256:7b319f24340b51f55a2bf7a12ac0755a9b03e718311dac567a0f4f7fabd2f5de"},
 ]
 identify = [
     {file = "identify-2.5.11-py2.py3-none-any.whl", hash = "sha256:e7db36b772b188099616aaf2accbee122949d1c6a1bac4f38196720d6f9f06db"},
@@ -862,8 +862,8 @@ pathspec = [
     {file = "pathspec-0.10.3.tar.gz", hash = "sha256:56200de4077d9d0791465aa9095a01d421861e405b5096955051deefd697d6f6"},
 ]
 platformdirs = [
-    {file = "platformdirs-2.6.0-py3-none-any.whl", hash = "sha256:1a89a12377800c81983db6be069ec068eee989748799b946cce2a6e80dcc54ca"},
-    {file = "platformdirs-2.6.0.tar.gz", hash = "sha256:b46ffafa316e6b83b47489d240ce17173f123a9b9c83282141c3daf26ad9ac2e"},
+    {file = "platformdirs-2.6.2-py3-none-any.whl", hash = "sha256:83c8f6d04389165de7c9b6f0c682439697887bca0aa2f1c87ef1826be3584490"},
+    {file = "platformdirs-2.6.2.tar.gz", hash = "sha256:e1fea1fe471b9ff8332e229df3cb7de4f53eeea4998d3b6bfff542115e998bd2"},
 ]
 pluggy = [
     {file = "pluggy-1.0.0-py2.py3-none-any.whl", hash = "sha256:74134bbf457f031a36d68416e1509f34bd5ccc019f0bcc952c7b909d06b37bd3"},
@@ -968,8 +968,8 @@ tomli = [
     {file = "tomli-2.0.1.tar.gz", hash = "sha256:de526c12914f0c550d15924c62d72abc48d6fe7364aa87328337a31007fe8a4f"},
 ]
 tox = [
-    {file = "tox-4.1.1-py3-none-any.whl", hash = "sha256:d6b9f9f77796fcb1260d46f12dd4d6ebcc16bb73e72f7a683421b365491a912e"},
-    {file = "tox-4.1.1.tar.gz", hash = "sha256:5d214ce3e480e3b2cce72dbc9e832296387e7311f76b70de4a649636d02e34c9"},
+    {file = "tox-4.1.3-py3-none-any.whl", hash = "sha256:f1840b1698e5187d4c3bae4fe41332c2f3fedde3b6773474899f9e0b329a41dd"},
+    {file = "tox-4.1.3.tar.gz", hash = "sha256:9976b41def48a5a2dce477de2c90c8231a5166829aaca916d0952ec4d7429f43"},
 ]
 tqdm = [
     {file = "tqdm-4.64.1-py2.py3-none-any.whl", hash = "sha256:6fee160d6ffcd1b1c68c65f14c829c22832bc401726335ce92c52d395944a6a1"},
diff --git a/pyproject.toml b/pyproject.toml
index 1cbf401d..ad60c235 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -22,7 +22,7 @@ pytest = "^7.2.0"
 pytest-cov = "^4.0.0"
 pytest-xdist = "^3.0.2"
 python-dotenv = "^0.21.0"
-tox = "^4.1.1"
+tox = "^4.1.3"
 pre-commit = "^2.21.0"
 isort = "^5.11.4"
 

From ebf153fce92bcb4a95d2a4ae59614f71e114fadd Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 4 Jan 2023 04:23:14 +0000
Subject: [PATCH 252/371] Bump tox from 4.1.3 to 4.2.0

Bumps [tox](https://github.com/tox-dev/tox) from 4.1.3 to 4.2.0.
- [Release notes](https://github.com/tox-dev/tox/releases)
- [Changelog](https://github.com/tox-dev/tox/blob/main/docs/changelog.rst)
- [Commits](https://github.com/tox-dev/tox/compare/4.1.3...4.2.0)

---
updated-dependencies:
- dependency-name: tox
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 poetry.lock    | 8 ++++----
 pyproject.toml | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/poetry.lock b/poetry.lock
index f3ce53e6..b5fa81ff 100644
--- a/poetry.lock
+++ b/poetry.lock
@@ -562,7 +562,7 @@ python-versions = ">=3.7"
 
 [[package]]
 name = "tox"
-version = "4.1.3"
+version = "4.2.0"
 description = "tox is a generic virtualenv management and test command line tool"
 category = "dev"
 optional = false
@@ -634,7 +634,7 @@ testing = ["coverage (>=6.2)", "coverage-enable-subprocess (>=1)", "flaky (>=3.7
 [metadata]
 lock-version = "1.1"
 python-versions = "^3.10"
-content-hash = "a059f89d220e8af85c85aaf59c1542ec32a90aa498cba3ac537b967249518edb"
+content-hash = "bb35eacca191568db65e00bfd7a06a43e0960851fe9337267656f046807e18e7"
 
 [metadata.files]
 anytree = [
@@ -968,8 +968,8 @@ tomli = [
     {file = "tomli-2.0.1.tar.gz", hash = "sha256:de526c12914f0c550d15924c62d72abc48d6fe7364aa87328337a31007fe8a4f"},
 ]
 tox = [
-    {file = "tox-4.1.3-py3-none-any.whl", hash = "sha256:f1840b1698e5187d4c3bae4fe41332c2f3fedde3b6773474899f9e0b329a41dd"},
-    {file = "tox-4.1.3.tar.gz", hash = "sha256:9976b41def48a5a2dce477de2c90c8231a5166829aaca916d0952ec4d7429f43"},
+    {file = "tox-4.2.0-py3-none-any.whl", hash = "sha256:20cafc6c2740671513bd52c0f7912c634a3428237ff70950f41e384335173a42"},
+    {file = "tox-4.2.0.tar.gz", hash = "sha256:ac1d997a73ae6a17e7dfe931ec2b5f534677535c857a7e821987083e122a4d33"},
 ]
 tqdm = [
     {file = "tqdm-4.64.1-py2.py3-none-any.whl", hash = "sha256:6fee160d6ffcd1b1c68c65f14c829c22832bc401726335ce92c52d395944a6a1"},
diff --git a/pyproject.toml b/pyproject.toml
index ad60c235..2d2f1a50 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -22,7 +22,7 @@ pytest = "^7.2.0"
 pytest-cov = "^4.0.0"
 pytest-xdist = "^3.0.2"
 python-dotenv = "^0.21.0"
-tox = "^4.1.3"
+tox = "^4.2.0"
 pre-commit = "^2.21.0"
 isort = "^5.11.4"
 

From 39a630abcdcf431a1ae9d5bdc1df5053cc6d7bc2 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 4 Jan 2023 06:27:27 +0100
Subject: [PATCH 253/371] Bump tox from 4.1.2 to 4.2.0 (#112)

Bumps [tox](https://github.com/tox-dev/tox) from 4.1.2 to 4.2.0.
- [Release notes](https://github.com/tox-dev/tox/releases)
- [Changelog](https://github.com/tox-dev/tox/blob/main/docs/changelog.rst)
- [Commits](https://github.com/tox-dev/tox/compare/4.1.2...4.2.0)

---
updated-dependencies:
- dependency-name: tox
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 poetry.lock    | 8 ++++----
 pyproject.toml | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/poetry.lock b/poetry.lock
index 9ef29789..530ba653 100644
--- a/poetry.lock
+++ b/poetry.lock
@@ -546,7 +546,7 @@ python-versions = ">=3.7"
 
 [[package]]
 name = "tox"
-version = "4.1.2"
+version = "4.2.0"
 description = "tox is a generic virtualenv management and test command line tool"
 category = "dev"
 optional = false
@@ -618,7 +618,7 @@ testing = ["coverage (>=6.2)", "coverage-enable-subprocess (>=1)", "flaky (>=3.7
 [metadata]
 lock-version = "1.1"
 python-versions = "^3.10"
-content-hash = "f7984e04893aa1edb78908842aaf6758854c73f430de26b50f4bcceb794fb26e"
+content-hash = "2727572f16a4e128dbf531e64f765a52e9fcf8e1fad03e73a60706ca622e2d3a"
 
 [metadata.files]
 anytree = [
@@ -944,8 +944,8 @@ tomli = [
     {file = "tomli-2.0.1.tar.gz", hash = "sha256:de526c12914f0c550d15924c62d72abc48d6fe7364aa87328337a31007fe8a4f"},
 ]
 tox = [
-    {file = "tox-4.1.2-py3-none-any.whl", hash = "sha256:aa1c07530f07265d025d534715f5e8d522606db71568cf6acbf7eadc30a8d0ed"},
-    {file = "tox-4.1.2.tar.gz", hash = "sha256:3910e7ddf260de9004738a416f2efdbca21ad7f35d279f8a323117256696535f"},
+    {file = "tox-4.2.0-py3-none-any.whl", hash = "sha256:20cafc6c2740671513bd52c0f7912c634a3428237ff70950f41e384335173a42"},
+    {file = "tox-4.2.0.tar.gz", hash = "sha256:ac1d997a73ae6a17e7dfe931ec2b5f534677535c857a7e821987083e122a4d33"},
 ]
 tqdm = [
     {file = "tqdm-4.64.1-py2.py3-none-any.whl", hash = "sha256:6fee160d6ffcd1b1c68c65f14c829c22832bc401726335ce92c52d395944a6a1"},
diff --git a/pyproject.toml b/pyproject.toml
index bcaf2366..0a20e0a2 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -20,7 +20,7 @@ pytest = "^7.2.0"
 pytest-cov = "^4.0.0"
 pytest-xdist = "^3.1.0"
 python-dotenv = "^0.21.0"
-tox = "^4.1.2"
+tox = "^4.2.0"
 pre-commit = "^2.21.0"
 isort = "^5.11.4"
 

From 64060e860684f351ad9334f3c8ccf383459d4acf Mon Sep 17 00:00:00 2001
From: Roel Adriaans <roel@adriaans.org>
Date: Wed, 4 Jan 2023 06:39:07 +0100
Subject: [PATCH 254/371] Add Python 3.11 (#113)

---
 .github/workflows/tox.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/tox.yml b/.github/workflows/tox.yml
index 4c6111b3..216a7def 100644
--- a/.github/workflows/tox.yml
+++ b/.github/workflows/tox.yml
@@ -5,11 +5,11 @@ on: pull_request
 jobs:
   build:
     name: Python Tests
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     strategy:
       max-parallel: 4
       matrix:
-        python-version: ['3.10']
+        python-version: ['3.10', '3.11']
 
     steps:
     - uses: actions/checkout@v3

From 3f558bb47e1acf0c1fd93ce02bd12af6be166496 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 6 Jan 2023 04:18:50 +0000
Subject: [PATCH 255/371] Bump tox from 4.2.0 to 4.2.4

Bumps [tox](https://github.com/tox-dev/tox) from 4.2.0 to 4.2.4.
- [Release notes](https://github.com/tox-dev/tox/releases)
- [Changelog](https://github.com/tox-dev/tox/blob/main/docs/changelog.rst)
- [Commits](https://github.com/tox-dev/tox/compare/4.2.0...4.2.4)

---
updated-dependencies:
- dependency-name: tox
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 poetry.lock    | 8 ++++----
 pyproject.toml | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/poetry.lock b/poetry.lock
index b5fa81ff..6fe9f89a 100644
--- a/poetry.lock
+++ b/poetry.lock
@@ -562,7 +562,7 @@ python-versions = ">=3.7"
 
 [[package]]
 name = "tox"
-version = "4.2.0"
+version = "4.2.4"
 description = "tox is a generic virtualenv management and test command line tool"
 category = "dev"
 optional = false
@@ -634,7 +634,7 @@ testing = ["coverage (>=6.2)", "coverage-enable-subprocess (>=1)", "flaky (>=3.7
 [metadata]
 lock-version = "1.1"
 python-versions = "^3.10"
-content-hash = "bb35eacca191568db65e00bfd7a06a43e0960851fe9337267656f046807e18e7"
+content-hash = "26039b8c21b6d6cf04d21ce869fa03f508a51208fbd1adc4adcb4b3dc6d7c27f"
 
 [metadata.files]
 anytree = [
@@ -968,8 +968,8 @@ tomli = [
     {file = "tomli-2.0.1.tar.gz", hash = "sha256:de526c12914f0c550d15924c62d72abc48d6fe7364aa87328337a31007fe8a4f"},
 ]
 tox = [
-    {file = "tox-4.2.0-py3-none-any.whl", hash = "sha256:20cafc6c2740671513bd52c0f7912c634a3428237ff70950f41e384335173a42"},
-    {file = "tox-4.2.0.tar.gz", hash = "sha256:ac1d997a73ae6a17e7dfe931ec2b5f534677535c857a7e821987083e122a4d33"},
+    {file = "tox-4.2.4-py3-none-any.whl", hash = "sha256:f51407aaff87f6f5361ae2733cffd371940ed001792b60ea50d955c266b3b22b"},
+    {file = "tox-4.2.4.tar.gz", hash = "sha256:05b1cbf94e02eff40818860b352b4a452d7369558f3bb05809043c6b4c36e5f4"},
 ]
 tqdm = [
     {file = "tqdm-4.64.1-py2.py3-none-any.whl", hash = "sha256:6fee160d6ffcd1b1c68c65f14c829c22832bc401726335ce92c52d395944a6a1"},
diff --git a/pyproject.toml b/pyproject.toml
index 2d2f1a50..dbf42d5e 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -22,7 +22,7 @@ pytest = "^7.2.0"
 pytest-cov = "^4.0.0"
 pytest-xdist = "^3.0.2"
 python-dotenv = "^0.21.0"
-tox = "^4.2.0"
+tox = "^4.2.4"
 pre-commit = "^2.21.0"
 isort = "^5.11.4"
 

From 585df9710717cc8f62047c4cb9be53ef3a7d8543 Mon Sep 17 00:00:00 2001
From: Roel Adriaans <roel.adriaans@ordina.nl>
Date: Fri, 6 Jan 2023 19:53:53 +0100
Subject: [PATCH 256/371] Update deps

---
 poetry.lock    | 742 +++++++++++++++++++++++--------------------------
 pyproject.toml |  10 +-
 2 files changed, 359 insertions(+), 393 deletions(-)

diff --git a/poetry.lock b/poetry.lock
index 6fe9f89a..659a8cee 100644
--- a/poetry.lock
+++ b/poetry.lock
@@ -1,3 +1,5 @@
+# This file is automatically @generated by Poetry and should not be changed by hand.
+
 [[package]]
 name = "anytree"
 version = "2.8.0"
@@ -5,6 +7,10 @@ description = "Powerful and Lightweight Python Tree Data Structure.."
 category = "main"
 optional = false
 python-versions = "*"
+files = [
+    {file = "anytree-2.8.0-py2.py3-none-any.whl", hash = "sha256:14c55ac77492b11532395049a03b773d14c7e30b22aa012e337b1e983de31521"},
+    {file = "anytree-2.8.0.tar.gz", hash = "sha256:3f0f93f355a91bc3e6245319bf4c1d50e3416cc7a35cc1133c1ff38306bbccab"},
+]
 
 [package.dependencies]
 six = ">=1.9.0"
@@ -20,23 +26,32 @@ description = "Better dates & times for Python"
 category = "dev"
 optional = false
 python-versions = ">=3.6"
+files = [
+    {file = "arrow-1.2.3-py3-none-any.whl", hash = "sha256:5a49ab92e3b7b71d96cd6bfcc4df14efefc9dfa96ea19045815914a6ab6b1fe2"},
+    {file = "arrow-1.2.3.tar.gz", hash = "sha256:3934b30ca1b9f292376d9db15b19446088d12ec58629bc3f0da28fd55fb633a1"},
+]
 
 [package.dependencies]
 python-dateutil = ">=2.7.0"
 
 [[package]]
 name = "attrs"
-version = "22.1.0"
+version = "22.2.0"
 description = "Classes Without Boilerplate"
 category = "dev"
 optional = false
-python-versions = ">=3.5"
+python-versions = ">=3.6"
+files = [
+    {file = "attrs-22.2.0-py3-none-any.whl", hash = "sha256:29e95c7f6778868dbd49170f98f8818f78f3dc5e0e37c0b1f474e3561b240836"},
+    {file = "attrs-22.2.0.tar.gz", hash = "sha256:c9227bfc2f01993c03f68db37d1d15c9690188323c067c641f1a35ca58185f99"},
+]
 
 [package.extras]
-dev = ["cloudpickle", "coverage[toml] (>=5.0.2)", "furo", "hypothesis", "mypy (>=0.900,!=0.940)", "pre-commit", "pympler", "pytest (>=4.3.0)", "pytest-mypy-plugins", "sphinx", "sphinx-notfound-page", "zope.interface"]
-docs = ["furo", "sphinx", "sphinx-notfound-page", "zope.interface"]
-tests = ["cloudpickle", "coverage[toml] (>=5.0.2)", "hypothesis", "mypy (>=0.900,!=0.940)", "pympler", "pytest (>=4.3.0)", "pytest-mypy-plugins", "zope.interface"]
-tests-no-zope = ["cloudpickle", "coverage[toml] (>=5.0.2)", "hypothesis", "mypy (>=0.900,!=0.940)", "pympler", "pytest (>=4.3.0)", "pytest-mypy-plugins"]
+cov = ["attrs[tests]", "coverage-enable-subprocess", "coverage[toml] (>=5.3)"]
+dev = ["attrs[docs,tests]"]
+docs = ["furo", "myst-parser", "sphinx", "sphinx-notfound-page", "sphinxcontrib-towncrier", "towncrier", "zope.interface"]
+tests = ["attrs[tests-no-zope]", "zope.interface"]
+tests-no-zope = ["cloudpickle", "cloudpickle", "hypothesis", "hypothesis", "mypy (>=0.971,<0.990)", "mypy (>=0.971,<0.990)", "pympler", "pympler", "pytest (>=4.3.0)", "pytest (>=4.3.0)", "pytest-mypy-plugins", "pytest-mypy-plugins", "pytest-xdist[psutil]", "pytest-xdist[psutil]"]
 
 [[package]]
 name = "beautifulsoup4"
@@ -45,6 +60,10 @@ description = "Screen-scraping library"
 category = "main"
 optional = false
 python-versions = ">=3.6.0"
+files = [
+    {file = "beautifulsoup4-4.11.1-py3-none-any.whl", hash = "sha256:58d5c3d29f5a36ffeb94f02f0d786cd53014cf9b3b3951d42e0080d8a9498d30"},
+    {file = "beautifulsoup4-4.11.1.tar.gz", hash = "sha256:ad9aa55b65ef2808eb405f46cf74df7fcb7044d5cbc26487f96eb2ef2e436693"},
+]
 
 [package.dependencies]
 soupsieve = ">1.2"
@@ -60,6 +79,10 @@ description = "Ultra-lightweight pure Python package to check if a file is binar
 category = "dev"
 optional = false
 python-versions = "*"
+files = [
+    {file = "binaryornot-0.4.4-py2.py3-none-any.whl", hash = "sha256:b8b71173c917bddcd2c16070412e369c3ed7f0528926f70cac18a6c97fd563e4"},
+    {file = "binaryornot-0.4.4.tar.gz", hash = "sha256:359501dfc9d40632edc9fac890e19542db1a287bbcfa58175b66658392018061"},
+]
 
 [package.dependencies]
 chardet = ">=3.0.2"
@@ -71,13 +94,26 @@ description = "The uncompromising code formatter."
 category = "dev"
 optional = false
 python-versions = ">=3.7"
+files = [
+    {file = "black-22.12.0-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:9eedd20838bd5d75b80c9f5487dbcb06836a43833a37846cf1d8c1cc01cef59d"},
+    {file = "black-22.12.0-cp310-cp310-win_amd64.whl", hash = "sha256:159a46a4947f73387b4d83e87ea006dbb2337eab6c879620a3ba52699b1f4351"},
+    {file = "black-22.12.0-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:d30b212bffeb1e252b31dd269dfae69dd17e06d92b87ad26e23890f3efea366f"},
+    {file = "black-22.12.0-cp311-cp311-win_amd64.whl", hash = "sha256:7412e75863aa5c5411886804678b7d083c7c28421210180d67dfd8cf1221e1f4"},
+    {file = "black-22.12.0-cp37-cp37m-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:c116eed0efb9ff870ded8b62fe9f28dd61ef6e9ddd28d83d7d264a38417dcee2"},
+    {file = "black-22.12.0-cp37-cp37m-win_amd64.whl", hash = "sha256:1f58cbe16dfe8c12b7434e50ff889fa479072096d79f0a7f25e4ab8e94cd8350"},
+    {file = "black-22.12.0-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:77d86c9f3db9b1bf6761244bc0b3572a546f5fe37917a044e02f3166d5aafa7d"},
+    {file = "black-22.12.0-cp38-cp38-win_amd64.whl", hash = "sha256:82d9fe8fee3401e02e79767016b4907820a7dc28d70d137eb397b92ef3cc5bfc"},
+    {file = "black-22.12.0-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:101c69b23df9b44247bd88e1d7e90154336ac4992502d4197bdac35dd7ee3320"},
+    {file = "black-22.12.0-cp39-cp39-win_amd64.whl", hash = "sha256:559c7a1ba9a006226f09e4916060982fd27334ae1998e7a38b3f33a37f7a2148"},
+    {file = "black-22.12.0-py3-none-any.whl", hash = "sha256:436cc9167dd28040ad90d3b404aec22cedf24a6e4d7de221bec2730ec0c97bcf"},
+    {file = "black-22.12.0.tar.gz", hash = "sha256:229351e5a18ca30f447bf724d007f890f97e13af070bb6ad4c0a441cd7596a2f"},
+]
 
 [package.dependencies]
 click = ">=8.0.0"
 mypy-extensions = ">=0.4.3"
 pathspec = ">=0.9.0"
 platformdirs = ">=2"
-tomli = {version = ">=1.1.0", markers = "python_full_version < \"3.11.0a7\""}
 
 [package.extras]
 colorama = ["colorama (>=0.4.3)"]
@@ -92,6 +128,10 @@ description = "Extensible memoizing collections and decorators"
 category = "dev"
 optional = false
 python-versions = "~=3.7"
+files = [
+    {file = "cachetools-5.2.0-py3-none-any.whl", hash = "sha256:f9f17d2aec496a9aa6b76f53e3b614c965223c061982d434d160f930c698a9db"},
+    {file = "cachetools-5.2.0.tar.gz", hash = "sha256:6a94c6402995a99c3970cc7e4884bb60b4a8639938157eeed436098bf9831757"},
+]
 
 [[package]]
 name = "certifi"
@@ -100,6 +140,10 @@ description = "Python package for providing Mozilla's CA Bundle."
 category = "main"
 optional = false
 python-versions = ">=3.6"
+files = [
+    {file = "certifi-2022.12.7-py3-none-any.whl", hash = "sha256:4ad3232f5e926d6718ec31cfc1fcadfde020920e278684144551c91769c7bc18"},
+    {file = "certifi-2022.12.7.tar.gz", hash = "sha256:35824b4c3a97115964b408844d64aa14db1cc518f6562e8d7261699d1350a9e3"},
+]
 
 [[package]]
 name = "cfgv"
@@ -108,6 +152,10 @@ description = "Validate configuration and produce human readable error messages.
 category = "dev"
 optional = false
 python-versions = ">=3.6.1"
+files = [
+    {file = "cfgv-3.3.1-py2.py3-none-any.whl", hash = "sha256:c6a0883f3917a037485059700b9e75da2464e6c27051014ad85ba6aaa5884426"},
+    {file = "cfgv-3.3.1.tar.gz", hash = "sha256:f5a830efb9ce7a445376bb66ec94c638a9787422f96264c98edc6bdeed8ab736"},
+]
 
 [[package]]
 name = "chardet"
@@ -116,6 +164,10 @@ description = "Universal encoding detector for Python 3"
 category = "dev"
 optional = false
 python-versions = ">=3.7"
+files = [
+    {file = "chardet-5.1.0-py3-none-any.whl", hash = "sha256:362777fb014af596ad31334fde1e8c327dfdb076e1960d1694662d46a6917ab9"},
+    {file = "chardet-5.1.0.tar.gz", hash = "sha256:0d62712b956bc154f85fb0a266e2a3c5913c2967e00348701b32411d6def31e5"},
+]
 
 [[package]]
 name = "charset-normalizer"
@@ -124,6 +176,10 @@ description = "The Real First Universal Charset Detector. Open, modern and activ
 category = "main"
 optional = false
 python-versions = ">=3.6.0"
+files = [
+    {file = "charset-normalizer-2.1.1.tar.gz", hash = "sha256:5a3d016c7c547f69d6f81fb0db9449ce888b418b5b9952cc5e6e66843e9dd845"},
+    {file = "charset_normalizer-2.1.1-py3-none-any.whl", hash = "sha256:83e9a75d1911279afd89352c68b45348559d1fc0506b054b346651b5e7fee29f"},
+]
 
 [package.extras]
 unicode-backport = ["unicodedata2"]
@@ -135,6 +191,10 @@ description = "Composable command line interface toolkit"
 category = "main"
 optional = false
 python-versions = ">=3.7"
+files = [
+    {file = "click-8.1.3-py3-none-any.whl", hash = "sha256:bb4d8133cb15a609f44e8213d9b391b0809795062913b383c62be0ee95b1db48"},
+    {file = "click-8.1.3.tar.gz", hash = "sha256:7682dc8afb30297001674575ea00d1814d808d6a36af415a82bd481d37ba7b8e"},
+]
 
 [package.dependencies]
 colorama = {version = "*", markers = "platform_system == \"Windows\""}
@@ -146,6 +206,10 @@ description = "Cross-platform colored terminal text."
 category = "main"
 optional = false
 python-versions = "!=3.0.*,!=3.1.*,!=3.2.*,!=3.3.*,!=3.4.*,!=3.5.*,!=3.6.*,>=2.7"
+files = [
+    {file = "colorama-0.4.6-py2.py3-none-any.whl", hash = "sha256:4f1d9991f5acc0ca119f9d443620b77f9d6b33703e51011c16baf57afb285fc6"},
+    {file = "colorama-0.4.6.tar.gz", hash = "sha256:08695f5cb7ed6e0531a20572697297273c47b8cae5a63ffc6d6ed5c201be6e44"},
+]
 
 [[package]]
 name = "cookiecutter"
@@ -154,6 +218,10 @@ description = "A command-line utility that creates projects from project templat
 category = "dev"
 optional = false
 python-versions = ">=3.7"
+files = [
+    {file = "cookiecutter-2.1.1-py2.py3-none-any.whl", hash = "sha256:9f3ab027cec4f70916e28f03470bdb41e637a3ad354b4d65c765d93aad160022"},
+    {file = "cookiecutter-2.1.1.tar.gz", hash = "sha256:f3982be8d9c53dac1261864013fdec7f83afd2e42ede6f6dd069c5e149c540d5"},
+]
 
 [package.dependencies]
 binaryornot = ">=0.4.4"
@@ -166,14 +234,64 @@ requests = ">=2.23.0"
 
 [[package]]
 name = "coverage"
-version = "7.0.0"
+version = "7.0.3"
 description = "Code coverage measurement for Python"
 category = "dev"
 optional = false
 python-versions = ">=3.7"
-
-[package.dependencies]
-tomli = {version = "*", optional = true, markers = "python_full_version <= \"3.11.0a6\" and extra == \"toml\""}
+files = [
+    {file = "coverage-7.0.3-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:2f7c51b6074a8a3063c341953dffe48fd6674f8e4b1d3c8aa8a91f58d6e716a8"},
+    {file = "coverage-7.0.3-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:628f47eaf66727fc986d3b190d6fa32f5e6b7754a243919d28bc0fd7974c449f"},
+    {file = "coverage-7.0.3-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:e89d5abf86c104de808108a25d171ad646c07eda96ca76c8b237b94b9c71e518"},
+    {file = "coverage-7.0.3-cp310-cp310-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:75e43c6f4ea4d122dac389aabdf9d4f0e160770a75e63372f88005d90f5bcc80"},
+    {file = "coverage-7.0.3-cp310-cp310-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:49da0ff241827ebb52d5d6d5a36d33b455fa5e721d44689c95df99fd8db82437"},
+    {file = "coverage-7.0.3-cp310-cp310-musllinux_1_1_aarch64.whl", hash = "sha256:0bce4ad5bdd0b02e177a085d28d2cea5fc57bb4ba2cead395e763e34cf934eb1"},
+    {file = "coverage-7.0.3-cp310-cp310-musllinux_1_1_i686.whl", hash = "sha256:f79691335257d60951638dd43576b9bcd6f52baa5c1c2cd07a509bb003238372"},
+    {file = "coverage-7.0.3-cp310-cp310-musllinux_1_1_x86_64.whl", hash = "sha256:5722269ed05fbdb94eef431787c66b66260ff3125d1a9afcc00facff8c45adf9"},
+    {file = "coverage-7.0.3-cp310-cp310-win32.whl", hash = "sha256:bdbda870e0fda7dd0fe7db7135ca226ec4c1ade8aa76e96614829b56ca491012"},
+    {file = "coverage-7.0.3-cp310-cp310-win_amd64.whl", hash = "sha256:e56fae4292e216b8deeee38ace84557b9fa85b52db005368a275427cdabb8192"},
+    {file = "coverage-7.0.3-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:b82343a5bc51627b9d606f0b6b6b9551db7b6311a5dd920fa52a94beae2e8959"},
+    {file = "coverage-7.0.3-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:fd0a8aa431f9b7ad9eb8264f55ef83cbb254962af3775092fb6e93890dea9ca2"},
+    {file = "coverage-7.0.3-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:112cfead1bd22eada8a8db9ed387bd3e8be5528debc42b5d3c1f7da4ffaf9fb5"},
+    {file = "coverage-7.0.3-cp311-cp311-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:af87e906355fa42447be5c08c5d44e6e1c005bf142f303f726ddf5ed6e0c8a4d"},
+    {file = "coverage-7.0.3-cp311-cp311-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:f30090e22a301952c5abd0e493a1c8358b4f0b368b49fa3e4568ed3ed68b8d1f"},
+    {file = "coverage-7.0.3-cp311-cp311-musllinux_1_1_aarch64.whl", hash = "sha256:ae871d09901911eedda1981ea6fd0f62a999107293cdc4c4fd612321c5b34745"},
+    {file = "coverage-7.0.3-cp311-cp311-musllinux_1_1_i686.whl", hash = "sha256:ed7c9debf7bfc63c9b9f8b595409237774ff4b061bf29fba6f53b287a2fdeab9"},
+    {file = "coverage-7.0.3-cp311-cp311-musllinux_1_1_x86_64.whl", hash = "sha256:13121fa22dcd2c7b19c5161e3fd725692448f05377b788da4502a383573227b3"},
+    {file = "coverage-7.0.3-cp311-cp311-win32.whl", hash = "sha256:037b51ee86bc600f99b3b957c20a172431c35c2ef9c1ca34bc813ab5b51fd9f5"},
+    {file = "coverage-7.0.3-cp311-cp311-win_amd64.whl", hash = "sha256:25fde928306034e8deecd5fc91a07432dcc282c8acb76749581a28963c9f4f3f"},
+    {file = "coverage-7.0.3-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:7e8b0642c38b3d3b3c01417643ccc645345b03c32a2e84ef93cdd6844d6fe530"},
+    {file = "coverage-7.0.3-cp37-cp37m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:18b09811f849cc958d23f733a350a66b54a8de3fed1e6128ba55a5c97ffb6f65"},
+    {file = "coverage-7.0.3-cp37-cp37m-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:349d0b545520e8516f7b4f12373afc705d17d901e1de6a37a20e4ec9332b61f7"},
+    {file = "coverage-7.0.3-cp37-cp37m-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:b5b38813eee5b4739f505d94247604c72eae626d5088a16dd77b08b8b1724ab3"},
+    {file = "coverage-7.0.3-cp37-cp37m-musllinux_1_1_aarch64.whl", hash = "sha256:ba9af1218fa01b1f11c72271bc7290b701d11ad4dbc2ae97c445ecacf6858dba"},
+    {file = "coverage-7.0.3-cp37-cp37m-musllinux_1_1_i686.whl", hash = "sha256:c5648c7eec5cf1ba5db1cf2d6c10036a582d7f09e172990474a122e30c841361"},
+    {file = "coverage-7.0.3-cp37-cp37m-musllinux_1_1_x86_64.whl", hash = "sha256:d0df04495b76a885bfef009f45eebe8fe2fbf815ad7a83dabcf5aced62f33162"},
+    {file = "coverage-7.0.3-cp37-cp37m-win32.whl", hash = "sha256:af6cef3796b8068713a48dd67d258dc9a6e2ebc3bd4645bfac03a09672fa5d20"},
+    {file = "coverage-7.0.3-cp37-cp37m-win_amd64.whl", hash = "sha256:62ef3800c4058844e2e3fa35faa9dd0ccde8a8aba6c763aae50342e00d4479d4"},
+    {file = "coverage-7.0.3-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:acef7f3a3825a2d218a03dd02f5f3cc7f27aa31d882dd780191d1ad101120d74"},
+    {file = "coverage-7.0.3-cp38-cp38-macosx_11_0_arm64.whl", hash = "sha256:a530663a361eb27375cec28aea5cd282089b5e4b022ae451c4c3493b026a68a5"},
+    {file = "coverage-7.0.3-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:c58cd6bb46dcb922e0d5792850aab5964433d511b3a020867650f8d930dde4f4"},
+    {file = "coverage-7.0.3-cp38-cp38-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:f918e9ef4c98f477a5458238dde2a1643aed956c7213873ab6b6b82e32b8ef61"},
+    {file = "coverage-7.0.3-cp38-cp38-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:2b865aa679bee7fbd1c55960940dbd3252621dd81468268786c67122bbd15343"},
+    {file = "coverage-7.0.3-cp38-cp38-musllinux_1_1_aarch64.whl", hash = "sha256:c5d9b480ebae60fc2cbc8d6865194136bc690538fa542ba58726433bed6e04cc"},
+    {file = "coverage-7.0.3-cp38-cp38-musllinux_1_1_i686.whl", hash = "sha256:985ad2af5ec3dbb4fd75d5b0735752c527ad183455520055a08cf8d6794cabfc"},
+    {file = "coverage-7.0.3-cp38-cp38-musllinux_1_1_x86_64.whl", hash = "sha256:ca15308ef722f120967af7474ba6a453e0f5b6f331251e20b8145497cf1bc14a"},
+    {file = "coverage-7.0.3-cp38-cp38-win32.whl", hash = "sha256:c1cee10662c25c94415bbb987f2ec0e6ba9e8fce786334b10be7e6a7ab958f69"},
+    {file = "coverage-7.0.3-cp38-cp38-win_amd64.whl", hash = "sha256:44d6a556de4418f1f3bfd57094b8c49f0408df5a433cf0d253eeb3075261c762"},
+    {file = "coverage-7.0.3-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:e6dcc70a25cb95df0ae33dfc701de9b09c37f7dd9f00394d684a5b57257f8246"},
+    {file = "coverage-7.0.3-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:bf76d79dfaea802f0f28f50153ffbc1a74ae1ee73e480baeda410b4f3e7ab25f"},
+    {file = "coverage-7.0.3-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:88834e5d56d01c141c29deedacba5773fe0bed900b1edc957595a8a6c0da1c3c"},
+    {file = "coverage-7.0.3-cp39-cp39-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:ef001a60e888f8741e42e5aa79ae55c91be73761e4df5e806efca1ddd62fd400"},
+    {file = "coverage-7.0.3-cp39-cp39-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:4959dc506be74e4963bd2c42f7b87d8e4b289891201e19ec551e64c6aa5441f8"},
+    {file = "coverage-7.0.3-cp39-cp39-musllinux_1_1_aarch64.whl", hash = "sha256:b791beb17b32ac019a78cfbe6184f992b6273fdca31145b928ad2099435e2fcb"},
+    {file = "coverage-7.0.3-cp39-cp39-musllinux_1_1_i686.whl", hash = "sha256:b07651e3b9af8f1a092861d88b4c74d913634a7f1f2280fca0ad041ad84e9e96"},
+    {file = "coverage-7.0.3-cp39-cp39-musllinux_1_1_x86_64.whl", hash = "sha256:55e46fa4168ccb7497c9be78627fcb147e06f474f846a10d55feeb5108a24ef0"},
+    {file = "coverage-7.0.3-cp39-cp39-win32.whl", hash = "sha256:e3f1cd1cd65695b1540b3cf7828d05b3515974a9d7c7530f762ac40f58a18161"},
+    {file = "coverage-7.0.3-cp39-cp39-win_amd64.whl", hash = "sha256:d8249666c23683f74f8f93aeaa8794ac87cc61c40ff70374a825f3352a4371dc"},
+    {file = "coverage-7.0.3-pp37.pp38.pp39-none-any.whl", hash = "sha256:b1ffc8f58b81baed3f8962e28c30d99442079b82ce1ec836a1f67c0accad91c1"},
+    {file = "coverage-7.0.3.tar.gz", hash = "sha256:d5be4e93acce64f516bf4fd239c0e6118fc913c93fa1a3f52d15bdcc60d97b2d"},
+]
 
 [package.extras]
 toml = ["tomli"]
@@ -185,17 +303,10 @@ description = "Distribution utilities"
 category = "dev"
 optional = false
 python-versions = "*"
-
-[[package]]
-name = "exceptiongroup"
-version = "1.0.4"
-description = "Backport of PEP 654 (exception groups)"
-category = "dev"
-optional = false
-python-versions = ">=3.7"
-
-[package.extras]
-test = ["pytest (>=6)"]
+files = [
+    {file = "distlib-0.3.6-py2.py3-none-any.whl", hash = "sha256:f35c4b692542ca110de7ef0bea44d73981caeb34ca0b9b6b2e6d7790dda8f80e"},
+    {file = "distlib-0.3.6.tar.gz", hash = "sha256:14bad2d9b04d3a36127ac97f30b12a19268f211063d8f8ee4f47108896e11b46"},
+]
 
 [[package]]
 name = "execnet"
@@ -204,6 +315,10 @@ description = "execnet: rapid multi-Python deployment"
 category = "dev"
 optional = false
 python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*"
+files = [
+    {file = "execnet-1.9.0-py2.py3-none-any.whl", hash = "sha256:a295f7cc774947aac58dde7fdc85f4aa00c42adf5d8f5468fc630c1acf30a142"},
+    {file = "execnet-1.9.0.tar.gz", hash = "sha256:8f694f3ba9cc92cab508b152dcfe322153975c29bda272e2fd7f3f00f36e47c5"},
+]
 
 [package.extras]
 testing = ["pre-commit"]
@@ -215,6 +330,10 @@ description = "A platform independent file lock."
 category = "dev"
 optional = false
 python-versions = ">=3.7"
+files = [
+    {file = "filelock-3.9.0-py3-none-any.whl", hash = "sha256:f58d535af89bb9ad5cd4df046f741f8553a418c01a7856bf0d173bbc9f6bd16d"},
+    {file = "filelock-3.9.0.tar.gz", hash = "sha256:7b319f24340b51f55a2bf7a12ac0755a9b03e718311dac567a0f4f7fabd2f5de"},
+]
 
 [package.extras]
 docs = ["furo (>=2022.12.7)", "sphinx (>=5.3)", "sphinx-autodoc-typehints (>=1.19.5)"]
@@ -222,11 +341,15 @@ testing = ["covdefaults (>=2.2.2)", "coverage (>=7.0.1)", "pytest (>=7.2)", "pyt
 
 [[package]]
 name = "identify"
-version = "2.5.11"
+version = "2.5.12"
 description = "File identification library for Python"
 category = "dev"
 optional = false
 python-versions = ">=3.7"
+files = [
+    {file = "identify-2.5.12-py2.py3-none-any.whl", hash = "sha256:e8a400c3062d980243d27ce10455a52832205649bbcaf27ffddb3dfaaf477bad"},
+    {file = "identify-2.5.12.tar.gz", hash = "sha256:0bc96b09c838310b6fcfcc61f78a981ea07f94836ef6ef553da5bb5d4745d662"},
+]
 
 [package.extras]
 license = ["ukkonen"]
@@ -238,6 +361,10 @@ description = "Internationalized Domain Names in Applications (IDNA)"
 category = "main"
 optional = false
 python-versions = ">=3.5"
+files = [
+    {file = "idna-3.4-py3-none-any.whl", hash = "sha256:90b77e79eaa3eba6de819a0c442c0b4ceefc341a7a2ab77d7562bf49f425c5c2"},
+    {file = "idna-3.4.tar.gz", hash = "sha256:814f528e8dead7d329833b91c5faa87d60bf71824cd12a7530b5526063d02cb4"},
+]
 
 [[package]]
 name = "iniconfig"
@@ -246,6 +373,10 @@ description = "iniconfig: brain-dead simple config-ini parsing"
 category = "dev"
 optional = false
 python-versions = "*"
+files = [
+    {file = "iniconfig-1.1.1-py2.py3-none-any.whl", hash = "sha256:011e24c64b7f47f6ebd835bb12a743f2fbe9a26d4cecaa7f53bc4f35ee9da8b3"},
+    {file = "iniconfig-1.1.1.tar.gz", hash = "sha256:bc3af051d7d14b2ee5ef9969666def0cd1a000e121eaea580d4a313df4b37f32"},
+]
 
 [[package]]
 name = "isort"
@@ -254,6 +385,10 @@ description = "A Python utility / library to sort Python imports."
 category = "dev"
 optional = false
 python-versions = ">=3.7.0"
+files = [
+    {file = "isort-5.11.4-py3-none-any.whl", hash = "sha256:c033fd0edb91000a7f09527fe5c75321878f98322a77ddcc81adbd83724afb7b"},
+    {file = "isort-5.11.4.tar.gz", hash = "sha256:6db30c5ded9815d813932c04c2f85a360bcdd35fed496f4d8f35495ef0a261b6"},
+]
 
 [package.extras]
 colors = ["colorama (>=0.4.3,<0.5.0)"]
@@ -268,6 +403,10 @@ description = "A very fast and expressive template engine."
 category = "dev"
 optional = false
 python-versions = ">=3.7"
+files = [
+    {file = "Jinja2-3.1.2-py3-none-any.whl", hash = "sha256:6088930bfe239f0e6710546ab9c19c9ef35e29792895fed6e6e31a023a182a61"},
+    {file = "Jinja2-3.1.2.tar.gz", hash = "sha256:31351a702a408a9e7595a8fc6150fc3f43bb6bf7e319770cbc0db9df9437e852"},
+]
 
 [package.dependencies]
 MarkupSafe = ">=2.0"
@@ -282,6 +421,10 @@ description = "Jinja2 Extension for Dates and Times"
 category = "dev"
 optional = false
 python-versions = "*"
+files = [
+    {file = "jinja2-time-0.2.0.tar.gz", hash = "sha256:d14eaa4d315e7688daa4969f616f226614350c48730bfa1692d2caebd8c90d40"},
+    {file = "jinja2_time-0.2.0-py2.py3-none-any.whl", hash = "sha256:d3eab6605e3ec8b7a0863df09cc1d23714908fa61aa6986a845c20ba488b4efa"},
+]
 
 [package.dependencies]
 arrow = "*"
@@ -294,6 +437,48 @@ description = "Safely add untrusted strings to HTML/XML markup."
 category = "dev"
 optional = false
 python-versions = ">=3.7"
+files = [
+    {file = "MarkupSafe-2.1.1-cp310-cp310-macosx_10_9_universal2.whl", hash = "sha256:86b1f75c4e7c2ac2ccdaec2b9022845dbb81880ca318bb7a0a01fbf7813e3812"},
+    {file = "MarkupSafe-2.1.1-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:f121a1420d4e173a5d96e47e9a0c0dcff965afdf1626d28de1460815f7c4ee7a"},
+    {file = "MarkupSafe-2.1.1-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:a49907dd8420c5685cfa064a1335b6754b74541bbb3706c259c02ed65b644b3e"},
+    {file = "MarkupSafe-2.1.1-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:10c1bfff05d95783da83491be968e8fe789263689c02724e0c691933c52994f5"},
+    {file = "MarkupSafe-2.1.1-cp310-cp310-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:b7bd98b796e2b6553da7225aeb61f447f80a1ca64f41d83612e6139ca5213aa4"},
+    {file = "MarkupSafe-2.1.1-cp310-cp310-musllinux_1_1_aarch64.whl", hash = "sha256:b09bf97215625a311f669476f44b8b318b075847b49316d3e28c08e41a7a573f"},
+    {file = "MarkupSafe-2.1.1-cp310-cp310-musllinux_1_1_i686.whl", hash = "sha256:694deca8d702d5db21ec83983ce0bb4b26a578e71fbdbd4fdcd387daa90e4d5e"},
+    {file = "MarkupSafe-2.1.1-cp310-cp310-musllinux_1_1_x86_64.whl", hash = "sha256:efc1913fd2ca4f334418481c7e595c00aad186563bbc1ec76067848c7ca0a933"},
+    {file = "MarkupSafe-2.1.1-cp310-cp310-win32.whl", hash = "sha256:4a33dea2b688b3190ee12bd7cfa29d39c9ed176bda40bfa11099a3ce5d3a7ac6"},
+    {file = "MarkupSafe-2.1.1-cp310-cp310-win_amd64.whl", hash = "sha256:dda30ba7e87fbbb7eab1ec9f58678558fd9a6b8b853530e176eabd064da81417"},
+    {file = "MarkupSafe-2.1.1-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:671cd1187ed5e62818414afe79ed29da836dde67166a9fac6d435873c44fdd02"},
+    {file = "MarkupSafe-2.1.1-cp37-cp37m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:3799351e2336dc91ea70b034983ee71cf2f9533cdff7c14c90ea126bfd95d65a"},
+    {file = "MarkupSafe-2.1.1-cp37-cp37m-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:e72591e9ecd94d7feb70c1cbd7be7b3ebea3f548870aa91e2732960fa4d57a37"},
+    {file = "MarkupSafe-2.1.1-cp37-cp37m-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:6fbf47b5d3728c6aea2abb0589b5d30459e369baa772e0f37a0320185e87c980"},
+    {file = "MarkupSafe-2.1.1-cp37-cp37m-musllinux_1_1_aarch64.whl", hash = "sha256:d5ee4f386140395a2c818d149221149c54849dfcfcb9f1debfe07a8b8bd63f9a"},
+    {file = "MarkupSafe-2.1.1-cp37-cp37m-musllinux_1_1_i686.whl", hash = "sha256:bcb3ed405ed3222f9904899563d6fc492ff75cce56cba05e32eff40e6acbeaa3"},
+    {file = "MarkupSafe-2.1.1-cp37-cp37m-musllinux_1_1_x86_64.whl", hash = "sha256:e1c0b87e09fa55a220f058d1d49d3fb8df88fbfab58558f1198e08c1e1de842a"},
+    {file = "MarkupSafe-2.1.1-cp37-cp37m-win32.whl", hash = "sha256:8dc1c72a69aa7e082593c4a203dcf94ddb74bb5c8a731e4e1eb68d031e8498ff"},
+    {file = "MarkupSafe-2.1.1-cp37-cp37m-win_amd64.whl", hash = "sha256:97a68e6ada378df82bc9f16b800ab77cbf4b2fada0081794318520138c088e4a"},
+    {file = "MarkupSafe-2.1.1-cp38-cp38-macosx_10_9_universal2.whl", hash = "sha256:e8c843bbcda3a2f1e3c2ab25913c80a3c5376cd00c6e8c4a86a89a28c8dc5452"},
+    {file = "MarkupSafe-2.1.1-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:0212a68688482dc52b2d45013df70d169f542b7394fc744c02a57374a4207003"},
+    {file = "MarkupSafe-2.1.1-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:8e576a51ad59e4bfaac456023a78f6b5e6e7651dcd383bcc3e18d06f9b55d6d1"},
+    {file = "MarkupSafe-2.1.1-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:4b9fe39a2ccc108a4accc2676e77da025ce383c108593d65cc909add5c3bd601"},
+    {file = "MarkupSafe-2.1.1-cp38-cp38-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:96e37a3dc86e80bf81758c152fe66dbf60ed5eca3d26305edf01892257049925"},
+    {file = "MarkupSafe-2.1.1-cp38-cp38-musllinux_1_1_aarch64.whl", hash = "sha256:6d0072fea50feec76a4c418096652f2c3238eaa014b2f94aeb1d56a66b41403f"},
+    {file = "MarkupSafe-2.1.1-cp38-cp38-musllinux_1_1_i686.whl", hash = "sha256:089cf3dbf0cd6c100f02945abeb18484bd1ee57a079aefd52cffd17fba910b88"},
+    {file = "MarkupSafe-2.1.1-cp38-cp38-musllinux_1_1_x86_64.whl", hash = "sha256:6a074d34ee7a5ce3effbc526b7083ec9731bb3cbf921bbe1d3005d4d2bdb3a63"},
+    {file = "MarkupSafe-2.1.1-cp38-cp38-win32.whl", hash = "sha256:421be9fbf0ffe9ffd7a378aafebbf6f4602d564d34be190fc19a193232fd12b1"},
+    {file = "MarkupSafe-2.1.1-cp38-cp38-win_amd64.whl", hash = "sha256:fc7b548b17d238737688817ab67deebb30e8073c95749d55538ed473130ec0c7"},
+    {file = "MarkupSafe-2.1.1-cp39-cp39-macosx_10_9_universal2.whl", hash = "sha256:e04e26803c9c3851c931eac40c695602c6295b8d432cbe78609649ad9bd2da8a"},
+    {file = "MarkupSafe-2.1.1-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:b87db4360013327109564f0e591bd2a3b318547bcef31b468a92ee504d07ae4f"},
+    {file = "MarkupSafe-2.1.1-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:99a2a507ed3ac881b975a2976d59f38c19386d128e7a9a18b7df6fff1fd4c1d6"},
+    {file = "MarkupSafe-2.1.1-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:56442863ed2b06d19c37f94d999035e15ee982988920e12a5b4ba29b62ad1f77"},
+    {file = "MarkupSafe-2.1.1-cp39-cp39-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:3ce11ee3f23f79dbd06fb3d63e2f6af7b12db1d46932fe7bd8afa259a5996603"},
+    {file = "MarkupSafe-2.1.1-cp39-cp39-musllinux_1_1_aarch64.whl", hash = "sha256:33b74d289bd2f5e527beadcaa3f401e0df0a89927c1559c8566c066fa4248ab7"},
+    {file = "MarkupSafe-2.1.1-cp39-cp39-musllinux_1_1_i686.whl", hash = "sha256:43093fb83d8343aac0b1baa75516da6092f58f41200907ef92448ecab8825135"},
+    {file = "MarkupSafe-2.1.1-cp39-cp39-musllinux_1_1_x86_64.whl", hash = "sha256:8e3dcf21f367459434c18e71b2a9532d96547aef8a871872a5bd69a715c15f96"},
+    {file = "MarkupSafe-2.1.1-cp39-cp39-win32.whl", hash = "sha256:d4306c36ca495956b6d568d276ac11fdd9c30a36f1b6eb928070dc5360b22e1c"},
+    {file = "MarkupSafe-2.1.1-cp39-cp39-win_amd64.whl", hash = "sha256:46d00d6cfecdde84d40e572d63735ef81423ad31184100411e6e3388d405e247"},
+    {file = "MarkupSafe-2.1.1.tar.gz", hash = "sha256:7f91197cc9e48f989d12e4e6fbc46495c446636dfc81b9ccf50bb0ec74b91d4b"},
+]
 
 [[package]]
 name = "more-itertools"
@@ -302,6 +487,10 @@ description = "More routines for operating on iterables, beyond itertools"
 category = "main"
 optional = false
 python-versions = ">=3.7"
+files = [
+    {file = "more-itertools-9.0.0.tar.gz", hash = "sha256:5a6257e40878ef0520b1803990e3e22303a41b5714006c32a3fd8304b26ea1ab"},
+    {file = "more_itertools-9.0.0-py3-none-any.whl", hash = "sha256:250e83d7e81d0c87ca6bd942e6aeab8cc9daa6096d12c5308f3f92fa5e5c1f41"},
+]
 
 [[package]]
 name = "mypy-extensions"
@@ -310,6 +499,10 @@ description = "Experimental type system extensions for programs checked with the
 category = "dev"
 optional = false
 python-versions = "*"
+files = [
+    {file = "mypy_extensions-0.4.3-py2.py3-none-any.whl", hash = "sha256:090fedd75945a69ae91ce1303b5824f428daf5a028d2f6ab8a299250a846f15d"},
+    {file = "mypy_extensions-0.4.3.tar.gz", hash = "sha256:2d82818f5bb3e369420cb3c4060a7970edba416647068eb4c5343488a6c604a8"},
+]
 
 [[package]]
 name = "nodeenv"
@@ -318,6 +511,10 @@ description = "Node.js virtual environment builder"
 category = "dev"
 optional = false
 python-versions = ">=2.7,!=3.0.*,!=3.1.*,!=3.2.*,!=3.3.*,!=3.4.*,!=3.5.*,!=3.6.*"
+files = [
+    {file = "nodeenv-1.7.0-py2.py3-none-any.whl", hash = "sha256:27083a7b96a25f2f5e1d8cb4b6317ee8aeda3bdd121394e5ac54e498028a042e"},
+    {file = "nodeenv-1.7.0.tar.gz", hash = "sha256:e0e7f7dfb85fc5394c6fe1e8fa98131a2473e04311a45afb6508f7cf1836fa2b"},
+]
 
 [package.dependencies]
 setuptools = "*"
@@ -329,6 +526,10 @@ description = "Core utilities for Python packages"
 category = "dev"
 optional = false
 python-versions = ">=3.7"
+files = [
+    {file = "packaging-22.0-py3-none-any.whl", hash = "sha256:957e2148ba0e1a3b282772e791ef1d8083648bc131c8ab0c1feba110ce1146c3"},
+    {file = "packaging-22.0.tar.gz", hash = "sha256:2198ec20bd4c017b8f9717e00f0c8714076fc2fd93816750ab48e2c41de2cfd3"},
+]
 
 [[package]]
 name = "parse"
@@ -337,6 +538,9 @@ description = "parse() is the opposite of format()"
 category = "main"
 optional = false
 python-versions = "*"
+files = [
+    {file = "parse-1.19.0.tar.gz", hash = "sha256:9ff82852bcb65d139813e2a5197627a94966245c897796760a3a2a8eb66f020b"},
+]
 
 [[package]]
 name = "pathspec"
@@ -345,6 +549,10 @@ description = "Utility library for gitignore style pattern matching of file path
 category = "dev"
 optional = false
 python-versions = ">=3.7"
+files = [
+    {file = "pathspec-0.10.3-py3-none-any.whl", hash = "sha256:3c95343af8b756205e2aba76e843ba9520a24dd84f68c22b9f93251507509dd6"},
+    {file = "pathspec-0.10.3.tar.gz", hash = "sha256:56200de4077d9d0791465aa9095a01d421861e405b5096955051deefd697d6f6"},
+]
 
 [[package]]
 name = "platformdirs"
@@ -353,6 +561,10 @@ description = "A small Python package for determining appropriate platform-speci
 category = "dev"
 optional = false
 python-versions = ">=3.7"
+files = [
+    {file = "platformdirs-2.6.2-py3-none-any.whl", hash = "sha256:83c8f6d04389165de7c9b6f0c682439697887bca0aa2f1c87ef1826be3584490"},
+    {file = "platformdirs-2.6.2.tar.gz", hash = "sha256:e1fea1fe471b9ff8332e229df3cb7de4f53eeea4998d3b6bfff542115e998bd2"},
+]
 
 [package.extras]
 docs = ["furo (>=2022.12.7)", "proselint (>=0.13)", "sphinx (>=5.3)", "sphinx-autodoc-typehints (>=1.19.5)"]
@@ -365,6 +577,10 @@ description = "plugin and hook calling mechanisms for python"
 category = "dev"
 optional = false
 python-versions = ">=3.6"
+files = [
+    {file = "pluggy-1.0.0-py2.py3-none-any.whl", hash = "sha256:74134bbf457f031a36d68416e1509f34bd5ccc019f0bcc952c7b909d06b37bd3"},
+    {file = "pluggy-1.0.0.tar.gz", hash = "sha256:4224373bacce55f955a878bf9cfa763c1e360858e330072059e10bad68531159"},
+]
 
 [package.extras]
 dev = ["pre-commit", "tox"]
@@ -377,6 +593,10 @@ description = "A framework for managing and maintaining multi-language pre-commi
 category = "dev"
 optional = false
 python-versions = ">=3.7"
+files = [
+    {file = "pre_commit-2.21.0-py2.py3-none-any.whl", hash = "sha256:e2f91727039fc39a92f58a588a25b87f936de6567eed4f0e673e0507edc75bad"},
+    {file = "pre_commit-2.21.0.tar.gz", hash = "sha256:31ef31af7e474a8d8995027fefdfcf509b5c913ff31f2015b4ec4beb26a6f658"},
+]
 
 [package.dependencies]
 cfgv = ">=2.0.0"
@@ -387,15 +607,18 @@ virtualenv = ">=20.10.0"
 
 [[package]]
 name = "pyproject-api"
-version = "1.2.1"
+version = "1.4.0"
 description = "API to interact with the python pyproject.toml based projects"
 category = "dev"
 optional = false
 python-versions = ">=3.7"
+files = [
+    {file = "pyproject_api-1.4.0-py3-none-any.whl", hash = "sha256:c34226297781efdd1ba4dfb74ce21076d9a8360e2125ea31803c1a02c76b2460"},
+    {file = "pyproject_api-1.4.0.tar.gz", hash = "sha256:ac85c1f82e0291dbae5a7739dbb9a990e11ee4034c9b5599ea714f07a24ecd71"},
+]
 
 [package.dependencies]
 packaging = ">=21.3"
-tomli = {version = ">=2.0.1", markers = "python_version < \"3.11\""}
 
 [package.extras]
 docs = ["furo (>=2022.9.29)", "sphinx (>=5.3)", "sphinx-autodoc-typehints (>=1.19.5)"]
@@ -408,15 +631,17 @@ description = "pytest: simple powerful testing with Python"
 category = "dev"
 optional = false
 python-versions = ">=3.7"
+files = [
+    {file = "pytest-7.2.0-py3-none-any.whl", hash = "sha256:892f933d339f068883b6fd5a459f03d85bfcb355e4981e146d2c7616c21fef71"},
+    {file = "pytest-7.2.0.tar.gz", hash = "sha256:c4014eb40e10f11f355ad4e3c2fb2c6c6d1919c73f3b5a433de4708202cade59"},
+]
 
 [package.dependencies]
 attrs = ">=19.2.0"
 colorama = {version = "*", markers = "sys_platform == \"win32\""}
-exceptiongroup = {version = ">=1.0.0rc8", markers = "python_version < \"3.11\""}
 iniconfig = "*"
 packaging = "*"
 pluggy = ">=0.12,<2.0"
-tomli = {version = ">=1.0.0", markers = "python_version < \"3.11\""}
 
 [package.extras]
 testing = ["argcomplete", "hypothesis (>=3.56)", "mock", "nose", "pygments (>=2.7.2)", "requests", "xmlschema"]
@@ -428,6 +653,10 @@ description = "Pytest plugin for measuring coverage."
 category = "dev"
 optional = false
 python-versions = ">=3.6"
+files = [
+    {file = "pytest-cov-4.0.0.tar.gz", hash = "sha256:996b79efde6433cdbd0088872dbc5fb3ed7fe1578b68cdbba634f14bb8dd0470"},
+    {file = "pytest_cov-4.0.0-py3-none-any.whl", hash = "sha256:2feb1b751d66a8bd934e5edfa2e961d11309dc37b73b0eabe73b5945fee20f6b"},
+]
 
 [package.dependencies]
 coverage = {version = ">=5.2.1", extras = ["toml"]}
@@ -443,6 +672,10 @@ description = "pytest xdist plugin for distributed testing, most importantly acr
 category = "dev"
 optional = false
 python-versions = ">=3.7"
+files = [
+    {file = "pytest-xdist-3.1.0.tar.gz", hash = "sha256:40fdb8f3544921c5dfcd486ac080ce22870e71d82ced6d2e78fa97c2addd480c"},
+    {file = "pytest_xdist-3.1.0-py3-none-any.whl", hash = "sha256:70a76f191d8a1d2d6be69fc440cdf85f3e4c03c08b520fd5dc5d338d6cf07d89"},
+]
 
 [package.dependencies]
 execnet = ">=1.1"
@@ -460,6 +693,10 @@ description = "Extensions to the standard Python datetime module"
 category = "dev"
 optional = false
 python-versions = "!=3.0.*,!=3.1.*,!=3.2.*,>=2.7"
+files = [
+    {file = "python-dateutil-2.8.2.tar.gz", hash = "sha256:0123cacc1627ae19ddf3c27a5de5bd67ee4586fbdd6440d9748f8abb483d3e86"},
+    {file = "python_dateutil-2.8.2-py2.py3-none-any.whl", hash = "sha256:961d03dc3453ebbc59dbdea9e4e11c5651520a876d0f4db161e8674aae935da9"},
+]
 
 [package.dependencies]
 six = ">=1.5"
@@ -471,6 +708,10 @@ description = "Read key-value pairs from a .env file and set them as environment
 category = "dev"
 optional = false
 python-versions = ">=3.7"
+files = [
+    {file = "python-dotenv-0.21.0.tar.gz", hash = "sha256:b77d08274639e3d34145dfa6c7008e66df0f04b7be7a75fd0d5292c191d79045"},
+    {file = "python_dotenv-0.21.0-py3-none-any.whl", hash = "sha256:1684eb44636dd462b66c3ee016599815514527ad99965de77f43e0944634a7e5"},
+]
 
 [package.extras]
 cli = ["click (>=5.0)"]
@@ -482,6 +723,10 @@ description = "A Python slugify application that also handles Unicode"
 category = "dev"
 optional = false
 python-versions = ">=3.7"
+files = [
+    {file = "python-slugify-7.0.0.tar.gz", hash = "sha256:7a0f21a39fa6c1c4bf2e5984c9b9ae944483fd10b54804cb0e23a3ccd4954f0b"},
+    {file = "python_slugify-7.0.0-py2.py3-none-any.whl", hash = "sha256:003aee64f9fd955d111549f96c4b58a3f40b9319383c70fad6277a4974bbf570"},
+]
 
 [package.dependencies]
 text-unidecode = ">=1.3"
@@ -496,6 +741,48 @@ description = "YAML parser and emitter for Python"
 category = "dev"
 optional = false
 python-versions = ">=3.6"
+files = [
+    {file = "PyYAML-6.0-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:d4db7c7aef085872ef65a8fd7d6d09a14ae91f691dec3e87ee5ee0539d516f53"},
+    {file = "PyYAML-6.0-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:9df7ed3b3d2e0ecfe09e14741b857df43adb5a3ddadc919a2d94fbdf78fea53c"},
+    {file = "PyYAML-6.0-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:77f396e6ef4c73fdc33a9157446466f1cff553d979bd00ecb64385760c6babdc"},
+    {file = "PyYAML-6.0-cp310-cp310-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:a80a78046a72361de73f8f395f1f1e49f956c6be882eed58505a15f3e430962b"},
+    {file = "PyYAML-6.0-cp310-cp310-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:f84fbc98b019fef2ee9a1cb3ce93e3187a6df0b2538a651bfb890254ba9f90b5"},
+    {file = "PyYAML-6.0-cp310-cp310-win32.whl", hash = "sha256:2cd5df3de48857ed0544b34e2d40e9fac445930039f3cfe4bcc592a1f836d513"},
+    {file = "PyYAML-6.0-cp310-cp310-win_amd64.whl", hash = "sha256:daf496c58a8c52083df09b80c860005194014c3698698d1a57cbcfa182142a3a"},
+    {file = "PyYAML-6.0-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:d4b0ba9512519522b118090257be113b9468d804b19d63c71dbcf4a48fa32358"},
+    {file = "PyYAML-6.0-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:81957921f441d50af23654aa6c5e5eaf9b06aba7f0a19c18a538dc7ef291c5a1"},
+    {file = "PyYAML-6.0-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:afa17f5bc4d1b10afd4466fd3a44dc0e245382deca5b3c353d8b757f9e3ecb8d"},
+    {file = "PyYAML-6.0-cp311-cp311-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:dbad0e9d368bb989f4515da330b88a057617d16b6a8245084f1b05400f24609f"},
+    {file = "PyYAML-6.0-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:432557aa2c09802be39460360ddffd48156e30721f5e8d917f01d31694216782"},
+    {file = "PyYAML-6.0-cp311-cp311-win32.whl", hash = "sha256:bfaef573a63ba8923503d27530362590ff4f576c626d86a9fed95822a8255fd7"},
+    {file = "PyYAML-6.0-cp311-cp311-win_amd64.whl", hash = "sha256:01b45c0191e6d66c470b6cf1b9531a771a83c1c4208272ead47a3ae4f2f603bf"},
+    {file = "PyYAML-6.0-cp36-cp36m-macosx_10_9_x86_64.whl", hash = "sha256:897b80890765f037df3403d22bab41627ca8811ae55e9a722fd0392850ec4d86"},
+    {file = "PyYAML-6.0-cp36-cp36m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:50602afada6d6cbfad699b0c7bb50d5ccffa7e46a3d738092afddc1f9758427f"},
+    {file = "PyYAML-6.0-cp36-cp36m-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:48c346915c114f5fdb3ead70312bd042a953a8ce5c7106d5bfb1a5254e47da92"},
+    {file = "PyYAML-6.0-cp36-cp36m-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:98c4d36e99714e55cfbaaee6dd5badbc9a1ec339ebfc3b1f52e293aee6bb71a4"},
+    {file = "PyYAML-6.0-cp36-cp36m-win32.whl", hash = "sha256:0283c35a6a9fbf047493e3a0ce8d79ef5030852c51e9d911a27badfde0605293"},
+    {file = "PyYAML-6.0-cp36-cp36m-win_amd64.whl", hash = "sha256:07751360502caac1c067a8132d150cf3d61339af5691fe9e87803040dbc5db57"},
+    {file = "PyYAML-6.0-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:819b3830a1543db06c4d4b865e70ded25be52a2e0631ccd2f6a47a2822f2fd7c"},
+    {file = "PyYAML-6.0-cp37-cp37m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:473f9edb243cb1935ab5a084eb238d842fb8f404ed2193a915d1784b5a6b5fc0"},
+    {file = "PyYAML-6.0-cp37-cp37m-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:0ce82d761c532fe4ec3f87fc45688bdd3a4c1dc5e0b4a19814b9009a29baefd4"},
+    {file = "PyYAML-6.0-cp37-cp37m-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:231710d57adfd809ef5d34183b8ed1eeae3f76459c18fb4a0b373ad56bedcdd9"},
+    {file = "PyYAML-6.0-cp37-cp37m-win32.whl", hash = "sha256:c5687b8d43cf58545ade1fe3e055f70eac7a5a1a0bf42824308d868289a95737"},
+    {file = "PyYAML-6.0-cp37-cp37m-win_amd64.whl", hash = "sha256:d15a181d1ecd0d4270dc32edb46f7cb7733c7c508857278d3d378d14d606db2d"},
+    {file = "PyYAML-6.0-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:0b4624f379dab24d3725ffde76559cff63d9ec94e1736b556dacdfebe5ab6d4b"},
+    {file = "PyYAML-6.0-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:213c60cd50106436cc818accf5baa1aba61c0189ff610f64f4a3e8c6726218ba"},
+    {file = "PyYAML-6.0-cp38-cp38-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:9fa600030013c4de8165339db93d182b9431076eb98eb40ee068700c9c813e34"},
+    {file = "PyYAML-6.0-cp38-cp38-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:277a0ef2981ca40581a47093e9e2d13b3f1fbbeffae064c1d21bfceba2030287"},
+    {file = "PyYAML-6.0-cp38-cp38-win32.whl", hash = "sha256:d4eccecf9adf6fbcc6861a38015c2a64f38b9d94838ac1810a9023a0609e1b78"},
+    {file = "PyYAML-6.0-cp38-cp38-win_amd64.whl", hash = "sha256:1e4747bc279b4f613a09eb64bba2ba602d8a6664c6ce6396a4d0cd413a50ce07"},
+    {file = "PyYAML-6.0-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:055d937d65826939cb044fc8c9b08889e8c743fdc6a32b33e2390f66013e449b"},
+    {file = "PyYAML-6.0-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:e61ceaab6f49fb8bdfaa0f92c4b57bcfbea54c09277b1b4f7ac376bfb7a7c174"},
+    {file = "PyYAML-6.0-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:d67d839ede4ed1b28a4e8909735fc992a923cdb84e618544973d7dfc71540803"},
+    {file = "PyYAML-6.0-cp39-cp39-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:cba8c411ef271aa037d7357a2bc8f9ee8b58b9965831d9e51baf703280dc73d3"},
+    {file = "PyYAML-6.0-cp39-cp39-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:40527857252b61eacd1d9af500c3337ba8deb8fc298940291486c465c8b46ec0"},
+    {file = "PyYAML-6.0-cp39-cp39-win32.whl", hash = "sha256:b5b9eccad747aabaaffbc6064800670f0c297e52c12754eb1d976c57e4f74dcb"},
+    {file = "PyYAML-6.0-cp39-cp39-win_amd64.whl", hash = "sha256:b3d267842bf12586ba6c734f89d1f5b871df0273157918b0ccefa29deb05c21c"},
+    {file = "PyYAML-6.0.tar.gz", hash = "sha256:68fb519c14306fec9720a2a5b45bc9f0c8d1b9c72adf45c37baedfcd949c35a2"},
+]
 
 [[package]]
 name = "requests"
@@ -504,6 +791,10 @@ description = "Python HTTP for Humans."
 category = "main"
 optional = false
 python-versions = ">=3.7, <4"
+files = [
+    {file = "requests-2.28.1-py3-none-any.whl", hash = "sha256:8fefa2a1a1365bf5520aac41836fbee479da67864514bdb821f31ce07ce65349"},
+    {file = "requests-2.28.1.tar.gz", hash = "sha256:7c5599b102feddaa661c826c56ab4fee28bfd17f5abca1ebbe3e7f19d7c97983"},
+]
 
 [package.dependencies]
 certifi = ">=2017.4.17"
@@ -522,6 +813,10 @@ description = "Easily download, build, install, upgrade, and uninstall Python pa
 category = "dev"
 optional = false
 python-versions = ">=3.7"
+files = [
+    {file = "setuptools-65.6.3-py3-none-any.whl", hash = "sha256:57f6f22bde4e042978bcd50176fdb381d7c21a9efa4041202288d3737a0c6a54"},
+    {file = "setuptools-65.6.3.tar.gz", hash = "sha256:a7620757bf984b58deaf32fc8a4577a9bbc0850cf92c20e1ce41c38c19e5fb75"},
+]
 
 [package.extras]
 docs = ["furo", "jaraco.packaging (>=9)", "jaraco.tidelift (>=1.4)", "pygments-github-lexers (==0.0.5)", "rst.linker (>=1.9)", "sphinx (>=3.5)", "sphinx-favicon", "sphinx-hoverxref (<2)", "sphinx-inline-tabs", "sphinx-notfound-page (==0.8.3)", "sphinx-reredirects", "sphinxcontrib-towncrier"]
@@ -535,6 +830,10 @@ description = "Python 2 and 3 compatibility utilities"
 category = "main"
 optional = false
 python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*"
+files = [
+    {file = "six-1.16.0-py2.py3-none-any.whl", hash = "sha256:8abb2f1d86890a2dfb989f9a77cfcfd3e47c2a354b01111771326f8aa26e0254"},
+    {file = "six-1.16.0.tar.gz", hash = "sha256:1e61c37477a1626458e36f7b1d82aa5c9b094fa4802892072e49de9c60c4c926"},
+]
 
 [[package]]
 name = "soupsieve"
@@ -543,6 +842,10 @@ description = "A modern CSS selector implementation for Beautiful Soup."
 category = "main"
 optional = false
 python-versions = ">=3.6"
+files = [
+    {file = "soupsieve-2.3.2.post1-py3-none-any.whl", hash = "sha256:3b2503d3c7084a42b1ebd08116e5f81aadfaea95863628c80a3b774a11b7c759"},
+    {file = "soupsieve-2.3.2.post1.tar.gz", hash = "sha256:fc53893b3da2c33de295667a0e19f078c14bf86544af307354de5fcf12a3f30d"},
+]
 
 [[package]]
 name = "text-unidecode"
@@ -551,22 +854,22 @@ description = "The most basic Text::Unidecode port"
 category = "dev"
 optional = false
 python-versions = "*"
-
-[[package]]
-name = "tomli"
-version = "2.0.1"
-description = "A lil' TOML parser"
-category = "dev"
-optional = false
-python-versions = ">=3.7"
+files = [
+    {file = "text-unidecode-1.3.tar.gz", hash = "sha256:bad6603bb14d279193107714b288be206cac565dfa49aa5b105294dd5c4aab93"},
+    {file = "text_unidecode-1.3-py2.py3-none-any.whl", hash = "sha256:1311f10e8b895935241623731c2ba64f4c455287888b18189350b67134a822e8"},
+]
 
 [[package]]
 name = "tox"
-version = "4.2.4"
+version = "4.2.5"
 description = "tox is a generic virtualenv management and test command line tool"
 category = "dev"
 optional = false
 python-versions = ">=3.7"
+files = [
+    {file = "tox-4.2.5-py3-none-any.whl", hash = "sha256:a256447ec85a058004231f19ca3df66b3be591a7561c8f8389d1d60b5b629989"},
+    {file = "tox-4.2.5.tar.gz", hash = "sha256:dba263a7da1151e3f7c0816bf9efcbad127ee7ec981e5f03b9666b47619c735e"},
+]
 
 [package.dependencies]
 cachetools = ">=5.2"
@@ -577,7 +880,6 @@ packaging = ">=22"
 platformdirs = ">=2.6.2"
 pluggy = ">=1"
 pyproject-api = ">=1.2.1"
-tomli = {version = ">=2.0.1", markers = "python_version < \"3.11\""}
 virtualenv = ">=20.17.1"
 
 [package.extras]
@@ -591,6 +893,10 @@ description = "Fast, Extensible Progress Meter"
 category = "main"
 optional = false
 python-versions = "!=3.0.*,!=3.1.*,!=3.2.*,!=3.3.*,>=2.7"
+files = [
+    {file = "tqdm-4.64.1-py2.py3-none-any.whl", hash = "sha256:6fee160d6ffcd1b1c68c65f14c829c22832bc401726335ce92c52d395944a6a1"},
+    {file = "tqdm-4.64.1.tar.gz", hash = "sha256:5f4f682a004951c1b450bc753c710e9280c5746ce6ffedee253ddbcbf54cf1e4"},
+]
 
 [package.dependencies]
 colorama = {version = "*", markers = "platform_system == \"Windows\""}
@@ -608,6 +914,10 @@ description = "HTTP library with thread-safe connection pooling, file post, and
 category = "main"
 optional = false
 python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*, !=3.5.*"
+files = [
+    {file = "urllib3-1.26.13-py2.py3-none-any.whl", hash = "sha256:47cc05d99aaa09c9e72ed5809b60e7ba354e64b59c9c173ac3018642d8bb41fc"},
+    {file = "urllib3-1.26.13.tar.gz", hash = "sha256:c083dd0dce68dbfbe1129d5271cb90f9447dea7d52097c6e0126120c521ddea8"},
+]
 
 [package.extras]
 brotli = ["brotli (>=1.0.9)", "brotlicffi (>=0.8.0)", "brotlipy (>=0.6.0)"]
@@ -621,6 +931,10 @@ description = "Virtual Python Environment builder"
 category = "dev"
 optional = false
 python-versions = ">=3.6"
+files = [
+    {file = "virtualenv-20.17.1-py3-none-any.whl", hash = "sha256:ce3b1684d6e1a20a3e5ed36795a97dfc6af29bc3970ca8dab93e11ac6094b3c4"},
+    {file = "virtualenv-20.17.1.tar.gz", hash = "sha256:f8b927684efc6f1cc206c9db297a570ab9ad0e51c16fa9e45487d36d1905c058"},
+]
 
 [package.dependencies]
 distlib = ">=0.3.6,<1"
@@ -632,354 +946,6 @@ docs = ["proselint (>=0.13)", "sphinx (>=5.3)", "sphinx-argparse (>=0.3.2)", "sp
 testing = ["coverage (>=6.2)", "coverage-enable-subprocess (>=1)", "flaky (>=3.7)", "packaging (>=21.3)", "pytest (>=7.0.1)", "pytest-env (>=0.6.2)", "pytest-freezegun (>=0.4.2)", "pytest-mock (>=3.6.1)", "pytest-randomly (>=3.10.3)", "pytest-timeout (>=2.1)"]
 
 [metadata]
-lock-version = "1.1"
-python-versions = "^3.10"
-content-hash = "26039b8c21b6d6cf04d21ce869fa03f508a51208fbd1adc4adcb4b3dc6d7c27f"
-
-[metadata.files]
-anytree = [
-    {file = "anytree-2.8.0-py2.py3-none-any.whl", hash = "sha256:14c55ac77492b11532395049a03b773d14c7e30b22aa012e337b1e983de31521"},
-    {file = "anytree-2.8.0.tar.gz", hash = "sha256:3f0f93f355a91bc3e6245319bf4c1d50e3416cc7a35cc1133c1ff38306bbccab"},
-]
-arrow = [
-    {file = "arrow-1.2.3-py3-none-any.whl", hash = "sha256:5a49ab92e3b7b71d96cd6bfcc4df14efefc9dfa96ea19045815914a6ab6b1fe2"},
-    {file = "arrow-1.2.3.tar.gz", hash = "sha256:3934b30ca1b9f292376d9db15b19446088d12ec58629bc3f0da28fd55fb633a1"},
-]
-attrs = [
-    {file = "attrs-22.1.0-py2.py3-none-any.whl", hash = "sha256:86efa402f67bf2df34f51a335487cf46b1ec130d02b8d39fd248abfd30da551c"},
-    {file = "attrs-22.1.0.tar.gz", hash = "sha256:29adc2665447e5191d0e7c568fde78b21f9672d344281d0c6e1ab085429b22b6"},
-]
-beautifulsoup4 = [
-    {file = "beautifulsoup4-4.11.1-py3-none-any.whl", hash = "sha256:58d5c3d29f5a36ffeb94f02f0d786cd53014cf9b3b3951d42e0080d8a9498d30"},
-    {file = "beautifulsoup4-4.11.1.tar.gz", hash = "sha256:ad9aa55b65ef2808eb405f46cf74df7fcb7044d5cbc26487f96eb2ef2e436693"},
-]
-binaryornot = [
-    {file = "binaryornot-0.4.4-py2.py3-none-any.whl", hash = "sha256:b8b71173c917bddcd2c16070412e369c3ed7f0528926f70cac18a6c97fd563e4"},
-    {file = "binaryornot-0.4.4.tar.gz", hash = "sha256:359501dfc9d40632edc9fac890e19542db1a287bbcfa58175b66658392018061"},
-]
-black = [
-    {file = "black-22.12.0-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:9eedd20838bd5d75b80c9f5487dbcb06836a43833a37846cf1d8c1cc01cef59d"},
-    {file = "black-22.12.0-cp310-cp310-win_amd64.whl", hash = "sha256:159a46a4947f73387b4d83e87ea006dbb2337eab6c879620a3ba52699b1f4351"},
-    {file = "black-22.12.0-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:d30b212bffeb1e252b31dd269dfae69dd17e06d92b87ad26e23890f3efea366f"},
-    {file = "black-22.12.0-cp311-cp311-win_amd64.whl", hash = "sha256:7412e75863aa5c5411886804678b7d083c7c28421210180d67dfd8cf1221e1f4"},
-    {file = "black-22.12.0-cp37-cp37m-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:c116eed0efb9ff870ded8b62fe9f28dd61ef6e9ddd28d83d7d264a38417dcee2"},
-    {file = "black-22.12.0-cp37-cp37m-win_amd64.whl", hash = "sha256:1f58cbe16dfe8c12b7434e50ff889fa479072096d79f0a7f25e4ab8e94cd8350"},
-    {file = "black-22.12.0-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:77d86c9f3db9b1bf6761244bc0b3572a546f5fe37917a044e02f3166d5aafa7d"},
-    {file = "black-22.12.0-cp38-cp38-win_amd64.whl", hash = "sha256:82d9fe8fee3401e02e79767016b4907820a7dc28d70d137eb397b92ef3cc5bfc"},
-    {file = "black-22.12.0-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:101c69b23df9b44247bd88e1d7e90154336ac4992502d4197bdac35dd7ee3320"},
-    {file = "black-22.12.0-cp39-cp39-win_amd64.whl", hash = "sha256:559c7a1ba9a006226f09e4916060982fd27334ae1998e7a38b3f33a37f7a2148"},
-    {file = "black-22.12.0-py3-none-any.whl", hash = "sha256:436cc9167dd28040ad90d3b404aec22cedf24a6e4d7de221bec2730ec0c97bcf"},
-    {file = "black-22.12.0.tar.gz", hash = "sha256:229351e5a18ca30f447bf724d007f890f97e13af070bb6ad4c0a441cd7596a2f"},
-]
-cachetools = [
-    {file = "cachetools-5.2.0-py3-none-any.whl", hash = "sha256:f9f17d2aec496a9aa6b76f53e3b614c965223c061982d434d160f930c698a9db"},
-    {file = "cachetools-5.2.0.tar.gz", hash = "sha256:6a94c6402995a99c3970cc7e4884bb60b4a8639938157eeed436098bf9831757"},
-]
-certifi = [
-    {file = "certifi-2022.12.7-py3-none-any.whl", hash = "sha256:4ad3232f5e926d6718ec31cfc1fcadfde020920e278684144551c91769c7bc18"},
-    {file = "certifi-2022.12.7.tar.gz", hash = "sha256:35824b4c3a97115964b408844d64aa14db1cc518f6562e8d7261699d1350a9e3"},
-]
-cfgv = [
-    {file = "cfgv-3.3.1-py2.py3-none-any.whl", hash = "sha256:c6a0883f3917a037485059700b9e75da2464e6c27051014ad85ba6aaa5884426"},
-    {file = "cfgv-3.3.1.tar.gz", hash = "sha256:f5a830efb9ce7a445376bb66ec94c638a9787422f96264c98edc6bdeed8ab736"},
-]
-chardet = [
-    {file = "chardet-5.1.0-py3-none-any.whl", hash = "sha256:362777fb014af596ad31334fde1e8c327dfdb076e1960d1694662d46a6917ab9"},
-    {file = "chardet-5.1.0.tar.gz", hash = "sha256:0d62712b956bc154f85fb0a266e2a3c5913c2967e00348701b32411d6def31e5"},
-]
-charset-normalizer = [
-    {file = "charset-normalizer-2.1.1.tar.gz", hash = "sha256:5a3d016c7c547f69d6f81fb0db9449ce888b418b5b9952cc5e6e66843e9dd845"},
-    {file = "charset_normalizer-2.1.1-py3-none-any.whl", hash = "sha256:83e9a75d1911279afd89352c68b45348559d1fc0506b054b346651b5e7fee29f"},
-]
-click = [
-    {file = "click-8.1.3-py3-none-any.whl", hash = "sha256:bb4d8133cb15a609f44e8213d9b391b0809795062913b383c62be0ee95b1db48"},
-    {file = "click-8.1.3.tar.gz", hash = "sha256:7682dc8afb30297001674575ea00d1814d808d6a36af415a82bd481d37ba7b8e"},
-]
-colorama = [
-    {file = "colorama-0.4.6-py2.py3-none-any.whl", hash = "sha256:4f1d9991f5acc0ca119f9d443620b77f9d6b33703e51011c16baf57afb285fc6"},
-    {file = "colorama-0.4.6.tar.gz", hash = "sha256:08695f5cb7ed6e0531a20572697297273c47b8cae5a63ffc6d6ed5c201be6e44"},
-]
-cookiecutter = [
-    {file = "cookiecutter-2.1.1-py2.py3-none-any.whl", hash = "sha256:9f3ab027cec4f70916e28f03470bdb41e637a3ad354b4d65c765d93aad160022"},
-    {file = "cookiecutter-2.1.1.tar.gz", hash = "sha256:f3982be8d9c53dac1261864013fdec7f83afd2e42ede6f6dd069c5e149c540d5"},
-]
-coverage = [
-    {file = "coverage-7.0.0-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:f2569682d6ea9628da8d6ba38579a48b1e53081226ec7a6c82b5024b3ce5009f"},
-    {file = "coverage-7.0.0-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:3ec256a592b497f26054195f7d7148892aca8c4cdcc064a7cc66ef7a0455b811"},
-    {file = "coverage-7.0.0-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:5885a4ceb6dde34271bb0adafa4a248a7f589c89821e9da3110c39f92f41e21b"},
-    {file = "coverage-7.0.0-cp310-cp310-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:d43d406a4d73aa7f855fa44fa77ff47e739b565b2af3844600cdc016d01e46b9"},
-    {file = "coverage-7.0.0-cp310-cp310-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:b18df11efa615b79b9ecc13035a712957ff6283f7b244e57684e1c092869f541"},
-    {file = "coverage-7.0.0-cp310-cp310-musllinux_1_1_aarch64.whl", hash = "sha256:f6a4bf5bdee93f6817797beba7086292c2ebde6df0d5822e0c33f8b05415c339"},
-    {file = "coverage-7.0.0-cp310-cp310-musllinux_1_1_i686.whl", hash = "sha256:33efe89cd0efef016db19d8d05aa46631f76793de90a61b6717acb202b36fe60"},
-    {file = "coverage-7.0.0-cp310-cp310-musllinux_1_1_x86_64.whl", hash = "sha256:96b5b1f1079e48f56bfccf103bcf44d48b9eb5163f1ea523fad580f15d3fe5e0"},
-    {file = "coverage-7.0.0-cp310-cp310-win32.whl", hash = "sha256:fb85b7a7a4b204bd59d6d0b0c8d87d9ffa820da225e691dfaffc3137dc05b5f6"},
-    {file = "coverage-7.0.0-cp310-cp310-win_amd64.whl", hash = "sha256:793dcd9d42035746fc7637df4336f7581df19d33c5c5253cf988c99d8e93a8ba"},
-    {file = "coverage-7.0.0-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:d564142a03d3bc8913499a458e931b52ddfe952f69b6cd4b24d810fd2959044a"},
-    {file = "coverage-7.0.0-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:0a8b0e86bede874bf5da566b02194fbb12dd14ce3585cabd58452007f272ba81"},
-    {file = "coverage-7.0.0-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:e645c73cbfc4577d93747d3f793115acf6f907a7eb9208fa807fdcf2da1964a4"},
-    {file = "coverage-7.0.0-cp311-cp311-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:de06e7585abe88c6d38c1b73ce4c3cb4c1a79fbb0da0d0f8e8689ef5729ec60d"},
-    {file = "coverage-7.0.0-cp311-cp311-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:a30b646fbdd5bc52f506e149fa4fbdef82432baf6b81774e61ec4e3b43b9cbde"},
-    {file = "coverage-7.0.0-cp311-cp311-musllinux_1_1_aarch64.whl", hash = "sha256:db8141856dc9be0917413df7200f53accf1d84c8b156868e6af058a1ea8e903a"},
-    {file = "coverage-7.0.0-cp311-cp311-musllinux_1_1_i686.whl", hash = "sha256:59e71912c7fc78d08a567ee65656123878f49ca1b5672e660ea70bf8dfbebf8f"},
-    {file = "coverage-7.0.0-cp311-cp311-musllinux_1_1_x86_64.whl", hash = "sha256:b8f7cd942dda3795fc9eadf303cc53a422ac057e3b70c2ad6d4276ec6a83a541"},
-    {file = "coverage-7.0.0-cp311-cp311-win32.whl", hash = "sha256:bf437a04b9790d3c9cd5b48e9ce9aa84229040e3ae7d6c670a55118906113c5a"},
-    {file = "coverage-7.0.0-cp311-cp311-win_amd64.whl", hash = "sha256:a7e1bb36b4e57a2d304322021b35d4e4a25fa0d501ba56e8e51efaebf4480556"},
-    {file = "coverage-7.0.0-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:215f40ef86f1958a1151fa7fad2b4f2f99534c4e10a34a1e065eba3f19ef8868"},
-    {file = "coverage-7.0.0-cp37-cp37m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:ae088eb1cbdad8206931b1bf3f11dee644e038a9300be84d3e705e29356e5b1d"},
-    {file = "coverage-7.0.0-cp37-cp37m-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:f9071e197faa24837b967bc9aa0b9ef961f805a75f1ee3ea1f3367f55cd46c3c"},
-    {file = "coverage-7.0.0-cp37-cp37m-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:8f1e6d9c70d45a960d3f3d781ea62b167fdf2e0e1f6bb282b96feea653adb923"},
-    {file = "coverage-7.0.0-cp37-cp37m-musllinux_1_1_aarch64.whl", hash = "sha256:9fadd15f9fcfd7b16d9cccce9f5e6ec6f9b8df860633ad9aa62c2b14c259560f"},
-    {file = "coverage-7.0.0-cp37-cp37m-musllinux_1_1_i686.whl", hash = "sha256:10b6246cae61896ab4c7568e498e492cbb73a2dfa4c3af79141c43cf806f929a"},
-    {file = "coverage-7.0.0-cp37-cp37m-musllinux_1_1_x86_64.whl", hash = "sha256:a8785791c2120af114ea7a06137f7778632e568a5aa2bbfc3b46c573b702af74"},
-    {file = "coverage-7.0.0-cp37-cp37m-win32.whl", hash = "sha256:30220518dd89c4878908d73f5f3d1269f86e9e045354436534587a18c7b9da85"},
-    {file = "coverage-7.0.0-cp37-cp37m-win_amd64.whl", hash = "sha256:bc904aa96105d73357de03de76336b1e3db28e2b12067d36625fd9646ab043fd"},
-    {file = "coverage-7.0.0-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:2331b7bd84a1be79bd17ca8e103ce38db8cbf7cb354dc56e651ba489cf849212"},
-    {file = "coverage-7.0.0-cp38-cp38-macosx_11_0_arm64.whl", hash = "sha256:e907db8bdd0ad1253a33c20fdc5f0f6209d271114a9c6f1fcdf96617343f7ca0"},
-    {file = "coverage-7.0.0-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:3c0deee68e0dae1d6e3fe6943c76d7e66fbeb6519bd08e4e5366bcc28a8a9aca"},
-    {file = "coverage-7.0.0-cp38-cp38-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:a6fff0f08bc5ffd0d78db821971472b4adc2ee876b86f743e46d634fb8e3c22f"},
-    {file = "coverage-7.0.0-cp38-cp38-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:a290b7921c1c05787b953e5854d394e887df40696f21381cc33c4e2179bf50ac"},
-    {file = "coverage-7.0.0-cp38-cp38-musllinux_1_1_aarch64.whl", hash = "sha256:100546219af59d2ad82d4575de03a303eb27b75ea36ffbd1677371924d50bcbc"},
-    {file = "coverage-7.0.0-cp38-cp38-musllinux_1_1_i686.whl", hash = "sha256:c1ba6e63b831112b9484ff5905370d89e43d4316bac76d403031f60d61597466"},
-    {file = "coverage-7.0.0-cp38-cp38-musllinux_1_1_x86_64.whl", hash = "sha256:c685fc17d6f4f1a3833e9dac27d0b931f7ccb52be6c30d269374203c7d0204a2"},
-    {file = "coverage-7.0.0-cp38-cp38-win32.whl", hash = "sha256:8938f3a10f45019b502020ba9567b97b6ecc8c76b664b421705c5406d4f92fe8"},
-    {file = "coverage-7.0.0-cp38-cp38-win_amd64.whl", hash = "sha256:c4b63888bef2928d0eca12cbce0760cfb696acb4fe226eb55178b6a2a039328a"},
-    {file = "coverage-7.0.0-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:cda63459eb20652b22e038729a8f5063862c189a3963cb042a764b753172f75e"},
-    {file = "coverage-7.0.0-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:e06abac1a4aec1ff989131e43ca917fc7bd296f34bf0cfe86cbf74343b21566d"},
-    {file = "coverage-7.0.0-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:32b94ad926e933976627f040f96dd1d9b0ac91f8d27e868c30a28253b9b6ac2d"},
-    {file = "coverage-7.0.0-cp39-cp39-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:d6b4af31fb49a2ae8de1cd505fa66c403bfcc5066e845ac19d8904dcfc9d40da"},
-    {file = "coverage-7.0.0-cp39-cp39-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:36b62f0220459e528ad5806cc7dede71aa716e067d2cb10cb4a09686b8791fba"},
-    {file = "coverage-7.0.0-cp39-cp39-musllinux_1_1_aarch64.whl", hash = "sha256:43ec1935c6d6caab4f3bc126d20bd709c0002a175d62208ebe745be37a826a41"},
-    {file = "coverage-7.0.0-cp39-cp39-musllinux_1_1_i686.whl", hash = "sha256:8593c9baf1f0f273afa22f5b45508b76adc7b8e94e17e7d98fbe1e3cd5812af2"},
-    {file = "coverage-7.0.0-cp39-cp39-musllinux_1_1_x86_64.whl", hash = "sha256:fee283cd36c3f14422d9c1b51da24ddbb5e1eed89ad2480f6a9f115df38b5df8"},
-    {file = "coverage-7.0.0-cp39-cp39-win32.whl", hash = "sha256:97c0b001ff15b8e8882995fc07ac0a08c8baf8b13c1145f3f12e0587bbb0e335"},
-    {file = "coverage-7.0.0-cp39-cp39-win_amd64.whl", hash = "sha256:8dbf83a4611c591b5de65069b6fd4dd3889200ed270cd2f7f5ac765d3842889f"},
-    {file = "coverage-7.0.0-pp36.pp37.pp38-none-any.whl", hash = "sha256:bcaf18e46668057051a312c714a4548b81f7e8fb3454116ad97be7562d2a99e4"},
-    {file = "coverage-7.0.0.tar.gz", hash = "sha256:9a175da2a7320e18fc3ee1d147639a2b3a8f037e508c96aa2da160294eb50e17"},
-]
-distlib = [
-    {file = "distlib-0.3.6-py2.py3-none-any.whl", hash = "sha256:f35c4b692542ca110de7ef0bea44d73981caeb34ca0b9b6b2e6d7790dda8f80e"},
-    {file = "distlib-0.3.6.tar.gz", hash = "sha256:14bad2d9b04d3a36127ac97f30b12a19268f211063d8f8ee4f47108896e11b46"},
-]
-exceptiongroup = [
-    {file = "exceptiongroup-1.0.4-py3-none-any.whl", hash = "sha256:542adf9dea4055530d6e1279602fa5cb11dab2395fa650b8674eaec35fc4a828"},
-    {file = "exceptiongroup-1.0.4.tar.gz", hash = "sha256:bd14967b79cd9bdb54d97323216f8fdf533e278df937aa2a90089e7d6e06e5ec"},
-]
-execnet = [
-    {file = "execnet-1.9.0-py2.py3-none-any.whl", hash = "sha256:a295f7cc774947aac58dde7fdc85f4aa00c42adf5d8f5468fc630c1acf30a142"},
-    {file = "execnet-1.9.0.tar.gz", hash = "sha256:8f694f3ba9cc92cab508b152dcfe322153975c29bda272e2fd7f3f00f36e47c5"},
-]
-filelock = [
-    {file = "filelock-3.9.0-py3-none-any.whl", hash = "sha256:f58d535af89bb9ad5cd4df046f741f8553a418c01a7856bf0d173bbc9f6bd16d"},
-    {file = "filelock-3.9.0.tar.gz", hash = "sha256:7b319f24340b51f55a2bf7a12ac0755a9b03e718311dac567a0f4f7fabd2f5de"},
-]
-identify = [
-    {file = "identify-2.5.11-py2.py3-none-any.whl", hash = "sha256:e7db36b772b188099616aaf2accbee122949d1c6a1bac4f38196720d6f9f06db"},
-    {file = "identify-2.5.11.tar.gz", hash = "sha256:14b7076b29c99b1b0b8b08e96d448c7b877a9b07683cd8cfda2ea06af85ffa1c"},
-]
-idna = [
-    {file = "idna-3.4-py3-none-any.whl", hash = "sha256:90b77e79eaa3eba6de819a0c442c0b4ceefc341a7a2ab77d7562bf49f425c5c2"},
-    {file = "idna-3.4.tar.gz", hash = "sha256:814f528e8dead7d329833b91c5faa87d60bf71824cd12a7530b5526063d02cb4"},
-]
-iniconfig = [
-    {file = "iniconfig-1.1.1-py2.py3-none-any.whl", hash = "sha256:011e24c64b7f47f6ebd835bb12a743f2fbe9a26d4cecaa7f53bc4f35ee9da8b3"},
-    {file = "iniconfig-1.1.1.tar.gz", hash = "sha256:bc3af051d7d14b2ee5ef9969666def0cd1a000e121eaea580d4a313df4b37f32"},
-]
-isort = [
-    {file = "isort-5.11.4-py3-none-any.whl", hash = "sha256:c033fd0edb91000a7f09527fe5c75321878f98322a77ddcc81adbd83724afb7b"},
-    {file = "isort-5.11.4.tar.gz", hash = "sha256:6db30c5ded9815d813932c04c2f85a360bcdd35fed496f4d8f35495ef0a261b6"},
-]
-jinja2 = [
-    {file = "Jinja2-3.1.2-py3-none-any.whl", hash = "sha256:6088930bfe239f0e6710546ab9c19c9ef35e29792895fed6e6e31a023a182a61"},
-    {file = "Jinja2-3.1.2.tar.gz", hash = "sha256:31351a702a408a9e7595a8fc6150fc3f43bb6bf7e319770cbc0db9df9437e852"},
-]
-jinja2-time = [
-    {file = "jinja2-time-0.2.0.tar.gz", hash = "sha256:d14eaa4d315e7688daa4969f616f226614350c48730bfa1692d2caebd8c90d40"},
-    {file = "jinja2_time-0.2.0-py2.py3-none-any.whl", hash = "sha256:d3eab6605e3ec8b7a0863df09cc1d23714908fa61aa6986a845c20ba488b4efa"},
-]
-markupsafe = [
-    {file = "MarkupSafe-2.1.1-cp310-cp310-macosx_10_9_universal2.whl", hash = "sha256:86b1f75c4e7c2ac2ccdaec2b9022845dbb81880ca318bb7a0a01fbf7813e3812"},
-    {file = "MarkupSafe-2.1.1-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:f121a1420d4e173a5d96e47e9a0c0dcff965afdf1626d28de1460815f7c4ee7a"},
-    {file = "MarkupSafe-2.1.1-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:a49907dd8420c5685cfa064a1335b6754b74541bbb3706c259c02ed65b644b3e"},
-    {file = "MarkupSafe-2.1.1-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:10c1bfff05d95783da83491be968e8fe789263689c02724e0c691933c52994f5"},
-    {file = "MarkupSafe-2.1.1-cp310-cp310-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:b7bd98b796e2b6553da7225aeb61f447f80a1ca64f41d83612e6139ca5213aa4"},
-    {file = "MarkupSafe-2.1.1-cp310-cp310-musllinux_1_1_aarch64.whl", hash = "sha256:b09bf97215625a311f669476f44b8b318b075847b49316d3e28c08e41a7a573f"},
-    {file = "MarkupSafe-2.1.1-cp310-cp310-musllinux_1_1_i686.whl", hash = "sha256:694deca8d702d5db21ec83983ce0bb4b26a578e71fbdbd4fdcd387daa90e4d5e"},
-    {file = "MarkupSafe-2.1.1-cp310-cp310-musllinux_1_1_x86_64.whl", hash = "sha256:efc1913fd2ca4f334418481c7e595c00aad186563bbc1ec76067848c7ca0a933"},
-    {file = "MarkupSafe-2.1.1-cp310-cp310-win32.whl", hash = "sha256:4a33dea2b688b3190ee12bd7cfa29d39c9ed176bda40bfa11099a3ce5d3a7ac6"},
-    {file = "MarkupSafe-2.1.1-cp310-cp310-win_amd64.whl", hash = "sha256:dda30ba7e87fbbb7eab1ec9f58678558fd9a6b8b853530e176eabd064da81417"},
-    {file = "MarkupSafe-2.1.1-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:671cd1187ed5e62818414afe79ed29da836dde67166a9fac6d435873c44fdd02"},
-    {file = "MarkupSafe-2.1.1-cp37-cp37m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:3799351e2336dc91ea70b034983ee71cf2f9533cdff7c14c90ea126bfd95d65a"},
-    {file = "MarkupSafe-2.1.1-cp37-cp37m-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:e72591e9ecd94d7feb70c1cbd7be7b3ebea3f548870aa91e2732960fa4d57a37"},
-    {file = "MarkupSafe-2.1.1-cp37-cp37m-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:6fbf47b5d3728c6aea2abb0589b5d30459e369baa772e0f37a0320185e87c980"},
-    {file = "MarkupSafe-2.1.1-cp37-cp37m-musllinux_1_1_aarch64.whl", hash = "sha256:d5ee4f386140395a2c818d149221149c54849dfcfcb9f1debfe07a8b8bd63f9a"},
-    {file = "MarkupSafe-2.1.1-cp37-cp37m-musllinux_1_1_i686.whl", hash = "sha256:bcb3ed405ed3222f9904899563d6fc492ff75cce56cba05e32eff40e6acbeaa3"},
-    {file = "MarkupSafe-2.1.1-cp37-cp37m-musllinux_1_1_x86_64.whl", hash = "sha256:e1c0b87e09fa55a220f058d1d49d3fb8df88fbfab58558f1198e08c1e1de842a"},
-    {file = "MarkupSafe-2.1.1-cp37-cp37m-win32.whl", hash = "sha256:8dc1c72a69aa7e082593c4a203dcf94ddb74bb5c8a731e4e1eb68d031e8498ff"},
-    {file = "MarkupSafe-2.1.1-cp37-cp37m-win_amd64.whl", hash = "sha256:97a68e6ada378df82bc9f16b800ab77cbf4b2fada0081794318520138c088e4a"},
-    {file = "MarkupSafe-2.1.1-cp38-cp38-macosx_10_9_universal2.whl", hash = "sha256:e8c843bbcda3a2f1e3c2ab25913c80a3c5376cd00c6e8c4a86a89a28c8dc5452"},
-    {file = "MarkupSafe-2.1.1-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:0212a68688482dc52b2d45013df70d169f542b7394fc744c02a57374a4207003"},
-    {file = "MarkupSafe-2.1.1-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:8e576a51ad59e4bfaac456023a78f6b5e6e7651dcd383bcc3e18d06f9b55d6d1"},
-    {file = "MarkupSafe-2.1.1-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:4b9fe39a2ccc108a4accc2676e77da025ce383c108593d65cc909add5c3bd601"},
-    {file = "MarkupSafe-2.1.1-cp38-cp38-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:96e37a3dc86e80bf81758c152fe66dbf60ed5eca3d26305edf01892257049925"},
-    {file = "MarkupSafe-2.1.1-cp38-cp38-musllinux_1_1_aarch64.whl", hash = "sha256:6d0072fea50feec76a4c418096652f2c3238eaa014b2f94aeb1d56a66b41403f"},
-    {file = "MarkupSafe-2.1.1-cp38-cp38-musllinux_1_1_i686.whl", hash = "sha256:089cf3dbf0cd6c100f02945abeb18484bd1ee57a079aefd52cffd17fba910b88"},
-    {file = "MarkupSafe-2.1.1-cp38-cp38-musllinux_1_1_x86_64.whl", hash = "sha256:6a074d34ee7a5ce3effbc526b7083ec9731bb3cbf921bbe1d3005d4d2bdb3a63"},
-    {file = "MarkupSafe-2.1.1-cp38-cp38-win32.whl", hash = "sha256:421be9fbf0ffe9ffd7a378aafebbf6f4602d564d34be190fc19a193232fd12b1"},
-    {file = "MarkupSafe-2.1.1-cp38-cp38-win_amd64.whl", hash = "sha256:fc7b548b17d238737688817ab67deebb30e8073c95749d55538ed473130ec0c7"},
-    {file = "MarkupSafe-2.1.1-cp39-cp39-macosx_10_9_universal2.whl", hash = "sha256:e04e26803c9c3851c931eac40c695602c6295b8d432cbe78609649ad9bd2da8a"},
-    {file = "MarkupSafe-2.1.1-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:b87db4360013327109564f0e591bd2a3b318547bcef31b468a92ee504d07ae4f"},
-    {file = "MarkupSafe-2.1.1-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:99a2a507ed3ac881b975a2976d59f38c19386d128e7a9a18b7df6fff1fd4c1d6"},
-    {file = "MarkupSafe-2.1.1-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:56442863ed2b06d19c37f94d999035e15ee982988920e12a5b4ba29b62ad1f77"},
-    {file = "MarkupSafe-2.1.1-cp39-cp39-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:3ce11ee3f23f79dbd06fb3d63e2f6af7b12db1d46932fe7bd8afa259a5996603"},
-    {file = "MarkupSafe-2.1.1-cp39-cp39-musllinux_1_1_aarch64.whl", hash = "sha256:33b74d289bd2f5e527beadcaa3f401e0df0a89927c1559c8566c066fa4248ab7"},
-    {file = "MarkupSafe-2.1.1-cp39-cp39-musllinux_1_1_i686.whl", hash = "sha256:43093fb83d8343aac0b1baa75516da6092f58f41200907ef92448ecab8825135"},
-    {file = "MarkupSafe-2.1.1-cp39-cp39-musllinux_1_1_x86_64.whl", hash = "sha256:8e3dcf21f367459434c18e71b2a9532d96547aef8a871872a5bd69a715c15f96"},
-    {file = "MarkupSafe-2.1.1-cp39-cp39-win32.whl", hash = "sha256:d4306c36ca495956b6d568d276ac11fdd9c30a36f1b6eb928070dc5360b22e1c"},
-    {file = "MarkupSafe-2.1.1-cp39-cp39-win_amd64.whl", hash = "sha256:46d00d6cfecdde84d40e572d63735ef81423ad31184100411e6e3388d405e247"},
-    {file = "MarkupSafe-2.1.1.tar.gz", hash = "sha256:7f91197cc9e48f989d12e4e6fbc46495c446636dfc81b9ccf50bb0ec74b91d4b"},
-]
-more-itertools = [
-    {file = "more-itertools-9.0.0.tar.gz", hash = "sha256:5a6257e40878ef0520b1803990e3e22303a41b5714006c32a3fd8304b26ea1ab"},
-    {file = "more_itertools-9.0.0-py3-none-any.whl", hash = "sha256:250e83d7e81d0c87ca6bd942e6aeab8cc9daa6096d12c5308f3f92fa5e5c1f41"},
-]
-mypy-extensions = [
-    {file = "mypy_extensions-0.4.3-py2.py3-none-any.whl", hash = "sha256:090fedd75945a69ae91ce1303b5824f428daf5a028d2f6ab8a299250a846f15d"},
-    {file = "mypy_extensions-0.4.3.tar.gz", hash = "sha256:2d82818f5bb3e369420cb3c4060a7970edba416647068eb4c5343488a6c604a8"},
-]
-nodeenv = [
-    {file = "nodeenv-1.7.0-py2.py3-none-any.whl", hash = "sha256:27083a7b96a25f2f5e1d8cb4b6317ee8aeda3bdd121394e5ac54e498028a042e"},
-    {file = "nodeenv-1.7.0.tar.gz", hash = "sha256:e0e7f7dfb85fc5394c6fe1e8fa98131a2473e04311a45afb6508f7cf1836fa2b"},
-]
-packaging = [
-    {file = "packaging-22.0-py3-none-any.whl", hash = "sha256:957e2148ba0e1a3b282772e791ef1d8083648bc131c8ab0c1feba110ce1146c3"},
-    {file = "packaging-22.0.tar.gz", hash = "sha256:2198ec20bd4c017b8f9717e00f0c8714076fc2fd93816750ab48e2c41de2cfd3"},
-]
-parse = [
-    {file = "parse-1.19.0.tar.gz", hash = "sha256:9ff82852bcb65d139813e2a5197627a94966245c897796760a3a2a8eb66f020b"},
-]
-pathspec = [
-    {file = "pathspec-0.10.3-py3-none-any.whl", hash = "sha256:3c95343af8b756205e2aba76e843ba9520a24dd84f68c22b9f93251507509dd6"},
-    {file = "pathspec-0.10.3.tar.gz", hash = "sha256:56200de4077d9d0791465aa9095a01d421861e405b5096955051deefd697d6f6"},
-]
-platformdirs = [
-    {file = "platformdirs-2.6.2-py3-none-any.whl", hash = "sha256:83c8f6d04389165de7c9b6f0c682439697887bca0aa2f1c87ef1826be3584490"},
-    {file = "platformdirs-2.6.2.tar.gz", hash = "sha256:e1fea1fe471b9ff8332e229df3cb7de4f53eeea4998d3b6bfff542115e998bd2"},
-]
-pluggy = [
-    {file = "pluggy-1.0.0-py2.py3-none-any.whl", hash = "sha256:74134bbf457f031a36d68416e1509f34bd5ccc019f0bcc952c7b909d06b37bd3"},
-    {file = "pluggy-1.0.0.tar.gz", hash = "sha256:4224373bacce55f955a878bf9cfa763c1e360858e330072059e10bad68531159"},
-]
-pre-commit = [
-    {file = "pre_commit-2.21.0-py2.py3-none-any.whl", hash = "sha256:e2f91727039fc39a92f58a588a25b87f936de6567eed4f0e673e0507edc75bad"},
-    {file = "pre_commit-2.21.0.tar.gz", hash = "sha256:31ef31af7e474a8d8995027fefdfcf509b5c913ff31f2015b4ec4beb26a6f658"},
-]
-pyproject-api = [
-    {file = "pyproject_api-1.2.1-py3-none-any.whl", hash = "sha256:155d5623453173b7b4e9379a3146ccef2d52335234eb2d03d6ba730e7dad179c"},
-    {file = "pyproject_api-1.2.1.tar.gz", hash = "sha256:093c047d192ceadcab7afd6b501276bf2ce44adf41cb9c313234518cddd20818"},
-]
-pytest = [
-    {file = "pytest-7.2.0-py3-none-any.whl", hash = "sha256:892f933d339f068883b6fd5a459f03d85bfcb355e4981e146d2c7616c21fef71"},
-    {file = "pytest-7.2.0.tar.gz", hash = "sha256:c4014eb40e10f11f355ad4e3c2fb2c6c6d1919c73f3b5a433de4708202cade59"},
-]
-pytest-cov = [
-    {file = "pytest-cov-4.0.0.tar.gz", hash = "sha256:996b79efde6433cdbd0088872dbc5fb3ed7fe1578b68cdbba634f14bb8dd0470"},
-    {file = "pytest_cov-4.0.0-py3-none-any.whl", hash = "sha256:2feb1b751d66a8bd934e5edfa2e961d11309dc37b73b0eabe73b5945fee20f6b"},
-]
-pytest-xdist = [
-    {file = "pytest-xdist-3.1.0.tar.gz", hash = "sha256:40fdb8f3544921c5dfcd486ac080ce22870e71d82ced6d2e78fa97c2addd480c"},
-    {file = "pytest_xdist-3.1.0-py3-none-any.whl", hash = "sha256:70a76f191d8a1d2d6be69fc440cdf85f3e4c03c08b520fd5dc5d338d6cf07d89"},
-]
-python-dateutil = [
-    {file = "python-dateutil-2.8.2.tar.gz", hash = "sha256:0123cacc1627ae19ddf3c27a5de5bd67ee4586fbdd6440d9748f8abb483d3e86"},
-    {file = "python_dateutil-2.8.2-py2.py3-none-any.whl", hash = "sha256:961d03dc3453ebbc59dbdea9e4e11c5651520a876d0f4db161e8674aae935da9"},
-]
-python-dotenv = [
-    {file = "python-dotenv-0.21.0.tar.gz", hash = "sha256:b77d08274639e3d34145dfa6c7008e66df0f04b7be7a75fd0d5292c191d79045"},
-    {file = "python_dotenv-0.21.0-py3-none-any.whl", hash = "sha256:1684eb44636dd462b66c3ee016599815514527ad99965de77f43e0944634a7e5"},
-]
-python-slugify = [
-    {file = "python-slugify-7.0.0.tar.gz", hash = "sha256:7a0f21a39fa6c1c4bf2e5984c9b9ae944483fd10b54804cb0e23a3ccd4954f0b"},
-    {file = "python_slugify-7.0.0-py2.py3-none-any.whl", hash = "sha256:003aee64f9fd955d111549f96c4b58a3f40b9319383c70fad6277a4974bbf570"},
-]
-pyyaml = [
-    {file = "PyYAML-6.0-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:d4db7c7aef085872ef65a8fd7d6d09a14ae91f691dec3e87ee5ee0539d516f53"},
-    {file = "PyYAML-6.0-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:9df7ed3b3d2e0ecfe09e14741b857df43adb5a3ddadc919a2d94fbdf78fea53c"},
-    {file = "PyYAML-6.0-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:77f396e6ef4c73fdc33a9157446466f1cff553d979bd00ecb64385760c6babdc"},
-    {file = "PyYAML-6.0-cp310-cp310-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:a80a78046a72361de73f8f395f1f1e49f956c6be882eed58505a15f3e430962b"},
-    {file = "PyYAML-6.0-cp310-cp310-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:f84fbc98b019fef2ee9a1cb3ce93e3187a6df0b2538a651bfb890254ba9f90b5"},
-    {file = "PyYAML-6.0-cp310-cp310-win32.whl", hash = "sha256:2cd5df3de48857ed0544b34e2d40e9fac445930039f3cfe4bcc592a1f836d513"},
-    {file = "PyYAML-6.0-cp310-cp310-win_amd64.whl", hash = "sha256:daf496c58a8c52083df09b80c860005194014c3698698d1a57cbcfa182142a3a"},
-    {file = "PyYAML-6.0-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:d4b0ba9512519522b118090257be113b9468d804b19d63c71dbcf4a48fa32358"},
-    {file = "PyYAML-6.0-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:81957921f441d50af23654aa6c5e5eaf9b06aba7f0a19c18a538dc7ef291c5a1"},
-    {file = "PyYAML-6.0-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:afa17f5bc4d1b10afd4466fd3a44dc0e245382deca5b3c353d8b757f9e3ecb8d"},
-    {file = "PyYAML-6.0-cp311-cp311-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:dbad0e9d368bb989f4515da330b88a057617d16b6a8245084f1b05400f24609f"},
-    {file = "PyYAML-6.0-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:432557aa2c09802be39460360ddffd48156e30721f5e8d917f01d31694216782"},
-    {file = "PyYAML-6.0-cp311-cp311-win32.whl", hash = "sha256:bfaef573a63ba8923503d27530362590ff4f576c626d86a9fed95822a8255fd7"},
-    {file = "PyYAML-6.0-cp311-cp311-win_amd64.whl", hash = "sha256:01b45c0191e6d66c470b6cf1b9531a771a83c1c4208272ead47a3ae4f2f603bf"},
-    {file = "PyYAML-6.0-cp36-cp36m-macosx_10_9_x86_64.whl", hash = "sha256:897b80890765f037df3403d22bab41627ca8811ae55e9a722fd0392850ec4d86"},
-    {file = "PyYAML-6.0-cp36-cp36m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:50602afada6d6cbfad699b0c7bb50d5ccffa7e46a3d738092afddc1f9758427f"},
-    {file = "PyYAML-6.0-cp36-cp36m-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:48c346915c114f5fdb3ead70312bd042a953a8ce5c7106d5bfb1a5254e47da92"},
-    {file = "PyYAML-6.0-cp36-cp36m-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:98c4d36e99714e55cfbaaee6dd5badbc9a1ec339ebfc3b1f52e293aee6bb71a4"},
-    {file = "PyYAML-6.0-cp36-cp36m-win32.whl", hash = "sha256:0283c35a6a9fbf047493e3a0ce8d79ef5030852c51e9d911a27badfde0605293"},
-    {file = "PyYAML-6.0-cp36-cp36m-win_amd64.whl", hash = "sha256:07751360502caac1c067a8132d150cf3d61339af5691fe9e87803040dbc5db57"},
-    {file = "PyYAML-6.0-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:819b3830a1543db06c4d4b865e70ded25be52a2e0631ccd2f6a47a2822f2fd7c"},
-    {file = "PyYAML-6.0-cp37-cp37m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:473f9edb243cb1935ab5a084eb238d842fb8f404ed2193a915d1784b5a6b5fc0"},
-    {file = "PyYAML-6.0-cp37-cp37m-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:0ce82d761c532fe4ec3f87fc45688bdd3a4c1dc5e0b4a19814b9009a29baefd4"},
-    {file = "PyYAML-6.0-cp37-cp37m-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:231710d57adfd809ef5d34183b8ed1eeae3f76459c18fb4a0b373ad56bedcdd9"},
-    {file = "PyYAML-6.0-cp37-cp37m-win32.whl", hash = "sha256:c5687b8d43cf58545ade1fe3e055f70eac7a5a1a0bf42824308d868289a95737"},
-    {file = "PyYAML-6.0-cp37-cp37m-win_amd64.whl", hash = "sha256:d15a181d1ecd0d4270dc32edb46f7cb7733c7c508857278d3d378d14d606db2d"},
-    {file = "PyYAML-6.0-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:0b4624f379dab24d3725ffde76559cff63d9ec94e1736b556dacdfebe5ab6d4b"},
-    {file = "PyYAML-6.0-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:213c60cd50106436cc818accf5baa1aba61c0189ff610f64f4a3e8c6726218ba"},
-    {file = "PyYAML-6.0-cp38-cp38-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:9fa600030013c4de8165339db93d182b9431076eb98eb40ee068700c9c813e34"},
-    {file = "PyYAML-6.0-cp38-cp38-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:277a0ef2981ca40581a47093e9e2d13b3f1fbbeffae064c1d21bfceba2030287"},
-    {file = "PyYAML-6.0-cp38-cp38-win32.whl", hash = "sha256:d4eccecf9adf6fbcc6861a38015c2a64f38b9d94838ac1810a9023a0609e1b78"},
-    {file = "PyYAML-6.0-cp38-cp38-win_amd64.whl", hash = "sha256:1e4747bc279b4f613a09eb64bba2ba602d8a6664c6ce6396a4d0cd413a50ce07"},
-    {file = "PyYAML-6.0-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:055d937d65826939cb044fc8c9b08889e8c743fdc6a32b33e2390f66013e449b"},
-    {file = "PyYAML-6.0-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:e61ceaab6f49fb8bdfaa0f92c4b57bcfbea54c09277b1b4f7ac376bfb7a7c174"},
-    {file = "PyYAML-6.0-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:d67d839ede4ed1b28a4e8909735fc992a923cdb84e618544973d7dfc71540803"},
-    {file = "PyYAML-6.0-cp39-cp39-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:cba8c411ef271aa037d7357a2bc8f9ee8b58b9965831d9e51baf703280dc73d3"},
-    {file = "PyYAML-6.0-cp39-cp39-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:40527857252b61eacd1d9af500c3337ba8deb8fc298940291486c465c8b46ec0"},
-    {file = "PyYAML-6.0-cp39-cp39-win32.whl", hash = "sha256:b5b9eccad747aabaaffbc6064800670f0c297e52c12754eb1d976c57e4f74dcb"},
-    {file = "PyYAML-6.0-cp39-cp39-win_amd64.whl", hash = "sha256:b3d267842bf12586ba6c734f89d1f5b871df0273157918b0ccefa29deb05c21c"},
-    {file = "PyYAML-6.0.tar.gz", hash = "sha256:68fb519c14306fec9720a2a5b45bc9f0c8d1b9c72adf45c37baedfcd949c35a2"},
-]
-requests = [
-    {file = "requests-2.28.1-py3-none-any.whl", hash = "sha256:8fefa2a1a1365bf5520aac41836fbee479da67864514bdb821f31ce07ce65349"},
-    {file = "requests-2.28.1.tar.gz", hash = "sha256:7c5599b102feddaa661c826c56ab4fee28bfd17f5abca1ebbe3e7f19d7c97983"},
-]
-setuptools = [
-    {file = "setuptools-65.6.3-py3-none-any.whl", hash = "sha256:57f6f22bde4e042978bcd50176fdb381d7c21a9efa4041202288d3737a0c6a54"},
-    {file = "setuptools-65.6.3.tar.gz", hash = "sha256:a7620757bf984b58deaf32fc8a4577a9bbc0850cf92c20e1ce41c38c19e5fb75"},
-]
-six = [
-    {file = "six-1.16.0-py2.py3-none-any.whl", hash = "sha256:8abb2f1d86890a2dfb989f9a77cfcfd3e47c2a354b01111771326f8aa26e0254"},
-    {file = "six-1.16.0.tar.gz", hash = "sha256:1e61c37477a1626458e36f7b1d82aa5c9b094fa4802892072e49de9c60c4c926"},
-]
-soupsieve = [
-    {file = "soupsieve-2.3.2.post1-py3-none-any.whl", hash = "sha256:3b2503d3c7084a42b1ebd08116e5f81aadfaea95863628c80a3b774a11b7c759"},
-    {file = "soupsieve-2.3.2.post1.tar.gz", hash = "sha256:fc53893b3da2c33de295667a0e19f078c14bf86544af307354de5fcf12a3f30d"},
-]
-text-unidecode = [
-    {file = "text-unidecode-1.3.tar.gz", hash = "sha256:bad6603bb14d279193107714b288be206cac565dfa49aa5b105294dd5c4aab93"},
-    {file = "text_unidecode-1.3-py2.py3-none-any.whl", hash = "sha256:1311f10e8b895935241623731c2ba64f4c455287888b18189350b67134a822e8"},
-]
-tomli = [
-    {file = "tomli-2.0.1-py3-none-any.whl", hash = "sha256:939de3e7a6161af0c887ef91b7d41a53e7c5a1ca976325f429cb46ea9bc30ecc"},
-    {file = "tomli-2.0.1.tar.gz", hash = "sha256:de526c12914f0c550d15924c62d72abc48d6fe7364aa87328337a31007fe8a4f"},
-]
-tox = [
-    {file = "tox-4.2.4-py3-none-any.whl", hash = "sha256:f51407aaff87f6f5361ae2733cffd371940ed001792b60ea50d955c266b3b22b"},
-    {file = "tox-4.2.4.tar.gz", hash = "sha256:05b1cbf94e02eff40818860b352b4a452d7369558f3bb05809043c6b4c36e5f4"},
-]
-tqdm = [
-    {file = "tqdm-4.64.1-py2.py3-none-any.whl", hash = "sha256:6fee160d6ffcd1b1c68c65f14c829c22832bc401726335ce92c52d395944a6a1"},
-    {file = "tqdm-4.64.1.tar.gz", hash = "sha256:5f4f682a004951c1b450bc753c710e9280c5746ce6ffedee253ddbcbf54cf1e4"},
-]
-urllib3 = [
-    {file = "urllib3-1.26.13-py2.py3-none-any.whl", hash = "sha256:47cc05d99aaa09c9e72ed5809b60e7ba354e64b59c9c173ac3018642d8bb41fc"},
-    {file = "urllib3-1.26.13.tar.gz", hash = "sha256:c083dd0dce68dbfbe1129d5271cb90f9447dea7d52097c6e0126120c521ddea8"},
-]
-virtualenv = [
-    {file = "virtualenv-20.17.1-py3-none-any.whl", hash = "sha256:ce3b1684d6e1a20a3e5ed36795a97dfc6af29bc3970ca8dab93e11ac6094b3c4"},
-    {file = "virtualenv-20.17.1.tar.gz", hash = "sha256:f8b927684efc6f1cc206c9db297a570ab9ad0e51c16fa9e45487d36d1905c058"},
-]
+lock-version = "2.0"
+python-versions = "^3.11"
+content-hash = "637dae1a2c725fad481c1d1aa64f01f523fd01db728f635be807238e6da04aad"
diff --git a/pyproject.toml b/pyproject.toml
index dbf42d5e..d427bc63 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -6,23 +6,23 @@ authors = ["Roel Adriaans <roel@adriaans.org>"]
 license = "MIT"
 
 [tool.poetry.dependencies]
-python = "^3.10"
+python = "^3.11"
 anytree = "^2.8.0"
 click = "^8.1.3"
 requests = "^2.28.1"
 beautifulsoup4 = "^4.11.1"
-tqdm = "^4.64.0"
+tqdm = "^4.64.1"
 parse = "^1.19.0"
 more-itertools = "^9.0.0"
 
 [tool.poetry.dev-dependencies]
-black = "^22.10"
+black = "^22.12.0"
 cookiecutter = "^2.1.1"
 pytest = "^7.2.0"
 pytest-cov = "^4.0.0"
-pytest-xdist = "^3.0.2"
+pytest-xdist = "^3.1.0"
 python-dotenv = "^0.21.0"
-tox = "^4.2.4"
+tox = "^4.2.5"
 pre-commit = "^2.21.0"
 isort = "^5.11.4"
 

From e82aff9f92b5e99adb8a8a5ede7cad99105b402d Mon Sep 17 00:00:00 2001
From: Roel Adriaans <roel.adriaans@ordina.nl>
Date: Sat, 7 Jan 2023 21:58:18 +0100
Subject: [PATCH 257/371] Day 15, part one

---
 .../solutions/data/day_15/day15.txt           | 33 +++++++++
 .../solutions/data/day_15/day15_test.txt      | 14 ++++
 src/adventofcode2022/solutions/day15.py       | 69 +++++++++++++++++++
 tests/solutions/test_day15_a.py               | 14 ++++
 tests/solutions/test_day15_b.py               | 19 +++++
 5 files changed, 149 insertions(+)
 create mode 100644 src/adventofcode2022/solutions/data/day_15/day15.txt
 create mode 100644 src/adventofcode2022/solutions/data/day_15/day15_test.txt
 create mode 100644 src/adventofcode2022/solutions/day15.py
 create mode 100644 tests/solutions/test_day15_a.py
 create mode 100644 tests/solutions/test_day15_b.py

diff --git a/src/adventofcode2022/solutions/data/day_15/day15.txt b/src/adventofcode2022/solutions/data/day_15/day15.txt
new file mode 100644
index 00000000..e6a6df58
--- /dev/null
+++ b/src/adventofcode2022/solutions/data/day_15/day15.txt
@@ -0,0 +1,33 @@
+Sensor at x=2302110, y=2237242: closest beacon is at x=2348729, y=1239977
+Sensor at x=47903, y=2473047: closest beacon is at x=-432198, y=2000000
+Sensor at x=2363579, y=1547888: closest beacon is at x=2348729, y=1239977
+Sensor at x=3619841, y=520506: closest beacon is at x=2348729, y=1239977
+Sensor at x=3941908, y=3526118: closest beacon is at x=3772294, y=3485243
+Sensor at x=3206, y=1564595: closest beacon is at x=-432198, y=2000000
+Sensor at x=3123411, y=3392077: closest beacon is at x=2977835, y=3592946
+Sensor at x=3279053, y=3984688: closest beacon is at x=2977835, y=3592946
+Sensor at x=2968162, y=3938490: closest beacon is at x=2977835, y=3592946
+Sensor at x=1772120, y=2862246: closest beacon is at x=2017966, y=3158243
+Sensor at x=3283241, y=2619168: closest beacon is at x=3172577, y=2521434
+Sensor at x=2471642, y=3890150: closest beacon is at x=2977835, y=3592946
+Sensor at x=3163348, y=3743489: closest beacon is at x=2977835, y=3592946
+Sensor at x=2933313, y=2919047: closest beacon is at x=3172577, y=2521434
+Sensor at x=2780640, y=3629927: closest beacon is at x=2977835, y=3592946
+Sensor at x=3986978, y=2079918: closest beacon is at x=3998497, y=2812428
+Sensor at x=315464, y=370694: closest beacon is at x=-550536, y=260566
+Sensor at x=3957316, y=3968366: closest beacon is at x=3772294, y=3485243
+Sensor at x=2118533, y=1074658: closest beacon is at x=2348729, y=1239977
+Sensor at x=3494855, y=3378533: closest beacon is at x=3772294, y=3485243
+Sensor at x=2575727, y=210553: closest beacon is at x=2348729, y=1239977
+Sensor at x=3999990, y=2813525: closest beacon is at x=3998497, y=2812428
+Sensor at x=3658837, y=3026912: closest beacon is at x=3998497, y=2812428
+Sensor at x=1551619, y=1701155: closest beacon is at x=2348729, y=1239977
+Sensor at x=2625855, y=3330422: closest beacon is at x=2977835, y=3592946
+Sensor at x=3476946, y=2445098: closest beacon is at x=3172577, y=2521434
+Sensor at x=2915568, y=1714113: closest beacon is at x=2348729, y=1239977
+Sensor at x=729668, y=3723377: closest beacon is at x=-997494, y=3617758
+Sensor at x=3631681, y=3801747: closest beacon is at x=3772294, y=3485243
+Sensor at x=2270816, y=3197807: closest beacon is at x=2017966, y=3158243
+Sensor at x=3999999, y=2810929: closest beacon is at x=3998497, y=2812428
+Sensor at x=3978805, y=3296024: closest beacon is at x=3772294, y=3485243
+Sensor at x=1054910, y=811769: closest beacon is at x=2348729, y=1239977
diff --git a/src/adventofcode2022/solutions/data/day_15/day15_test.txt b/src/adventofcode2022/solutions/data/day_15/day15_test.txt
new file mode 100644
index 00000000..a6124240
--- /dev/null
+++ b/src/adventofcode2022/solutions/data/day_15/day15_test.txt
@@ -0,0 +1,14 @@
+Sensor at x=2, y=18: closest beacon is at x=-2, y=15
+Sensor at x=9, y=16: closest beacon is at x=10, y=16
+Sensor at x=13, y=2: closest beacon is at x=15, y=3
+Sensor at x=12, y=14: closest beacon is at x=10, y=16
+Sensor at x=10, y=20: closest beacon is at x=10, y=16
+Sensor at x=14, y=17: closest beacon is at x=10, y=16
+Sensor at x=8, y=7: closest beacon is at x=2, y=10
+Sensor at x=2, y=0: closest beacon is at x=2, y=10
+Sensor at x=0, y=11: closest beacon is at x=2, y=10
+Sensor at x=20, y=14: closest beacon is at x=25, y=17
+Sensor at x=17, y=20: closest beacon is at x=21, y=22
+Sensor at x=16, y=7: closest beacon is at x=15, y=3
+Sensor at x=14, y=3: closest beacon is at x=15, y=3
+Sensor at x=20, y=1: closest beacon is at x=15, y=3
diff --git a/src/adventofcode2022/solutions/day15.py b/src/adventofcode2022/solutions/day15.py
new file mode 100644
index 00000000..e54d38f0
--- /dev/null
+++ b/src/adventofcode2022/solutions/day15.py
@@ -0,0 +1,69 @@
+from parse import parse
+
+from adventofcode2022.utils.abstract import FileReaderSolution
+from adventofcode2022.utils.point import XYPoint as Point
+
+
+class Day15:
+    sensors: list[Point]
+    beacons: list[Point]
+    distance: list[int]
+
+    def parse(self, input_lines: list[str]):
+        """Parse line:
+        Sensor at x=2, y=0: closest beacon is at x=2, y=10
+        """
+        self.sensors = []
+        self.beacons = []
+        self.distance = []
+        for line in input_lines:
+            p = parse(
+                "Sensor at x={sx:d}, y={sy:d}: closest beacon is at x={bx:d}, y={by:d}",
+                line,
+            )
+            sensor = Point(p["sx"], p["sy"])
+            beacon = Point(p["bx"], p["by"])
+            distance = abs(sensor.distance(beacon))
+            self.sensors.append(sensor)
+            self.beacons.append(beacon)
+            self.distance.append(distance)
+
+
+class Day15PartA(Day15, FileReaderSolution):
+    def find_positions(self, row) -> int:
+        invalid_points = set()
+        # Exclude the beacons on this lines
+        beacons_on_row = set()
+
+        for sensor, beacon, distance in zip(self.sensors, self.beacons, self.distance):
+            if beacon.y == row:
+                # We do not calculate the beacons.
+                beacons_on_row.add(beacon)
+
+            # Calculate the distande between the sensor and the row we are measuring
+            if sensor.y > row:
+                remainder = distance - (sensor.y - row)
+            else:
+                remainder = distance - (row - sensor.y)
+
+            # Skip sensors too far away
+            if remainder < 0:
+                continue
+
+            for i in range(remainder + 1):
+                invalid_points.add(sensor.x + i)
+                invalid_points.add(sensor.x - i)
+
+        return len(invalid_points) - len(beacons_on_row)
+
+    def execute(self, input_data, row=2000000) -> int:
+        self.parse(input_data.splitlines())
+        return self.find_positions(row)
+
+    def solve(self, input_data: str) -> int:
+        return self.execute(input_data, row=2000000)
+
+
+class Day15PartB(Day15, FileReaderSolution):
+    def solve(self, input_data: str) -> int:
+        raise NotImplementedError
diff --git a/tests/solutions/test_day15_a.py b/tests/solutions/test_day15_a.py
new file mode 100644
index 00000000..29636e73
--- /dev/null
+++ b/tests/solutions/test_day15_a.py
@@ -0,0 +1,14 @@
+from adventofcode2022.solutions.day15 import Day15PartA
+
+
+class TestDay15PartA:
+    def test_day15a_solve(self, testdata):
+        solution = Day15PartA()
+        result = solution.execute(testdata, 10)
+        assert result == 26
+
+    def test_day15a_data(self):
+        """Result we got when we did the real solution"""
+        solution = Day15PartA()
+        res = solution("day_15/day15.txt")
+        assert res == 0
diff --git a/tests/solutions/test_day15_b.py b/tests/solutions/test_day15_b.py
new file mode 100644
index 00000000..b69c1eac
--- /dev/null
+++ b/tests/solutions/test_day15_b.py
@@ -0,0 +1,19 @@
+import pytest
+
+from adventofcode2022.solutions.day15 import Day15PartB
+
+
+class TestDay15PartB:
+    @pytest.mark.xfail(reason="Not yet implemented", raises=NotImplementedError)
+    @pytest.mark.parametrize(("input_data", "expected_result"), [("", ""), ("", "")])
+    def test_day15b_solve(self, input_data, expected_result):
+        solution = Day15PartB()
+        result = solution.solve(input_data)
+        assert result == expected_result
+
+    @pytest.mark.xfail(reason="Not yet implemented", raises=NotImplementedError)
+    def test_day15b_data(self):
+        """Result we got when we did the real solution"""
+        solution = Day15PartB()
+        res = solution("day_15/day15.txt")
+        assert res == 0

From 1ea74db7ee3a3461615c1912b1e79273d3025648 Mon Sep 17 00:00:00 2001
From: Roel Adriaans <roel.adriaans@ordina.nl>
Date: Sat, 7 Jan 2023 21:58:49 +0100
Subject: [PATCH 258/371] Add solution

---
 tests/solutions/test_day15_a.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/solutions/test_day15_a.py b/tests/solutions/test_day15_a.py
index 29636e73..3787e995 100644
--- a/tests/solutions/test_day15_a.py
+++ b/tests/solutions/test_day15_a.py
@@ -11,4 +11,4 @@ def test_day15a_data(self):
         """Result we got when we did the real solution"""
         solution = Day15PartA()
         res = solution("day_15/day15.txt")
-        assert res == 0
+        assert res == 5083287

From 0210bc1b986d20293d57a6d71bb66aefd82ab41e Mon Sep 17 00:00:00 2001
From: Roel Adriaans <roel.adriaans@ordina.nl>
Date: Sat, 7 Jan 2023 23:28:32 +0100
Subject: [PATCH 259/371] Part 2

---
 src/adventofcode2022/solutions/day15.py | 10 +++++++++-
 tests/solutions/test_day15_b.py         |  8 +++-----
 2 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/src/adventofcode2022/solutions/day15.py b/src/adventofcode2022/solutions/day15.py
index e54d38f0..3eef2a4a 100644
--- a/src/adventofcode2022/solutions/day15.py
+++ b/src/adventofcode2022/solutions/day15.py
@@ -65,5 +65,13 @@ def solve(self, input_data: str) -> int:
 
 
 class Day15PartB(Day15, FileReaderSolution):
+    def find_frequency(self, factor: int) -> int:
+        """Find the tuning frequency"""
+        return -1
+
+    def execute(self, input_data: str, factor: int) -> int:
+        self.parse(input_data.splitlines())
+        return self.find_frequency(factor)
+
     def solve(self, input_data: str) -> int:
-        raise NotImplementedError
+        return self.execute(input_data, factor=4000000)
diff --git a/tests/solutions/test_day15_b.py b/tests/solutions/test_day15_b.py
index b69c1eac..e372771c 100644
--- a/tests/solutions/test_day15_b.py
+++ b/tests/solutions/test_day15_b.py
@@ -4,12 +4,10 @@
 
 
 class TestDay15PartB:
-    @pytest.mark.xfail(reason="Not yet implemented", raises=NotImplementedError)
-    @pytest.mark.parametrize(("input_data", "expected_result"), [("", ""), ("", "")])
-    def test_day15b_solve(self, input_data, expected_result):
+    def test_day15b_solve(self, testdata):
         solution = Day15PartB()
-        result = solution.solve(input_data)
-        assert result == expected_result
+        result = solution.execute(testdata, 20)
+        assert result == 56000011
 
     @pytest.mark.xfail(reason="Not yet implemented", raises=NotImplementedError)
     def test_day15b_data(self):

From 31d0ddf8793bf8656acb3d4ad88cbf5328d25149 Mon Sep 17 00:00:00 2001
From: Roel Adriaans <roel.adriaans@ordina.nl>
Date: Sun, 8 Jan 2023 20:48:20 +0100
Subject: [PATCH 260/371] WIP

---
 src/adventofcode2022/solutions/day15.py | 72 ++++++++++++++++++-------
 test.py                                 |  5 ++
 2 files changed, 57 insertions(+), 20 deletions(-)
 create mode 100644 test.py

diff --git a/src/adventofcode2022/solutions/day15.py b/src/adventofcode2022/solutions/day15.py
index 3eef2a4a..8edaa761 100644
--- a/src/adventofcode2022/solutions/day15.py
+++ b/src/adventofcode2022/solutions/day15.py
@@ -2,20 +2,23 @@
 
 from adventofcode2022.utils.abstract import FileReaderSolution
 from adventofcode2022.utils.point import XYPoint as Point
+from typing import NamedTuple
+
+
+class Line(NamedTuple):
+    sensor: Point
+    beacon: Point
+    distance: int
 
 
 class Day15:
-    sensors: list[Point]
-    beacons: list[Point]
-    distance: list[int]
+    lines: list[Line]
 
     def parse(self, input_lines: list[str]):
         """Parse line:
         Sensor at x=2, y=0: closest beacon is at x=2, y=10
         """
-        self.sensors = []
-        self.beacons = []
-        self.distance = []
+        self.lines = []
         for line in input_lines:
             p = parse(
                 "Sensor at x={sx:d}, y={sy:d}: closest beacon is at x={bx:d}, y={by:d}",
@@ -24,9 +27,12 @@ def parse(self, input_lines: list[str]):
             sensor = Point(p["sx"], p["sy"])
             beacon = Point(p["bx"], p["by"])
             distance = abs(sensor.distance(beacon))
-            self.sensors.append(sensor)
-            self.beacons.append(beacon)
-            self.distance.append(distance)
+            self.lines.append(Line(sensor=sensor, beacon=beacon, distance=distance))
+
+    @staticmethod
+    def remaining_on_line(line, y):
+        """Calculate the distance between the sensor and the row we are measuring"""
+        return line.distance - abs(line.sensor.y - y)
 
 
 class Day15PartA(Day15, FileReaderSolution):
@@ -35,24 +41,21 @@ def find_positions(self, row) -> int:
         # Exclude the beacons on this lines
         beacons_on_row = set()
 
-        for sensor, beacon, distance in zip(self.sensors, self.beacons, self.distance):
-            if beacon.y == row:
+        for line in self.lines:
+            if line.beacon.y == row:
                 # We do not calculate the beacons.
-                beacons_on_row.add(beacon)
+                beacons_on_row.add(line.beacon)
 
             # Calculate the distande between the sensor and the row we are measuring
-            if sensor.y > row:
-                remainder = distance - (sensor.y - row)
-            else:
-                remainder = distance - (row - sensor.y)
+            remainder = self.remaining_on_line(line, row)
 
             # Skip sensors too far away
             if remainder < 0:
                 continue
 
             for i in range(remainder + 1):
-                invalid_points.add(sensor.x + i)
-                invalid_points.add(sensor.x - i)
+                invalid_points.add(line.sensor.x + i)
+                invalid_points.add(line.sensor.x - i)
 
         return len(invalid_points) - len(beacons_on_row)
 
@@ -67,11 +70,40 @@ def solve(self, input_data: str) -> int:
 class Day15PartB(Day15, FileReaderSolution):
     def find_frequency(self, factor: int) -> int:
         """Find the tuning frequency"""
-        return -1
+        y = 0
+        while y < factor:
+            print(f"New line {y}")
+            x = 0
+            while x <= factor:
+                # print(f"new {x=}")
+                new_x = x
+                for line in self.lines:
+                    new_x = self.skip_over_line(line, x, y)
+                    # print(f"{new_x=}")
+                    if x != new_x:
+                        break
+                if new_x == x:
+                    # Return here?
+                    res = (x * factor) + y
+                    print(f"Result ?? {res=}")
+                    y = factor + 1
+                    break
+                x = new_x
+            y += 1
+        return (x * factor) + y
+
+    def skip_over_line(self, line, x, y):
+        remaining = self.remaining_on_line(line, y)
+        if x >= line.sensor.x - remaining and x <= line.sensor.x + remaining:
+            return line.sensor.x + 1
+        return x
+        # if line[0].x - remaining <= x <= line[0].x + remaining:
+        #     return line[0].x + remaining + 1
+        # return x
 
     def execute(self, input_data: str, factor: int) -> int:
         self.parse(input_data.splitlines())
         return self.find_frequency(factor)
 
     def solve(self, input_data: str) -> int:
-        return self.execute(input_data, factor=4000000)
+        return self.execute(input_data, factor=4_000_000)
diff --git a/test.py b/test.py
new file mode 100644
index 00000000..7981a171
--- /dev/null
+++ b/test.py
@@ -0,0 +1,5 @@
+for n in range(10):
+    print(n)
+    if n == 3:
+        print("Adding 1 to n")
+        n += 1

From b4f492f346a4bfb5c54a43297538ffcc567e8f9c Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sun, 8 Jan 2023 21:20:22 +0100
Subject: [PATCH 261/371] Bump tox from 4.2.0 to 4.2.4 (#115)

Bumps [tox](https://github.com/tox-dev/tox) from 4.2.0 to 4.2.4.
- [Release notes](https://github.com/tox-dev/tox/releases)
- [Changelog](https://github.com/tox-dev/tox/blob/main/docs/changelog.rst)
- [Commits](https://github.com/tox-dev/tox/compare/4.2.0...4.2.4)

---
updated-dependencies:
- dependency-name: tox
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 poetry.lock    | 8 ++++----
 pyproject.toml | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/poetry.lock b/poetry.lock
index 530ba653..0e0b4680 100644
--- a/poetry.lock
+++ b/poetry.lock
@@ -546,7 +546,7 @@ python-versions = ">=3.7"
 
 [[package]]
 name = "tox"
-version = "4.2.0"
+version = "4.2.4"
 description = "tox is a generic virtualenv management and test command line tool"
 category = "dev"
 optional = false
@@ -618,7 +618,7 @@ testing = ["coverage (>=6.2)", "coverage-enable-subprocess (>=1)", "flaky (>=3.7
 [metadata]
 lock-version = "1.1"
 python-versions = "^3.10"
-content-hash = "2727572f16a4e128dbf531e64f765a52e9fcf8e1fad03e73a60706ca622e2d3a"
+content-hash = "b75cde6334c61a9e693c7b0de526488ee824c10d1fa6f1e8c3be08eb8f640981"
 
 [metadata.files]
 anytree = [
@@ -944,8 +944,8 @@ tomli = [
     {file = "tomli-2.0.1.tar.gz", hash = "sha256:de526c12914f0c550d15924c62d72abc48d6fe7364aa87328337a31007fe8a4f"},
 ]
 tox = [
-    {file = "tox-4.2.0-py3-none-any.whl", hash = "sha256:20cafc6c2740671513bd52c0f7912c634a3428237ff70950f41e384335173a42"},
-    {file = "tox-4.2.0.tar.gz", hash = "sha256:ac1d997a73ae6a17e7dfe931ec2b5f534677535c857a7e821987083e122a4d33"},
+    {file = "tox-4.2.4-py3-none-any.whl", hash = "sha256:f51407aaff87f6f5361ae2733cffd371940ed001792b60ea50d955c266b3b22b"},
+    {file = "tox-4.2.4.tar.gz", hash = "sha256:05b1cbf94e02eff40818860b352b4a452d7369558f3bb05809043c6b4c36e5f4"},
 ]
 tqdm = [
     {file = "tqdm-4.64.1-py2.py3-none-any.whl", hash = "sha256:6fee160d6ffcd1b1c68c65f14c829c22832bc401726335ce92c52d395944a6a1"},
diff --git a/pyproject.toml b/pyproject.toml
index 0a20e0a2..edfc4b15 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -20,7 +20,7 @@ pytest = "^7.2.0"
 pytest-cov = "^4.0.0"
 pytest-xdist = "^3.1.0"
 python-dotenv = "^0.21.0"
-tox = "^4.2.0"
+tox = "^4.2.4"
 pre-commit = "^2.21.0"
 isort = "^5.11.4"
 

From 12381c2e1cb9790eddd2aa7174e3098959c0e48d Mon Sep 17 00:00:00 2001
From: Roel Adriaans <roel@adriaans.org>
Date: Sun, 8 Jan 2023 21:56:12 +0100
Subject: [PATCH 262/371] Exclude day 15, part 2, still not finished

---
 tests/solutions/test_day15_b.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/tests/solutions/test_day15_b.py b/tests/solutions/test_day15_b.py
index e372771c..97bec366 100644
--- a/tests/solutions/test_day15_b.py
+++ b/tests/solutions/test_day15_b.py
@@ -4,12 +4,13 @@
 
 
 class TestDay15PartB:
+    @pytest.mark.xfail(reason="Not the right implementation", raises=AssertionError)
     def test_day15b_solve(self, testdata):
         solution = Day15PartB()
         result = solution.execute(testdata, 20)
         assert result == 56000011
 
-    @pytest.mark.xfail(reason="Not yet implemented", raises=NotImplementedError)
+    @pytest.mark.xfail(reason="Not the right implementation", raises=AssertionError)
     def test_day15b_data(self):
         """Result we got when we did the real solution"""
         solution = Day15PartB()

From 4f2984f1250f0b0cc7591cb5ef4e766af4d45345 Mon Sep 17 00:00:00 2001
From: Roel Adriaans <roel@adriaans.org>
Date: Sun, 8 Jan 2023 21:59:40 +0100
Subject: [PATCH 263/371] By default, create empty test data files

---
 .../{{cookiecutter.file_name}}_test.txt                           | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 create mode 100644 template/{{cookiecutter.advendofcode2022}}/src/adventofcode2022/solutions/data/{{cookiecutter.directory_name}}/{{cookiecutter.file_name}}_test.txt

diff --git a/template/{{cookiecutter.advendofcode2022}}/src/adventofcode2022/solutions/data/{{cookiecutter.directory_name}}/{{cookiecutter.file_name}}_test.txt b/template/{{cookiecutter.advendofcode2022}}/src/adventofcode2022/solutions/data/{{cookiecutter.directory_name}}/{{cookiecutter.file_name}}_test.txt
new file mode 100644
index 00000000..e69de29b

From 5615dcdc8376f97ca5fab22e073c4504881d73f5 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 9 Jan 2023 04:29:34 +0000
Subject: [PATCH 264/371] Bump tox from 4.2.5 to 4.2.6

Bumps [tox](https://github.com/tox-dev/tox) from 4.2.5 to 4.2.6.
- [Release notes](https://github.com/tox-dev/tox/releases)
- [Changelog](https://github.com/tox-dev/tox/blob/main/docs/changelog.rst)
- [Commits](https://github.com/tox-dev/tox/compare/4.2.5...4.2.6)

---
updated-dependencies:
- dependency-name: tox
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 poetry.lock    | 686 ++++++++++++++++++++++++-------------------------
 pyproject.toml |   2 +-
 2 files changed, 344 insertions(+), 344 deletions(-)

diff --git a/poetry.lock b/poetry.lock
index 659a8cee..901a3eab 100644
--- a/poetry.lock
+++ b/poetry.lock
@@ -1,5 +1,3 @@
-# This file is automatically @generated by Poetry and should not be changed by hand.
-
 [[package]]
 name = "anytree"
 version = "2.8.0"
@@ -7,10 +5,6 @@ description = "Powerful and Lightweight Python Tree Data Structure.."
 category = "main"
 optional = false
 python-versions = "*"
-files = [
-    {file = "anytree-2.8.0-py2.py3-none-any.whl", hash = "sha256:14c55ac77492b11532395049a03b773d14c7e30b22aa012e337b1e983de31521"},
-    {file = "anytree-2.8.0.tar.gz", hash = "sha256:3f0f93f355a91bc3e6245319bf4c1d50e3416cc7a35cc1133c1ff38306bbccab"},
-]
 
 [package.dependencies]
 six = ">=1.9.0"
@@ -26,10 +20,6 @@ description = "Better dates & times for Python"
 category = "dev"
 optional = false
 python-versions = ">=3.6"
-files = [
-    {file = "arrow-1.2.3-py3-none-any.whl", hash = "sha256:5a49ab92e3b7b71d96cd6bfcc4df14efefc9dfa96ea19045815914a6ab6b1fe2"},
-    {file = "arrow-1.2.3.tar.gz", hash = "sha256:3934b30ca1b9f292376d9db15b19446088d12ec58629bc3f0da28fd55fb633a1"},
-]
 
 [package.dependencies]
 python-dateutil = ">=2.7.0"
@@ -41,10 +31,6 @@ description = "Classes Without Boilerplate"
 category = "dev"
 optional = false
 python-versions = ">=3.6"
-files = [
-    {file = "attrs-22.2.0-py3-none-any.whl", hash = "sha256:29e95c7f6778868dbd49170f98f8818f78f3dc5e0e37c0b1f474e3561b240836"},
-    {file = "attrs-22.2.0.tar.gz", hash = "sha256:c9227bfc2f01993c03f68db37d1d15c9690188323c067c641f1a35ca58185f99"},
-]
 
 [package.extras]
 cov = ["attrs[tests]", "coverage-enable-subprocess", "coverage[toml] (>=5.3)"]
@@ -60,10 +46,6 @@ description = "Screen-scraping library"
 category = "main"
 optional = false
 python-versions = ">=3.6.0"
-files = [
-    {file = "beautifulsoup4-4.11.1-py3-none-any.whl", hash = "sha256:58d5c3d29f5a36ffeb94f02f0d786cd53014cf9b3b3951d42e0080d8a9498d30"},
-    {file = "beautifulsoup4-4.11.1.tar.gz", hash = "sha256:ad9aa55b65ef2808eb405f46cf74df7fcb7044d5cbc26487f96eb2ef2e436693"},
-]
 
 [package.dependencies]
 soupsieve = ">1.2"
@@ -79,10 +61,6 @@ description = "Ultra-lightweight pure Python package to check if a file is binar
 category = "dev"
 optional = false
 python-versions = "*"
-files = [
-    {file = "binaryornot-0.4.4-py2.py3-none-any.whl", hash = "sha256:b8b71173c917bddcd2c16070412e369c3ed7f0528926f70cac18a6c97fd563e4"},
-    {file = "binaryornot-0.4.4.tar.gz", hash = "sha256:359501dfc9d40632edc9fac890e19542db1a287bbcfa58175b66658392018061"},
-]
 
 [package.dependencies]
 chardet = ">=3.0.2"
@@ -94,20 +72,6 @@ description = "The uncompromising code formatter."
 category = "dev"
 optional = false
 python-versions = ">=3.7"
-files = [
-    {file = "black-22.12.0-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:9eedd20838bd5d75b80c9f5487dbcb06836a43833a37846cf1d8c1cc01cef59d"},
-    {file = "black-22.12.0-cp310-cp310-win_amd64.whl", hash = "sha256:159a46a4947f73387b4d83e87ea006dbb2337eab6c879620a3ba52699b1f4351"},
-    {file = "black-22.12.0-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:d30b212bffeb1e252b31dd269dfae69dd17e06d92b87ad26e23890f3efea366f"},
-    {file = "black-22.12.0-cp311-cp311-win_amd64.whl", hash = "sha256:7412e75863aa5c5411886804678b7d083c7c28421210180d67dfd8cf1221e1f4"},
-    {file = "black-22.12.0-cp37-cp37m-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:c116eed0efb9ff870ded8b62fe9f28dd61ef6e9ddd28d83d7d264a38417dcee2"},
-    {file = "black-22.12.0-cp37-cp37m-win_amd64.whl", hash = "sha256:1f58cbe16dfe8c12b7434e50ff889fa479072096d79f0a7f25e4ab8e94cd8350"},
-    {file = "black-22.12.0-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:77d86c9f3db9b1bf6761244bc0b3572a546f5fe37917a044e02f3166d5aafa7d"},
-    {file = "black-22.12.0-cp38-cp38-win_amd64.whl", hash = "sha256:82d9fe8fee3401e02e79767016b4907820a7dc28d70d137eb397b92ef3cc5bfc"},
-    {file = "black-22.12.0-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:101c69b23df9b44247bd88e1d7e90154336ac4992502d4197bdac35dd7ee3320"},
-    {file = "black-22.12.0-cp39-cp39-win_amd64.whl", hash = "sha256:559c7a1ba9a006226f09e4916060982fd27334ae1998e7a38b3f33a37f7a2148"},
-    {file = "black-22.12.0-py3-none-any.whl", hash = "sha256:436cc9167dd28040ad90d3b404aec22cedf24a6e4d7de221bec2730ec0c97bcf"},
-    {file = "black-22.12.0.tar.gz", hash = "sha256:229351e5a18ca30f447bf724d007f890f97e13af070bb6ad4c0a441cd7596a2f"},
-]
 
 [package.dependencies]
 click = ">=8.0.0"
@@ -128,10 +92,6 @@ description = "Extensible memoizing collections and decorators"
 category = "dev"
 optional = false
 python-versions = "~=3.7"
-files = [
-    {file = "cachetools-5.2.0-py3-none-any.whl", hash = "sha256:f9f17d2aec496a9aa6b76f53e3b614c965223c061982d434d160f930c698a9db"},
-    {file = "cachetools-5.2.0.tar.gz", hash = "sha256:6a94c6402995a99c3970cc7e4884bb60b4a8639938157eeed436098bf9831757"},
-]
 
 [[package]]
 name = "certifi"
@@ -140,10 +100,6 @@ description = "Python package for providing Mozilla's CA Bundle."
 category = "main"
 optional = false
 python-versions = ">=3.6"
-files = [
-    {file = "certifi-2022.12.7-py3-none-any.whl", hash = "sha256:4ad3232f5e926d6718ec31cfc1fcadfde020920e278684144551c91769c7bc18"},
-    {file = "certifi-2022.12.7.tar.gz", hash = "sha256:35824b4c3a97115964b408844d64aa14db1cc518f6562e8d7261699d1350a9e3"},
-]
 
 [[package]]
 name = "cfgv"
@@ -152,10 +108,6 @@ description = "Validate configuration and produce human readable error messages.
 category = "dev"
 optional = false
 python-versions = ">=3.6.1"
-files = [
-    {file = "cfgv-3.3.1-py2.py3-none-any.whl", hash = "sha256:c6a0883f3917a037485059700b9e75da2464e6c27051014ad85ba6aaa5884426"},
-    {file = "cfgv-3.3.1.tar.gz", hash = "sha256:f5a830efb9ce7a445376bb66ec94c638a9787422f96264c98edc6bdeed8ab736"},
-]
 
 [[package]]
 name = "chardet"
@@ -164,10 +116,6 @@ description = "Universal encoding detector for Python 3"
 category = "dev"
 optional = false
 python-versions = ">=3.7"
-files = [
-    {file = "chardet-5.1.0-py3-none-any.whl", hash = "sha256:362777fb014af596ad31334fde1e8c327dfdb076e1960d1694662d46a6917ab9"},
-    {file = "chardet-5.1.0.tar.gz", hash = "sha256:0d62712b956bc154f85fb0a266e2a3c5913c2967e00348701b32411d6def31e5"},
-]
 
 [[package]]
 name = "charset-normalizer"
@@ -176,10 +124,6 @@ description = "The Real First Universal Charset Detector. Open, modern and activ
 category = "main"
 optional = false
 python-versions = ">=3.6.0"
-files = [
-    {file = "charset-normalizer-2.1.1.tar.gz", hash = "sha256:5a3d016c7c547f69d6f81fb0db9449ce888b418b5b9952cc5e6e66843e9dd845"},
-    {file = "charset_normalizer-2.1.1-py3-none-any.whl", hash = "sha256:83e9a75d1911279afd89352c68b45348559d1fc0506b054b346651b5e7fee29f"},
-]
 
 [package.extras]
 unicode-backport = ["unicodedata2"]
@@ -191,10 +135,6 @@ description = "Composable command line interface toolkit"
 category = "main"
 optional = false
 python-versions = ">=3.7"
-files = [
-    {file = "click-8.1.3-py3-none-any.whl", hash = "sha256:bb4d8133cb15a609f44e8213d9b391b0809795062913b383c62be0ee95b1db48"},
-    {file = "click-8.1.3.tar.gz", hash = "sha256:7682dc8afb30297001674575ea00d1814d808d6a36af415a82bd481d37ba7b8e"},
-]
 
 [package.dependencies]
 colorama = {version = "*", markers = "platform_system == \"Windows\""}
@@ -206,10 +146,6 @@ description = "Cross-platform colored terminal text."
 category = "main"
 optional = false
 python-versions = "!=3.0.*,!=3.1.*,!=3.2.*,!=3.3.*,!=3.4.*,!=3.5.*,!=3.6.*,>=2.7"
-files = [
-    {file = "colorama-0.4.6-py2.py3-none-any.whl", hash = "sha256:4f1d9991f5acc0ca119f9d443620b77f9d6b33703e51011c16baf57afb285fc6"},
-    {file = "colorama-0.4.6.tar.gz", hash = "sha256:08695f5cb7ed6e0531a20572697297273c47b8cae5a63ffc6d6ed5c201be6e44"},
-]
 
 [[package]]
 name = "cookiecutter"
@@ -218,10 +154,6 @@ description = "A command-line utility that creates projects from project templat
 category = "dev"
 optional = false
 python-versions = ">=3.7"
-files = [
-    {file = "cookiecutter-2.1.1-py2.py3-none-any.whl", hash = "sha256:9f3ab027cec4f70916e28f03470bdb41e637a3ad354b4d65c765d93aad160022"},
-    {file = "cookiecutter-2.1.1.tar.gz", hash = "sha256:f3982be8d9c53dac1261864013fdec7f83afd2e42ede6f6dd069c5e149c540d5"},
-]
 
 [package.dependencies]
 binaryornot = ">=0.4.4"
@@ -239,59 +171,6 @@ description = "Code coverage measurement for Python"
 category = "dev"
 optional = false
 python-versions = ">=3.7"
-files = [
-    {file = "coverage-7.0.3-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:2f7c51b6074a8a3063c341953dffe48fd6674f8e4b1d3c8aa8a91f58d6e716a8"},
-    {file = "coverage-7.0.3-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:628f47eaf66727fc986d3b190d6fa32f5e6b7754a243919d28bc0fd7974c449f"},
-    {file = "coverage-7.0.3-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:e89d5abf86c104de808108a25d171ad646c07eda96ca76c8b237b94b9c71e518"},
-    {file = "coverage-7.0.3-cp310-cp310-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:75e43c6f4ea4d122dac389aabdf9d4f0e160770a75e63372f88005d90f5bcc80"},
-    {file = "coverage-7.0.3-cp310-cp310-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:49da0ff241827ebb52d5d6d5a36d33b455fa5e721d44689c95df99fd8db82437"},
-    {file = "coverage-7.0.3-cp310-cp310-musllinux_1_1_aarch64.whl", hash = "sha256:0bce4ad5bdd0b02e177a085d28d2cea5fc57bb4ba2cead395e763e34cf934eb1"},
-    {file = "coverage-7.0.3-cp310-cp310-musllinux_1_1_i686.whl", hash = "sha256:f79691335257d60951638dd43576b9bcd6f52baa5c1c2cd07a509bb003238372"},
-    {file = "coverage-7.0.3-cp310-cp310-musllinux_1_1_x86_64.whl", hash = "sha256:5722269ed05fbdb94eef431787c66b66260ff3125d1a9afcc00facff8c45adf9"},
-    {file = "coverage-7.0.3-cp310-cp310-win32.whl", hash = "sha256:bdbda870e0fda7dd0fe7db7135ca226ec4c1ade8aa76e96614829b56ca491012"},
-    {file = "coverage-7.0.3-cp310-cp310-win_amd64.whl", hash = "sha256:e56fae4292e216b8deeee38ace84557b9fa85b52db005368a275427cdabb8192"},
-    {file = "coverage-7.0.3-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:b82343a5bc51627b9d606f0b6b6b9551db7b6311a5dd920fa52a94beae2e8959"},
-    {file = "coverage-7.0.3-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:fd0a8aa431f9b7ad9eb8264f55ef83cbb254962af3775092fb6e93890dea9ca2"},
-    {file = "coverage-7.0.3-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:112cfead1bd22eada8a8db9ed387bd3e8be5528debc42b5d3c1f7da4ffaf9fb5"},
-    {file = "coverage-7.0.3-cp311-cp311-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:af87e906355fa42447be5c08c5d44e6e1c005bf142f303f726ddf5ed6e0c8a4d"},
-    {file = "coverage-7.0.3-cp311-cp311-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:f30090e22a301952c5abd0e493a1c8358b4f0b368b49fa3e4568ed3ed68b8d1f"},
-    {file = "coverage-7.0.3-cp311-cp311-musllinux_1_1_aarch64.whl", hash = "sha256:ae871d09901911eedda1981ea6fd0f62a999107293cdc4c4fd612321c5b34745"},
-    {file = "coverage-7.0.3-cp311-cp311-musllinux_1_1_i686.whl", hash = "sha256:ed7c9debf7bfc63c9b9f8b595409237774ff4b061bf29fba6f53b287a2fdeab9"},
-    {file = "coverage-7.0.3-cp311-cp311-musllinux_1_1_x86_64.whl", hash = "sha256:13121fa22dcd2c7b19c5161e3fd725692448f05377b788da4502a383573227b3"},
-    {file = "coverage-7.0.3-cp311-cp311-win32.whl", hash = "sha256:037b51ee86bc600f99b3b957c20a172431c35c2ef9c1ca34bc813ab5b51fd9f5"},
-    {file = "coverage-7.0.3-cp311-cp311-win_amd64.whl", hash = "sha256:25fde928306034e8deecd5fc91a07432dcc282c8acb76749581a28963c9f4f3f"},
-    {file = "coverage-7.0.3-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:7e8b0642c38b3d3b3c01417643ccc645345b03c32a2e84ef93cdd6844d6fe530"},
-    {file = "coverage-7.0.3-cp37-cp37m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:18b09811f849cc958d23f733a350a66b54a8de3fed1e6128ba55a5c97ffb6f65"},
-    {file = "coverage-7.0.3-cp37-cp37m-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:349d0b545520e8516f7b4f12373afc705d17d901e1de6a37a20e4ec9332b61f7"},
-    {file = "coverage-7.0.3-cp37-cp37m-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:b5b38813eee5b4739f505d94247604c72eae626d5088a16dd77b08b8b1724ab3"},
-    {file = "coverage-7.0.3-cp37-cp37m-musllinux_1_1_aarch64.whl", hash = "sha256:ba9af1218fa01b1f11c72271bc7290b701d11ad4dbc2ae97c445ecacf6858dba"},
-    {file = "coverage-7.0.3-cp37-cp37m-musllinux_1_1_i686.whl", hash = "sha256:c5648c7eec5cf1ba5db1cf2d6c10036a582d7f09e172990474a122e30c841361"},
-    {file = "coverage-7.0.3-cp37-cp37m-musllinux_1_1_x86_64.whl", hash = "sha256:d0df04495b76a885bfef009f45eebe8fe2fbf815ad7a83dabcf5aced62f33162"},
-    {file = "coverage-7.0.3-cp37-cp37m-win32.whl", hash = "sha256:af6cef3796b8068713a48dd67d258dc9a6e2ebc3bd4645bfac03a09672fa5d20"},
-    {file = "coverage-7.0.3-cp37-cp37m-win_amd64.whl", hash = "sha256:62ef3800c4058844e2e3fa35faa9dd0ccde8a8aba6c763aae50342e00d4479d4"},
-    {file = "coverage-7.0.3-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:acef7f3a3825a2d218a03dd02f5f3cc7f27aa31d882dd780191d1ad101120d74"},
-    {file = "coverage-7.0.3-cp38-cp38-macosx_11_0_arm64.whl", hash = "sha256:a530663a361eb27375cec28aea5cd282089b5e4b022ae451c4c3493b026a68a5"},
-    {file = "coverage-7.0.3-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:c58cd6bb46dcb922e0d5792850aab5964433d511b3a020867650f8d930dde4f4"},
-    {file = "coverage-7.0.3-cp38-cp38-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:f918e9ef4c98f477a5458238dde2a1643aed956c7213873ab6b6b82e32b8ef61"},
-    {file = "coverage-7.0.3-cp38-cp38-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:2b865aa679bee7fbd1c55960940dbd3252621dd81468268786c67122bbd15343"},
-    {file = "coverage-7.0.3-cp38-cp38-musllinux_1_1_aarch64.whl", hash = "sha256:c5d9b480ebae60fc2cbc8d6865194136bc690538fa542ba58726433bed6e04cc"},
-    {file = "coverage-7.0.3-cp38-cp38-musllinux_1_1_i686.whl", hash = "sha256:985ad2af5ec3dbb4fd75d5b0735752c527ad183455520055a08cf8d6794cabfc"},
-    {file = "coverage-7.0.3-cp38-cp38-musllinux_1_1_x86_64.whl", hash = "sha256:ca15308ef722f120967af7474ba6a453e0f5b6f331251e20b8145497cf1bc14a"},
-    {file = "coverage-7.0.3-cp38-cp38-win32.whl", hash = "sha256:c1cee10662c25c94415bbb987f2ec0e6ba9e8fce786334b10be7e6a7ab958f69"},
-    {file = "coverage-7.0.3-cp38-cp38-win_amd64.whl", hash = "sha256:44d6a556de4418f1f3bfd57094b8c49f0408df5a433cf0d253eeb3075261c762"},
-    {file = "coverage-7.0.3-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:e6dcc70a25cb95df0ae33dfc701de9b09c37f7dd9f00394d684a5b57257f8246"},
-    {file = "coverage-7.0.3-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:bf76d79dfaea802f0f28f50153ffbc1a74ae1ee73e480baeda410b4f3e7ab25f"},
-    {file = "coverage-7.0.3-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:88834e5d56d01c141c29deedacba5773fe0bed900b1edc957595a8a6c0da1c3c"},
-    {file = "coverage-7.0.3-cp39-cp39-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:ef001a60e888f8741e42e5aa79ae55c91be73761e4df5e806efca1ddd62fd400"},
-    {file = "coverage-7.0.3-cp39-cp39-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:4959dc506be74e4963bd2c42f7b87d8e4b289891201e19ec551e64c6aa5441f8"},
-    {file = "coverage-7.0.3-cp39-cp39-musllinux_1_1_aarch64.whl", hash = "sha256:b791beb17b32ac019a78cfbe6184f992b6273fdca31145b928ad2099435e2fcb"},
-    {file = "coverage-7.0.3-cp39-cp39-musllinux_1_1_i686.whl", hash = "sha256:b07651e3b9af8f1a092861d88b4c74d913634a7f1f2280fca0ad041ad84e9e96"},
-    {file = "coverage-7.0.3-cp39-cp39-musllinux_1_1_x86_64.whl", hash = "sha256:55e46fa4168ccb7497c9be78627fcb147e06f474f846a10d55feeb5108a24ef0"},
-    {file = "coverage-7.0.3-cp39-cp39-win32.whl", hash = "sha256:e3f1cd1cd65695b1540b3cf7828d05b3515974a9d7c7530f762ac40f58a18161"},
-    {file = "coverage-7.0.3-cp39-cp39-win_amd64.whl", hash = "sha256:d8249666c23683f74f8f93aeaa8794ac87cc61c40ff70374a825f3352a4371dc"},
-    {file = "coverage-7.0.3-pp37.pp38.pp39-none-any.whl", hash = "sha256:b1ffc8f58b81baed3f8962e28c30d99442079b82ce1ec836a1f67c0accad91c1"},
-    {file = "coverage-7.0.3.tar.gz", hash = "sha256:d5be4e93acce64f516bf4fd239c0e6118fc913c93fa1a3f52d15bdcc60d97b2d"},
-]
 
 [package.extras]
 toml = ["tomli"]
@@ -303,10 +182,6 @@ description = "Distribution utilities"
 category = "dev"
 optional = false
 python-versions = "*"
-files = [
-    {file = "distlib-0.3.6-py2.py3-none-any.whl", hash = "sha256:f35c4b692542ca110de7ef0bea44d73981caeb34ca0b9b6b2e6d7790dda8f80e"},
-    {file = "distlib-0.3.6.tar.gz", hash = "sha256:14bad2d9b04d3a36127ac97f30b12a19268f211063d8f8ee4f47108896e11b46"},
-]
 
 [[package]]
 name = "execnet"
@@ -315,10 +190,6 @@ description = "execnet: rapid multi-Python deployment"
 category = "dev"
 optional = false
 python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*"
-files = [
-    {file = "execnet-1.9.0-py2.py3-none-any.whl", hash = "sha256:a295f7cc774947aac58dde7fdc85f4aa00c42adf5d8f5468fc630c1acf30a142"},
-    {file = "execnet-1.9.0.tar.gz", hash = "sha256:8f694f3ba9cc92cab508b152dcfe322153975c29bda272e2fd7f3f00f36e47c5"},
-]
 
 [package.extras]
 testing = ["pre-commit"]
@@ -330,10 +201,6 @@ description = "A platform independent file lock."
 category = "dev"
 optional = false
 python-versions = ">=3.7"
-files = [
-    {file = "filelock-3.9.0-py3-none-any.whl", hash = "sha256:f58d535af89bb9ad5cd4df046f741f8553a418c01a7856bf0d173bbc9f6bd16d"},
-    {file = "filelock-3.9.0.tar.gz", hash = "sha256:7b319f24340b51f55a2bf7a12ac0755a9b03e718311dac567a0f4f7fabd2f5de"},
-]
 
 [package.extras]
 docs = ["furo (>=2022.12.7)", "sphinx (>=5.3)", "sphinx-autodoc-typehints (>=1.19.5)"]
@@ -346,10 +213,6 @@ description = "File identification library for Python"
 category = "dev"
 optional = false
 python-versions = ">=3.7"
-files = [
-    {file = "identify-2.5.12-py2.py3-none-any.whl", hash = "sha256:e8a400c3062d980243d27ce10455a52832205649bbcaf27ffddb3dfaaf477bad"},
-    {file = "identify-2.5.12.tar.gz", hash = "sha256:0bc96b09c838310b6fcfcc61f78a981ea07f94836ef6ef553da5bb5d4745d662"},
-]
 
 [package.extras]
 license = ["ukkonen"]
@@ -361,10 +224,6 @@ description = "Internationalized Domain Names in Applications (IDNA)"
 category = "main"
 optional = false
 python-versions = ">=3.5"
-files = [
-    {file = "idna-3.4-py3-none-any.whl", hash = "sha256:90b77e79eaa3eba6de819a0c442c0b4ceefc341a7a2ab77d7562bf49f425c5c2"},
-    {file = "idna-3.4.tar.gz", hash = "sha256:814f528e8dead7d329833b91c5faa87d60bf71824cd12a7530b5526063d02cb4"},
-]
 
 [[package]]
 name = "iniconfig"
@@ -373,10 +232,6 @@ description = "iniconfig: brain-dead simple config-ini parsing"
 category = "dev"
 optional = false
 python-versions = "*"
-files = [
-    {file = "iniconfig-1.1.1-py2.py3-none-any.whl", hash = "sha256:011e24c64b7f47f6ebd835bb12a743f2fbe9a26d4cecaa7f53bc4f35ee9da8b3"},
-    {file = "iniconfig-1.1.1.tar.gz", hash = "sha256:bc3af051d7d14b2ee5ef9969666def0cd1a000e121eaea580d4a313df4b37f32"},
-]
 
 [[package]]
 name = "isort"
@@ -385,10 +240,6 @@ description = "A Python utility / library to sort Python imports."
 category = "dev"
 optional = false
 python-versions = ">=3.7.0"
-files = [
-    {file = "isort-5.11.4-py3-none-any.whl", hash = "sha256:c033fd0edb91000a7f09527fe5c75321878f98322a77ddcc81adbd83724afb7b"},
-    {file = "isort-5.11.4.tar.gz", hash = "sha256:6db30c5ded9815d813932c04c2f85a360bcdd35fed496f4d8f35495ef0a261b6"},
-]
 
 [package.extras]
 colors = ["colorama (>=0.4.3,<0.5.0)"]
@@ -403,10 +254,6 @@ description = "A very fast and expressive template engine."
 category = "dev"
 optional = false
 python-versions = ">=3.7"
-files = [
-    {file = "Jinja2-3.1.2-py3-none-any.whl", hash = "sha256:6088930bfe239f0e6710546ab9c19c9ef35e29792895fed6e6e31a023a182a61"},
-    {file = "Jinja2-3.1.2.tar.gz", hash = "sha256:31351a702a408a9e7595a8fc6150fc3f43bb6bf7e319770cbc0db9df9437e852"},
-]
 
 [package.dependencies]
 MarkupSafe = ">=2.0"
@@ -421,10 +268,6 @@ description = "Jinja2 Extension for Dates and Times"
 category = "dev"
 optional = false
 python-versions = "*"
-files = [
-    {file = "jinja2-time-0.2.0.tar.gz", hash = "sha256:d14eaa4d315e7688daa4969f616f226614350c48730bfa1692d2caebd8c90d40"},
-    {file = "jinja2_time-0.2.0-py2.py3-none-any.whl", hash = "sha256:d3eab6605e3ec8b7a0863df09cc1d23714908fa61aa6986a845c20ba488b4efa"},
-]
 
 [package.dependencies]
 arrow = "*"
@@ -437,48 +280,6 @@ description = "Safely add untrusted strings to HTML/XML markup."
 category = "dev"
 optional = false
 python-versions = ">=3.7"
-files = [
-    {file = "MarkupSafe-2.1.1-cp310-cp310-macosx_10_9_universal2.whl", hash = "sha256:86b1f75c4e7c2ac2ccdaec2b9022845dbb81880ca318bb7a0a01fbf7813e3812"},
-    {file = "MarkupSafe-2.1.1-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:f121a1420d4e173a5d96e47e9a0c0dcff965afdf1626d28de1460815f7c4ee7a"},
-    {file = "MarkupSafe-2.1.1-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:a49907dd8420c5685cfa064a1335b6754b74541bbb3706c259c02ed65b644b3e"},
-    {file = "MarkupSafe-2.1.1-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:10c1bfff05d95783da83491be968e8fe789263689c02724e0c691933c52994f5"},
-    {file = "MarkupSafe-2.1.1-cp310-cp310-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:b7bd98b796e2b6553da7225aeb61f447f80a1ca64f41d83612e6139ca5213aa4"},
-    {file = "MarkupSafe-2.1.1-cp310-cp310-musllinux_1_1_aarch64.whl", hash = "sha256:b09bf97215625a311f669476f44b8b318b075847b49316d3e28c08e41a7a573f"},
-    {file = "MarkupSafe-2.1.1-cp310-cp310-musllinux_1_1_i686.whl", hash = "sha256:694deca8d702d5db21ec83983ce0bb4b26a578e71fbdbd4fdcd387daa90e4d5e"},
-    {file = "MarkupSafe-2.1.1-cp310-cp310-musllinux_1_1_x86_64.whl", hash = "sha256:efc1913fd2ca4f334418481c7e595c00aad186563bbc1ec76067848c7ca0a933"},
-    {file = "MarkupSafe-2.1.1-cp310-cp310-win32.whl", hash = "sha256:4a33dea2b688b3190ee12bd7cfa29d39c9ed176bda40bfa11099a3ce5d3a7ac6"},
-    {file = "MarkupSafe-2.1.1-cp310-cp310-win_amd64.whl", hash = "sha256:dda30ba7e87fbbb7eab1ec9f58678558fd9a6b8b853530e176eabd064da81417"},
-    {file = "MarkupSafe-2.1.1-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:671cd1187ed5e62818414afe79ed29da836dde67166a9fac6d435873c44fdd02"},
-    {file = "MarkupSafe-2.1.1-cp37-cp37m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:3799351e2336dc91ea70b034983ee71cf2f9533cdff7c14c90ea126bfd95d65a"},
-    {file = "MarkupSafe-2.1.1-cp37-cp37m-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:e72591e9ecd94d7feb70c1cbd7be7b3ebea3f548870aa91e2732960fa4d57a37"},
-    {file = "MarkupSafe-2.1.1-cp37-cp37m-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:6fbf47b5d3728c6aea2abb0589b5d30459e369baa772e0f37a0320185e87c980"},
-    {file = "MarkupSafe-2.1.1-cp37-cp37m-musllinux_1_1_aarch64.whl", hash = "sha256:d5ee4f386140395a2c818d149221149c54849dfcfcb9f1debfe07a8b8bd63f9a"},
-    {file = "MarkupSafe-2.1.1-cp37-cp37m-musllinux_1_1_i686.whl", hash = "sha256:bcb3ed405ed3222f9904899563d6fc492ff75cce56cba05e32eff40e6acbeaa3"},
-    {file = "MarkupSafe-2.1.1-cp37-cp37m-musllinux_1_1_x86_64.whl", hash = "sha256:e1c0b87e09fa55a220f058d1d49d3fb8df88fbfab58558f1198e08c1e1de842a"},
-    {file = "MarkupSafe-2.1.1-cp37-cp37m-win32.whl", hash = "sha256:8dc1c72a69aa7e082593c4a203dcf94ddb74bb5c8a731e4e1eb68d031e8498ff"},
-    {file = "MarkupSafe-2.1.1-cp37-cp37m-win_amd64.whl", hash = "sha256:97a68e6ada378df82bc9f16b800ab77cbf4b2fada0081794318520138c088e4a"},
-    {file = "MarkupSafe-2.1.1-cp38-cp38-macosx_10_9_universal2.whl", hash = "sha256:e8c843bbcda3a2f1e3c2ab25913c80a3c5376cd00c6e8c4a86a89a28c8dc5452"},
-    {file = "MarkupSafe-2.1.1-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:0212a68688482dc52b2d45013df70d169f542b7394fc744c02a57374a4207003"},
-    {file = "MarkupSafe-2.1.1-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:8e576a51ad59e4bfaac456023a78f6b5e6e7651dcd383bcc3e18d06f9b55d6d1"},
-    {file = "MarkupSafe-2.1.1-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:4b9fe39a2ccc108a4accc2676e77da025ce383c108593d65cc909add5c3bd601"},
-    {file = "MarkupSafe-2.1.1-cp38-cp38-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:96e37a3dc86e80bf81758c152fe66dbf60ed5eca3d26305edf01892257049925"},
-    {file = "MarkupSafe-2.1.1-cp38-cp38-musllinux_1_1_aarch64.whl", hash = "sha256:6d0072fea50feec76a4c418096652f2c3238eaa014b2f94aeb1d56a66b41403f"},
-    {file = "MarkupSafe-2.1.1-cp38-cp38-musllinux_1_1_i686.whl", hash = "sha256:089cf3dbf0cd6c100f02945abeb18484bd1ee57a079aefd52cffd17fba910b88"},
-    {file = "MarkupSafe-2.1.1-cp38-cp38-musllinux_1_1_x86_64.whl", hash = "sha256:6a074d34ee7a5ce3effbc526b7083ec9731bb3cbf921bbe1d3005d4d2bdb3a63"},
-    {file = "MarkupSafe-2.1.1-cp38-cp38-win32.whl", hash = "sha256:421be9fbf0ffe9ffd7a378aafebbf6f4602d564d34be190fc19a193232fd12b1"},
-    {file = "MarkupSafe-2.1.1-cp38-cp38-win_amd64.whl", hash = "sha256:fc7b548b17d238737688817ab67deebb30e8073c95749d55538ed473130ec0c7"},
-    {file = "MarkupSafe-2.1.1-cp39-cp39-macosx_10_9_universal2.whl", hash = "sha256:e04e26803c9c3851c931eac40c695602c6295b8d432cbe78609649ad9bd2da8a"},
-    {file = "MarkupSafe-2.1.1-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:b87db4360013327109564f0e591bd2a3b318547bcef31b468a92ee504d07ae4f"},
-    {file = "MarkupSafe-2.1.1-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:99a2a507ed3ac881b975a2976d59f38c19386d128e7a9a18b7df6fff1fd4c1d6"},
-    {file = "MarkupSafe-2.1.1-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:56442863ed2b06d19c37f94d999035e15ee982988920e12a5b4ba29b62ad1f77"},
-    {file = "MarkupSafe-2.1.1-cp39-cp39-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:3ce11ee3f23f79dbd06fb3d63e2f6af7b12db1d46932fe7bd8afa259a5996603"},
-    {file = "MarkupSafe-2.1.1-cp39-cp39-musllinux_1_1_aarch64.whl", hash = "sha256:33b74d289bd2f5e527beadcaa3f401e0df0a89927c1559c8566c066fa4248ab7"},
-    {file = "MarkupSafe-2.1.1-cp39-cp39-musllinux_1_1_i686.whl", hash = "sha256:43093fb83d8343aac0b1baa75516da6092f58f41200907ef92448ecab8825135"},
-    {file = "MarkupSafe-2.1.1-cp39-cp39-musllinux_1_1_x86_64.whl", hash = "sha256:8e3dcf21f367459434c18e71b2a9532d96547aef8a871872a5bd69a715c15f96"},
-    {file = "MarkupSafe-2.1.1-cp39-cp39-win32.whl", hash = "sha256:d4306c36ca495956b6d568d276ac11fdd9c30a36f1b6eb928070dc5360b22e1c"},
-    {file = "MarkupSafe-2.1.1-cp39-cp39-win_amd64.whl", hash = "sha256:46d00d6cfecdde84d40e572d63735ef81423ad31184100411e6e3388d405e247"},
-    {file = "MarkupSafe-2.1.1.tar.gz", hash = "sha256:7f91197cc9e48f989d12e4e6fbc46495c446636dfc81b9ccf50bb0ec74b91d4b"},
-]
 
 [[package]]
 name = "more-itertools"
@@ -487,10 +288,6 @@ description = "More routines for operating on iterables, beyond itertools"
 category = "main"
 optional = false
 python-versions = ">=3.7"
-files = [
-    {file = "more-itertools-9.0.0.tar.gz", hash = "sha256:5a6257e40878ef0520b1803990e3e22303a41b5714006c32a3fd8304b26ea1ab"},
-    {file = "more_itertools-9.0.0-py3-none-any.whl", hash = "sha256:250e83d7e81d0c87ca6bd942e6aeab8cc9daa6096d12c5308f3f92fa5e5c1f41"},
-]
 
 [[package]]
 name = "mypy-extensions"
@@ -499,10 +296,6 @@ description = "Experimental type system extensions for programs checked with the
 category = "dev"
 optional = false
 python-versions = "*"
-files = [
-    {file = "mypy_extensions-0.4.3-py2.py3-none-any.whl", hash = "sha256:090fedd75945a69ae91ce1303b5824f428daf5a028d2f6ab8a299250a846f15d"},
-    {file = "mypy_extensions-0.4.3.tar.gz", hash = "sha256:2d82818f5bb3e369420cb3c4060a7970edba416647068eb4c5343488a6c604a8"},
-]
 
 [[package]]
 name = "nodeenv"
@@ -511,10 +304,6 @@ description = "Node.js virtual environment builder"
 category = "dev"
 optional = false
 python-versions = ">=2.7,!=3.0.*,!=3.1.*,!=3.2.*,!=3.3.*,!=3.4.*,!=3.5.*,!=3.6.*"
-files = [
-    {file = "nodeenv-1.7.0-py2.py3-none-any.whl", hash = "sha256:27083a7b96a25f2f5e1d8cb4b6317ee8aeda3bdd121394e5ac54e498028a042e"},
-    {file = "nodeenv-1.7.0.tar.gz", hash = "sha256:e0e7f7dfb85fc5394c6fe1e8fa98131a2473e04311a45afb6508f7cf1836fa2b"},
-]
 
 [package.dependencies]
 setuptools = "*"
@@ -526,10 +315,6 @@ description = "Core utilities for Python packages"
 category = "dev"
 optional = false
 python-versions = ">=3.7"
-files = [
-    {file = "packaging-22.0-py3-none-any.whl", hash = "sha256:957e2148ba0e1a3b282772e791ef1d8083648bc131c8ab0c1feba110ce1146c3"},
-    {file = "packaging-22.0.tar.gz", hash = "sha256:2198ec20bd4c017b8f9717e00f0c8714076fc2fd93816750ab48e2c41de2cfd3"},
-]
 
 [[package]]
 name = "parse"
@@ -538,9 +323,6 @@ description = "parse() is the opposite of format()"
 category = "main"
 optional = false
 python-versions = "*"
-files = [
-    {file = "parse-1.19.0.tar.gz", hash = "sha256:9ff82852bcb65d139813e2a5197627a94966245c897796760a3a2a8eb66f020b"},
-]
 
 [[package]]
 name = "pathspec"
@@ -549,10 +331,6 @@ description = "Utility library for gitignore style pattern matching of file path
 category = "dev"
 optional = false
 python-versions = ">=3.7"
-files = [
-    {file = "pathspec-0.10.3-py3-none-any.whl", hash = "sha256:3c95343af8b756205e2aba76e843ba9520a24dd84f68c22b9f93251507509dd6"},
-    {file = "pathspec-0.10.3.tar.gz", hash = "sha256:56200de4077d9d0791465aa9095a01d421861e405b5096955051deefd697d6f6"},
-]
 
 [[package]]
 name = "platformdirs"
@@ -561,10 +339,6 @@ description = "A small Python package for determining appropriate platform-speci
 category = "dev"
 optional = false
 python-versions = ">=3.7"
-files = [
-    {file = "platformdirs-2.6.2-py3-none-any.whl", hash = "sha256:83c8f6d04389165de7c9b6f0c682439697887bca0aa2f1c87ef1826be3584490"},
-    {file = "platformdirs-2.6.2.tar.gz", hash = "sha256:e1fea1fe471b9ff8332e229df3cb7de4f53eeea4998d3b6bfff542115e998bd2"},
-]
 
 [package.extras]
 docs = ["furo (>=2022.12.7)", "proselint (>=0.13)", "sphinx (>=5.3)", "sphinx-autodoc-typehints (>=1.19.5)"]
@@ -577,10 +351,6 @@ description = "plugin and hook calling mechanisms for python"
 category = "dev"
 optional = false
 python-versions = ">=3.6"
-files = [
-    {file = "pluggy-1.0.0-py2.py3-none-any.whl", hash = "sha256:74134bbf457f031a36d68416e1509f34bd5ccc019f0bcc952c7b909d06b37bd3"},
-    {file = "pluggy-1.0.0.tar.gz", hash = "sha256:4224373bacce55f955a878bf9cfa763c1e360858e330072059e10bad68531159"},
-]
 
 [package.extras]
 dev = ["pre-commit", "tox"]
@@ -593,10 +363,6 @@ description = "A framework for managing and maintaining multi-language pre-commi
 category = "dev"
 optional = false
 python-versions = ">=3.7"
-files = [
-    {file = "pre_commit-2.21.0-py2.py3-none-any.whl", hash = "sha256:e2f91727039fc39a92f58a588a25b87f936de6567eed4f0e673e0507edc75bad"},
-    {file = "pre_commit-2.21.0.tar.gz", hash = "sha256:31ef31af7e474a8d8995027fefdfcf509b5c913ff31f2015b4ec4beb26a6f658"},
-]
 
 [package.dependencies]
 cfgv = ">=2.0.0"
@@ -612,10 +378,6 @@ description = "API to interact with the python pyproject.toml based projects"
 category = "dev"
 optional = false
 python-versions = ">=3.7"
-files = [
-    {file = "pyproject_api-1.4.0-py3-none-any.whl", hash = "sha256:c34226297781efdd1ba4dfb74ce21076d9a8360e2125ea31803c1a02c76b2460"},
-    {file = "pyproject_api-1.4.0.tar.gz", hash = "sha256:ac85c1f82e0291dbae5a7739dbb9a990e11ee4034c9b5599ea714f07a24ecd71"},
-]
 
 [package.dependencies]
 packaging = ">=21.3"
@@ -631,10 +393,6 @@ description = "pytest: simple powerful testing with Python"
 category = "dev"
 optional = false
 python-versions = ">=3.7"
-files = [
-    {file = "pytest-7.2.0-py3-none-any.whl", hash = "sha256:892f933d339f068883b6fd5a459f03d85bfcb355e4981e146d2c7616c21fef71"},
-    {file = "pytest-7.2.0.tar.gz", hash = "sha256:c4014eb40e10f11f355ad4e3c2fb2c6c6d1919c73f3b5a433de4708202cade59"},
-]
 
 [package.dependencies]
 attrs = ">=19.2.0"
@@ -653,10 +411,6 @@ description = "Pytest plugin for measuring coverage."
 category = "dev"
 optional = false
 python-versions = ">=3.6"
-files = [
-    {file = "pytest-cov-4.0.0.tar.gz", hash = "sha256:996b79efde6433cdbd0088872dbc5fb3ed7fe1578b68cdbba634f14bb8dd0470"},
-    {file = "pytest_cov-4.0.0-py3-none-any.whl", hash = "sha256:2feb1b751d66a8bd934e5edfa2e961d11309dc37b73b0eabe73b5945fee20f6b"},
-]
 
 [package.dependencies]
 coverage = {version = ">=5.2.1", extras = ["toml"]}
@@ -672,10 +426,6 @@ description = "pytest xdist plugin for distributed testing, most importantly acr
 category = "dev"
 optional = false
 python-versions = ">=3.7"
-files = [
-    {file = "pytest-xdist-3.1.0.tar.gz", hash = "sha256:40fdb8f3544921c5dfcd486ac080ce22870e71d82ced6d2e78fa97c2addd480c"},
-    {file = "pytest_xdist-3.1.0-py3-none-any.whl", hash = "sha256:70a76f191d8a1d2d6be69fc440cdf85f3e4c03c08b520fd5dc5d338d6cf07d89"},
-]
 
 [package.dependencies]
 execnet = ">=1.1"
@@ -693,10 +443,6 @@ description = "Extensions to the standard Python datetime module"
 category = "dev"
 optional = false
 python-versions = "!=3.0.*,!=3.1.*,!=3.2.*,>=2.7"
-files = [
-    {file = "python-dateutil-2.8.2.tar.gz", hash = "sha256:0123cacc1627ae19ddf3c27a5de5bd67ee4586fbdd6440d9748f8abb483d3e86"},
-    {file = "python_dateutil-2.8.2-py2.py3-none-any.whl", hash = "sha256:961d03dc3453ebbc59dbdea9e4e11c5651520a876d0f4db161e8674aae935da9"},
-]
 
 [package.dependencies]
 six = ">=1.5"
@@ -708,10 +454,6 @@ description = "Read key-value pairs from a .env file and set them as environment
 category = "dev"
 optional = false
 python-versions = ">=3.7"
-files = [
-    {file = "python-dotenv-0.21.0.tar.gz", hash = "sha256:b77d08274639e3d34145dfa6c7008e66df0f04b7be7a75fd0d5292c191d79045"},
-    {file = "python_dotenv-0.21.0-py3-none-any.whl", hash = "sha256:1684eb44636dd462b66c3ee016599815514527ad99965de77f43e0944634a7e5"},
-]
 
 [package.extras]
 cli = ["click (>=5.0)"]
@@ -723,10 +465,6 @@ description = "A Python slugify application that also handles Unicode"
 category = "dev"
 optional = false
 python-versions = ">=3.7"
-files = [
-    {file = "python-slugify-7.0.0.tar.gz", hash = "sha256:7a0f21a39fa6c1c4bf2e5984c9b9ae944483fd10b54804cb0e23a3ccd4954f0b"},
-    {file = "python_slugify-7.0.0-py2.py3-none-any.whl", hash = "sha256:003aee64f9fd955d111549f96c4b58a3f40b9319383c70fad6277a4974bbf570"},
-]
 
 [package.dependencies]
 text-unidecode = ">=1.3"
@@ -741,48 +479,6 @@ description = "YAML parser and emitter for Python"
 category = "dev"
 optional = false
 python-versions = ">=3.6"
-files = [
-    {file = "PyYAML-6.0-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:d4db7c7aef085872ef65a8fd7d6d09a14ae91f691dec3e87ee5ee0539d516f53"},
-    {file = "PyYAML-6.0-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:9df7ed3b3d2e0ecfe09e14741b857df43adb5a3ddadc919a2d94fbdf78fea53c"},
-    {file = "PyYAML-6.0-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:77f396e6ef4c73fdc33a9157446466f1cff553d979bd00ecb64385760c6babdc"},
-    {file = "PyYAML-6.0-cp310-cp310-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:a80a78046a72361de73f8f395f1f1e49f956c6be882eed58505a15f3e430962b"},
-    {file = "PyYAML-6.0-cp310-cp310-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:f84fbc98b019fef2ee9a1cb3ce93e3187a6df0b2538a651bfb890254ba9f90b5"},
-    {file = "PyYAML-6.0-cp310-cp310-win32.whl", hash = "sha256:2cd5df3de48857ed0544b34e2d40e9fac445930039f3cfe4bcc592a1f836d513"},
-    {file = "PyYAML-6.0-cp310-cp310-win_amd64.whl", hash = "sha256:daf496c58a8c52083df09b80c860005194014c3698698d1a57cbcfa182142a3a"},
-    {file = "PyYAML-6.0-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:d4b0ba9512519522b118090257be113b9468d804b19d63c71dbcf4a48fa32358"},
-    {file = "PyYAML-6.0-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:81957921f441d50af23654aa6c5e5eaf9b06aba7f0a19c18a538dc7ef291c5a1"},
-    {file = "PyYAML-6.0-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:afa17f5bc4d1b10afd4466fd3a44dc0e245382deca5b3c353d8b757f9e3ecb8d"},
-    {file = "PyYAML-6.0-cp311-cp311-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:dbad0e9d368bb989f4515da330b88a057617d16b6a8245084f1b05400f24609f"},
-    {file = "PyYAML-6.0-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:432557aa2c09802be39460360ddffd48156e30721f5e8d917f01d31694216782"},
-    {file = "PyYAML-6.0-cp311-cp311-win32.whl", hash = "sha256:bfaef573a63ba8923503d27530362590ff4f576c626d86a9fed95822a8255fd7"},
-    {file = "PyYAML-6.0-cp311-cp311-win_amd64.whl", hash = "sha256:01b45c0191e6d66c470b6cf1b9531a771a83c1c4208272ead47a3ae4f2f603bf"},
-    {file = "PyYAML-6.0-cp36-cp36m-macosx_10_9_x86_64.whl", hash = "sha256:897b80890765f037df3403d22bab41627ca8811ae55e9a722fd0392850ec4d86"},
-    {file = "PyYAML-6.0-cp36-cp36m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:50602afada6d6cbfad699b0c7bb50d5ccffa7e46a3d738092afddc1f9758427f"},
-    {file = "PyYAML-6.0-cp36-cp36m-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:48c346915c114f5fdb3ead70312bd042a953a8ce5c7106d5bfb1a5254e47da92"},
-    {file = "PyYAML-6.0-cp36-cp36m-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:98c4d36e99714e55cfbaaee6dd5badbc9a1ec339ebfc3b1f52e293aee6bb71a4"},
-    {file = "PyYAML-6.0-cp36-cp36m-win32.whl", hash = "sha256:0283c35a6a9fbf047493e3a0ce8d79ef5030852c51e9d911a27badfde0605293"},
-    {file = "PyYAML-6.0-cp36-cp36m-win_amd64.whl", hash = "sha256:07751360502caac1c067a8132d150cf3d61339af5691fe9e87803040dbc5db57"},
-    {file = "PyYAML-6.0-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:819b3830a1543db06c4d4b865e70ded25be52a2e0631ccd2f6a47a2822f2fd7c"},
-    {file = "PyYAML-6.0-cp37-cp37m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:473f9edb243cb1935ab5a084eb238d842fb8f404ed2193a915d1784b5a6b5fc0"},
-    {file = "PyYAML-6.0-cp37-cp37m-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:0ce82d761c532fe4ec3f87fc45688bdd3a4c1dc5e0b4a19814b9009a29baefd4"},
-    {file = "PyYAML-6.0-cp37-cp37m-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:231710d57adfd809ef5d34183b8ed1eeae3f76459c18fb4a0b373ad56bedcdd9"},
-    {file = "PyYAML-6.0-cp37-cp37m-win32.whl", hash = "sha256:c5687b8d43cf58545ade1fe3e055f70eac7a5a1a0bf42824308d868289a95737"},
-    {file = "PyYAML-6.0-cp37-cp37m-win_amd64.whl", hash = "sha256:d15a181d1ecd0d4270dc32edb46f7cb7733c7c508857278d3d378d14d606db2d"},
-    {file = "PyYAML-6.0-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:0b4624f379dab24d3725ffde76559cff63d9ec94e1736b556dacdfebe5ab6d4b"},
-    {file = "PyYAML-6.0-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:213c60cd50106436cc818accf5baa1aba61c0189ff610f64f4a3e8c6726218ba"},
-    {file = "PyYAML-6.0-cp38-cp38-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:9fa600030013c4de8165339db93d182b9431076eb98eb40ee068700c9c813e34"},
-    {file = "PyYAML-6.0-cp38-cp38-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:277a0ef2981ca40581a47093e9e2d13b3f1fbbeffae064c1d21bfceba2030287"},
-    {file = "PyYAML-6.0-cp38-cp38-win32.whl", hash = "sha256:d4eccecf9adf6fbcc6861a38015c2a64f38b9d94838ac1810a9023a0609e1b78"},
-    {file = "PyYAML-6.0-cp38-cp38-win_amd64.whl", hash = "sha256:1e4747bc279b4f613a09eb64bba2ba602d8a6664c6ce6396a4d0cd413a50ce07"},
-    {file = "PyYAML-6.0-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:055d937d65826939cb044fc8c9b08889e8c743fdc6a32b33e2390f66013e449b"},
-    {file = "PyYAML-6.0-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:e61ceaab6f49fb8bdfaa0f92c4b57bcfbea54c09277b1b4f7ac376bfb7a7c174"},
-    {file = "PyYAML-6.0-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:d67d839ede4ed1b28a4e8909735fc992a923cdb84e618544973d7dfc71540803"},
-    {file = "PyYAML-6.0-cp39-cp39-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:cba8c411ef271aa037d7357a2bc8f9ee8b58b9965831d9e51baf703280dc73d3"},
-    {file = "PyYAML-6.0-cp39-cp39-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:40527857252b61eacd1d9af500c3337ba8deb8fc298940291486c465c8b46ec0"},
-    {file = "PyYAML-6.0-cp39-cp39-win32.whl", hash = "sha256:b5b9eccad747aabaaffbc6064800670f0c297e52c12754eb1d976c57e4f74dcb"},
-    {file = "PyYAML-6.0-cp39-cp39-win_amd64.whl", hash = "sha256:b3d267842bf12586ba6c734f89d1f5b871df0273157918b0ccefa29deb05c21c"},
-    {file = "PyYAML-6.0.tar.gz", hash = "sha256:68fb519c14306fec9720a2a5b45bc9f0c8d1b9c72adf45c37baedfcd949c35a2"},
-]
 
 [[package]]
 name = "requests"
@@ -791,10 +487,6 @@ description = "Python HTTP for Humans."
 category = "main"
 optional = false
 python-versions = ">=3.7, <4"
-files = [
-    {file = "requests-2.28.1-py3-none-any.whl", hash = "sha256:8fefa2a1a1365bf5520aac41836fbee479da67864514bdb821f31ce07ce65349"},
-    {file = "requests-2.28.1.tar.gz", hash = "sha256:7c5599b102feddaa661c826c56ab4fee28bfd17f5abca1ebbe3e7f19d7c97983"},
-]
 
 [package.dependencies]
 certifi = ">=2017.4.17"
@@ -813,10 +505,6 @@ description = "Easily download, build, install, upgrade, and uninstall Python pa
 category = "dev"
 optional = false
 python-versions = ">=3.7"
-files = [
-    {file = "setuptools-65.6.3-py3-none-any.whl", hash = "sha256:57f6f22bde4e042978bcd50176fdb381d7c21a9efa4041202288d3737a0c6a54"},
-    {file = "setuptools-65.6.3.tar.gz", hash = "sha256:a7620757bf984b58deaf32fc8a4577a9bbc0850cf92c20e1ce41c38c19e5fb75"},
-]
 
 [package.extras]
 docs = ["furo", "jaraco.packaging (>=9)", "jaraco.tidelift (>=1.4)", "pygments-github-lexers (==0.0.5)", "rst.linker (>=1.9)", "sphinx (>=3.5)", "sphinx-favicon", "sphinx-hoverxref (<2)", "sphinx-inline-tabs", "sphinx-notfound-page (==0.8.3)", "sphinx-reredirects", "sphinxcontrib-towncrier"]
@@ -830,10 +518,6 @@ description = "Python 2 and 3 compatibility utilities"
 category = "main"
 optional = false
 python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*"
-files = [
-    {file = "six-1.16.0-py2.py3-none-any.whl", hash = "sha256:8abb2f1d86890a2dfb989f9a77cfcfd3e47c2a354b01111771326f8aa26e0254"},
-    {file = "six-1.16.0.tar.gz", hash = "sha256:1e61c37477a1626458e36f7b1d82aa5c9b094fa4802892072e49de9c60c4c926"},
-]
 
 [[package]]
 name = "soupsieve"
@@ -842,10 +526,6 @@ description = "A modern CSS selector implementation for Beautiful Soup."
 category = "main"
 optional = false
 python-versions = ">=3.6"
-files = [
-    {file = "soupsieve-2.3.2.post1-py3-none-any.whl", hash = "sha256:3b2503d3c7084a42b1ebd08116e5f81aadfaea95863628c80a3b774a11b7c759"},
-    {file = "soupsieve-2.3.2.post1.tar.gz", hash = "sha256:fc53893b3da2c33de295667a0e19f078c14bf86544af307354de5fcf12a3f30d"},
-]
 
 [[package]]
 name = "text-unidecode"
@@ -854,22 +534,14 @@ description = "The most basic Text::Unidecode port"
 category = "dev"
 optional = false
 python-versions = "*"
-files = [
-    {file = "text-unidecode-1.3.tar.gz", hash = "sha256:bad6603bb14d279193107714b288be206cac565dfa49aa5b105294dd5c4aab93"},
-    {file = "text_unidecode-1.3-py2.py3-none-any.whl", hash = "sha256:1311f10e8b895935241623731c2ba64f4c455287888b18189350b67134a822e8"},
-]
 
 [[package]]
 name = "tox"
-version = "4.2.5"
+version = "4.2.6"
 description = "tox is a generic virtualenv management and test command line tool"
 category = "dev"
 optional = false
 python-versions = ">=3.7"
-files = [
-    {file = "tox-4.2.5-py3-none-any.whl", hash = "sha256:a256447ec85a058004231f19ca3df66b3be591a7561c8f8389d1d60b5b629989"},
-    {file = "tox-4.2.5.tar.gz", hash = "sha256:dba263a7da1151e3f7c0816bf9efcbad127ee7ec981e5f03b9666b47619c735e"},
-]
 
 [package.dependencies]
 cachetools = ">=5.2"
@@ -893,10 +565,6 @@ description = "Fast, Extensible Progress Meter"
 category = "main"
 optional = false
 python-versions = "!=3.0.*,!=3.1.*,!=3.2.*,!=3.3.*,>=2.7"
-files = [
-    {file = "tqdm-4.64.1-py2.py3-none-any.whl", hash = "sha256:6fee160d6ffcd1b1c68c65f14c829c22832bc401726335ce92c52d395944a6a1"},
-    {file = "tqdm-4.64.1.tar.gz", hash = "sha256:5f4f682a004951c1b450bc753c710e9280c5746ce6ffedee253ddbcbf54cf1e4"},
-]
 
 [package.dependencies]
 colorama = {version = "*", markers = "platform_system == \"Windows\""}
@@ -914,10 +582,6 @@ description = "HTTP library with thread-safe connection pooling, file post, and
 category = "main"
 optional = false
 python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*, !=3.5.*"
-files = [
-    {file = "urllib3-1.26.13-py2.py3-none-any.whl", hash = "sha256:47cc05d99aaa09c9e72ed5809b60e7ba354e64b59c9c173ac3018642d8bb41fc"},
-    {file = "urllib3-1.26.13.tar.gz", hash = "sha256:c083dd0dce68dbfbe1129d5271cb90f9447dea7d52097c6e0126120c521ddea8"},
-]
 
 [package.extras]
 brotli = ["brotli (>=1.0.9)", "brotlicffi (>=0.8.0)", "brotlipy (>=0.6.0)"]
@@ -931,10 +595,6 @@ description = "Virtual Python Environment builder"
 category = "dev"
 optional = false
 python-versions = ">=3.6"
-files = [
-    {file = "virtualenv-20.17.1-py3-none-any.whl", hash = "sha256:ce3b1684d6e1a20a3e5ed36795a97dfc6af29bc3970ca8dab93e11ac6094b3c4"},
-    {file = "virtualenv-20.17.1.tar.gz", hash = "sha256:f8b927684efc6f1cc206c9db297a570ab9ad0e51c16fa9e45487d36d1905c058"},
-]
 
 [package.dependencies]
 distlib = ">=0.3.6,<1"
@@ -946,6 +606,346 @@ docs = ["proselint (>=0.13)", "sphinx (>=5.3)", "sphinx-argparse (>=0.3.2)", "sp
 testing = ["coverage (>=6.2)", "coverage-enable-subprocess (>=1)", "flaky (>=3.7)", "packaging (>=21.3)", "pytest (>=7.0.1)", "pytest-env (>=0.6.2)", "pytest-freezegun (>=0.4.2)", "pytest-mock (>=3.6.1)", "pytest-randomly (>=3.10.3)", "pytest-timeout (>=2.1)"]
 
 [metadata]
-lock-version = "2.0"
+lock-version = "1.1"
 python-versions = "^3.11"
-content-hash = "637dae1a2c725fad481c1d1aa64f01f523fd01db728f635be807238e6da04aad"
+content-hash = "176a152d1a388614834f5af9830dec157b748ceb7f0065f6b0ae01fc03d2e4d3"
+
+[metadata.files]
+anytree = [
+    {file = "anytree-2.8.0-py2.py3-none-any.whl", hash = "sha256:14c55ac77492b11532395049a03b773d14c7e30b22aa012e337b1e983de31521"},
+    {file = "anytree-2.8.0.tar.gz", hash = "sha256:3f0f93f355a91bc3e6245319bf4c1d50e3416cc7a35cc1133c1ff38306bbccab"},
+]
+arrow = [
+    {file = "arrow-1.2.3-py3-none-any.whl", hash = "sha256:5a49ab92e3b7b71d96cd6bfcc4df14efefc9dfa96ea19045815914a6ab6b1fe2"},
+    {file = "arrow-1.2.3.tar.gz", hash = "sha256:3934b30ca1b9f292376d9db15b19446088d12ec58629bc3f0da28fd55fb633a1"},
+]
+attrs = [
+    {file = "attrs-22.2.0-py3-none-any.whl", hash = "sha256:29e95c7f6778868dbd49170f98f8818f78f3dc5e0e37c0b1f474e3561b240836"},
+    {file = "attrs-22.2.0.tar.gz", hash = "sha256:c9227bfc2f01993c03f68db37d1d15c9690188323c067c641f1a35ca58185f99"},
+]
+beautifulsoup4 = [
+    {file = "beautifulsoup4-4.11.1-py3-none-any.whl", hash = "sha256:58d5c3d29f5a36ffeb94f02f0d786cd53014cf9b3b3951d42e0080d8a9498d30"},
+    {file = "beautifulsoup4-4.11.1.tar.gz", hash = "sha256:ad9aa55b65ef2808eb405f46cf74df7fcb7044d5cbc26487f96eb2ef2e436693"},
+]
+binaryornot = [
+    {file = "binaryornot-0.4.4-py2.py3-none-any.whl", hash = "sha256:b8b71173c917bddcd2c16070412e369c3ed7f0528926f70cac18a6c97fd563e4"},
+    {file = "binaryornot-0.4.4.tar.gz", hash = "sha256:359501dfc9d40632edc9fac890e19542db1a287bbcfa58175b66658392018061"},
+]
+black = [
+    {file = "black-22.12.0-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:9eedd20838bd5d75b80c9f5487dbcb06836a43833a37846cf1d8c1cc01cef59d"},
+    {file = "black-22.12.0-cp310-cp310-win_amd64.whl", hash = "sha256:159a46a4947f73387b4d83e87ea006dbb2337eab6c879620a3ba52699b1f4351"},
+    {file = "black-22.12.0-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:d30b212bffeb1e252b31dd269dfae69dd17e06d92b87ad26e23890f3efea366f"},
+    {file = "black-22.12.0-cp311-cp311-win_amd64.whl", hash = "sha256:7412e75863aa5c5411886804678b7d083c7c28421210180d67dfd8cf1221e1f4"},
+    {file = "black-22.12.0-cp37-cp37m-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:c116eed0efb9ff870ded8b62fe9f28dd61ef6e9ddd28d83d7d264a38417dcee2"},
+    {file = "black-22.12.0-cp37-cp37m-win_amd64.whl", hash = "sha256:1f58cbe16dfe8c12b7434e50ff889fa479072096d79f0a7f25e4ab8e94cd8350"},
+    {file = "black-22.12.0-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:77d86c9f3db9b1bf6761244bc0b3572a546f5fe37917a044e02f3166d5aafa7d"},
+    {file = "black-22.12.0-cp38-cp38-win_amd64.whl", hash = "sha256:82d9fe8fee3401e02e79767016b4907820a7dc28d70d137eb397b92ef3cc5bfc"},
+    {file = "black-22.12.0-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:101c69b23df9b44247bd88e1d7e90154336ac4992502d4197bdac35dd7ee3320"},
+    {file = "black-22.12.0-cp39-cp39-win_amd64.whl", hash = "sha256:559c7a1ba9a006226f09e4916060982fd27334ae1998e7a38b3f33a37f7a2148"},
+    {file = "black-22.12.0-py3-none-any.whl", hash = "sha256:436cc9167dd28040ad90d3b404aec22cedf24a6e4d7de221bec2730ec0c97bcf"},
+    {file = "black-22.12.0.tar.gz", hash = "sha256:229351e5a18ca30f447bf724d007f890f97e13af070bb6ad4c0a441cd7596a2f"},
+]
+cachetools = [
+    {file = "cachetools-5.2.0-py3-none-any.whl", hash = "sha256:f9f17d2aec496a9aa6b76f53e3b614c965223c061982d434d160f930c698a9db"},
+    {file = "cachetools-5.2.0.tar.gz", hash = "sha256:6a94c6402995a99c3970cc7e4884bb60b4a8639938157eeed436098bf9831757"},
+]
+certifi = [
+    {file = "certifi-2022.12.7-py3-none-any.whl", hash = "sha256:4ad3232f5e926d6718ec31cfc1fcadfde020920e278684144551c91769c7bc18"},
+    {file = "certifi-2022.12.7.tar.gz", hash = "sha256:35824b4c3a97115964b408844d64aa14db1cc518f6562e8d7261699d1350a9e3"},
+]
+cfgv = [
+    {file = "cfgv-3.3.1-py2.py3-none-any.whl", hash = "sha256:c6a0883f3917a037485059700b9e75da2464e6c27051014ad85ba6aaa5884426"},
+    {file = "cfgv-3.3.1.tar.gz", hash = "sha256:f5a830efb9ce7a445376bb66ec94c638a9787422f96264c98edc6bdeed8ab736"},
+]
+chardet = [
+    {file = "chardet-5.1.0-py3-none-any.whl", hash = "sha256:362777fb014af596ad31334fde1e8c327dfdb076e1960d1694662d46a6917ab9"},
+    {file = "chardet-5.1.0.tar.gz", hash = "sha256:0d62712b956bc154f85fb0a266e2a3c5913c2967e00348701b32411d6def31e5"},
+]
+charset-normalizer = [
+    {file = "charset-normalizer-2.1.1.tar.gz", hash = "sha256:5a3d016c7c547f69d6f81fb0db9449ce888b418b5b9952cc5e6e66843e9dd845"},
+    {file = "charset_normalizer-2.1.1-py3-none-any.whl", hash = "sha256:83e9a75d1911279afd89352c68b45348559d1fc0506b054b346651b5e7fee29f"},
+]
+click = [
+    {file = "click-8.1.3-py3-none-any.whl", hash = "sha256:bb4d8133cb15a609f44e8213d9b391b0809795062913b383c62be0ee95b1db48"},
+    {file = "click-8.1.3.tar.gz", hash = "sha256:7682dc8afb30297001674575ea00d1814d808d6a36af415a82bd481d37ba7b8e"},
+]
+colorama = [
+    {file = "colorama-0.4.6-py2.py3-none-any.whl", hash = "sha256:4f1d9991f5acc0ca119f9d443620b77f9d6b33703e51011c16baf57afb285fc6"},
+    {file = "colorama-0.4.6.tar.gz", hash = "sha256:08695f5cb7ed6e0531a20572697297273c47b8cae5a63ffc6d6ed5c201be6e44"},
+]
+cookiecutter = [
+    {file = "cookiecutter-2.1.1-py2.py3-none-any.whl", hash = "sha256:9f3ab027cec4f70916e28f03470bdb41e637a3ad354b4d65c765d93aad160022"},
+    {file = "cookiecutter-2.1.1.tar.gz", hash = "sha256:f3982be8d9c53dac1261864013fdec7f83afd2e42ede6f6dd069c5e149c540d5"},
+]
+coverage = [
+    {file = "coverage-7.0.3-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:2f7c51b6074a8a3063c341953dffe48fd6674f8e4b1d3c8aa8a91f58d6e716a8"},
+    {file = "coverage-7.0.3-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:628f47eaf66727fc986d3b190d6fa32f5e6b7754a243919d28bc0fd7974c449f"},
+    {file = "coverage-7.0.3-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:e89d5abf86c104de808108a25d171ad646c07eda96ca76c8b237b94b9c71e518"},
+    {file = "coverage-7.0.3-cp310-cp310-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:75e43c6f4ea4d122dac389aabdf9d4f0e160770a75e63372f88005d90f5bcc80"},
+    {file = "coverage-7.0.3-cp310-cp310-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:49da0ff241827ebb52d5d6d5a36d33b455fa5e721d44689c95df99fd8db82437"},
+    {file = "coverage-7.0.3-cp310-cp310-musllinux_1_1_aarch64.whl", hash = "sha256:0bce4ad5bdd0b02e177a085d28d2cea5fc57bb4ba2cead395e763e34cf934eb1"},
+    {file = "coverage-7.0.3-cp310-cp310-musllinux_1_1_i686.whl", hash = "sha256:f79691335257d60951638dd43576b9bcd6f52baa5c1c2cd07a509bb003238372"},
+    {file = "coverage-7.0.3-cp310-cp310-musllinux_1_1_x86_64.whl", hash = "sha256:5722269ed05fbdb94eef431787c66b66260ff3125d1a9afcc00facff8c45adf9"},
+    {file = "coverage-7.0.3-cp310-cp310-win32.whl", hash = "sha256:bdbda870e0fda7dd0fe7db7135ca226ec4c1ade8aa76e96614829b56ca491012"},
+    {file = "coverage-7.0.3-cp310-cp310-win_amd64.whl", hash = "sha256:e56fae4292e216b8deeee38ace84557b9fa85b52db005368a275427cdabb8192"},
+    {file = "coverage-7.0.3-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:b82343a5bc51627b9d606f0b6b6b9551db7b6311a5dd920fa52a94beae2e8959"},
+    {file = "coverage-7.0.3-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:fd0a8aa431f9b7ad9eb8264f55ef83cbb254962af3775092fb6e93890dea9ca2"},
+    {file = "coverage-7.0.3-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:112cfead1bd22eada8a8db9ed387bd3e8be5528debc42b5d3c1f7da4ffaf9fb5"},
+    {file = "coverage-7.0.3-cp311-cp311-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:af87e906355fa42447be5c08c5d44e6e1c005bf142f303f726ddf5ed6e0c8a4d"},
+    {file = "coverage-7.0.3-cp311-cp311-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:f30090e22a301952c5abd0e493a1c8358b4f0b368b49fa3e4568ed3ed68b8d1f"},
+    {file = "coverage-7.0.3-cp311-cp311-musllinux_1_1_aarch64.whl", hash = "sha256:ae871d09901911eedda1981ea6fd0f62a999107293cdc4c4fd612321c5b34745"},
+    {file = "coverage-7.0.3-cp311-cp311-musllinux_1_1_i686.whl", hash = "sha256:ed7c9debf7bfc63c9b9f8b595409237774ff4b061bf29fba6f53b287a2fdeab9"},
+    {file = "coverage-7.0.3-cp311-cp311-musllinux_1_1_x86_64.whl", hash = "sha256:13121fa22dcd2c7b19c5161e3fd725692448f05377b788da4502a383573227b3"},
+    {file = "coverage-7.0.3-cp311-cp311-win32.whl", hash = "sha256:037b51ee86bc600f99b3b957c20a172431c35c2ef9c1ca34bc813ab5b51fd9f5"},
+    {file = "coverage-7.0.3-cp311-cp311-win_amd64.whl", hash = "sha256:25fde928306034e8deecd5fc91a07432dcc282c8acb76749581a28963c9f4f3f"},
+    {file = "coverage-7.0.3-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:7e8b0642c38b3d3b3c01417643ccc645345b03c32a2e84ef93cdd6844d6fe530"},
+    {file = "coverage-7.0.3-cp37-cp37m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:18b09811f849cc958d23f733a350a66b54a8de3fed1e6128ba55a5c97ffb6f65"},
+    {file = "coverage-7.0.3-cp37-cp37m-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:349d0b545520e8516f7b4f12373afc705d17d901e1de6a37a20e4ec9332b61f7"},
+    {file = "coverage-7.0.3-cp37-cp37m-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:b5b38813eee5b4739f505d94247604c72eae626d5088a16dd77b08b8b1724ab3"},
+    {file = "coverage-7.0.3-cp37-cp37m-musllinux_1_1_aarch64.whl", hash = "sha256:ba9af1218fa01b1f11c72271bc7290b701d11ad4dbc2ae97c445ecacf6858dba"},
+    {file = "coverage-7.0.3-cp37-cp37m-musllinux_1_1_i686.whl", hash = "sha256:c5648c7eec5cf1ba5db1cf2d6c10036a582d7f09e172990474a122e30c841361"},
+    {file = "coverage-7.0.3-cp37-cp37m-musllinux_1_1_x86_64.whl", hash = "sha256:d0df04495b76a885bfef009f45eebe8fe2fbf815ad7a83dabcf5aced62f33162"},
+    {file = "coverage-7.0.3-cp37-cp37m-win32.whl", hash = "sha256:af6cef3796b8068713a48dd67d258dc9a6e2ebc3bd4645bfac03a09672fa5d20"},
+    {file = "coverage-7.0.3-cp37-cp37m-win_amd64.whl", hash = "sha256:62ef3800c4058844e2e3fa35faa9dd0ccde8a8aba6c763aae50342e00d4479d4"},
+    {file = "coverage-7.0.3-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:acef7f3a3825a2d218a03dd02f5f3cc7f27aa31d882dd780191d1ad101120d74"},
+    {file = "coverage-7.0.3-cp38-cp38-macosx_11_0_arm64.whl", hash = "sha256:a530663a361eb27375cec28aea5cd282089b5e4b022ae451c4c3493b026a68a5"},
+    {file = "coverage-7.0.3-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:c58cd6bb46dcb922e0d5792850aab5964433d511b3a020867650f8d930dde4f4"},
+    {file = "coverage-7.0.3-cp38-cp38-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:f918e9ef4c98f477a5458238dde2a1643aed956c7213873ab6b6b82e32b8ef61"},
+    {file = "coverage-7.0.3-cp38-cp38-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:2b865aa679bee7fbd1c55960940dbd3252621dd81468268786c67122bbd15343"},
+    {file = "coverage-7.0.3-cp38-cp38-musllinux_1_1_aarch64.whl", hash = "sha256:c5d9b480ebae60fc2cbc8d6865194136bc690538fa542ba58726433bed6e04cc"},
+    {file = "coverage-7.0.3-cp38-cp38-musllinux_1_1_i686.whl", hash = "sha256:985ad2af5ec3dbb4fd75d5b0735752c527ad183455520055a08cf8d6794cabfc"},
+    {file = "coverage-7.0.3-cp38-cp38-musllinux_1_1_x86_64.whl", hash = "sha256:ca15308ef722f120967af7474ba6a453e0f5b6f331251e20b8145497cf1bc14a"},
+    {file = "coverage-7.0.3-cp38-cp38-win32.whl", hash = "sha256:c1cee10662c25c94415bbb987f2ec0e6ba9e8fce786334b10be7e6a7ab958f69"},
+    {file = "coverage-7.0.3-cp38-cp38-win_amd64.whl", hash = "sha256:44d6a556de4418f1f3bfd57094b8c49f0408df5a433cf0d253eeb3075261c762"},
+    {file = "coverage-7.0.3-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:e6dcc70a25cb95df0ae33dfc701de9b09c37f7dd9f00394d684a5b57257f8246"},
+    {file = "coverage-7.0.3-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:bf76d79dfaea802f0f28f50153ffbc1a74ae1ee73e480baeda410b4f3e7ab25f"},
+    {file = "coverage-7.0.3-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:88834e5d56d01c141c29deedacba5773fe0bed900b1edc957595a8a6c0da1c3c"},
+    {file = "coverage-7.0.3-cp39-cp39-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:ef001a60e888f8741e42e5aa79ae55c91be73761e4df5e806efca1ddd62fd400"},
+    {file = "coverage-7.0.3-cp39-cp39-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:4959dc506be74e4963bd2c42f7b87d8e4b289891201e19ec551e64c6aa5441f8"},
+    {file = "coverage-7.0.3-cp39-cp39-musllinux_1_1_aarch64.whl", hash = "sha256:b791beb17b32ac019a78cfbe6184f992b6273fdca31145b928ad2099435e2fcb"},
+    {file = "coverage-7.0.3-cp39-cp39-musllinux_1_1_i686.whl", hash = "sha256:b07651e3b9af8f1a092861d88b4c74d913634a7f1f2280fca0ad041ad84e9e96"},
+    {file = "coverage-7.0.3-cp39-cp39-musllinux_1_1_x86_64.whl", hash = "sha256:55e46fa4168ccb7497c9be78627fcb147e06f474f846a10d55feeb5108a24ef0"},
+    {file = "coverage-7.0.3-cp39-cp39-win32.whl", hash = "sha256:e3f1cd1cd65695b1540b3cf7828d05b3515974a9d7c7530f762ac40f58a18161"},
+    {file = "coverage-7.0.3-cp39-cp39-win_amd64.whl", hash = "sha256:d8249666c23683f74f8f93aeaa8794ac87cc61c40ff70374a825f3352a4371dc"},
+    {file = "coverage-7.0.3-pp37.pp38.pp39-none-any.whl", hash = "sha256:b1ffc8f58b81baed3f8962e28c30d99442079b82ce1ec836a1f67c0accad91c1"},
+    {file = "coverage-7.0.3.tar.gz", hash = "sha256:d5be4e93acce64f516bf4fd239c0e6118fc913c93fa1a3f52d15bdcc60d97b2d"},
+]
+distlib = [
+    {file = "distlib-0.3.6-py2.py3-none-any.whl", hash = "sha256:f35c4b692542ca110de7ef0bea44d73981caeb34ca0b9b6b2e6d7790dda8f80e"},
+    {file = "distlib-0.3.6.tar.gz", hash = "sha256:14bad2d9b04d3a36127ac97f30b12a19268f211063d8f8ee4f47108896e11b46"},
+]
+execnet = [
+    {file = "execnet-1.9.0-py2.py3-none-any.whl", hash = "sha256:a295f7cc774947aac58dde7fdc85f4aa00c42adf5d8f5468fc630c1acf30a142"},
+    {file = "execnet-1.9.0.tar.gz", hash = "sha256:8f694f3ba9cc92cab508b152dcfe322153975c29bda272e2fd7f3f00f36e47c5"},
+]
+filelock = [
+    {file = "filelock-3.9.0-py3-none-any.whl", hash = "sha256:f58d535af89bb9ad5cd4df046f741f8553a418c01a7856bf0d173bbc9f6bd16d"},
+    {file = "filelock-3.9.0.tar.gz", hash = "sha256:7b319f24340b51f55a2bf7a12ac0755a9b03e718311dac567a0f4f7fabd2f5de"},
+]
+identify = [
+    {file = "identify-2.5.12-py2.py3-none-any.whl", hash = "sha256:e8a400c3062d980243d27ce10455a52832205649bbcaf27ffddb3dfaaf477bad"},
+    {file = "identify-2.5.12.tar.gz", hash = "sha256:0bc96b09c838310b6fcfcc61f78a981ea07f94836ef6ef553da5bb5d4745d662"},
+]
+idna = [
+    {file = "idna-3.4-py3-none-any.whl", hash = "sha256:90b77e79eaa3eba6de819a0c442c0b4ceefc341a7a2ab77d7562bf49f425c5c2"},
+    {file = "idna-3.4.tar.gz", hash = "sha256:814f528e8dead7d329833b91c5faa87d60bf71824cd12a7530b5526063d02cb4"},
+]
+iniconfig = [
+    {file = "iniconfig-1.1.1-py2.py3-none-any.whl", hash = "sha256:011e24c64b7f47f6ebd835bb12a743f2fbe9a26d4cecaa7f53bc4f35ee9da8b3"},
+    {file = "iniconfig-1.1.1.tar.gz", hash = "sha256:bc3af051d7d14b2ee5ef9969666def0cd1a000e121eaea580d4a313df4b37f32"},
+]
+isort = [
+    {file = "isort-5.11.4-py3-none-any.whl", hash = "sha256:c033fd0edb91000a7f09527fe5c75321878f98322a77ddcc81adbd83724afb7b"},
+    {file = "isort-5.11.4.tar.gz", hash = "sha256:6db30c5ded9815d813932c04c2f85a360bcdd35fed496f4d8f35495ef0a261b6"},
+]
+jinja2 = [
+    {file = "Jinja2-3.1.2-py3-none-any.whl", hash = "sha256:6088930bfe239f0e6710546ab9c19c9ef35e29792895fed6e6e31a023a182a61"},
+    {file = "Jinja2-3.1.2.tar.gz", hash = "sha256:31351a702a408a9e7595a8fc6150fc3f43bb6bf7e319770cbc0db9df9437e852"},
+]
+jinja2-time = [
+    {file = "jinja2-time-0.2.0.tar.gz", hash = "sha256:d14eaa4d315e7688daa4969f616f226614350c48730bfa1692d2caebd8c90d40"},
+    {file = "jinja2_time-0.2.0-py2.py3-none-any.whl", hash = "sha256:d3eab6605e3ec8b7a0863df09cc1d23714908fa61aa6986a845c20ba488b4efa"},
+]
+markupsafe = [
+    {file = "MarkupSafe-2.1.1-cp310-cp310-macosx_10_9_universal2.whl", hash = "sha256:86b1f75c4e7c2ac2ccdaec2b9022845dbb81880ca318bb7a0a01fbf7813e3812"},
+    {file = "MarkupSafe-2.1.1-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:f121a1420d4e173a5d96e47e9a0c0dcff965afdf1626d28de1460815f7c4ee7a"},
+    {file = "MarkupSafe-2.1.1-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:a49907dd8420c5685cfa064a1335b6754b74541bbb3706c259c02ed65b644b3e"},
+    {file = "MarkupSafe-2.1.1-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:10c1bfff05d95783da83491be968e8fe789263689c02724e0c691933c52994f5"},
+    {file = "MarkupSafe-2.1.1-cp310-cp310-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:b7bd98b796e2b6553da7225aeb61f447f80a1ca64f41d83612e6139ca5213aa4"},
+    {file = "MarkupSafe-2.1.1-cp310-cp310-musllinux_1_1_aarch64.whl", hash = "sha256:b09bf97215625a311f669476f44b8b318b075847b49316d3e28c08e41a7a573f"},
+    {file = "MarkupSafe-2.1.1-cp310-cp310-musllinux_1_1_i686.whl", hash = "sha256:694deca8d702d5db21ec83983ce0bb4b26a578e71fbdbd4fdcd387daa90e4d5e"},
+    {file = "MarkupSafe-2.1.1-cp310-cp310-musllinux_1_1_x86_64.whl", hash = "sha256:efc1913fd2ca4f334418481c7e595c00aad186563bbc1ec76067848c7ca0a933"},
+    {file = "MarkupSafe-2.1.1-cp310-cp310-win32.whl", hash = "sha256:4a33dea2b688b3190ee12bd7cfa29d39c9ed176bda40bfa11099a3ce5d3a7ac6"},
+    {file = "MarkupSafe-2.1.1-cp310-cp310-win_amd64.whl", hash = "sha256:dda30ba7e87fbbb7eab1ec9f58678558fd9a6b8b853530e176eabd064da81417"},
+    {file = "MarkupSafe-2.1.1-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:671cd1187ed5e62818414afe79ed29da836dde67166a9fac6d435873c44fdd02"},
+    {file = "MarkupSafe-2.1.1-cp37-cp37m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:3799351e2336dc91ea70b034983ee71cf2f9533cdff7c14c90ea126bfd95d65a"},
+    {file = "MarkupSafe-2.1.1-cp37-cp37m-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:e72591e9ecd94d7feb70c1cbd7be7b3ebea3f548870aa91e2732960fa4d57a37"},
+    {file = "MarkupSafe-2.1.1-cp37-cp37m-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:6fbf47b5d3728c6aea2abb0589b5d30459e369baa772e0f37a0320185e87c980"},
+    {file = "MarkupSafe-2.1.1-cp37-cp37m-musllinux_1_1_aarch64.whl", hash = "sha256:d5ee4f386140395a2c818d149221149c54849dfcfcb9f1debfe07a8b8bd63f9a"},
+    {file = "MarkupSafe-2.1.1-cp37-cp37m-musllinux_1_1_i686.whl", hash = "sha256:bcb3ed405ed3222f9904899563d6fc492ff75cce56cba05e32eff40e6acbeaa3"},
+    {file = "MarkupSafe-2.1.1-cp37-cp37m-musllinux_1_1_x86_64.whl", hash = "sha256:e1c0b87e09fa55a220f058d1d49d3fb8df88fbfab58558f1198e08c1e1de842a"},
+    {file = "MarkupSafe-2.1.1-cp37-cp37m-win32.whl", hash = "sha256:8dc1c72a69aa7e082593c4a203dcf94ddb74bb5c8a731e4e1eb68d031e8498ff"},
+    {file = "MarkupSafe-2.1.1-cp37-cp37m-win_amd64.whl", hash = "sha256:97a68e6ada378df82bc9f16b800ab77cbf4b2fada0081794318520138c088e4a"},
+    {file = "MarkupSafe-2.1.1-cp38-cp38-macosx_10_9_universal2.whl", hash = "sha256:e8c843bbcda3a2f1e3c2ab25913c80a3c5376cd00c6e8c4a86a89a28c8dc5452"},
+    {file = "MarkupSafe-2.1.1-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:0212a68688482dc52b2d45013df70d169f542b7394fc744c02a57374a4207003"},
+    {file = "MarkupSafe-2.1.1-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:8e576a51ad59e4bfaac456023a78f6b5e6e7651dcd383bcc3e18d06f9b55d6d1"},
+    {file = "MarkupSafe-2.1.1-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:4b9fe39a2ccc108a4accc2676e77da025ce383c108593d65cc909add5c3bd601"},
+    {file = "MarkupSafe-2.1.1-cp38-cp38-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:96e37a3dc86e80bf81758c152fe66dbf60ed5eca3d26305edf01892257049925"},
+    {file = "MarkupSafe-2.1.1-cp38-cp38-musllinux_1_1_aarch64.whl", hash = "sha256:6d0072fea50feec76a4c418096652f2c3238eaa014b2f94aeb1d56a66b41403f"},
+    {file = "MarkupSafe-2.1.1-cp38-cp38-musllinux_1_1_i686.whl", hash = "sha256:089cf3dbf0cd6c100f02945abeb18484bd1ee57a079aefd52cffd17fba910b88"},
+    {file = "MarkupSafe-2.1.1-cp38-cp38-musllinux_1_1_x86_64.whl", hash = "sha256:6a074d34ee7a5ce3effbc526b7083ec9731bb3cbf921bbe1d3005d4d2bdb3a63"},
+    {file = "MarkupSafe-2.1.1-cp38-cp38-win32.whl", hash = "sha256:421be9fbf0ffe9ffd7a378aafebbf6f4602d564d34be190fc19a193232fd12b1"},
+    {file = "MarkupSafe-2.1.1-cp38-cp38-win_amd64.whl", hash = "sha256:fc7b548b17d238737688817ab67deebb30e8073c95749d55538ed473130ec0c7"},
+    {file = "MarkupSafe-2.1.1-cp39-cp39-macosx_10_9_universal2.whl", hash = "sha256:e04e26803c9c3851c931eac40c695602c6295b8d432cbe78609649ad9bd2da8a"},
+    {file = "MarkupSafe-2.1.1-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:b87db4360013327109564f0e591bd2a3b318547bcef31b468a92ee504d07ae4f"},
+    {file = "MarkupSafe-2.1.1-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:99a2a507ed3ac881b975a2976d59f38c19386d128e7a9a18b7df6fff1fd4c1d6"},
+    {file = "MarkupSafe-2.1.1-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:56442863ed2b06d19c37f94d999035e15ee982988920e12a5b4ba29b62ad1f77"},
+    {file = "MarkupSafe-2.1.1-cp39-cp39-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:3ce11ee3f23f79dbd06fb3d63e2f6af7b12db1d46932fe7bd8afa259a5996603"},
+    {file = "MarkupSafe-2.1.1-cp39-cp39-musllinux_1_1_aarch64.whl", hash = "sha256:33b74d289bd2f5e527beadcaa3f401e0df0a89927c1559c8566c066fa4248ab7"},
+    {file = "MarkupSafe-2.1.1-cp39-cp39-musllinux_1_1_i686.whl", hash = "sha256:43093fb83d8343aac0b1baa75516da6092f58f41200907ef92448ecab8825135"},
+    {file = "MarkupSafe-2.1.1-cp39-cp39-musllinux_1_1_x86_64.whl", hash = "sha256:8e3dcf21f367459434c18e71b2a9532d96547aef8a871872a5bd69a715c15f96"},
+    {file = "MarkupSafe-2.1.1-cp39-cp39-win32.whl", hash = "sha256:d4306c36ca495956b6d568d276ac11fdd9c30a36f1b6eb928070dc5360b22e1c"},
+    {file = "MarkupSafe-2.1.1-cp39-cp39-win_amd64.whl", hash = "sha256:46d00d6cfecdde84d40e572d63735ef81423ad31184100411e6e3388d405e247"},
+    {file = "MarkupSafe-2.1.1.tar.gz", hash = "sha256:7f91197cc9e48f989d12e4e6fbc46495c446636dfc81b9ccf50bb0ec74b91d4b"},
+]
+more-itertools = [
+    {file = "more-itertools-9.0.0.tar.gz", hash = "sha256:5a6257e40878ef0520b1803990e3e22303a41b5714006c32a3fd8304b26ea1ab"},
+    {file = "more_itertools-9.0.0-py3-none-any.whl", hash = "sha256:250e83d7e81d0c87ca6bd942e6aeab8cc9daa6096d12c5308f3f92fa5e5c1f41"},
+]
+mypy-extensions = [
+    {file = "mypy_extensions-0.4.3-py2.py3-none-any.whl", hash = "sha256:090fedd75945a69ae91ce1303b5824f428daf5a028d2f6ab8a299250a846f15d"},
+    {file = "mypy_extensions-0.4.3.tar.gz", hash = "sha256:2d82818f5bb3e369420cb3c4060a7970edba416647068eb4c5343488a6c604a8"},
+]
+nodeenv = [
+    {file = "nodeenv-1.7.0-py2.py3-none-any.whl", hash = "sha256:27083a7b96a25f2f5e1d8cb4b6317ee8aeda3bdd121394e5ac54e498028a042e"},
+    {file = "nodeenv-1.7.0.tar.gz", hash = "sha256:e0e7f7dfb85fc5394c6fe1e8fa98131a2473e04311a45afb6508f7cf1836fa2b"},
+]
+packaging = [
+    {file = "packaging-22.0-py3-none-any.whl", hash = "sha256:957e2148ba0e1a3b282772e791ef1d8083648bc131c8ab0c1feba110ce1146c3"},
+    {file = "packaging-22.0.tar.gz", hash = "sha256:2198ec20bd4c017b8f9717e00f0c8714076fc2fd93816750ab48e2c41de2cfd3"},
+]
+parse = [
+    {file = "parse-1.19.0.tar.gz", hash = "sha256:9ff82852bcb65d139813e2a5197627a94966245c897796760a3a2a8eb66f020b"},
+]
+pathspec = [
+    {file = "pathspec-0.10.3-py3-none-any.whl", hash = "sha256:3c95343af8b756205e2aba76e843ba9520a24dd84f68c22b9f93251507509dd6"},
+    {file = "pathspec-0.10.3.tar.gz", hash = "sha256:56200de4077d9d0791465aa9095a01d421861e405b5096955051deefd697d6f6"},
+]
+platformdirs = [
+    {file = "platformdirs-2.6.2-py3-none-any.whl", hash = "sha256:83c8f6d04389165de7c9b6f0c682439697887bca0aa2f1c87ef1826be3584490"},
+    {file = "platformdirs-2.6.2.tar.gz", hash = "sha256:e1fea1fe471b9ff8332e229df3cb7de4f53eeea4998d3b6bfff542115e998bd2"},
+]
+pluggy = [
+    {file = "pluggy-1.0.0-py2.py3-none-any.whl", hash = "sha256:74134bbf457f031a36d68416e1509f34bd5ccc019f0bcc952c7b909d06b37bd3"},
+    {file = "pluggy-1.0.0.tar.gz", hash = "sha256:4224373bacce55f955a878bf9cfa763c1e360858e330072059e10bad68531159"},
+]
+pre-commit = [
+    {file = "pre_commit-2.21.0-py2.py3-none-any.whl", hash = "sha256:e2f91727039fc39a92f58a588a25b87f936de6567eed4f0e673e0507edc75bad"},
+    {file = "pre_commit-2.21.0.tar.gz", hash = "sha256:31ef31af7e474a8d8995027fefdfcf509b5c913ff31f2015b4ec4beb26a6f658"},
+]
+pyproject-api = [
+    {file = "pyproject_api-1.4.0-py3-none-any.whl", hash = "sha256:c34226297781efdd1ba4dfb74ce21076d9a8360e2125ea31803c1a02c76b2460"},
+    {file = "pyproject_api-1.4.0.tar.gz", hash = "sha256:ac85c1f82e0291dbae5a7739dbb9a990e11ee4034c9b5599ea714f07a24ecd71"},
+]
+pytest = [
+    {file = "pytest-7.2.0-py3-none-any.whl", hash = "sha256:892f933d339f068883b6fd5a459f03d85bfcb355e4981e146d2c7616c21fef71"},
+    {file = "pytest-7.2.0.tar.gz", hash = "sha256:c4014eb40e10f11f355ad4e3c2fb2c6c6d1919c73f3b5a433de4708202cade59"},
+]
+pytest-cov = [
+    {file = "pytest-cov-4.0.0.tar.gz", hash = "sha256:996b79efde6433cdbd0088872dbc5fb3ed7fe1578b68cdbba634f14bb8dd0470"},
+    {file = "pytest_cov-4.0.0-py3-none-any.whl", hash = "sha256:2feb1b751d66a8bd934e5edfa2e961d11309dc37b73b0eabe73b5945fee20f6b"},
+]
+pytest-xdist = [
+    {file = "pytest-xdist-3.1.0.tar.gz", hash = "sha256:40fdb8f3544921c5dfcd486ac080ce22870e71d82ced6d2e78fa97c2addd480c"},
+    {file = "pytest_xdist-3.1.0-py3-none-any.whl", hash = "sha256:70a76f191d8a1d2d6be69fc440cdf85f3e4c03c08b520fd5dc5d338d6cf07d89"},
+]
+python-dateutil = [
+    {file = "python-dateutil-2.8.2.tar.gz", hash = "sha256:0123cacc1627ae19ddf3c27a5de5bd67ee4586fbdd6440d9748f8abb483d3e86"},
+    {file = "python_dateutil-2.8.2-py2.py3-none-any.whl", hash = "sha256:961d03dc3453ebbc59dbdea9e4e11c5651520a876d0f4db161e8674aae935da9"},
+]
+python-dotenv = [
+    {file = "python-dotenv-0.21.0.tar.gz", hash = "sha256:b77d08274639e3d34145dfa6c7008e66df0f04b7be7a75fd0d5292c191d79045"},
+    {file = "python_dotenv-0.21.0-py3-none-any.whl", hash = "sha256:1684eb44636dd462b66c3ee016599815514527ad99965de77f43e0944634a7e5"},
+]
+python-slugify = [
+    {file = "python-slugify-7.0.0.tar.gz", hash = "sha256:7a0f21a39fa6c1c4bf2e5984c9b9ae944483fd10b54804cb0e23a3ccd4954f0b"},
+    {file = "python_slugify-7.0.0-py2.py3-none-any.whl", hash = "sha256:003aee64f9fd955d111549f96c4b58a3f40b9319383c70fad6277a4974bbf570"},
+]
+pyyaml = [
+    {file = "PyYAML-6.0-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:d4db7c7aef085872ef65a8fd7d6d09a14ae91f691dec3e87ee5ee0539d516f53"},
+    {file = "PyYAML-6.0-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:9df7ed3b3d2e0ecfe09e14741b857df43adb5a3ddadc919a2d94fbdf78fea53c"},
+    {file = "PyYAML-6.0-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:77f396e6ef4c73fdc33a9157446466f1cff553d979bd00ecb64385760c6babdc"},
+    {file = "PyYAML-6.0-cp310-cp310-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:a80a78046a72361de73f8f395f1f1e49f956c6be882eed58505a15f3e430962b"},
+    {file = "PyYAML-6.0-cp310-cp310-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:f84fbc98b019fef2ee9a1cb3ce93e3187a6df0b2538a651bfb890254ba9f90b5"},
+    {file = "PyYAML-6.0-cp310-cp310-win32.whl", hash = "sha256:2cd5df3de48857ed0544b34e2d40e9fac445930039f3cfe4bcc592a1f836d513"},
+    {file = "PyYAML-6.0-cp310-cp310-win_amd64.whl", hash = "sha256:daf496c58a8c52083df09b80c860005194014c3698698d1a57cbcfa182142a3a"},
+    {file = "PyYAML-6.0-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:d4b0ba9512519522b118090257be113b9468d804b19d63c71dbcf4a48fa32358"},
+    {file = "PyYAML-6.0-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:81957921f441d50af23654aa6c5e5eaf9b06aba7f0a19c18a538dc7ef291c5a1"},
+    {file = "PyYAML-6.0-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:afa17f5bc4d1b10afd4466fd3a44dc0e245382deca5b3c353d8b757f9e3ecb8d"},
+    {file = "PyYAML-6.0-cp311-cp311-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:dbad0e9d368bb989f4515da330b88a057617d16b6a8245084f1b05400f24609f"},
+    {file = "PyYAML-6.0-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:432557aa2c09802be39460360ddffd48156e30721f5e8d917f01d31694216782"},
+    {file = "PyYAML-6.0-cp311-cp311-win32.whl", hash = "sha256:bfaef573a63ba8923503d27530362590ff4f576c626d86a9fed95822a8255fd7"},
+    {file = "PyYAML-6.0-cp311-cp311-win_amd64.whl", hash = "sha256:01b45c0191e6d66c470b6cf1b9531a771a83c1c4208272ead47a3ae4f2f603bf"},
+    {file = "PyYAML-6.0-cp36-cp36m-macosx_10_9_x86_64.whl", hash = "sha256:897b80890765f037df3403d22bab41627ca8811ae55e9a722fd0392850ec4d86"},
+    {file = "PyYAML-6.0-cp36-cp36m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:50602afada6d6cbfad699b0c7bb50d5ccffa7e46a3d738092afddc1f9758427f"},
+    {file = "PyYAML-6.0-cp36-cp36m-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:48c346915c114f5fdb3ead70312bd042a953a8ce5c7106d5bfb1a5254e47da92"},
+    {file = "PyYAML-6.0-cp36-cp36m-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:98c4d36e99714e55cfbaaee6dd5badbc9a1ec339ebfc3b1f52e293aee6bb71a4"},
+    {file = "PyYAML-6.0-cp36-cp36m-win32.whl", hash = "sha256:0283c35a6a9fbf047493e3a0ce8d79ef5030852c51e9d911a27badfde0605293"},
+    {file = "PyYAML-6.0-cp36-cp36m-win_amd64.whl", hash = "sha256:07751360502caac1c067a8132d150cf3d61339af5691fe9e87803040dbc5db57"},
+    {file = "PyYAML-6.0-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:819b3830a1543db06c4d4b865e70ded25be52a2e0631ccd2f6a47a2822f2fd7c"},
+    {file = "PyYAML-6.0-cp37-cp37m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:473f9edb243cb1935ab5a084eb238d842fb8f404ed2193a915d1784b5a6b5fc0"},
+    {file = "PyYAML-6.0-cp37-cp37m-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:0ce82d761c532fe4ec3f87fc45688bdd3a4c1dc5e0b4a19814b9009a29baefd4"},
+    {file = "PyYAML-6.0-cp37-cp37m-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:231710d57adfd809ef5d34183b8ed1eeae3f76459c18fb4a0b373ad56bedcdd9"},
+    {file = "PyYAML-6.0-cp37-cp37m-win32.whl", hash = "sha256:c5687b8d43cf58545ade1fe3e055f70eac7a5a1a0bf42824308d868289a95737"},
+    {file = "PyYAML-6.0-cp37-cp37m-win_amd64.whl", hash = "sha256:d15a181d1ecd0d4270dc32edb46f7cb7733c7c508857278d3d378d14d606db2d"},
+    {file = "PyYAML-6.0-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:0b4624f379dab24d3725ffde76559cff63d9ec94e1736b556dacdfebe5ab6d4b"},
+    {file = "PyYAML-6.0-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:213c60cd50106436cc818accf5baa1aba61c0189ff610f64f4a3e8c6726218ba"},
+    {file = "PyYAML-6.0-cp38-cp38-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:9fa600030013c4de8165339db93d182b9431076eb98eb40ee068700c9c813e34"},
+    {file = "PyYAML-6.0-cp38-cp38-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:277a0ef2981ca40581a47093e9e2d13b3f1fbbeffae064c1d21bfceba2030287"},
+    {file = "PyYAML-6.0-cp38-cp38-win32.whl", hash = "sha256:d4eccecf9adf6fbcc6861a38015c2a64f38b9d94838ac1810a9023a0609e1b78"},
+    {file = "PyYAML-6.0-cp38-cp38-win_amd64.whl", hash = "sha256:1e4747bc279b4f613a09eb64bba2ba602d8a6664c6ce6396a4d0cd413a50ce07"},
+    {file = "PyYAML-6.0-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:055d937d65826939cb044fc8c9b08889e8c743fdc6a32b33e2390f66013e449b"},
+    {file = "PyYAML-6.0-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:e61ceaab6f49fb8bdfaa0f92c4b57bcfbea54c09277b1b4f7ac376bfb7a7c174"},
+    {file = "PyYAML-6.0-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:d67d839ede4ed1b28a4e8909735fc992a923cdb84e618544973d7dfc71540803"},
+    {file = "PyYAML-6.0-cp39-cp39-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:cba8c411ef271aa037d7357a2bc8f9ee8b58b9965831d9e51baf703280dc73d3"},
+    {file = "PyYAML-6.0-cp39-cp39-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:40527857252b61eacd1d9af500c3337ba8deb8fc298940291486c465c8b46ec0"},
+    {file = "PyYAML-6.0-cp39-cp39-win32.whl", hash = "sha256:b5b9eccad747aabaaffbc6064800670f0c297e52c12754eb1d976c57e4f74dcb"},
+    {file = "PyYAML-6.0-cp39-cp39-win_amd64.whl", hash = "sha256:b3d267842bf12586ba6c734f89d1f5b871df0273157918b0ccefa29deb05c21c"},
+    {file = "PyYAML-6.0.tar.gz", hash = "sha256:68fb519c14306fec9720a2a5b45bc9f0c8d1b9c72adf45c37baedfcd949c35a2"},
+]
+requests = [
+    {file = "requests-2.28.1-py3-none-any.whl", hash = "sha256:8fefa2a1a1365bf5520aac41836fbee479da67864514bdb821f31ce07ce65349"},
+    {file = "requests-2.28.1.tar.gz", hash = "sha256:7c5599b102feddaa661c826c56ab4fee28bfd17f5abca1ebbe3e7f19d7c97983"},
+]
+setuptools = [
+    {file = "setuptools-65.6.3-py3-none-any.whl", hash = "sha256:57f6f22bde4e042978bcd50176fdb381d7c21a9efa4041202288d3737a0c6a54"},
+    {file = "setuptools-65.6.3.tar.gz", hash = "sha256:a7620757bf984b58deaf32fc8a4577a9bbc0850cf92c20e1ce41c38c19e5fb75"},
+]
+six = [
+    {file = "six-1.16.0-py2.py3-none-any.whl", hash = "sha256:8abb2f1d86890a2dfb989f9a77cfcfd3e47c2a354b01111771326f8aa26e0254"},
+    {file = "six-1.16.0.tar.gz", hash = "sha256:1e61c37477a1626458e36f7b1d82aa5c9b094fa4802892072e49de9c60c4c926"},
+]
+soupsieve = [
+    {file = "soupsieve-2.3.2.post1-py3-none-any.whl", hash = "sha256:3b2503d3c7084a42b1ebd08116e5f81aadfaea95863628c80a3b774a11b7c759"},
+    {file = "soupsieve-2.3.2.post1.tar.gz", hash = "sha256:fc53893b3da2c33de295667a0e19f078c14bf86544af307354de5fcf12a3f30d"},
+]
+text-unidecode = [
+    {file = "text-unidecode-1.3.tar.gz", hash = "sha256:bad6603bb14d279193107714b288be206cac565dfa49aa5b105294dd5c4aab93"},
+    {file = "text_unidecode-1.3-py2.py3-none-any.whl", hash = "sha256:1311f10e8b895935241623731c2ba64f4c455287888b18189350b67134a822e8"},
+]
+tox = [
+    {file = "tox-4.2.6-py3-none-any.whl", hash = "sha256:fb79b3e4b788491949576a9c80c2d56419eac994567c3591e24bb2788b5901d0"},
+    {file = "tox-4.2.6.tar.gz", hash = "sha256:ecf224a4f3a318adcdd71aa8fe15ffd31f14afd6a9845a43ffd63950a7325538"},
+]
+tqdm = [
+    {file = "tqdm-4.64.1-py2.py3-none-any.whl", hash = "sha256:6fee160d6ffcd1b1c68c65f14c829c22832bc401726335ce92c52d395944a6a1"},
+    {file = "tqdm-4.64.1.tar.gz", hash = "sha256:5f4f682a004951c1b450bc753c710e9280c5746ce6ffedee253ddbcbf54cf1e4"},
+]
+urllib3 = [
+    {file = "urllib3-1.26.13-py2.py3-none-any.whl", hash = "sha256:47cc05d99aaa09c9e72ed5809b60e7ba354e64b59c9c173ac3018642d8bb41fc"},
+    {file = "urllib3-1.26.13.tar.gz", hash = "sha256:c083dd0dce68dbfbe1129d5271cb90f9447dea7d52097c6e0126120c521ddea8"},
+]
+virtualenv = [
+    {file = "virtualenv-20.17.1-py3-none-any.whl", hash = "sha256:ce3b1684d6e1a20a3e5ed36795a97dfc6af29bc3970ca8dab93e11ac6094b3c4"},
+    {file = "virtualenv-20.17.1.tar.gz", hash = "sha256:f8b927684efc6f1cc206c9db297a570ab9ad0e51c16fa9e45487d36d1905c058"},
+]
diff --git a/pyproject.toml b/pyproject.toml
index d427bc63..82e173a5 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -22,7 +22,7 @@ pytest = "^7.2.0"
 pytest-cov = "^4.0.0"
 pytest-xdist = "^3.1.0"
 python-dotenv = "^0.21.0"
-tox = "^4.2.5"
+tox = "^4.2.6"
 pre-commit = "^2.21.0"
 isort = "^5.11.4"
 

From a769fe5a2819ee0eeaf53fd3249b9fb0e49f9439 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 10 Jan 2023 10:15:42 +0100
Subject: [PATCH 265/371] Bump tox from 4.2.4 to 4.2.6 (#116)

Bumps [tox](https://github.com/tox-dev/tox) from 4.2.4 to 4.2.6.
- [Release notes](https://github.com/tox-dev/tox/releases)
- [Changelog](https://github.com/tox-dev/tox/blob/main/docs/changelog.rst)
- [Commits](https://github.com/tox-dev/tox/compare/4.2.4...4.2.6)

---
updated-dependencies:
- dependency-name: tox
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 poetry.lock    | 8 ++++----
 pyproject.toml | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/poetry.lock b/poetry.lock
index 0e0b4680..91857f38 100644
--- a/poetry.lock
+++ b/poetry.lock
@@ -546,7 +546,7 @@ python-versions = ">=3.7"
 
 [[package]]
 name = "tox"
-version = "4.2.4"
+version = "4.2.6"
 description = "tox is a generic virtualenv management and test command line tool"
 category = "dev"
 optional = false
@@ -618,7 +618,7 @@ testing = ["coverage (>=6.2)", "coverage-enable-subprocess (>=1)", "flaky (>=3.7
 [metadata]
 lock-version = "1.1"
 python-versions = "^3.10"
-content-hash = "b75cde6334c61a9e693c7b0de526488ee824c10d1fa6f1e8c3be08eb8f640981"
+content-hash = "c99fee43853c4f2ce20b9e22b04024969621db9df14dcdec7341acb867097b29"
 
 [metadata.files]
 anytree = [
@@ -944,8 +944,8 @@ tomli = [
     {file = "tomli-2.0.1.tar.gz", hash = "sha256:de526c12914f0c550d15924c62d72abc48d6fe7364aa87328337a31007fe8a4f"},
 ]
 tox = [
-    {file = "tox-4.2.4-py3-none-any.whl", hash = "sha256:f51407aaff87f6f5361ae2733cffd371940ed001792b60ea50d955c266b3b22b"},
-    {file = "tox-4.2.4.tar.gz", hash = "sha256:05b1cbf94e02eff40818860b352b4a452d7369558f3bb05809043c6b4c36e5f4"},
+    {file = "tox-4.2.6-py3-none-any.whl", hash = "sha256:fb79b3e4b788491949576a9c80c2d56419eac994567c3591e24bb2788b5901d0"},
+    {file = "tox-4.2.6.tar.gz", hash = "sha256:ecf224a4f3a318adcdd71aa8fe15ffd31f14afd6a9845a43ffd63950a7325538"},
 ]
 tqdm = [
     {file = "tqdm-4.64.1-py2.py3-none-any.whl", hash = "sha256:6fee160d6ffcd1b1c68c65f14c829c22832bc401726335ce92c52d395944a6a1"},
diff --git a/pyproject.toml b/pyproject.toml
index edfc4b15..5f1dcc2a 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -20,7 +20,7 @@ pytest = "^7.2.0"
 pytest-cov = "^4.0.0"
 pytest-xdist = "^3.1.0"
 python-dotenv = "^0.21.0"
-tox = "^4.2.4"
+tox = "^4.2.6"
 pre-commit = "^2.21.0"
 isort = "^5.11.4"
 

From 06620f349a6a2d5f1f34a9794b94efcd01d9e902 Mon Sep 17 00:00:00 2001
From: Roel Adriaans <roel.adriaans@ordina.nl>
Date: Wed, 11 Jan 2023 19:02:04 +0100
Subject: [PATCH 266/371] Day 15 now works, slowly :)

---
 src/adventofcode2022/solutions/day15.py | 21 +++++++--------------
 tests/solutions/test_day15_b.py         |  4 ++--
 2 files changed, 9 insertions(+), 16 deletions(-)

diff --git a/src/adventofcode2022/solutions/day15.py b/src/adventofcode2022/solutions/day15.py
index 8edaa761..71fdf586 100644
--- a/src/adventofcode2022/solutions/day15.py
+++ b/src/adventofcode2022/solutions/day15.py
@@ -1,8 +1,9 @@
+from typing import NamedTuple
+
 from parse import parse
 
 from adventofcode2022.utils.abstract import FileReaderSolution
 from adventofcode2022.utils.point import XYPoint as Point
-from typing import NamedTuple
 
 
 class Line(NamedTuple):
@@ -72,34 +73,26 @@ def find_frequency(self, factor: int) -> int:
         """Find the tuning frequency"""
         y = 0
         while y < factor:
-            print(f"New line {y}")
             x = 0
             while x <= factor:
-                # print(f"new {x=}")
                 new_x = x
                 for line in self.lines:
                     new_x = self.skip_over_line(line, x, y)
-                    # print(f"{new_x=}")
                     if x != new_x:
                         break
                 if new_x == x:
                     # Return here?
-                    res = (x * factor) + y
-                    print(f"Result ?? {res=}")
-                    y = factor + 1
-                    break
+                    res = (x * 4000000) + y
+                    return res
                 x = new_x
             y += 1
-        return (x * factor) + y
+        return -1
 
     def skip_over_line(self, line, x, y):
         remaining = self.remaining_on_line(line, y)
-        if x >= line.sensor.x - remaining and x <= line.sensor.x + remaining:
-            return line.sensor.x + 1
+        if line.sensor.x - remaining <= x <= line.sensor.x + remaining:
+            return line.sensor.x + 1 + remaining
         return x
-        # if line[0].x - remaining <= x <= line[0].x + remaining:
-        #     return line[0].x + remaining + 1
-        # return x
 
     def execute(self, input_data: str, factor: int) -> int:
         self.parse(input_data.splitlines())
diff --git a/tests/solutions/test_day15_b.py b/tests/solutions/test_day15_b.py
index e372771c..a1a84179 100644
--- a/tests/solutions/test_day15_b.py
+++ b/tests/solutions/test_day15_b.py
@@ -9,9 +9,9 @@ def test_day15b_solve(self, testdata):
         result = solution.execute(testdata, 20)
         assert result == 56000011
 
-    @pytest.mark.xfail(reason="Not yet implemented", raises=NotImplementedError)
+    @pytest.mark.skip(reason="Right answer, but very slow")
     def test_day15b_data(self):
         """Result we got when we did the real solution"""
         solution = Day15PartB()
         res = solution("day_15/day15.txt")
-        assert res == 0
+        assert res == 13134039205729

From 942f352d95202c9a2d78b8157960d1f5d781b354 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 12 Jan 2023 04:16:24 +0000
Subject: [PATCH 267/371] Bump tox from 4.2.6 to 4.2.8

Bumps [tox](https://github.com/tox-dev/tox) from 4.2.6 to 4.2.8.
- [Release notes](https://github.com/tox-dev/tox/releases)
- [Changelog](https://github.com/tox-dev/tox/blob/main/docs/changelog.rst)
- [Commits](https://github.com/tox-dev/tox/compare/4.2.6...4.2.8)

---
updated-dependencies:
- dependency-name: tox
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 poetry.lock    | 704 ++++++++++++++++++++++++-------------------------
 pyproject.toml |   2 +-
 2 files changed, 353 insertions(+), 353 deletions(-)

diff --git a/poetry.lock b/poetry.lock
index 91857f38..2f891059 100644
--- a/poetry.lock
+++ b/poetry.lock
@@ -1,3 +1,5 @@
+# This file is automatically @generated by Poetry and should not be changed by hand.
+
 [[package]]
 name = "anytree"
 version = "2.8.0"
@@ -5,6 +7,10 @@ description = "Powerful and Lightweight Python Tree Data Structure.."
 category = "main"
 optional = false
 python-versions = "*"
+files = [
+    {file = "anytree-2.8.0-py2.py3-none-any.whl", hash = "sha256:14c55ac77492b11532395049a03b773d14c7e30b22aa012e337b1e983de31521"},
+    {file = "anytree-2.8.0.tar.gz", hash = "sha256:3f0f93f355a91bc3e6245319bf4c1d50e3416cc7a35cc1133c1ff38306bbccab"},
+]
 
 [package.dependencies]
 six = ">=1.9.0"
@@ -20,6 +26,10 @@ description = "Better dates & times for Python"
 category = "dev"
 optional = false
 python-versions = ">=3.6"
+files = [
+    {file = "arrow-1.2.3-py3-none-any.whl", hash = "sha256:5a49ab92e3b7b71d96cd6bfcc4df14efefc9dfa96ea19045815914a6ab6b1fe2"},
+    {file = "arrow-1.2.3.tar.gz", hash = "sha256:3934b30ca1b9f292376d9db15b19446088d12ec58629bc3f0da28fd55fb633a1"},
+]
 
 [package.dependencies]
 python-dateutil = ">=2.7.0"
@@ -31,6 +41,10 @@ description = "Classes Without Boilerplate"
 category = "dev"
 optional = false
 python-versions = ">=3.5"
+files = [
+    {file = "attrs-22.1.0-py2.py3-none-any.whl", hash = "sha256:86efa402f67bf2df34f51a335487cf46b1ec130d02b8d39fd248abfd30da551c"},
+    {file = "attrs-22.1.0.tar.gz", hash = "sha256:29adc2665447e5191d0e7c568fde78b21f9672d344281d0c6e1ab085429b22b6"},
+]
 
 [package.extras]
 dev = ["cloudpickle", "coverage[toml] (>=5.0.2)", "furo", "hypothesis", "mypy (>=0.900,!=0.940)", "pre-commit", "pympler", "pytest (>=4.3.0)", "pytest-mypy-plugins", "sphinx", "sphinx-notfound-page", "zope.interface"]
@@ -45,6 +59,10 @@ description = "Screen-scraping library"
 category = "main"
 optional = false
 python-versions = ">=3.6.0"
+files = [
+    {file = "beautifulsoup4-4.11.1-py3-none-any.whl", hash = "sha256:58d5c3d29f5a36ffeb94f02f0d786cd53014cf9b3b3951d42e0080d8a9498d30"},
+    {file = "beautifulsoup4-4.11.1.tar.gz", hash = "sha256:ad9aa55b65ef2808eb405f46cf74df7fcb7044d5cbc26487f96eb2ef2e436693"},
+]
 
 [package.dependencies]
 soupsieve = ">1.2"
@@ -60,6 +78,10 @@ description = "Ultra-lightweight pure Python package to check if a file is binar
 category = "dev"
 optional = false
 python-versions = "*"
+files = [
+    {file = "binaryornot-0.4.4-py2.py3-none-any.whl", hash = "sha256:b8b71173c917bddcd2c16070412e369c3ed7f0528926f70cac18a6c97fd563e4"},
+    {file = "binaryornot-0.4.4.tar.gz", hash = "sha256:359501dfc9d40632edc9fac890e19542db1a287bbcfa58175b66658392018061"},
+]
 
 [package.dependencies]
 chardet = ">=3.0.2"
@@ -71,6 +93,20 @@ description = "The uncompromising code formatter."
 category = "dev"
 optional = false
 python-versions = ">=3.7"
+files = [
+    {file = "black-22.12.0-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:9eedd20838bd5d75b80c9f5487dbcb06836a43833a37846cf1d8c1cc01cef59d"},
+    {file = "black-22.12.0-cp310-cp310-win_amd64.whl", hash = "sha256:159a46a4947f73387b4d83e87ea006dbb2337eab6c879620a3ba52699b1f4351"},
+    {file = "black-22.12.0-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:d30b212bffeb1e252b31dd269dfae69dd17e06d92b87ad26e23890f3efea366f"},
+    {file = "black-22.12.0-cp311-cp311-win_amd64.whl", hash = "sha256:7412e75863aa5c5411886804678b7d083c7c28421210180d67dfd8cf1221e1f4"},
+    {file = "black-22.12.0-cp37-cp37m-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:c116eed0efb9ff870ded8b62fe9f28dd61ef6e9ddd28d83d7d264a38417dcee2"},
+    {file = "black-22.12.0-cp37-cp37m-win_amd64.whl", hash = "sha256:1f58cbe16dfe8c12b7434e50ff889fa479072096d79f0a7f25e4ab8e94cd8350"},
+    {file = "black-22.12.0-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:77d86c9f3db9b1bf6761244bc0b3572a546f5fe37917a044e02f3166d5aafa7d"},
+    {file = "black-22.12.0-cp38-cp38-win_amd64.whl", hash = "sha256:82d9fe8fee3401e02e79767016b4907820a7dc28d70d137eb397b92ef3cc5bfc"},
+    {file = "black-22.12.0-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:101c69b23df9b44247bd88e1d7e90154336ac4992502d4197bdac35dd7ee3320"},
+    {file = "black-22.12.0-cp39-cp39-win_amd64.whl", hash = "sha256:559c7a1ba9a006226f09e4916060982fd27334ae1998e7a38b3f33a37f7a2148"},
+    {file = "black-22.12.0-py3-none-any.whl", hash = "sha256:436cc9167dd28040ad90d3b404aec22cedf24a6e4d7de221bec2730ec0c97bcf"},
+    {file = "black-22.12.0.tar.gz", hash = "sha256:229351e5a18ca30f447bf724d007f890f97e13af070bb6ad4c0a441cd7596a2f"},
+]
 
 [package.dependencies]
 click = ">=8.0.0"
@@ -87,11 +123,15 @@ uvloop = ["uvloop (>=0.15.2)"]
 
 [[package]]
 name = "cachetools"
-version = "5.2.0"
+version = "5.2.1"
 description = "Extensible memoizing collections and decorators"
 category = "dev"
 optional = false
 python-versions = "~=3.7"
+files = [
+    {file = "cachetools-5.2.1-py3-none-any.whl", hash = "sha256:8462eebf3a6c15d25430a8c27c56ac61340b2ecf60c9ce57afc2b97e450e47da"},
+    {file = "cachetools-5.2.1.tar.gz", hash = "sha256:5991bc0e08a1319bb618d3195ca5b6bc76646a49c21d55962977197b301cc1fe"},
+]
 
 [[package]]
 name = "certifi"
@@ -100,6 +140,10 @@ description = "Python package for providing Mozilla's CA Bundle."
 category = "main"
 optional = false
 python-versions = ">=3.6"
+files = [
+    {file = "certifi-2022.12.7-py3-none-any.whl", hash = "sha256:4ad3232f5e926d6718ec31cfc1fcadfde020920e278684144551c91769c7bc18"},
+    {file = "certifi-2022.12.7.tar.gz", hash = "sha256:35824b4c3a97115964b408844d64aa14db1cc518f6562e8d7261699d1350a9e3"},
+]
 
 [[package]]
 name = "cfgv"
@@ -108,6 +152,10 @@ description = "Validate configuration and produce human readable error messages.
 category = "dev"
 optional = false
 python-versions = ">=3.6.1"
+files = [
+    {file = "cfgv-3.3.1-py2.py3-none-any.whl", hash = "sha256:c6a0883f3917a037485059700b9e75da2464e6c27051014ad85ba6aaa5884426"},
+    {file = "cfgv-3.3.1.tar.gz", hash = "sha256:f5a830efb9ce7a445376bb66ec94c638a9787422f96264c98edc6bdeed8ab736"},
+]
 
 [[package]]
 name = "chardet"
@@ -116,6 +164,10 @@ description = "Universal encoding detector for Python 3"
 category = "dev"
 optional = false
 python-versions = ">=3.7"
+files = [
+    {file = "chardet-5.1.0-py3-none-any.whl", hash = "sha256:362777fb014af596ad31334fde1e8c327dfdb076e1960d1694662d46a6917ab9"},
+    {file = "chardet-5.1.0.tar.gz", hash = "sha256:0d62712b956bc154f85fb0a266e2a3c5913c2967e00348701b32411d6def31e5"},
+]
 
 [[package]]
 name = "charset-normalizer"
@@ -124,6 +176,10 @@ description = "The Real First Universal Charset Detector. Open, modern and activ
 category = "main"
 optional = false
 python-versions = ">=3.6.0"
+files = [
+    {file = "charset-normalizer-2.1.1.tar.gz", hash = "sha256:5a3d016c7c547f69d6f81fb0db9449ce888b418b5b9952cc5e6e66843e9dd845"},
+    {file = "charset_normalizer-2.1.1-py3-none-any.whl", hash = "sha256:83e9a75d1911279afd89352c68b45348559d1fc0506b054b346651b5e7fee29f"},
+]
 
 [package.extras]
 unicode-backport = ["unicodedata2"]
@@ -135,6 +191,10 @@ description = "Composable command line interface toolkit"
 category = "main"
 optional = false
 python-versions = ">=3.7"
+files = [
+    {file = "click-8.1.3-py3-none-any.whl", hash = "sha256:bb4d8133cb15a609f44e8213d9b391b0809795062913b383c62be0ee95b1db48"},
+    {file = "click-8.1.3.tar.gz", hash = "sha256:7682dc8afb30297001674575ea00d1814d808d6a36af415a82bd481d37ba7b8e"},
+]
 
 [package.dependencies]
 colorama = {version = "*", markers = "platform_system == \"Windows\""}
@@ -146,6 +206,10 @@ description = "Cross-platform colored terminal text."
 category = "main"
 optional = false
 python-versions = "!=3.0.*,!=3.1.*,!=3.2.*,!=3.3.*,!=3.4.*,!=3.5.*,!=3.6.*,>=2.7"
+files = [
+    {file = "colorama-0.4.6-py2.py3-none-any.whl", hash = "sha256:4f1d9991f5acc0ca119f9d443620b77f9d6b33703e51011c16baf57afb285fc6"},
+    {file = "colorama-0.4.6.tar.gz", hash = "sha256:08695f5cb7ed6e0531a20572697297273c47b8cae5a63ffc6d6ed5c201be6e44"},
+]
 
 [[package]]
 name = "cookiecutter"
@@ -154,6 +218,10 @@ description = "A command-line utility that creates projects from project templat
 category = "dev"
 optional = false
 python-versions = ">=3.7"
+files = [
+    {file = "cookiecutter-2.1.1-py2.py3-none-any.whl", hash = "sha256:9f3ab027cec4f70916e28f03470bdb41e637a3ad354b4d65c765d93aad160022"},
+    {file = "cookiecutter-2.1.1.tar.gz", hash = "sha256:f3982be8d9c53dac1261864013fdec7f83afd2e42ede6f6dd069c5e149c540d5"},
+]
 
 [package.dependencies]
 binaryornot = ">=0.4.4"
@@ -171,6 +239,58 @@ description = "Code coverage measurement for Python"
 category = "dev"
 optional = false
 python-versions = ">=3.7"
+files = [
+    {file = "coverage-6.5.0-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:ef8674b0ee8cc11e2d574e3e2998aea5df5ab242e012286824ea3c6970580e53"},
+    {file = "coverage-6.5.0-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:784f53ebc9f3fd0e2a3f6a78b2be1bd1f5575d7863e10c6e12504f240fd06660"},
+    {file = "coverage-6.5.0-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:b4a5be1748d538a710f87542f22c2cad22f80545a847ad91ce45e77417293eb4"},
+    {file = "coverage-6.5.0-cp310-cp310-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:83516205e254a0cb77d2d7bb3632ee019d93d9f4005de31dca0a8c3667d5bc04"},
+    {file = "coverage-6.5.0-cp310-cp310-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:af4fffaffc4067232253715065e30c5a7ec6faac36f8fc8d6f64263b15f74db0"},
+    {file = "coverage-6.5.0-cp310-cp310-musllinux_1_1_aarch64.whl", hash = "sha256:97117225cdd992a9c2a5515db1f66b59db634f59d0679ca1fa3fe8da32749cae"},
+    {file = "coverage-6.5.0-cp310-cp310-musllinux_1_1_i686.whl", hash = "sha256:a1170fa54185845505fbfa672f1c1ab175446c887cce8212c44149581cf2d466"},
+    {file = "coverage-6.5.0-cp310-cp310-musllinux_1_1_x86_64.whl", hash = "sha256:11b990d520ea75e7ee8dcab5bc908072aaada194a794db9f6d7d5cfd19661e5a"},
+    {file = "coverage-6.5.0-cp310-cp310-win32.whl", hash = "sha256:5dbec3b9095749390c09ab7c89d314727f18800060d8d24e87f01fb9cfb40b32"},
+    {file = "coverage-6.5.0-cp310-cp310-win_amd64.whl", hash = "sha256:59f53f1dc5b656cafb1badd0feb428c1e7bc19b867479ff72f7a9dd9b479f10e"},
+    {file = "coverage-6.5.0-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:4a5375e28c5191ac38cca59b38edd33ef4cc914732c916f2929029b4bfb50795"},
+    {file = "coverage-6.5.0-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:c4ed2820d919351f4167e52425e096af41bfabacb1857186c1ea32ff9983ed75"},
+    {file = "coverage-6.5.0-cp311-cp311-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:33a7da4376d5977fbf0a8ed91c4dffaaa8dbf0ddbf4c8eea500a2486d8bc4d7b"},
+    {file = "coverage-6.5.0-cp311-cp311-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:a8fb6cf131ac4070c9c5a3e21de0f7dc5a0fbe8bc77c9456ced896c12fcdad91"},
+    {file = "coverage-6.5.0-cp311-cp311-musllinux_1_1_aarch64.whl", hash = "sha256:a6b7d95969b8845250586f269e81e5dfdd8ff828ddeb8567a4a2eaa7313460c4"},
+    {file = "coverage-6.5.0-cp311-cp311-musllinux_1_1_i686.whl", hash = "sha256:1ef221513e6f68b69ee9e159506d583d31aa3567e0ae84eaad9d6ec1107dddaa"},
+    {file = "coverage-6.5.0-cp311-cp311-musllinux_1_1_x86_64.whl", hash = "sha256:cca4435eebea7962a52bdb216dec27215d0df64cf27fc1dd538415f5d2b9da6b"},
+    {file = "coverage-6.5.0-cp311-cp311-win32.whl", hash = "sha256:98e8a10b7a314f454d9eff4216a9a94d143a7ee65018dd12442e898ee2310578"},
+    {file = "coverage-6.5.0-cp311-cp311-win_amd64.whl", hash = "sha256:bc8ef5e043a2af066fa8cbfc6e708d58017024dc4345a1f9757b329a249f041b"},
+    {file = "coverage-6.5.0-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:4433b90fae13f86fafff0b326453dd42fc9a639a0d9e4eec4d366436d1a41b6d"},
+    {file = "coverage-6.5.0-cp37-cp37m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:f4f05d88d9a80ad3cac6244d36dd89a3c00abc16371769f1340101d3cb899fc3"},
+    {file = "coverage-6.5.0-cp37-cp37m-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:94e2565443291bd778421856bc975d351738963071e9b8839ca1fc08b42d4bef"},
+    {file = "coverage-6.5.0-cp37-cp37m-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:027018943386e7b942fa832372ebc120155fd970837489896099f5cfa2890f79"},
+    {file = "coverage-6.5.0-cp37-cp37m-musllinux_1_1_aarch64.whl", hash = "sha256:255758a1e3b61db372ec2736c8e2a1fdfaf563977eedbdf131de003ca5779b7d"},
+    {file = "coverage-6.5.0-cp37-cp37m-musllinux_1_1_i686.whl", hash = "sha256:851cf4ff24062c6aec510a454b2584f6e998cada52d4cb58c5e233d07172e50c"},
+    {file = "coverage-6.5.0-cp37-cp37m-musllinux_1_1_x86_64.whl", hash = "sha256:12adf310e4aafddc58afdb04d686795f33f4d7a6fa67a7a9d4ce7d6ae24d949f"},
+    {file = "coverage-6.5.0-cp37-cp37m-win32.whl", hash = "sha256:b5604380f3415ba69de87a289a2b56687faa4fe04dbee0754bfcae433489316b"},
+    {file = "coverage-6.5.0-cp37-cp37m-win_amd64.whl", hash = "sha256:4a8dbc1f0fbb2ae3de73eb0bdbb914180c7abfbf258e90b311dcd4f585d44bd2"},
+    {file = "coverage-6.5.0-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:d900bb429fdfd7f511f868cedd03a6bbb142f3f9118c09b99ef8dc9bf9643c3c"},
+    {file = "coverage-6.5.0-cp38-cp38-macosx_11_0_arm64.whl", hash = "sha256:2198ea6fc548de52adc826f62cb18554caedfb1d26548c1b7c88d8f7faa8f6ba"},
+    {file = "coverage-6.5.0-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:6c4459b3de97b75e3bd6b7d4b7f0db13f17f504f3d13e2a7c623786289dd670e"},
+    {file = "coverage-6.5.0-cp38-cp38-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:20c8ac5386253717e5ccc827caad43ed66fea0efe255727b1053a8154d952398"},
+    {file = "coverage-6.5.0-cp38-cp38-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:6b07130585d54fe8dff3d97b93b0e20290de974dc8177c320aeaf23459219c0b"},
+    {file = "coverage-6.5.0-cp38-cp38-musllinux_1_1_aarch64.whl", hash = "sha256:dbdb91cd8c048c2b09eb17713b0c12a54fbd587d79adcebad543bc0cd9a3410b"},
+    {file = "coverage-6.5.0-cp38-cp38-musllinux_1_1_i686.whl", hash = "sha256:de3001a203182842a4630e7b8d1a2c7c07ec1b45d3084a83d5d227a3806f530f"},
+    {file = "coverage-6.5.0-cp38-cp38-musllinux_1_1_x86_64.whl", hash = "sha256:e07f4a4a9b41583d6eabec04f8b68076ab3cd44c20bd29332c6572dda36f372e"},
+    {file = "coverage-6.5.0-cp38-cp38-win32.whl", hash = "sha256:6d4817234349a80dbf03640cec6109cd90cba068330703fa65ddf56b60223a6d"},
+    {file = "coverage-6.5.0-cp38-cp38-win_amd64.whl", hash = "sha256:7ccf362abd726b0410bf8911c31fbf97f09f8f1061f8c1cf03dfc4b6372848f6"},
+    {file = "coverage-6.5.0-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:633713d70ad6bfc49b34ead4060531658dc6dfc9b3eb7d8a716d5873377ab745"},
+    {file = "coverage-6.5.0-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:95203854f974e07af96358c0b261f1048d8e1083f2de9b1c565e1be4a3a48cfc"},
+    {file = "coverage-6.5.0-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:b9023e237f4c02ff739581ef35969c3739445fb059b060ca51771e69101efffe"},
+    {file = "coverage-6.5.0-cp39-cp39-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:265de0fa6778d07de30bcf4d9dc471c3dc4314a23a3c6603d356a3c9abc2dfcf"},
+    {file = "coverage-6.5.0-cp39-cp39-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:8f830ed581b45b82451a40faabb89c84e1a998124ee4212d440e9c6cf70083e5"},
+    {file = "coverage-6.5.0-cp39-cp39-musllinux_1_1_aarch64.whl", hash = "sha256:7b6be138d61e458e18d8e6ddcddd36dd96215edfe5f1168de0b1b32635839b62"},
+    {file = "coverage-6.5.0-cp39-cp39-musllinux_1_1_i686.whl", hash = "sha256:42eafe6778551cf006a7c43153af1211c3aaab658d4d66fa5fcc021613d02518"},
+    {file = "coverage-6.5.0-cp39-cp39-musllinux_1_1_x86_64.whl", hash = "sha256:723e8130d4ecc8f56e9a611e73b31219595baa3bb252d539206f7bbbab6ffc1f"},
+    {file = "coverage-6.5.0-cp39-cp39-win32.whl", hash = "sha256:d9ecf0829c6a62b9b573c7bb6d4dcd6ba8b6f80be9ba4fc7ed50bf4ac9aecd72"},
+    {file = "coverage-6.5.0-cp39-cp39-win_amd64.whl", hash = "sha256:fc2af30ed0d5ae0b1abdb4ebdce598eafd5b35397d4d75deb341a614d333d987"},
+    {file = "coverage-6.5.0-pp36.pp37.pp38-none-any.whl", hash = "sha256:1431986dac3923c5945271f169f59c45b8802a114c8f548d611f2015133df77a"},
+    {file = "coverage-6.5.0.tar.gz", hash = "sha256:f642e90754ee3e06b0e7e51bce3379590e76b7f76b708e1a71ff043f87025c84"},
+]
 
 [package.dependencies]
 tomli = {version = "*", optional = true, markers = "python_full_version <= \"3.11.0a6\" and extra == \"toml\""}
@@ -185,6 +305,10 @@ description = "Distribution utilities"
 category = "dev"
 optional = false
 python-versions = "*"
+files = [
+    {file = "distlib-0.3.6-py2.py3-none-any.whl", hash = "sha256:f35c4b692542ca110de7ef0bea44d73981caeb34ca0b9b6b2e6d7790dda8f80e"},
+    {file = "distlib-0.3.6.tar.gz", hash = "sha256:14bad2d9b04d3a36127ac97f30b12a19268f211063d8f8ee4f47108896e11b46"},
+]
 
 [[package]]
 name = "exceptiongroup"
@@ -193,6 +317,10 @@ description = "Backport of PEP 654 (exception groups)"
 category = "dev"
 optional = false
 python-versions = ">=3.7"
+files = [
+    {file = "exceptiongroup-1.0.1-py3-none-any.whl", hash = "sha256:4d6c0aa6dd825810941c792f53d7b8d71da26f5e5f84f20f9508e8f2d33b140a"},
+    {file = "exceptiongroup-1.0.1.tar.gz", hash = "sha256:73866f7f842ede6cb1daa42c4af078e2035e5f7607f0e2c762cc51bb31bbe7b2"},
+]
 
 [package.extras]
 test = ["pytest (>=6)"]
@@ -204,6 +332,10 @@ description = "execnet: rapid multi-Python deployment"
 category = "dev"
 optional = false
 python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*"
+files = [
+    {file = "execnet-1.9.0-py2.py3-none-any.whl", hash = "sha256:a295f7cc774947aac58dde7fdc85f4aa00c42adf5d8f5468fc630c1acf30a142"},
+    {file = "execnet-1.9.0.tar.gz", hash = "sha256:8f694f3ba9cc92cab508b152dcfe322153975c29bda272e2fd7f3f00f36e47c5"},
+]
 
 [package.extras]
 testing = ["pre-commit"]
@@ -215,6 +347,10 @@ description = "A platform independent file lock."
 category = "dev"
 optional = false
 python-versions = ">=3.7"
+files = [
+    {file = "filelock-3.9.0-py3-none-any.whl", hash = "sha256:f58d535af89bb9ad5cd4df046f741f8553a418c01a7856bf0d173bbc9f6bd16d"},
+    {file = "filelock-3.9.0.tar.gz", hash = "sha256:7b319f24340b51f55a2bf7a12ac0755a9b03e718311dac567a0f4f7fabd2f5de"},
+]
 
 [package.extras]
 docs = ["furo (>=2022.12.7)", "sphinx (>=5.3)", "sphinx-autodoc-typehints (>=1.19.5)"]
@@ -227,6 +363,10 @@ description = "File identification library for Python"
 category = "dev"
 optional = false
 python-versions = ">=3.7"
+files = [
+    {file = "identify-2.5.8-py2.py3-none-any.whl", hash = "sha256:48b7925fe122720088aeb7a6c34f17b27e706b72c61070f27fe3789094233440"},
+    {file = "identify-2.5.8.tar.gz", hash = "sha256:7a214a10313b9489a0d61467db2856ae8d0b8306fc923e03a9effa53d8aedc58"},
+]
 
 [package.extras]
 license = ["ukkonen"]
@@ -238,6 +378,10 @@ description = "Internationalized Domain Names in Applications (IDNA)"
 category = "main"
 optional = false
 python-versions = ">=3.5"
+files = [
+    {file = "idna-3.4-py3-none-any.whl", hash = "sha256:90b77e79eaa3eba6de819a0c442c0b4ceefc341a7a2ab77d7562bf49f425c5c2"},
+    {file = "idna-3.4.tar.gz", hash = "sha256:814f528e8dead7d329833b91c5faa87d60bf71824cd12a7530b5526063d02cb4"},
+]
 
 [[package]]
 name = "iniconfig"
@@ -246,6 +390,10 @@ description = "iniconfig: brain-dead simple config-ini parsing"
 category = "dev"
 optional = false
 python-versions = "*"
+files = [
+    {file = "iniconfig-1.1.1-py2.py3-none-any.whl", hash = "sha256:011e24c64b7f47f6ebd835bb12a743f2fbe9a26d4cecaa7f53bc4f35ee9da8b3"},
+    {file = "iniconfig-1.1.1.tar.gz", hash = "sha256:bc3af051d7d14b2ee5ef9969666def0cd1a000e121eaea580d4a313df4b37f32"},
+]
 
 [[package]]
 name = "isort"
@@ -254,6 +402,10 @@ description = "A Python utility / library to sort Python imports."
 category = "dev"
 optional = false
 python-versions = ">=3.7.0"
+files = [
+    {file = "isort-5.11.4-py3-none-any.whl", hash = "sha256:c033fd0edb91000a7f09527fe5c75321878f98322a77ddcc81adbd83724afb7b"},
+    {file = "isort-5.11.4.tar.gz", hash = "sha256:6db30c5ded9815d813932c04c2f85a360bcdd35fed496f4d8f35495ef0a261b6"},
+]
 
 [package.extras]
 colors = ["colorama (>=0.4.3,<0.5.0)"]
@@ -268,6 +420,10 @@ description = "A very fast and expressive template engine."
 category = "dev"
 optional = false
 python-versions = ">=3.7"
+files = [
+    {file = "Jinja2-3.1.2-py3-none-any.whl", hash = "sha256:6088930bfe239f0e6710546ab9c19c9ef35e29792895fed6e6e31a023a182a61"},
+    {file = "Jinja2-3.1.2.tar.gz", hash = "sha256:31351a702a408a9e7595a8fc6150fc3f43bb6bf7e319770cbc0db9df9437e852"},
+]
 
 [package.dependencies]
 MarkupSafe = ">=2.0"
@@ -282,6 +438,10 @@ description = "Jinja2 Extension for Dates and Times"
 category = "dev"
 optional = false
 python-versions = "*"
+files = [
+    {file = "jinja2-time-0.2.0.tar.gz", hash = "sha256:d14eaa4d315e7688daa4969f616f226614350c48730bfa1692d2caebd8c90d40"},
+    {file = "jinja2_time-0.2.0-py2.py3-none-any.whl", hash = "sha256:d3eab6605e3ec8b7a0863df09cc1d23714908fa61aa6986a845c20ba488b4efa"},
+]
 
 [package.dependencies]
 arrow = "*"
@@ -294,6 +454,48 @@ description = "Safely add untrusted strings to HTML/XML markup."
 category = "dev"
 optional = false
 python-versions = ">=3.7"
+files = [
+    {file = "MarkupSafe-2.1.1-cp310-cp310-macosx_10_9_universal2.whl", hash = "sha256:86b1f75c4e7c2ac2ccdaec2b9022845dbb81880ca318bb7a0a01fbf7813e3812"},
+    {file = "MarkupSafe-2.1.1-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:f121a1420d4e173a5d96e47e9a0c0dcff965afdf1626d28de1460815f7c4ee7a"},
+    {file = "MarkupSafe-2.1.1-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:a49907dd8420c5685cfa064a1335b6754b74541bbb3706c259c02ed65b644b3e"},
+    {file = "MarkupSafe-2.1.1-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:10c1bfff05d95783da83491be968e8fe789263689c02724e0c691933c52994f5"},
+    {file = "MarkupSafe-2.1.1-cp310-cp310-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:b7bd98b796e2b6553da7225aeb61f447f80a1ca64f41d83612e6139ca5213aa4"},
+    {file = "MarkupSafe-2.1.1-cp310-cp310-musllinux_1_1_aarch64.whl", hash = "sha256:b09bf97215625a311f669476f44b8b318b075847b49316d3e28c08e41a7a573f"},
+    {file = "MarkupSafe-2.1.1-cp310-cp310-musllinux_1_1_i686.whl", hash = "sha256:694deca8d702d5db21ec83983ce0bb4b26a578e71fbdbd4fdcd387daa90e4d5e"},
+    {file = "MarkupSafe-2.1.1-cp310-cp310-musllinux_1_1_x86_64.whl", hash = "sha256:efc1913fd2ca4f334418481c7e595c00aad186563bbc1ec76067848c7ca0a933"},
+    {file = "MarkupSafe-2.1.1-cp310-cp310-win32.whl", hash = "sha256:4a33dea2b688b3190ee12bd7cfa29d39c9ed176bda40bfa11099a3ce5d3a7ac6"},
+    {file = "MarkupSafe-2.1.1-cp310-cp310-win_amd64.whl", hash = "sha256:dda30ba7e87fbbb7eab1ec9f58678558fd9a6b8b853530e176eabd064da81417"},
+    {file = "MarkupSafe-2.1.1-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:671cd1187ed5e62818414afe79ed29da836dde67166a9fac6d435873c44fdd02"},
+    {file = "MarkupSafe-2.1.1-cp37-cp37m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:3799351e2336dc91ea70b034983ee71cf2f9533cdff7c14c90ea126bfd95d65a"},
+    {file = "MarkupSafe-2.1.1-cp37-cp37m-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:e72591e9ecd94d7feb70c1cbd7be7b3ebea3f548870aa91e2732960fa4d57a37"},
+    {file = "MarkupSafe-2.1.1-cp37-cp37m-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:6fbf47b5d3728c6aea2abb0589b5d30459e369baa772e0f37a0320185e87c980"},
+    {file = "MarkupSafe-2.1.1-cp37-cp37m-musllinux_1_1_aarch64.whl", hash = "sha256:d5ee4f386140395a2c818d149221149c54849dfcfcb9f1debfe07a8b8bd63f9a"},
+    {file = "MarkupSafe-2.1.1-cp37-cp37m-musllinux_1_1_i686.whl", hash = "sha256:bcb3ed405ed3222f9904899563d6fc492ff75cce56cba05e32eff40e6acbeaa3"},
+    {file = "MarkupSafe-2.1.1-cp37-cp37m-musllinux_1_1_x86_64.whl", hash = "sha256:e1c0b87e09fa55a220f058d1d49d3fb8df88fbfab58558f1198e08c1e1de842a"},
+    {file = "MarkupSafe-2.1.1-cp37-cp37m-win32.whl", hash = "sha256:8dc1c72a69aa7e082593c4a203dcf94ddb74bb5c8a731e4e1eb68d031e8498ff"},
+    {file = "MarkupSafe-2.1.1-cp37-cp37m-win_amd64.whl", hash = "sha256:97a68e6ada378df82bc9f16b800ab77cbf4b2fada0081794318520138c088e4a"},
+    {file = "MarkupSafe-2.1.1-cp38-cp38-macosx_10_9_universal2.whl", hash = "sha256:e8c843bbcda3a2f1e3c2ab25913c80a3c5376cd00c6e8c4a86a89a28c8dc5452"},
+    {file = "MarkupSafe-2.1.1-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:0212a68688482dc52b2d45013df70d169f542b7394fc744c02a57374a4207003"},
+    {file = "MarkupSafe-2.1.1-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:8e576a51ad59e4bfaac456023a78f6b5e6e7651dcd383bcc3e18d06f9b55d6d1"},
+    {file = "MarkupSafe-2.1.1-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:4b9fe39a2ccc108a4accc2676e77da025ce383c108593d65cc909add5c3bd601"},
+    {file = "MarkupSafe-2.1.1-cp38-cp38-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:96e37a3dc86e80bf81758c152fe66dbf60ed5eca3d26305edf01892257049925"},
+    {file = "MarkupSafe-2.1.1-cp38-cp38-musllinux_1_1_aarch64.whl", hash = "sha256:6d0072fea50feec76a4c418096652f2c3238eaa014b2f94aeb1d56a66b41403f"},
+    {file = "MarkupSafe-2.1.1-cp38-cp38-musllinux_1_1_i686.whl", hash = "sha256:089cf3dbf0cd6c100f02945abeb18484bd1ee57a079aefd52cffd17fba910b88"},
+    {file = "MarkupSafe-2.1.1-cp38-cp38-musllinux_1_1_x86_64.whl", hash = "sha256:6a074d34ee7a5ce3effbc526b7083ec9731bb3cbf921bbe1d3005d4d2bdb3a63"},
+    {file = "MarkupSafe-2.1.1-cp38-cp38-win32.whl", hash = "sha256:421be9fbf0ffe9ffd7a378aafebbf6f4602d564d34be190fc19a193232fd12b1"},
+    {file = "MarkupSafe-2.1.1-cp38-cp38-win_amd64.whl", hash = "sha256:fc7b548b17d238737688817ab67deebb30e8073c95749d55538ed473130ec0c7"},
+    {file = "MarkupSafe-2.1.1-cp39-cp39-macosx_10_9_universal2.whl", hash = "sha256:e04e26803c9c3851c931eac40c695602c6295b8d432cbe78609649ad9bd2da8a"},
+    {file = "MarkupSafe-2.1.1-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:b87db4360013327109564f0e591bd2a3b318547bcef31b468a92ee504d07ae4f"},
+    {file = "MarkupSafe-2.1.1-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:99a2a507ed3ac881b975a2976d59f38c19386d128e7a9a18b7df6fff1fd4c1d6"},
+    {file = "MarkupSafe-2.1.1-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:56442863ed2b06d19c37f94d999035e15ee982988920e12a5b4ba29b62ad1f77"},
+    {file = "MarkupSafe-2.1.1-cp39-cp39-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:3ce11ee3f23f79dbd06fb3d63e2f6af7b12db1d46932fe7bd8afa259a5996603"},
+    {file = "MarkupSafe-2.1.1-cp39-cp39-musllinux_1_1_aarch64.whl", hash = "sha256:33b74d289bd2f5e527beadcaa3f401e0df0a89927c1559c8566c066fa4248ab7"},
+    {file = "MarkupSafe-2.1.1-cp39-cp39-musllinux_1_1_i686.whl", hash = "sha256:43093fb83d8343aac0b1baa75516da6092f58f41200907ef92448ecab8825135"},
+    {file = "MarkupSafe-2.1.1-cp39-cp39-musllinux_1_1_x86_64.whl", hash = "sha256:8e3dcf21f367459434c18e71b2a9532d96547aef8a871872a5bd69a715c15f96"},
+    {file = "MarkupSafe-2.1.1-cp39-cp39-win32.whl", hash = "sha256:d4306c36ca495956b6d568d276ac11fdd9c30a36f1b6eb928070dc5360b22e1c"},
+    {file = "MarkupSafe-2.1.1-cp39-cp39-win_amd64.whl", hash = "sha256:46d00d6cfecdde84d40e572d63735ef81423ad31184100411e6e3388d405e247"},
+    {file = "MarkupSafe-2.1.1.tar.gz", hash = "sha256:7f91197cc9e48f989d12e4e6fbc46495c446636dfc81b9ccf50bb0ec74b91d4b"},
+]
 
 [[package]]
 name = "mypy-extensions"
@@ -302,6 +504,10 @@ description = "Experimental type system extensions for programs checked with the
 category = "dev"
 optional = false
 python-versions = "*"
+files = [
+    {file = "mypy_extensions-0.4.3-py2.py3-none-any.whl", hash = "sha256:090fedd75945a69ae91ce1303b5824f428daf5a028d2f6ab8a299250a846f15d"},
+    {file = "mypy_extensions-0.4.3.tar.gz", hash = "sha256:2d82818f5bb3e369420cb3c4060a7970edba416647068eb4c5343488a6c604a8"},
+]
 
 [[package]]
 name = "nodeenv"
@@ -310,17 +516,25 @@ description = "Node.js virtual environment builder"
 category = "dev"
 optional = false
 python-versions = ">=2.7,!=3.0.*,!=3.1.*,!=3.2.*,!=3.3.*,!=3.4.*,!=3.5.*,!=3.6.*"
+files = [
+    {file = "nodeenv-1.7.0-py2.py3-none-any.whl", hash = "sha256:27083a7b96a25f2f5e1d8cb4b6317ee8aeda3bdd121394e5ac54e498028a042e"},
+    {file = "nodeenv-1.7.0.tar.gz", hash = "sha256:e0e7f7dfb85fc5394c6fe1e8fa98131a2473e04311a45afb6508f7cf1836fa2b"},
+]
 
 [package.dependencies]
 setuptools = "*"
 
 [[package]]
 name = "packaging"
-version = "22.0"
+version = "23.0"
 description = "Core utilities for Python packages"
 category = "dev"
 optional = false
 python-versions = ">=3.7"
+files = [
+    {file = "packaging-23.0-py3-none-any.whl", hash = "sha256:714ac14496c3e68c99c29b00845f7a2b85f3bb6f1078fd9f72fd20f0570002b2"},
+    {file = "packaging-23.0.tar.gz", hash = "sha256:b6ad297f8907de0fa2fe1ccbd26fdaf387f5f47c7275fedf8cce89f99446cf97"},
+]
 
 [[package]]
 name = "pathspec"
@@ -329,6 +543,10 @@ description = "Utility library for gitignore style pattern matching of file path
 category = "dev"
 optional = false
 python-versions = ">=3.7"
+files = [
+    {file = "pathspec-0.10.1-py3-none-any.whl", hash = "sha256:46846318467efc4556ccfd27816e004270a9eeeeb4d062ce5e6fc7a87c573f93"},
+    {file = "pathspec-0.10.1.tar.gz", hash = "sha256:7ace6161b621d31e7902eb6b5ae148d12cfd23f4a249b9ffb6b9fee12084323d"},
+]
 
 [[package]]
 name = "platformdirs"
@@ -337,6 +555,10 @@ description = "A small Python package for determining appropriate platform-speci
 category = "dev"
 optional = false
 python-versions = ">=3.7"
+files = [
+    {file = "platformdirs-2.6.2-py3-none-any.whl", hash = "sha256:83c8f6d04389165de7c9b6f0c682439697887bca0aa2f1c87ef1826be3584490"},
+    {file = "platformdirs-2.6.2.tar.gz", hash = "sha256:e1fea1fe471b9ff8332e229df3cb7de4f53eeea4998d3b6bfff542115e998bd2"},
+]
 
 [package.extras]
 docs = ["furo (>=2022.12.7)", "proselint (>=0.13)", "sphinx (>=5.3)", "sphinx-autodoc-typehints (>=1.19.5)"]
@@ -349,6 +571,10 @@ description = "plugin and hook calling mechanisms for python"
 category = "dev"
 optional = false
 python-versions = ">=3.6"
+files = [
+    {file = "pluggy-1.0.0-py2.py3-none-any.whl", hash = "sha256:74134bbf457f031a36d68416e1509f34bd5ccc019f0bcc952c7b909d06b37bd3"},
+    {file = "pluggy-1.0.0.tar.gz", hash = "sha256:4224373bacce55f955a878bf9cfa763c1e360858e330072059e10bad68531159"},
+]
 
 [package.extras]
 dev = ["pre-commit", "tox"]
@@ -361,6 +587,10 @@ description = "A framework for managing and maintaining multi-language pre-commi
 category = "dev"
 optional = false
 python-versions = ">=3.7"
+files = [
+    {file = "pre_commit-2.21.0-py2.py3-none-any.whl", hash = "sha256:e2f91727039fc39a92f58a588a25b87f936de6567eed4f0e673e0507edc75bad"},
+    {file = "pre_commit-2.21.0.tar.gz", hash = "sha256:31ef31af7e474a8d8995027fefdfcf509b5c913ff31f2015b4ec4beb26a6f658"},
+]
 
 [package.dependencies]
 cfgv = ">=2.0.0"
@@ -371,11 +601,15 @@ virtualenv = ">=20.10.0"
 
 [[package]]
 name = "pyproject-api"
-version = "1.2.1"
+version = "1.4.0"
 description = "API to interact with the python pyproject.toml based projects"
 category = "dev"
 optional = false
 python-versions = ">=3.7"
+files = [
+    {file = "pyproject_api-1.4.0-py3-none-any.whl", hash = "sha256:c34226297781efdd1ba4dfb74ce21076d9a8360e2125ea31803c1a02c76b2460"},
+    {file = "pyproject_api-1.4.0.tar.gz", hash = "sha256:ac85c1f82e0291dbae5a7739dbb9a990e11ee4034c9b5599ea714f07a24ecd71"},
+]
 
 [package.dependencies]
 packaging = ">=21.3"
@@ -392,6 +626,10 @@ description = "pytest: simple powerful testing with Python"
 category = "dev"
 optional = false
 python-versions = ">=3.7"
+files = [
+    {file = "pytest-7.2.0-py3-none-any.whl", hash = "sha256:892f933d339f068883b6fd5a459f03d85bfcb355e4981e146d2c7616c21fef71"},
+    {file = "pytest-7.2.0.tar.gz", hash = "sha256:c4014eb40e10f11f355ad4e3c2fb2c6c6d1919c73f3b5a433de4708202cade59"},
+]
 
 [package.dependencies]
 attrs = ">=19.2.0"
@@ -412,6 +650,10 @@ description = "Pytest plugin for measuring coverage."
 category = "dev"
 optional = false
 python-versions = ">=3.6"
+files = [
+    {file = "pytest-cov-4.0.0.tar.gz", hash = "sha256:996b79efde6433cdbd0088872dbc5fb3ed7fe1578b68cdbba634f14bb8dd0470"},
+    {file = "pytest_cov-4.0.0-py3-none-any.whl", hash = "sha256:2feb1b751d66a8bd934e5edfa2e961d11309dc37b73b0eabe73b5945fee20f6b"},
+]
 
 [package.dependencies]
 coverage = {version = ">=5.2.1", extras = ["toml"]}
@@ -427,6 +669,10 @@ description = "pytest xdist plugin for distributed testing, most importantly acr
 category = "dev"
 optional = false
 python-versions = ">=3.7"
+files = [
+    {file = "pytest-xdist-3.1.0.tar.gz", hash = "sha256:40fdb8f3544921c5dfcd486ac080ce22870e71d82ced6d2e78fa97c2addd480c"},
+    {file = "pytest_xdist-3.1.0-py3-none-any.whl", hash = "sha256:70a76f191d8a1d2d6be69fc440cdf85f3e4c03c08b520fd5dc5d338d6cf07d89"},
+]
 
 [package.dependencies]
 execnet = ">=1.1"
@@ -444,6 +690,10 @@ description = "Extensions to the standard Python datetime module"
 category = "dev"
 optional = false
 python-versions = "!=3.0.*,!=3.1.*,!=3.2.*,>=2.7"
+files = [
+    {file = "python-dateutil-2.8.2.tar.gz", hash = "sha256:0123cacc1627ae19ddf3c27a5de5bd67ee4586fbdd6440d9748f8abb483d3e86"},
+    {file = "python_dateutil-2.8.2-py2.py3-none-any.whl", hash = "sha256:961d03dc3453ebbc59dbdea9e4e11c5651520a876d0f4db161e8674aae935da9"},
+]
 
 [package.dependencies]
 six = ">=1.5"
@@ -455,6 +705,10 @@ description = "Read key-value pairs from a .env file and set them as environment
 category = "dev"
 optional = false
 python-versions = ">=3.7"
+files = [
+    {file = "python-dotenv-0.21.0.tar.gz", hash = "sha256:b77d08274639e3d34145dfa6c7008e66df0f04b7be7a75fd0d5292c191d79045"},
+    {file = "python_dotenv-0.21.0-py3-none-any.whl", hash = "sha256:1684eb44636dd462b66c3ee016599815514527ad99965de77f43e0944634a7e5"},
+]
 
 [package.extras]
 cli = ["click (>=5.0)"]
@@ -466,6 +720,10 @@ description = "A Python slugify application that also handles Unicode"
 category = "dev"
 optional = false
 python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*, !=3.5.*"
+files = [
+    {file = "python-slugify-6.1.2.tar.gz", hash = "sha256:272d106cb31ab99b3496ba085e3fea0e9e76dcde967b5e9992500d1f785ce4e1"},
+    {file = "python_slugify-6.1.2-py2.py3-none-any.whl", hash = "sha256:7b2c274c308b62f4269a9ba701aa69a797e9bca41aeee5b3a9e79e36b6656927"},
+]
 
 [package.dependencies]
 text-unidecode = ">=1.3"
@@ -480,6 +738,48 @@ description = "YAML parser and emitter for Python"
 category = "dev"
 optional = false
 python-versions = ">=3.6"
+files = [
+    {file = "PyYAML-6.0-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:d4db7c7aef085872ef65a8fd7d6d09a14ae91f691dec3e87ee5ee0539d516f53"},
+    {file = "PyYAML-6.0-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:9df7ed3b3d2e0ecfe09e14741b857df43adb5a3ddadc919a2d94fbdf78fea53c"},
+    {file = "PyYAML-6.0-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:77f396e6ef4c73fdc33a9157446466f1cff553d979bd00ecb64385760c6babdc"},
+    {file = "PyYAML-6.0-cp310-cp310-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:a80a78046a72361de73f8f395f1f1e49f956c6be882eed58505a15f3e430962b"},
+    {file = "PyYAML-6.0-cp310-cp310-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:f84fbc98b019fef2ee9a1cb3ce93e3187a6df0b2538a651bfb890254ba9f90b5"},
+    {file = "PyYAML-6.0-cp310-cp310-win32.whl", hash = "sha256:2cd5df3de48857ed0544b34e2d40e9fac445930039f3cfe4bcc592a1f836d513"},
+    {file = "PyYAML-6.0-cp310-cp310-win_amd64.whl", hash = "sha256:daf496c58a8c52083df09b80c860005194014c3698698d1a57cbcfa182142a3a"},
+    {file = "PyYAML-6.0-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:d4b0ba9512519522b118090257be113b9468d804b19d63c71dbcf4a48fa32358"},
+    {file = "PyYAML-6.0-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:81957921f441d50af23654aa6c5e5eaf9b06aba7f0a19c18a538dc7ef291c5a1"},
+    {file = "PyYAML-6.0-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:afa17f5bc4d1b10afd4466fd3a44dc0e245382deca5b3c353d8b757f9e3ecb8d"},
+    {file = "PyYAML-6.0-cp311-cp311-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:dbad0e9d368bb989f4515da330b88a057617d16b6a8245084f1b05400f24609f"},
+    {file = "PyYAML-6.0-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:432557aa2c09802be39460360ddffd48156e30721f5e8d917f01d31694216782"},
+    {file = "PyYAML-6.0-cp311-cp311-win32.whl", hash = "sha256:bfaef573a63ba8923503d27530362590ff4f576c626d86a9fed95822a8255fd7"},
+    {file = "PyYAML-6.0-cp311-cp311-win_amd64.whl", hash = "sha256:01b45c0191e6d66c470b6cf1b9531a771a83c1c4208272ead47a3ae4f2f603bf"},
+    {file = "PyYAML-6.0-cp36-cp36m-macosx_10_9_x86_64.whl", hash = "sha256:897b80890765f037df3403d22bab41627ca8811ae55e9a722fd0392850ec4d86"},
+    {file = "PyYAML-6.0-cp36-cp36m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:50602afada6d6cbfad699b0c7bb50d5ccffa7e46a3d738092afddc1f9758427f"},
+    {file = "PyYAML-6.0-cp36-cp36m-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:48c346915c114f5fdb3ead70312bd042a953a8ce5c7106d5bfb1a5254e47da92"},
+    {file = "PyYAML-6.0-cp36-cp36m-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:98c4d36e99714e55cfbaaee6dd5badbc9a1ec339ebfc3b1f52e293aee6bb71a4"},
+    {file = "PyYAML-6.0-cp36-cp36m-win32.whl", hash = "sha256:0283c35a6a9fbf047493e3a0ce8d79ef5030852c51e9d911a27badfde0605293"},
+    {file = "PyYAML-6.0-cp36-cp36m-win_amd64.whl", hash = "sha256:07751360502caac1c067a8132d150cf3d61339af5691fe9e87803040dbc5db57"},
+    {file = "PyYAML-6.0-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:819b3830a1543db06c4d4b865e70ded25be52a2e0631ccd2f6a47a2822f2fd7c"},
+    {file = "PyYAML-6.0-cp37-cp37m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:473f9edb243cb1935ab5a084eb238d842fb8f404ed2193a915d1784b5a6b5fc0"},
+    {file = "PyYAML-6.0-cp37-cp37m-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:0ce82d761c532fe4ec3f87fc45688bdd3a4c1dc5e0b4a19814b9009a29baefd4"},
+    {file = "PyYAML-6.0-cp37-cp37m-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:231710d57adfd809ef5d34183b8ed1eeae3f76459c18fb4a0b373ad56bedcdd9"},
+    {file = "PyYAML-6.0-cp37-cp37m-win32.whl", hash = "sha256:c5687b8d43cf58545ade1fe3e055f70eac7a5a1a0bf42824308d868289a95737"},
+    {file = "PyYAML-6.0-cp37-cp37m-win_amd64.whl", hash = "sha256:d15a181d1ecd0d4270dc32edb46f7cb7733c7c508857278d3d378d14d606db2d"},
+    {file = "PyYAML-6.0-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:0b4624f379dab24d3725ffde76559cff63d9ec94e1736b556dacdfebe5ab6d4b"},
+    {file = "PyYAML-6.0-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:213c60cd50106436cc818accf5baa1aba61c0189ff610f64f4a3e8c6726218ba"},
+    {file = "PyYAML-6.0-cp38-cp38-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:9fa600030013c4de8165339db93d182b9431076eb98eb40ee068700c9c813e34"},
+    {file = "PyYAML-6.0-cp38-cp38-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:277a0ef2981ca40581a47093e9e2d13b3f1fbbeffae064c1d21bfceba2030287"},
+    {file = "PyYAML-6.0-cp38-cp38-win32.whl", hash = "sha256:d4eccecf9adf6fbcc6861a38015c2a64f38b9d94838ac1810a9023a0609e1b78"},
+    {file = "PyYAML-6.0-cp38-cp38-win_amd64.whl", hash = "sha256:1e4747bc279b4f613a09eb64bba2ba602d8a6664c6ce6396a4d0cd413a50ce07"},
+    {file = "PyYAML-6.0-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:055d937d65826939cb044fc8c9b08889e8c743fdc6a32b33e2390f66013e449b"},
+    {file = "PyYAML-6.0-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:e61ceaab6f49fb8bdfaa0f92c4b57bcfbea54c09277b1b4f7ac376bfb7a7c174"},
+    {file = "PyYAML-6.0-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:d67d839ede4ed1b28a4e8909735fc992a923cdb84e618544973d7dfc71540803"},
+    {file = "PyYAML-6.0-cp39-cp39-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:cba8c411ef271aa037d7357a2bc8f9ee8b58b9965831d9e51baf703280dc73d3"},
+    {file = "PyYAML-6.0-cp39-cp39-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:40527857252b61eacd1d9af500c3337ba8deb8fc298940291486c465c8b46ec0"},
+    {file = "PyYAML-6.0-cp39-cp39-win32.whl", hash = "sha256:b5b9eccad747aabaaffbc6064800670f0c297e52c12754eb1d976c57e4f74dcb"},
+    {file = "PyYAML-6.0-cp39-cp39-win_amd64.whl", hash = "sha256:b3d267842bf12586ba6c734f89d1f5b871df0273157918b0ccefa29deb05c21c"},
+    {file = "PyYAML-6.0.tar.gz", hash = "sha256:68fb519c14306fec9720a2a5b45bc9f0c8d1b9c72adf45c37baedfcd949c35a2"},
+]
 
 [[package]]
 name = "requests"
@@ -488,6 +788,10 @@ description = "Python HTTP for Humans."
 category = "main"
 optional = false
 python-versions = ">=3.7, <4"
+files = [
+    {file = "requests-2.28.1-py3-none-any.whl", hash = "sha256:8fefa2a1a1365bf5520aac41836fbee479da67864514bdb821f31ce07ce65349"},
+    {file = "requests-2.28.1.tar.gz", hash = "sha256:7c5599b102feddaa661c826c56ab4fee28bfd17f5abca1ebbe3e7f19d7c97983"},
+]
 
 [package.dependencies]
 certifi = ">=2017.4.17"
@@ -506,7 +810,11 @@ description = "Easily download, build, install, upgrade, and uninstall Python pa
 category = "dev"
 optional = false
 python-versions = ">=3.7"
-
+files = [
+    {file = "setuptools-65.5.1-py3-none-any.whl", hash = "sha256:d0b9a8433464d5800cbe05094acf5c6d52a91bfac9b52bcfc4d41382be5d5d31"},
+    {file = "setuptools-65.5.1.tar.gz", hash = "sha256:e197a19aa8ec9722928f2206f8de752def0e4c9fc6953527360d1c36d94ddb2f"},
+]
+
 [package.extras]
 docs = ["furo", "jaraco.packaging (>=9)", "jaraco.tidelift (>=1.4)", "pygments-github-lexers (==0.0.5)", "rst.linker (>=1.9)", "sphinx (>=3.5)", "sphinx-favicon", "sphinx-hoverxref (<2)", "sphinx-inline-tabs", "sphinx-notfound-page (==0.8.3)", "sphinx-reredirects", "sphinxcontrib-towncrier"]
 testing = ["build[virtualenv]", "filelock (>=3.4.0)", "flake8 (<5)", "flake8-2020", "ini2toml[lite] (>=0.9)", "jaraco.envs (>=2.2)", "jaraco.path (>=3.2.0)", "pip (>=19.1)", "pip-run (>=8.8)", "pytest (>=6)", "pytest-black (>=0.3.7)", "pytest-checkdocs (>=2.4)", "pytest-cov", "pytest-enabler (>=1.3)", "pytest-flake8", "pytest-mypy (>=0.9.1)", "pytest-perf", "pytest-timeout", "pytest-xdist", "tomli-w (>=1.0.0)", "virtualenv (>=13.0.0)", "wheel"]
@@ -519,6 +827,10 @@ description = "Python 2 and 3 compatibility utilities"
 category = "main"
 optional = false
 python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*"
+files = [
+    {file = "six-1.16.0-py2.py3-none-any.whl", hash = "sha256:8abb2f1d86890a2dfb989f9a77cfcfd3e47c2a354b01111771326f8aa26e0254"},
+    {file = "six-1.16.0.tar.gz", hash = "sha256:1e61c37477a1626458e36f7b1d82aa5c9b094fa4802892072e49de9c60c4c926"},
+]
 
 [[package]]
 name = "soupsieve"
@@ -527,6 +839,10 @@ description = "A modern CSS selector implementation for Beautiful Soup."
 category = "main"
 optional = false
 python-versions = ">=3.6"
+files = [
+    {file = "soupsieve-2.3.2.post1-py3-none-any.whl", hash = "sha256:3b2503d3c7084a42b1ebd08116e5f81aadfaea95863628c80a3b774a11b7c759"},
+    {file = "soupsieve-2.3.2.post1.tar.gz", hash = "sha256:fc53893b3da2c33de295667a0e19f078c14bf86544af307354de5fcf12a3f30d"},
+]
 
 [[package]]
 name = "text-unidecode"
@@ -535,6 +851,10 @@ description = "The most basic Text::Unidecode port"
 category = "dev"
 optional = false
 python-versions = "*"
+files = [
+    {file = "text-unidecode-1.3.tar.gz", hash = "sha256:bad6603bb14d279193107714b288be206cac565dfa49aa5b105294dd5c4aab93"},
+    {file = "text_unidecode-1.3-py2.py3-none-any.whl", hash = "sha256:1311f10e8b895935241623731c2ba64f4c455287888b18189350b67134a822e8"},
+]
 
 [[package]]
 name = "tomli"
@@ -543,30 +863,38 @@ description = "A lil' TOML parser"
 category = "dev"
 optional = false
 python-versions = ">=3.7"
+files = [
+    {file = "tomli-2.0.1-py3-none-any.whl", hash = "sha256:939de3e7a6161af0c887ef91b7d41a53e7c5a1ca976325f429cb46ea9bc30ecc"},
+    {file = "tomli-2.0.1.tar.gz", hash = "sha256:de526c12914f0c550d15924c62d72abc48d6fe7364aa87328337a31007fe8a4f"},
+]
 
 [[package]]
 name = "tox"
-version = "4.2.6"
+version = "4.2.8"
 description = "tox is a generic virtualenv management and test command line tool"
 category = "dev"
 optional = false
 python-versions = ">=3.7"
+files = [
+    {file = "tox-4.2.8-py3-none-any.whl", hash = "sha256:e9d5006a533d280e2ca26e3ca61052ffa55a65b683486f92d12563a14a9b7a4f"},
+    {file = "tox-4.2.8.tar.gz", hash = "sha256:7c31940d755355210151e8bef23feab3d714a8a4795e513c454ff0baccd995b1"},
+]
 
 [package.dependencies]
-cachetools = ">=5.2"
+cachetools = ">=5.2.1"
 chardet = ">=5.1"
 colorama = ">=0.4.6"
 filelock = ">=3.9"
-packaging = ">=22"
+packaging = ">=23"
 platformdirs = ">=2.6.2"
 pluggy = ">=1"
-pyproject-api = ">=1.2.1"
+pyproject-api = ">=1.4"
 tomli = {version = ">=2.0.1", markers = "python_version < \"3.11\""}
 virtualenv = ">=20.17.1"
 
 [package.extras]
-docs = ["furo (>=2022.12.7)", "sphinx (>=6)", "sphinx-argparse-cli (>=1.10)", "sphinx-autodoc-typehints (>=1.19.5)", "sphinx-copybutton (>=0.5.1)", "sphinx-inline-tabs (>=2022.1.2b11)", "sphinxcontrib-towncrier (>=0.2.1a0)", "towncrier (>=22.12)"]
-testing = ["build[virtualenv] (>=0.9)", "covdefaults (>=2.2.2)", "devpi-process (>=0.3)", "diff-cover (>=7.3)", "distlib (>=0.3.6)", "flaky (>=3.7)", "hatch-vcs (>=0.3)", "hatchling (>=1.12)", "psutil (>=5.9.4)", "pytest (>=7.2)", "pytest-cov (>=4)", "pytest-mock (>=3.10)", "pytest-xdist (>=3.1)", "re-assert (>=1.1)", "time-machine (>=2.8.2)"]
+docs = ["furo (>=2022.12.7)", "sphinx (>=6.1.3)", "sphinx-argparse-cli (>=1.11)", "sphinx-autodoc-typehints (>=1.20.1)", "sphinx-copybutton (>=0.5.1)", "sphinx-inline-tabs (>=2022.1.2b11)", "sphinxcontrib-towncrier (>=0.2.1a0)", "towncrier (>=22.12)"]
+testing = ["build[virtualenv] (>=0.9)", "covdefaults (>=2.2.2)", "devpi-process (>=0.3)", "diff-cover (>=7.3)", "distlib (>=0.3.6)", "flaky (>=3.7)", "hatch-vcs (>=0.3)", "hatchling (>=1.12.2)", "psutil (>=5.9.4)", "pytest (>=7.2)", "pytest-cov (>=4)", "pytest-mock (>=3.10)", "pytest-xdist (>=3.1)", "re-assert (>=1.1)", "time-machine (>=2.8.2)", "wheel (>=0.38.4)"]
 
 [[package]]
 name = "tqdm"
@@ -575,6 +903,10 @@ description = "Fast, Extensible Progress Meter"
 category = "main"
 optional = false
 python-versions = "!=3.0.*,!=3.1.*,!=3.2.*,!=3.3.*,>=2.7"
+files = [
+    {file = "tqdm-4.64.1-py2.py3-none-any.whl", hash = "sha256:6fee160d6ffcd1b1c68c65f14c829c22832bc401726335ce92c52d395944a6a1"},
+    {file = "tqdm-4.64.1.tar.gz", hash = "sha256:5f4f682a004951c1b450bc753c710e9280c5746ce6ffedee253ddbcbf54cf1e4"},
+]
 
 [package.dependencies]
 colorama = {version = "*", markers = "platform_system == \"Windows\""}
@@ -592,6 +924,10 @@ description = "HTTP library with thread-safe connection pooling, file post, and
 category = "main"
 optional = false
 python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*, !=3.5.*, <4"
+files = [
+    {file = "urllib3-1.26.12-py2.py3-none-any.whl", hash = "sha256:b930dd878d5a8afb066a637fbb35144fe7901e3b209d1cd4f524bd0e9deee997"},
+    {file = "urllib3-1.26.12.tar.gz", hash = "sha256:3fa96cf423e6987997fc326ae8df396db2a8b7c667747d47ddd8ecba91f4a74e"},
+]
 
 [package.extras]
 brotli = ["brotli (>=1.0.9)", "brotlicffi (>=0.8.0)", "brotlipy (>=0.6.0)"]
@@ -605,6 +941,10 @@ description = "Virtual Python Environment builder"
 category = "dev"
 optional = false
 python-versions = ">=3.6"
+files = [
+    {file = "virtualenv-20.17.1-py3-none-any.whl", hash = "sha256:ce3b1684d6e1a20a3e5ed36795a97dfc6af29bc3970ca8dab93e11ac6094b3c4"},
+    {file = "virtualenv-20.17.1.tar.gz", hash = "sha256:f8b927684efc6f1cc206c9db297a570ab9ad0e51c16fa9e45487d36d1905c058"},
+]
 
 [package.dependencies]
 distlib = ">=0.3.6,<1"
@@ -616,346 +956,6 @@ docs = ["proselint (>=0.13)", "sphinx (>=5.3)", "sphinx-argparse (>=0.3.2)", "sp
 testing = ["coverage (>=6.2)", "coverage-enable-subprocess (>=1)", "flaky (>=3.7)", "packaging (>=21.3)", "pytest (>=7.0.1)", "pytest-env (>=0.6.2)", "pytest-freezegun (>=0.4.2)", "pytest-mock (>=3.6.1)", "pytest-randomly (>=3.10.3)", "pytest-timeout (>=2.1)"]
 
 [metadata]
-lock-version = "1.1"
+lock-version = "2.0"
 python-versions = "^3.10"
-content-hash = "c99fee43853c4f2ce20b9e22b04024969621db9df14dcdec7341acb867097b29"
-
-[metadata.files]
-anytree = [
-    {file = "anytree-2.8.0-py2.py3-none-any.whl", hash = "sha256:14c55ac77492b11532395049a03b773d14c7e30b22aa012e337b1e983de31521"},
-    {file = "anytree-2.8.0.tar.gz", hash = "sha256:3f0f93f355a91bc3e6245319bf4c1d50e3416cc7a35cc1133c1ff38306bbccab"},
-]
-arrow = [
-    {file = "arrow-1.2.3-py3-none-any.whl", hash = "sha256:5a49ab92e3b7b71d96cd6bfcc4df14efefc9dfa96ea19045815914a6ab6b1fe2"},
-    {file = "arrow-1.2.3.tar.gz", hash = "sha256:3934b30ca1b9f292376d9db15b19446088d12ec58629bc3f0da28fd55fb633a1"},
-]
-attrs = [
-    {file = "attrs-22.1.0-py2.py3-none-any.whl", hash = "sha256:86efa402f67bf2df34f51a335487cf46b1ec130d02b8d39fd248abfd30da551c"},
-    {file = "attrs-22.1.0.tar.gz", hash = "sha256:29adc2665447e5191d0e7c568fde78b21f9672d344281d0c6e1ab085429b22b6"},
-]
-beautifulsoup4 = [
-    {file = "beautifulsoup4-4.11.1-py3-none-any.whl", hash = "sha256:58d5c3d29f5a36ffeb94f02f0d786cd53014cf9b3b3951d42e0080d8a9498d30"},
-    {file = "beautifulsoup4-4.11.1.tar.gz", hash = "sha256:ad9aa55b65ef2808eb405f46cf74df7fcb7044d5cbc26487f96eb2ef2e436693"},
-]
-binaryornot = [
-    {file = "binaryornot-0.4.4-py2.py3-none-any.whl", hash = "sha256:b8b71173c917bddcd2c16070412e369c3ed7f0528926f70cac18a6c97fd563e4"},
-    {file = "binaryornot-0.4.4.tar.gz", hash = "sha256:359501dfc9d40632edc9fac890e19542db1a287bbcfa58175b66658392018061"},
-]
-black = [
-    {file = "black-22.12.0-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:9eedd20838bd5d75b80c9f5487dbcb06836a43833a37846cf1d8c1cc01cef59d"},
-    {file = "black-22.12.0-cp310-cp310-win_amd64.whl", hash = "sha256:159a46a4947f73387b4d83e87ea006dbb2337eab6c879620a3ba52699b1f4351"},
-    {file = "black-22.12.0-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:d30b212bffeb1e252b31dd269dfae69dd17e06d92b87ad26e23890f3efea366f"},
-    {file = "black-22.12.0-cp311-cp311-win_amd64.whl", hash = "sha256:7412e75863aa5c5411886804678b7d083c7c28421210180d67dfd8cf1221e1f4"},
-    {file = "black-22.12.0-cp37-cp37m-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:c116eed0efb9ff870ded8b62fe9f28dd61ef6e9ddd28d83d7d264a38417dcee2"},
-    {file = "black-22.12.0-cp37-cp37m-win_amd64.whl", hash = "sha256:1f58cbe16dfe8c12b7434e50ff889fa479072096d79f0a7f25e4ab8e94cd8350"},
-    {file = "black-22.12.0-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:77d86c9f3db9b1bf6761244bc0b3572a546f5fe37917a044e02f3166d5aafa7d"},
-    {file = "black-22.12.0-cp38-cp38-win_amd64.whl", hash = "sha256:82d9fe8fee3401e02e79767016b4907820a7dc28d70d137eb397b92ef3cc5bfc"},
-    {file = "black-22.12.0-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:101c69b23df9b44247bd88e1d7e90154336ac4992502d4197bdac35dd7ee3320"},
-    {file = "black-22.12.0-cp39-cp39-win_amd64.whl", hash = "sha256:559c7a1ba9a006226f09e4916060982fd27334ae1998e7a38b3f33a37f7a2148"},
-    {file = "black-22.12.0-py3-none-any.whl", hash = "sha256:436cc9167dd28040ad90d3b404aec22cedf24a6e4d7de221bec2730ec0c97bcf"},
-    {file = "black-22.12.0.tar.gz", hash = "sha256:229351e5a18ca30f447bf724d007f890f97e13af070bb6ad4c0a441cd7596a2f"},
-]
-cachetools = [
-    {file = "cachetools-5.2.0-py3-none-any.whl", hash = "sha256:f9f17d2aec496a9aa6b76f53e3b614c965223c061982d434d160f930c698a9db"},
-    {file = "cachetools-5.2.0.tar.gz", hash = "sha256:6a94c6402995a99c3970cc7e4884bb60b4a8639938157eeed436098bf9831757"},
-]
-certifi = [
-    {file = "certifi-2022.12.7-py3-none-any.whl", hash = "sha256:4ad3232f5e926d6718ec31cfc1fcadfde020920e278684144551c91769c7bc18"},
-    {file = "certifi-2022.12.7.tar.gz", hash = "sha256:35824b4c3a97115964b408844d64aa14db1cc518f6562e8d7261699d1350a9e3"},
-]
-cfgv = [
-    {file = "cfgv-3.3.1-py2.py3-none-any.whl", hash = "sha256:c6a0883f3917a037485059700b9e75da2464e6c27051014ad85ba6aaa5884426"},
-    {file = "cfgv-3.3.1.tar.gz", hash = "sha256:f5a830efb9ce7a445376bb66ec94c638a9787422f96264c98edc6bdeed8ab736"},
-]
-chardet = [
-    {file = "chardet-5.1.0-py3-none-any.whl", hash = "sha256:362777fb014af596ad31334fde1e8c327dfdb076e1960d1694662d46a6917ab9"},
-    {file = "chardet-5.1.0.tar.gz", hash = "sha256:0d62712b956bc154f85fb0a266e2a3c5913c2967e00348701b32411d6def31e5"},
-]
-charset-normalizer = [
-    {file = "charset-normalizer-2.1.1.tar.gz", hash = "sha256:5a3d016c7c547f69d6f81fb0db9449ce888b418b5b9952cc5e6e66843e9dd845"},
-    {file = "charset_normalizer-2.1.1-py3-none-any.whl", hash = "sha256:83e9a75d1911279afd89352c68b45348559d1fc0506b054b346651b5e7fee29f"},
-]
-click = [
-    {file = "click-8.1.3-py3-none-any.whl", hash = "sha256:bb4d8133cb15a609f44e8213d9b391b0809795062913b383c62be0ee95b1db48"},
-    {file = "click-8.1.3.tar.gz", hash = "sha256:7682dc8afb30297001674575ea00d1814d808d6a36af415a82bd481d37ba7b8e"},
-]
-colorama = [
-    {file = "colorama-0.4.6-py2.py3-none-any.whl", hash = "sha256:4f1d9991f5acc0ca119f9d443620b77f9d6b33703e51011c16baf57afb285fc6"},
-    {file = "colorama-0.4.6.tar.gz", hash = "sha256:08695f5cb7ed6e0531a20572697297273c47b8cae5a63ffc6d6ed5c201be6e44"},
-]
-cookiecutter = [
-    {file = "cookiecutter-2.1.1-py2.py3-none-any.whl", hash = "sha256:9f3ab027cec4f70916e28f03470bdb41e637a3ad354b4d65c765d93aad160022"},
-    {file = "cookiecutter-2.1.1.tar.gz", hash = "sha256:f3982be8d9c53dac1261864013fdec7f83afd2e42ede6f6dd069c5e149c540d5"},
-]
-coverage = [
-    {file = "coverage-6.5.0-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:ef8674b0ee8cc11e2d574e3e2998aea5df5ab242e012286824ea3c6970580e53"},
-    {file = "coverage-6.5.0-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:784f53ebc9f3fd0e2a3f6a78b2be1bd1f5575d7863e10c6e12504f240fd06660"},
-    {file = "coverage-6.5.0-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:b4a5be1748d538a710f87542f22c2cad22f80545a847ad91ce45e77417293eb4"},
-    {file = "coverage-6.5.0-cp310-cp310-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:83516205e254a0cb77d2d7bb3632ee019d93d9f4005de31dca0a8c3667d5bc04"},
-    {file = "coverage-6.5.0-cp310-cp310-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:af4fffaffc4067232253715065e30c5a7ec6faac36f8fc8d6f64263b15f74db0"},
-    {file = "coverage-6.5.0-cp310-cp310-musllinux_1_1_aarch64.whl", hash = "sha256:97117225cdd992a9c2a5515db1f66b59db634f59d0679ca1fa3fe8da32749cae"},
-    {file = "coverage-6.5.0-cp310-cp310-musllinux_1_1_i686.whl", hash = "sha256:a1170fa54185845505fbfa672f1c1ab175446c887cce8212c44149581cf2d466"},
-    {file = "coverage-6.5.0-cp310-cp310-musllinux_1_1_x86_64.whl", hash = "sha256:11b990d520ea75e7ee8dcab5bc908072aaada194a794db9f6d7d5cfd19661e5a"},
-    {file = "coverage-6.5.0-cp310-cp310-win32.whl", hash = "sha256:5dbec3b9095749390c09ab7c89d314727f18800060d8d24e87f01fb9cfb40b32"},
-    {file = "coverage-6.5.0-cp310-cp310-win_amd64.whl", hash = "sha256:59f53f1dc5b656cafb1badd0feb428c1e7bc19b867479ff72f7a9dd9b479f10e"},
-    {file = "coverage-6.5.0-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:4a5375e28c5191ac38cca59b38edd33ef4cc914732c916f2929029b4bfb50795"},
-    {file = "coverage-6.5.0-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:c4ed2820d919351f4167e52425e096af41bfabacb1857186c1ea32ff9983ed75"},
-    {file = "coverage-6.5.0-cp311-cp311-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:33a7da4376d5977fbf0a8ed91c4dffaaa8dbf0ddbf4c8eea500a2486d8bc4d7b"},
-    {file = "coverage-6.5.0-cp311-cp311-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:a8fb6cf131ac4070c9c5a3e21de0f7dc5a0fbe8bc77c9456ced896c12fcdad91"},
-    {file = "coverage-6.5.0-cp311-cp311-musllinux_1_1_aarch64.whl", hash = "sha256:a6b7d95969b8845250586f269e81e5dfdd8ff828ddeb8567a4a2eaa7313460c4"},
-    {file = "coverage-6.5.0-cp311-cp311-musllinux_1_1_i686.whl", hash = "sha256:1ef221513e6f68b69ee9e159506d583d31aa3567e0ae84eaad9d6ec1107dddaa"},
-    {file = "coverage-6.5.0-cp311-cp311-musllinux_1_1_x86_64.whl", hash = "sha256:cca4435eebea7962a52bdb216dec27215d0df64cf27fc1dd538415f5d2b9da6b"},
-    {file = "coverage-6.5.0-cp311-cp311-win32.whl", hash = "sha256:98e8a10b7a314f454d9eff4216a9a94d143a7ee65018dd12442e898ee2310578"},
-    {file = "coverage-6.5.0-cp311-cp311-win_amd64.whl", hash = "sha256:bc8ef5e043a2af066fa8cbfc6e708d58017024dc4345a1f9757b329a249f041b"},
-    {file = "coverage-6.5.0-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:4433b90fae13f86fafff0b326453dd42fc9a639a0d9e4eec4d366436d1a41b6d"},
-    {file = "coverage-6.5.0-cp37-cp37m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:f4f05d88d9a80ad3cac6244d36dd89a3c00abc16371769f1340101d3cb899fc3"},
-    {file = "coverage-6.5.0-cp37-cp37m-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:94e2565443291bd778421856bc975d351738963071e9b8839ca1fc08b42d4bef"},
-    {file = "coverage-6.5.0-cp37-cp37m-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:027018943386e7b942fa832372ebc120155fd970837489896099f5cfa2890f79"},
-    {file = "coverage-6.5.0-cp37-cp37m-musllinux_1_1_aarch64.whl", hash = "sha256:255758a1e3b61db372ec2736c8e2a1fdfaf563977eedbdf131de003ca5779b7d"},
-    {file = "coverage-6.5.0-cp37-cp37m-musllinux_1_1_i686.whl", hash = "sha256:851cf4ff24062c6aec510a454b2584f6e998cada52d4cb58c5e233d07172e50c"},
-    {file = "coverage-6.5.0-cp37-cp37m-musllinux_1_1_x86_64.whl", hash = "sha256:12adf310e4aafddc58afdb04d686795f33f4d7a6fa67a7a9d4ce7d6ae24d949f"},
-    {file = "coverage-6.5.0-cp37-cp37m-win32.whl", hash = "sha256:b5604380f3415ba69de87a289a2b56687faa4fe04dbee0754bfcae433489316b"},
-    {file = "coverage-6.5.0-cp37-cp37m-win_amd64.whl", hash = "sha256:4a8dbc1f0fbb2ae3de73eb0bdbb914180c7abfbf258e90b311dcd4f585d44bd2"},
-    {file = "coverage-6.5.0-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:d900bb429fdfd7f511f868cedd03a6bbb142f3f9118c09b99ef8dc9bf9643c3c"},
-    {file = "coverage-6.5.0-cp38-cp38-macosx_11_0_arm64.whl", hash = "sha256:2198ea6fc548de52adc826f62cb18554caedfb1d26548c1b7c88d8f7faa8f6ba"},
-    {file = "coverage-6.5.0-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:6c4459b3de97b75e3bd6b7d4b7f0db13f17f504f3d13e2a7c623786289dd670e"},
-    {file = "coverage-6.5.0-cp38-cp38-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:20c8ac5386253717e5ccc827caad43ed66fea0efe255727b1053a8154d952398"},
-    {file = "coverage-6.5.0-cp38-cp38-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:6b07130585d54fe8dff3d97b93b0e20290de974dc8177c320aeaf23459219c0b"},
-    {file = "coverage-6.5.0-cp38-cp38-musllinux_1_1_aarch64.whl", hash = "sha256:dbdb91cd8c048c2b09eb17713b0c12a54fbd587d79adcebad543bc0cd9a3410b"},
-    {file = "coverage-6.5.0-cp38-cp38-musllinux_1_1_i686.whl", hash = "sha256:de3001a203182842a4630e7b8d1a2c7c07ec1b45d3084a83d5d227a3806f530f"},
-    {file = "coverage-6.5.0-cp38-cp38-musllinux_1_1_x86_64.whl", hash = "sha256:e07f4a4a9b41583d6eabec04f8b68076ab3cd44c20bd29332c6572dda36f372e"},
-    {file = "coverage-6.5.0-cp38-cp38-win32.whl", hash = "sha256:6d4817234349a80dbf03640cec6109cd90cba068330703fa65ddf56b60223a6d"},
-    {file = "coverage-6.5.0-cp38-cp38-win_amd64.whl", hash = "sha256:7ccf362abd726b0410bf8911c31fbf97f09f8f1061f8c1cf03dfc4b6372848f6"},
-    {file = "coverage-6.5.0-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:633713d70ad6bfc49b34ead4060531658dc6dfc9b3eb7d8a716d5873377ab745"},
-    {file = "coverage-6.5.0-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:95203854f974e07af96358c0b261f1048d8e1083f2de9b1c565e1be4a3a48cfc"},
-    {file = "coverage-6.5.0-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:b9023e237f4c02ff739581ef35969c3739445fb059b060ca51771e69101efffe"},
-    {file = "coverage-6.5.0-cp39-cp39-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:265de0fa6778d07de30bcf4d9dc471c3dc4314a23a3c6603d356a3c9abc2dfcf"},
-    {file = "coverage-6.5.0-cp39-cp39-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:8f830ed581b45b82451a40faabb89c84e1a998124ee4212d440e9c6cf70083e5"},
-    {file = "coverage-6.5.0-cp39-cp39-musllinux_1_1_aarch64.whl", hash = "sha256:7b6be138d61e458e18d8e6ddcddd36dd96215edfe5f1168de0b1b32635839b62"},
-    {file = "coverage-6.5.0-cp39-cp39-musllinux_1_1_i686.whl", hash = "sha256:42eafe6778551cf006a7c43153af1211c3aaab658d4d66fa5fcc021613d02518"},
-    {file = "coverage-6.5.0-cp39-cp39-musllinux_1_1_x86_64.whl", hash = "sha256:723e8130d4ecc8f56e9a611e73b31219595baa3bb252d539206f7bbbab6ffc1f"},
-    {file = "coverage-6.5.0-cp39-cp39-win32.whl", hash = "sha256:d9ecf0829c6a62b9b573c7bb6d4dcd6ba8b6f80be9ba4fc7ed50bf4ac9aecd72"},
-    {file = "coverage-6.5.0-cp39-cp39-win_amd64.whl", hash = "sha256:fc2af30ed0d5ae0b1abdb4ebdce598eafd5b35397d4d75deb341a614d333d987"},
-    {file = "coverage-6.5.0-pp36.pp37.pp38-none-any.whl", hash = "sha256:1431986dac3923c5945271f169f59c45b8802a114c8f548d611f2015133df77a"},
-    {file = "coverage-6.5.0.tar.gz", hash = "sha256:f642e90754ee3e06b0e7e51bce3379590e76b7f76b708e1a71ff043f87025c84"},
-]
-distlib = [
-    {file = "distlib-0.3.6-py2.py3-none-any.whl", hash = "sha256:f35c4b692542ca110de7ef0bea44d73981caeb34ca0b9b6b2e6d7790dda8f80e"},
-    {file = "distlib-0.3.6.tar.gz", hash = "sha256:14bad2d9b04d3a36127ac97f30b12a19268f211063d8f8ee4f47108896e11b46"},
-]
-exceptiongroup = [
-    {file = "exceptiongroup-1.0.1-py3-none-any.whl", hash = "sha256:4d6c0aa6dd825810941c792f53d7b8d71da26f5e5f84f20f9508e8f2d33b140a"},
-    {file = "exceptiongroup-1.0.1.tar.gz", hash = "sha256:73866f7f842ede6cb1daa42c4af078e2035e5f7607f0e2c762cc51bb31bbe7b2"},
-]
-execnet = [
-    {file = "execnet-1.9.0-py2.py3-none-any.whl", hash = "sha256:a295f7cc774947aac58dde7fdc85f4aa00c42adf5d8f5468fc630c1acf30a142"},
-    {file = "execnet-1.9.0.tar.gz", hash = "sha256:8f694f3ba9cc92cab508b152dcfe322153975c29bda272e2fd7f3f00f36e47c5"},
-]
-filelock = [
-    {file = "filelock-3.9.0-py3-none-any.whl", hash = "sha256:f58d535af89bb9ad5cd4df046f741f8553a418c01a7856bf0d173bbc9f6bd16d"},
-    {file = "filelock-3.9.0.tar.gz", hash = "sha256:7b319f24340b51f55a2bf7a12ac0755a9b03e718311dac567a0f4f7fabd2f5de"},
-]
-identify = [
-    {file = "identify-2.5.8-py2.py3-none-any.whl", hash = "sha256:48b7925fe122720088aeb7a6c34f17b27e706b72c61070f27fe3789094233440"},
-    {file = "identify-2.5.8.tar.gz", hash = "sha256:7a214a10313b9489a0d61467db2856ae8d0b8306fc923e03a9effa53d8aedc58"},
-]
-idna = [
-    {file = "idna-3.4-py3-none-any.whl", hash = "sha256:90b77e79eaa3eba6de819a0c442c0b4ceefc341a7a2ab77d7562bf49f425c5c2"},
-    {file = "idna-3.4.tar.gz", hash = "sha256:814f528e8dead7d329833b91c5faa87d60bf71824cd12a7530b5526063d02cb4"},
-]
-iniconfig = [
-    {file = "iniconfig-1.1.1-py2.py3-none-any.whl", hash = "sha256:011e24c64b7f47f6ebd835bb12a743f2fbe9a26d4cecaa7f53bc4f35ee9da8b3"},
-    {file = "iniconfig-1.1.1.tar.gz", hash = "sha256:bc3af051d7d14b2ee5ef9969666def0cd1a000e121eaea580d4a313df4b37f32"},
-]
-isort = [
-    {file = "isort-5.11.4-py3-none-any.whl", hash = "sha256:c033fd0edb91000a7f09527fe5c75321878f98322a77ddcc81adbd83724afb7b"},
-    {file = "isort-5.11.4.tar.gz", hash = "sha256:6db30c5ded9815d813932c04c2f85a360bcdd35fed496f4d8f35495ef0a261b6"},
-]
-jinja2 = [
-    {file = "Jinja2-3.1.2-py3-none-any.whl", hash = "sha256:6088930bfe239f0e6710546ab9c19c9ef35e29792895fed6e6e31a023a182a61"},
-    {file = "Jinja2-3.1.2.tar.gz", hash = "sha256:31351a702a408a9e7595a8fc6150fc3f43bb6bf7e319770cbc0db9df9437e852"},
-]
-jinja2-time = [
-    {file = "jinja2-time-0.2.0.tar.gz", hash = "sha256:d14eaa4d315e7688daa4969f616f226614350c48730bfa1692d2caebd8c90d40"},
-    {file = "jinja2_time-0.2.0-py2.py3-none-any.whl", hash = "sha256:d3eab6605e3ec8b7a0863df09cc1d23714908fa61aa6986a845c20ba488b4efa"},
-]
-markupsafe = [
-    {file = "MarkupSafe-2.1.1-cp310-cp310-macosx_10_9_universal2.whl", hash = "sha256:86b1f75c4e7c2ac2ccdaec2b9022845dbb81880ca318bb7a0a01fbf7813e3812"},
-    {file = "MarkupSafe-2.1.1-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:f121a1420d4e173a5d96e47e9a0c0dcff965afdf1626d28de1460815f7c4ee7a"},
-    {file = "MarkupSafe-2.1.1-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:a49907dd8420c5685cfa064a1335b6754b74541bbb3706c259c02ed65b644b3e"},
-    {file = "MarkupSafe-2.1.1-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:10c1bfff05d95783da83491be968e8fe789263689c02724e0c691933c52994f5"},
-    {file = "MarkupSafe-2.1.1-cp310-cp310-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:b7bd98b796e2b6553da7225aeb61f447f80a1ca64f41d83612e6139ca5213aa4"},
-    {file = "MarkupSafe-2.1.1-cp310-cp310-musllinux_1_1_aarch64.whl", hash = "sha256:b09bf97215625a311f669476f44b8b318b075847b49316d3e28c08e41a7a573f"},
-    {file = "MarkupSafe-2.1.1-cp310-cp310-musllinux_1_1_i686.whl", hash = "sha256:694deca8d702d5db21ec83983ce0bb4b26a578e71fbdbd4fdcd387daa90e4d5e"},
-    {file = "MarkupSafe-2.1.1-cp310-cp310-musllinux_1_1_x86_64.whl", hash = "sha256:efc1913fd2ca4f334418481c7e595c00aad186563bbc1ec76067848c7ca0a933"},
-    {file = "MarkupSafe-2.1.1-cp310-cp310-win32.whl", hash = "sha256:4a33dea2b688b3190ee12bd7cfa29d39c9ed176bda40bfa11099a3ce5d3a7ac6"},
-    {file = "MarkupSafe-2.1.1-cp310-cp310-win_amd64.whl", hash = "sha256:dda30ba7e87fbbb7eab1ec9f58678558fd9a6b8b853530e176eabd064da81417"},
-    {file = "MarkupSafe-2.1.1-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:671cd1187ed5e62818414afe79ed29da836dde67166a9fac6d435873c44fdd02"},
-    {file = "MarkupSafe-2.1.1-cp37-cp37m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:3799351e2336dc91ea70b034983ee71cf2f9533cdff7c14c90ea126bfd95d65a"},
-    {file = "MarkupSafe-2.1.1-cp37-cp37m-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:e72591e9ecd94d7feb70c1cbd7be7b3ebea3f548870aa91e2732960fa4d57a37"},
-    {file = "MarkupSafe-2.1.1-cp37-cp37m-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:6fbf47b5d3728c6aea2abb0589b5d30459e369baa772e0f37a0320185e87c980"},
-    {file = "MarkupSafe-2.1.1-cp37-cp37m-musllinux_1_1_aarch64.whl", hash = "sha256:d5ee4f386140395a2c818d149221149c54849dfcfcb9f1debfe07a8b8bd63f9a"},
-    {file = "MarkupSafe-2.1.1-cp37-cp37m-musllinux_1_1_i686.whl", hash = "sha256:bcb3ed405ed3222f9904899563d6fc492ff75cce56cba05e32eff40e6acbeaa3"},
-    {file = "MarkupSafe-2.1.1-cp37-cp37m-musllinux_1_1_x86_64.whl", hash = "sha256:e1c0b87e09fa55a220f058d1d49d3fb8df88fbfab58558f1198e08c1e1de842a"},
-    {file = "MarkupSafe-2.1.1-cp37-cp37m-win32.whl", hash = "sha256:8dc1c72a69aa7e082593c4a203dcf94ddb74bb5c8a731e4e1eb68d031e8498ff"},
-    {file = "MarkupSafe-2.1.1-cp37-cp37m-win_amd64.whl", hash = "sha256:97a68e6ada378df82bc9f16b800ab77cbf4b2fada0081794318520138c088e4a"},
-    {file = "MarkupSafe-2.1.1-cp38-cp38-macosx_10_9_universal2.whl", hash = "sha256:e8c843bbcda3a2f1e3c2ab25913c80a3c5376cd00c6e8c4a86a89a28c8dc5452"},
-    {file = "MarkupSafe-2.1.1-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:0212a68688482dc52b2d45013df70d169f542b7394fc744c02a57374a4207003"},
-    {file = "MarkupSafe-2.1.1-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:8e576a51ad59e4bfaac456023a78f6b5e6e7651dcd383bcc3e18d06f9b55d6d1"},
-    {file = "MarkupSafe-2.1.1-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:4b9fe39a2ccc108a4accc2676e77da025ce383c108593d65cc909add5c3bd601"},
-    {file = "MarkupSafe-2.1.1-cp38-cp38-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:96e37a3dc86e80bf81758c152fe66dbf60ed5eca3d26305edf01892257049925"},
-    {file = "MarkupSafe-2.1.1-cp38-cp38-musllinux_1_1_aarch64.whl", hash = "sha256:6d0072fea50feec76a4c418096652f2c3238eaa014b2f94aeb1d56a66b41403f"},
-    {file = "MarkupSafe-2.1.1-cp38-cp38-musllinux_1_1_i686.whl", hash = "sha256:089cf3dbf0cd6c100f02945abeb18484bd1ee57a079aefd52cffd17fba910b88"},
-    {file = "MarkupSafe-2.1.1-cp38-cp38-musllinux_1_1_x86_64.whl", hash = "sha256:6a074d34ee7a5ce3effbc526b7083ec9731bb3cbf921bbe1d3005d4d2bdb3a63"},
-    {file = "MarkupSafe-2.1.1-cp38-cp38-win32.whl", hash = "sha256:421be9fbf0ffe9ffd7a378aafebbf6f4602d564d34be190fc19a193232fd12b1"},
-    {file = "MarkupSafe-2.1.1-cp38-cp38-win_amd64.whl", hash = "sha256:fc7b548b17d238737688817ab67deebb30e8073c95749d55538ed473130ec0c7"},
-    {file = "MarkupSafe-2.1.1-cp39-cp39-macosx_10_9_universal2.whl", hash = "sha256:e04e26803c9c3851c931eac40c695602c6295b8d432cbe78609649ad9bd2da8a"},
-    {file = "MarkupSafe-2.1.1-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:b87db4360013327109564f0e591bd2a3b318547bcef31b468a92ee504d07ae4f"},
-    {file = "MarkupSafe-2.1.1-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:99a2a507ed3ac881b975a2976d59f38c19386d128e7a9a18b7df6fff1fd4c1d6"},
-    {file = "MarkupSafe-2.1.1-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:56442863ed2b06d19c37f94d999035e15ee982988920e12a5b4ba29b62ad1f77"},
-    {file = "MarkupSafe-2.1.1-cp39-cp39-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:3ce11ee3f23f79dbd06fb3d63e2f6af7b12db1d46932fe7bd8afa259a5996603"},
-    {file = "MarkupSafe-2.1.1-cp39-cp39-musllinux_1_1_aarch64.whl", hash = "sha256:33b74d289bd2f5e527beadcaa3f401e0df0a89927c1559c8566c066fa4248ab7"},
-    {file = "MarkupSafe-2.1.1-cp39-cp39-musllinux_1_1_i686.whl", hash = "sha256:43093fb83d8343aac0b1baa75516da6092f58f41200907ef92448ecab8825135"},
-    {file = "MarkupSafe-2.1.1-cp39-cp39-musllinux_1_1_x86_64.whl", hash = "sha256:8e3dcf21f367459434c18e71b2a9532d96547aef8a871872a5bd69a715c15f96"},
-    {file = "MarkupSafe-2.1.1-cp39-cp39-win32.whl", hash = "sha256:d4306c36ca495956b6d568d276ac11fdd9c30a36f1b6eb928070dc5360b22e1c"},
-    {file = "MarkupSafe-2.1.1-cp39-cp39-win_amd64.whl", hash = "sha256:46d00d6cfecdde84d40e572d63735ef81423ad31184100411e6e3388d405e247"},
-    {file = "MarkupSafe-2.1.1.tar.gz", hash = "sha256:7f91197cc9e48f989d12e4e6fbc46495c446636dfc81b9ccf50bb0ec74b91d4b"},
-]
-mypy-extensions = [
-    {file = "mypy_extensions-0.4.3-py2.py3-none-any.whl", hash = "sha256:090fedd75945a69ae91ce1303b5824f428daf5a028d2f6ab8a299250a846f15d"},
-    {file = "mypy_extensions-0.4.3.tar.gz", hash = "sha256:2d82818f5bb3e369420cb3c4060a7970edba416647068eb4c5343488a6c604a8"},
-]
-nodeenv = [
-    {file = "nodeenv-1.7.0-py2.py3-none-any.whl", hash = "sha256:27083a7b96a25f2f5e1d8cb4b6317ee8aeda3bdd121394e5ac54e498028a042e"},
-    {file = "nodeenv-1.7.0.tar.gz", hash = "sha256:e0e7f7dfb85fc5394c6fe1e8fa98131a2473e04311a45afb6508f7cf1836fa2b"},
-]
-packaging = [
-    {file = "packaging-22.0-py3-none-any.whl", hash = "sha256:957e2148ba0e1a3b282772e791ef1d8083648bc131c8ab0c1feba110ce1146c3"},
-    {file = "packaging-22.0.tar.gz", hash = "sha256:2198ec20bd4c017b8f9717e00f0c8714076fc2fd93816750ab48e2c41de2cfd3"},
-]
-pathspec = [
-    {file = "pathspec-0.10.1-py3-none-any.whl", hash = "sha256:46846318467efc4556ccfd27816e004270a9eeeeb4d062ce5e6fc7a87c573f93"},
-    {file = "pathspec-0.10.1.tar.gz", hash = "sha256:7ace6161b621d31e7902eb6b5ae148d12cfd23f4a249b9ffb6b9fee12084323d"},
-]
-platformdirs = [
-    {file = "platformdirs-2.6.2-py3-none-any.whl", hash = "sha256:83c8f6d04389165de7c9b6f0c682439697887bca0aa2f1c87ef1826be3584490"},
-    {file = "platformdirs-2.6.2.tar.gz", hash = "sha256:e1fea1fe471b9ff8332e229df3cb7de4f53eeea4998d3b6bfff542115e998bd2"},
-]
-pluggy = [
-    {file = "pluggy-1.0.0-py2.py3-none-any.whl", hash = "sha256:74134bbf457f031a36d68416e1509f34bd5ccc019f0bcc952c7b909d06b37bd3"},
-    {file = "pluggy-1.0.0.tar.gz", hash = "sha256:4224373bacce55f955a878bf9cfa763c1e360858e330072059e10bad68531159"},
-]
-pre-commit = [
-    {file = "pre_commit-2.21.0-py2.py3-none-any.whl", hash = "sha256:e2f91727039fc39a92f58a588a25b87f936de6567eed4f0e673e0507edc75bad"},
-    {file = "pre_commit-2.21.0.tar.gz", hash = "sha256:31ef31af7e474a8d8995027fefdfcf509b5c913ff31f2015b4ec4beb26a6f658"},
-]
-pyproject-api = [
-    {file = "pyproject_api-1.2.1-py3-none-any.whl", hash = "sha256:155d5623453173b7b4e9379a3146ccef2d52335234eb2d03d6ba730e7dad179c"},
-    {file = "pyproject_api-1.2.1.tar.gz", hash = "sha256:093c047d192ceadcab7afd6b501276bf2ce44adf41cb9c313234518cddd20818"},
-]
-pytest = [
-    {file = "pytest-7.2.0-py3-none-any.whl", hash = "sha256:892f933d339f068883b6fd5a459f03d85bfcb355e4981e146d2c7616c21fef71"},
-    {file = "pytest-7.2.0.tar.gz", hash = "sha256:c4014eb40e10f11f355ad4e3c2fb2c6c6d1919c73f3b5a433de4708202cade59"},
-]
-pytest-cov = [
-    {file = "pytest-cov-4.0.0.tar.gz", hash = "sha256:996b79efde6433cdbd0088872dbc5fb3ed7fe1578b68cdbba634f14bb8dd0470"},
-    {file = "pytest_cov-4.0.0-py3-none-any.whl", hash = "sha256:2feb1b751d66a8bd934e5edfa2e961d11309dc37b73b0eabe73b5945fee20f6b"},
-]
-pytest-xdist = [
-    {file = "pytest-xdist-3.1.0.tar.gz", hash = "sha256:40fdb8f3544921c5dfcd486ac080ce22870e71d82ced6d2e78fa97c2addd480c"},
-    {file = "pytest_xdist-3.1.0-py3-none-any.whl", hash = "sha256:70a76f191d8a1d2d6be69fc440cdf85f3e4c03c08b520fd5dc5d338d6cf07d89"},
-]
-python-dateutil = [
-    {file = "python-dateutil-2.8.2.tar.gz", hash = "sha256:0123cacc1627ae19ddf3c27a5de5bd67ee4586fbdd6440d9748f8abb483d3e86"},
-    {file = "python_dateutil-2.8.2-py2.py3-none-any.whl", hash = "sha256:961d03dc3453ebbc59dbdea9e4e11c5651520a876d0f4db161e8674aae935da9"},
-]
-python-dotenv = [
-    {file = "python-dotenv-0.21.0.tar.gz", hash = "sha256:b77d08274639e3d34145dfa6c7008e66df0f04b7be7a75fd0d5292c191d79045"},
-    {file = "python_dotenv-0.21.0-py3-none-any.whl", hash = "sha256:1684eb44636dd462b66c3ee016599815514527ad99965de77f43e0944634a7e5"},
-]
-python-slugify = [
-    {file = "python-slugify-6.1.2.tar.gz", hash = "sha256:272d106cb31ab99b3496ba085e3fea0e9e76dcde967b5e9992500d1f785ce4e1"},
-    {file = "python_slugify-6.1.2-py2.py3-none-any.whl", hash = "sha256:7b2c274c308b62f4269a9ba701aa69a797e9bca41aeee5b3a9e79e36b6656927"},
-]
-pyyaml = [
-    {file = "PyYAML-6.0-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:d4db7c7aef085872ef65a8fd7d6d09a14ae91f691dec3e87ee5ee0539d516f53"},
-    {file = "PyYAML-6.0-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:9df7ed3b3d2e0ecfe09e14741b857df43adb5a3ddadc919a2d94fbdf78fea53c"},
-    {file = "PyYAML-6.0-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:77f396e6ef4c73fdc33a9157446466f1cff553d979bd00ecb64385760c6babdc"},
-    {file = "PyYAML-6.0-cp310-cp310-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:a80a78046a72361de73f8f395f1f1e49f956c6be882eed58505a15f3e430962b"},
-    {file = "PyYAML-6.0-cp310-cp310-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:f84fbc98b019fef2ee9a1cb3ce93e3187a6df0b2538a651bfb890254ba9f90b5"},
-    {file = "PyYAML-6.0-cp310-cp310-win32.whl", hash = "sha256:2cd5df3de48857ed0544b34e2d40e9fac445930039f3cfe4bcc592a1f836d513"},
-    {file = "PyYAML-6.0-cp310-cp310-win_amd64.whl", hash = "sha256:daf496c58a8c52083df09b80c860005194014c3698698d1a57cbcfa182142a3a"},
-    {file = "PyYAML-6.0-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:d4b0ba9512519522b118090257be113b9468d804b19d63c71dbcf4a48fa32358"},
-    {file = "PyYAML-6.0-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:81957921f441d50af23654aa6c5e5eaf9b06aba7f0a19c18a538dc7ef291c5a1"},
-    {file = "PyYAML-6.0-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:afa17f5bc4d1b10afd4466fd3a44dc0e245382deca5b3c353d8b757f9e3ecb8d"},
-    {file = "PyYAML-6.0-cp311-cp311-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:dbad0e9d368bb989f4515da330b88a057617d16b6a8245084f1b05400f24609f"},
-    {file = "PyYAML-6.0-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:432557aa2c09802be39460360ddffd48156e30721f5e8d917f01d31694216782"},
-    {file = "PyYAML-6.0-cp311-cp311-win32.whl", hash = "sha256:bfaef573a63ba8923503d27530362590ff4f576c626d86a9fed95822a8255fd7"},
-    {file = "PyYAML-6.0-cp311-cp311-win_amd64.whl", hash = "sha256:01b45c0191e6d66c470b6cf1b9531a771a83c1c4208272ead47a3ae4f2f603bf"},
-    {file = "PyYAML-6.0-cp36-cp36m-macosx_10_9_x86_64.whl", hash = "sha256:897b80890765f037df3403d22bab41627ca8811ae55e9a722fd0392850ec4d86"},
-    {file = "PyYAML-6.0-cp36-cp36m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:50602afada6d6cbfad699b0c7bb50d5ccffa7e46a3d738092afddc1f9758427f"},
-    {file = "PyYAML-6.0-cp36-cp36m-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:48c346915c114f5fdb3ead70312bd042a953a8ce5c7106d5bfb1a5254e47da92"},
-    {file = "PyYAML-6.0-cp36-cp36m-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:98c4d36e99714e55cfbaaee6dd5badbc9a1ec339ebfc3b1f52e293aee6bb71a4"},
-    {file = "PyYAML-6.0-cp36-cp36m-win32.whl", hash = "sha256:0283c35a6a9fbf047493e3a0ce8d79ef5030852c51e9d911a27badfde0605293"},
-    {file = "PyYAML-6.0-cp36-cp36m-win_amd64.whl", hash = "sha256:07751360502caac1c067a8132d150cf3d61339af5691fe9e87803040dbc5db57"},
-    {file = "PyYAML-6.0-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:819b3830a1543db06c4d4b865e70ded25be52a2e0631ccd2f6a47a2822f2fd7c"},
-    {file = "PyYAML-6.0-cp37-cp37m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:473f9edb243cb1935ab5a084eb238d842fb8f404ed2193a915d1784b5a6b5fc0"},
-    {file = "PyYAML-6.0-cp37-cp37m-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:0ce82d761c532fe4ec3f87fc45688bdd3a4c1dc5e0b4a19814b9009a29baefd4"},
-    {file = "PyYAML-6.0-cp37-cp37m-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:231710d57adfd809ef5d34183b8ed1eeae3f76459c18fb4a0b373ad56bedcdd9"},
-    {file = "PyYAML-6.0-cp37-cp37m-win32.whl", hash = "sha256:c5687b8d43cf58545ade1fe3e055f70eac7a5a1a0bf42824308d868289a95737"},
-    {file = "PyYAML-6.0-cp37-cp37m-win_amd64.whl", hash = "sha256:d15a181d1ecd0d4270dc32edb46f7cb7733c7c508857278d3d378d14d606db2d"},
-    {file = "PyYAML-6.0-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:0b4624f379dab24d3725ffde76559cff63d9ec94e1736b556dacdfebe5ab6d4b"},
-    {file = "PyYAML-6.0-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:213c60cd50106436cc818accf5baa1aba61c0189ff610f64f4a3e8c6726218ba"},
-    {file = "PyYAML-6.0-cp38-cp38-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:9fa600030013c4de8165339db93d182b9431076eb98eb40ee068700c9c813e34"},
-    {file = "PyYAML-6.0-cp38-cp38-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:277a0ef2981ca40581a47093e9e2d13b3f1fbbeffae064c1d21bfceba2030287"},
-    {file = "PyYAML-6.0-cp38-cp38-win32.whl", hash = "sha256:d4eccecf9adf6fbcc6861a38015c2a64f38b9d94838ac1810a9023a0609e1b78"},
-    {file = "PyYAML-6.0-cp38-cp38-win_amd64.whl", hash = "sha256:1e4747bc279b4f613a09eb64bba2ba602d8a6664c6ce6396a4d0cd413a50ce07"},
-    {file = "PyYAML-6.0-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:055d937d65826939cb044fc8c9b08889e8c743fdc6a32b33e2390f66013e449b"},
-    {file = "PyYAML-6.0-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:e61ceaab6f49fb8bdfaa0f92c4b57bcfbea54c09277b1b4f7ac376bfb7a7c174"},
-    {file = "PyYAML-6.0-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:d67d839ede4ed1b28a4e8909735fc992a923cdb84e618544973d7dfc71540803"},
-    {file = "PyYAML-6.0-cp39-cp39-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:cba8c411ef271aa037d7357a2bc8f9ee8b58b9965831d9e51baf703280dc73d3"},
-    {file = "PyYAML-6.0-cp39-cp39-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:40527857252b61eacd1d9af500c3337ba8deb8fc298940291486c465c8b46ec0"},
-    {file = "PyYAML-6.0-cp39-cp39-win32.whl", hash = "sha256:b5b9eccad747aabaaffbc6064800670f0c297e52c12754eb1d976c57e4f74dcb"},
-    {file = "PyYAML-6.0-cp39-cp39-win_amd64.whl", hash = "sha256:b3d267842bf12586ba6c734f89d1f5b871df0273157918b0ccefa29deb05c21c"},
-    {file = "PyYAML-6.0.tar.gz", hash = "sha256:68fb519c14306fec9720a2a5b45bc9f0c8d1b9c72adf45c37baedfcd949c35a2"},
-]
-requests = [
-    {file = "requests-2.28.1-py3-none-any.whl", hash = "sha256:8fefa2a1a1365bf5520aac41836fbee479da67864514bdb821f31ce07ce65349"},
-    {file = "requests-2.28.1.tar.gz", hash = "sha256:7c5599b102feddaa661c826c56ab4fee28bfd17f5abca1ebbe3e7f19d7c97983"},
-]
-setuptools = [
-    {file = "setuptools-65.5.1-py3-none-any.whl", hash = "sha256:d0b9a8433464d5800cbe05094acf5c6d52a91bfac9b52bcfc4d41382be5d5d31"},
-    {file = "setuptools-65.5.1.tar.gz", hash = "sha256:e197a19aa8ec9722928f2206f8de752def0e4c9fc6953527360d1c36d94ddb2f"},
-]
-six = [
-    {file = "six-1.16.0-py2.py3-none-any.whl", hash = "sha256:8abb2f1d86890a2dfb989f9a77cfcfd3e47c2a354b01111771326f8aa26e0254"},
-    {file = "six-1.16.0.tar.gz", hash = "sha256:1e61c37477a1626458e36f7b1d82aa5c9b094fa4802892072e49de9c60c4c926"},
-]
-soupsieve = [
-    {file = "soupsieve-2.3.2.post1-py3-none-any.whl", hash = "sha256:3b2503d3c7084a42b1ebd08116e5f81aadfaea95863628c80a3b774a11b7c759"},
-    {file = "soupsieve-2.3.2.post1.tar.gz", hash = "sha256:fc53893b3da2c33de295667a0e19f078c14bf86544af307354de5fcf12a3f30d"},
-]
-text-unidecode = [
-    {file = "text-unidecode-1.3.tar.gz", hash = "sha256:bad6603bb14d279193107714b288be206cac565dfa49aa5b105294dd5c4aab93"},
-    {file = "text_unidecode-1.3-py2.py3-none-any.whl", hash = "sha256:1311f10e8b895935241623731c2ba64f4c455287888b18189350b67134a822e8"},
-]
-tomli = [
-    {file = "tomli-2.0.1-py3-none-any.whl", hash = "sha256:939de3e7a6161af0c887ef91b7d41a53e7c5a1ca976325f429cb46ea9bc30ecc"},
-    {file = "tomli-2.0.1.tar.gz", hash = "sha256:de526c12914f0c550d15924c62d72abc48d6fe7364aa87328337a31007fe8a4f"},
-]
-tox = [
-    {file = "tox-4.2.6-py3-none-any.whl", hash = "sha256:fb79b3e4b788491949576a9c80c2d56419eac994567c3591e24bb2788b5901d0"},
-    {file = "tox-4.2.6.tar.gz", hash = "sha256:ecf224a4f3a318adcdd71aa8fe15ffd31f14afd6a9845a43ffd63950a7325538"},
-]
-tqdm = [
-    {file = "tqdm-4.64.1-py2.py3-none-any.whl", hash = "sha256:6fee160d6ffcd1b1c68c65f14c829c22832bc401726335ce92c52d395944a6a1"},
-    {file = "tqdm-4.64.1.tar.gz", hash = "sha256:5f4f682a004951c1b450bc753c710e9280c5746ce6ffedee253ddbcbf54cf1e4"},
-]
-urllib3 = [
-    {file = "urllib3-1.26.12-py2.py3-none-any.whl", hash = "sha256:b930dd878d5a8afb066a637fbb35144fe7901e3b209d1cd4f524bd0e9deee997"},
-    {file = "urllib3-1.26.12.tar.gz", hash = "sha256:3fa96cf423e6987997fc326ae8df396db2a8b7c667747d47ddd8ecba91f4a74e"},
-]
-virtualenv = [
-    {file = "virtualenv-20.17.1-py3-none-any.whl", hash = "sha256:ce3b1684d6e1a20a3e5ed36795a97dfc6af29bc3970ca8dab93e11ac6094b3c4"},
-    {file = "virtualenv-20.17.1.tar.gz", hash = "sha256:f8b927684efc6f1cc206c9db297a570ab9ad0e51c16fa9e45487d36d1905c058"},
-]
+content-hash = "ec39e5340fbdc19f01903a2932734ef7b47704925803b1cf0e1d804d8ff7a258"
diff --git a/pyproject.toml b/pyproject.toml
index 5f1dcc2a..e67bd3a5 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -20,7 +20,7 @@ pytest = "^7.2.0"
 pytest-cov = "^4.0.0"
 pytest-xdist = "^3.1.0"
 python-dotenv = "^0.21.0"
-tox = "^4.2.6"
+tox = "^4.2.8"
 pre-commit = "^2.21.0"
 isort = "^5.11.4"
 

From ee4ca808b617309bf6c99d99070dd0ffc442fed9 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 13 Jan 2023 04:14:54 +0000
Subject: [PATCH 268/371] Bump requests from 2.28.1 to 2.28.2

Bumps [requests](https://github.com/psf/requests) from 2.28.1 to 2.28.2.
- [Release notes](https://github.com/psf/requests/releases)
- [Changelog](https://github.com/psf/requests/blob/main/HISTORY.md)
- [Commits](https://github.com/psf/requests/compare/v2.28.1...v2.28.2)

---
updated-dependencies:
- dependency-name: requests
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 poetry.lock    | 760 ++++++++++++++++++++++++-------------------------
 pyproject.toml |   2 +-
 2 files changed, 381 insertions(+), 381 deletions(-)

diff --git a/poetry.lock b/poetry.lock
index 901a3eab..a1aaccdc 100644
--- a/poetry.lock
+++ b/poetry.lock
@@ -1,3 +1,5 @@
+# This file is automatically @generated by Poetry and should not be changed by hand.
+
 [[package]]
 name = "anytree"
 version = "2.8.0"
@@ -5,6 +7,10 @@ description = "Powerful and Lightweight Python Tree Data Structure.."
 category = "main"
 optional = false
 python-versions = "*"
+files = [
+    {file = "anytree-2.8.0-py2.py3-none-any.whl", hash = "sha256:14c55ac77492b11532395049a03b773d14c7e30b22aa012e337b1e983de31521"},
+    {file = "anytree-2.8.0.tar.gz", hash = "sha256:3f0f93f355a91bc3e6245319bf4c1d50e3416cc7a35cc1133c1ff38306bbccab"},
+]
 
 [package.dependencies]
 six = ">=1.9.0"
@@ -20,6 +26,10 @@ description = "Better dates & times for Python"
 category = "dev"
 optional = false
 python-versions = ">=3.6"
+files = [
+    {file = "arrow-1.2.3-py3-none-any.whl", hash = "sha256:5a49ab92e3b7b71d96cd6bfcc4df14efefc9dfa96ea19045815914a6ab6b1fe2"},
+    {file = "arrow-1.2.3.tar.gz", hash = "sha256:3934b30ca1b9f292376d9db15b19446088d12ec58629bc3f0da28fd55fb633a1"},
+]
 
 [package.dependencies]
 python-dateutil = ">=2.7.0"
@@ -31,6 +41,10 @@ description = "Classes Without Boilerplate"
 category = "dev"
 optional = false
 python-versions = ">=3.6"
+files = [
+    {file = "attrs-22.2.0-py3-none-any.whl", hash = "sha256:29e95c7f6778868dbd49170f98f8818f78f3dc5e0e37c0b1f474e3561b240836"},
+    {file = "attrs-22.2.0.tar.gz", hash = "sha256:c9227bfc2f01993c03f68db37d1d15c9690188323c067c641f1a35ca58185f99"},
+]
 
 [package.extras]
 cov = ["attrs[tests]", "coverage-enable-subprocess", "coverage[toml] (>=5.3)"]
@@ -46,6 +60,10 @@ description = "Screen-scraping library"
 category = "main"
 optional = false
 python-versions = ">=3.6.0"
+files = [
+    {file = "beautifulsoup4-4.11.1-py3-none-any.whl", hash = "sha256:58d5c3d29f5a36ffeb94f02f0d786cd53014cf9b3b3951d42e0080d8a9498d30"},
+    {file = "beautifulsoup4-4.11.1.tar.gz", hash = "sha256:ad9aa55b65ef2808eb405f46cf74df7fcb7044d5cbc26487f96eb2ef2e436693"},
+]
 
 [package.dependencies]
 soupsieve = ">1.2"
@@ -61,6 +79,10 @@ description = "Ultra-lightweight pure Python package to check if a file is binar
 category = "dev"
 optional = false
 python-versions = "*"
+files = [
+    {file = "binaryornot-0.4.4-py2.py3-none-any.whl", hash = "sha256:b8b71173c917bddcd2c16070412e369c3ed7f0528926f70cac18a6c97fd563e4"},
+    {file = "binaryornot-0.4.4.tar.gz", hash = "sha256:359501dfc9d40632edc9fac890e19542db1a287bbcfa58175b66658392018061"},
+]
 
 [package.dependencies]
 chardet = ">=3.0.2"
@@ -72,6 +94,20 @@ description = "The uncompromising code formatter."
 category = "dev"
 optional = false
 python-versions = ">=3.7"
+files = [
+    {file = "black-22.12.0-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:9eedd20838bd5d75b80c9f5487dbcb06836a43833a37846cf1d8c1cc01cef59d"},
+    {file = "black-22.12.0-cp310-cp310-win_amd64.whl", hash = "sha256:159a46a4947f73387b4d83e87ea006dbb2337eab6c879620a3ba52699b1f4351"},
+    {file = "black-22.12.0-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:d30b212bffeb1e252b31dd269dfae69dd17e06d92b87ad26e23890f3efea366f"},
+    {file = "black-22.12.0-cp311-cp311-win_amd64.whl", hash = "sha256:7412e75863aa5c5411886804678b7d083c7c28421210180d67dfd8cf1221e1f4"},
+    {file = "black-22.12.0-cp37-cp37m-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:c116eed0efb9ff870ded8b62fe9f28dd61ef6e9ddd28d83d7d264a38417dcee2"},
+    {file = "black-22.12.0-cp37-cp37m-win_amd64.whl", hash = "sha256:1f58cbe16dfe8c12b7434e50ff889fa479072096d79f0a7f25e4ab8e94cd8350"},
+    {file = "black-22.12.0-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:77d86c9f3db9b1bf6761244bc0b3572a546f5fe37917a044e02f3166d5aafa7d"},
+    {file = "black-22.12.0-cp38-cp38-win_amd64.whl", hash = "sha256:82d9fe8fee3401e02e79767016b4907820a7dc28d70d137eb397b92ef3cc5bfc"},
+    {file = "black-22.12.0-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:101c69b23df9b44247bd88e1d7e90154336ac4992502d4197bdac35dd7ee3320"},
+    {file = "black-22.12.0-cp39-cp39-win_amd64.whl", hash = "sha256:559c7a1ba9a006226f09e4916060982fd27334ae1998e7a38b3f33a37f7a2148"},
+    {file = "black-22.12.0-py3-none-any.whl", hash = "sha256:436cc9167dd28040ad90d3b404aec22cedf24a6e4d7de221bec2730ec0c97bcf"},
+    {file = "black-22.12.0.tar.gz", hash = "sha256:229351e5a18ca30f447bf724d007f890f97e13af070bb6ad4c0a441cd7596a2f"},
+]
 
 [package.dependencies]
 click = ">=8.0.0"
@@ -92,6 +128,10 @@ description = "Extensible memoizing collections and decorators"
 category = "dev"
 optional = false
 python-versions = "~=3.7"
+files = [
+    {file = "cachetools-5.2.0-py3-none-any.whl", hash = "sha256:f9f17d2aec496a9aa6b76f53e3b614c965223c061982d434d160f930c698a9db"},
+    {file = "cachetools-5.2.0.tar.gz", hash = "sha256:6a94c6402995a99c3970cc7e4884bb60b4a8639938157eeed436098bf9831757"},
+]
 
 [[package]]
 name = "certifi"
@@ -100,6 +140,10 @@ description = "Python package for providing Mozilla's CA Bundle."
 category = "main"
 optional = false
 python-versions = ">=3.6"
+files = [
+    {file = "certifi-2022.12.7-py3-none-any.whl", hash = "sha256:4ad3232f5e926d6718ec31cfc1fcadfde020920e278684144551c91769c7bc18"},
+    {file = "certifi-2022.12.7.tar.gz", hash = "sha256:35824b4c3a97115964b408844d64aa14db1cc518f6562e8d7261699d1350a9e3"},
+]
 
 [[package]]
 name = "cfgv"
@@ -108,6 +152,10 @@ description = "Validate configuration and produce human readable error messages.
 category = "dev"
 optional = false
 python-versions = ">=3.6.1"
+files = [
+    {file = "cfgv-3.3.1-py2.py3-none-any.whl", hash = "sha256:c6a0883f3917a037485059700b9e75da2464e6c27051014ad85ba6aaa5884426"},
+    {file = "cfgv-3.3.1.tar.gz", hash = "sha256:f5a830efb9ce7a445376bb66ec94c638a9787422f96264c98edc6bdeed8ab736"},
+]
 
 [[package]]
 name = "chardet"
@@ -116,6 +164,10 @@ description = "Universal encoding detector for Python 3"
 category = "dev"
 optional = false
 python-versions = ">=3.7"
+files = [
+    {file = "chardet-5.1.0-py3-none-any.whl", hash = "sha256:362777fb014af596ad31334fde1e8c327dfdb076e1960d1694662d46a6917ab9"},
+    {file = "chardet-5.1.0.tar.gz", hash = "sha256:0d62712b956bc154f85fb0a266e2a3c5913c2967e00348701b32411d6def31e5"},
+]
 
 [[package]]
 name = "charset-normalizer"
@@ -124,6 +176,10 @@ description = "The Real First Universal Charset Detector. Open, modern and activ
 category = "main"
 optional = false
 python-versions = ">=3.6.0"
+files = [
+    {file = "charset-normalizer-2.1.1.tar.gz", hash = "sha256:5a3d016c7c547f69d6f81fb0db9449ce888b418b5b9952cc5e6e66843e9dd845"},
+    {file = "charset_normalizer-2.1.1-py3-none-any.whl", hash = "sha256:83e9a75d1911279afd89352c68b45348559d1fc0506b054b346651b5e7fee29f"},
+]
 
 [package.extras]
 unicode-backport = ["unicodedata2"]
@@ -135,6 +191,10 @@ description = "Composable command line interface toolkit"
 category = "main"
 optional = false
 python-versions = ">=3.7"
+files = [
+    {file = "click-8.1.3-py3-none-any.whl", hash = "sha256:bb4d8133cb15a609f44e8213d9b391b0809795062913b383c62be0ee95b1db48"},
+    {file = "click-8.1.3.tar.gz", hash = "sha256:7682dc8afb30297001674575ea00d1814d808d6a36af415a82bd481d37ba7b8e"},
+]
 
 [package.dependencies]
 colorama = {version = "*", markers = "platform_system == \"Windows\""}
@@ -146,6 +206,10 @@ description = "Cross-platform colored terminal text."
 category = "main"
 optional = false
 python-versions = "!=3.0.*,!=3.1.*,!=3.2.*,!=3.3.*,!=3.4.*,!=3.5.*,!=3.6.*,>=2.7"
+files = [
+    {file = "colorama-0.4.6-py2.py3-none-any.whl", hash = "sha256:4f1d9991f5acc0ca119f9d443620b77f9d6b33703e51011c16baf57afb285fc6"},
+    {file = "colorama-0.4.6.tar.gz", hash = "sha256:08695f5cb7ed6e0531a20572697297273c47b8cae5a63ffc6d6ed5c201be6e44"},
+]
 
 [[package]]
 name = "cookiecutter"
@@ -154,6 +218,10 @@ description = "A command-line utility that creates projects from project templat
 category = "dev"
 optional = false
 python-versions = ">=3.7"
+files = [
+    {file = "cookiecutter-2.1.1-py2.py3-none-any.whl", hash = "sha256:9f3ab027cec4f70916e28f03470bdb41e637a3ad354b4d65c765d93aad160022"},
+    {file = "cookiecutter-2.1.1.tar.gz", hash = "sha256:f3982be8d9c53dac1261864013fdec7f83afd2e42ede6f6dd069c5e149c540d5"},
+]
 
 [package.dependencies]
 binaryornot = ">=0.4.4"
@@ -171,6 +239,59 @@ description = "Code coverage measurement for Python"
 category = "dev"
 optional = false
 python-versions = ">=3.7"
+files = [
+    {file = "coverage-7.0.3-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:2f7c51b6074a8a3063c341953dffe48fd6674f8e4b1d3c8aa8a91f58d6e716a8"},
+    {file = "coverage-7.0.3-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:628f47eaf66727fc986d3b190d6fa32f5e6b7754a243919d28bc0fd7974c449f"},
+    {file = "coverage-7.0.3-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:e89d5abf86c104de808108a25d171ad646c07eda96ca76c8b237b94b9c71e518"},
+    {file = "coverage-7.0.3-cp310-cp310-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:75e43c6f4ea4d122dac389aabdf9d4f0e160770a75e63372f88005d90f5bcc80"},
+    {file = "coverage-7.0.3-cp310-cp310-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:49da0ff241827ebb52d5d6d5a36d33b455fa5e721d44689c95df99fd8db82437"},
+    {file = "coverage-7.0.3-cp310-cp310-musllinux_1_1_aarch64.whl", hash = "sha256:0bce4ad5bdd0b02e177a085d28d2cea5fc57bb4ba2cead395e763e34cf934eb1"},
+    {file = "coverage-7.0.3-cp310-cp310-musllinux_1_1_i686.whl", hash = "sha256:f79691335257d60951638dd43576b9bcd6f52baa5c1c2cd07a509bb003238372"},
+    {file = "coverage-7.0.3-cp310-cp310-musllinux_1_1_x86_64.whl", hash = "sha256:5722269ed05fbdb94eef431787c66b66260ff3125d1a9afcc00facff8c45adf9"},
+    {file = "coverage-7.0.3-cp310-cp310-win32.whl", hash = "sha256:bdbda870e0fda7dd0fe7db7135ca226ec4c1ade8aa76e96614829b56ca491012"},
+    {file = "coverage-7.0.3-cp310-cp310-win_amd64.whl", hash = "sha256:e56fae4292e216b8deeee38ace84557b9fa85b52db005368a275427cdabb8192"},
+    {file = "coverage-7.0.3-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:b82343a5bc51627b9d606f0b6b6b9551db7b6311a5dd920fa52a94beae2e8959"},
+    {file = "coverage-7.0.3-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:fd0a8aa431f9b7ad9eb8264f55ef83cbb254962af3775092fb6e93890dea9ca2"},
+    {file = "coverage-7.0.3-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:112cfead1bd22eada8a8db9ed387bd3e8be5528debc42b5d3c1f7da4ffaf9fb5"},
+    {file = "coverage-7.0.3-cp311-cp311-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:af87e906355fa42447be5c08c5d44e6e1c005bf142f303f726ddf5ed6e0c8a4d"},
+    {file = "coverage-7.0.3-cp311-cp311-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:f30090e22a301952c5abd0e493a1c8358b4f0b368b49fa3e4568ed3ed68b8d1f"},
+    {file = "coverage-7.0.3-cp311-cp311-musllinux_1_1_aarch64.whl", hash = "sha256:ae871d09901911eedda1981ea6fd0f62a999107293cdc4c4fd612321c5b34745"},
+    {file = "coverage-7.0.3-cp311-cp311-musllinux_1_1_i686.whl", hash = "sha256:ed7c9debf7bfc63c9b9f8b595409237774ff4b061bf29fba6f53b287a2fdeab9"},
+    {file = "coverage-7.0.3-cp311-cp311-musllinux_1_1_x86_64.whl", hash = "sha256:13121fa22dcd2c7b19c5161e3fd725692448f05377b788da4502a383573227b3"},
+    {file = "coverage-7.0.3-cp311-cp311-win32.whl", hash = "sha256:037b51ee86bc600f99b3b957c20a172431c35c2ef9c1ca34bc813ab5b51fd9f5"},
+    {file = "coverage-7.0.3-cp311-cp311-win_amd64.whl", hash = "sha256:25fde928306034e8deecd5fc91a07432dcc282c8acb76749581a28963c9f4f3f"},
+    {file = "coverage-7.0.3-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:7e8b0642c38b3d3b3c01417643ccc645345b03c32a2e84ef93cdd6844d6fe530"},
+    {file = "coverage-7.0.3-cp37-cp37m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:18b09811f849cc958d23f733a350a66b54a8de3fed1e6128ba55a5c97ffb6f65"},
+    {file = "coverage-7.0.3-cp37-cp37m-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:349d0b545520e8516f7b4f12373afc705d17d901e1de6a37a20e4ec9332b61f7"},
+    {file = "coverage-7.0.3-cp37-cp37m-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:b5b38813eee5b4739f505d94247604c72eae626d5088a16dd77b08b8b1724ab3"},
+    {file = "coverage-7.0.3-cp37-cp37m-musllinux_1_1_aarch64.whl", hash = "sha256:ba9af1218fa01b1f11c72271bc7290b701d11ad4dbc2ae97c445ecacf6858dba"},
+    {file = "coverage-7.0.3-cp37-cp37m-musllinux_1_1_i686.whl", hash = "sha256:c5648c7eec5cf1ba5db1cf2d6c10036a582d7f09e172990474a122e30c841361"},
+    {file = "coverage-7.0.3-cp37-cp37m-musllinux_1_1_x86_64.whl", hash = "sha256:d0df04495b76a885bfef009f45eebe8fe2fbf815ad7a83dabcf5aced62f33162"},
+    {file = "coverage-7.0.3-cp37-cp37m-win32.whl", hash = "sha256:af6cef3796b8068713a48dd67d258dc9a6e2ebc3bd4645bfac03a09672fa5d20"},
+    {file = "coverage-7.0.3-cp37-cp37m-win_amd64.whl", hash = "sha256:62ef3800c4058844e2e3fa35faa9dd0ccde8a8aba6c763aae50342e00d4479d4"},
+    {file = "coverage-7.0.3-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:acef7f3a3825a2d218a03dd02f5f3cc7f27aa31d882dd780191d1ad101120d74"},
+    {file = "coverage-7.0.3-cp38-cp38-macosx_11_0_arm64.whl", hash = "sha256:a530663a361eb27375cec28aea5cd282089b5e4b022ae451c4c3493b026a68a5"},
+    {file = "coverage-7.0.3-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:c58cd6bb46dcb922e0d5792850aab5964433d511b3a020867650f8d930dde4f4"},
+    {file = "coverage-7.0.3-cp38-cp38-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:f918e9ef4c98f477a5458238dde2a1643aed956c7213873ab6b6b82e32b8ef61"},
+    {file = "coverage-7.0.3-cp38-cp38-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:2b865aa679bee7fbd1c55960940dbd3252621dd81468268786c67122bbd15343"},
+    {file = "coverage-7.0.3-cp38-cp38-musllinux_1_1_aarch64.whl", hash = "sha256:c5d9b480ebae60fc2cbc8d6865194136bc690538fa542ba58726433bed6e04cc"},
+    {file = "coverage-7.0.3-cp38-cp38-musllinux_1_1_i686.whl", hash = "sha256:985ad2af5ec3dbb4fd75d5b0735752c527ad183455520055a08cf8d6794cabfc"},
+    {file = "coverage-7.0.3-cp38-cp38-musllinux_1_1_x86_64.whl", hash = "sha256:ca15308ef722f120967af7474ba6a453e0f5b6f331251e20b8145497cf1bc14a"},
+    {file = "coverage-7.0.3-cp38-cp38-win32.whl", hash = "sha256:c1cee10662c25c94415bbb987f2ec0e6ba9e8fce786334b10be7e6a7ab958f69"},
+    {file = "coverage-7.0.3-cp38-cp38-win_amd64.whl", hash = "sha256:44d6a556de4418f1f3bfd57094b8c49f0408df5a433cf0d253eeb3075261c762"},
+    {file = "coverage-7.0.3-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:e6dcc70a25cb95df0ae33dfc701de9b09c37f7dd9f00394d684a5b57257f8246"},
+    {file = "coverage-7.0.3-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:bf76d79dfaea802f0f28f50153ffbc1a74ae1ee73e480baeda410b4f3e7ab25f"},
+    {file = "coverage-7.0.3-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:88834e5d56d01c141c29deedacba5773fe0bed900b1edc957595a8a6c0da1c3c"},
+    {file = "coverage-7.0.3-cp39-cp39-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:ef001a60e888f8741e42e5aa79ae55c91be73761e4df5e806efca1ddd62fd400"},
+    {file = "coverage-7.0.3-cp39-cp39-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:4959dc506be74e4963bd2c42f7b87d8e4b289891201e19ec551e64c6aa5441f8"},
+    {file = "coverage-7.0.3-cp39-cp39-musllinux_1_1_aarch64.whl", hash = "sha256:b791beb17b32ac019a78cfbe6184f992b6273fdca31145b928ad2099435e2fcb"},
+    {file = "coverage-7.0.3-cp39-cp39-musllinux_1_1_i686.whl", hash = "sha256:b07651e3b9af8f1a092861d88b4c74d913634a7f1f2280fca0ad041ad84e9e96"},
+    {file = "coverage-7.0.3-cp39-cp39-musllinux_1_1_x86_64.whl", hash = "sha256:55e46fa4168ccb7497c9be78627fcb147e06f474f846a10d55feeb5108a24ef0"},
+    {file = "coverage-7.0.3-cp39-cp39-win32.whl", hash = "sha256:e3f1cd1cd65695b1540b3cf7828d05b3515974a9d7c7530f762ac40f58a18161"},
+    {file = "coverage-7.0.3-cp39-cp39-win_amd64.whl", hash = "sha256:d8249666c23683f74f8f93aeaa8794ac87cc61c40ff70374a825f3352a4371dc"},
+    {file = "coverage-7.0.3-pp37.pp38.pp39-none-any.whl", hash = "sha256:b1ffc8f58b81baed3f8962e28c30d99442079b82ce1ec836a1f67c0accad91c1"},
+    {file = "coverage-7.0.3.tar.gz", hash = "sha256:d5be4e93acce64f516bf4fd239c0e6118fc913c93fa1a3f52d15bdcc60d97b2d"},
+]
 
 [package.extras]
 toml = ["tomli"]
@@ -182,6 +303,10 @@ description = "Distribution utilities"
 category = "dev"
 optional = false
 python-versions = "*"
+files = [
+    {file = "distlib-0.3.6-py2.py3-none-any.whl", hash = "sha256:f35c4b692542ca110de7ef0bea44d73981caeb34ca0b9b6b2e6d7790dda8f80e"},
+    {file = "distlib-0.3.6.tar.gz", hash = "sha256:14bad2d9b04d3a36127ac97f30b12a19268f211063d8f8ee4f47108896e11b46"},
+]
 
 [[package]]
 name = "execnet"
@@ -190,6 +315,10 @@ description = "execnet: rapid multi-Python deployment"
 category = "dev"
 optional = false
 python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*"
+files = [
+    {file = "execnet-1.9.0-py2.py3-none-any.whl", hash = "sha256:a295f7cc774947aac58dde7fdc85f4aa00c42adf5d8f5468fc630c1acf30a142"},
+    {file = "execnet-1.9.0.tar.gz", hash = "sha256:8f694f3ba9cc92cab508b152dcfe322153975c29bda272e2fd7f3f00f36e47c5"},
+]
 
 [package.extras]
 testing = ["pre-commit"]
@@ -201,6 +330,10 @@ description = "A platform independent file lock."
 category = "dev"
 optional = false
 python-versions = ">=3.7"
+files = [
+    {file = "filelock-3.9.0-py3-none-any.whl", hash = "sha256:f58d535af89bb9ad5cd4df046f741f8553a418c01a7856bf0d173bbc9f6bd16d"},
+    {file = "filelock-3.9.0.tar.gz", hash = "sha256:7b319f24340b51f55a2bf7a12ac0755a9b03e718311dac567a0f4f7fabd2f5de"},
+]
 
 [package.extras]
 docs = ["furo (>=2022.12.7)", "sphinx (>=5.3)", "sphinx-autodoc-typehints (>=1.19.5)"]
@@ -213,6 +346,10 @@ description = "File identification library for Python"
 category = "dev"
 optional = false
 python-versions = ">=3.7"
+files = [
+    {file = "identify-2.5.12-py2.py3-none-any.whl", hash = "sha256:e8a400c3062d980243d27ce10455a52832205649bbcaf27ffddb3dfaaf477bad"},
+    {file = "identify-2.5.12.tar.gz", hash = "sha256:0bc96b09c838310b6fcfcc61f78a981ea07f94836ef6ef553da5bb5d4745d662"},
+]
 
 [package.extras]
 license = ["ukkonen"]
@@ -224,6 +361,10 @@ description = "Internationalized Domain Names in Applications (IDNA)"
 category = "main"
 optional = false
 python-versions = ">=3.5"
+files = [
+    {file = "idna-3.4-py3-none-any.whl", hash = "sha256:90b77e79eaa3eba6de819a0c442c0b4ceefc341a7a2ab77d7562bf49f425c5c2"},
+    {file = "idna-3.4.tar.gz", hash = "sha256:814f528e8dead7d329833b91c5faa87d60bf71824cd12a7530b5526063d02cb4"},
+]
 
 [[package]]
 name = "iniconfig"
@@ -232,6 +373,10 @@ description = "iniconfig: brain-dead simple config-ini parsing"
 category = "dev"
 optional = false
 python-versions = "*"
+files = [
+    {file = "iniconfig-1.1.1-py2.py3-none-any.whl", hash = "sha256:011e24c64b7f47f6ebd835bb12a743f2fbe9a26d4cecaa7f53bc4f35ee9da8b3"},
+    {file = "iniconfig-1.1.1.tar.gz", hash = "sha256:bc3af051d7d14b2ee5ef9969666def0cd1a000e121eaea580d4a313df4b37f32"},
+]
 
 [[package]]
 name = "isort"
@@ -240,6 +385,10 @@ description = "A Python utility / library to sort Python imports."
 category = "dev"
 optional = false
 python-versions = ">=3.7.0"
+files = [
+    {file = "isort-5.11.4-py3-none-any.whl", hash = "sha256:c033fd0edb91000a7f09527fe5c75321878f98322a77ddcc81adbd83724afb7b"},
+    {file = "isort-5.11.4.tar.gz", hash = "sha256:6db30c5ded9815d813932c04c2f85a360bcdd35fed496f4d8f35495ef0a261b6"},
+]
 
 [package.extras]
 colors = ["colorama (>=0.4.3,<0.5.0)"]
@@ -254,6 +403,10 @@ description = "A very fast and expressive template engine."
 category = "dev"
 optional = false
 python-versions = ">=3.7"
+files = [
+    {file = "Jinja2-3.1.2-py3-none-any.whl", hash = "sha256:6088930bfe239f0e6710546ab9c19c9ef35e29792895fed6e6e31a023a182a61"},
+    {file = "Jinja2-3.1.2.tar.gz", hash = "sha256:31351a702a408a9e7595a8fc6150fc3f43bb6bf7e319770cbc0db9df9437e852"},
+]
 
 [package.dependencies]
 MarkupSafe = ">=2.0"
@@ -268,6 +421,10 @@ description = "Jinja2 Extension for Dates and Times"
 category = "dev"
 optional = false
 python-versions = "*"
+files = [
+    {file = "jinja2-time-0.2.0.tar.gz", hash = "sha256:d14eaa4d315e7688daa4969f616f226614350c48730bfa1692d2caebd8c90d40"},
+    {file = "jinja2_time-0.2.0-py2.py3-none-any.whl", hash = "sha256:d3eab6605e3ec8b7a0863df09cc1d23714908fa61aa6986a845c20ba488b4efa"},
+]
 
 [package.dependencies]
 arrow = "*"
@@ -280,6 +437,48 @@ description = "Safely add untrusted strings to HTML/XML markup."
 category = "dev"
 optional = false
 python-versions = ">=3.7"
+files = [
+    {file = "MarkupSafe-2.1.1-cp310-cp310-macosx_10_9_universal2.whl", hash = "sha256:86b1f75c4e7c2ac2ccdaec2b9022845dbb81880ca318bb7a0a01fbf7813e3812"},
+    {file = "MarkupSafe-2.1.1-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:f121a1420d4e173a5d96e47e9a0c0dcff965afdf1626d28de1460815f7c4ee7a"},
+    {file = "MarkupSafe-2.1.1-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:a49907dd8420c5685cfa064a1335b6754b74541bbb3706c259c02ed65b644b3e"},
+    {file = "MarkupSafe-2.1.1-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:10c1bfff05d95783da83491be968e8fe789263689c02724e0c691933c52994f5"},
+    {file = "MarkupSafe-2.1.1-cp310-cp310-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:b7bd98b796e2b6553da7225aeb61f447f80a1ca64f41d83612e6139ca5213aa4"},
+    {file = "MarkupSafe-2.1.1-cp310-cp310-musllinux_1_1_aarch64.whl", hash = "sha256:b09bf97215625a311f669476f44b8b318b075847b49316d3e28c08e41a7a573f"},
+    {file = "MarkupSafe-2.1.1-cp310-cp310-musllinux_1_1_i686.whl", hash = "sha256:694deca8d702d5db21ec83983ce0bb4b26a578e71fbdbd4fdcd387daa90e4d5e"},
+    {file = "MarkupSafe-2.1.1-cp310-cp310-musllinux_1_1_x86_64.whl", hash = "sha256:efc1913fd2ca4f334418481c7e595c00aad186563bbc1ec76067848c7ca0a933"},
+    {file = "MarkupSafe-2.1.1-cp310-cp310-win32.whl", hash = "sha256:4a33dea2b688b3190ee12bd7cfa29d39c9ed176bda40bfa11099a3ce5d3a7ac6"},
+    {file = "MarkupSafe-2.1.1-cp310-cp310-win_amd64.whl", hash = "sha256:dda30ba7e87fbbb7eab1ec9f58678558fd9a6b8b853530e176eabd064da81417"},
+    {file = "MarkupSafe-2.1.1-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:671cd1187ed5e62818414afe79ed29da836dde67166a9fac6d435873c44fdd02"},
+    {file = "MarkupSafe-2.1.1-cp37-cp37m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:3799351e2336dc91ea70b034983ee71cf2f9533cdff7c14c90ea126bfd95d65a"},
+    {file = "MarkupSafe-2.1.1-cp37-cp37m-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:e72591e9ecd94d7feb70c1cbd7be7b3ebea3f548870aa91e2732960fa4d57a37"},
+    {file = "MarkupSafe-2.1.1-cp37-cp37m-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:6fbf47b5d3728c6aea2abb0589b5d30459e369baa772e0f37a0320185e87c980"},
+    {file = "MarkupSafe-2.1.1-cp37-cp37m-musllinux_1_1_aarch64.whl", hash = "sha256:d5ee4f386140395a2c818d149221149c54849dfcfcb9f1debfe07a8b8bd63f9a"},
+    {file = "MarkupSafe-2.1.1-cp37-cp37m-musllinux_1_1_i686.whl", hash = "sha256:bcb3ed405ed3222f9904899563d6fc492ff75cce56cba05e32eff40e6acbeaa3"},
+    {file = "MarkupSafe-2.1.1-cp37-cp37m-musllinux_1_1_x86_64.whl", hash = "sha256:e1c0b87e09fa55a220f058d1d49d3fb8df88fbfab58558f1198e08c1e1de842a"},
+    {file = "MarkupSafe-2.1.1-cp37-cp37m-win32.whl", hash = "sha256:8dc1c72a69aa7e082593c4a203dcf94ddb74bb5c8a731e4e1eb68d031e8498ff"},
+    {file = "MarkupSafe-2.1.1-cp37-cp37m-win_amd64.whl", hash = "sha256:97a68e6ada378df82bc9f16b800ab77cbf4b2fada0081794318520138c088e4a"},
+    {file = "MarkupSafe-2.1.1-cp38-cp38-macosx_10_9_universal2.whl", hash = "sha256:e8c843bbcda3a2f1e3c2ab25913c80a3c5376cd00c6e8c4a86a89a28c8dc5452"},
+    {file = "MarkupSafe-2.1.1-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:0212a68688482dc52b2d45013df70d169f542b7394fc744c02a57374a4207003"},
+    {file = "MarkupSafe-2.1.1-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:8e576a51ad59e4bfaac456023a78f6b5e6e7651dcd383bcc3e18d06f9b55d6d1"},
+    {file = "MarkupSafe-2.1.1-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:4b9fe39a2ccc108a4accc2676e77da025ce383c108593d65cc909add5c3bd601"},
+    {file = "MarkupSafe-2.1.1-cp38-cp38-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:96e37a3dc86e80bf81758c152fe66dbf60ed5eca3d26305edf01892257049925"},
+    {file = "MarkupSafe-2.1.1-cp38-cp38-musllinux_1_1_aarch64.whl", hash = "sha256:6d0072fea50feec76a4c418096652f2c3238eaa014b2f94aeb1d56a66b41403f"},
+    {file = "MarkupSafe-2.1.1-cp38-cp38-musllinux_1_1_i686.whl", hash = "sha256:089cf3dbf0cd6c100f02945abeb18484bd1ee57a079aefd52cffd17fba910b88"},
+    {file = "MarkupSafe-2.1.1-cp38-cp38-musllinux_1_1_x86_64.whl", hash = "sha256:6a074d34ee7a5ce3effbc526b7083ec9731bb3cbf921bbe1d3005d4d2bdb3a63"},
+    {file = "MarkupSafe-2.1.1-cp38-cp38-win32.whl", hash = "sha256:421be9fbf0ffe9ffd7a378aafebbf6f4602d564d34be190fc19a193232fd12b1"},
+    {file = "MarkupSafe-2.1.1-cp38-cp38-win_amd64.whl", hash = "sha256:fc7b548b17d238737688817ab67deebb30e8073c95749d55538ed473130ec0c7"},
+    {file = "MarkupSafe-2.1.1-cp39-cp39-macosx_10_9_universal2.whl", hash = "sha256:e04e26803c9c3851c931eac40c695602c6295b8d432cbe78609649ad9bd2da8a"},
+    {file = "MarkupSafe-2.1.1-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:b87db4360013327109564f0e591bd2a3b318547bcef31b468a92ee504d07ae4f"},
+    {file = "MarkupSafe-2.1.1-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:99a2a507ed3ac881b975a2976d59f38c19386d128e7a9a18b7df6fff1fd4c1d6"},
+    {file = "MarkupSafe-2.1.1-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:56442863ed2b06d19c37f94d999035e15ee982988920e12a5b4ba29b62ad1f77"},
+    {file = "MarkupSafe-2.1.1-cp39-cp39-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:3ce11ee3f23f79dbd06fb3d63e2f6af7b12db1d46932fe7bd8afa259a5996603"},
+    {file = "MarkupSafe-2.1.1-cp39-cp39-musllinux_1_1_aarch64.whl", hash = "sha256:33b74d289bd2f5e527beadcaa3f401e0df0a89927c1559c8566c066fa4248ab7"},
+    {file = "MarkupSafe-2.1.1-cp39-cp39-musllinux_1_1_i686.whl", hash = "sha256:43093fb83d8343aac0b1baa75516da6092f58f41200907ef92448ecab8825135"},
+    {file = "MarkupSafe-2.1.1-cp39-cp39-musllinux_1_1_x86_64.whl", hash = "sha256:8e3dcf21f367459434c18e71b2a9532d96547aef8a871872a5bd69a715c15f96"},
+    {file = "MarkupSafe-2.1.1-cp39-cp39-win32.whl", hash = "sha256:d4306c36ca495956b6d568d276ac11fdd9c30a36f1b6eb928070dc5360b22e1c"},
+    {file = "MarkupSafe-2.1.1-cp39-cp39-win_amd64.whl", hash = "sha256:46d00d6cfecdde84d40e572d63735ef81423ad31184100411e6e3388d405e247"},
+    {file = "MarkupSafe-2.1.1.tar.gz", hash = "sha256:7f91197cc9e48f989d12e4e6fbc46495c446636dfc81b9ccf50bb0ec74b91d4b"},
+]
 
 [[package]]
 name = "more-itertools"
@@ -288,6 +487,10 @@ description = "More routines for operating on iterables, beyond itertools"
 category = "main"
 optional = false
 python-versions = ">=3.7"
+files = [
+    {file = "more-itertools-9.0.0.tar.gz", hash = "sha256:5a6257e40878ef0520b1803990e3e22303a41b5714006c32a3fd8304b26ea1ab"},
+    {file = "more_itertools-9.0.0-py3-none-any.whl", hash = "sha256:250e83d7e81d0c87ca6bd942e6aeab8cc9daa6096d12c5308f3f92fa5e5c1f41"},
+]
 
 [[package]]
 name = "mypy-extensions"
@@ -296,6 +499,10 @@ description = "Experimental type system extensions for programs checked with the
 category = "dev"
 optional = false
 python-versions = "*"
+files = [
+    {file = "mypy_extensions-0.4.3-py2.py3-none-any.whl", hash = "sha256:090fedd75945a69ae91ce1303b5824f428daf5a028d2f6ab8a299250a846f15d"},
+    {file = "mypy_extensions-0.4.3.tar.gz", hash = "sha256:2d82818f5bb3e369420cb3c4060a7970edba416647068eb4c5343488a6c604a8"},
+]
 
 [[package]]
 name = "nodeenv"
@@ -304,6 +511,10 @@ description = "Node.js virtual environment builder"
 category = "dev"
 optional = false
 python-versions = ">=2.7,!=3.0.*,!=3.1.*,!=3.2.*,!=3.3.*,!=3.4.*,!=3.5.*,!=3.6.*"
+files = [
+    {file = "nodeenv-1.7.0-py2.py3-none-any.whl", hash = "sha256:27083a7b96a25f2f5e1d8cb4b6317ee8aeda3bdd121394e5ac54e498028a042e"},
+    {file = "nodeenv-1.7.0.tar.gz", hash = "sha256:e0e7f7dfb85fc5394c6fe1e8fa98131a2473e04311a45afb6508f7cf1836fa2b"},
+]
 
 [package.dependencies]
 setuptools = "*"
@@ -315,6 +526,10 @@ description = "Core utilities for Python packages"
 category = "dev"
 optional = false
 python-versions = ">=3.7"
+files = [
+    {file = "packaging-22.0-py3-none-any.whl", hash = "sha256:957e2148ba0e1a3b282772e791ef1d8083648bc131c8ab0c1feba110ce1146c3"},
+    {file = "packaging-22.0.tar.gz", hash = "sha256:2198ec20bd4c017b8f9717e00f0c8714076fc2fd93816750ab48e2c41de2cfd3"},
+]
 
 [[package]]
 name = "parse"
@@ -323,6 +538,9 @@ description = "parse() is the opposite of format()"
 category = "main"
 optional = false
 python-versions = "*"
+files = [
+    {file = "parse-1.19.0.tar.gz", hash = "sha256:9ff82852bcb65d139813e2a5197627a94966245c897796760a3a2a8eb66f020b"},
+]
 
 [[package]]
 name = "pathspec"
@@ -331,6 +549,10 @@ description = "Utility library for gitignore style pattern matching of file path
 category = "dev"
 optional = false
 python-versions = ">=3.7"
+files = [
+    {file = "pathspec-0.10.3-py3-none-any.whl", hash = "sha256:3c95343af8b756205e2aba76e843ba9520a24dd84f68c22b9f93251507509dd6"},
+    {file = "pathspec-0.10.3.tar.gz", hash = "sha256:56200de4077d9d0791465aa9095a01d421861e405b5096955051deefd697d6f6"},
+]
 
 [[package]]
 name = "platformdirs"
@@ -339,6 +561,10 @@ description = "A small Python package for determining appropriate platform-speci
 category = "dev"
 optional = false
 python-versions = ">=3.7"
+files = [
+    {file = "platformdirs-2.6.2-py3-none-any.whl", hash = "sha256:83c8f6d04389165de7c9b6f0c682439697887bca0aa2f1c87ef1826be3584490"},
+    {file = "platformdirs-2.6.2.tar.gz", hash = "sha256:e1fea1fe471b9ff8332e229df3cb7de4f53eeea4998d3b6bfff542115e998bd2"},
+]
 
 [package.extras]
 docs = ["furo (>=2022.12.7)", "proselint (>=0.13)", "sphinx (>=5.3)", "sphinx-autodoc-typehints (>=1.19.5)"]
@@ -351,6 +577,10 @@ description = "plugin and hook calling mechanisms for python"
 category = "dev"
 optional = false
 python-versions = ">=3.6"
+files = [
+    {file = "pluggy-1.0.0-py2.py3-none-any.whl", hash = "sha256:74134bbf457f031a36d68416e1509f34bd5ccc019f0bcc952c7b909d06b37bd3"},
+    {file = "pluggy-1.0.0.tar.gz", hash = "sha256:4224373bacce55f955a878bf9cfa763c1e360858e330072059e10bad68531159"},
+]
 
 [package.extras]
 dev = ["pre-commit", "tox"]
@@ -363,6 +593,10 @@ description = "A framework for managing and maintaining multi-language pre-commi
 category = "dev"
 optional = false
 python-versions = ">=3.7"
+files = [
+    {file = "pre_commit-2.21.0-py2.py3-none-any.whl", hash = "sha256:e2f91727039fc39a92f58a588a25b87f936de6567eed4f0e673e0507edc75bad"},
+    {file = "pre_commit-2.21.0.tar.gz", hash = "sha256:31ef31af7e474a8d8995027fefdfcf509b5c913ff31f2015b4ec4beb26a6f658"},
+]
 
 [package.dependencies]
 cfgv = ">=2.0.0"
@@ -378,6 +612,10 @@ description = "API to interact with the python pyproject.toml based projects"
 category = "dev"
 optional = false
 python-versions = ">=3.7"
+files = [
+    {file = "pyproject_api-1.4.0-py3-none-any.whl", hash = "sha256:c34226297781efdd1ba4dfb74ce21076d9a8360e2125ea31803c1a02c76b2460"},
+    {file = "pyproject_api-1.4.0.tar.gz", hash = "sha256:ac85c1f82e0291dbae5a7739dbb9a990e11ee4034c9b5599ea714f07a24ecd71"},
+]
 
 [package.dependencies]
 packaging = ">=21.3"
@@ -393,6 +631,10 @@ description = "pytest: simple powerful testing with Python"
 category = "dev"
 optional = false
 python-versions = ">=3.7"
+files = [
+    {file = "pytest-7.2.0-py3-none-any.whl", hash = "sha256:892f933d339f068883b6fd5a459f03d85bfcb355e4981e146d2c7616c21fef71"},
+    {file = "pytest-7.2.0.tar.gz", hash = "sha256:c4014eb40e10f11f355ad4e3c2fb2c6c6d1919c73f3b5a433de4708202cade59"},
+]
 
 [package.dependencies]
 attrs = ">=19.2.0"
@@ -411,6 +653,10 @@ description = "Pytest plugin for measuring coverage."
 category = "dev"
 optional = false
 python-versions = ">=3.6"
+files = [
+    {file = "pytest-cov-4.0.0.tar.gz", hash = "sha256:996b79efde6433cdbd0088872dbc5fb3ed7fe1578b68cdbba634f14bb8dd0470"},
+    {file = "pytest_cov-4.0.0-py3-none-any.whl", hash = "sha256:2feb1b751d66a8bd934e5edfa2e961d11309dc37b73b0eabe73b5945fee20f6b"},
+]
 
 [package.dependencies]
 coverage = {version = ">=5.2.1", extras = ["toml"]}
@@ -426,6 +672,10 @@ description = "pytest xdist plugin for distributed testing, most importantly acr
 category = "dev"
 optional = false
 python-versions = ">=3.7"
+files = [
+    {file = "pytest-xdist-3.1.0.tar.gz", hash = "sha256:40fdb8f3544921c5dfcd486ac080ce22870e71d82ced6d2e78fa97c2addd480c"},
+    {file = "pytest_xdist-3.1.0-py3-none-any.whl", hash = "sha256:70a76f191d8a1d2d6be69fc440cdf85f3e4c03c08b520fd5dc5d338d6cf07d89"},
+]
 
 [package.dependencies]
 execnet = ">=1.1"
@@ -443,6 +693,10 @@ description = "Extensions to the standard Python datetime module"
 category = "dev"
 optional = false
 python-versions = "!=3.0.*,!=3.1.*,!=3.2.*,>=2.7"
+files = [
+    {file = "python-dateutil-2.8.2.tar.gz", hash = "sha256:0123cacc1627ae19ddf3c27a5de5bd67ee4586fbdd6440d9748f8abb483d3e86"},
+    {file = "python_dateutil-2.8.2-py2.py3-none-any.whl", hash = "sha256:961d03dc3453ebbc59dbdea9e4e11c5651520a876d0f4db161e8674aae935da9"},
+]
 
 [package.dependencies]
 six = ">=1.5"
@@ -454,6 +708,10 @@ description = "Read key-value pairs from a .env file and set them as environment
 category = "dev"
 optional = false
 python-versions = ">=3.7"
+files = [
+    {file = "python-dotenv-0.21.0.tar.gz", hash = "sha256:b77d08274639e3d34145dfa6c7008e66df0f04b7be7a75fd0d5292c191d79045"},
+    {file = "python_dotenv-0.21.0-py3-none-any.whl", hash = "sha256:1684eb44636dd462b66c3ee016599815514527ad99965de77f43e0944634a7e5"},
+]
 
 [package.extras]
 cli = ["click (>=5.0)"]
@@ -465,6 +723,10 @@ description = "A Python slugify application that also handles Unicode"
 category = "dev"
 optional = false
 python-versions = ">=3.7"
+files = [
+    {file = "python-slugify-7.0.0.tar.gz", hash = "sha256:7a0f21a39fa6c1c4bf2e5984c9b9ae944483fd10b54804cb0e23a3ccd4954f0b"},
+    {file = "python_slugify-7.0.0-py2.py3-none-any.whl", hash = "sha256:003aee64f9fd955d111549f96c4b58a3f40b9319383c70fad6277a4974bbf570"},
+]
 
 [package.dependencies]
 text-unidecode = ">=1.3"
@@ -479,45 +741,99 @@ description = "YAML parser and emitter for Python"
 category = "dev"
 optional = false
 python-versions = ">=3.6"
-
-[[package]]
-name = "requests"
-version = "2.28.1"
-description = "Python HTTP for Humans."
-category = "main"
-optional = false
-python-versions = ">=3.7, <4"
-
-[package.dependencies]
-certifi = ">=2017.4.17"
-charset-normalizer = ">=2,<3"
-idna = ">=2.5,<4"
-urllib3 = ">=1.21.1,<1.27"
-
-[package.extras]
-socks = ["PySocks (>=1.5.6,!=1.5.7)"]
-use-chardet-on-py3 = ["chardet (>=3.0.2,<6)"]
-
-[[package]]
-name = "setuptools"
-version = "65.6.3"
-description = "Easily download, build, install, upgrade, and uninstall Python packages"
-category = "dev"
-optional = false
-python-versions = ">=3.7"
-
-[package.extras]
-docs = ["furo", "jaraco.packaging (>=9)", "jaraco.tidelift (>=1.4)", "pygments-github-lexers (==0.0.5)", "rst.linker (>=1.9)", "sphinx (>=3.5)", "sphinx-favicon", "sphinx-hoverxref (<2)", "sphinx-inline-tabs", "sphinx-notfound-page (==0.8.3)", "sphinx-reredirects", "sphinxcontrib-towncrier"]
-testing = ["build[virtualenv]", "filelock (>=3.4.0)", "flake8 (<5)", "flake8-2020", "ini2toml[lite] (>=0.9)", "jaraco.envs (>=2.2)", "jaraco.path (>=3.2.0)", "pip (>=19.1)", "pip-run (>=8.8)", "pytest (>=6)", "pytest-black (>=0.3.7)", "pytest-checkdocs (>=2.4)", "pytest-cov", "pytest-enabler (>=1.3)", "pytest-flake8", "pytest-mypy (>=0.9.1)", "pytest-perf", "pytest-timeout", "pytest-xdist", "tomli-w (>=1.0.0)", "virtualenv (>=13.0.0)", "wheel"]
-testing-integration = ["build[virtualenv]", "filelock (>=3.4.0)", "jaraco.envs (>=2.2)", "jaraco.path (>=3.2.0)", "pytest", "pytest-enabler", "pytest-xdist", "tomli", "virtualenv (>=13.0.0)", "wheel"]
-
-[[package]]
-name = "six"
-version = "1.16.0"
-description = "Python 2 and 3 compatibility utilities"
-category = "main"
-optional = false
+files = [
+    {file = "PyYAML-6.0-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:d4db7c7aef085872ef65a8fd7d6d09a14ae91f691dec3e87ee5ee0539d516f53"},
+    {file = "PyYAML-6.0-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:9df7ed3b3d2e0ecfe09e14741b857df43adb5a3ddadc919a2d94fbdf78fea53c"},
+    {file = "PyYAML-6.0-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:77f396e6ef4c73fdc33a9157446466f1cff553d979bd00ecb64385760c6babdc"},
+    {file = "PyYAML-6.0-cp310-cp310-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:a80a78046a72361de73f8f395f1f1e49f956c6be882eed58505a15f3e430962b"},
+    {file = "PyYAML-6.0-cp310-cp310-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:f84fbc98b019fef2ee9a1cb3ce93e3187a6df0b2538a651bfb890254ba9f90b5"},
+    {file = "PyYAML-6.0-cp310-cp310-win32.whl", hash = "sha256:2cd5df3de48857ed0544b34e2d40e9fac445930039f3cfe4bcc592a1f836d513"},
+    {file = "PyYAML-6.0-cp310-cp310-win_amd64.whl", hash = "sha256:daf496c58a8c52083df09b80c860005194014c3698698d1a57cbcfa182142a3a"},
+    {file = "PyYAML-6.0-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:d4b0ba9512519522b118090257be113b9468d804b19d63c71dbcf4a48fa32358"},
+    {file = "PyYAML-6.0-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:81957921f441d50af23654aa6c5e5eaf9b06aba7f0a19c18a538dc7ef291c5a1"},
+    {file = "PyYAML-6.0-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:afa17f5bc4d1b10afd4466fd3a44dc0e245382deca5b3c353d8b757f9e3ecb8d"},
+    {file = "PyYAML-6.0-cp311-cp311-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:dbad0e9d368bb989f4515da330b88a057617d16b6a8245084f1b05400f24609f"},
+    {file = "PyYAML-6.0-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:432557aa2c09802be39460360ddffd48156e30721f5e8d917f01d31694216782"},
+    {file = "PyYAML-6.0-cp311-cp311-win32.whl", hash = "sha256:bfaef573a63ba8923503d27530362590ff4f576c626d86a9fed95822a8255fd7"},
+    {file = "PyYAML-6.0-cp311-cp311-win_amd64.whl", hash = "sha256:01b45c0191e6d66c470b6cf1b9531a771a83c1c4208272ead47a3ae4f2f603bf"},
+    {file = "PyYAML-6.0-cp36-cp36m-macosx_10_9_x86_64.whl", hash = "sha256:897b80890765f037df3403d22bab41627ca8811ae55e9a722fd0392850ec4d86"},
+    {file = "PyYAML-6.0-cp36-cp36m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:50602afada6d6cbfad699b0c7bb50d5ccffa7e46a3d738092afddc1f9758427f"},
+    {file = "PyYAML-6.0-cp36-cp36m-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:48c346915c114f5fdb3ead70312bd042a953a8ce5c7106d5bfb1a5254e47da92"},
+    {file = "PyYAML-6.0-cp36-cp36m-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:98c4d36e99714e55cfbaaee6dd5badbc9a1ec339ebfc3b1f52e293aee6bb71a4"},
+    {file = "PyYAML-6.0-cp36-cp36m-win32.whl", hash = "sha256:0283c35a6a9fbf047493e3a0ce8d79ef5030852c51e9d911a27badfde0605293"},
+    {file = "PyYAML-6.0-cp36-cp36m-win_amd64.whl", hash = "sha256:07751360502caac1c067a8132d150cf3d61339af5691fe9e87803040dbc5db57"},
+    {file = "PyYAML-6.0-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:819b3830a1543db06c4d4b865e70ded25be52a2e0631ccd2f6a47a2822f2fd7c"},
+    {file = "PyYAML-6.0-cp37-cp37m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:473f9edb243cb1935ab5a084eb238d842fb8f404ed2193a915d1784b5a6b5fc0"},
+    {file = "PyYAML-6.0-cp37-cp37m-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:0ce82d761c532fe4ec3f87fc45688bdd3a4c1dc5e0b4a19814b9009a29baefd4"},
+    {file = "PyYAML-6.0-cp37-cp37m-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:231710d57adfd809ef5d34183b8ed1eeae3f76459c18fb4a0b373ad56bedcdd9"},
+    {file = "PyYAML-6.0-cp37-cp37m-win32.whl", hash = "sha256:c5687b8d43cf58545ade1fe3e055f70eac7a5a1a0bf42824308d868289a95737"},
+    {file = "PyYAML-6.0-cp37-cp37m-win_amd64.whl", hash = "sha256:d15a181d1ecd0d4270dc32edb46f7cb7733c7c508857278d3d378d14d606db2d"},
+    {file = "PyYAML-6.0-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:0b4624f379dab24d3725ffde76559cff63d9ec94e1736b556dacdfebe5ab6d4b"},
+    {file = "PyYAML-6.0-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:213c60cd50106436cc818accf5baa1aba61c0189ff610f64f4a3e8c6726218ba"},
+    {file = "PyYAML-6.0-cp38-cp38-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:9fa600030013c4de8165339db93d182b9431076eb98eb40ee068700c9c813e34"},
+    {file = "PyYAML-6.0-cp38-cp38-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:277a0ef2981ca40581a47093e9e2d13b3f1fbbeffae064c1d21bfceba2030287"},
+    {file = "PyYAML-6.0-cp38-cp38-win32.whl", hash = "sha256:d4eccecf9adf6fbcc6861a38015c2a64f38b9d94838ac1810a9023a0609e1b78"},
+    {file = "PyYAML-6.0-cp38-cp38-win_amd64.whl", hash = "sha256:1e4747bc279b4f613a09eb64bba2ba602d8a6664c6ce6396a4d0cd413a50ce07"},
+    {file = "PyYAML-6.0-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:055d937d65826939cb044fc8c9b08889e8c743fdc6a32b33e2390f66013e449b"},
+    {file = "PyYAML-6.0-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:e61ceaab6f49fb8bdfaa0f92c4b57bcfbea54c09277b1b4f7ac376bfb7a7c174"},
+    {file = "PyYAML-6.0-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:d67d839ede4ed1b28a4e8909735fc992a923cdb84e618544973d7dfc71540803"},
+    {file = "PyYAML-6.0-cp39-cp39-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:cba8c411ef271aa037d7357a2bc8f9ee8b58b9965831d9e51baf703280dc73d3"},
+    {file = "PyYAML-6.0-cp39-cp39-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:40527857252b61eacd1d9af500c3337ba8deb8fc298940291486c465c8b46ec0"},
+    {file = "PyYAML-6.0-cp39-cp39-win32.whl", hash = "sha256:b5b9eccad747aabaaffbc6064800670f0c297e52c12754eb1d976c57e4f74dcb"},
+    {file = "PyYAML-6.0-cp39-cp39-win_amd64.whl", hash = "sha256:b3d267842bf12586ba6c734f89d1f5b871df0273157918b0ccefa29deb05c21c"},
+    {file = "PyYAML-6.0.tar.gz", hash = "sha256:68fb519c14306fec9720a2a5b45bc9f0c8d1b9c72adf45c37baedfcd949c35a2"},
+]
+
+[[package]]
+name = "requests"
+version = "2.28.2"
+description = "Python HTTP for Humans."
+category = "main"
+optional = false
+python-versions = ">=3.7, <4"
+files = [
+    {file = "requests-2.28.2-py3-none-any.whl", hash = "sha256:64299f4909223da747622c030b781c0d7811e359c37124b4bd368fb8c6518baa"},
+    {file = "requests-2.28.2.tar.gz", hash = "sha256:98b1b2782e3c6c4904938b84c0eb932721069dfdb9134313beff7c83c2df24bf"},
+]
+
+[package.dependencies]
+certifi = ">=2017.4.17"
+charset-normalizer = ">=2,<4"
+idna = ">=2.5,<4"
+urllib3 = ">=1.21.1,<1.27"
+
+[package.extras]
+socks = ["PySocks (>=1.5.6,!=1.5.7)"]
+use-chardet-on-py3 = ["chardet (>=3.0.2,<6)"]
+
+[[package]]
+name = "setuptools"
+version = "65.6.3"
+description = "Easily download, build, install, upgrade, and uninstall Python packages"
+category = "dev"
+optional = false
+python-versions = ">=3.7"
+files = [
+    {file = "setuptools-65.6.3-py3-none-any.whl", hash = "sha256:57f6f22bde4e042978bcd50176fdb381d7c21a9efa4041202288d3737a0c6a54"},
+    {file = "setuptools-65.6.3.tar.gz", hash = "sha256:a7620757bf984b58deaf32fc8a4577a9bbc0850cf92c20e1ce41c38c19e5fb75"},
+]
+
+[package.extras]
+docs = ["furo", "jaraco.packaging (>=9)", "jaraco.tidelift (>=1.4)", "pygments-github-lexers (==0.0.5)", "rst.linker (>=1.9)", "sphinx (>=3.5)", "sphinx-favicon", "sphinx-hoverxref (<2)", "sphinx-inline-tabs", "sphinx-notfound-page (==0.8.3)", "sphinx-reredirects", "sphinxcontrib-towncrier"]
+testing = ["build[virtualenv]", "filelock (>=3.4.0)", "flake8 (<5)", "flake8-2020", "ini2toml[lite] (>=0.9)", "jaraco.envs (>=2.2)", "jaraco.path (>=3.2.0)", "pip (>=19.1)", "pip-run (>=8.8)", "pytest (>=6)", "pytest-black (>=0.3.7)", "pytest-checkdocs (>=2.4)", "pytest-cov", "pytest-enabler (>=1.3)", "pytest-flake8", "pytest-mypy (>=0.9.1)", "pytest-perf", "pytest-timeout", "pytest-xdist", "tomli-w (>=1.0.0)", "virtualenv (>=13.0.0)", "wheel"]
+testing-integration = ["build[virtualenv]", "filelock (>=3.4.0)", "jaraco.envs (>=2.2)", "jaraco.path (>=3.2.0)", "pytest", "pytest-enabler", "pytest-xdist", "tomli", "virtualenv (>=13.0.0)", "wheel"]
+
+[[package]]
+name = "six"
+version = "1.16.0"
+description = "Python 2 and 3 compatibility utilities"
+category = "main"
+optional = false
 python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*"
+files = [
+    {file = "six-1.16.0-py2.py3-none-any.whl", hash = "sha256:8abb2f1d86890a2dfb989f9a77cfcfd3e47c2a354b01111771326f8aa26e0254"},
+    {file = "six-1.16.0.tar.gz", hash = "sha256:1e61c37477a1626458e36f7b1d82aa5c9b094fa4802892072e49de9c60c4c926"},
+]
 
 [[package]]
 name = "soupsieve"
@@ -526,6 +842,10 @@ description = "A modern CSS selector implementation for Beautiful Soup."
 category = "main"
 optional = false
 python-versions = ">=3.6"
+files = [
+    {file = "soupsieve-2.3.2.post1-py3-none-any.whl", hash = "sha256:3b2503d3c7084a42b1ebd08116e5f81aadfaea95863628c80a3b774a11b7c759"},
+    {file = "soupsieve-2.3.2.post1.tar.gz", hash = "sha256:fc53893b3da2c33de295667a0e19f078c14bf86544af307354de5fcf12a3f30d"},
+]
 
 [[package]]
 name = "text-unidecode"
@@ -534,6 +854,10 @@ description = "The most basic Text::Unidecode port"
 category = "dev"
 optional = false
 python-versions = "*"
+files = [
+    {file = "text-unidecode-1.3.tar.gz", hash = "sha256:bad6603bb14d279193107714b288be206cac565dfa49aa5b105294dd5c4aab93"},
+    {file = "text_unidecode-1.3-py2.py3-none-any.whl", hash = "sha256:1311f10e8b895935241623731c2ba64f4c455287888b18189350b67134a822e8"},
+]
 
 [[package]]
 name = "tox"
@@ -542,6 +866,10 @@ description = "tox is a generic virtualenv management and test command line tool
 category = "dev"
 optional = false
 python-versions = ">=3.7"
+files = [
+    {file = "tox-4.2.6-py3-none-any.whl", hash = "sha256:fb79b3e4b788491949576a9c80c2d56419eac994567c3591e24bb2788b5901d0"},
+    {file = "tox-4.2.6.tar.gz", hash = "sha256:ecf224a4f3a318adcdd71aa8fe15ffd31f14afd6a9845a43ffd63950a7325538"},
+]
 
 [package.dependencies]
 cachetools = ">=5.2"
@@ -565,6 +893,10 @@ description = "Fast, Extensible Progress Meter"
 category = "main"
 optional = false
 python-versions = "!=3.0.*,!=3.1.*,!=3.2.*,!=3.3.*,>=2.7"
+files = [
+    {file = "tqdm-4.64.1-py2.py3-none-any.whl", hash = "sha256:6fee160d6ffcd1b1c68c65f14c829c22832bc401726335ce92c52d395944a6a1"},
+    {file = "tqdm-4.64.1.tar.gz", hash = "sha256:5f4f682a004951c1b450bc753c710e9280c5746ce6ffedee253ddbcbf54cf1e4"},
+]
 
 [package.dependencies]
 colorama = {version = "*", markers = "platform_system == \"Windows\""}
@@ -582,6 +914,10 @@ description = "HTTP library with thread-safe connection pooling, file post, and
 category = "main"
 optional = false
 python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*, !=3.5.*"
+files = [
+    {file = "urllib3-1.26.13-py2.py3-none-any.whl", hash = "sha256:47cc05d99aaa09c9e72ed5809b60e7ba354e64b59c9c173ac3018642d8bb41fc"},
+    {file = "urllib3-1.26.13.tar.gz", hash = "sha256:c083dd0dce68dbfbe1129d5271cb90f9447dea7d52097c6e0126120c521ddea8"},
+]
 
 [package.extras]
 brotli = ["brotli (>=1.0.9)", "brotlicffi (>=0.8.0)", "brotlipy (>=0.6.0)"]
@@ -595,6 +931,10 @@ description = "Virtual Python Environment builder"
 category = "dev"
 optional = false
 python-versions = ">=3.6"
+files = [
+    {file = "virtualenv-20.17.1-py3-none-any.whl", hash = "sha256:ce3b1684d6e1a20a3e5ed36795a97dfc6af29bc3970ca8dab93e11ac6094b3c4"},
+    {file = "virtualenv-20.17.1.tar.gz", hash = "sha256:f8b927684efc6f1cc206c9db297a570ab9ad0e51c16fa9e45487d36d1905c058"},
+]
 
 [package.dependencies]
 distlib = ">=0.3.6,<1"
@@ -606,346 +946,6 @@ docs = ["proselint (>=0.13)", "sphinx (>=5.3)", "sphinx-argparse (>=0.3.2)", "sp
 testing = ["coverage (>=6.2)", "coverage-enable-subprocess (>=1)", "flaky (>=3.7)", "packaging (>=21.3)", "pytest (>=7.0.1)", "pytest-env (>=0.6.2)", "pytest-freezegun (>=0.4.2)", "pytest-mock (>=3.6.1)", "pytest-randomly (>=3.10.3)", "pytest-timeout (>=2.1)"]
 
 [metadata]
-lock-version = "1.1"
+lock-version = "2.0"
 python-versions = "^3.11"
-content-hash = "176a152d1a388614834f5af9830dec157b748ceb7f0065f6b0ae01fc03d2e4d3"
-
-[metadata.files]
-anytree = [
-    {file = "anytree-2.8.0-py2.py3-none-any.whl", hash = "sha256:14c55ac77492b11532395049a03b773d14c7e30b22aa012e337b1e983de31521"},
-    {file = "anytree-2.8.0.tar.gz", hash = "sha256:3f0f93f355a91bc3e6245319bf4c1d50e3416cc7a35cc1133c1ff38306bbccab"},
-]
-arrow = [
-    {file = "arrow-1.2.3-py3-none-any.whl", hash = "sha256:5a49ab92e3b7b71d96cd6bfcc4df14efefc9dfa96ea19045815914a6ab6b1fe2"},
-    {file = "arrow-1.2.3.tar.gz", hash = "sha256:3934b30ca1b9f292376d9db15b19446088d12ec58629bc3f0da28fd55fb633a1"},
-]
-attrs = [
-    {file = "attrs-22.2.0-py3-none-any.whl", hash = "sha256:29e95c7f6778868dbd49170f98f8818f78f3dc5e0e37c0b1f474e3561b240836"},
-    {file = "attrs-22.2.0.tar.gz", hash = "sha256:c9227bfc2f01993c03f68db37d1d15c9690188323c067c641f1a35ca58185f99"},
-]
-beautifulsoup4 = [
-    {file = "beautifulsoup4-4.11.1-py3-none-any.whl", hash = "sha256:58d5c3d29f5a36ffeb94f02f0d786cd53014cf9b3b3951d42e0080d8a9498d30"},
-    {file = "beautifulsoup4-4.11.1.tar.gz", hash = "sha256:ad9aa55b65ef2808eb405f46cf74df7fcb7044d5cbc26487f96eb2ef2e436693"},
-]
-binaryornot = [
-    {file = "binaryornot-0.4.4-py2.py3-none-any.whl", hash = "sha256:b8b71173c917bddcd2c16070412e369c3ed7f0528926f70cac18a6c97fd563e4"},
-    {file = "binaryornot-0.4.4.tar.gz", hash = "sha256:359501dfc9d40632edc9fac890e19542db1a287bbcfa58175b66658392018061"},
-]
-black = [
-    {file = "black-22.12.0-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:9eedd20838bd5d75b80c9f5487dbcb06836a43833a37846cf1d8c1cc01cef59d"},
-    {file = "black-22.12.0-cp310-cp310-win_amd64.whl", hash = "sha256:159a46a4947f73387b4d83e87ea006dbb2337eab6c879620a3ba52699b1f4351"},
-    {file = "black-22.12.0-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:d30b212bffeb1e252b31dd269dfae69dd17e06d92b87ad26e23890f3efea366f"},
-    {file = "black-22.12.0-cp311-cp311-win_amd64.whl", hash = "sha256:7412e75863aa5c5411886804678b7d083c7c28421210180d67dfd8cf1221e1f4"},
-    {file = "black-22.12.0-cp37-cp37m-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:c116eed0efb9ff870ded8b62fe9f28dd61ef6e9ddd28d83d7d264a38417dcee2"},
-    {file = "black-22.12.0-cp37-cp37m-win_amd64.whl", hash = "sha256:1f58cbe16dfe8c12b7434e50ff889fa479072096d79f0a7f25e4ab8e94cd8350"},
-    {file = "black-22.12.0-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:77d86c9f3db9b1bf6761244bc0b3572a546f5fe37917a044e02f3166d5aafa7d"},
-    {file = "black-22.12.0-cp38-cp38-win_amd64.whl", hash = "sha256:82d9fe8fee3401e02e79767016b4907820a7dc28d70d137eb397b92ef3cc5bfc"},
-    {file = "black-22.12.0-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:101c69b23df9b44247bd88e1d7e90154336ac4992502d4197bdac35dd7ee3320"},
-    {file = "black-22.12.0-cp39-cp39-win_amd64.whl", hash = "sha256:559c7a1ba9a006226f09e4916060982fd27334ae1998e7a38b3f33a37f7a2148"},
-    {file = "black-22.12.0-py3-none-any.whl", hash = "sha256:436cc9167dd28040ad90d3b404aec22cedf24a6e4d7de221bec2730ec0c97bcf"},
-    {file = "black-22.12.0.tar.gz", hash = "sha256:229351e5a18ca30f447bf724d007f890f97e13af070bb6ad4c0a441cd7596a2f"},
-]
-cachetools = [
-    {file = "cachetools-5.2.0-py3-none-any.whl", hash = "sha256:f9f17d2aec496a9aa6b76f53e3b614c965223c061982d434d160f930c698a9db"},
-    {file = "cachetools-5.2.0.tar.gz", hash = "sha256:6a94c6402995a99c3970cc7e4884bb60b4a8639938157eeed436098bf9831757"},
-]
-certifi = [
-    {file = "certifi-2022.12.7-py3-none-any.whl", hash = "sha256:4ad3232f5e926d6718ec31cfc1fcadfde020920e278684144551c91769c7bc18"},
-    {file = "certifi-2022.12.7.tar.gz", hash = "sha256:35824b4c3a97115964b408844d64aa14db1cc518f6562e8d7261699d1350a9e3"},
-]
-cfgv = [
-    {file = "cfgv-3.3.1-py2.py3-none-any.whl", hash = "sha256:c6a0883f3917a037485059700b9e75da2464e6c27051014ad85ba6aaa5884426"},
-    {file = "cfgv-3.3.1.tar.gz", hash = "sha256:f5a830efb9ce7a445376bb66ec94c638a9787422f96264c98edc6bdeed8ab736"},
-]
-chardet = [
-    {file = "chardet-5.1.0-py3-none-any.whl", hash = "sha256:362777fb014af596ad31334fde1e8c327dfdb076e1960d1694662d46a6917ab9"},
-    {file = "chardet-5.1.0.tar.gz", hash = "sha256:0d62712b956bc154f85fb0a266e2a3c5913c2967e00348701b32411d6def31e5"},
-]
-charset-normalizer = [
-    {file = "charset-normalizer-2.1.1.tar.gz", hash = "sha256:5a3d016c7c547f69d6f81fb0db9449ce888b418b5b9952cc5e6e66843e9dd845"},
-    {file = "charset_normalizer-2.1.1-py3-none-any.whl", hash = "sha256:83e9a75d1911279afd89352c68b45348559d1fc0506b054b346651b5e7fee29f"},
-]
-click = [
-    {file = "click-8.1.3-py3-none-any.whl", hash = "sha256:bb4d8133cb15a609f44e8213d9b391b0809795062913b383c62be0ee95b1db48"},
-    {file = "click-8.1.3.tar.gz", hash = "sha256:7682dc8afb30297001674575ea00d1814d808d6a36af415a82bd481d37ba7b8e"},
-]
-colorama = [
-    {file = "colorama-0.4.6-py2.py3-none-any.whl", hash = "sha256:4f1d9991f5acc0ca119f9d443620b77f9d6b33703e51011c16baf57afb285fc6"},
-    {file = "colorama-0.4.6.tar.gz", hash = "sha256:08695f5cb7ed6e0531a20572697297273c47b8cae5a63ffc6d6ed5c201be6e44"},
-]
-cookiecutter = [
-    {file = "cookiecutter-2.1.1-py2.py3-none-any.whl", hash = "sha256:9f3ab027cec4f70916e28f03470bdb41e637a3ad354b4d65c765d93aad160022"},
-    {file = "cookiecutter-2.1.1.tar.gz", hash = "sha256:f3982be8d9c53dac1261864013fdec7f83afd2e42ede6f6dd069c5e149c540d5"},
-]
-coverage = [
-    {file = "coverage-7.0.3-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:2f7c51b6074a8a3063c341953dffe48fd6674f8e4b1d3c8aa8a91f58d6e716a8"},
-    {file = "coverage-7.0.3-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:628f47eaf66727fc986d3b190d6fa32f5e6b7754a243919d28bc0fd7974c449f"},
-    {file = "coverage-7.0.3-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:e89d5abf86c104de808108a25d171ad646c07eda96ca76c8b237b94b9c71e518"},
-    {file = "coverage-7.0.3-cp310-cp310-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:75e43c6f4ea4d122dac389aabdf9d4f0e160770a75e63372f88005d90f5bcc80"},
-    {file = "coverage-7.0.3-cp310-cp310-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:49da0ff241827ebb52d5d6d5a36d33b455fa5e721d44689c95df99fd8db82437"},
-    {file = "coverage-7.0.3-cp310-cp310-musllinux_1_1_aarch64.whl", hash = "sha256:0bce4ad5bdd0b02e177a085d28d2cea5fc57bb4ba2cead395e763e34cf934eb1"},
-    {file = "coverage-7.0.3-cp310-cp310-musllinux_1_1_i686.whl", hash = "sha256:f79691335257d60951638dd43576b9bcd6f52baa5c1c2cd07a509bb003238372"},
-    {file = "coverage-7.0.3-cp310-cp310-musllinux_1_1_x86_64.whl", hash = "sha256:5722269ed05fbdb94eef431787c66b66260ff3125d1a9afcc00facff8c45adf9"},
-    {file = "coverage-7.0.3-cp310-cp310-win32.whl", hash = "sha256:bdbda870e0fda7dd0fe7db7135ca226ec4c1ade8aa76e96614829b56ca491012"},
-    {file = "coverage-7.0.3-cp310-cp310-win_amd64.whl", hash = "sha256:e56fae4292e216b8deeee38ace84557b9fa85b52db005368a275427cdabb8192"},
-    {file = "coverage-7.0.3-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:b82343a5bc51627b9d606f0b6b6b9551db7b6311a5dd920fa52a94beae2e8959"},
-    {file = "coverage-7.0.3-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:fd0a8aa431f9b7ad9eb8264f55ef83cbb254962af3775092fb6e93890dea9ca2"},
-    {file = "coverage-7.0.3-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:112cfead1bd22eada8a8db9ed387bd3e8be5528debc42b5d3c1f7da4ffaf9fb5"},
-    {file = "coverage-7.0.3-cp311-cp311-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:af87e906355fa42447be5c08c5d44e6e1c005bf142f303f726ddf5ed6e0c8a4d"},
-    {file = "coverage-7.0.3-cp311-cp311-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:f30090e22a301952c5abd0e493a1c8358b4f0b368b49fa3e4568ed3ed68b8d1f"},
-    {file = "coverage-7.0.3-cp311-cp311-musllinux_1_1_aarch64.whl", hash = "sha256:ae871d09901911eedda1981ea6fd0f62a999107293cdc4c4fd612321c5b34745"},
-    {file = "coverage-7.0.3-cp311-cp311-musllinux_1_1_i686.whl", hash = "sha256:ed7c9debf7bfc63c9b9f8b595409237774ff4b061bf29fba6f53b287a2fdeab9"},
-    {file = "coverage-7.0.3-cp311-cp311-musllinux_1_1_x86_64.whl", hash = "sha256:13121fa22dcd2c7b19c5161e3fd725692448f05377b788da4502a383573227b3"},
-    {file = "coverage-7.0.3-cp311-cp311-win32.whl", hash = "sha256:037b51ee86bc600f99b3b957c20a172431c35c2ef9c1ca34bc813ab5b51fd9f5"},
-    {file = "coverage-7.0.3-cp311-cp311-win_amd64.whl", hash = "sha256:25fde928306034e8deecd5fc91a07432dcc282c8acb76749581a28963c9f4f3f"},
-    {file = "coverage-7.0.3-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:7e8b0642c38b3d3b3c01417643ccc645345b03c32a2e84ef93cdd6844d6fe530"},
-    {file = "coverage-7.0.3-cp37-cp37m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:18b09811f849cc958d23f733a350a66b54a8de3fed1e6128ba55a5c97ffb6f65"},
-    {file = "coverage-7.0.3-cp37-cp37m-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:349d0b545520e8516f7b4f12373afc705d17d901e1de6a37a20e4ec9332b61f7"},
-    {file = "coverage-7.0.3-cp37-cp37m-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:b5b38813eee5b4739f505d94247604c72eae626d5088a16dd77b08b8b1724ab3"},
-    {file = "coverage-7.0.3-cp37-cp37m-musllinux_1_1_aarch64.whl", hash = "sha256:ba9af1218fa01b1f11c72271bc7290b701d11ad4dbc2ae97c445ecacf6858dba"},
-    {file = "coverage-7.0.3-cp37-cp37m-musllinux_1_1_i686.whl", hash = "sha256:c5648c7eec5cf1ba5db1cf2d6c10036a582d7f09e172990474a122e30c841361"},
-    {file = "coverage-7.0.3-cp37-cp37m-musllinux_1_1_x86_64.whl", hash = "sha256:d0df04495b76a885bfef009f45eebe8fe2fbf815ad7a83dabcf5aced62f33162"},
-    {file = "coverage-7.0.3-cp37-cp37m-win32.whl", hash = "sha256:af6cef3796b8068713a48dd67d258dc9a6e2ebc3bd4645bfac03a09672fa5d20"},
-    {file = "coverage-7.0.3-cp37-cp37m-win_amd64.whl", hash = "sha256:62ef3800c4058844e2e3fa35faa9dd0ccde8a8aba6c763aae50342e00d4479d4"},
-    {file = "coverage-7.0.3-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:acef7f3a3825a2d218a03dd02f5f3cc7f27aa31d882dd780191d1ad101120d74"},
-    {file = "coverage-7.0.3-cp38-cp38-macosx_11_0_arm64.whl", hash = "sha256:a530663a361eb27375cec28aea5cd282089b5e4b022ae451c4c3493b026a68a5"},
-    {file = "coverage-7.0.3-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:c58cd6bb46dcb922e0d5792850aab5964433d511b3a020867650f8d930dde4f4"},
-    {file = "coverage-7.0.3-cp38-cp38-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:f918e9ef4c98f477a5458238dde2a1643aed956c7213873ab6b6b82e32b8ef61"},
-    {file = "coverage-7.0.3-cp38-cp38-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:2b865aa679bee7fbd1c55960940dbd3252621dd81468268786c67122bbd15343"},
-    {file = "coverage-7.0.3-cp38-cp38-musllinux_1_1_aarch64.whl", hash = "sha256:c5d9b480ebae60fc2cbc8d6865194136bc690538fa542ba58726433bed6e04cc"},
-    {file = "coverage-7.0.3-cp38-cp38-musllinux_1_1_i686.whl", hash = "sha256:985ad2af5ec3dbb4fd75d5b0735752c527ad183455520055a08cf8d6794cabfc"},
-    {file = "coverage-7.0.3-cp38-cp38-musllinux_1_1_x86_64.whl", hash = "sha256:ca15308ef722f120967af7474ba6a453e0f5b6f331251e20b8145497cf1bc14a"},
-    {file = "coverage-7.0.3-cp38-cp38-win32.whl", hash = "sha256:c1cee10662c25c94415bbb987f2ec0e6ba9e8fce786334b10be7e6a7ab958f69"},
-    {file = "coverage-7.0.3-cp38-cp38-win_amd64.whl", hash = "sha256:44d6a556de4418f1f3bfd57094b8c49f0408df5a433cf0d253eeb3075261c762"},
-    {file = "coverage-7.0.3-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:e6dcc70a25cb95df0ae33dfc701de9b09c37f7dd9f00394d684a5b57257f8246"},
-    {file = "coverage-7.0.3-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:bf76d79dfaea802f0f28f50153ffbc1a74ae1ee73e480baeda410b4f3e7ab25f"},
-    {file = "coverage-7.0.3-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:88834e5d56d01c141c29deedacba5773fe0bed900b1edc957595a8a6c0da1c3c"},
-    {file = "coverage-7.0.3-cp39-cp39-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:ef001a60e888f8741e42e5aa79ae55c91be73761e4df5e806efca1ddd62fd400"},
-    {file = "coverage-7.0.3-cp39-cp39-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:4959dc506be74e4963bd2c42f7b87d8e4b289891201e19ec551e64c6aa5441f8"},
-    {file = "coverage-7.0.3-cp39-cp39-musllinux_1_1_aarch64.whl", hash = "sha256:b791beb17b32ac019a78cfbe6184f992b6273fdca31145b928ad2099435e2fcb"},
-    {file = "coverage-7.0.3-cp39-cp39-musllinux_1_1_i686.whl", hash = "sha256:b07651e3b9af8f1a092861d88b4c74d913634a7f1f2280fca0ad041ad84e9e96"},
-    {file = "coverage-7.0.3-cp39-cp39-musllinux_1_1_x86_64.whl", hash = "sha256:55e46fa4168ccb7497c9be78627fcb147e06f474f846a10d55feeb5108a24ef0"},
-    {file = "coverage-7.0.3-cp39-cp39-win32.whl", hash = "sha256:e3f1cd1cd65695b1540b3cf7828d05b3515974a9d7c7530f762ac40f58a18161"},
-    {file = "coverage-7.0.3-cp39-cp39-win_amd64.whl", hash = "sha256:d8249666c23683f74f8f93aeaa8794ac87cc61c40ff70374a825f3352a4371dc"},
-    {file = "coverage-7.0.3-pp37.pp38.pp39-none-any.whl", hash = "sha256:b1ffc8f58b81baed3f8962e28c30d99442079b82ce1ec836a1f67c0accad91c1"},
-    {file = "coverage-7.0.3.tar.gz", hash = "sha256:d5be4e93acce64f516bf4fd239c0e6118fc913c93fa1a3f52d15bdcc60d97b2d"},
-]
-distlib = [
-    {file = "distlib-0.3.6-py2.py3-none-any.whl", hash = "sha256:f35c4b692542ca110de7ef0bea44d73981caeb34ca0b9b6b2e6d7790dda8f80e"},
-    {file = "distlib-0.3.6.tar.gz", hash = "sha256:14bad2d9b04d3a36127ac97f30b12a19268f211063d8f8ee4f47108896e11b46"},
-]
-execnet = [
-    {file = "execnet-1.9.0-py2.py3-none-any.whl", hash = "sha256:a295f7cc774947aac58dde7fdc85f4aa00c42adf5d8f5468fc630c1acf30a142"},
-    {file = "execnet-1.9.0.tar.gz", hash = "sha256:8f694f3ba9cc92cab508b152dcfe322153975c29bda272e2fd7f3f00f36e47c5"},
-]
-filelock = [
-    {file = "filelock-3.9.0-py3-none-any.whl", hash = "sha256:f58d535af89bb9ad5cd4df046f741f8553a418c01a7856bf0d173bbc9f6bd16d"},
-    {file = "filelock-3.9.0.tar.gz", hash = "sha256:7b319f24340b51f55a2bf7a12ac0755a9b03e718311dac567a0f4f7fabd2f5de"},
-]
-identify = [
-    {file = "identify-2.5.12-py2.py3-none-any.whl", hash = "sha256:e8a400c3062d980243d27ce10455a52832205649bbcaf27ffddb3dfaaf477bad"},
-    {file = "identify-2.5.12.tar.gz", hash = "sha256:0bc96b09c838310b6fcfcc61f78a981ea07f94836ef6ef553da5bb5d4745d662"},
-]
-idna = [
-    {file = "idna-3.4-py3-none-any.whl", hash = "sha256:90b77e79eaa3eba6de819a0c442c0b4ceefc341a7a2ab77d7562bf49f425c5c2"},
-    {file = "idna-3.4.tar.gz", hash = "sha256:814f528e8dead7d329833b91c5faa87d60bf71824cd12a7530b5526063d02cb4"},
-]
-iniconfig = [
-    {file = "iniconfig-1.1.1-py2.py3-none-any.whl", hash = "sha256:011e24c64b7f47f6ebd835bb12a743f2fbe9a26d4cecaa7f53bc4f35ee9da8b3"},
-    {file = "iniconfig-1.1.1.tar.gz", hash = "sha256:bc3af051d7d14b2ee5ef9969666def0cd1a000e121eaea580d4a313df4b37f32"},
-]
-isort = [
-    {file = "isort-5.11.4-py3-none-any.whl", hash = "sha256:c033fd0edb91000a7f09527fe5c75321878f98322a77ddcc81adbd83724afb7b"},
-    {file = "isort-5.11.4.tar.gz", hash = "sha256:6db30c5ded9815d813932c04c2f85a360bcdd35fed496f4d8f35495ef0a261b6"},
-]
-jinja2 = [
-    {file = "Jinja2-3.1.2-py3-none-any.whl", hash = "sha256:6088930bfe239f0e6710546ab9c19c9ef35e29792895fed6e6e31a023a182a61"},
-    {file = "Jinja2-3.1.2.tar.gz", hash = "sha256:31351a702a408a9e7595a8fc6150fc3f43bb6bf7e319770cbc0db9df9437e852"},
-]
-jinja2-time = [
-    {file = "jinja2-time-0.2.0.tar.gz", hash = "sha256:d14eaa4d315e7688daa4969f616f226614350c48730bfa1692d2caebd8c90d40"},
-    {file = "jinja2_time-0.2.0-py2.py3-none-any.whl", hash = "sha256:d3eab6605e3ec8b7a0863df09cc1d23714908fa61aa6986a845c20ba488b4efa"},
-]
-markupsafe = [
-    {file = "MarkupSafe-2.1.1-cp310-cp310-macosx_10_9_universal2.whl", hash = "sha256:86b1f75c4e7c2ac2ccdaec2b9022845dbb81880ca318bb7a0a01fbf7813e3812"},
-    {file = "MarkupSafe-2.1.1-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:f121a1420d4e173a5d96e47e9a0c0dcff965afdf1626d28de1460815f7c4ee7a"},
-    {file = "MarkupSafe-2.1.1-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:a49907dd8420c5685cfa064a1335b6754b74541bbb3706c259c02ed65b644b3e"},
-    {file = "MarkupSafe-2.1.1-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:10c1bfff05d95783da83491be968e8fe789263689c02724e0c691933c52994f5"},
-    {file = "MarkupSafe-2.1.1-cp310-cp310-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:b7bd98b796e2b6553da7225aeb61f447f80a1ca64f41d83612e6139ca5213aa4"},
-    {file = "MarkupSafe-2.1.1-cp310-cp310-musllinux_1_1_aarch64.whl", hash = "sha256:b09bf97215625a311f669476f44b8b318b075847b49316d3e28c08e41a7a573f"},
-    {file = "MarkupSafe-2.1.1-cp310-cp310-musllinux_1_1_i686.whl", hash = "sha256:694deca8d702d5db21ec83983ce0bb4b26a578e71fbdbd4fdcd387daa90e4d5e"},
-    {file = "MarkupSafe-2.1.1-cp310-cp310-musllinux_1_1_x86_64.whl", hash = "sha256:efc1913fd2ca4f334418481c7e595c00aad186563bbc1ec76067848c7ca0a933"},
-    {file = "MarkupSafe-2.1.1-cp310-cp310-win32.whl", hash = "sha256:4a33dea2b688b3190ee12bd7cfa29d39c9ed176bda40bfa11099a3ce5d3a7ac6"},
-    {file = "MarkupSafe-2.1.1-cp310-cp310-win_amd64.whl", hash = "sha256:dda30ba7e87fbbb7eab1ec9f58678558fd9a6b8b853530e176eabd064da81417"},
-    {file = "MarkupSafe-2.1.1-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:671cd1187ed5e62818414afe79ed29da836dde67166a9fac6d435873c44fdd02"},
-    {file = "MarkupSafe-2.1.1-cp37-cp37m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:3799351e2336dc91ea70b034983ee71cf2f9533cdff7c14c90ea126bfd95d65a"},
-    {file = "MarkupSafe-2.1.1-cp37-cp37m-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:e72591e9ecd94d7feb70c1cbd7be7b3ebea3f548870aa91e2732960fa4d57a37"},
-    {file = "MarkupSafe-2.1.1-cp37-cp37m-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:6fbf47b5d3728c6aea2abb0589b5d30459e369baa772e0f37a0320185e87c980"},
-    {file = "MarkupSafe-2.1.1-cp37-cp37m-musllinux_1_1_aarch64.whl", hash = "sha256:d5ee4f386140395a2c818d149221149c54849dfcfcb9f1debfe07a8b8bd63f9a"},
-    {file = "MarkupSafe-2.1.1-cp37-cp37m-musllinux_1_1_i686.whl", hash = "sha256:bcb3ed405ed3222f9904899563d6fc492ff75cce56cba05e32eff40e6acbeaa3"},
-    {file = "MarkupSafe-2.1.1-cp37-cp37m-musllinux_1_1_x86_64.whl", hash = "sha256:e1c0b87e09fa55a220f058d1d49d3fb8df88fbfab58558f1198e08c1e1de842a"},
-    {file = "MarkupSafe-2.1.1-cp37-cp37m-win32.whl", hash = "sha256:8dc1c72a69aa7e082593c4a203dcf94ddb74bb5c8a731e4e1eb68d031e8498ff"},
-    {file = "MarkupSafe-2.1.1-cp37-cp37m-win_amd64.whl", hash = "sha256:97a68e6ada378df82bc9f16b800ab77cbf4b2fada0081794318520138c088e4a"},
-    {file = "MarkupSafe-2.1.1-cp38-cp38-macosx_10_9_universal2.whl", hash = "sha256:e8c843bbcda3a2f1e3c2ab25913c80a3c5376cd00c6e8c4a86a89a28c8dc5452"},
-    {file = "MarkupSafe-2.1.1-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:0212a68688482dc52b2d45013df70d169f542b7394fc744c02a57374a4207003"},
-    {file = "MarkupSafe-2.1.1-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:8e576a51ad59e4bfaac456023a78f6b5e6e7651dcd383bcc3e18d06f9b55d6d1"},
-    {file = "MarkupSafe-2.1.1-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:4b9fe39a2ccc108a4accc2676e77da025ce383c108593d65cc909add5c3bd601"},
-    {file = "MarkupSafe-2.1.1-cp38-cp38-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:96e37a3dc86e80bf81758c152fe66dbf60ed5eca3d26305edf01892257049925"},
-    {file = "MarkupSafe-2.1.1-cp38-cp38-musllinux_1_1_aarch64.whl", hash = "sha256:6d0072fea50feec76a4c418096652f2c3238eaa014b2f94aeb1d56a66b41403f"},
-    {file = "MarkupSafe-2.1.1-cp38-cp38-musllinux_1_1_i686.whl", hash = "sha256:089cf3dbf0cd6c100f02945abeb18484bd1ee57a079aefd52cffd17fba910b88"},
-    {file = "MarkupSafe-2.1.1-cp38-cp38-musllinux_1_1_x86_64.whl", hash = "sha256:6a074d34ee7a5ce3effbc526b7083ec9731bb3cbf921bbe1d3005d4d2bdb3a63"},
-    {file = "MarkupSafe-2.1.1-cp38-cp38-win32.whl", hash = "sha256:421be9fbf0ffe9ffd7a378aafebbf6f4602d564d34be190fc19a193232fd12b1"},
-    {file = "MarkupSafe-2.1.1-cp38-cp38-win_amd64.whl", hash = "sha256:fc7b548b17d238737688817ab67deebb30e8073c95749d55538ed473130ec0c7"},
-    {file = "MarkupSafe-2.1.1-cp39-cp39-macosx_10_9_universal2.whl", hash = "sha256:e04e26803c9c3851c931eac40c695602c6295b8d432cbe78609649ad9bd2da8a"},
-    {file = "MarkupSafe-2.1.1-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:b87db4360013327109564f0e591bd2a3b318547bcef31b468a92ee504d07ae4f"},
-    {file = "MarkupSafe-2.1.1-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:99a2a507ed3ac881b975a2976d59f38c19386d128e7a9a18b7df6fff1fd4c1d6"},
-    {file = "MarkupSafe-2.1.1-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:56442863ed2b06d19c37f94d999035e15ee982988920e12a5b4ba29b62ad1f77"},
-    {file = "MarkupSafe-2.1.1-cp39-cp39-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:3ce11ee3f23f79dbd06fb3d63e2f6af7b12db1d46932fe7bd8afa259a5996603"},
-    {file = "MarkupSafe-2.1.1-cp39-cp39-musllinux_1_1_aarch64.whl", hash = "sha256:33b74d289bd2f5e527beadcaa3f401e0df0a89927c1559c8566c066fa4248ab7"},
-    {file = "MarkupSafe-2.1.1-cp39-cp39-musllinux_1_1_i686.whl", hash = "sha256:43093fb83d8343aac0b1baa75516da6092f58f41200907ef92448ecab8825135"},
-    {file = "MarkupSafe-2.1.1-cp39-cp39-musllinux_1_1_x86_64.whl", hash = "sha256:8e3dcf21f367459434c18e71b2a9532d96547aef8a871872a5bd69a715c15f96"},
-    {file = "MarkupSafe-2.1.1-cp39-cp39-win32.whl", hash = "sha256:d4306c36ca495956b6d568d276ac11fdd9c30a36f1b6eb928070dc5360b22e1c"},
-    {file = "MarkupSafe-2.1.1-cp39-cp39-win_amd64.whl", hash = "sha256:46d00d6cfecdde84d40e572d63735ef81423ad31184100411e6e3388d405e247"},
-    {file = "MarkupSafe-2.1.1.tar.gz", hash = "sha256:7f91197cc9e48f989d12e4e6fbc46495c446636dfc81b9ccf50bb0ec74b91d4b"},
-]
-more-itertools = [
-    {file = "more-itertools-9.0.0.tar.gz", hash = "sha256:5a6257e40878ef0520b1803990e3e22303a41b5714006c32a3fd8304b26ea1ab"},
-    {file = "more_itertools-9.0.0-py3-none-any.whl", hash = "sha256:250e83d7e81d0c87ca6bd942e6aeab8cc9daa6096d12c5308f3f92fa5e5c1f41"},
-]
-mypy-extensions = [
-    {file = "mypy_extensions-0.4.3-py2.py3-none-any.whl", hash = "sha256:090fedd75945a69ae91ce1303b5824f428daf5a028d2f6ab8a299250a846f15d"},
-    {file = "mypy_extensions-0.4.3.tar.gz", hash = "sha256:2d82818f5bb3e369420cb3c4060a7970edba416647068eb4c5343488a6c604a8"},
-]
-nodeenv = [
-    {file = "nodeenv-1.7.0-py2.py3-none-any.whl", hash = "sha256:27083a7b96a25f2f5e1d8cb4b6317ee8aeda3bdd121394e5ac54e498028a042e"},
-    {file = "nodeenv-1.7.0.tar.gz", hash = "sha256:e0e7f7dfb85fc5394c6fe1e8fa98131a2473e04311a45afb6508f7cf1836fa2b"},
-]
-packaging = [
-    {file = "packaging-22.0-py3-none-any.whl", hash = "sha256:957e2148ba0e1a3b282772e791ef1d8083648bc131c8ab0c1feba110ce1146c3"},
-    {file = "packaging-22.0.tar.gz", hash = "sha256:2198ec20bd4c017b8f9717e00f0c8714076fc2fd93816750ab48e2c41de2cfd3"},
-]
-parse = [
-    {file = "parse-1.19.0.tar.gz", hash = "sha256:9ff82852bcb65d139813e2a5197627a94966245c897796760a3a2a8eb66f020b"},
-]
-pathspec = [
-    {file = "pathspec-0.10.3-py3-none-any.whl", hash = "sha256:3c95343af8b756205e2aba76e843ba9520a24dd84f68c22b9f93251507509dd6"},
-    {file = "pathspec-0.10.3.tar.gz", hash = "sha256:56200de4077d9d0791465aa9095a01d421861e405b5096955051deefd697d6f6"},
-]
-platformdirs = [
-    {file = "platformdirs-2.6.2-py3-none-any.whl", hash = "sha256:83c8f6d04389165de7c9b6f0c682439697887bca0aa2f1c87ef1826be3584490"},
-    {file = "platformdirs-2.6.2.tar.gz", hash = "sha256:e1fea1fe471b9ff8332e229df3cb7de4f53eeea4998d3b6bfff542115e998bd2"},
-]
-pluggy = [
-    {file = "pluggy-1.0.0-py2.py3-none-any.whl", hash = "sha256:74134bbf457f031a36d68416e1509f34bd5ccc019f0bcc952c7b909d06b37bd3"},
-    {file = "pluggy-1.0.0.tar.gz", hash = "sha256:4224373bacce55f955a878bf9cfa763c1e360858e330072059e10bad68531159"},
-]
-pre-commit = [
-    {file = "pre_commit-2.21.0-py2.py3-none-any.whl", hash = "sha256:e2f91727039fc39a92f58a588a25b87f936de6567eed4f0e673e0507edc75bad"},
-    {file = "pre_commit-2.21.0.tar.gz", hash = "sha256:31ef31af7e474a8d8995027fefdfcf509b5c913ff31f2015b4ec4beb26a6f658"},
-]
-pyproject-api = [
-    {file = "pyproject_api-1.4.0-py3-none-any.whl", hash = "sha256:c34226297781efdd1ba4dfb74ce21076d9a8360e2125ea31803c1a02c76b2460"},
-    {file = "pyproject_api-1.4.0.tar.gz", hash = "sha256:ac85c1f82e0291dbae5a7739dbb9a990e11ee4034c9b5599ea714f07a24ecd71"},
-]
-pytest = [
-    {file = "pytest-7.2.0-py3-none-any.whl", hash = "sha256:892f933d339f068883b6fd5a459f03d85bfcb355e4981e146d2c7616c21fef71"},
-    {file = "pytest-7.2.0.tar.gz", hash = "sha256:c4014eb40e10f11f355ad4e3c2fb2c6c6d1919c73f3b5a433de4708202cade59"},
-]
-pytest-cov = [
-    {file = "pytest-cov-4.0.0.tar.gz", hash = "sha256:996b79efde6433cdbd0088872dbc5fb3ed7fe1578b68cdbba634f14bb8dd0470"},
-    {file = "pytest_cov-4.0.0-py3-none-any.whl", hash = "sha256:2feb1b751d66a8bd934e5edfa2e961d11309dc37b73b0eabe73b5945fee20f6b"},
-]
-pytest-xdist = [
-    {file = "pytest-xdist-3.1.0.tar.gz", hash = "sha256:40fdb8f3544921c5dfcd486ac080ce22870e71d82ced6d2e78fa97c2addd480c"},
-    {file = "pytest_xdist-3.1.0-py3-none-any.whl", hash = "sha256:70a76f191d8a1d2d6be69fc440cdf85f3e4c03c08b520fd5dc5d338d6cf07d89"},
-]
-python-dateutil = [
-    {file = "python-dateutil-2.8.2.tar.gz", hash = "sha256:0123cacc1627ae19ddf3c27a5de5bd67ee4586fbdd6440d9748f8abb483d3e86"},
-    {file = "python_dateutil-2.8.2-py2.py3-none-any.whl", hash = "sha256:961d03dc3453ebbc59dbdea9e4e11c5651520a876d0f4db161e8674aae935da9"},
-]
-python-dotenv = [
-    {file = "python-dotenv-0.21.0.tar.gz", hash = "sha256:b77d08274639e3d34145dfa6c7008e66df0f04b7be7a75fd0d5292c191d79045"},
-    {file = "python_dotenv-0.21.0-py3-none-any.whl", hash = "sha256:1684eb44636dd462b66c3ee016599815514527ad99965de77f43e0944634a7e5"},
-]
-python-slugify = [
-    {file = "python-slugify-7.0.0.tar.gz", hash = "sha256:7a0f21a39fa6c1c4bf2e5984c9b9ae944483fd10b54804cb0e23a3ccd4954f0b"},
-    {file = "python_slugify-7.0.0-py2.py3-none-any.whl", hash = "sha256:003aee64f9fd955d111549f96c4b58a3f40b9319383c70fad6277a4974bbf570"},
-]
-pyyaml = [
-    {file = "PyYAML-6.0-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:d4db7c7aef085872ef65a8fd7d6d09a14ae91f691dec3e87ee5ee0539d516f53"},
-    {file = "PyYAML-6.0-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:9df7ed3b3d2e0ecfe09e14741b857df43adb5a3ddadc919a2d94fbdf78fea53c"},
-    {file = "PyYAML-6.0-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:77f396e6ef4c73fdc33a9157446466f1cff553d979bd00ecb64385760c6babdc"},
-    {file = "PyYAML-6.0-cp310-cp310-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:a80a78046a72361de73f8f395f1f1e49f956c6be882eed58505a15f3e430962b"},
-    {file = "PyYAML-6.0-cp310-cp310-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:f84fbc98b019fef2ee9a1cb3ce93e3187a6df0b2538a651bfb890254ba9f90b5"},
-    {file = "PyYAML-6.0-cp310-cp310-win32.whl", hash = "sha256:2cd5df3de48857ed0544b34e2d40e9fac445930039f3cfe4bcc592a1f836d513"},
-    {file = "PyYAML-6.0-cp310-cp310-win_amd64.whl", hash = "sha256:daf496c58a8c52083df09b80c860005194014c3698698d1a57cbcfa182142a3a"},
-    {file = "PyYAML-6.0-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:d4b0ba9512519522b118090257be113b9468d804b19d63c71dbcf4a48fa32358"},
-    {file = "PyYAML-6.0-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:81957921f441d50af23654aa6c5e5eaf9b06aba7f0a19c18a538dc7ef291c5a1"},
-    {file = "PyYAML-6.0-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:afa17f5bc4d1b10afd4466fd3a44dc0e245382deca5b3c353d8b757f9e3ecb8d"},
-    {file = "PyYAML-6.0-cp311-cp311-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:dbad0e9d368bb989f4515da330b88a057617d16b6a8245084f1b05400f24609f"},
-    {file = "PyYAML-6.0-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:432557aa2c09802be39460360ddffd48156e30721f5e8d917f01d31694216782"},
-    {file = "PyYAML-6.0-cp311-cp311-win32.whl", hash = "sha256:bfaef573a63ba8923503d27530362590ff4f576c626d86a9fed95822a8255fd7"},
-    {file = "PyYAML-6.0-cp311-cp311-win_amd64.whl", hash = "sha256:01b45c0191e6d66c470b6cf1b9531a771a83c1c4208272ead47a3ae4f2f603bf"},
-    {file = "PyYAML-6.0-cp36-cp36m-macosx_10_9_x86_64.whl", hash = "sha256:897b80890765f037df3403d22bab41627ca8811ae55e9a722fd0392850ec4d86"},
-    {file = "PyYAML-6.0-cp36-cp36m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:50602afada6d6cbfad699b0c7bb50d5ccffa7e46a3d738092afddc1f9758427f"},
-    {file = "PyYAML-6.0-cp36-cp36m-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:48c346915c114f5fdb3ead70312bd042a953a8ce5c7106d5bfb1a5254e47da92"},
-    {file = "PyYAML-6.0-cp36-cp36m-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:98c4d36e99714e55cfbaaee6dd5badbc9a1ec339ebfc3b1f52e293aee6bb71a4"},
-    {file = "PyYAML-6.0-cp36-cp36m-win32.whl", hash = "sha256:0283c35a6a9fbf047493e3a0ce8d79ef5030852c51e9d911a27badfde0605293"},
-    {file = "PyYAML-6.0-cp36-cp36m-win_amd64.whl", hash = "sha256:07751360502caac1c067a8132d150cf3d61339af5691fe9e87803040dbc5db57"},
-    {file = "PyYAML-6.0-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:819b3830a1543db06c4d4b865e70ded25be52a2e0631ccd2f6a47a2822f2fd7c"},
-    {file = "PyYAML-6.0-cp37-cp37m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:473f9edb243cb1935ab5a084eb238d842fb8f404ed2193a915d1784b5a6b5fc0"},
-    {file = "PyYAML-6.0-cp37-cp37m-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:0ce82d761c532fe4ec3f87fc45688bdd3a4c1dc5e0b4a19814b9009a29baefd4"},
-    {file = "PyYAML-6.0-cp37-cp37m-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:231710d57adfd809ef5d34183b8ed1eeae3f76459c18fb4a0b373ad56bedcdd9"},
-    {file = "PyYAML-6.0-cp37-cp37m-win32.whl", hash = "sha256:c5687b8d43cf58545ade1fe3e055f70eac7a5a1a0bf42824308d868289a95737"},
-    {file = "PyYAML-6.0-cp37-cp37m-win_amd64.whl", hash = "sha256:d15a181d1ecd0d4270dc32edb46f7cb7733c7c508857278d3d378d14d606db2d"},
-    {file = "PyYAML-6.0-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:0b4624f379dab24d3725ffde76559cff63d9ec94e1736b556dacdfebe5ab6d4b"},
-    {file = "PyYAML-6.0-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:213c60cd50106436cc818accf5baa1aba61c0189ff610f64f4a3e8c6726218ba"},
-    {file = "PyYAML-6.0-cp38-cp38-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:9fa600030013c4de8165339db93d182b9431076eb98eb40ee068700c9c813e34"},
-    {file = "PyYAML-6.0-cp38-cp38-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:277a0ef2981ca40581a47093e9e2d13b3f1fbbeffae064c1d21bfceba2030287"},
-    {file = "PyYAML-6.0-cp38-cp38-win32.whl", hash = "sha256:d4eccecf9adf6fbcc6861a38015c2a64f38b9d94838ac1810a9023a0609e1b78"},
-    {file = "PyYAML-6.0-cp38-cp38-win_amd64.whl", hash = "sha256:1e4747bc279b4f613a09eb64bba2ba602d8a6664c6ce6396a4d0cd413a50ce07"},
-    {file = "PyYAML-6.0-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:055d937d65826939cb044fc8c9b08889e8c743fdc6a32b33e2390f66013e449b"},
-    {file = "PyYAML-6.0-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:e61ceaab6f49fb8bdfaa0f92c4b57bcfbea54c09277b1b4f7ac376bfb7a7c174"},
-    {file = "PyYAML-6.0-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:d67d839ede4ed1b28a4e8909735fc992a923cdb84e618544973d7dfc71540803"},
-    {file = "PyYAML-6.0-cp39-cp39-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:cba8c411ef271aa037d7357a2bc8f9ee8b58b9965831d9e51baf703280dc73d3"},
-    {file = "PyYAML-6.0-cp39-cp39-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:40527857252b61eacd1d9af500c3337ba8deb8fc298940291486c465c8b46ec0"},
-    {file = "PyYAML-6.0-cp39-cp39-win32.whl", hash = "sha256:b5b9eccad747aabaaffbc6064800670f0c297e52c12754eb1d976c57e4f74dcb"},
-    {file = "PyYAML-6.0-cp39-cp39-win_amd64.whl", hash = "sha256:b3d267842bf12586ba6c734f89d1f5b871df0273157918b0ccefa29deb05c21c"},
-    {file = "PyYAML-6.0.tar.gz", hash = "sha256:68fb519c14306fec9720a2a5b45bc9f0c8d1b9c72adf45c37baedfcd949c35a2"},
-]
-requests = [
-    {file = "requests-2.28.1-py3-none-any.whl", hash = "sha256:8fefa2a1a1365bf5520aac41836fbee479da67864514bdb821f31ce07ce65349"},
-    {file = "requests-2.28.1.tar.gz", hash = "sha256:7c5599b102feddaa661c826c56ab4fee28bfd17f5abca1ebbe3e7f19d7c97983"},
-]
-setuptools = [
-    {file = "setuptools-65.6.3-py3-none-any.whl", hash = "sha256:57f6f22bde4e042978bcd50176fdb381d7c21a9efa4041202288d3737a0c6a54"},
-    {file = "setuptools-65.6.3.tar.gz", hash = "sha256:a7620757bf984b58deaf32fc8a4577a9bbc0850cf92c20e1ce41c38c19e5fb75"},
-]
-six = [
-    {file = "six-1.16.0-py2.py3-none-any.whl", hash = "sha256:8abb2f1d86890a2dfb989f9a77cfcfd3e47c2a354b01111771326f8aa26e0254"},
-    {file = "six-1.16.0.tar.gz", hash = "sha256:1e61c37477a1626458e36f7b1d82aa5c9b094fa4802892072e49de9c60c4c926"},
-]
-soupsieve = [
-    {file = "soupsieve-2.3.2.post1-py3-none-any.whl", hash = "sha256:3b2503d3c7084a42b1ebd08116e5f81aadfaea95863628c80a3b774a11b7c759"},
-    {file = "soupsieve-2.3.2.post1.tar.gz", hash = "sha256:fc53893b3da2c33de295667a0e19f078c14bf86544af307354de5fcf12a3f30d"},
-]
-text-unidecode = [
-    {file = "text-unidecode-1.3.tar.gz", hash = "sha256:bad6603bb14d279193107714b288be206cac565dfa49aa5b105294dd5c4aab93"},
-    {file = "text_unidecode-1.3-py2.py3-none-any.whl", hash = "sha256:1311f10e8b895935241623731c2ba64f4c455287888b18189350b67134a822e8"},
-]
-tox = [
-    {file = "tox-4.2.6-py3-none-any.whl", hash = "sha256:fb79b3e4b788491949576a9c80c2d56419eac994567c3591e24bb2788b5901d0"},
-    {file = "tox-4.2.6.tar.gz", hash = "sha256:ecf224a4f3a318adcdd71aa8fe15ffd31f14afd6a9845a43ffd63950a7325538"},
-]
-tqdm = [
-    {file = "tqdm-4.64.1-py2.py3-none-any.whl", hash = "sha256:6fee160d6ffcd1b1c68c65f14c829c22832bc401726335ce92c52d395944a6a1"},
-    {file = "tqdm-4.64.1.tar.gz", hash = "sha256:5f4f682a004951c1b450bc753c710e9280c5746ce6ffedee253ddbcbf54cf1e4"},
-]
-urllib3 = [
-    {file = "urllib3-1.26.13-py2.py3-none-any.whl", hash = "sha256:47cc05d99aaa09c9e72ed5809b60e7ba354e64b59c9c173ac3018642d8bb41fc"},
-    {file = "urllib3-1.26.13.tar.gz", hash = "sha256:c083dd0dce68dbfbe1129d5271cb90f9447dea7d52097c6e0126120c521ddea8"},
-]
-virtualenv = [
-    {file = "virtualenv-20.17.1-py3-none-any.whl", hash = "sha256:ce3b1684d6e1a20a3e5ed36795a97dfc6af29bc3970ca8dab93e11ac6094b3c4"},
-    {file = "virtualenv-20.17.1.tar.gz", hash = "sha256:f8b927684efc6f1cc206c9db297a570ab9ad0e51c16fa9e45487d36d1905c058"},
-]
+content-hash = "0f32f154ad2b8583e3ba92f9a1c7c91e764fc4be611d387a0788097770dea35f"
diff --git a/pyproject.toml b/pyproject.toml
index 82e173a5..332e742d 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -9,7 +9,7 @@ license = "MIT"
 python = "^3.11"
 anytree = "^2.8.0"
 click = "^8.1.3"
-requests = "^2.28.1"
+requests = "^2.28.2"
 beautifulsoup4 = "^4.11.1"
 tqdm = "^4.64.1"
 parse = "^1.19.0"

From 039013fe2cbb858d8d8679776c629a9aefa64ec7 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sun, 15 Jan 2023 18:41:37 +0000
Subject: [PATCH 269/371] Bump tox from 4.2.6 to 4.2.8

Bumps [tox](https://github.com/tox-dev/tox) from 4.2.6 to 4.2.8.
- [Release notes](https://github.com/tox-dev/tox/releases)
- [Changelog](https://github.com/tox-dev/tox/blob/main/docs/changelog.rst)
- [Commits](https://github.com/tox-dev/tox/compare/4.2.6...4.2.8)

---
updated-dependencies:
- dependency-name: tox
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 poetry.lock    | 30 +++++++++++++++---------------
 pyproject.toml |  2 +-
 2 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/poetry.lock b/poetry.lock
index a1aaccdc..934888d0 100644
--- a/poetry.lock
+++ b/poetry.lock
@@ -123,14 +123,14 @@ uvloop = ["uvloop (>=0.15.2)"]
 
 [[package]]
 name = "cachetools"
-version = "5.2.0"
+version = "5.2.1"
 description = "Extensible memoizing collections and decorators"
 category = "dev"
 optional = false
 python-versions = "~=3.7"
 files = [
-    {file = "cachetools-5.2.0-py3-none-any.whl", hash = "sha256:f9f17d2aec496a9aa6b76f53e3b614c965223c061982d434d160f930c698a9db"},
-    {file = "cachetools-5.2.0.tar.gz", hash = "sha256:6a94c6402995a99c3970cc7e4884bb60b4a8639938157eeed436098bf9831757"},
+    {file = "cachetools-5.2.1-py3-none-any.whl", hash = "sha256:8462eebf3a6c15d25430a8c27c56ac61340b2ecf60c9ce57afc2b97e450e47da"},
+    {file = "cachetools-5.2.1.tar.gz", hash = "sha256:5991bc0e08a1319bb618d3195ca5b6bc76646a49c21d55962977197b301cc1fe"},
 ]
 
 [[package]]
@@ -521,14 +521,14 @@ setuptools = "*"
 
 [[package]]
 name = "packaging"
-version = "22.0"
+version = "23.0"
 description = "Core utilities for Python packages"
 category = "dev"
 optional = false
 python-versions = ">=3.7"
 files = [
-    {file = "packaging-22.0-py3-none-any.whl", hash = "sha256:957e2148ba0e1a3b282772e791ef1d8083648bc131c8ab0c1feba110ce1146c3"},
-    {file = "packaging-22.0.tar.gz", hash = "sha256:2198ec20bd4c017b8f9717e00f0c8714076fc2fd93816750ab48e2c41de2cfd3"},
+    {file = "packaging-23.0-py3-none-any.whl", hash = "sha256:714ac14496c3e68c99c29b00845f7a2b85f3bb6f1078fd9f72fd20f0570002b2"},
+    {file = "packaging-23.0.tar.gz", hash = "sha256:b6ad297f8907de0fa2fe1ccbd26fdaf387f5f47c7275fedf8cce89f99446cf97"},
 ]
 
 [[package]]
@@ -861,30 +861,30 @@ files = [
 
 [[package]]
 name = "tox"
-version = "4.2.6"
+version = "4.2.8"
 description = "tox is a generic virtualenv management and test command line tool"
 category = "dev"
 optional = false
 python-versions = ">=3.7"
 files = [
-    {file = "tox-4.2.6-py3-none-any.whl", hash = "sha256:fb79b3e4b788491949576a9c80c2d56419eac994567c3591e24bb2788b5901d0"},
-    {file = "tox-4.2.6.tar.gz", hash = "sha256:ecf224a4f3a318adcdd71aa8fe15ffd31f14afd6a9845a43ffd63950a7325538"},
+    {file = "tox-4.2.8-py3-none-any.whl", hash = "sha256:e9d5006a533d280e2ca26e3ca61052ffa55a65b683486f92d12563a14a9b7a4f"},
+    {file = "tox-4.2.8.tar.gz", hash = "sha256:7c31940d755355210151e8bef23feab3d714a8a4795e513c454ff0baccd995b1"},
 ]
 
 [package.dependencies]
-cachetools = ">=5.2"
+cachetools = ">=5.2.1"
 chardet = ">=5.1"
 colorama = ">=0.4.6"
 filelock = ">=3.9"
-packaging = ">=22"
+packaging = ">=23"
 platformdirs = ">=2.6.2"
 pluggy = ">=1"
-pyproject-api = ">=1.2.1"
+pyproject-api = ">=1.4"
 virtualenv = ">=20.17.1"
 
 [package.extras]
-docs = ["furo (>=2022.12.7)", "sphinx (>=6)", "sphinx-argparse-cli (>=1.10)", "sphinx-autodoc-typehints (>=1.19.5)", "sphinx-copybutton (>=0.5.1)", "sphinx-inline-tabs (>=2022.1.2b11)", "sphinxcontrib-towncrier (>=0.2.1a0)", "towncrier (>=22.12)"]
-testing = ["build[virtualenv] (>=0.9)", "covdefaults (>=2.2.2)", "devpi-process (>=0.3)", "diff-cover (>=7.3)", "distlib (>=0.3.6)", "flaky (>=3.7)", "hatch-vcs (>=0.3)", "hatchling (>=1.12)", "psutil (>=5.9.4)", "pytest (>=7.2)", "pytest-cov (>=4)", "pytest-mock (>=3.10)", "pytest-xdist (>=3.1)", "re-assert (>=1.1)", "time-machine (>=2.8.2)"]
+docs = ["furo (>=2022.12.7)", "sphinx (>=6.1.3)", "sphinx-argparse-cli (>=1.11)", "sphinx-autodoc-typehints (>=1.20.1)", "sphinx-copybutton (>=0.5.1)", "sphinx-inline-tabs (>=2022.1.2b11)", "sphinxcontrib-towncrier (>=0.2.1a0)", "towncrier (>=22.12)"]
+testing = ["build[virtualenv] (>=0.9)", "covdefaults (>=2.2.2)", "devpi-process (>=0.3)", "diff-cover (>=7.3)", "distlib (>=0.3.6)", "flaky (>=3.7)", "hatch-vcs (>=0.3)", "hatchling (>=1.12.2)", "psutil (>=5.9.4)", "pytest (>=7.2)", "pytest-cov (>=4)", "pytest-mock (>=3.10)", "pytest-xdist (>=3.1)", "re-assert (>=1.1)", "time-machine (>=2.8.2)", "wheel (>=0.38.4)"]
 
 [[package]]
 name = "tqdm"
@@ -948,4 +948,4 @@ testing = ["coverage (>=6.2)", "coverage-enable-subprocess (>=1)", "flaky (>=3.7
 [metadata]
 lock-version = "2.0"
 python-versions = "^3.11"
-content-hash = "0f32f154ad2b8583e3ba92f9a1c7c91e764fc4be611d387a0788097770dea35f"
+content-hash = "d9e8e55304bfe60d8d0c3b1b405ae8572dcb9be85b8a0df953563508c80ca5df"
diff --git a/pyproject.toml b/pyproject.toml
index 332e742d..b84bc5f9 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -22,7 +22,7 @@ pytest = "^7.2.0"
 pytest-cov = "^4.0.0"
 pytest-xdist = "^3.1.0"
 python-dotenv = "^0.21.0"
-tox = "^4.2.6"
+tox = "^4.2.8"
 pre-commit = "^2.21.0"
 isort = "^5.11.4"
 

From 754c9fbdc1e33e0739cee5fe34414872a187285c Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sun, 15 Jan 2023 18:42:07 +0000
Subject: [PATCH 270/371] Bump requests from 2.28.1 to 2.28.2

Bumps [requests](https://github.com/psf/requests) from 2.28.1 to 2.28.2.
- [Release notes](https://github.com/psf/requests/releases)
- [Changelog](https://github.com/psf/requests/blob/main/HISTORY.md)
- [Commits](https://github.com/psf/requests/compare/v2.28.1...v2.28.2)

---
updated-dependencies:
- dependency-name: requests
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 poetry.lock    | 10 +++++-----
 pyproject.toml |  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/poetry.lock b/poetry.lock
index 2f891059..44ed8309 100644
--- a/poetry.lock
+++ b/poetry.lock
@@ -783,19 +783,19 @@ files = [
 
 [[package]]
 name = "requests"
-version = "2.28.1"
+version = "2.28.2"
 description = "Python HTTP for Humans."
 category = "main"
 optional = false
 python-versions = ">=3.7, <4"
 files = [
-    {file = "requests-2.28.1-py3-none-any.whl", hash = "sha256:8fefa2a1a1365bf5520aac41836fbee479da67864514bdb821f31ce07ce65349"},
-    {file = "requests-2.28.1.tar.gz", hash = "sha256:7c5599b102feddaa661c826c56ab4fee28bfd17f5abca1ebbe3e7f19d7c97983"},
+    {file = "requests-2.28.2-py3-none-any.whl", hash = "sha256:64299f4909223da747622c030b781c0d7811e359c37124b4bd368fb8c6518baa"},
+    {file = "requests-2.28.2.tar.gz", hash = "sha256:98b1b2782e3c6c4904938b84c0eb932721069dfdb9134313beff7c83c2df24bf"},
 ]
 
 [package.dependencies]
 certifi = ">=2017.4.17"
-charset-normalizer = ">=2,<3"
+charset-normalizer = ">=2,<4"
 idna = ">=2.5,<4"
 urllib3 = ">=1.21.1,<1.27"
 
@@ -958,4 +958,4 @@ testing = ["coverage (>=6.2)", "coverage-enable-subprocess (>=1)", "flaky (>=3.7
 [metadata]
 lock-version = "2.0"
 python-versions = "^3.10"
-content-hash = "ec39e5340fbdc19f01903a2932734ef7b47704925803b1cf0e1d804d8ff7a258"
+content-hash = "bea39f9c228f060e93b817740d7f17721211302a202f8a7498a54a99053bc237"
diff --git a/pyproject.toml b/pyproject.toml
index e67bd3a5..7c615298 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -9,7 +9,7 @@ license = "MIT"
 python = "^3.10"
 anytree = "^2.8.0"
 click = "^8.1.3"
-requests = "^2.28.1"
+requests = "^2.28.2"
 beautifulsoup4 = "^4.11.1"
 tqdm = "^4.64.0"
 

From baf07f01299e86f06e1f93b775f60c1430168205 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 16 Jan 2023 04:35:46 +0000
Subject: [PATCH 271/371] Bump pytest from 7.2.0 to 7.2.1

Bumps [pytest](https://github.com/pytest-dev/pytest) from 7.2.0 to 7.2.1.
- [Release notes](https://github.com/pytest-dev/pytest/releases)
- [Changelog](https://github.com/pytest-dev/pytest/blob/main/CHANGELOG.rst)
- [Commits](https://github.com/pytest-dev/pytest/compare/7.2.0...7.2.1)

---
updated-dependencies:
- dependency-name: pytest
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 poetry.lock    | 8 ++++----
 pyproject.toml | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/poetry.lock b/poetry.lock
index 934888d0..f6fd8b60 100644
--- a/poetry.lock
+++ b/poetry.lock
@@ -626,14 +626,14 @@ testing = ["covdefaults (>=2.2.2)", "importlib-metadata (>=5.1)", "pytest (>=7.2
 
 [[package]]
 name = "pytest"
-version = "7.2.0"
+version = "7.2.1"
 description = "pytest: simple powerful testing with Python"
 category = "dev"
 optional = false
 python-versions = ">=3.7"
 files = [
-    {file = "pytest-7.2.0-py3-none-any.whl", hash = "sha256:892f933d339f068883b6fd5a459f03d85bfcb355e4981e146d2c7616c21fef71"},
-    {file = "pytest-7.2.0.tar.gz", hash = "sha256:c4014eb40e10f11f355ad4e3c2fb2c6c6d1919c73f3b5a433de4708202cade59"},
+    {file = "pytest-7.2.1-py3-none-any.whl", hash = "sha256:c7c6ca206e93355074ae32f7403e8ea12163b1163c976fee7d4d84027c162be5"},
+    {file = "pytest-7.2.1.tar.gz", hash = "sha256:d45e0952f3727241918b8fd0f376f5ff6b301cc0777c6f9a556935c92d8a7d42"},
 ]
 
 [package.dependencies]
@@ -948,4 +948,4 @@ testing = ["coverage (>=6.2)", "coverage-enable-subprocess (>=1)", "flaky (>=3.7
 [metadata]
 lock-version = "2.0"
 python-versions = "^3.11"
-content-hash = "d9e8e55304bfe60d8d0c3b1b405ae8572dcb9be85b8a0df953563508c80ca5df"
+content-hash = "b720932917d5f8fe091bb1110ce242ab22316882a9c8669a08132c18938a9e56"
diff --git a/pyproject.toml b/pyproject.toml
index b84bc5f9..a6350247 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -18,7 +18,7 @@ more-itertools = "^9.0.0"
 [tool.poetry.dev-dependencies]
 black = "^22.12.0"
 cookiecutter = "^2.1.1"
-pytest = "^7.2.0"
+pytest = "^7.2.1"
 pytest-cov = "^4.0.0"
 pytest-xdist = "^3.1.0"
 python-dotenv = "^0.21.0"

From a4778640da294eaf0f4fe25f5ace55a9fb3f7600 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 16 Jan 2023 05:38:28 +0000
Subject: [PATCH 272/371] Bump tox from 4.2.8 to 4.3.1

Bumps [tox](https://github.com/tox-dev/tox) from 4.2.8 to 4.3.1.
- [Release notes](https://github.com/tox-dev/tox/releases)
- [Changelog](https://github.com/tox-dev/tox/blob/main/docs/changelog.rst)
- [Commits](https://github.com/tox-dev/tox/compare/4.2.8...4.3.1)

---
updated-dependencies:
- dependency-name: tox
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 poetry.lock    | 8 ++++----
 pyproject.toml | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/poetry.lock b/poetry.lock
index f6fd8b60..23d626ae 100644
--- a/poetry.lock
+++ b/poetry.lock
@@ -861,14 +861,14 @@ files = [
 
 [[package]]
 name = "tox"
-version = "4.2.8"
+version = "4.3.1"
 description = "tox is a generic virtualenv management and test command line tool"
 category = "dev"
 optional = false
 python-versions = ">=3.7"
 files = [
-    {file = "tox-4.2.8-py3-none-any.whl", hash = "sha256:e9d5006a533d280e2ca26e3ca61052ffa55a65b683486f92d12563a14a9b7a4f"},
-    {file = "tox-4.2.8.tar.gz", hash = "sha256:7c31940d755355210151e8bef23feab3d714a8a4795e513c454ff0baccd995b1"},
+    {file = "tox-4.3.1-py3-none-any.whl", hash = "sha256:3b4c8bb7f281989b5ea2c39e862711ef2dbd15fedbf0c5f64e7c04c7d8cd8957"},
+    {file = "tox-4.3.1.tar.gz", hash = "sha256:df2bf3c8329d1bc23a618329480ddefc0400af42804f801599b2ec38914f6309"},
 ]
 
 [package.dependencies]
@@ -948,4 +948,4 @@ testing = ["coverage (>=6.2)", "coverage-enable-subprocess (>=1)", "flaky (>=3.7
 [metadata]
 lock-version = "2.0"
 python-versions = "^3.11"
-content-hash = "b720932917d5f8fe091bb1110ce242ab22316882a9c8669a08132c18938a9e56"
+content-hash = "f4b2f1be7c1cd033c559ed065d7d1ccdcb970c358024f1852a4c278f72fb1fdb"
diff --git a/pyproject.toml b/pyproject.toml
index a6350247..9eeab35f 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -22,7 +22,7 @@ pytest = "^7.2.1"
 pytest-cov = "^4.0.0"
 pytest-xdist = "^3.1.0"
 python-dotenv = "^0.21.0"
-tox = "^4.2.8"
+tox = "^4.3.1"
 pre-commit = "^2.21.0"
 isort = "^5.11.4"
 

From a06869d2179e4b5620bb3a56ef8382f3d58eadcc Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 30 Jan 2023 04:30:35 +0000
Subject: [PATCH 273/371] Bump isort from 5.11.4 to 5.12.0

Bumps [isort](https://github.com/pycqa/isort) from 5.11.4 to 5.12.0.
- [Release notes](https://github.com/pycqa/isort/releases)
- [Changelog](https://github.com/PyCQA/isort/blob/main/CHANGELOG.md)
- [Commits](https://github.com/pycqa/isort/compare/5.11.4...5.12.0)

---
updated-dependencies:
- dependency-name: isort
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 poetry.lock    | 14 +++++++-------
 pyproject.toml |  2 +-
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/poetry.lock b/poetry.lock
index 23d626ae..d12db1e2 100644
--- a/poetry.lock
+++ b/poetry.lock
@@ -380,19 +380,19 @@ files = [
 
 [[package]]
 name = "isort"
-version = "5.11.4"
+version = "5.12.0"
 description = "A Python utility / library to sort Python imports."
 category = "dev"
 optional = false
-python-versions = ">=3.7.0"
+python-versions = ">=3.8.0"
 files = [
-    {file = "isort-5.11.4-py3-none-any.whl", hash = "sha256:c033fd0edb91000a7f09527fe5c75321878f98322a77ddcc81adbd83724afb7b"},
-    {file = "isort-5.11.4.tar.gz", hash = "sha256:6db30c5ded9815d813932c04c2f85a360bcdd35fed496f4d8f35495ef0a261b6"},
+    {file = "isort-5.12.0-py3-none-any.whl", hash = "sha256:f84c2818376e66cf843d497486ea8fed8700b340f308f076c6fb1229dff318b6"},
+    {file = "isort-5.12.0.tar.gz", hash = "sha256:8bef7dde241278824a6d83f44a544709b065191b95b6e50894bdc722fcba0504"},
 ]
 
 [package.extras]
-colors = ["colorama (>=0.4.3,<0.5.0)"]
-pipfile-deprecated-finder = ["pipreqs", "requirementslib"]
+colors = ["colorama (>=0.4.3)"]
+pipfile-deprecated-finder = ["pip-shims (>=0.5.2)", "pipreqs", "requirementslib"]
 plugins = ["setuptools"]
 requirements-deprecated-finder = ["pip-api", "pipreqs"]
 
@@ -948,4 +948,4 @@ testing = ["coverage (>=6.2)", "coverage-enable-subprocess (>=1)", "flaky (>=3.7
 [metadata]
 lock-version = "2.0"
 python-versions = "^3.11"
-content-hash = "f4b2f1be7c1cd033c559ed065d7d1ccdcb970c358024f1852a4c278f72fb1fdb"
+content-hash = "1e384a94ecebcf462d817aa26111e8b0cfe347d592400943c2eca06785cb3a06"
diff --git a/pyproject.toml b/pyproject.toml
index 9eeab35f..d419e226 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -24,7 +24,7 @@ pytest-xdist = "^3.1.0"
 python-dotenv = "^0.21.0"
 tox = "^4.3.1"
 pre-commit = "^2.21.0"
-isort = "^5.11.4"
+isort = "^5.12.0"
 
 [tool.poetry.scripts]
 adventofcode = "adventofcode2022.main:main"

From b0bca1fc23e771f6c59a72af8e210c37a95b6b19 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 2 Feb 2023 11:28:28 +0000
Subject: [PATCH 274/371] Bump tox from 4.3.1 to 4.4.4

Bumps [tox](https://github.com/tox-dev/tox) from 4.3.1 to 4.4.4.
- [Release notes](https://github.com/tox-dev/tox/releases)
- [Changelog](https://github.com/tox-dev/tox/blob/main/docs/changelog.rst)
- [Commits](https://github.com/tox-dev/tox/compare/4.3.1...4.4.4)

---
updated-dependencies:
- dependency-name: tox
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 poetry.lock    | 16 ++++++++--------
 pyproject.toml |  2 +-
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/poetry.lock b/poetry.lock
index d12db1e2..2a0c2aad 100644
--- a/poetry.lock
+++ b/poetry.lock
@@ -607,14 +607,14 @@ virtualenv = ">=20.10.0"
 
 [[package]]
 name = "pyproject-api"
-version = "1.4.0"
+version = "1.5.0"
 description = "API to interact with the python pyproject.toml based projects"
 category = "dev"
 optional = false
 python-versions = ">=3.7"
 files = [
-    {file = "pyproject_api-1.4.0-py3-none-any.whl", hash = "sha256:c34226297781efdd1ba4dfb74ce21076d9a8360e2125ea31803c1a02c76b2460"},
-    {file = "pyproject_api-1.4.0.tar.gz", hash = "sha256:ac85c1f82e0291dbae5a7739dbb9a990e11ee4034c9b5599ea714f07a24ecd71"},
+    {file = "pyproject_api-1.5.0-py3-none-any.whl", hash = "sha256:4c111277dfb96bcd562c6245428f27250b794bfe3e210b8714c4f893952f2c17"},
+    {file = "pyproject_api-1.5.0.tar.gz", hash = "sha256:0962df21f3e633b8ddb9567c011e6c1b3dcdfc31b7860c0ede7e24c5a1200fbe"},
 ]
 
 [package.dependencies]
@@ -861,14 +861,14 @@ files = [
 
 [[package]]
 name = "tox"
-version = "4.3.1"
+version = "4.4.4"
 description = "tox is a generic virtualenv management and test command line tool"
 category = "dev"
 optional = false
 python-versions = ">=3.7"
 files = [
-    {file = "tox-4.3.1-py3-none-any.whl", hash = "sha256:3b4c8bb7f281989b5ea2c39e862711ef2dbd15fedbf0c5f64e7c04c7d8cd8957"},
-    {file = "tox-4.3.1.tar.gz", hash = "sha256:df2bf3c8329d1bc23a618329480ddefc0400af42804f801599b2ec38914f6309"},
+    {file = "tox-4.4.4-py3-none-any.whl", hash = "sha256:1195820ca35b141ce5ab040c9dfad8f03de6897c9bd867c6151dfb7dc58e64cd"},
+    {file = "tox-4.4.4.tar.gz", hash = "sha256:e1ef01d9e9503b1218511f74517dc3f0008c8b5e0cc53ab7f51ff3c2ca63b349"},
 ]
 
 [package.dependencies]
@@ -879,7 +879,7 @@ filelock = ">=3.9"
 packaging = ">=23"
 platformdirs = ">=2.6.2"
 pluggy = ">=1"
-pyproject-api = ">=1.4"
+pyproject-api = ">=1.5"
 virtualenv = ">=20.17.1"
 
 [package.extras]
@@ -948,4 +948,4 @@ testing = ["coverage (>=6.2)", "coverage-enable-subprocess (>=1)", "flaky (>=3.7
 [metadata]
 lock-version = "2.0"
 python-versions = "^3.11"
-content-hash = "1e384a94ecebcf462d817aa26111e8b0cfe347d592400943c2eca06785cb3a06"
+content-hash = "f66391093c2c75e70c0fe31110c4fcf6a2b0a7c7e1d4b6a405f12b51af9606c3"
diff --git a/pyproject.toml b/pyproject.toml
index d419e226..a3e5fb10 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -22,7 +22,7 @@ pytest = "^7.2.1"
 pytest-cov = "^4.0.0"
 pytest-xdist = "^3.1.0"
 python-dotenv = "^0.21.0"
-tox = "^4.3.1"
+tox = "^4.4.4"
 pre-commit = "^2.21.0"
 isort = "^5.12.0"
 

From 7991c7bf491633713b5338727396e851ec190394 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 2 Feb 2023 11:32:12 +0000
Subject: [PATCH 275/371] Bump python-dotenv from 0.21.0 to 0.21.1

Bumps [python-dotenv](https://github.com/theskumar/python-dotenv) from 0.21.0 to 0.21.1.
- [Release notes](https://github.com/theskumar/python-dotenv/releases)
- [Changelog](https://github.com/theskumar/python-dotenv/blob/main/CHANGELOG.md)
- [Commits](https://github.com/theskumar/python-dotenv/compare/v0.21.0...v0.21.1)

---
updated-dependencies:
- dependency-name: python-dotenv
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 poetry.lock    | 8 ++++----
 pyproject.toml | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/poetry.lock b/poetry.lock
index 2a0c2aad..74fd589d 100644
--- a/poetry.lock
+++ b/poetry.lock
@@ -703,14 +703,14 @@ six = ">=1.5"
 
 [[package]]
 name = "python-dotenv"
-version = "0.21.0"
+version = "0.21.1"
 description = "Read key-value pairs from a .env file and set them as environment variables"
 category = "dev"
 optional = false
 python-versions = ">=3.7"
 files = [
-    {file = "python-dotenv-0.21.0.tar.gz", hash = "sha256:b77d08274639e3d34145dfa6c7008e66df0f04b7be7a75fd0d5292c191d79045"},
-    {file = "python_dotenv-0.21.0-py3-none-any.whl", hash = "sha256:1684eb44636dd462b66c3ee016599815514527ad99965de77f43e0944634a7e5"},
+    {file = "python-dotenv-0.21.1.tar.gz", hash = "sha256:1c93de8f636cde3ce377292818d0e440b6e45a82f215c3744979151fa8151c49"},
+    {file = "python_dotenv-0.21.1-py3-none-any.whl", hash = "sha256:41e12e0318bebc859fcc4d97d4db8d20ad21721a6aa5047dd59f090391cb549a"},
 ]
 
 [package.extras]
@@ -948,4 +948,4 @@ testing = ["coverage (>=6.2)", "coverage-enable-subprocess (>=1)", "flaky (>=3.7
 [metadata]
 lock-version = "2.0"
 python-versions = "^3.11"
-content-hash = "f66391093c2c75e70c0fe31110c4fcf6a2b0a7c7e1d4b6a405f12b51af9606c3"
+content-hash = "fd750338b3cb45939a6352b896bfadae89329b69b529c89f7eb37bbd9b7c4079"
diff --git a/pyproject.toml b/pyproject.toml
index a3e5fb10..19c25157 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -21,7 +21,7 @@ cookiecutter = "^2.1.1"
 pytest = "^7.2.1"
 pytest-cov = "^4.0.0"
 pytest-xdist = "^3.1.0"
-python-dotenv = "^0.21.0"
+python-dotenv = "^0.21.1"
 tox = "^4.4.4"
 pre-commit = "^2.21.0"
 isort = "^5.12.0"

From cc037663eac45c69846647b005bc938b7c9176ce Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 2 Feb 2023 11:40:25 +0000
Subject: [PATCH 276/371] Bump pre-commit from 2.21.0 to 3.0.3

Bumps [pre-commit](https://github.com/pre-commit/pre-commit) from 2.21.0 to 3.0.3.
- [Release notes](https://github.com/pre-commit/pre-commit/releases)
- [Changelog](https://github.com/pre-commit/pre-commit/blob/main/CHANGELOG.md)
- [Commits](https://github.com/pre-commit/pre-commit/compare/v2.21.0...v3.0.3)

---
updated-dependencies:
- dependency-name: pre-commit
  dependency-type: direct:development
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 poetry.lock    | 10 +++++-----
 pyproject.toml |  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/poetry.lock b/poetry.lock
index 74fd589d..7c021b9b 100644
--- a/poetry.lock
+++ b/poetry.lock
@@ -588,14 +588,14 @@ testing = ["pytest", "pytest-benchmark"]
 
 [[package]]
 name = "pre-commit"
-version = "2.21.0"
+version = "3.0.3"
 description = "A framework for managing and maintaining multi-language pre-commit hooks."
 category = "dev"
 optional = false
-python-versions = ">=3.7"
+python-versions = ">=3.8"
 files = [
-    {file = "pre_commit-2.21.0-py2.py3-none-any.whl", hash = "sha256:e2f91727039fc39a92f58a588a25b87f936de6567eed4f0e673e0507edc75bad"},
-    {file = "pre_commit-2.21.0.tar.gz", hash = "sha256:31ef31af7e474a8d8995027fefdfcf509b5c913ff31f2015b4ec4beb26a6f658"},
+    {file = "pre_commit-3.0.3-py2.py3-none-any.whl", hash = "sha256:83e2e8cc5cbb3691cff9474494816918d865120768aa36c9eda6185126667d21"},
+    {file = "pre_commit-3.0.3.tar.gz", hash = "sha256:4187e74fda38f0f700256fb2f757774385503b04292047d0899fc913207f314b"},
 ]
 
 [package.dependencies]
@@ -948,4 +948,4 @@ testing = ["coverage (>=6.2)", "coverage-enable-subprocess (>=1)", "flaky (>=3.7
 [metadata]
 lock-version = "2.0"
 python-versions = "^3.11"
-content-hash = "fd750338b3cb45939a6352b896bfadae89329b69b529c89f7eb37bbd9b7c4079"
+content-hash = "5d3f34375e7c44d11d5cc37e94d1fca844df06976ae43d5db405d2eca792f3b2"
diff --git a/pyproject.toml b/pyproject.toml
index 19c25157..b9fafedb 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -23,7 +23,7 @@ pytest-cov = "^4.0.0"
 pytest-xdist = "^3.1.0"
 python-dotenv = "^0.21.1"
 tox = "^4.4.4"
-pre-commit = "^2.21.0"
+pre-commit = "^3.0.3"
 isort = "^5.12.0"
 
 [tool.poetry.scripts]

From 513114317cb680a86a951fc30a23604df2da3be4 Mon Sep 17 00:00:00 2001
From: Roel Adriaans <roel@adriaans.org>
Date: Wed, 8 Feb 2023 19:08:50 +0100
Subject: [PATCH 277/371] Update every dependency (#138)

---
 .pre-commit-config.yaml                 |  10 +-
 poetry.lock                             | 509 ++++++++++++++----------
 pyproject.toml                          |  18 +-
 src/adventofcode2021/solutions/day02.py |   1 -
 4 files changed, 323 insertions(+), 215 deletions(-)

diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index 4056fc31..c4297182 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -2,24 +2,24 @@
 
 repos:
   - repo: https://github.com/ambv/black
-    rev: 22.10.0
+    rev: 23.1.0
     hooks:
     - id: black
       language_version: 'python3.10'
 
   - repo: https://github.com/pycqa/flake8
-    rev: 5.0.4
+    rev: 6.0.0
     hooks:
     - id: flake8
       args: ["--ignore", "E203,W503"]
 
   - repo: https://github.com/PyCQA/isort
-    rev: 5.10.1
+    rev: 5.12.0
     hooks:
     - id: isort
 
   - repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: v4.3.0
+    rev: v4.4.0
     hooks:
     - id: check-yaml
     - id: end-of-file-fixer
@@ -31,7 +31,7 @@ repos:
       language_version: python3
 
   - repo: https://github.com/asottile/pyupgrade
-    rev: v3.1.0
+    rev: v3.3.1
     hooks:
     - id: pyupgrade
       args: [ "--py310-plus" ]
diff --git a/poetry.lock b/poetry.lock
index 44ed8309..5a5ab399 100644
--- a/poetry.lock
+++ b/poetry.lock
@@ -36,32 +36,33 @@ python-dateutil = ">=2.7.0"
 
 [[package]]
 name = "attrs"
-version = "22.1.0"
+version = "22.2.0"
 description = "Classes Without Boilerplate"
 category = "dev"
 optional = false
-python-versions = ">=3.5"
+python-versions = ">=3.6"
 files = [
-    {file = "attrs-22.1.0-py2.py3-none-any.whl", hash = "sha256:86efa402f67bf2df34f51a335487cf46b1ec130d02b8d39fd248abfd30da551c"},
-    {file = "attrs-22.1.0.tar.gz", hash = "sha256:29adc2665447e5191d0e7c568fde78b21f9672d344281d0c6e1ab085429b22b6"},
+    {file = "attrs-22.2.0-py3-none-any.whl", hash = "sha256:29e95c7f6778868dbd49170f98f8818f78f3dc5e0e37c0b1f474e3561b240836"},
+    {file = "attrs-22.2.0.tar.gz", hash = "sha256:c9227bfc2f01993c03f68db37d1d15c9690188323c067c641f1a35ca58185f99"},
 ]
 
 [package.extras]
-dev = ["cloudpickle", "coverage[toml] (>=5.0.2)", "furo", "hypothesis", "mypy (>=0.900,!=0.940)", "pre-commit", "pympler", "pytest (>=4.3.0)", "pytest-mypy-plugins", "sphinx", "sphinx-notfound-page", "zope.interface"]
-docs = ["furo", "sphinx", "sphinx-notfound-page", "zope.interface"]
-tests = ["cloudpickle", "coverage[toml] (>=5.0.2)", "hypothesis", "mypy (>=0.900,!=0.940)", "pympler", "pytest (>=4.3.0)", "pytest-mypy-plugins", "zope.interface"]
-tests-no-zope = ["cloudpickle", "coverage[toml] (>=5.0.2)", "hypothesis", "mypy (>=0.900,!=0.940)", "pympler", "pytest (>=4.3.0)", "pytest-mypy-plugins"]
+cov = ["attrs[tests]", "coverage-enable-subprocess", "coverage[toml] (>=5.3)"]
+dev = ["attrs[docs,tests]"]
+docs = ["furo", "myst-parser", "sphinx", "sphinx-notfound-page", "sphinxcontrib-towncrier", "towncrier", "zope.interface"]
+tests = ["attrs[tests-no-zope]", "zope.interface"]
+tests-no-zope = ["cloudpickle", "cloudpickle", "hypothesis", "hypothesis", "mypy (>=0.971,<0.990)", "mypy (>=0.971,<0.990)", "pympler", "pympler", "pytest (>=4.3.0)", "pytest (>=4.3.0)", "pytest-mypy-plugins", "pytest-mypy-plugins", "pytest-xdist[psutil]", "pytest-xdist[psutil]"]
 
 [[package]]
 name = "beautifulsoup4"
-version = "4.11.1"
+version = "4.11.2"
 description = "Screen-scraping library"
 category = "main"
 optional = false
 python-versions = ">=3.6.0"
 files = [
-    {file = "beautifulsoup4-4.11.1-py3-none-any.whl", hash = "sha256:58d5c3d29f5a36ffeb94f02f0d786cd53014cf9b3b3951d42e0080d8a9498d30"},
-    {file = "beautifulsoup4-4.11.1.tar.gz", hash = "sha256:ad9aa55b65ef2808eb405f46cf74df7fcb7044d5cbc26487f96eb2ef2e436693"},
+    {file = "beautifulsoup4-4.11.2-py3-none-any.whl", hash = "sha256:0e79446b10b3ecb499c1556f7e228a53e64a2bfcebd455f370d8927cb5b59e39"},
+    {file = "beautifulsoup4-4.11.2.tar.gz", hash = "sha256:bc4bdda6717de5a2987436fb8d72f45dc90dd856bdfd512a1314ce90349a0106"},
 ]
 
 [package.dependencies]
@@ -88,32 +89,46 @@ chardet = ">=3.0.2"
 
 [[package]]
 name = "black"
-version = "22.12.0"
+version = "23.1.0"
 description = "The uncompromising code formatter."
 category = "dev"
 optional = false
 python-versions = ">=3.7"
 files = [
-    {file = "black-22.12.0-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:9eedd20838bd5d75b80c9f5487dbcb06836a43833a37846cf1d8c1cc01cef59d"},
-    {file = "black-22.12.0-cp310-cp310-win_amd64.whl", hash = "sha256:159a46a4947f73387b4d83e87ea006dbb2337eab6c879620a3ba52699b1f4351"},
-    {file = "black-22.12.0-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:d30b212bffeb1e252b31dd269dfae69dd17e06d92b87ad26e23890f3efea366f"},
-    {file = "black-22.12.0-cp311-cp311-win_amd64.whl", hash = "sha256:7412e75863aa5c5411886804678b7d083c7c28421210180d67dfd8cf1221e1f4"},
-    {file = "black-22.12.0-cp37-cp37m-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:c116eed0efb9ff870ded8b62fe9f28dd61ef6e9ddd28d83d7d264a38417dcee2"},
-    {file = "black-22.12.0-cp37-cp37m-win_amd64.whl", hash = "sha256:1f58cbe16dfe8c12b7434e50ff889fa479072096d79f0a7f25e4ab8e94cd8350"},
-    {file = "black-22.12.0-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:77d86c9f3db9b1bf6761244bc0b3572a546f5fe37917a044e02f3166d5aafa7d"},
-    {file = "black-22.12.0-cp38-cp38-win_amd64.whl", hash = "sha256:82d9fe8fee3401e02e79767016b4907820a7dc28d70d137eb397b92ef3cc5bfc"},
-    {file = "black-22.12.0-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:101c69b23df9b44247bd88e1d7e90154336ac4992502d4197bdac35dd7ee3320"},
-    {file = "black-22.12.0-cp39-cp39-win_amd64.whl", hash = "sha256:559c7a1ba9a006226f09e4916060982fd27334ae1998e7a38b3f33a37f7a2148"},
-    {file = "black-22.12.0-py3-none-any.whl", hash = "sha256:436cc9167dd28040ad90d3b404aec22cedf24a6e4d7de221bec2730ec0c97bcf"},
-    {file = "black-22.12.0.tar.gz", hash = "sha256:229351e5a18ca30f447bf724d007f890f97e13af070bb6ad4c0a441cd7596a2f"},
+    {file = "black-23.1.0-cp310-cp310-macosx_10_16_arm64.whl", hash = "sha256:b6a92a41ee34b883b359998f0c8e6eb8e99803aa8bf3123bf2b2e6fec505a221"},
+    {file = "black-23.1.0-cp310-cp310-macosx_10_16_universal2.whl", hash = "sha256:57c18c5165c1dbe291d5306e53fb3988122890e57bd9b3dcb75f967f13411a26"},
+    {file = "black-23.1.0-cp310-cp310-macosx_10_16_x86_64.whl", hash = "sha256:9880d7d419bb7e709b37e28deb5e68a49227713b623c72b2b931028ea65f619b"},
+    {file = "black-23.1.0-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:e6663f91b6feca5d06f2ccd49a10f254f9298cc1f7f49c46e498a0771b507104"},
+    {file = "black-23.1.0-cp310-cp310-win_amd64.whl", hash = "sha256:9afd3f493666a0cd8f8df9a0200c6359ac53940cbde049dcb1a7eb6ee2dd7074"},
+    {file = "black-23.1.0-cp311-cp311-macosx_10_16_arm64.whl", hash = "sha256:bfffba28dc52a58f04492181392ee380e95262af14ee01d4bc7bb1b1c6ca8d27"},
+    {file = "black-23.1.0-cp311-cp311-macosx_10_16_universal2.whl", hash = "sha256:c1c476bc7b7d021321e7d93dc2cbd78ce103b84d5a4cf97ed535fbc0d6660648"},
+    {file = "black-23.1.0-cp311-cp311-macosx_10_16_x86_64.whl", hash = "sha256:382998821f58e5c8238d3166c492139573325287820963d2f7de4d518bd76958"},
+    {file = "black-23.1.0-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:2bf649fda611c8550ca9d7592b69f0637218c2369b7744694c5e4902873b2f3a"},
+    {file = "black-23.1.0-cp311-cp311-win_amd64.whl", hash = "sha256:121ca7f10b4a01fd99951234abdbd97728e1240be89fde18480ffac16503d481"},
+    {file = "black-23.1.0-cp37-cp37m-macosx_10_16_x86_64.whl", hash = "sha256:a8471939da5e824b891b25751955be52ee7f8a30a916d570a5ba8e0f2eb2ecad"},
+    {file = "black-23.1.0-cp37-cp37m-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:8178318cb74f98bc571eef19068f6ab5613b3e59d4f47771582f04e175570ed8"},
+    {file = "black-23.1.0-cp37-cp37m-win_amd64.whl", hash = "sha256:a436e7881d33acaf2536c46a454bb964a50eff59b21b51c6ccf5a40601fbef24"},
+    {file = "black-23.1.0-cp38-cp38-macosx_10_16_arm64.whl", hash = "sha256:a59db0a2094d2259c554676403fa2fac3473ccf1354c1c63eccf7ae65aac8ab6"},
+    {file = "black-23.1.0-cp38-cp38-macosx_10_16_universal2.whl", hash = "sha256:0052dba51dec07ed029ed61b18183942043e00008ec65d5028814afaab9a22fd"},
+    {file = "black-23.1.0-cp38-cp38-macosx_10_16_x86_64.whl", hash = "sha256:49f7b39e30f326a34b5c9a4213213a6b221d7ae9d58ec70df1c4a307cf2a1580"},
+    {file = "black-23.1.0-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:162e37d49e93bd6eb6f1afc3e17a3d23a823042530c37c3c42eeeaf026f38468"},
+    {file = "black-23.1.0-cp38-cp38-win_amd64.whl", hash = "sha256:8b70eb40a78dfac24842458476135f9b99ab952dd3f2dab738c1881a9b38b753"},
+    {file = "black-23.1.0-cp39-cp39-macosx_10_16_arm64.whl", hash = "sha256:a29650759a6a0944e7cca036674655c2f0f63806ddecc45ed40b7b8aa314b651"},
+    {file = "black-23.1.0-cp39-cp39-macosx_10_16_universal2.whl", hash = "sha256:bb460c8561c8c1bec7824ecbc3ce085eb50005883a6203dcfb0122e95797ee06"},
+    {file = "black-23.1.0-cp39-cp39-macosx_10_16_x86_64.whl", hash = "sha256:c91dfc2c2a4e50df0026f88d2215e166616e0c80e86004d0003ece0488db2739"},
+    {file = "black-23.1.0-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:2a951cc83ab535d248c89f300eccbd625e80ab880fbcfb5ac8afb5f01a258ac9"},
+    {file = "black-23.1.0-cp39-cp39-win_amd64.whl", hash = "sha256:0680d4380db3719ebcfb2613f34e86c8e6d15ffeabcf8ec59355c5e7b85bb555"},
+    {file = "black-23.1.0-py3-none-any.whl", hash = "sha256:7a0f701d314cfa0896b9001df70a530eb2472babb76086344e688829efd97d32"},
+    {file = "black-23.1.0.tar.gz", hash = "sha256:b0bd97bea8903f5a2ba7219257a44e3f1f9d00073d6cc1add68f0beec69692ac"},
 ]
 
 [package.dependencies]
 click = ">=8.0.0"
 mypy-extensions = ">=0.4.3"
+packaging = ">=22.0"
 pathspec = ">=0.9.0"
 platformdirs = ">=2"
-tomli = {version = ">=1.1.0", markers = "python_full_version < \"3.11.0a7\""}
+tomli = {version = ">=1.1.0", markers = "python_version < \"3.11\""}
 
 [package.extras]
 colorama = ["colorama (>=0.4.3)"]
@@ -123,14 +138,14 @@ uvloop = ["uvloop (>=0.15.2)"]
 
 [[package]]
 name = "cachetools"
-version = "5.2.1"
+version = "5.3.0"
 description = "Extensible memoizing collections and decorators"
 category = "dev"
 optional = false
 python-versions = "~=3.7"
 files = [
-    {file = "cachetools-5.2.1-py3-none-any.whl", hash = "sha256:8462eebf3a6c15d25430a8c27c56ac61340b2ecf60c9ce57afc2b97e450e47da"},
-    {file = "cachetools-5.2.1.tar.gz", hash = "sha256:5991bc0e08a1319bb618d3195ca5b6bc76646a49c21d55962977197b301cc1fe"},
+    {file = "cachetools-5.3.0-py3-none-any.whl", hash = "sha256:429e1a1e845c008ea6c85aa35d4b98b65d6a9763eeef3e37e92728a12d1de9d4"},
+    {file = "cachetools-5.3.0.tar.gz", hash = "sha256:13dfddc7b8df938c21a940dfa6557ce6e94a2f1cdfa58eb90c805721d58f2c14"},
 ]
 
 [[package]]
@@ -171,19 +186,102 @@ files = [
 
 [[package]]
 name = "charset-normalizer"
-version = "2.1.1"
+version = "3.0.1"
 description = "The Real First Universal Charset Detector. Open, modern and actively maintained alternative to Chardet."
 category = "main"
 optional = false
-python-versions = ">=3.6.0"
+python-versions = "*"
 files = [
-    {file = "charset-normalizer-2.1.1.tar.gz", hash = "sha256:5a3d016c7c547f69d6f81fb0db9449ce888b418b5b9952cc5e6e66843e9dd845"},
-    {file = "charset_normalizer-2.1.1-py3-none-any.whl", hash = "sha256:83e9a75d1911279afd89352c68b45348559d1fc0506b054b346651b5e7fee29f"},
+    {file = "charset-normalizer-3.0.1.tar.gz", hash = "sha256:ebea339af930f8ca5d7a699b921106c6e29c617fe9606fa7baa043c1cdae326f"},
+    {file = "charset_normalizer-3.0.1-cp310-cp310-macosx_10_9_universal2.whl", hash = "sha256:88600c72ef7587fe1708fd242b385b6ed4b8904976d5da0893e31df8b3480cb6"},
+    {file = "charset_normalizer-3.0.1-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:c75ffc45f25324e68ab238cb4b5c0a38cd1c3d7f1fb1f72b5541de469e2247db"},
+    {file = "charset_normalizer-3.0.1-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:db72b07027db150f468fbada4d85b3b2729a3db39178abf5c543b784c1254539"},
+    {file = "charset_normalizer-3.0.1-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:62595ab75873d50d57323a91dd03e6966eb79c41fa834b7a1661ed043b2d404d"},
+    {file = "charset_normalizer-3.0.1-cp310-cp310-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:ff6f3db31555657f3163b15a6b7c6938d08df7adbfc9dd13d9d19edad678f1e8"},
+    {file = "charset_normalizer-3.0.1-cp310-cp310-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:772b87914ff1152b92a197ef4ea40efe27a378606c39446ded52c8f80f79702e"},
+    {file = "charset_normalizer-3.0.1-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:70990b9c51340e4044cfc394a81f614f3f90d41397104d226f21e66de668730d"},
+    {file = "charset_normalizer-3.0.1-cp310-cp310-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:292d5e8ba896bbfd6334b096e34bffb56161c81408d6d036a7dfa6929cff8783"},
+    {file = "charset_normalizer-3.0.1-cp310-cp310-musllinux_1_1_aarch64.whl", hash = "sha256:2edb64ee7bf1ed524a1da60cdcd2e1f6e2b4f66ef7c077680739f1641f62f555"},
+    {file = "charset_normalizer-3.0.1-cp310-cp310-musllinux_1_1_i686.whl", hash = "sha256:31a9ddf4718d10ae04d9b18801bd776693487cbb57d74cc3458a7673f6f34639"},
+    {file = "charset_normalizer-3.0.1-cp310-cp310-musllinux_1_1_ppc64le.whl", hash = "sha256:44ba614de5361b3e5278e1241fda3dc1838deed864b50a10d7ce92983797fa76"},
+    {file = "charset_normalizer-3.0.1-cp310-cp310-musllinux_1_1_s390x.whl", hash = "sha256:12db3b2c533c23ab812c2b25934f60383361f8a376ae272665f8e48b88e8e1c6"},
+    {file = "charset_normalizer-3.0.1-cp310-cp310-musllinux_1_1_x86_64.whl", hash = "sha256:c512accbd6ff0270939b9ac214b84fb5ada5f0409c44298361b2f5e13f9aed9e"},
+    {file = "charset_normalizer-3.0.1-cp310-cp310-win32.whl", hash = "sha256:502218f52498a36d6bf5ea77081844017bf7982cdbe521ad85e64cabee1b608b"},
+    {file = "charset_normalizer-3.0.1-cp310-cp310-win_amd64.whl", hash = "sha256:601f36512f9e28f029d9481bdaf8e89e5148ac5d89cffd3b05cd533eeb423b59"},
+    {file = "charset_normalizer-3.0.1-cp311-cp311-macosx_10_9_universal2.whl", hash = "sha256:0298eafff88c99982a4cf66ba2efa1128e4ddaca0b05eec4c456bbc7db691d8d"},
+    {file = "charset_normalizer-3.0.1-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:a8d0fc946c784ff7f7c3742310cc8a57c5c6dc31631269876a88b809dbeff3d3"},
+    {file = "charset_normalizer-3.0.1-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:87701167f2a5c930b403e9756fab1d31d4d4da52856143b609e30a1ce7160f3c"},
+    {file = "charset_normalizer-3.0.1-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:14e76c0f23218b8f46c4d87018ca2e441535aed3632ca134b10239dfb6dadd6b"},
+    {file = "charset_normalizer-3.0.1-cp311-cp311-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:0c0a590235ccd933d9892c627dec5bc7511ce6ad6c1011fdf5b11363022746c1"},
+    {file = "charset_normalizer-3.0.1-cp311-cp311-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:8c7fe7afa480e3e82eed58e0ca89f751cd14d767638e2550c77a92a9e749c317"},
+    {file = "charset_normalizer-3.0.1-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:79909e27e8e4fcc9db4addea88aa63f6423ebb171db091fb4373e3312cb6d603"},
+    {file = "charset_normalizer-3.0.1-cp311-cp311-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:8ac7b6a045b814cf0c47f3623d21ebd88b3e8cf216a14790b455ea7ff0135d18"},
+    {file = "charset_normalizer-3.0.1-cp311-cp311-musllinux_1_1_aarch64.whl", hash = "sha256:72966d1b297c741541ca8cf1223ff262a6febe52481af742036a0b296e35fa5a"},
+    {file = "charset_normalizer-3.0.1-cp311-cp311-musllinux_1_1_i686.whl", hash = "sha256:f9d0c5c045a3ca9bedfc35dca8526798eb91a07aa7a2c0fee134c6c6f321cbd7"},
+    {file = "charset_normalizer-3.0.1-cp311-cp311-musllinux_1_1_ppc64le.whl", hash = "sha256:5995f0164fa7df59db4746112fec3f49c461dd6b31b841873443bdb077c13cfc"},
+    {file = "charset_normalizer-3.0.1-cp311-cp311-musllinux_1_1_s390x.whl", hash = "sha256:4a8fcf28c05c1f6d7e177a9a46a1c52798bfe2ad80681d275b10dcf317deaf0b"},
+    {file = "charset_normalizer-3.0.1-cp311-cp311-musllinux_1_1_x86_64.whl", hash = "sha256:761e8904c07ad053d285670f36dd94e1b6ab7f16ce62b9805c475b7aa1cffde6"},
+    {file = "charset_normalizer-3.0.1-cp311-cp311-win32.whl", hash = "sha256:71140351489970dfe5e60fc621ada3e0f41104a5eddaca47a7acb3c1b851d6d3"},
+    {file = "charset_normalizer-3.0.1-cp311-cp311-win_amd64.whl", hash = "sha256:9ab77acb98eba3fd2a85cd160851816bfce6871d944d885febf012713f06659c"},
+    {file = "charset_normalizer-3.0.1-cp36-cp36m-macosx_10_9_x86_64.whl", hash = "sha256:84c3990934bae40ea69a82034912ffe5a62c60bbf6ec5bc9691419641d7d5c9a"},
+    {file = "charset_normalizer-3.0.1-cp36-cp36m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:74292fc76c905c0ef095fe11e188a32ebd03bc38f3f3e9bcb85e4e6db177b7ea"},
+    {file = "charset_normalizer-3.0.1-cp36-cp36m-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:c95a03c79bbe30eec3ec2b7f076074f4281526724c8685a42872974ef4d36b72"},
+    {file = "charset_normalizer-3.0.1-cp36-cp36m-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:f4c39b0e3eac288fedc2b43055cfc2ca7a60362d0e5e87a637beac5d801ef478"},
+    {file = "charset_normalizer-3.0.1-cp36-cp36m-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:df2c707231459e8a4028eabcd3cfc827befd635b3ef72eada84ab13b52e1574d"},
+    {file = "charset_normalizer-3.0.1-cp36-cp36m-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:93ad6d87ac18e2a90b0fe89df7c65263b9a99a0eb98f0a3d2e079f12a0735837"},
+    {file = "charset_normalizer-3.0.1-cp36-cp36m-musllinux_1_1_aarch64.whl", hash = "sha256:59e5686dd847347e55dffcc191a96622f016bc0ad89105e24c14e0d6305acbc6"},
+    {file = "charset_normalizer-3.0.1-cp36-cp36m-musllinux_1_1_i686.whl", hash = "sha256:cd6056167405314a4dc3c173943f11249fa0f1b204f8b51ed4bde1a9cd1834dc"},
+    {file = "charset_normalizer-3.0.1-cp36-cp36m-musllinux_1_1_ppc64le.whl", hash = "sha256:083c8d17153ecb403e5e1eb76a7ef4babfc2c48d58899c98fcaa04833e7a2f9a"},
+    {file = "charset_normalizer-3.0.1-cp36-cp36m-musllinux_1_1_s390x.whl", hash = "sha256:f5057856d21e7586765171eac8b9fc3f7d44ef39425f85dbcccb13b3ebea806c"},
+    {file = "charset_normalizer-3.0.1-cp36-cp36m-musllinux_1_1_x86_64.whl", hash = "sha256:7eb33a30d75562222b64f569c642ff3dc6689e09adda43a082208397f016c39a"},
+    {file = "charset_normalizer-3.0.1-cp36-cp36m-win32.whl", hash = "sha256:95dea361dd73757c6f1c0a1480ac499952c16ac83f7f5f4f84f0658a01b8ef41"},
+    {file = "charset_normalizer-3.0.1-cp36-cp36m-win_amd64.whl", hash = "sha256:eaa379fcd227ca235d04152ca6704c7cb55564116f8bc52545ff357628e10602"},
+    {file = "charset_normalizer-3.0.1-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:3e45867f1f2ab0711d60c6c71746ac53537f1684baa699f4f668d4c6f6ce8e14"},
+    {file = "charset_normalizer-3.0.1-cp37-cp37m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:cadaeaba78750d58d3cc6ac4d1fd867da6fc73c88156b7a3212a3cd4819d679d"},
+    {file = "charset_normalizer-3.0.1-cp37-cp37m-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:911d8a40b2bef5b8bbae2e36a0b103f142ac53557ab421dc16ac4aafee6f53dc"},
+    {file = "charset_normalizer-3.0.1-cp37-cp37m-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:503e65837c71b875ecdd733877d852adbc465bd82c768a067badd953bf1bc5a3"},
+    {file = "charset_normalizer-3.0.1-cp37-cp37m-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:a60332922359f920193b1d4826953c507a877b523b2395ad7bc716ddd386d866"},
+    {file = "charset_normalizer-3.0.1-cp37-cp37m-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:16a8663d6e281208d78806dbe14ee9903715361cf81f6d4309944e4d1e59ac5b"},
+    {file = "charset_normalizer-3.0.1-cp37-cp37m-musllinux_1_1_aarch64.whl", hash = "sha256:a16418ecf1329f71df119e8a65f3aa68004a3f9383821edcb20f0702934d8087"},
+    {file = "charset_normalizer-3.0.1-cp37-cp37m-musllinux_1_1_i686.whl", hash = "sha256:9d9153257a3f70d5f69edf2325357251ed20f772b12e593f3b3377b5f78e7ef8"},
+    {file = "charset_normalizer-3.0.1-cp37-cp37m-musllinux_1_1_ppc64le.whl", hash = "sha256:02a51034802cbf38db3f89c66fb5d2ec57e6fe7ef2f4a44d070a593c3688667b"},
+    {file = "charset_normalizer-3.0.1-cp37-cp37m-musllinux_1_1_s390x.whl", hash = "sha256:2e396d70bc4ef5325b72b593a72c8979999aa52fb8bcf03f701c1b03e1166918"},
+    {file = "charset_normalizer-3.0.1-cp37-cp37m-musllinux_1_1_x86_64.whl", hash = "sha256:11b53acf2411c3b09e6af37e4b9005cba376c872503c8f28218c7243582df45d"},
+    {file = "charset_normalizer-3.0.1-cp37-cp37m-win32.whl", hash = "sha256:0bf2dae5291758b6f84cf923bfaa285632816007db0330002fa1de38bfcb7154"},
+    {file = "charset_normalizer-3.0.1-cp37-cp37m-win_amd64.whl", hash = "sha256:2c03cc56021a4bd59be889c2b9257dae13bf55041a3372d3295416f86b295fb5"},
+    {file = "charset_normalizer-3.0.1-cp38-cp38-macosx_10_9_universal2.whl", hash = "sha256:024e606be3ed92216e2b6952ed859d86b4cfa52cd5bc5f050e7dc28f9b43ec42"},
+    {file = "charset_normalizer-3.0.1-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:4b0d02d7102dd0f997580b51edc4cebcf2ab6397a7edf89f1c73b586c614272c"},
+    {file = "charset_normalizer-3.0.1-cp38-cp38-macosx_11_0_arm64.whl", hash = "sha256:358a7c4cb8ba9b46c453b1dd8d9e431452d5249072e4f56cfda3149f6ab1405e"},
+    {file = "charset_normalizer-3.0.1-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:81d6741ab457d14fdedc215516665050f3822d3e56508921cc7239f8c8e66a58"},
+    {file = "charset_normalizer-3.0.1-cp38-cp38-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:8b8af03d2e37866d023ad0ddea594edefc31e827fee64f8de5611a1dbc373174"},
+    {file = "charset_normalizer-3.0.1-cp38-cp38-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:9cf4e8ad252f7c38dd1f676b46514f92dc0ebeb0db5552f5f403509705e24753"},
+    {file = "charset_normalizer-3.0.1-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:e696f0dd336161fca9adbb846875d40752e6eba585843c768935ba5c9960722b"},
+    {file = "charset_normalizer-3.0.1-cp38-cp38-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:c22d3fe05ce11d3671297dc8973267daa0f938b93ec716e12e0f6dee81591dc1"},
+    {file = "charset_normalizer-3.0.1-cp38-cp38-musllinux_1_1_aarch64.whl", hash = "sha256:109487860ef6a328f3eec66f2bf78b0b72400280d8f8ea05f69c51644ba6521a"},
+    {file = "charset_normalizer-3.0.1-cp38-cp38-musllinux_1_1_i686.whl", hash = "sha256:37f8febc8ec50c14f3ec9637505f28e58d4f66752207ea177c1d67df25da5aed"},
+    {file = "charset_normalizer-3.0.1-cp38-cp38-musllinux_1_1_ppc64le.whl", hash = "sha256:f97e83fa6c25693c7a35de154681fcc257c1c41b38beb0304b9c4d2d9e164479"},
+    {file = "charset_normalizer-3.0.1-cp38-cp38-musllinux_1_1_s390x.whl", hash = "sha256:a152f5f33d64a6be73f1d30c9cc82dfc73cec6477ec268e7c6e4c7d23c2d2291"},
+    {file = "charset_normalizer-3.0.1-cp38-cp38-musllinux_1_1_x86_64.whl", hash = "sha256:39049da0ffb96c8cbb65cbf5c5f3ca3168990adf3551bd1dee10c48fce8ae820"},
+    {file = "charset_normalizer-3.0.1-cp38-cp38-win32.whl", hash = "sha256:4457ea6774b5611f4bed5eaa5df55f70abde42364d498c5134b7ef4c6958e20e"},
+    {file = "charset_normalizer-3.0.1-cp38-cp38-win_amd64.whl", hash = "sha256:e62164b50f84e20601c1ff8eb55620d2ad25fb81b59e3cd776a1902527a788af"},
+    {file = "charset_normalizer-3.0.1-cp39-cp39-macosx_10_9_universal2.whl", hash = "sha256:8eade758719add78ec36dc13201483f8e9b5d940329285edcd5f70c0a9edbd7f"},
+    {file = "charset_normalizer-3.0.1-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:8499ca8f4502af841f68135133d8258f7b32a53a1d594aa98cc52013fff55678"},
+    {file = "charset_normalizer-3.0.1-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:3fc1c4a2ffd64890aebdb3f97e1278b0cc72579a08ca4de8cd2c04799a3a22be"},
+    {file = "charset_normalizer-3.0.1-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:00d3ffdaafe92a5dc603cb9bd5111aaa36dfa187c8285c543be562e61b755f6b"},
+    {file = "charset_normalizer-3.0.1-cp39-cp39-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:c2ac1b08635a8cd4e0cbeaf6f5e922085908d48eb05d44c5ae9eabab148512ca"},
+    {file = "charset_normalizer-3.0.1-cp39-cp39-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:f6f45710b4459401609ebebdbcfb34515da4fc2aa886f95107f556ac69a9147e"},
+    {file = "charset_normalizer-3.0.1-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:3ae1de54a77dc0d6d5fcf623290af4266412a7c4be0b1ff7444394f03f5c54e3"},
+    {file = "charset_normalizer-3.0.1-cp39-cp39-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:3b590df687e3c5ee0deef9fc8c547d81986d9a1b56073d82de008744452d6541"},
+    {file = "charset_normalizer-3.0.1-cp39-cp39-musllinux_1_1_aarch64.whl", hash = "sha256:ab5de034a886f616a5668aa5d098af2b5385ed70142090e2a31bcbd0af0fdb3d"},
+    {file = "charset_normalizer-3.0.1-cp39-cp39-musllinux_1_1_i686.whl", hash = "sha256:9cb3032517f1627cc012dbc80a8ec976ae76d93ea2b5feaa9d2a5b8882597579"},
+    {file = "charset_normalizer-3.0.1-cp39-cp39-musllinux_1_1_ppc64le.whl", hash = "sha256:608862a7bf6957f2333fc54ab4399e405baad0163dc9f8d99cb236816db169d4"},
+    {file = "charset_normalizer-3.0.1-cp39-cp39-musllinux_1_1_s390x.whl", hash = "sha256:0f438ae3532723fb6ead77e7c604be7c8374094ef4ee2c5e03a3a17f1fca256c"},
+    {file = "charset_normalizer-3.0.1-cp39-cp39-musllinux_1_1_x86_64.whl", hash = "sha256:356541bf4381fa35856dafa6a965916e54bed415ad8a24ee6de6e37deccf2786"},
+    {file = "charset_normalizer-3.0.1-cp39-cp39-win32.whl", hash = "sha256:39cf9ed17fe3b1bc81f33c9ceb6ce67683ee7526e65fde1447c772afc54a1bb8"},
+    {file = "charset_normalizer-3.0.1-cp39-cp39-win_amd64.whl", hash = "sha256:0a11e971ed097d24c534c037d298ad32c6ce81a45736d31e0ff0ad37ab437d59"},
+    {file = "charset_normalizer-3.0.1-py3-none-any.whl", hash = "sha256:7e189e2e1d3ed2f4aebabd2d5b0f931e883676e51c7624826e0a4e5fe8a0bf24"},
 ]
 
-[package.extras]
-unicode-backport = ["unicodedata2"]
-
 [[package]]
 name = "click"
 version = "8.1.3"
@@ -234,62 +332,63 @@ requests = ">=2.23.0"
 
 [[package]]
 name = "coverage"
-version = "6.5.0"
+version = "7.1.0"
 description = "Code coverage measurement for Python"
 category = "dev"
 optional = false
 python-versions = ">=3.7"
 files = [
-    {file = "coverage-6.5.0-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:ef8674b0ee8cc11e2d574e3e2998aea5df5ab242e012286824ea3c6970580e53"},
-    {file = "coverage-6.5.0-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:784f53ebc9f3fd0e2a3f6a78b2be1bd1f5575d7863e10c6e12504f240fd06660"},
-    {file = "coverage-6.5.0-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:b4a5be1748d538a710f87542f22c2cad22f80545a847ad91ce45e77417293eb4"},
-    {file = "coverage-6.5.0-cp310-cp310-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:83516205e254a0cb77d2d7bb3632ee019d93d9f4005de31dca0a8c3667d5bc04"},
-    {file = "coverage-6.5.0-cp310-cp310-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:af4fffaffc4067232253715065e30c5a7ec6faac36f8fc8d6f64263b15f74db0"},
-    {file = "coverage-6.5.0-cp310-cp310-musllinux_1_1_aarch64.whl", hash = "sha256:97117225cdd992a9c2a5515db1f66b59db634f59d0679ca1fa3fe8da32749cae"},
-    {file = "coverage-6.5.0-cp310-cp310-musllinux_1_1_i686.whl", hash = "sha256:a1170fa54185845505fbfa672f1c1ab175446c887cce8212c44149581cf2d466"},
-    {file = "coverage-6.5.0-cp310-cp310-musllinux_1_1_x86_64.whl", hash = "sha256:11b990d520ea75e7ee8dcab5bc908072aaada194a794db9f6d7d5cfd19661e5a"},
-    {file = "coverage-6.5.0-cp310-cp310-win32.whl", hash = "sha256:5dbec3b9095749390c09ab7c89d314727f18800060d8d24e87f01fb9cfb40b32"},
-    {file = "coverage-6.5.0-cp310-cp310-win_amd64.whl", hash = "sha256:59f53f1dc5b656cafb1badd0feb428c1e7bc19b867479ff72f7a9dd9b479f10e"},
-    {file = "coverage-6.5.0-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:4a5375e28c5191ac38cca59b38edd33ef4cc914732c916f2929029b4bfb50795"},
-    {file = "coverage-6.5.0-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:c4ed2820d919351f4167e52425e096af41bfabacb1857186c1ea32ff9983ed75"},
-    {file = "coverage-6.5.0-cp311-cp311-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:33a7da4376d5977fbf0a8ed91c4dffaaa8dbf0ddbf4c8eea500a2486d8bc4d7b"},
-    {file = "coverage-6.5.0-cp311-cp311-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:a8fb6cf131ac4070c9c5a3e21de0f7dc5a0fbe8bc77c9456ced896c12fcdad91"},
-    {file = "coverage-6.5.0-cp311-cp311-musllinux_1_1_aarch64.whl", hash = "sha256:a6b7d95969b8845250586f269e81e5dfdd8ff828ddeb8567a4a2eaa7313460c4"},
-    {file = "coverage-6.5.0-cp311-cp311-musllinux_1_1_i686.whl", hash = "sha256:1ef221513e6f68b69ee9e159506d583d31aa3567e0ae84eaad9d6ec1107dddaa"},
-    {file = "coverage-6.5.0-cp311-cp311-musllinux_1_1_x86_64.whl", hash = "sha256:cca4435eebea7962a52bdb216dec27215d0df64cf27fc1dd538415f5d2b9da6b"},
-    {file = "coverage-6.5.0-cp311-cp311-win32.whl", hash = "sha256:98e8a10b7a314f454d9eff4216a9a94d143a7ee65018dd12442e898ee2310578"},
-    {file = "coverage-6.5.0-cp311-cp311-win_amd64.whl", hash = "sha256:bc8ef5e043a2af066fa8cbfc6e708d58017024dc4345a1f9757b329a249f041b"},
-    {file = "coverage-6.5.0-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:4433b90fae13f86fafff0b326453dd42fc9a639a0d9e4eec4d366436d1a41b6d"},
-    {file = "coverage-6.5.0-cp37-cp37m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:f4f05d88d9a80ad3cac6244d36dd89a3c00abc16371769f1340101d3cb899fc3"},
-    {file = "coverage-6.5.0-cp37-cp37m-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:94e2565443291bd778421856bc975d351738963071e9b8839ca1fc08b42d4bef"},
-    {file = "coverage-6.5.0-cp37-cp37m-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:027018943386e7b942fa832372ebc120155fd970837489896099f5cfa2890f79"},
-    {file = "coverage-6.5.0-cp37-cp37m-musllinux_1_1_aarch64.whl", hash = "sha256:255758a1e3b61db372ec2736c8e2a1fdfaf563977eedbdf131de003ca5779b7d"},
-    {file = "coverage-6.5.0-cp37-cp37m-musllinux_1_1_i686.whl", hash = "sha256:851cf4ff24062c6aec510a454b2584f6e998cada52d4cb58c5e233d07172e50c"},
-    {file = "coverage-6.5.0-cp37-cp37m-musllinux_1_1_x86_64.whl", hash = "sha256:12adf310e4aafddc58afdb04d686795f33f4d7a6fa67a7a9d4ce7d6ae24d949f"},
-    {file = "coverage-6.5.0-cp37-cp37m-win32.whl", hash = "sha256:b5604380f3415ba69de87a289a2b56687faa4fe04dbee0754bfcae433489316b"},
-    {file = "coverage-6.5.0-cp37-cp37m-win_amd64.whl", hash = "sha256:4a8dbc1f0fbb2ae3de73eb0bdbb914180c7abfbf258e90b311dcd4f585d44bd2"},
-    {file = "coverage-6.5.0-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:d900bb429fdfd7f511f868cedd03a6bbb142f3f9118c09b99ef8dc9bf9643c3c"},
-    {file = "coverage-6.5.0-cp38-cp38-macosx_11_0_arm64.whl", hash = "sha256:2198ea6fc548de52adc826f62cb18554caedfb1d26548c1b7c88d8f7faa8f6ba"},
-    {file = "coverage-6.5.0-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:6c4459b3de97b75e3bd6b7d4b7f0db13f17f504f3d13e2a7c623786289dd670e"},
-    {file = "coverage-6.5.0-cp38-cp38-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:20c8ac5386253717e5ccc827caad43ed66fea0efe255727b1053a8154d952398"},
-    {file = "coverage-6.5.0-cp38-cp38-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:6b07130585d54fe8dff3d97b93b0e20290de974dc8177c320aeaf23459219c0b"},
-    {file = "coverage-6.5.0-cp38-cp38-musllinux_1_1_aarch64.whl", hash = "sha256:dbdb91cd8c048c2b09eb17713b0c12a54fbd587d79adcebad543bc0cd9a3410b"},
-    {file = "coverage-6.5.0-cp38-cp38-musllinux_1_1_i686.whl", hash = "sha256:de3001a203182842a4630e7b8d1a2c7c07ec1b45d3084a83d5d227a3806f530f"},
-    {file = "coverage-6.5.0-cp38-cp38-musllinux_1_1_x86_64.whl", hash = "sha256:e07f4a4a9b41583d6eabec04f8b68076ab3cd44c20bd29332c6572dda36f372e"},
-    {file = "coverage-6.5.0-cp38-cp38-win32.whl", hash = "sha256:6d4817234349a80dbf03640cec6109cd90cba068330703fa65ddf56b60223a6d"},
-    {file = "coverage-6.5.0-cp38-cp38-win_amd64.whl", hash = "sha256:7ccf362abd726b0410bf8911c31fbf97f09f8f1061f8c1cf03dfc4b6372848f6"},
-    {file = "coverage-6.5.0-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:633713d70ad6bfc49b34ead4060531658dc6dfc9b3eb7d8a716d5873377ab745"},
-    {file = "coverage-6.5.0-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:95203854f974e07af96358c0b261f1048d8e1083f2de9b1c565e1be4a3a48cfc"},
-    {file = "coverage-6.5.0-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:b9023e237f4c02ff739581ef35969c3739445fb059b060ca51771e69101efffe"},
-    {file = "coverage-6.5.0-cp39-cp39-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:265de0fa6778d07de30bcf4d9dc471c3dc4314a23a3c6603d356a3c9abc2dfcf"},
-    {file = "coverage-6.5.0-cp39-cp39-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:8f830ed581b45b82451a40faabb89c84e1a998124ee4212d440e9c6cf70083e5"},
-    {file = "coverage-6.5.0-cp39-cp39-musllinux_1_1_aarch64.whl", hash = "sha256:7b6be138d61e458e18d8e6ddcddd36dd96215edfe5f1168de0b1b32635839b62"},
-    {file = "coverage-6.5.0-cp39-cp39-musllinux_1_1_i686.whl", hash = "sha256:42eafe6778551cf006a7c43153af1211c3aaab658d4d66fa5fcc021613d02518"},
-    {file = "coverage-6.5.0-cp39-cp39-musllinux_1_1_x86_64.whl", hash = "sha256:723e8130d4ecc8f56e9a611e73b31219595baa3bb252d539206f7bbbab6ffc1f"},
-    {file = "coverage-6.5.0-cp39-cp39-win32.whl", hash = "sha256:d9ecf0829c6a62b9b573c7bb6d4dcd6ba8b6f80be9ba4fc7ed50bf4ac9aecd72"},
-    {file = "coverage-6.5.0-cp39-cp39-win_amd64.whl", hash = "sha256:fc2af30ed0d5ae0b1abdb4ebdce598eafd5b35397d4d75deb341a614d333d987"},
-    {file = "coverage-6.5.0-pp36.pp37.pp38-none-any.whl", hash = "sha256:1431986dac3923c5945271f169f59c45b8802a114c8f548d611f2015133df77a"},
-    {file = "coverage-6.5.0.tar.gz", hash = "sha256:f642e90754ee3e06b0e7e51bce3379590e76b7f76b708e1a71ff043f87025c84"},
+    {file = "coverage-7.1.0-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:3b946bbcd5a8231383450b195cfb58cb01cbe7f8949f5758566b881df4b33baf"},
+    {file = "coverage-7.1.0-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:ec8e767f13be637d056f7e07e61d089e555f719b387a7070154ad80a0ff31801"},
+    {file = "coverage-7.1.0-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:d4a5a5879a939cb84959d86869132b00176197ca561c664fc21478c1eee60d75"},
+    {file = "coverage-7.1.0-cp310-cp310-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:b643cb30821e7570c0aaf54feaf0bfb630b79059f85741843e9dc23f33aaca2c"},
+    {file = "coverage-7.1.0-cp310-cp310-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:32df215215f3af2c1617a55dbdfb403b772d463d54d219985ac7cd3bf124cada"},
+    {file = "coverage-7.1.0-cp310-cp310-musllinux_1_1_aarch64.whl", hash = "sha256:33d1ae9d4079e05ac4cc1ef9e20c648f5afabf1a92adfaf2ccf509c50b85717f"},
+    {file = "coverage-7.1.0-cp310-cp310-musllinux_1_1_i686.whl", hash = "sha256:29571503c37f2ef2138a306d23e7270687c0efb9cab4bd8038d609b5c2393a3a"},
+    {file = "coverage-7.1.0-cp310-cp310-musllinux_1_1_x86_64.whl", hash = "sha256:63ffd21aa133ff48c4dff7adcc46b7ec8b565491bfc371212122dd999812ea1c"},
+    {file = "coverage-7.1.0-cp310-cp310-win32.whl", hash = "sha256:4b14d5e09c656de5038a3f9bfe5228f53439282abcab87317c9f7f1acb280352"},
+    {file = "coverage-7.1.0-cp310-cp310-win_amd64.whl", hash = "sha256:8361be1c2c073919500b6601220a6f2f98ea0b6d2fec5014c1d9cfa23dd07038"},
+    {file = "coverage-7.1.0-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:da9b41d4539eefd408c46725fb76ecba3a50a3367cafb7dea5f250d0653c1040"},
+    {file = "coverage-7.1.0-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:c5b15ed7644ae4bee0ecf74fee95808dcc34ba6ace87e8dfbf5cb0dc20eab45a"},
+    {file = "coverage-7.1.0-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:d12d076582507ea460ea2a89a8c85cb558f83406c8a41dd641d7be9a32e1274f"},
+    {file = "coverage-7.1.0-cp311-cp311-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:e2617759031dae1bf183c16cef8fcfb3de7617f394c813fa5e8e46e9b82d4222"},
+    {file = "coverage-7.1.0-cp311-cp311-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:c4e4881fa9e9667afcc742f0c244d9364d197490fbc91d12ac3b5de0bf2df146"},
+    {file = "coverage-7.1.0-cp311-cp311-musllinux_1_1_aarch64.whl", hash = "sha256:9d58885215094ab4a86a6aef044e42994a2bd76a446dc59b352622655ba6621b"},
+    {file = "coverage-7.1.0-cp311-cp311-musllinux_1_1_i686.whl", hash = "sha256:ffeeb38ee4a80a30a6877c5c4c359e5498eec095878f1581453202bfacc8fbc2"},
+    {file = "coverage-7.1.0-cp311-cp311-musllinux_1_1_x86_64.whl", hash = "sha256:3baf5f126f30781b5e93dbefcc8271cb2491647f8283f20ac54d12161dff080e"},
+    {file = "coverage-7.1.0-cp311-cp311-win32.whl", hash = "sha256:ded59300d6330be27bc6cf0b74b89ada58069ced87c48eaf9344e5e84b0072f7"},
+    {file = "coverage-7.1.0-cp311-cp311-win_amd64.whl", hash = "sha256:6a43c7823cd7427b4ed763aa7fb63901ca8288591323b58c9cd6ec31ad910f3c"},
+    {file = "coverage-7.1.0-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:7a726d742816cb3a8973c8c9a97539c734b3a309345236cd533c4883dda05b8d"},
+    {file = "coverage-7.1.0-cp37-cp37m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:bc7c85a150501286f8b56bd8ed3aa4093f4b88fb68c0843d21ff9656f0009d6a"},
+    {file = "coverage-7.1.0-cp37-cp37m-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:f5b4198d85a3755d27e64c52f8c95d6333119e49fd001ae5798dac872c95e0f8"},
+    {file = "coverage-7.1.0-cp37-cp37m-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:ddb726cb861c3117a553f940372a495fe1078249ff5f8a5478c0576c7be12050"},
+    {file = "coverage-7.1.0-cp37-cp37m-musllinux_1_1_aarch64.whl", hash = "sha256:51b236e764840a6df0661b67e50697aaa0e7d4124ca95e5058fa3d7cbc240b7c"},
+    {file = "coverage-7.1.0-cp37-cp37m-musllinux_1_1_i686.whl", hash = "sha256:7ee5c9bb51695f80878faaa5598040dd6c9e172ddcf490382e8aedb8ec3fec8d"},
+    {file = "coverage-7.1.0-cp37-cp37m-musllinux_1_1_x86_64.whl", hash = "sha256:c31b75ae466c053a98bf26843563b3b3517b8f37da4d47b1c582fdc703112bc3"},
+    {file = "coverage-7.1.0-cp37-cp37m-win32.whl", hash = "sha256:3b155caf3760408d1cb903b21e6a97ad4e2bdad43cbc265e3ce0afb8e0057e73"},
+    {file = "coverage-7.1.0-cp37-cp37m-win_amd64.whl", hash = "sha256:2a60d6513781e87047c3e630b33b4d1e89f39836dac6e069ffee28c4786715f5"},
+    {file = "coverage-7.1.0-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:f2cba5c6db29ce991029b5e4ac51eb36774458f0a3b8d3137241b32d1bb91f06"},
+    {file = "coverage-7.1.0-cp38-cp38-macosx_11_0_arm64.whl", hash = "sha256:beeb129cacea34490ffd4d6153af70509aa3cda20fdda2ea1a2be870dfec8d52"},
+    {file = "coverage-7.1.0-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:0c45948f613d5d18c9ec5eaa203ce06a653334cf1bd47c783a12d0dd4fd9c851"},
+    {file = "coverage-7.1.0-cp38-cp38-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:ef382417db92ba23dfb5864a3fc9be27ea4894e86620d342a116b243ade5d35d"},
+    {file = "coverage-7.1.0-cp38-cp38-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:7c7c0d0827e853315c9bbd43c1162c006dd808dbbe297db7ae66cd17b07830f0"},
+    {file = "coverage-7.1.0-cp38-cp38-musllinux_1_1_aarch64.whl", hash = "sha256:e5cdbb5cafcedea04924568d990e20ce7f1945a1dd54b560f879ee2d57226912"},
+    {file = "coverage-7.1.0-cp38-cp38-musllinux_1_1_i686.whl", hash = "sha256:9817733f0d3ea91bea80de0f79ef971ae94f81ca52f9b66500c6a2fea8e4b4f8"},
+    {file = "coverage-7.1.0-cp38-cp38-musllinux_1_1_x86_64.whl", hash = "sha256:218fe982371ac7387304153ecd51205f14e9d731b34fb0568181abaf7b443ba0"},
+    {file = "coverage-7.1.0-cp38-cp38-win32.whl", hash = "sha256:04481245ef966fbd24ae9b9e537ce899ae584d521dfbe78f89cad003c38ca2ab"},
+    {file = "coverage-7.1.0-cp38-cp38-win_amd64.whl", hash = "sha256:8ae125d1134bf236acba8b83e74c603d1b30e207266121e76484562bc816344c"},
+    {file = "coverage-7.1.0-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:2bf1d5f2084c3932b56b962a683074a3692bce7cabd3aa023c987a2a8e7612f6"},
+    {file = "coverage-7.1.0-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:98b85dd86514d889a2e3dd22ab3c18c9d0019e696478391d86708b805f4ea0fa"},
+    {file = "coverage-7.1.0-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:38da2db80cc505a611938d8624801158e409928b136c8916cd2e203970dde4dc"},
+    {file = "coverage-7.1.0-cp39-cp39-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:3164d31078fa9efe406e198aecd2a02d32a62fecbdef74f76dad6a46c7e48311"},
+    {file = "coverage-7.1.0-cp39-cp39-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:db61a79c07331e88b9a9974815c075fbd812bc9dbc4dc44b366b5368a2936063"},
+    {file = "coverage-7.1.0-cp39-cp39-musllinux_1_1_aarch64.whl", hash = "sha256:9ccb092c9ede70b2517a57382a601619d20981f56f440eae7e4d7eaafd1d1d09"},
+    {file = "coverage-7.1.0-cp39-cp39-musllinux_1_1_i686.whl", hash = "sha256:33ff26d0f6cc3ca8de13d14fde1ff8efe1456b53e3f0273e63cc8b3c84a063d8"},
+    {file = "coverage-7.1.0-cp39-cp39-musllinux_1_1_x86_64.whl", hash = "sha256:d47dd659a4ee952e90dc56c97d78132573dc5c7b09d61b416a9deef4ebe01a0c"},
+    {file = "coverage-7.1.0-cp39-cp39-win32.whl", hash = "sha256:d248cd4a92065a4d4543b8331660121b31c4148dd00a691bfb7a5cdc7483cfa4"},
+    {file = "coverage-7.1.0-cp39-cp39-win_amd64.whl", hash = "sha256:7ed681b0f8e8bcbbffa58ba26fcf5dbc8f79e7997595bf071ed5430d8c08d6f3"},
+    {file = "coverage-7.1.0-pp37.pp38.pp39-none-any.whl", hash = "sha256:755e89e32376c850f826c425ece2c35a4fc266c081490eb0a841e7c1cb0d3bda"},
+    {file = "coverage-7.1.0.tar.gz", hash = "sha256:10188fe543560ec4874f974b5305cd1a8bdcfa885ee00ea3a03733464c4ca265"},
 ]
 
 [package.dependencies]
@@ -312,14 +411,14 @@ files = [
 
 [[package]]
 name = "exceptiongroup"
-version = "1.0.1"
+version = "1.1.0"
 description = "Backport of PEP 654 (exception groups)"
 category = "dev"
 optional = false
 python-versions = ">=3.7"
 files = [
-    {file = "exceptiongroup-1.0.1-py3-none-any.whl", hash = "sha256:4d6c0aa6dd825810941c792f53d7b8d71da26f5e5f84f20f9508e8f2d33b140a"},
-    {file = "exceptiongroup-1.0.1.tar.gz", hash = "sha256:73866f7f842ede6cb1daa42c4af078e2035e5f7607f0e2c762cc51bb31bbe7b2"},
+    {file = "exceptiongroup-1.1.0-py3-none-any.whl", hash = "sha256:327cbda3da756e2de031a3107b81ab7b3770a602c4d16ca618298c526f4bec1e"},
+    {file = "exceptiongroup-1.1.0.tar.gz", hash = "sha256:bcb67d800a4497e1b404c2dd44fca47d3b7a5e5433dbab67f96c1a685cdfdf23"},
 ]
 
 [package.extras]
@@ -358,14 +457,14 @@ testing = ["covdefaults (>=2.2.2)", "coverage (>=7.0.1)", "pytest (>=7.2)", "pyt
 
 [[package]]
 name = "identify"
-version = "2.5.8"
+version = "2.5.17"
 description = "File identification library for Python"
 category = "dev"
 optional = false
 python-versions = ">=3.7"
 files = [
-    {file = "identify-2.5.8-py2.py3-none-any.whl", hash = "sha256:48b7925fe122720088aeb7a6c34f17b27e706b72c61070f27fe3789094233440"},
-    {file = "identify-2.5.8.tar.gz", hash = "sha256:7a214a10313b9489a0d61467db2856ae8d0b8306fc923e03a9effa53d8aedc58"},
+    {file = "identify-2.5.17-py2.py3-none-any.whl", hash = "sha256:7d526dd1283555aafcc91539acc061d8f6f59adb0a7bba462735b0a318bff7ed"},
+    {file = "identify-2.5.17.tar.gz", hash = "sha256:93cc61a861052de9d4c541a7acb7e3dcc9c11b398a2144f6e52ae5285f5f4f06"},
 ]
 
 [package.extras]
@@ -385,31 +484,31 @@ files = [
 
 [[package]]
 name = "iniconfig"
-version = "1.1.1"
-description = "iniconfig: brain-dead simple config-ini parsing"
+version = "2.0.0"
+description = "brain-dead simple config-ini parsing"
 category = "dev"
 optional = false
-python-versions = "*"
+python-versions = ">=3.7"
 files = [
-    {file = "iniconfig-1.1.1-py2.py3-none-any.whl", hash = "sha256:011e24c64b7f47f6ebd835bb12a743f2fbe9a26d4cecaa7f53bc4f35ee9da8b3"},
-    {file = "iniconfig-1.1.1.tar.gz", hash = "sha256:bc3af051d7d14b2ee5ef9969666def0cd1a000e121eaea580d4a313df4b37f32"},
+    {file = "iniconfig-2.0.0-py3-none-any.whl", hash = "sha256:b6a85871a79d2e3b22d2d1b94ac2824226a63c6b741c88f7ae975f18b6778374"},
+    {file = "iniconfig-2.0.0.tar.gz", hash = "sha256:2d91e135bf72d31a410b17c16da610a82cb55f6b0477d1a902134b24a455b8b3"},
 ]
 
 [[package]]
 name = "isort"
-version = "5.11.4"
+version = "5.12.0"
 description = "A Python utility / library to sort Python imports."
 category = "dev"
 optional = false
-python-versions = ">=3.7.0"
+python-versions = ">=3.8.0"
 files = [
-    {file = "isort-5.11.4-py3-none-any.whl", hash = "sha256:c033fd0edb91000a7f09527fe5c75321878f98322a77ddcc81adbd83724afb7b"},
-    {file = "isort-5.11.4.tar.gz", hash = "sha256:6db30c5ded9815d813932c04c2f85a360bcdd35fed496f4d8f35495ef0a261b6"},
+    {file = "isort-5.12.0-py3-none-any.whl", hash = "sha256:f84c2818376e66cf843d497486ea8fed8700b340f308f076c6fb1229dff318b6"},
+    {file = "isort-5.12.0.tar.gz", hash = "sha256:8bef7dde241278824a6d83f44a544709b065191b95b6e50894bdc722fcba0504"},
 ]
 
 [package.extras]
-colors = ["colorama (>=0.4.3,<0.5.0)"]
-pipfile-deprecated-finder = ["pipreqs", "requirementslib"]
+colors = ["colorama (>=0.4.3)"]
+pipfile-deprecated-finder = ["pip-shims (>=0.5.2)", "pipreqs", "requirementslib"]
 plugins = ["setuptools"]
 requirements-deprecated-finder = ["pip-api", "pipreqs"]
 
@@ -449,64 +548,74 @@ jinja2 = "*"
 
 [[package]]
 name = "markupsafe"
-version = "2.1.1"
+version = "2.1.2"
 description = "Safely add untrusted strings to HTML/XML markup."
 category = "dev"
 optional = false
 python-versions = ">=3.7"
 files = [
-    {file = "MarkupSafe-2.1.1-cp310-cp310-macosx_10_9_universal2.whl", hash = "sha256:86b1f75c4e7c2ac2ccdaec2b9022845dbb81880ca318bb7a0a01fbf7813e3812"},
-    {file = "MarkupSafe-2.1.1-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:f121a1420d4e173a5d96e47e9a0c0dcff965afdf1626d28de1460815f7c4ee7a"},
-    {file = "MarkupSafe-2.1.1-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:a49907dd8420c5685cfa064a1335b6754b74541bbb3706c259c02ed65b644b3e"},
-    {file = "MarkupSafe-2.1.1-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:10c1bfff05d95783da83491be968e8fe789263689c02724e0c691933c52994f5"},
-    {file = "MarkupSafe-2.1.1-cp310-cp310-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:b7bd98b796e2b6553da7225aeb61f447f80a1ca64f41d83612e6139ca5213aa4"},
-    {file = "MarkupSafe-2.1.1-cp310-cp310-musllinux_1_1_aarch64.whl", hash = "sha256:b09bf97215625a311f669476f44b8b318b075847b49316d3e28c08e41a7a573f"},
-    {file = "MarkupSafe-2.1.1-cp310-cp310-musllinux_1_1_i686.whl", hash = "sha256:694deca8d702d5db21ec83983ce0bb4b26a578e71fbdbd4fdcd387daa90e4d5e"},
-    {file = "MarkupSafe-2.1.1-cp310-cp310-musllinux_1_1_x86_64.whl", hash = "sha256:efc1913fd2ca4f334418481c7e595c00aad186563bbc1ec76067848c7ca0a933"},
-    {file = "MarkupSafe-2.1.1-cp310-cp310-win32.whl", hash = "sha256:4a33dea2b688b3190ee12bd7cfa29d39c9ed176bda40bfa11099a3ce5d3a7ac6"},
-    {file = "MarkupSafe-2.1.1-cp310-cp310-win_amd64.whl", hash = "sha256:dda30ba7e87fbbb7eab1ec9f58678558fd9a6b8b853530e176eabd064da81417"},
-    {file = "MarkupSafe-2.1.1-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:671cd1187ed5e62818414afe79ed29da836dde67166a9fac6d435873c44fdd02"},
-    {file = "MarkupSafe-2.1.1-cp37-cp37m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:3799351e2336dc91ea70b034983ee71cf2f9533cdff7c14c90ea126bfd95d65a"},
-    {file = "MarkupSafe-2.1.1-cp37-cp37m-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:e72591e9ecd94d7feb70c1cbd7be7b3ebea3f548870aa91e2732960fa4d57a37"},
-    {file = "MarkupSafe-2.1.1-cp37-cp37m-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:6fbf47b5d3728c6aea2abb0589b5d30459e369baa772e0f37a0320185e87c980"},
-    {file = "MarkupSafe-2.1.1-cp37-cp37m-musllinux_1_1_aarch64.whl", hash = "sha256:d5ee4f386140395a2c818d149221149c54849dfcfcb9f1debfe07a8b8bd63f9a"},
-    {file = "MarkupSafe-2.1.1-cp37-cp37m-musllinux_1_1_i686.whl", hash = "sha256:bcb3ed405ed3222f9904899563d6fc492ff75cce56cba05e32eff40e6acbeaa3"},
-    {file = "MarkupSafe-2.1.1-cp37-cp37m-musllinux_1_1_x86_64.whl", hash = "sha256:e1c0b87e09fa55a220f058d1d49d3fb8df88fbfab58558f1198e08c1e1de842a"},
-    {file = "MarkupSafe-2.1.1-cp37-cp37m-win32.whl", hash = "sha256:8dc1c72a69aa7e082593c4a203dcf94ddb74bb5c8a731e4e1eb68d031e8498ff"},
-    {file = "MarkupSafe-2.1.1-cp37-cp37m-win_amd64.whl", hash = "sha256:97a68e6ada378df82bc9f16b800ab77cbf4b2fada0081794318520138c088e4a"},
-    {file = "MarkupSafe-2.1.1-cp38-cp38-macosx_10_9_universal2.whl", hash = "sha256:e8c843bbcda3a2f1e3c2ab25913c80a3c5376cd00c6e8c4a86a89a28c8dc5452"},
-    {file = "MarkupSafe-2.1.1-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:0212a68688482dc52b2d45013df70d169f542b7394fc744c02a57374a4207003"},
-    {file = "MarkupSafe-2.1.1-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:8e576a51ad59e4bfaac456023a78f6b5e6e7651dcd383bcc3e18d06f9b55d6d1"},
-    {file = "MarkupSafe-2.1.1-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:4b9fe39a2ccc108a4accc2676e77da025ce383c108593d65cc909add5c3bd601"},
-    {file = "MarkupSafe-2.1.1-cp38-cp38-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:96e37a3dc86e80bf81758c152fe66dbf60ed5eca3d26305edf01892257049925"},
-    {file = "MarkupSafe-2.1.1-cp38-cp38-musllinux_1_1_aarch64.whl", hash = "sha256:6d0072fea50feec76a4c418096652f2c3238eaa014b2f94aeb1d56a66b41403f"},
-    {file = "MarkupSafe-2.1.1-cp38-cp38-musllinux_1_1_i686.whl", hash = "sha256:089cf3dbf0cd6c100f02945abeb18484bd1ee57a079aefd52cffd17fba910b88"},
-    {file = "MarkupSafe-2.1.1-cp38-cp38-musllinux_1_1_x86_64.whl", hash = "sha256:6a074d34ee7a5ce3effbc526b7083ec9731bb3cbf921bbe1d3005d4d2bdb3a63"},
-    {file = "MarkupSafe-2.1.1-cp38-cp38-win32.whl", hash = "sha256:421be9fbf0ffe9ffd7a378aafebbf6f4602d564d34be190fc19a193232fd12b1"},
-    {file = "MarkupSafe-2.1.1-cp38-cp38-win_amd64.whl", hash = "sha256:fc7b548b17d238737688817ab67deebb30e8073c95749d55538ed473130ec0c7"},
-    {file = "MarkupSafe-2.1.1-cp39-cp39-macosx_10_9_universal2.whl", hash = "sha256:e04e26803c9c3851c931eac40c695602c6295b8d432cbe78609649ad9bd2da8a"},
-    {file = "MarkupSafe-2.1.1-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:b87db4360013327109564f0e591bd2a3b318547bcef31b468a92ee504d07ae4f"},
-    {file = "MarkupSafe-2.1.1-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:99a2a507ed3ac881b975a2976d59f38c19386d128e7a9a18b7df6fff1fd4c1d6"},
-    {file = "MarkupSafe-2.1.1-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:56442863ed2b06d19c37f94d999035e15ee982988920e12a5b4ba29b62ad1f77"},
-    {file = "MarkupSafe-2.1.1-cp39-cp39-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:3ce11ee3f23f79dbd06fb3d63e2f6af7b12db1d46932fe7bd8afa259a5996603"},
-    {file = "MarkupSafe-2.1.1-cp39-cp39-musllinux_1_1_aarch64.whl", hash = "sha256:33b74d289bd2f5e527beadcaa3f401e0df0a89927c1559c8566c066fa4248ab7"},
-    {file = "MarkupSafe-2.1.1-cp39-cp39-musllinux_1_1_i686.whl", hash = "sha256:43093fb83d8343aac0b1baa75516da6092f58f41200907ef92448ecab8825135"},
-    {file = "MarkupSafe-2.1.1-cp39-cp39-musllinux_1_1_x86_64.whl", hash = "sha256:8e3dcf21f367459434c18e71b2a9532d96547aef8a871872a5bd69a715c15f96"},
-    {file = "MarkupSafe-2.1.1-cp39-cp39-win32.whl", hash = "sha256:d4306c36ca495956b6d568d276ac11fdd9c30a36f1b6eb928070dc5360b22e1c"},
-    {file = "MarkupSafe-2.1.1-cp39-cp39-win_amd64.whl", hash = "sha256:46d00d6cfecdde84d40e572d63735ef81423ad31184100411e6e3388d405e247"},
-    {file = "MarkupSafe-2.1.1.tar.gz", hash = "sha256:7f91197cc9e48f989d12e4e6fbc46495c446636dfc81b9ccf50bb0ec74b91d4b"},
+    {file = "MarkupSafe-2.1.2-cp310-cp310-macosx_10_9_universal2.whl", hash = "sha256:665a36ae6f8f20a4676b53224e33d456a6f5a72657d9c83c2aa00765072f31f7"},
+    {file = "MarkupSafe-2.1.2-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:340bea174e9761308703ae988e982005aedf427de816d1afe98147668cc03036"},
+    {file = "MarkupSafe-2.1.2-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:22152d00bf4a9c7c83960521fc558f55a1adbc0631fbb00a9471e097b19d72e1"},
+    {file = "MarkupSafe-2.1.2-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:28057e985dace2f478e042eaa15606c7efccb700797660629da387eb289b9323"},
+    {file = "MarkupSafe-2.1.2-cp310-cp310-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:ca244fa73f50a800cf8c3ebf7fd93149ec37f5cb9596aa8873ae2c1d23498601"},
+    {file = "MarkupSafe-2.1.2-cp310-cp310-musllinux_1_1_aarch64.whl", hash = "sha256:d9d971ec1e79906046aa3ca266de79eac42f1dbf3612a05dc9368125952bd1a1"},
+    {file = "MarkupSafe-2.1.2-cp310-cp310-musllinux_1_1_i686.whl", hash = "sha256:7e007132af78ea9df29495dbf7b5824cb71648d7133cf7848a2a5dd00d36f9ff"},
+    {file = "MarkupSafe-2.1.2-cp310-cp310-musllinux_1_1_x86_64.whl", hash = "sha256:7313ce6a199651c4ed9d7e4cfb4aa56fe923b1adf9af3b420ee14e6d9a73df65"},
+    {file = "MarkupSafe-2.1.2-cp310-cp310-win32.whl", hash = "sha256:c4a549890a45f57f1ebf99c067a4ad0cb423a05544accaf2b065246827ed9603"},
+    {file = "MarkupSafe-2.1.2-cp310-cp310-win_amd64.whl", hash = "sha256:835fb5e38fd89328e9c81067fd642b3593c33e1e17e2fdbf77f5676abb14a156"},
+    {file = "MarkupSafe-2.1.2-cp311-cp311-macosx_10_9_universal2.whl", hash = "sha256:2ec4f2d48ae59bbb9d1f9d7efb9236ab81429a764dedca114f5fdabbc3788013"},
+    {file = "MarkupSafe-2.1.2-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:608e7073dfa9e38a85d38474c082d4281f4ce276ac0010224eaba11e929dd53a"},
+    {file = "MarkupSafe-2.1.2-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:65608c35bfb8a76763f37036547f7adfd09270fbdbf96608be2bead319728fcd"},
+    {file = "MarkupSafe-2.1.2-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:f2bfb563d0211ce16b63c7cb9395d2c682a23187f54c3d79bfec33e6705473c6"},
+    {file = "MarkupSafe-2.1.2-cp311-cp311-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:da25303d91526aac3672ee6d49a2f3db2d9502a4a60b55519feb1a4c7714e07d"},
+    {file = "MarkupSafe-2.1.2-cp311-cp311-musllinux_1_1_aarch64.whl", hash = "sha256:9cad97ab29dfc3f0249b483412c85c8ef4766d96cdf9dcf5a1e3caa3f3661cf1"},
+    {file = "MarkupSafe-2.1.2-cp311-cp311-musllinux_1_1_i686.whl", hash = "sha256:085fd3201e7b12809f9e6e9bc1e5c96a368c8523fad5afb02afe3c051ae4afcc"},
+    {file = "MarkupSafe-2.1.2-cp311-cp311-musllinux_1_1_x86_64.whl", hash = "sha256:1bea30e9bf331f3fef67e0a3877b2288593c98a21ccb2cf29b74c581a4eb3af0"},
+    {file = "MarkupSafe-2.1.2-cp311-cp311-win32.whl", hash = "sha256:7df70907e00c970c60b9ef2938d894a9381f38e6b9db73c5be35e59d92e06625"},
+    {file = "MarkupSafe-2.1.2-cp311-cp311-win_amd64.whl", hash = "sha256:e55e40ff0cc8cc5c07996915ad367fa47da6b3fc091fdadca7f5403239c5fec3"},
+    {file = "MarkupSafe-2.1.2-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:a6e40afa7f45939ca356f348c8e23048e02cb109ced1eb8420961b2f40fb373a"},
+    {file = "MarkupSafe-2.1.2-cp37-cp37m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:cf877ab4ed6e302ec1d04952ca358b381a882fbd9d1b07cccbfd61783561f98a"},
+    {file = "MarkupSafe-2.1.2-cp37-cp37m-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:63ba06c9941e46fa389d389644e2d8225e0e3e5ebcc4ff1ea8506dce646f8c8a"},
+    {file = "MarkupSafe-2.1.2-cp37-cp37m-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:f1cd098434e83e656abf198f103a8207a8187c0fc110306691a2e94a78d0abb2"},
+    {file = "MarkupSafe-2.1.2-cp37-cp37m-musllinux_1_1_aarch64.whl", hash = "sha256:55f44b440d491028addb3b88f72207d71eeebfb7b5dbf0643f7c023ae1fba619"},
+    {file = "MarkupSafe-2.1.2-cp37-cp37m-musllinux_1_1_i686.whl", hash = "sha256:a6f2fcca746e8d5910e18782f976489939d54a91f9411c32051b4aab2bd7c513"},
+    {file = "MarkupSafe-2.1.2-cp37-cp37m-musllinux_1_1_x86_64.whl", hash = "sha256:0b462104ba25f1ac006fdab8b6a01ebbfbce9ed37fd37fd4acd70c67c973e460"},
+    {file = "MarkupSafe-2.1.2-cp37-cp37m-win32.whl", hash = "sha256:7668b52e102d0ed87cb082380a7e2e1e78737ddecdde129acadb0eccc5423859"},
+    {file = "MarkupSafe-2.1.2-cp37-cp37m-win_amd64.whl", hash = "sha256:6d6607f98fcf17e534162f0709aaad3ab7a96032723d8ac8750ffe17ae5a0666"},
+    {file = "MarkupSafe-2.1.2-cp38-cp38-macosx_10_9_universal2.whl", hash = "sha256:a806db027852538d2ad7555b203300173dd1b77ba116de92da9afbc3a3be3eed"},
+    {file = "MarkupSafe-2.1.2-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:a4abaec6ca3ad8660690236d11bfe28dfd707778e2442b45addd2f086d6ef094"},
+    {file = "MarkupSafe-2.1.2-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:f03a532d7dee1bed20bc4884194a16160a2de9ffc6354b3878ec9682bb623c54"},
+    {file = "MarkupSafe-2.1.2-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:4cf06cdc1dda95223e9d2d3c58d3b178aa5dacb35ee7e3bbac10e4e1faacb419"},
+    {file = "MarkupSafe-2.1.2-cp38-cp38-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:22731d79ed2eb25059ae3df1dfc9cb1546691cc41f4e3130fe6bfbc3ecbbecfa"},
+    {file = "MarkupSafe-2.1.2-cp38-cp38-musllinux_1_1_aarch64.whl", hash = "sha256:f8ffb705ffcf5ddd0e80b65ddf7bed7ee4f5a441ea7d3419e861a12eaf41af58"},
+    {file = "MarkupSafe-2.1.2-cp38-cp38-musllinux_1_1_i686.whl", hash = "sha256:8db032bf0ce9022a8e41a22598eefc802314e81b879ae093f36ce9ddf39ab1ba"},
+    {file = "MarkupSafe-2.1.2-cp38-cp38-musllinux_1_1_x86_64.whl", hash = "sha256:2298c859cfc5463f1b64bd55cb3e602528db6fa0f3cfd568d3605c50678f8f03"},
+    {file = "MarkupSafe-2.1.2-cp38-cp38-win32.whl", hash = "sha256:50c42830a633fa0cf9e7d27664637532791bfc31c731a87b202d2d8ac40c3ea2"},
+    {file = "MarkupSafe-2.1.2-cp38-cp38-win_amd64.whl", hash = "sha256:bb06feb762bade6bf3c8b844462274db0c76acc95c52abe8dbed28ae3d44a147"},
+    {file = "MarkupSafe-2.1.2-cp39-cp39-macosx_10_9_universal2.whl", hash = "sha256:99625a92da8229df6d44335e6fcc558a5037dd0a760e11d84be2260e6f37002f"},
+    {file = "MarkupSafe-2.1.2-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:8bca7e26c1dd751236cfb0c6c72d4ad61d986e9a41bbf76cb445f69488b2a2bd"},
+    {file = "MarkupSafe-2.1.2-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:40627dcf047dadb22cd25ea7ecfe9cbf3bbbad0482ee5920b582f3809c97654f"},
+    {file = "MarkupSafe-2.1.2-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:40dfd3fefbef579ee058f139733ac336312663c6706d1163b82b3003fb1925c4"},
+    {file = "MarkupSafe-2.1.2-cp39-cp39-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:090376d812fb6ac5f171e5938e82e7f2d7adc2b629101cec0db8b267815c85e2"},
+    {file = "MarkupSafe-2.1.2-cp39-cp39-musllinux_1_1_aarch64.whl", hash = "sha256:2e7821bffe00aa6bd07a23913b7f4e01328c3d5cc0b40b36c0bd81d362faeb65"},
+    {file = "MarkupSafe-2.1.2-cp39-cp39-musllinux_1_1_i686.whl", hash = "sha256:c0a33bc9f02c2b17c3ea382f91b4db0e6cde90b63b296422a939886a7a80de1c"},
+    {file = "MarkupSafe-2.1.2-cp39-cp39-musllinux_1_1_x86_64.whl", hash = "sha256:b8526c6d437855442cdd3d87eede9c425c4445ea011ca38d937db299382e6fa3"},
+    {file = "MarkupSafe-2.1.2-cp39-cp39-win32.whl", hash = "sha256:137678c63c977754abe9086a3ec011e8fd985ab90631145dfb9294ad09c102a7"},
+    {file = "MarkupSafe-2.1.2-cp39-cp39-win_amd64.whl", hash = "sha256:0576fe974b40a400449768941d5d0858cc624e3249dfd1e0c33674e5c7ca7aed"},
+    {file = "MarkupSafe-2.1.2.tar.gz", hash = "sha256:abcabc8c2b26036d62d4c746381a6f7cf60aafcc653198ad678306986b09450d"},
 ]
 
 [[package]]
 name = "mypy-extensions"
-version = "0.4.3"
-description = "Experimental type system extensions for programs checked with the mypy typechecker."
+version = "1.0.0"
+description = "Type system extensions for programs checked with the mypy type checker."
 category = "dev"
 optional = false
-python-versions = "*"
+python-versions = ">=3.5"
 files = [
-    {file = "mypy_extensions-0.4.3-py2.py3-none-any.whl", hash = "sha256:090fedd75945a69ae91ce1303b5824f428daf5a028d2f6ab8a299250a846f15d"},
-    {file = "mypy_extensions-0.4.3.tar.gz", hash = "sha256:2d82818f5bb3e369420cb3c4060a7970edba416647068eb4c5343488a6c604a8"},
+    {file = "mypy_extensions-1.0.0-py3-none-any.whl", hash = "sha256:4392f6c0eb8a5668a69e23d168ffa70f0be9ccfd32b5cc2d26a34ae5b844552d"},
+    {file = "mypy_extensions-1.0.0.tar.gz", hash = "sha256:75dbf8955dc00442a438fc4d0666508a9a97b6bd41aa2f0ffe9d2f2725af0782"},
 ]
 
 [[package]]
@@ -538,31 +647,31 @@ files = [
 
 [[package]]
 name = "pathspec"
-version = "0.10.1"
+version = "0.11.0"
 description = "Utility library for gitignore style pattern matching of file paths."
 category = "dev"
 optional = false
 python-versions = ">=3.7"
 files = [
-    {file = "pathspec-0.10.1-py3-none-any.whl", hash = "sha256:46846318467efc4556ccfd27816e004270a9eeeeb4d062ce5e6fc7a87c573f93"},
-    {file = "pathspec-0.10.1.tar.gz", hash = "sha256:7ace6161b621d31e7902eb6b5ae148d12cfd23f4a249b9ffb6b9fee12084323d"},
+    {file = "pathspec-0.11.0-py3-none-any.whl", hash = "sha256:3a66eb970cbac598f9e5ccb5b2cf58930cd8e3ed86d393d541eaf2d8b1705229"},
+    {file = "pathspec-0.11.0.tar.gz", hash = "sha256:64d338d4e0914e91c1792321e6907b5a593f1ab1851de7fc269557a21b30ebbc"},
 ]
 
 [[package]]
 name = "platformdirs"
-version = "2.6.2"
+version = "3.0.0"
 description = "A small Python package for determining appropriate platform-specific dirs, e.g. a \"user data dir\"."
 category = "dev"
 optional = false
 python-versions = ">=3.7"
 files = [
-    {file = "platformdirs-2.6.2-py3-none-any.whl", hash = "sha256:83c8f6d04389165de7c9b6f0c682439697887bca0aa2f1c87ef1826be3584490"},
-    {file = "platformdirs-2.6.2.tar.gz", hash = "sha256:e1fea1fe471b9ff8332e229df3cb7de4f53eeea4998d3b6bfff542115e998bd2"},
+    {file = "platformdirs-3.0.0-py3-none-any.whl", hash = "sha256:b1d5eb14f221506f50d6604a561f4c5786d9e80355219694a1b244bcd96f4567"},
+    {file = "platformdirs-3.0.0.tar.gz", hash = "sha256:8a1228abb1ef82d788f74139988b137e78692984ec7b08eaa6c65f1723af28f9"},
 ]
 
 [package.extras]
-docs = ["furo (>=2022.12.7)", "proselint (>=0.13)", "sphinx (>=5.3)", "sphinx-autodoc-typehints (>=1.19.5)"]
-test = ["appdirs (==1.4.4)", "covdefaults (>=2.2.2)", "pytest (>=7.2)", "pytest-cov (>=4)", "pytest-mock (>=3.10)"]
+docs = ["furo (>=2022.12.7)", "proselint (>=0.13)", "sphinx (>=6.1.3)", "sphinx-autodoc-typehints (>=1.22,!=1.23.4)"]
+test = ["appdirs (==1.4.4)", "covdefaults (>=2.2.2)", "pytest (>=7.2.1)", "pytest-cov (>=4)", "pytest-mock (>=3.10)"]
 
 [[package]]
 name = "pluggy"
@@ -582,14 +691,14 @@ testing = ["pytest", "pytest-benchmark"]
 
 [[package]]
 name = "pre-commit"
-version = "2.21.0"
+version = "3.0.4"
 description = "A framework for managing and maintaining multi-language pre-commit hooks."
 category = "dev"
 optional = false
-python-versions = ">=3.7"
+python-versions = ">=3.8"
 files = [
-    {file = "pre_commit-2.21.0-py2.py3-none-any.whl", hash = "sha256:e2f91727039fc39a92f58a588a25b87f936de6567eed4f0e673e0507edc75bad"},
-    {file = "pre_commit-2.21.0.tar.gz", hash = "sha256:31ef31af7e474a8d8995027fefdfcf509b5c913ff31f2015b4ec4beb26a6f658"},
+    {file = "pre_commit-3.0.4-py2.py3-none-any.whl", hash = "sha256:9e3255edb0c9e7fe9b4f328cb3dc86069f8fdc38026f1bf521018a05eaf4d67b"},
+    {file = "pre_commit-3.0.4.tar.gz", hash = "sha256:bc4687478d55578c4ac37272fe96df66f73d9b5cf81be6f28627d4e712e752d5"},
 ]
 
 [package.dependencies]
@@ -601,14 +710,14 @@ virtualenv = ">=20.10.0"
 
 [[package]]
 name = "pyproject-api"
-version = "1.4.0"
+version = "1.5.0"
 description = "API to interact with the python pyproject.toml based projects"
 category = "dev"
 optional = false
 python-versions = ">=3.7"
 files = [
-    {file = "pyproject_api-1.4.0-py3-none-any.whl", hash = "sha256:c34226297781efdd1ba4dfb74ce21076d9a8360e2125ea31803c1a02c76b2460"},
-    {file = "pyproject_api-1.4.0.tar.gz", hash = "sha256:ac85c1f82e0291dbae5a7739dbb9a990e11ee4034c9b5599ea714f07a24ecd71"},
+    {file = "pyproject_api-1.5.0-py3-none-any.whl", hash = "sha256:4c111277dfb96bcd562c6245428f27250b794bfe3e210b8714c4f893952f2c17"},
+    {file = "pyproject_api-1.5.0.tar.gz", hash = "sha256:0962df21f3e633b8ddb9567c011e6c1b3dcdfc31b7860c0ede7e24c5a1200fbe"},
 ]
 
 [package.dependencies]
@@ -621,14 +730,14 @@ testing = ["covdefaults (>=2.2.2)", "importlib-metadata (>=5.1)", "pytest (>=7.2
 
 [[package]]
 name = "pytest"
-version = "7.2.0"
+version = "7.2.1"
 description = "pytest: simple powerful testing with Python"
 category = "dev"
 optional = false
 python-versions = ">=3.7"
 files = [
-    {file = "pytest-7.2.0-py3-none-any.whl", hash = "sha256:892f933d339f068883b6fd5a459f03d85bfcb355e4981e146d2c7616c21fef71"},
-    {file = "pytest-7.2.0.tar.gz", hash = "sha256:c4014eb40e10f11f355ad4e3c2fb2c6c6d1919c73f3b5a433de4708202cade59"},
+    {file = "pytest-7.2.1-py3-none-any.whl", hash = "sha256:c7c6ca206e93355074ae32f7403e8ea12163b1163c976fee7d4d84027c162be5"},
+    {file = "pytest-7.2.1.tar.gz", hash = "sha256:d45e0952f3727241918b8fd0f376f5ff6b301cc0777c6f9a556935c92d8a7d42"},
 ]
 
 [package.dependencies]
@@ -664,14 +773,14 @@ testing = ["fields", "hunter", "process-tests", "pytest-xdist", "six", "virtuale
 
 [[package]]
 name = "pytest-xdist"
-version = "3.1.0"
+version = "3.2.0"
 description = "pytest xdist plugin for distributed testing, most importantly across multiple CPUs"
 category = "dev"
 optional = false
 python-versions = ">=3.7"
 files = [
-    {file = "pytest-xdist-3.1.0.tar.gz", hash = "sha256:40fdb8f3544921c5dfcd486ac080ce22870e71d82ced6d2e78fa97c2addd480c"},
-    {file = "pytest_xdist-3.1.0-py3-none-any.whl", hash = "sha256:70a76f191d8a1d2d6be69fc440cdf85f3e4c03c08b520fd5dc5d338d6cf07d89"},
+    {file = "pytest-xdist-3.2.0.tar.gz", hash = "sha256:fa10f95a2564cd91652f2d132725183c3b590d9fdcdec09d3677386ecf4c1ce9"},
+    {file = "pytest_xdist-3.2.0-py3-none-any.whl", hash = "sha256:336098e3bbd8193276867cc87db8b22903c3927665dff9d1ac8684c02f597b68"},
 ]
 
 [package.dependencies]
@@ -700,14 +809,14 @@ six = ">=1.5"
 
 [[package]]
 name = "python-dotenv"
-version = "0.21.0"
+version = "0.21.1"
 description = "Read key-value pairs from a .env file and set them as environment variables"
 category = "dev"
 optional = false
 python-versions = ">=3.7"
 files = [
-    {file = "python-dotenv-0.21.0.tar.gz", hash = "sha256:b77d08274639e3d34145dfa6c7008e66df0f04b7be7a75fd0d5292c191d79045"},
-    {file = "python_dotenv-0.21.0-py3-none-any.whl", hash = "sha256:1684eb44636dd462b66c3ee016599815514527ad99965de77f43e0944634a7e5"},
+    {file = "python-dotenv-0.21.1.tar.gz", hash = "sha256:1c93de8f636cde3ce377292818d0e440b6e45a82f215c3744979151fa8151c49"},
+    {file = "python_dotenv-0.21.1-py3-none-any.whl", hash = "sha256:41e12e0318bebc859fcc4d97d4db8d20ad21721a6aa5047dd59f090391cb549a"},
 ]
 
 [package.extras]
@@ -715,14 +824,14 @@ cli = ["click (>=5.0)"]
 
 [[package]]
 name = "python-slugify"
-version = "6.1.2"
+version = "8.0.0"
 description = "A Python slugify application that also handles Unicode"
 category = "dev"
 optional = false
-python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*, !=3.5.*"
+python-versions = ">=3.7"
 files = [
-    {file = "python-slugify-6.1.2.tar.gz", hash = "sha256:272d106cb31ab99b3496ba085e3fea0e9e76dcde967b5e9992500d1f785ce4e1"},
-    {file = "python_slugify-6.1.2-py2.py3-none-any.whl", hash = "sha256:7b2c274c308b62f4269a9ba701aa69a797e9bca41aeee5b3a9e79e36b6656927"},
+    {file = "python-slugify-8.0.0.tar.gz", hash = "sha256:f1da83f3c7ab839b3f84543470cd95bdb5a81f1a0b80fed502f78b7dca256062"},
+    {file = "python_slugify-8.0.0-py2.py3-none-any.whl", hash = "sha256:51f217508df20a6c166c7821683384b998560adcf8f19a6c2ca8b460528ccd9c"},
 ]
 
 [package.dependencies]
@@ -805,18 +914,18 @@ use-chardet-on-py3 = ["chardet (>=3.0.2,<6)"]
 
 [[package]]
 name = "setuptools"
-version = "65.5.1"
+version = "67.2.0"
 description = "Easily download, build, install, upgrade, and uninstall Python packages"
 category = "dev"
 optional = false
 python-versions = ">=3.7"
 files = [
-    {file = "setuptools-65.5.1-py3-none-any.whl", hash = "sha256:d0b9a8433464d5800cbe05094acf5c6d52a91bfac9b52bcfc4d41382be5d5d31"},
-    {file = "setuptools-65.5.1.tar.gz", hash = "sha256:e197a19aa8ec9722928f2206f8de752def0e4c9fc6953527360d1c36d94ddb2f"},
+    {file = "setuptools-67.2.0-py3-none-any.whl", hash = "sha256:16ccf598aab3b506593c17378473978908a2734d7336755a8769b480906bec1c"},
+    {file = "setuptools-67.2.0.tar.gz", hash = "sha256:b440ee5f7e607bb8c9de15259dba2583dd41a38879a7abc1d43a71c59524da48"},
 ]
 
 [package.extras]
-docs = ["furo", "jaraco.packaging (>=9)", "jaraco.tidelift (>=1.4)", "pygments-github-lexers (==0.0.5)", "rst.linker (>=1.9)", "sphinx (>=3.5)", "sphinx-favicon", "sphinx-hoverxref (<2)", "sphinx-inline-tabs", "sphinx-notfound-page (==0.8.3)", "sphinx-reredirects", "sphinxcontrib-towncrier"]
+docs = ["furo", "jaraco.packaging (>=9)", "jaraco.tidelift (>=1.4)", "pygments-github-lexers (==0.0.5)", "rst.linker (>=1.9)", "sphinx (>=3.5)", "sphinx-favicon", "sphinx-hoverxref (<2)", "sphinx-inline-tabs", "sphinx-lint", "sphinx-notfound-page (==0.8.3)", "sphinx-reredirects", "sphinxcontrib-towncrier"]
 testing = ["build[virtualenv]", "filelock (>=3.4.0)", "flake8 (<5)", "flake8-2020", "ini2toml[lite] (>=0.9)", "jaraco.envs (>=2.2)", "jaraco.path (>=3.2.0)", "pip (>=19.1)", "pip-run (>=8.8)", "pytest (>=6)", "pytest-black (>=0.3.7)", "pytest-checkdocs (>=2.4)", "pytest-cov", "pytest-enabler (>=1.3)", "pytest-flake8", "pytest-mypy (>=0.9.1)", "pytest-perf", "pytest-timeout", "pytest-xdist", "tomli-w (>=1.0.0)", "virtualenv (>=13.0.0)", "wheel"]
 testing-integration = ["build[virtualenv]", "filelock (>=3.4.0)", "jaraco.envs (>=2.2)", "jaraco.path (>=3.2.0)", "pytest", "pytest-enabler", "pytest-xdist", "tomli", "virtualenv (>=13.0.0)", "wheel"]
 
@@ -870,31 +979,31 @@ files = [
 
 [[package]]
 name = "tox"
-version = "4.2.8"
+version = "4.4.5"
 description = "tox is a generic virtualenv management and test command line tool"
 category = "dev"
 optional = false
 python-versions = ">=3.7"
 files = [
-    {file = "tox-4.2.8-py3-none-any.whl", hash = "sha256:e9d5006a533d280e2ca26e3ca61052ffa55a65b683486f92d12563a14a9b7a4f"},
-    {file = "tox-4.2.8.tar.gz", hash = "sha256:7c31940d755355210151e8bef23feab3d714a8a4795e513c454ff0baccd995b1"},
+    {file = "tox-4.4.5-py3-none-any.whl", hash = "sha256:1081864f1a1393ffa11ebe9beaa280349020579310d217a594a4e7b6124c5425"},
+    {file = "tox-4.4.5.tar.gz", hash = "sha256:f9bc83c5da8666baa2a4d4e884bbbda124fe646e4b1c0e412949cecc2b6e8f90"},
 ]
 
 [package.dependencies]
-cachetools = ">=5.2.1"
+cachetools = ">=5.3"
 chardet = ">=5.1"
 colorama = ">=0.4.6"
 filelock = ">=3.9"
 packaging = ">=23"
 platformdirs = ">=2.6.2"
 pluggy = ">=1"
-pyproject-api = ">=1.4"
+pyproject-api = ">=1.5"
 tomli = {version = ">=2.0.1", markers = "python_version < \"3.11\""}
 virtualenv = ">=20.17.1"
 
 [package.extras]
-docs = ["furo (>=2022.12.7)", "sphinx (>=6.1.3)", "sphinx-argparse-cli (>=1.11)", "sphinx-autodoc-typehints (>=1.20.1)", "sphinx-copybutton (>=0.5.1)", "sphinx-inline-tabs (>=2022.1.2b11)", "sphinxcontrib-towncrier (>=0.2.1a0)", "towncrier (>=22.12)"]
-testing = ["build[virtualenv] (>=0.9)", "covdefaults (>=2.2.2)", "devpi-process (>=0.3)", "diff-cover (>=7.3)", "distlib (>=0.3.6)", "flaky (>=3.7)", "hatch-vcs (>=0.3)", "hatchling (>=1.12.2)", "psutil (>=5.9.4)", "pytest (>=7.2)", "pytest-cov (>=4)", "pytest-mock (>=3.10)", "pytest-xdist (>=3.1)", "re-assert (>=1.1)", "time-machine (>=2.8.2)", "wheel (>=0.38.4)"]
+docs = ["furo (>=2022.12.7)", "sphinx (>=6.1.3)", "sphinx-argparse-cli (>=1.11)", "sphinx-autodoc-typehints (>=1.22,!=1.23.4)", "sphinx-copybutton (>=0.5.1)", "sphinx-inline-tabs (>=2022.1.2b11)", "sphinxcontrib-towncrier (>=0.2.1a0)", "towncrier (>=22.12)"]
+testing = ["build[virtualenv] (>=0.10)", "covdefaults (>=2.2.2)", "devpi-process (>=0.3)", "diff-cover (>=7.4)", "distlib (>=0.3.6)", "flaky (>=3.7)", "hatch-vcs (>=0.3)", "hatchling (>=1.12.2)", "psutil (>=5.9.4)", "pytest (>=7.2.1)", "pytest-cov (>=4)", "pytest-mock (>=3.10)", "pytest-xdist (>=3.1)", "re-assert (>=1.1)", "time-machine (>=2.9)", "wheel (>=0.38.4)"]
 
 [[package]]
 name = "tqdm"
@@ -919,14 +1028,14 @@ telegram = ["requests"]
 
 [[package]]
 name = "urllib3"
-version = "1.26.12"
+version = "1.26.14"
 description = "HTTP library with thread-safe connection pooling, file post, and more."
 category = "main"
 optional = false
-python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*, !=3.5.*, <4"
+python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*, !=3.5.*"
 files = [
-    {file = "urllib3-1.26.12-py2.py3-none-any.whl", hash = "sha256:b930dd878d5a8afb066a637fbb35144fe7901e3b209d1cd4f524bd0e9deee997"},
-    {file = "urllib3-1.26.12.tar.gz", hash = "sha256:3fa96cf423e6987997fc326ae8df396db2a8b7c667747d47ddd8ecba91f4a74e"},
+    {file = "urllib3-1.26.14-py2.py3-none-any.whl", hash = "sha256:75edcdc2f7d85b137124a6c3c9fc3933cdeaa12ecb9a6a959f22797a0feca7e1"},
+    {file = "urllib3-1.26.14.tar.gz", hash = "sha256:076907bf8fd355cde77728471316625a4d2f7e713c125f51953bb5b3eecf4f72"},
 ]
 
 [package.extras]
@@ -936,26 +1045,26 @@ socks = ["PySocks (>=1.5.6,!=1.5.7,<2.0)"]
 
 [[package]]
 name = "virtualenv"
-version = "20.17.1"
+version = "20.19.0"
 description = "Virtual Python Environment builder"
 category = "dev"
 optional = false
-python-versions = ">=3.6"
+python-versions = ">=3.7"
 files = [
-    {file = "virtualenv-20.17.1-py3-none-any.whl", hash = "sha256:ce3b1684d6e1a20a3e5ed36795a97dfc6af29bc3970ca8dab93e11ac6094b3c4"},
-    {file = "virtualenv-20.17.1.tar.gz", hash = "sha256:f8b927684efc6f1cc206c9db297a570ab9ad0e51c16fa9e45487d36d1905c058"},
+    {file = "virtualenv-20.19.0-py3-none-any.whl", hash = "sha256:54eb59e7352b573aa04d53f80fc9736ed0ad5143af445a1e539aada6eb947dd1"},
+    {file = "virtualenv-20.19.0.tar.gz", hash = "sha256:37a640ba82ed40b226599c522d411e4be5edb339a0c0de030c0dc7b646d61590"},
 ]
 
 [package.dependencies]
 distlib = ">=0.3.6,<1"
 filelock = ">=3.4.1,<4"
-platformdirs = ">=2.4,<3"
+platformdirs = ">=2.4,<4"
 
 [package.extras]
-docs = ["proselint (>=0.13)", "sphinx (>=5.3)", "sphinx-argparse (>=0.3.2)", "sphinx-rtd-theme (>=1)", "towncrier (>=22.8)"]
-testing = ["coverage (>=6.2)", "coverage-enable-subprocess (>=1)", "flaky (>=3.7)", "packaging (>=21.3)", "pytest (>=7.0.1)", "pytest-env (>=0.6.2)", "pytest-freezegun (>=0.4.2)", "pytest-mock (>=3.6.1)", "pytest-randomly (>=3.10.3)", "pytest-timeout (>=2.1)"]
+docs = ["furo (>=2022.12.7)", "proselint (>=0.13)", "sphinx (>=6.1.3)", "sphinx-argparse (>=0.4)", "sphinxcontrib-towncrier (>=0.2.1a0)", "towncrier (>=22.12)"]
+test = ["covdefaults (>=2.2.2)", "coverage (>=7.1)", "coverage-enable-subprocess (>=1)", "flaky (>=3.7)", "packaging (>=23)", "pytest (>=7.2.1)", "pytest-env (>=0.8.1)", "pytest-freezegun (>=0.4.2)", "pytest-mock (>=3.10)", "pytest-randomly (>=3.12)", "pytest-timeout (>=2.1)"]
 
 [metadata]
 lock-version = "2.0"
 python-versions = "^3.10"
-content-hash = "bea39f9c228f060e93b817740d7f17721211302a202f8a7498a54a99053bc237"
+content-hash = "90732d2a098b42b1095eea2bfe344bd5f44460429c8965ec96e3f8fd47a9dc8c"
diff --git a/pyproject.toml b/pyproject.toml
index 7c615298..5a1b72aa 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -10,19 +10,19 @@ python = "^3.10"
 anytree = "^2.8.0"
 click = "^8.1.3"
 requests = "^2.28.2"
-beautifulsoup4 = "^4.11.1"
-tqdm = "^4.64.0"
+beautifulsoup4 = "^4.11.2"
+tqdm = "^4.64.1"
 
 [tool.poetry.dev-dependencies]
-black = "^22.12"
+black = "^23.1.0"
 cookiecutter = "^2.1.1"
-pytest = "^7.2.0"
+pytest = "^7.2.1"
 pytest-cov = "^4.0.0"
-pytest-xdist = "^3.1.0"
-python-dotenv = "^0.21.0"
-tox = "^4.2.8"
-pre-commit = "^2.21.0"
-isort = "^5.11.4"
+pytest-xdist = "^3.2.0"
+python-dotenv = "^0.21.1"
+tox = "^4.4.5"
+pre-commit = "^3.0.4"
+isort = "^5.12.0"
 
 [tool.poetry.scripts]
 adventofcode = "adventofcode2021.main:main"
diff --git a/src/adventofcode2021/solutions/day02.py b/src/adventofcode2021/solutions/day02.py
index ba9faf33..b04bdd59 100644
--- a/src/adventofcode2021/solutions/day02.py
+++ b/src/adventofcode2021/solutions/day02.py
@@ -29,7 +29,6 @@ def solve(self, input_data: str) -> int:
         depth = position = aim = 0
 
         for line in [line for line in input_data.split("\n") if line]:
-
             direction, movement = line.split(" ")[0], int(line.split(" ")[1])
             match direction:
                 case "down":

From f30e7a8025478f508fb0927a886c8c33fe64e22e Mon Sep 17 00:00:00 2001
From: Roel Adriaans <roel.adriaans@ordina.nl>
Date: Wed, 8 Feb 2023 19:14:04 +0100
Subject: [PATCH 278/371] Update deps!

---
 .pre-commit-config.yaml |   4 +-
 poetry.lock             | 447 +++++++++++++++++++++++++---------------
 pyproject.toml          |  10 +-
 3 files changed, 284 insertions(+), 177 deletions(-)

diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index fbd22a9b..c4297182 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -2,7 +2,7 @@
 
 repos:
   - repo: https://github.com/ambv/black
-    rev: 22.12.0
+    rev: 23.1.0
     hooks:
     - id: black
       language_version: 'python3.10'
@@ -14,7 +14,7 @@ repos:
       args: ["--ignore", "E203,W503"]
 
   - repo: https://github.com/PyCQA/isort
-    rev: 5.11.4
+    rev: 5.12.0
     hooks:
     - id: isort
 
diff --git a/poetry.lock b/poetry.lock
index 7c021b9b..7f22ce16 100644
--- a/poetry.lock
+++ b/poetry.lock
@@ -55,14 +55,14 @@ tests-no-zope = ["cloudpickle", "cloudpickle", "hypothesis", "hypothesis", "mypy
 
 [[package]]
 name = "beautifulsoup4"
-version = "4.11.1"
+version = "4.11.2"
 description = "Screen-scraping library"
 category = "main"
 optional = false
 python-versions = ">=3.6.0"
 files = [
-    {file = "beautifulsoup4-4.11.1-py3-none-any.whl", hash = "sha256:58d5c3d29f5a36ffeb94f02f0d786cd53014cf9b3b3951d42e0080d8a9498d30"},
-    {file = "beautifulsoup4-4.11.1.tar.gz", hash = "sha256:ad9aa55b65ef2808eb405f46cf74df7fcb7044d5cbc26487f96eb2ef2e436693"},
+    {file = "beautifulsoup4-4.11.2-py3-none-any.whl", hash = "sha256:0e79446b10b3ecb499c1556f7e228a53e64a2bfcebd455f370d8927cb5b59e39"},
+    {file = "beautifulsoup4-4.11.2.tar.gz", hash = "sha256:bc4bdda6717de5a2987436fb8d72f45dc90dd856bdfd512a1314ce90349a0106"},
 ]
 
 [package.dependencies]
@@ -89,29 +89,43 @@ chardet = ">=3.0.2"
 
 [[package]]
 name = "black"
-version = "22.12.0"
+version = "23.1.0"
 description = "The uncompromising code formatter."
 category = "dev"
 optional = false
 python-versions = ">=3.7"
 files = [
-    {file = "black-22.12.0-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:9eedd20838bd5d75b80c9f5487dbcb06836a43833a37846cf1d8c1cc01cef59d"},
-    {file = "black-22.12.0-cp310-cp310-win_amd64.whl", hash = "sha256:159a46a4947f73387b4d83e87ea006dbb2337eab6c879620a3ba52699b1f4351"},
-    {file = "black-22.12.0-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:d30b212bffeb1e252b31dd269dfae69dd17e06d92b87ad26e23890f3efea366f"},
-    {file = "black-22.12.0-cp311-cp311-win_amd64.whl", hash = "sha256:7412e75863aa5c5411886804678b7d083c7c28421210180d67dfd8cf1221e1f4"},
-    {file = "black-22.12.0-cp37-cp37m-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:c116eed0efb9ff870ded8b62fe9f28dd61ef6e9ddd28d83d7d264a38417dcee2"},
-    {file = "black-22.12.0-cp37-cp37m-win_amd64.whl", hash = "sha256:1f58cbe16dfe8c12b7434e50ff889fa479072096d79f0a7f25e4ab8e94cd8350"},
-    {file = "black-22.12.0-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:77d86c9f3db9b1bf6761244bc0b3572a546f5fe37917a044e02f3166d5aafa7d"},
-    {file = "black-22.12.0-cp38-cp38-win_amd64.whl", hash = "sha256:82d9fe8fee3401e02e79767016b4907820a7dc28d70d137eb397b92ef3cc5bfc"},
-    {file = "black-22.12.0-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:101c69b23df9b44247bd88e1d7e90154336ac4992502d4197bdac35dd7ee3320"},
-    {file = "black-22.12.0-cp39-cp39-win_amd64.whl", hash = "sha256:559c7a1ba9a006226f09e4916060982fd27334ae1998e7a38b3f33a37f7a2148"},
-    {file = "black-22.12.0-py3-none-any.whl", hash = "sha256:436cc9167dd28040ad90d3b404aec22cedf24a6e4d7de221bec2730ec0c97bcf"},
-    {file = "black-22.12.0.tar.gz", hash = "sha256:229351e5a18ca30f447bf724d007f890f97e13af070bb6ad4c0a441cd7596a2f"},
+    {file = "black-23.1.0-cp310-cp310-macosx_10_16_arm64.whl", hash = "sha256:b6a92a41ee34b883b359998f0c8e6eb8e99803aa8bf3123bf2b2e6fec505a221"},
+    {file = "black-23.1.0-cp310-cp310-macosx_10_16_universal2.whl", hash = "sha256:57c18c5165c1dbe291d5306e53fb3988122890e57bd9b3dcb75f967f13411a26"},
+    {file = "black-23.1.0-cp310-cp310-macosx_10_16_x86_64.whl", hash = "sha256:9880d7d419bb7e709b37e28deb5e68a49227713b623c72b2b931028ea65f619b"},
+    {file = "black-23.1.0-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:e6663f91b6feca5d06f2ccd49a10f254f9298cc1f7f49c46e498a0771b507104"},
+    {file = "black-23.1.0-cp310-cp310-win_amd64.whl", hash = "sha256:9afd3f493666a0cd8f8df9a0200c6359ac53940cbde049dcb1a7eb6ee2dd7074"},
+    {file = "black-23.1.0-cp311-cp311-macosx_10_16_arm64.whl", hash = "sha256:bfffba28dc52a58f04492181392ee380e95262af14ee01d4bc7bb1b1c6ca8d27"},
+    {file = "black-23.1.0-cp311-cp311-macosx_10_16_universal2.whl", hash = "sha256:c1c476bc7b7d021321e7d93dc2cbd78ce103b84d5a4cf97ed535fbc0d6660648"},
+    {file = "black-23.1.0-cp311-cp311-macosx_10_16_x86_64.whl", hash = "sha256:382998821f58e5c8238d3166c492139573325287820963d2f7de4d518bd76958"},
+    {file = "black-23.1.0-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:2bf649fda611c8550ca9d7592b69f0637218c2369b7744694c5e4902873b2f3a"},
+    {file = "black-23.1.0-cp311-cp311-win_amd64.whl", hash = "sha256:121ca7f10b4a01fd99951234abdbd97728e1240be89fde18480ffac16503d481"},
+    {file = "black-23.1.0-cp37-cp37m-macosx_10_16_x86_64.whl", hash = "sha256:a8471939da5e824b891b25751955be52ee7f8a30a916d570a5ba8e0f2eb2ecad"},
+    {file = "black-23.1.0-cp37-cp37m-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:8178318cb74f98bc571eef19068f6ab5613b3e59d4f47771582f04e175570ed8"},
+    {file = "black-23.1.0-cp37-cp37m-win_amd64.whl", hash = "sha256:a436e7881d33acaf2536c46a454bb964a50eff59b21b51c6ccf5a40601fbef24"},
+    {file = "black-23.1.0-cp38-cp38-macosx_10_16_arm64.whl", hash = "sha256:a59db0a2094d2259c554676403fa2fac3473ccf1354c1c63eccf7ae65aac8ab6"},
+    {file = "black-23.1.0-cp38-cp38-macosx_10_16_universal2.whl", hash = "sha256:0052dba51dec07ed029ed61b18183942043e00008ec65d5028814afaab9a22fd"},
+    {file = "black-23.1.0-cp38-cp38-macosx_10_16_x86_64.whl", hash = "sha256:49f7b39e30f326a34b5c9a4213213a6b221d7ae9d58ec70df1c4a307cf2a1580"},
+    {file = "black-23.1.0-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:162e37d49e93bd6eb6f1afc3e17a3d23a823042530c37c3c42eeeaf026f38468"},
+    {file = "black-23.1.0-cp38-cp38-win_amd64.whl", hash = "sha256:8b70eb40a78dfac24842458476135f9b99ab952dd3f2dab738c1881a9b38b753"},
+    {file = "black-23.1.0-cp39-cp39-macosx_10_16_arm64.whl", hash = "sha256:a29650759a6a0944e7cca036674655c2f0f63806ddecc45ed40b7b8aa314b651"},
+    {file = "black-23.1.0-cp39-cp39-macosx_10_16_universal2.whl", hash = "sha256:bb460c8561c8c1bec7824ecbc3ce085eb50005883a6203dcfb0122e95797ee06"},
+    {file = "black-23.1.0-cp39-cp39-macosx_10_16_x86_64.whl", hash = "sha256:c91dfc2c2a4e50df0026f88d2215e166616e0c80e86004d0003ece0488db2739"},
+    {file = "black-23.1.0-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:2a951cc83ab535d248c89f300eccbd625e80ab880fbcfb5ac8afb5f01a258ac9"},
+    {file = "black-23.1.0-cp39-cp39-win_amd64.whl", hash = "sha256:0680d4380db3719ebcfb2613f34e86c8e6d15ffeabcf8ec59355c5e7b85bb555"},
+    {file = "black-23.1.0-py3-none-any.whl", hash = "sha256:7a0f701d314cfa0896b9001df70a530eb2472babb76086344e688829efd97d32"},
+    {file = "black-23.1.0.tar.gz", hash = "sha256:b0bd97bea8903f5a2ba7219257a44e3f1f9d00073d6cc1add68f0beec69692ac"},
 ]
 
 [package.dependencies]
 click = ">=8.0.0"
 mypy-extensions = ">=0.4.3"
+packaging = ">=22.0"
 pathspec = ">=0.9.0"
 platformdirs = ">=2"
 
@@ -123,14 +137,14 @@ uvloop = ["uvloop (>=0.15.2)"]
 
 [[package]]
 name = "cachetools"
-version = "5.2.1"
+version = "5.3.0"
 description = "Extensible memoizing collections and decorators"
 category = "dev"
 optional = false
 python-versions = "~=3.7"
 files = [
-    {file = "cachetools-5.2.1-py3-none-any.whl", hash = "sha256:8462eebf3a6c15d25430a8c27c56ac61340b2ecf60c9ce57afc2b97e450e47da"},
-    {file = "cachetools-5.2.1.tar.gz", hash = "sha256:5991bc0e08a1319bb618d3195ca5b6bc76646a49c21d55962977197b301cc1fe"},
+    {file = "cachetools-5.3.0-py3-none-any.whl", hash = "sha256:429e1a1e845c008ea6c85aa35d4b98b65d6a9763eeef3e37e92728a12d1de9d4"},
+    {file = "cachetools-5.3.0.tar.gz", hash = "sha256:13dfddc7b8df938c21a940dfa6557ce6e94a2f1cdfa58eb90c805721d58f2c14"},
 ]
 
 [[package]]
@@ -171,19 +185,102 @@ files = [
 
 [[package]]
 name = "charset-normalizer"
-version = "2.1.1"
+version = "3.0.1"
 description = "The Real First Universal Charset Detector. Open, modern and actively maintained alternative to Chardet."
 category = "main"
 optional = false
-python-versions = ">=3.6.0"
+python-versions = "*"
 files = [
-    {file = "charset-normalizer-2.1.1.tar.gz", hash = "sha256:5a3d016c7c547f69d6f81fb0db9449ce888b418b5b9952cc5e6e66843e9dd845"},
-    {file = "charset_normalizer-2.1.1-py3-none-any.whl", hash = "sha256:83e9a75d1911279afd89352c68b45348559d1fc0506b054b346651b5e7fee29f"},
+    {file = "charset-normalizer-3.0.1.tar.gz", hash = "sha256:ebea339af930f8ca5d7a699b921106c6e29c617fe9606fa7baa043c1cdae326f"},
+    {file = "charset_normalizer-3.0.1-cp310-cp310-macosx_10_9_universal2.whl", hash = "sha256:88600c72ef7587fe1708fd242b385b6ed4b8904976d5da0893e31df8b3480cb6"},
+    {file = "charset_normalizer-3.0.1-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:c75ffc45f25324e68ab238cb4b5c0a38cd1c3d7f1fb1f72b5541de469e2247db"},
+    {file = "charset_normalizer-3.0.1-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:db72b07027db150f468fbada4d85b3b2729a3db39178abf5c543b784c1254539"},
+    {file = "charset_normalizer-3.0.1-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:62595ab75873d50d57323a91dd03e6966eb79c41fa834b7a1661ed043b2d404d"},
+    {file = "charset_normalizer-3.0.1-cp310-cp310-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:ff6f3db31555657f3163b15a6b7c6938d08df7adbfc9dd13d9d19edad678f1e8"},
+    {file = "charset_normalizer-3.0.1-cp310-cp310-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:772b87914ff1152b92a197ef4ea40efe27a378606c39446ded52c8f80f79702e"},
+    {file = "charset_normalizer-3.0.1-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:70990b9c51340e4044cfc394a81f614f3f90d41397104d226f21e66de668730d"},
+    {file = "charset_normalizer-3.0.1-cp310-cp310-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:292d5e8ba896bbfd6334b096e34bffb56161c81408d6d036a7dfa6929cff8783"},
+    {file = "charset_normalizer-3.0.1-cp310-cp310-musllinux_1_1_aarch64.whl", hash = "sha256:2edb64ee7bf1ed524a1da60cdcd2e1f6e2b4f66ef7c077680739f1641f62f555"},
+    {file = "charset_normalizer-3.0.1-cp310-cp310-musllinux_1_1_i686.whl", hash = "sha256:31a9ddf4718d10ae04d9b18801bd776693487cbb57d74cc3458a7673f6f34639"},
+    {file = "charset_normalizer-3.0.1-cp310-cp310-musllinux_1_1_ppc64le.whl", hash = "sha256:44ba614de5361b3e5278e1241fda3dc1838deed864b50a10d7ce92983797fa76"},
+    {file = "charset_normalizer-3.0.1-cp310-cp310-musllinux_1_1_s390x.whl", hash = "sha256:12db3b2c533c23ab812c2b25934f60383361f8a376ae272665f8e48b88e8e1c6"},
+    {file = "charset_normalizer-3.0.1-cp310-cp310-musllinux_1_1_x86_64.whl", hash = "sha256:c512accbd6ff0270939b9ac214b84fb5ada5f0409c44298361b2f5e13f9aed9e"},
+    {file = "charset_normalizer-3.0.1-cp310-cp310-win32.whl", hash = "sha256:502218f52498a36d6bf5ea77081844017bf7982cdbe521ad85e64cabee1b608b"},
+    {file = "charset_normalizer-3.0.1-cp310-cp310-win_amd64.whl", hash = "sha256:601f36512f9e28f029d9481bdaf8e89e5148ac5d89cffd3b05cd533eeb423b59"},
+    {file = "charset_normalizer-3.0.1-cp311-cp311-macosx_10_9_universal2.whl", hash = "sha256:0298eafff88c99982a4cf66ba2efa1128e4ddaca0b05eec4c456bbc7db691d8d"},
+    {file = "charset_normalizer-3.0.1-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:a8d0fc946c784ff7f7c3742310cc8a57c5c6dc31631269876a88b809dbeff3d3"},
+    {file = "charset_normalizer-3.0.1-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:87701167f2a5c930b403e9756fab1d31d4d4da52856143b609e30a1ce7160f3c"},
+    {file = "charset_normalizer-3.0.1-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:14e76c0f23218b8f46c4d87018ca2e441535aed3632ca134b10239dfb6dadd6b"},
+    {file = "charset_normalizer-3.0.1-cp311-cp311-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:0c0a590235ccd933d9892c627dec5bc7511ce6ad6c1011fdf5b11363022746c1"},
+    {file = "charset_normalizer-3.0.1-cp311-cp311-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:8c7fe7afa480e3e82eed58e0ca89f751cd14d767638e2550c77a92a9e749c317"},
+    {file = "charset_normalizer-3.0.1-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:79909e27e8e4fcc9db4addea88aa63f6423ebb171db091fb4373e3312cb6d603"},
+    {file = "charset_normalizer-3.0.1-cp311-cp311-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:8ac7b6a045b814cf0c47f3623d21ebd88b3e8cf216a14790b455ea7ff0135d18"},
+    {file = "charset_normalizer-3.0.1-cp311-cp311-musllinux_1_1_aarch64.whl", hash = "sha256:72966d1b297c741541ca8cf1223ff262a6febe52481af742036a0b296e35fa5a"},
+    {file = "charset_normalizer-3.0.1-cp311-cp311-musllinux_1_1_i686.whl", hash = "sha256:f9d0c5c045a3ca9bedfc35dca8526798eb91a07aa7a2c0fee134c6c6f321cbd7"},
+    {file = "charset_normalizer-3.0.1-cp311-cp311-musllinux_1_1_ppc64le.whl", hash = "sha256:5995f0164fa7df59db4746112fec3f49c461dd6b31b841873443bdb077c13cfc"},
+    {file = "charset_normalizer-3.0.1-cp311-cp311-musllinux_1_1_s390x.whl", hash = "sha256:4a8fcf28c05c1f6d7e177a9a46a1c52798bfe2ad80681d275b10dcf317deaf0b"},
+    {file = "charset_normalizer-3.0.1-cp311-cp311-musllinux_1_1_x86_64.whl", hash = "sha256:761e8904c07ad053d285670f36dd94e1b6ab7f16ce62b9805c475b7aa1cffde6"},
+    {file = "charset_normalizer-3.0.1-cp311-cp311-win32.whl", hash = "sha256:71140351489970dfe5e60fc621ada3e0f41104a5eddaca47a7acb3c1b851d6d3"},
+    {file = "charset_normalizer-3.0.1-cp311-cp311-win_amd64.whl", hash = "sha256:9ab77acb98eba3fd2a85cd160851816bfce6871d944d885febf012713f06659c"},
+    {file = "charset_normalizer-3.0.1-cp36-cp36m-macosx_10_9_x86_64.whl", hash = "sha256:84c3990934bae40ea69a82034912ffe5a62c60bbf6ec5bc9691419641d7d5c9a"},
+    {file = "charset_normalizer-3.0.1-cp36-cp36m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:74292fc76c905c0ef095fe11e188a32ebd03bc38f3f3e9bcb85e4e6db177b7ea"},
+    {file = "charset_normalizer-3.0.1-cp36-cp36m-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:c95a03c79bbe30eec3ec2b7f076074f4281526724c8685a42872974ef4d36b72"},
+    {file = "charset_normalizer-3.0.1-cp36-cp36m-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:f4c39b0e3eac288fedc2b43055cfc2ca7a60362d0e5e87a637beac5d801ef478"},
+    {file = "charset_normalizer-3.0.1-cp36-cp36m-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:df2c707231459e8a4028eabcd3cfc827befd635b3ef72eada84ab13b52e1574d"},
+    {file = "charset_normalizer-3.0.1-cp36-cp36m-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:93ad6d87ac18e2a90b0fe89df7c65263b9a99a0eb98f0a3d2e079f12a0735837"},
+    {file = "charset_normalizer-3.0.1-cp36-cp36m-musllinux_1_1_aarch64.whl", hash = "sha256:59e5686dd847347e55dffcc191a96622f016bc0ad89105e24c14e0d6305acbc6"},
+    {file = "charset_normalizer-3.0.1-cp36-cp36m-musllinux_1_1_i686.whl", hash = "sha256:cd6056167405314a4dc3c173943f11249fa0f1b204f8b51ed4bde1a9cd1834dc"},
+    {file = "charset_normalizer-3.0.1-cp36-cp36m-musllinux_1_1_ppc64le.whl", hash = "sha256:083c8d17153ecb403e5e1eb76a7ef4babfc2c48d58899c98fcaa04833e7a2f9a"},
+    {file = "charset_normalizer-3.0.1-cp36-cp36m-musllinux_1_1_s390x.whl", hash = "sha256:f5057856d21e7586765171eac8b9fc3f7d44ef39425f85dbcccb13b3ebea806c"},
+    {file = "charset_normalizer-3.0.1-cp36-cp36m-musllinux_1_1_x86_64.whl", hash = "sha256:7eb33a30d75562222b64f569c642ff3dc6689e09adda43a082208397f016c39a"},
+    {file = "charset_normalizer-3.0.1-cp36-cp36m-win32.whl", hash = "sha256:95dea361dd73757c6f1c0a1480ac499952c16ac83f7f5f4f84f0658a01b8ef41"},
+    {file = "charset_normalizer-3.0.1-cp36-cp36m-win_amd64.whl", hash = "sha256:eaa379fcd227ca235d04152ca6704c7cb55564116f8bc52545ff357628e10602"},
+    {file = "charset_normalizer-3.0.1-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:3e45867f1f2ab0711d60c6c71746ac53537f1684baa699f4f668d4c6f6ce8e14"},
+    {file = "charset_normalizer-3.0.1-cp37-cp37m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:cadaeaba78750d58d3cc6ac4d1fd867da6fc73c88156b7a3212a3cd4819d679d"},
+    {file = "charset_normalizer-3.0.1-cp37-cp37m-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:911d8a40b2bef5b8bbae2e36a0b103f142ac53557ab421dc16ac4aafee6f53dc"},
+    {file = "charset_normalizer-3.0.1-cp37-cp37m-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:503e65837c71b875ecdd733877d852adbc465bd82c768a067badd953bf1bc5a3"},
+    {file = "charset_normalizer-3.0.1-cp37-cp37m-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:a60332922359f920193b1d4826953c507a877b523b2395ad7bc716ddd386d866"},
+    {file = "charset_normalizer-3.0.1-cp37-cp37m-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:16a8663d6e281208d78806dbe14ee9903715361cf81f6d4309944e4d1e59ac5b"},
+    {file = "charset_normalizer-3.0.1-cp37-cp37m-musllinux_1_1_aarch64.whl", hash = "sha256:a16418ecf1329f71df119e8a65f3aa68004a3f9383821edcb20f0702934d8087"},
+    {file = "charset_normalizer-3.0.1-cp37-cp37m-musllinux_1_1_i686.whl", hash = "sha256:9d9153257a3f70d5f69edf2325357251ed20f772b12e593f3b3377b5f78e7ef8"},
+    {file = "charset_normalizer-3.0.1-cp37-cp37m-musllinux_1_1_ppc64le.whl", hash = "sha256:02a51034802cbf38db3f89c66fb5d2ec57e6fe7ef2f4a44d070a593c3688667b"},
+    {file = "charset_normalizer-3.0.1-cp37-cp37m-musllinux_1_1_s390x.whl", hash = "sha256:2e396d70bc4ef5325b72b593a72c8979999aa52fb8bcf03f701c1b03e1166918"},
+    {file = "charset_normalizer-3.0.1-cp37-cp37m-musllinux_1_1_x86_64.whl", hash = "sha256:11b53acf2411c3b09e6af37e4b9005cba376c872503c8f28218c7243582df45d"},
+    {file = "charset_normalizer-3.0.1-cp37-cp37m-win32.whl", hash = "sha256:0bf2dae5291758b6f84cf923bfaa285632816007db0330002fa1de38bfcb7154"},
+    {file = "charset_normalizer-3.0.1-cp37-cp37m-win_amd64.whl", hash = "sha256:2c03cc56021a4bd59be889c2b9257dae13bf55041a3372d3295416f86b295fb5"},
+    {file = "charset_normalizer-3.0.1-cp38-cp38-macosx_10_9_universal2.whl", hash = "sha256:024e606be3ed92216e2b6952ed859d86b4cfa52cd5bc5f050e7dc28f9b43ec42"},
+    {file = "charset_normalizer-3.0.1-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:4b0d02d7102dd0f997580b51edc4cebcf2ab6397a7edf89f1c73b586c614272c"},
+    {file = "charset_normalizer-3.0.1-cp38-cp38-macosx_11_0_arm64.whl", hash = "sha256:358a7c4cb8ba9b46c453b1dd8d9e431452d5249072e4f56cfda3149f6ab1405e"},
+    {file = "charset_normalizer-3.0.1-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:81d6741ab457d14fdedc215516665050f3822d3e56508921cc7239f8c8e66a58"},
+    {file = "charset_normalizer-3.0.1-cp38-cp38-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:8b8af03d2e37866d023ad0ddea594edefc31e827fee64f8de5611a1dbc373174"},
+    {file = "charset_normalizer-3.0.1-cp38-cp38-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:9cf4e8ad252f7c38dd1f676b46514f92dc0ebeb0db5552f5f403509705e24753"},
+    {file = "charset_normalizer-3.0.1-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:e696f0dd336161fca9adbb846875d40752e6eba585843c768935ba5c9960722b"},
+    {file = "charset_normalizer-3.0.1-cp38-cp38-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:c22d3fe05ce11d3671297dc8973267daa0f938b93ec716e12e0f6dee81591dc1"},
+    {file = "charset_normalizer-3.0.1-cp38-cp38-musllinux_1_1_aarch64.whl", hash = "sha256:109487860ef6a328f3eec66f2bf78b0b72400280d8f8ea05f69c51644ba6521a"},
+    {file = "charset_normalizer-3.0.1-cp38-cp38-musllinux_1_1_i686.whl", hash = "sha256:37f8febc8ec50c14f3ec9637505f28e58d4f66752207ea177c1d67df25da5aed"},
+    {file = "charset_normalizer-3.0.1-cp38-cp38-musllinux_1_1_ppc64le.whl", hash = "sha256:f97e83fa6c25693c7a35de154681fcc257c1c41b38beb0304b9c4d2d9e164479"},
+    {file = "charset_normalizer-3.0.1-cp38-cp38-musllinux_1_1_s390x.whl", hash = "sha256:a152f5f33d64a6be73f1d30c9cc82dfc73cec6477ec268e7c6e4c7d23c2d2291"},
+    {file = "charset_normalizer-3.0.1-cp38-cp38-musllinux_1_1_x86_64.whl", hash = "sha256:39049da0ffb96c8cbb65cbf5c5f3ca3168990adf3551bd1dee10c48fce8ae820"},
+    {file = "charset_normalizer-3.0.1-cp38-cp38-win32.whl", hash = "sha256:4457ea6774b5611f4bed5eaa5df55f70abde42364d498c5134b7ef4c6958e20e"},
+    {file = "charset_normalizer-3.0.1-cp38-cp38-win_amd64.whl", hash = "sha256:e62164b50f84e20601c1ff8eb55620d2ad25fb81b59e3cd776a1902527a788af"},
+    {file = "charset_normalizer-3.0.1-cp39-cp39-macosx_10_9_universal2.whl", hash = "sha256:8eade758719add78ec36dc13201483f8e9b5d940329285edcd5f70c0a9edbd7f"},
+    {file = "charset_normalizer-3.0.1-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:8499ca8f4502af841f68135133d8258f7b32a53a1d594aa98cc52013fff55678"},
+    {file = "charset_normalizer-3.0.1-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:3fc1c4a2ffd64890aebdb3f97e1278b0cc72579a08ca4de8cd2c04799a3a22be"},
+    {file = "charset_normalizer-3.0.1-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:00d3ffdaafe92a5dc603cb9bd5111aaa36dfa187c8285c543be562e61b755f6b"},
+    {file = "charset_normalizer-3.0.1-cp39-cp39-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:c2ac1b08635a8cd4e0cbeaf6f5e922085908d48eb05d44c5ae9eabab148512ca"},
+    {file = "charset_normalizer-3.0.1-cp39-cp39-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:f6f45710b4459401609ebebdbcfb34515da4fc2aa886f95107f556ac69a9147e"},
+    {file = "charset_normalizer-3.0.1-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:3ae1de54a77dc0d6d5fcf623290af4266412a7c4be0b1ff7444394f03f5c54e3"},
+    {file = "charset_normalizer-3.0.1-cp39-cp39-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:3b590df687e3c5ee0deef9fc8c547d81986d9a1b56073d82de008744452d6541"},
+    {file = "charset_normalizer-3.0.1-cp39-cp39-musllinux_1_1_aarch64.whl", hash = "sha256:ab5de034a886f616a5668aa5d098af2b5385ed70142090e2a31bcbd0af0fdb3d"},
+    {file = "charset_normalizer-3.0.1-cp39-cp39-musllinux_1_1_i686.whl", hash = "sha256:9cb3032517f1627cc012dbc80a8ec976ae76d93ea2b5feaa9d2a5b8882597579"},
+    {file = "charset_normalizer-3.0.1-cp39-cp39-musllinux_1_1_ppc64le.whl", hash = "sha256:608862a7bf6957f2333fc54ab4399e405baad0163dc9f8d99cb236816db169d4"},
+    {file = "charset_normalizer-3.0.1-cp39-cp39-musllinux_1_1_s390x.whl", hash = "sha256:0f438ae3532723fb6ead77e7c604be7c8374094ef4ee2c5e03a3a17f1fca256c"},
+    {file = "charset_normalizer-3.0.1-cp39-cp39-musllinux_1_1_x86_64.whl", hash = "sha256:356541bf4381fa35856dafa6a965916e54bed415ad8a24ee6de6e37deccf2786"},
+    {file = "charset_normalizer-3.0.1-cp39-cp39-win32.whl", hash = "sha256:39cf9ed17fe3b1bc81f33c9ceb6ce67683ee7526e65fde1447c772afc54a1bb8"},
+    {file = "charset_normalizer-3.0.1-cp39-cp39-win_amd64.whl", hash = "sha256:0a11e971ed097d24c534c037d298ad32c6ce81a45736d31e0ff0ad37ab437d59"},
+    {file = "charset_normalizer-3.0.1-py3-none-any.whl", hash = "sha256:7e189e2e1d3ed2f4aebabd2d5b0f931e883676e51c7624826e0a4e5fe8a0bf24"},
 ]
 
-[package.extras]
-unicode-backport = ["unicodedata2"]
-
 [[package]]
 name = "click"
 version = "8.1.3"
@@ -234,63 +331,63 @@ requests = ">=2.23.0"
 
 [[package]]
 name = "coverage"
-version = "7.0.3"
+version = "7.1.0"
 description = "Code coverage measurement for Python"
 category = "dev"
 optional = false
 python-versions = ">=3.7"
 files = [
-    {file = "coverage-7.0.3-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:2f7c51b6074a8a3063c341953dffe48fd6674f8e4b1d3c8aa8a91f58d6e716a8"},
-    {file = "coverage-7.0.3-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:628f47eaf66727fc986d3b190d6fa32f5e6b7754a243919d28bc0fd7974c449f"},
-    {file = "coverage-7.0.3-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:e89d5abf86c104de808108a25d171ad646c07eda96ca76c8b237b94b9c71e518"},
-    {file = "coverage-7.0.3-cp310-cp310-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:75e43c6f4ea4d122dac389aabdf9d4f0e160770a75e63372f88005d90f5bcc80"},
-    {file = "coverage-7.0.3-cp310-cp310-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:49da0ff241827ebb52d5d6d5a36d33b455fa5e721d44689c95df99fd8db82437"},
-    {file = "coverage-7.0.3-cp310-cp310-musllinux_1_1_aarch64.whl", hash = "sha256:0bce4ad5bdd0b02e177a085d28d2cea5fc57bb4ba2cead395e763e34cf934eb1"},
-    {file = "coverage-7.0.3-cp310-cp310-musllinux_1_1_i686.whl", hash = "sha256:f79691335257d60951638dd43576b9bcd6f52baa5c1c2cd07a509bb003238372"},
-    {file = "coverage-7.0.3-cp310-cp310-musllinux_1_1_x86_64.whl", hash = "sha256:5722269ed05fbdb94eef431787c66b66260ff3125d1a9afcc00facff8c45adf9"},
-    {file = "coverage-7.0.3-cp310-cp310-win32.whl", hash = "sha256:bdbda870e0fda7dd0fe7db7135ca226ec4c1ade8aa76e96614829b56ca491012"},
-    {file = "coverage-7.0.3-cp310-cp310-win_amd64.whl", hash = "sha256:e56fae4292e216b8deeee38ace84557b9fa85b52db005368a275427cdabb8192"},
-    {file = "coverage-7.0.3-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:b82343a5bc51627b9d606f0b6b6b9551db7b6311a5dd920fa52a94beae2e8959"},
-    {file = "coverage-7.0.3-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:fd0a8aa431f9b7ad9eb8264f55ef83cbb254962af3775092fb6e93890dea9ca2"},
-    {file = "coverage-7.0.3-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:112cfead1bd22eada8a8db9ed387bd3e8be5528debc42b5d3c1f7da4ffaf9fb5"},
-    {file = "coverage-7.0.3-cp311-cp311-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:af87e906355fa42447be5c08c5d44e6e1c005bf142f303f726ddf5ed6e0c8a4d"},
-    {file = "coverage-7.0.3-cp311-cp311-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:f30090e22a301952c5abd0e493a1c8358b4f0b368b49fa3e4568ed3ed68b8d1f"},
-    {file = "coverage-7.0.3-cp311-cp311-musllinux_1_1_aarch64.whl", hash = "sha256:ae871d09901911eedda1981ea6fd0f62a999107293cdc4c4fd612321c5b34745"},
-    {file = "coverage-7.0.3-cp311-cp311-musllinux_1_1_i686.whl", hash = "sha256:ed7c9debf7bfc63c9b9f8b595409237774ff4b061bf29fba6f53b287a2fdeab9"},
-    {file = "coverage-7.0.3-cp311-cp311-musllinux_1_1_x86_64.whl", hash = "sha256:13121fa22dcd2c7b19c5161e3fd725692448f05377b788da4502a383573227b3"},
-    {file = "coverage-7.0.3-cp311-cp311-win32.whl", hash = "sha256:037b51ee86bc600f99b3b957c20a172431c35c2ef9c1ca34bc813ab5b51fd9f5"},
-    {file = "coverage-7.0.3-cp311-cp311-win_amd64.whl", hash = "sha256:25fde928306034e8deecd5fc91a07432dcc282c8acb76749581a28963c9f4f3f"},
-    {file = "coverage-7.0.3-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:7e8b0642c38b3d3b3c01417643ccc645345b03c32a2e84ef93cdd6844d6fe530"},
-    {file = "coverage-7.0.3-cp37-cp37m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:18b09811f849cc958d23f733a350a66b54a8de3fed1e6128ba55a5c97ffb6f65"},
-    {file = "coverage-7.0.3-cp37-cp37m-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:349d0b545520e8516f7b4f12373afc705d17d901e1de6a37a20e4ec9332b61f7"},
-    {file = "coverage-7.0.3-cp37-cp37m-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:b5b38813eee5b4739f505d94247604c72eae626d5088a16dd77b08b8b1724ab3"},
-    {file = "coverage-7.0.3-cp37-cp37m-musllinux_1_1_aarch64.whl", hash = "sha256:ba9af1218fa01b1f11c72271bc7290b701d11ad4dbc2ae97c445ecacf6858dba"},
-    {file = "coverage-7.0.3-cp37-cp37m-musllinux_1_1_i686.whl", hash = "sha256:c5648c7eec5cf1ba5db1cf2d6c10036a582d7f09e172990474a122e30c841361"},
-    {file = "coverage-7.0.3-cp37-cp37m-musllinux_1_1_x86_64.whl", hash = "sha256:d0df04495b76a885bfef009f45eebe8fe2fbf815ad7a83dabcf5aced62f33162"},
-    {file = "coverage-7.0.3-cp37-cp37m-win32.whl", hash = "sha256:af6cef3796b8068713a48dd67d258dc9a6e2ebc3bd4645bfac03a09672fa5d20"},
-    {file = "coverage-7.0.3-cp37-cp37m-win_amd64.whl", hash = "sha256:62ef3800c4058844e2e3fa35faa9dd0ccde8a8aba6c763aae50342e00d4479d4"},
-    {file = "coverage-7.0.3-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:acef7f3a3825a2d218a03dd02f5f3cc7f27aa31d882dd780191d1ad101120d74"},
-    {file = "coverage-7.0.3-cp38-cp38-macosx_11_0_arm64.whl", hash = "sha256:a530663a361eb27375cec28aea5cd282089b5e4b022ae451c4c3493b026a68a5"},
-    {file = "coverage-7.0.3-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:c58cd6bb46dcb922e0d5792850aab5964433d511b3a020867650f8d930dde4f4"},
-    {file = "coverage-7.0.3-cp38-cp38-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:f918e9ef4c98f477a5458238dde2a1643aed956c7213873ab6b6b82e32b8ef61"},
-    {file = "coverage-7.0.3-cp38-cp38-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:2b865aa679bee7fbd1c55960940dbd3252621dd81468268786c67122bbd15343"},
-    {file = "coverage-7.0.3-cp38-cp38-musllinux_1_1_aarch64.whl", hash = "sha256:c5d9b480ebae60fc2cbc8d6865194136bc690538fa542ba58726433bed6e04cc"},
-    {file = "coverage-7.0.3-cp38-cp38-musllinux_1_1_i686.whl", hash = "sha256:985ad2af5ec3dbb4fd75d5b0735752c527ad183455520055a08cf8d6794cabfc"},
-    {file = "coverage-7.0.3-cp38-cp38-musllinux_1_1_x86_64.whl", hash = "sha256:ca15308ef722f120967af7474ba6a453e0f5b6f331251e20b8145497cf1bc14a"},
-    {file = "coverage-7.0.3-cp38-cp38-win32.whl", hash = "sha256:c1cee10662c25c94415bbb987f2ec0e6ba9e8fce786334b10be7e6a7ab958f69"},
-    {file = "coverage-7.0.3-cp38-cp38-win_amd64.whl", hash = "sha256:44d6a556de4418f1f3bfd57094b8c49f0408df5a433cf0d253eeb3075261c762"},
-    {file = "coverage-7.0.3-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:e6dcc70a25cb95df0ae33dfc701de9b09c37f7dd9f00394d684a5b57257f8246"},
-    {file = "coverage-7.0.3-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:bf76d79dfaea802f0f28f50153ffbc1a74ae1ee73e480baeda410b4f3e7ab25f"},
-    {file = "coverage-7.0.3-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:88834e5d56d01c141c29deedacba5773fe0bed900b1edc957595a8a6c0da1c3c"},
-    {file = "coverage-7.0.3-cp39-cp39-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:ef001a60e888f8741e42e5aa79ae55c91be73761e4df5e806efca1ddd62fd400"},
-    {file = "coverage-7.0.3-cp39-cp39-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:4959dc506be74e4963bd2c42f7b87d8e4b289891201e19ec551e64c6aa5441f8"},
-    {file = "coverage-7.0.3-cp39-cp39-musllinux_1_1_aarch64.whl", hash = "sha256:b791beb17b32ac019a78cfbe6184f992b6273fdca31145b928ad2099435e2fcb"},
-    {file = "coverage-7.0.3-cp39-cp39-musllinux_1_1_i686.whl", hash = "sha256:b07651e3b9af8f1a092861d88b4c74d913634a7f1f2280fca0ad041ad84e9e96"},
-    {file = "coverage-7.0.3-cp39-cp39-musllinux_1_1_x86_64.whl", hash = "sha256:55e46fa4168ccb7497c9be78627fcb147e06f474f846a10d55feeb5108a24ef0"},
-    {file = "coverage-7.0.3-cp39-cp39-win32.whl", hash = "sha256:e3f1cd1cd65695b1540b3cf7828d05b3515974a9d7c7530f762ac40f58a18161"},
-    {file = "coverage-7.0.3-cp39-cp39-win_amd64.whl", hash = "sha256:d8249666c23683f74f8f93aeaa8794ac87cc61c40ff70374a825f3352a4371dc"},
-    {file = "coverage-7.0.3-pp37.pp38.pp39-none-any.whl", hash = "sha256:b1ffc8f58b81baed3f8962e28c30d99442079b82ce1ec836a1f67c0accad91c1"},
-    {file = "coverage-7.0.3.tar.gz", hash = "sha256:d5be4e93acce64f516bf4fd239c0e6118fc913c93fa1a3f52d15bdcc60d97b2d"},
+    {file = "coverage-7.1.0-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:3b946bbcd5a8231383450b195cfb58cb01cbe7f8949f5758566b881df4b33baf"},
+    {file = "coverage-7.1.0-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:ec8e767f13be637d056f7e07e61d089e555f719b387a7070154ad80a0ff31801"},
+    {file = "coverage-7.1.0-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:d4a5a5879a939cb84959d86869132b00176197ca561c664fc21478c1eee60d75"},
+    {file = "coverage-7.1.0-cp310-cp310-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:b643cb30821e7570c0aaf54feaf0bfb630b79059f85741843e9dc23f33aaca2c"},
+    {file = "coverage-7.1.0-cp310-cp310-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:32df215215f3af2c1617a55dbdfb403b772d463d54d219985ac7cd3bf124cada"},
+    {file = "coverage-7.1.0-cp310-cp310-musllinux_1_1_aarch64.whl", hash = "sha256:33d1ae9d4079e05ac4cc1ef9e20c648f5afabf1a92adfaf2ccf509c50b85717f"},
+    {file = "coverage-7.1.0-cp310-cp310-musllinux_1_1_i686.whl", hash = "sha256:29571503c37f2ef2138a306d23e7270687c0efb9cab4bd8038d609b5c2393a3a"},
+    {file = "coverage-7.1.0-cp310-cp310-musllinux_1_1_x86_64.whl", hash = "sha256:63ffd21aa133ff48c4dff7adcc46b7ec8b565491bfc371212122dd999812ea1c"},
+    {file = "coverage-7.1.0-cp310-cp310-win32.whl", hash = "sha256:4b14d5e09c656de5038a3f9bfe5228f53439282abcab87317c9f7f1acb280352"},
+    {file = "coverage-7.1.0-cp310-cp310-win_amd64.whl", hash = "sha256:8361be1c2c073919500b6601220a6f2f98ea0b6d2fec5014c1d9cfa23dd07038"},
+    {file = "coverage-7.1.0-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:da9b41d4539eefd408c46725fb76ecba3a50a3367cafb7dea5f250d0653c1040"},
+    {file = "coverage-7.1.0-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:c5b15ed7644ae4bee0ecf74fee95808dcc34ba6ace87e8dfbf5cb0dc20eab45a"},
+    {file = "coverage-7.1.0-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:d12d076582507ea460ea2a89a8c85cb558f83406c8a41dd641d7be9a32e1274f"},
+    {file = "coverage-7.1.0-cp311-cp311-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:e2617759031dae1bf183c16cef8fcfb3de7617f394c813fa5e8e46e9b82d4222"},
+    {file = "coverage-7.1.0-cp311-cp311-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:c4e4881fa9e9667afcc742f0c244d9364d197490fbc91d12ac3b5de0bf2df146"},
+    {file = "coverage-7.1.0-cp311-cp311-musllinux_1_1_aarch64.whl", hash = "sha256:9d58885215094ab4a86a6aef044e42994a2bd76a446dc59b352622655ba6621b"},
+    {file = "coverage-7.1.0-cp311-cp311-musllinux_1_1_i686.whl", hash = "sha256:ffeeb38ee4a80a30a6877c5c4c359e5498eec095878f1581453202bfacc8fbc2"},
+    {file = "coverage-7.1.0-cp311-cp311-musllinux_1_1_x86_64.whl", hash = "sha256:3baf5f126f30781b5e93dbefcc8271cb2491647f8283f20ac54d12161dff080e"},
+    {file = "coverage-7.1.0-cp311-cp311-win32.whl", hash = "sha256:ded59300d6330be27bc6cf0b74b89ada58069ced87c48eaf9344e5e84b0072f7"},
+    {file = "coverage-7.1.0-cp311-cp311-win_amd64.whl", hash = "sha256:6a43c7823cd7427b4ed763aa7fb63901ca8288591323b58c9cd6ec31ad910f3c"},
+    {file = "coverage-7.1.0-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:7a726d742816cb3a8973c8c9a97539c734b3a309345236cd533c4883dda05b8d"},
+    {file = "coverage-7.1.0-cp37-cp37m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:bc7c85a150501286f8b56bd8ed3aa4093f4b88fb68c0843d21ff9656f0009d6a"},
+    {file = "coverage-7.1.0-cp37-cp37m-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:f5b4198d85a3755d27e64c52f8c95d6333119e49fd001ae5798dac872c95e0f8"},
+    {file = "coverage-7.1.0-cp37-cp37m-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:ddb726cb861c3117a553f940372a495fe1078249ff5f8a5478c0576c7be12050"},
+    {file = "coverage-7.1.0-cp37-cp37m-musllinux_1_1_aarch64.whl", hash = "sha256:51b236e764840a6df0661b67e50697aaa0e7d4124ca95e5058fa3d7cbc240b7c"},
+    {file = "coverage-7.1.0-cp37-cp37m-musllinux_1_1_i686.whl", hash = "sha256:7ee5c9bb51695f80878faaa5598040dd6c9e172ddcf490382e8aedb8ec3fec8d"},
+    {file = "coverage-7.1.0-cp37-cp37m-musllinux_1_1_x86_64.whl", hash = "sha256:c31b75ae466c053a98bf26843563b3b3517b8f37da4d47b1c582fdc703112bc3"},
+    {file = "coverage-7.1.0-cp37-cp37m-win32.whl", hash = "sha256:3b155caf3760408d1cb903b21e6a97ad4e2bdad43cbc265e3ce0afb8e0057e73"},
+    {file = "coverage-7.1.0-cp37-cp37m-win_amd64.whl", hash = "sha256:2a60d6513781e87047c3e630b33b4d1e89f39836dac6e069ffee28c4786715f5"},
+    {file = "coverage-7.1.0-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:f2cba5c6db29ce991029b5e4ac51eb36774458f0a3b8d3137241b32d1bb91f06"},
+    {file = "coverage-7.1.0-cp38-cp38-macosx_11_0_arm64.whl", hash = "sha256:beeb129cacea34490ffd4d6153af70509aa3cda20fdda2ea1a2be870dfec8d52"},
+    {file = "coverage-7.1.0-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:0c45948f613d5d18c9ec5eaa203ce06a653334cf1bd47c783a12d0dd4fd9c851"},
+    {file = "coverage-7.1.0-cp38-cp38-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:ef382417db92ba23dfb5864a3fc9be27ea4894e86620d342a116b243ade5d35d"},
+    {file = "coverage-7.1.0-cp38-cp38-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:7c7c0d0827e853315c9bbd43c1162c006dd808dbbe297db7ae66cd17b07830f0"},
+    {file = "coverage-7.1.0-cp38-cp38-musllinux_1_1_aarch64.whl", hash = "sha256:e5cdbb5cafcedea04924568d990e20ce7f1945a1dd54b560f879ee2d57226912"},
+    {file = "coverage-7.1.0-cp38-cp38-musllinux_1_1_i686.whl", hash = "sha256:9817733f0d3ea91bea80de0f79ef971ae94f81ca52f9b66500c6a2fea8e4b4f8"},
+    {file = "coverage-7.1.0-cp38-cp38-musllinux_1_1_x86_64.whl", hash = "sha256:218fe982371ac7387304153ecd51205f14e9d731b34fb0568181abaf7b443ba0"},
+    {file = "coverage-7.1.0-cp38-cp38-win32.whl", hash = "sha256:04481245ef966fbd24ae9b9e537ce899ae584d521dfbe78f89cad003c38ca2ab"},
+    {file = "coverage-7.1.0-cp38-cp38-win_amd64.whl", hash = "sha256:8ae125d1134bf236acba8b83e74c603d1b30e207266121e76484562bc816344c"},
+    {file = "coverage-7.1.0-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:2bf1d5f2084c3932b56b962a683074a3692bce7cabd3aa023c987a2a8e7612f6"},
+    {file = "coverage-7.1.0-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:98b85dd86514d889a2e3dd22ab3c18c9d0019e696478391d86708b805f4ea0fa"},
+    {file = "coverage-7.1.0-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:38da2db80cc505a611938d8624801158e409928b136c8916cd2e203970dde4dc"},
+    {file = "coverage-7.1.0-cp39-cp39-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:3164d31078fa9efe406e198aecd2a02d32a62fecbdef74f76dad6a46c7e48311"},
+    {file = "coverage-7.1.0-cp39-cp39-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:db61a79c07331e88b9a9974815c075fbd812bc9dbc4dc44b366b5368a2936063"},
+    {file = "coverage-7.1.0-cp39-cp39-musllinux_1_1_aarch64.whl", hash = "sha256:9ccb092c9ede70b2517a57382a601619d20981f56f440eae7e4d7eaafd1d1d09"},
+    {file = "coverage-7.1.0-cp39-cp39-musllinux_1_1_i686.whl", hash = "sha256:33ff26d0f6cc3ca8de13d14fde1ff8efe1456b53e3f0273e63cc8b3c84a063d8"},
+    {file = "coverage-7.1.0-cp39-cp39-musllinux_1_1_x86_64.whl", hash = "sha256:d47dd659a4ee952e90dc56c97d78132573dc5c7b09d61b416a9deef4ebe01a0c"},
+    {file = "coverage-7.1.0-cp39-cp39-win32.whl", hash = "sha256:d248cd4a92065a4d4543b8331660121b31c4148dd00a691bfb7a5cdc7483cfa4"},
+    {file = "coverage-7.1.0-cp39-cp39-win_amd64.whl", hash = "sha256:7ed681b0f8e8bcbbffa58ba26fcf5dbc8f79e7997595bf071ed5430d8c08d6f3"},
+    {file = "coverage-7.1.0-pp37.pp38.pp39-none-any.whl", hash = "sha256:755e89e32376c850f826c425ece2c35a4fc266c081490eb0a841e7c1cb0d3bda"},
+    {file = "coverage-7.1.0.tar.gz", hash = "sha256:10188fe543560ec4874f974b5305cd1a8bdcfa885ee00ea3a03733464c4ca265"},
 ]
 
 [package.extras]
@@ -341,14 +438,14 @@ testing = ["covdefaults (>=2.2.2)", "coverage (>=7.0.1)", "pytest (>=7.2)", "pyt
 
 [[package]]
 name = "identify"
-version = "2.5.12"
+version = "2.5.17"
 description = "File identification library for Python"
 category = "dev"
 optional = false
 python-versions = ">=3.7"
 files = [
-    {file = "identify-2.5.12-py2.py3-none-any.whl", hash = "sha256:e8a400c3062d980243d27ce10455a52832205649bbcaf27ffddb3dfaaf477bad"},
-    {file = "identify-2.5.12.tar.gz", hash = "sha256:0bc96b09c838310b6fcfcc61f78a981ea07f94836ef6ef553da5bb5d4745d662"},
+    {file = "identify-2.5.17-py2.py3-none-any.whl", hash = "sha256:7d526dd1283555aafcc91539acc061d8f6f59adb0a7bba462735b0a318bff7ed"},
+    {file = "identify-2.5.17.tar.gz", hash = "sha256:93cc61a861052de9d4c541a7acb7e3dcc9c11b398a2144f6e52ae5285f5f4f06"},
 ]
 
 [package.extras]
@@ -368,14 +465,14 @@ files = [
 
 [[package]]
 name = "iniconfig"
-version = "1.1.1"
-description = "iniconfig: brain-dead simple config-ini parsing"
+version = "2.0.0"
+description = "brain-dead simple config-ini parsing"
 category = "dev"
 optional = false
-python-versions = "*"
+python-versions = ">=3.7"
 files = [
-    {file = "iniconfig-1.1.1-py2.py3-none-any.whl", hash = "sha256:011e24c64b7f47f6ebd835bb12a743f2fbe9a26d4cecaa7f53bc4f35ee9da8b3"},
-    {file = "iniconfig-1.1.1.tar.gz", hash = "sha256:bc3af051d7d14b2ee5ef9969666def0cd1a000e121eaea580d4a313df4b37f32"},
+    {file = "iniconfig-2.0.0-py3-none-any.whl", hash = "sha256:b6a85871a79d2e3b22d2d1b94ac2824226a63c6b741c88f7ae975f18b6778374"},
+    {file = "iniconfig-2.0.0.tar.gz", hash = "sha256:2d91e135bf72d31a410b17c16da610a82cb55f6b0477d1a902134b24a455b8b3"},
 ]
 
 [[package]]
@@ -432,52 +529,62 @@ jinja2 = "*"
 
 [[package]]
 name = "markupsafe"
-version = "2.1.1"
+version = "2.1.2"
 description = "Safely add untrusted strings to HTML/XML markup."
 category = "dev"
 optional = false
 python-versions = ">=3.7"
 files = [
-    {file = "MarkupSafe-2.1.1-cp310-cp310-macosx_10_9_universal2.whl", hash = "sha256:86b1f75c4e7c2ac2ccdaec2b9022845dbb81880ca318bb7a0a01fbf7813e3812"},
-    {file = "MarkupSafe-2.1.1-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:f121a1420d4e173a5d96e47e9a0c0dcff965afdf1626d28de1460815f7c4ee7a"},
-    {file = "MarkupSafe-2.1.1-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:a49907dd8420c5685cfa064a1335b6754b74541bbb3706c259c02ed65b644b3e"},
-    {file = "MarkupSafe-2.1.1-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:10c1bfff05d95783da83491be968e8fe789263689c02724e0c691933c52994f5"},
-    {file = "MarkupSafe-2.1.1-cp310-cp310-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:b7bd98b796e2b6553da7225aeb61f447f80a1ca64f41d83612e6139ca5213aa4"},
-    {file = "MarkupSafe-2.1.1-cp310-cp310-musllinux_1_1_aarch64.whl", hash = "sha256:b09bf97215625a311f669476f44b8b318b075847b49316d3e28c08e41a7a573f"},
-    {file = "MarkupSafe-2.1.1-cp310-cp310-musllinux_1_1_i686.whl", hash = "sha256:694deca8d702d5db21ec83983ce0bb4b26a578e71fbdbd4fdcd387daa90e4d5e"},
-    {file = "MarkupSafe-2.1.1-cp310-cp310-musllinux_1_1_x86_64.whl", hash = "sha256:efc1913fd2ca4f334418481c7e595c00aad186563bbc1ec76067848c7ca0a933"},
-    {file = "MarkupSafe-2.1.1-cp310-cp310-win32.whl", hash = "sha256:4a33dea2b688b3190ee12bd7cfa29d39c9ed176bda40bfa11099a3ce5d3a7ac6"},
-    {file = "MarkupSafe-2.1.1-cp310-cp310-win_amd64.whl", hash = "sha256:dda30ba7e87fbbb7eab1ec9f58678558fd9a6b8b853530e176eabd064da81417"},
-    {file = "MarkupSafe-2.1.1-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:671cd1187ed5e62818414afe79ed29da836dde67166a9fac6d435873c44fdd02"},
-    {file = "MarkupSafe-2.1.1-cp37-cp37m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:3799351e2336dc91ea70b034983ee71cf2f9533cdff7c14c90ea126bfd95d65a"},
-    {file = "MarkupSafe-2.1.1-cp37-cp37m-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:e72591e9ecd94d7feb70c1cbd7be7b3ebea3f548870aa91e2732960fa4d57a37"},
-    {file = "MarkupSafe-2.1.1-cp37-cp37m-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:6fbf47b5d3728c6aea2abb0589b5d30459e369baa772e0f37a0320185e87c980"},
-    {file = "MarkupSafe-2.1.1-cp37-cp37m-musllinux_1_1_aarch64.whl", hash = "sha256:d5ee4f386140395a2c818d149221149c54849dfcfcb9f1debfe07a8b8bd63f9a"},
-    {file = "MarkupSafe-2.1.1-cp37-cp37m-musllinux_1_1_i686.whl", hash = "sha256:bcb3ed405ed3222f9904899563d6fc492ff75cce56cba05e32eff40e6acbeaa3"},
-    {file = "MarkupSafe-2.1.1-cp37-cp37m-musllinux_1_1_x86_64.whl", hash = "sha256:e1c0b87e09fa55a220f058d1d49d3fb8df88fbfab58558f1198e08c1e1de842a"},
-    {file = "MarkupSafe-2.1.1-cp37-cp37m-win32.whl", hash = "sha256:8dc1c72a69aa7e082593c4a203dcf94ddb74bb5c8a731e4e1eb68d031e8498ff"},
-    {file = "MarkupSafe-2.1.1-cp37-cp37m-win_amd64.whl", hash = "sha256:97a68e6ada378df82bc9f16b800ab77cbf4b2fada0081794318520138c088e4a"},
-    {file = "MarkupSafe-2.1.1-cp38-cp38-macosx_10_9_universal2.whl", hash = "sha256:e8c843bbcda3a2f1e3c2ab25913c80a3c5376cd00c6e8c4a86a89a28c8dc5452"},
-    {file = "MarkupSafe-2.1.1-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:0212a68688482dc52b2d45013df70d169f542b7394fc744c02a57374a4207003"},
-    {file = "MarkupSafe-2.1.1-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:8e576a51ad59e4bfaac456023a78f6b5e6e7651dcd383bcc3e18d06f9b55d6d1"},
-    {file = "MarkupSafe-2.1.1-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:4b9fe39a2ccc108a4accc2676e77da025ce383c108593d65cc909add5c3bd601"},
-    {file = "MarkupSafe-2.1.1-cp38-cp38-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:96e37a3dc86e80bf81758c152fe66dbf60ed5eca3d26305edf01892257049925"},
-    {file = "MarkupSafe-2.1.1-cp38-cp38-musllinux_1_1_aarch64.whl", hash = "sha256:6d0072fea50feec76a4c418096652f2c3238eaa014b2f94aeb1d56a66b41403f"},
-    {file = "MarkupSafe-2.1.1-cp38-cp38-musllinux_1_1_i686.whl", hash = "sha256:089cf3dbf0cd6c100f02945abeb18484bd1ee57a079aefd52cffd17fba910b88"},
-    {file = "MarkupSafe-2.1.1-cp38-cp38-musllinux_1_1_x86_64.whl", hash = "sha256:6a074d34ee7a5ce3effbc526b7083ec9731bb3cbf921bbe1d3005d4d2bdb3a63"},
-    {file = "MarkupSafe-2.1.1-cp38-cp38-win32.whl", hash = "sha256:421be9fbf0ffe9ffd7a378aafebbf6f4602d564d34be190fc19a193232fd12b1"},
-    {file = "MarkupSafe-2.1.1-cp38-cp38-win_amd64.whl", hash = "sha256:fc7b548b17d238737688817ab67deebb30e8073c95749d55538ed473130ec0c7"},
-    {file = "MarkupSafe-2.1.1-cp39-cp39-macosx_10_9_universal2.whl", hash = "sha256:e04e26803c9c3851c931eac40c695602c6295b8d432cbe78609649ad9bd2da8a"},
-    {file = "MarkupSafe-2.1.1-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:b87db4360013327109564f0e591bd2a3b318547bcef31b468a92ee504d07ae4f"},
-    {file = "MarkupSafe-2.1.1-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:99a2a507ed3ac881b975a2976d59f38c19386d128e7a9a18b7df6fff1fd4c1d6"},
-    {file = "MarkupSafe-2.1.1-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:56442863ed2b06d19c37f94d999035e15ee982988920e12a5b4ba29b62ad1f77"},
-    {file = "MarkupSafe-2.1.1-cp39-cp39-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:3ce11ee3f23f79dbd06fb3d63e2f6af7b12db1d46932fe7bd8afa259a5996603"},
-    {file = "MarkupSafe-2.1.1-cp39-cp39-musllinux_1_1_aarch64.whl", hash = "sha256:33b74d289bd2f5e527beadcaa3f401e0df0a89927c1559c8566c066fa4248ab7"},
-    {file = "MarkupSafe-2.1.1-cp39-cp39-musllinux_1_1_i686.whl", hash = "sha256:43093fb83d8343aac0b1baa75516da6092f58f41200907ef92448ecab8825135"},
-    {file = "MarkupSafe-2.1.1-cp39-cp39-musllinux_1_1_x86_64.whl", hash = "sha256:8e3dcf21f367459434c18e71b2a9532d96547aef8a871872a5bd69a715c15f96"},
-    {file = "MarkupSafe-2.1.1-cp39-cp39-win32.whl", hash = "sha256:d4306c36ca495956b6d568d276ac11fdd9c30a36f1b6eb928070dc5360b22e1c"},
-    {file = "MarkupSafe-2.1.1-cp39-cp39-win_amd64.whl", hash = "sha256:46d00d6cfecdde84d40e572d63735ef81423ad31184100411e6e3388d405e247"},
-    {file = "MarkupSafe-2.1.1.tar.gz", hash = "sha256:7f91197cc9e48f989d12e4e6fbc46495c446636dfc81b9ccf50bb0ec74b91d4b"},
+    {file = "MarkupSafe-2.1.2-cp310-cp310-macosx_10_9_universal2.whl", hash = "sha256:665a36ae6f8f20a4676b53224e33d456a6f5a72657d9c83c2aa00765072f31f7"},
+    {file = "MarkupSafe-2.1.2-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:340bea174e9761308703ae988e982005aedf427de816d1afe98147668cc03036"},
+    {file = "MarkupSafe-2.1.2-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:22152d00bf4a9c7c83960521fc558f55a1adbc0631fbb00a9471e097b19d72e1"},
+    {file = "MarkupSafe-2.1.2-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:28057e985dace2f478e042eaa15606c7efccb700797660629da387eb289b9323"},
+    {file = "MarkupSafe-2.1.2-cp310-cp310-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:ca244fa73f50a800cf8c3ebf7fd93149ec37f5cb9596aa8873ae2c1d23498601"},
+    {file = "MarkupSafe-2.1.2-cp310-cp310-musllinux_1_1_aarch64.whl", hash = "sha256:d9d971ec1e79906046aa3ca266de79eac42f1dbf3612a05dc9368125952bd1a1"},
+    {file = "MarkupSafe-2.1.2-cp310-cp310-musllinux_1_1_i686.whl", hash = "sha256:7e007132af78ea9df29495dbf7b5824cb71648d7133cf7848a2a5dd00d36f9ff"},
+    {file = "MarkupSafe-2.1.2-cp310-cp310-musllinux_1_1_x86_64.whl", hash = "sha256:7313ce6a199651c4ed9d7e4cfb4aa56fe923b1adf9af3b420ee14e6d9a73df65"},
+    {file = "MarkupSafe-2.1.2-cp310-cp310-win32.whl", hash = "sha256:c4a549890a45f57f1ebf99c067a4ad0cb423a05544accaf2b065246827ed9603"},
+    {file = "MarkupSafe-2.1.2-cp310-cp310-win_amd64.whl", hash = "sha256:835fb5e38fd89328e9c81067fd642b3593c33e1e17e2fdbf77f5676abb14a156"},
+    {file = "MarkupSafe-2.1.2-cp311-cp311-macosx_10_9_universal2.whl", hash = "sha256:2ec4f2d48ae59bbb9d1f9d7efb9236ab81429a764dedca114f5fdabbc3788013"},
+    {file = "MarkupSafe-2.1.2-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:608e7073dfa9e38a85d38474c082d4281f4ce276ac0010224eaba11e929dd53a"},
+    {file = "MarkupSafe-2.1.2-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:65608c35bfb8a76763f37036547f7adfd09270fbdbf96608be2bead319728fcd"},
+    {file = "MarkupSafe-2.1.2-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:f2bfb563d0211ce16b63c7cb9395d2c682a23187f54c3d79bfec33e6705473c6"},
+    {file = "MarkupSafe-2.1.2-cp311-cp311-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:da25303d91526aac3672ee6d49a2f3db2d9502a4a60b55519feb1a4c7714e07d"},
+    {file = "MarkupSafe-2.1.2-cp311-cp311-musllinux_1_1_aarch64.whl", hash = "sha256:9cad97ab29dfc3f0249b483412c85c8ef4766d96cdf9dcf5a1e3caa3f3661cf1"},
+    {file = "MarkupSafe-2.1.2-cp311-cp311-musllinux_1_1_i686.whl", hash = "sha256:085fd3201e7b12809f9e6e9bc1e5c96a368c8523fad5afb02afe3c051ae4afcc"},
+    {file = "MarkupSafe-2.1.2-cp311-cp311-musllinux_1_1_x86_64.whl", hash = "sha256:1bea30e9bf331f3fef67e0a3877b2288593c98a21ccb2cf29b74c581a4eb3af0"},
+    {file = "MarkupSafe-2.1.2-cp311-cp311-win32.whl", hash = "sha256:7df70907e00c970c60b9ef2938d894a9381f38e6b9db73c5be35e59d92e06625"},
+    {file = "MarkupSafe-2.1.2-cp311-cp311-win_amd64.whl", hash = "sha256:e55e40ff0cc8cc5c07996915ad367fa47da6b3fc091fdadca7f5403239c5fec3"},
+    {file = "MarkupSafe-2.1.2-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:a6e40afa7f45939ca356f348c8e23048e02cb109ced1eb8420961b2f40fb373a"},
+    {file = "MarkupSafe-2.1.2-cp37-cp37m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:cf877ab4ed6e302ec1d04952ca358b381a882fbd9d1b07cccbfd61783561f98a"},
+    {file = "MarkupSafe-2.1.2-cp37-cp37m-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:63ba06c9941e46fa389d389644e2d8225e0e3e5ebcc4ff1ea8506dce646f8c8a"},
+    {file = "MarkupSafe-2.1.2-cp37-cp37m-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:f1cd098434e83e656abf198f103a8207a8187c0fc110306691a2e94a78d0abb2"},
+    {file = "MarkupSafe-2.1.2-cp37-cp37m-musllinux_1_1_aarch64.whl", hash = "sha256:55f44b440d491028addb3b88f72207d71eeebfb7b5dbf0643f7c023ae1fba619"},
+    {file = "MarkupSafe-2.1.2-cp37-cp37m-musllinux_1_1_i686.whl", hash = "sha256:a6f2fcca746e8d5910e18782f976489939d54a91f9411c32051b4aab2bd7c513"},
+    {file = "MarkupSafe-2.1.2-cp37-cp37m-musllinux_1_1_x86_64.whl", hash = "sha256:0b462104ba25f1ac006fdab8b6a01ebbfbce9ed37fd37fd4acd70c67c973e460"},
+    {file = "MarkupSafe-2.1.2-cp37-cp37m-win32.whl", hash = "sha256:7668b52e102d0ed87cb082380a7e2e1e78737ddecdde129acadb0eccc5423859"},
+    {file = "MarkupSafe-2.1.2-cp37-cp37m-win_amd64.whl", hash = "sha256:6d6607f98fcf17e534162f0709aaad3ab7a96032723d8ac8750ffe17ae5a0666"},
+    {file = "MarkupSafe-2.1.2-cp38-cp38-macosx_10_9_universal2.whl", hash = "sha256:a806db027852538d2ad7555b203300173dd1b77ba116de92da9afbc3a3be3eed"},
+    {file = "MarkupSafe-2.1.2-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:a4abaec6ca3ad8660690236d11bfe28dfd707778e2442b45addd2f086d6ef094"},
+    {file = "MarkupSafe-2.1.2-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:f03a532d7dee1bed20bc4884194a16160a2de9ffc6354b3878ec9682bb623c54"},
+    {file = "MarkupSafe-2.1.2-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:4cf06cdc1dda95223e9d2d3c58d3b178aa5dacb35ee7e3bbac10e4e1faacb419"},
+    {file = "MarkupSafe-2.1.2-cp38-cp38-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:22731d79ed2eb25059ae3df1dfc9cb1546691cc41f4e3130fe6bfbc3ecbbecfa"},
+    {file = "MarkupSafe-2.1.2-cp38-cp38-musllinux_1_1_aarch64.whl", hash = "sha256:f8ffb705ffcf5ddd0e80b65ddf7bed7ee4f5a441ea7d3419e861a12eaf41af58"},
+    {file = "MarkupSafe-2.1.2-cp38-cp38-musllinux_1_1_i686.whl", hash = "sha256:8db032bf0ce9022a8e41a22598eefc802314e81b879ae093f36ce9ddf39ab1ba"},
+    {file = "MarkupSafe-2.1.2-cp38-cp38-musllinux_1_1_x86_64.whl", hash = "sha256:2298c859cfc5463f1b64bd55cb3e602528db6fa0f3cfd568d3605c50678f8f03"},
+    {file = "MarkupSafe-2.1.2-cp38-cp38-win32.whl", hash = "sha256:50c42830a633fa0cf9e7d27664637532791bfc31c731a87b202d2d8ac40c3ea2"},
+    {file = "MarkupSafe-2.1.2-cp38-cp38-win_amd64.whl", hash = "sha256:bb06feb762bade6bf3c8b844462274db0c76acc95c52abe8dbed28ae3d44a147"},
+    {file = "MarkupSafe-2.1.2-cp39-cp39-macosx_10_9_universal2.whl", hash = "sha256:99625a92da8229df6d44335e6fcc558a5037dd0a760e11d84be2260e6f37002f"},
+    {file = "MarkupSafe-2.1.2-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:8bca7e26c1dd751236cfb0c6c72d4ad61d986e9a41bbf76cb445f69488b2a2bd"},
+    {file = "MarkupSafe-2.1.2-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:40627dcf047dadb22cd25ea7ecfe9cbf3bbbad0482ee5920b582f3809c97654f"},
+    {file = "MarkupSafe-2.1.2-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:40dfd3fefbef579ee058f139733ac336312663c6706d1163b82b3003fb1925c4"},
+    {file = "MarkupSafe-2.1.2-cp39-cp39-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:090376d812fb6ac5f171e5938e82e7f2d7adc2b629101cec0db8b267815c85e2"},
+    {file = "MarkupSafe-2.1.2-cp39-cp39-musllinux_1_1_aarch64.whl", hash = "sha256:2e7821bffe00aa6bd07a23913b7f4e01328c3d5cc0b40b36c0bd81d362faeb65"},
+    {file = "MarkupSafe-2.1.2-cp39-cp39-musllinux_1_1_i686.whl", hash = "sha256:c0a33bc9f02c2b17c3ea382f91b4db0e6cde90b63b296422a939886a7a80de1c"},
+    {file = "MarkupSafe-2.1.2-cp39-cp39-musllinux_1_1_x86_64.whl", hash = "sha256:b8526c6d437855442cdd3d87eede9c425c4445ea011ca38d937db299382e6fa3"},
+    {file = "MarkupSafe-2.1.2-cp39-cp39-win32.whl", hash = "sha256:137678c63c977754abe9086a3ec011e8fd985ab90631145dfb9294ad09c102a7"},
+    {file = "MarkupSafe-2.1.2-cp39-cp39-win_amd64.whl", hash = "sha256:0576fe974b40a400449768941d5d0858cc624e3249dfd1e0c33674e5c7ca7aed"},
+    {file = "MarkupSafe-2.1.2.tar.gz", hash = "sha256:abcabc8c2b26036d62d4c746381a6f7cf60aafcc653198ad678306986b09450d"},
 ]
 
 [[package]]
@@ -494,14 +601,14 @@ files = [
 
 [[package]]
 name = "mypy-extensions"
-version = "0.4.3"
-description = "Experimental type system extensions for programs checked with the mypy typechecker."
+version = "1.0.0"
+description = "Type system extensions for programs checked with the mypy type checker."
 category = "dev"
 optional = false
-python-versions = "*"
+python-versions = ">=3.5"
 files = [
-    {file = "mypy_extensions-0.4.3-py2.py3-none-any.whl", hash = "sha256:090fedd75945a69ae91ce1303b5824f428daf5a028d2f6ab8a299250a846f15d"},
-    {file = "mypy_extensions-0.4.3.tar.gz", hash = "sha256:2d82818f5bb3e369420cb3c4060a7970edba416647068eb4c5343488a6c604a8"},
+    {file = "mypy_extensions-1.0.0-py3-none-any.whl", hash = "sha256:4392f6c0eb8a5668a69e23d168ffa70f0be9ccfd32b5cc2d26a34ae5b844552d"},
+    {file = "mypy_extensions-1.0.0.tar.gz", hash = "sha256:75dbf8955dc00442a438fc4d0666508a9a97b6bd41aa2f0ffe9d2f2725af0782"},
 ]
 
 [[package]]
@@ -544,31 +651,31 @@ files = [
 
 [[package]]
 name = "pathspec"
-version = "0.10.3"
+version = "0.11.0"
 description = "Utility library for gitignore style pattern matching of file paths."
 category = "dev"
 optional = false
 python-versions = ">=3.7"
 files = [
-    {file = "pathspec-0.10.3-py3-none-any.whl", hash = "sha256:3c95343af8b756205e2aba76e843ba9520a24dd84f68c22b9f93251507509dd6"},
-    {file = "pathspec-0.10.3.tar.gz", hash = "sha256:56200de4077d9d0791465aa9095a01d421861e405b5096955051deefd697d6f6"},
+    {file = "pathspec-0.11.0-py3-none-any.whl", hash = "sha256:3a66eb970cbac598f9e5ccb5b2cf58930cd8e3ed86d393d541eaf2d8b1705229"},
+    {file = "pathspec-0.11.0.tar.gz", hash = "sha256:64d338d4e0914e91c1792321e6907b5a593f1ab1851de7fc269557a21b30ebbc"},
 ]
 
 [[package]]
 name = "platformdirs"
-version = "2.6.2"
+version = "3.0.0"
 description = "A small Python package for determining appropriate platform-specific dirs, e.g. a \"user data dir\"."
 category = "dev"
 optional = false
 python-versions = ">=3.7"
 files = [
-    {file = "platformdirs-2.6.2-py3-none-any.whl", hash = "sha256:83c8f6d04389165de7c9b6f0c682439697887bca0aa2f1c87ef1826be3584490"},
-    {file = "platformdirs-2.6.2.tar.gz", hash = "sha256:e1fea1fe471b9ff8332e229df3cb7de4f53eeea4998d3b6bfff542115e998bd2"},
+    {file = "platformdirs-3.0.0-py3-none-any.whl", hash = "sha256:b1d5eb14f221506f50d6604a561f4c5786d9e80355219694a1b244bcd96f4567"},
+    {file = "platformdirs-3.0.0.tar.gz", hash = "sha256:8a1228abb1ef82d788f74139988b137e78692984ec7b08eaa6c65f1723af28f9"},
 ]
 
 [package.extras]
-docs = ["furo (>=2022.12.7)", "proselint (>=0.13)", "sphinx (>=5.3)", "sphinx-autodoc-typehints (>=1.19.5)"]
-test = ["appdirs (==1.4.4)", "covdefaults (>=2.2.2)", "pytest (>=7.2)", "pytest-cov (>=4)", "pytest-mock (>=3.10)"]
+docs = ["furo (>=2022.12.7)", "proselint (>=0.13)", "sphinx (>=6.1.3)", "sphinx-autodoc-typehints (>=1.22,!=1.23.4)"]
+test = ["appdirs (==1.4.4)", "covdefaults (>=2.2.2)", "pytest (>=7.2.1)", "pytest-cov (>=4)", "pytest-mock (>=3.10)"]
 
 [[package]]
 name = "pluggy"
@@ -588,14 +695,14 @@ testing = ["pytest", "pytest-benchmark"]
 
 [[package]]
 name = "pre-commit"
-version = "3.0.3"
+version = "3.0.4"
 description = "A framework for managing and maintaining multi-language pre-commit hooks."
 category = "dev"
 optional = false
 python-versions = ">=3.8"
 files = [
-    {file = "pre_commit-3.0.3-py2.py3-none-any.whl", hash = "sha256:83e2e8cc5cbb3691cff9474494816918d865120768aa36c9eda6185126667d21"},
-    {file = "pre_commit-3.0.3.tar.gz", hash = "sha256:4187e74fda38f0f700256fb2f757774385503b04292047d0899fc913207f314b"},
+    {file = "pre_commit-3.0.4-py2.py3-none-any.whl", hash = "sha256:9e3255edb0c9e7fe9b4f328cb3dc86069f8fdc38026f1bf521018a05eaf4d67b"},
+    {file = "pre_commit-3.0.4.tar.gz", hash = "sha256:bc4687478d55578c4ac37272fe96df66f73d9b5cf81be6f28627d4e712e752d5"},
 ]
 
 [package.dependencies]
@@ -667,14 +774,14 @@ testing = ["fields", "hunter", "process-tests", "pytest-xdist", "six", "virtuale
 
 [[package]]
 name = "pytest-xdist"
-version = "3.1.0"
+version = "3.2.0"
 description = "pytest xdist plugin for distributed testing, most importantly across multiple CPUs"
 category = "dev"
 optional = false
 python-versions = ">=3.7"
 files = [
-    {file = "pytest-xdist-3.1.0.tar.gz", hash = "sha256:40fdb8f3544921c5dfcd486ac080ce22870e71d82ced6d2e78fa97c2addd480c"},
-    {file = "pytest_xdist-3.1.0-py3-none-any.whl", hash = "sha256:70a76f191d8a1d2d6be69fc440cdf85f3e4c03c08b520fd5dc5d338d6cf07d89"},
+    {file = "pytest-xdist-3.2.0.tar.gz", hash = "sha256:fa10f95a2564cd91652f2d132725183c3b590d9fdcdec09d3677386ecf4c1ce9"},
+    {file = "pytest_xdist-3.2.0-py3-none-any.whl", hash = "sha256:336098e3bbd8193276867cc87db8b22903c3927665dff9d1ac8684c02f597b68"},
 ]
 
 [package.dependencies]
@@ -718,14 +825,14 @@ cli = ["click (>=5.0)"]
 
 [[package]]
 name = "python-slugify"
-version = "7.0.0"
+version = "8.0.0"
 description = "A Python slugify application that also handles Unicode"
 category = "dev"
 optional = false
 python-versions = ">=3.7"
 files = [
-    {file = "python-slugify-7.0.0.tar.gz", hash = "sha256:7a0f21a39fa6c1c4bf2e5984c9b9ae944483fd10b54804cb0e23a3ccd4954f0b"},
-    {file = "python_slugify-7.0.0-py2.py3-none-any.whl", hash = "sha256:003aee64f9fd955d111549f96c4b58a3f40b9319383c70fad6277a4974bbf570"},
+    {file = "python-slugify-8.0.0.tar.gz", hash = "sha256:f1da83f3c7ab839b3f84543470cd95bdb5a81f1a0b80fed502f78b7dca256062"},
+    {file = "python_slugify-8.0.0-py2.py3-none-any.whl", hash = "sha256:51f217508df20a6c166c7821683384b998560adcf8f19a6c2ca8b460528ccd9c"},
 ]
 
 [package.dependencies]
@@ -808,18 +915,18 @@ use-chardet-on-py3 = ["chardet (>=3.0.2,<6)"]
 
 [[package]]
 name = "setuptools"
-version = "65.6.3"
+version = "67.2.0"
 description = "Easily download, build, install, upgrade, and uninstall Python packages"
 category = "dev"
 optional = false
 python-versions = ">=3.7"
 files = [
-    {file = "setuptools-65.6.3-py3-none-any.whl", hash = "sha256:57f6f22bde4e042978bcd50176fdb381d7c21a9efa4041202288d3737a0c6a54"},
-    {file = "setuptools-65.6.3.tar.gz", hash = "sha256:a7620757bf984b58deaf32fc8a4577a9bbc0850cf92c20e1ce41c38c19e5fb75"},
+    {file = "setuptools-67.2.0-py3-none-any.whl", hash = "sha256:16ccf598aab3b506593c17378473978908a2734d7336755a8769b480906bec1c"},
+    {file = "setuptools-67.2.0.tar.gz", hash = "sha256:b440ee5f7e607bb8c9de15259dba2583dd41a38879a7abc1d43a71c59524da48"},
 ]
 
 [package.extras]
-docs = ["furo", "jaraco.packaging (>=9)", "jaraco.tidelift (>=1.4)", "pygments-github-lexers (==0.0.5)", "rst.linker (>=1.9)", "sphinx (>=3.5)", "sphinx-favicon", "sphinx-hoverxref (<2)", "sphinx-inline-tabs", "sphinx-notfound-page (==0.8.3)", "sphinx-reredirects", "sphinxcontrib-towncrier"]
+docs = ["furo", "jaraco.packaging (>=9)", "jaraco.tidelift (>=1.4)", "pygments-github-lexers (==0.0.5)", "rst.linker (>=1.9)", "sphinx (>=3.5)", "sphinx-favicon", "sphinx-hoverxref (<2)", "sphinx-inline-tabs", "sphinx-lint", "sphinx-notfound-page (==0.8.3)", "sphinx-reredirects", "sphinxcontrib-towncrier"]
 testing = ["build[virtualenv]", "filelock (>=3.4.0)", "flake8 (<5)", "flake8-2020", "ini2toml[lite] (>=0.9)", "jaraco.envs (>=2.2)", "jaraco.path (>=3.2.0)", "pip (>=19.1)", "pip-run (>=8.8)", "pytest (>=6)", "pytest-black (>=0.3.7)", "pytest-checkdocs (>=2.4)", "pytest-cov", "pytest-enabler (>=1.3)", "pytest-flake8", "pytest-mypy (>=0.9.1)", "pytest-perf", "pytest-timeout", "pytest-xdist", "tomli-w (>=1.0.0)", "virtualenv (>=13.0.0)", "wheel"]
 testing-integration = ["build[virtualenv]", "filelock (>=3.4.0)", "jaraco.envs (>=2.2)", "jaraco.path (>=3.2.0)", "pytest", "pytest-enabler", "pytest-xdist", "tomli", "virtualenv (>=13.0.0)", "wheel"]
 
@@ -861,18 +968,18 @@ files = [
 
 [[package]]
 name = "tox"
-version = "4.4.4"
+version = "4.4.5"
 description = "tox is a generic virtualenv management and test command line tool"
 category = "dev"
 optional = false
 python-versions = ">=3.7"
 files = [
-    {file = "tox-4.4.4-py3-none-any.whl", hash = "sha256:1195820ca35b141ce5ab040c9dfad8f03de6897c9bd867c6151dfb7dc58e64cd"},
-    {file = "tox-4.4.4.tar.gz", hash = "sha256:e1ef01d9e9503b1218511f74517dc3f0008c8b5e0cc53ab7f51ff3c2ca63b349"},
+    {file = "tox-4.4.5-py3-none-any.whl", hash = "sha256:1081864f1a1393ffa11ebe9beaa280349020579310d217a594a4e7b6124c5425"},
+    {file = "tox-4.4.5.tar.gz", hash = "sha256:f9bc83c5da8666baa2a4d4e884bbbda124fe646e4b1c0e412949cecc2b6e8f90"},
 ]
 
 [package.dependencies]
-cachetools = ">=5.2.1"
+cachetools = ">=5.3"
 chardet = ">=5.1"
 colorama = ">=0.4.6"
 filelock = ">=3.9"
@@ -883,8 +990,8 @@ pyproject-api = ">=1.5"
 virtualenv = ">=20.17.1"
 
 [package.extras]
-docs = ["furo (>=2022.12.7)", "sphinx (>=6.1.3)", "sphinx-argparse-cli (>=1.11)", "sphinx-autodoc-typehints (>=1.20.1)", "sphinx-copybutton (>=0.5.1)", "sphinx-inline-tabs (>=2022.1.2b11)", "sphinxcontrib-towncrier (>=0.2.1a0)", "towncrier (>=22.12)"]
-testing = ["build[virtualenv] (>=0.9)", "covdefaults (>=2.2.2)", "devpi-process (>=0.3)", "diff-cover (>=7.3)", "distlib (>=0.3.6)", "flaky (>=3.7)", "hatch-vcs (>=0.3)", "hatchling (>=1.12.2)", "psutil (>=5.9.4)", "pytest (>=7.2)", "pytest-cov (>=4)", "pytest-mock (>=3.10)", "pytest-xdist (>=3.1)", "re-assert (>=1.1)", "time-machine (>=2.8.2)", "wheel (>=0.38.4)"]
+docs = ["furo (>=2022.12.7)", "sphinx (>=6.1.3)", "sphinx-argparse-cli (>=1.11)", "sphinx-autodoc-typehints (>=1.22,!=1.23.4)", "sphinx-copybutton (>=0.5.1)", "sphinx-inline-tabs (>=2022.1.2b11)", "sphinxcontrib-towncrier (>=0.2.1a0)", "towncrier (>=22.12)"]
+testing = ["build[virtualenv] (>=0.10)", "covdefaults (>=2.2.2)", "devpi-process (>=0.3)", "diff-cover (>=7.4)", "distlib (>=0.3.6)", "flaky (>=3.7)", "hatch-vcs (>=0.3)", "hatchling (>=1.12.2)", "psutil (>=5.9.4)", "pytest (>=7.2.1)", "pytest-cov (>=4)", "pytest-mock (>=3.10)", "pytest-xdist (>=3.1)", "re-assert (>=1.1)", "time-machine (>=2.9)", "wheel (>=0.38.4)"]
 
 [[package]]
 name = "tqdm"
@@ -909,14 +1016,14 @@ telegram = ["requests"]
 
 [[package]]
 name = "urllib3"
-version = "1.26.13"
+version = "1.26.14"
 description = "HTTP library with thread-safe connection pooling, file post, and more."
 category = "main"
 optional = false
 python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*, !=3.5.*"
 files = [
-    {file = "urllib3-1.26.13-py2.py3-none-any.whl", hash = "sha256:47cc05d99aaa09c9e72ed5809b60e7ba354e64b59c9c173ac3018642d8bb41fc"},
-    {file = "urllib3-1.26.13.tar.gz", hash = "sha256:c083dd0dce68dbfbe1129d5271cb90f9447dea7d52097c6e0126120c521ddea8"},
+    {file = "urllib3-1.26.14-py2.py3-none-any.whl", hash = "sha256:75edcdc2f7d85b137124a6c3c9fc3933cdeaa12ecb9a6a959f22797a0feca7e1"},
+    {file = "urllib3-1.26.14.tar.gz", hash = "sha256:076907bf8fd355cde77728471316625a4d2f7e713c125f51953bb5b3eecf4f72"},
 ]
 
 [package.extras]
@@ -926,26 +1033,26 @@ socks = ["PySocks (>=1.5.6,!=1.5.7,<2.0)"]
 
 [[package]]
 name = "virtualenv"
-version = "20.17.1"
+version = "20.19.0"
 description = "Virtual Python Environment builder"
 category = "dev"
 optional = false
-python-versions = ">=3.6"
+python-versions = ">=3.7"
 files = [
-    {file = "virtualenv-20.17.1-py3-none-any.whl", hash = "sha256:ce3b1684d6e1a20a3e5ed36795a97dfc6af29bc3970ca8dab93e11ac6094b3c4"},
-    {file = "virtualenv-20.17.1.tar.gz", hash = "sha256:f8b927684efc6f1cc206c9db297a570ab9ad0e51c16fa9e45487d36d1905c058"},
+    {file = "virtualenv-20.19.0-py3-none-any.whl", hash = "sha256:54eb59e7352b573aa04d53f80fc9736ed0ad5143af445a1e539aada6eb947dd1"},
+    {file = "virtualenv-20.19.0.tar.gz", hash = "sha256:37a640ba82ed40b226599c522d411e4be5edb339a0c0de030c0dc7b646d61590"},
 ]
 
 [package.dependencies]
 distlib = ">=0.3.6,<1"
 filelock = ">=3.4.1,<4"
-platformdirs = ">=2.4,<3"
+platformdirs = ">=2.4,<4"
 
 [package.extras]
-docs = ["proselint (>=0.13)", "sphinx (>=5.3)", "sphinx-argparse (>=0.3.2)", "sphinx-rtd-theme (>=1)", "towncrier (>=22.8)"]
-testing = ["coverage (>=6.2)", "coverage-enable-subprocess (>=1)", "flaky (>=3.7)", "packaging (>=21.3)", "pytest (>=7.0.1)", "pytest-env (>=0.6.2)", "pytest-freezegun (>=0.4.2)", "pytest-mock (>=3.6.1)", "pytest-randomly (>=3.10.3)", "pytest-timeout (>=2.1)"]
+docs = ["furo (>=2022.12.7)", "proselint (>=0.13)", "sphinx (>=6.1.3)", "sphinx-argparse (>=0.4)", "sphinxcontrib-towncrier (>=0.2.1a0)", "towncrier (>=22.12)"]
+test = ["covdefaults (>=2.2.2)", "coverage (>=7.1)", "coverage-enable-subprocess (>=1)", "flaky (>=3.7)", "packaging (>=23)", "pytest (>=7.2.1)", "pytest-env (>=0.8.1)", "pytest-freezegun (>=0.4.2)", "pytest-mock (>=3.10)", "pytest-randomly (>=3.12)", "pytest-timeout (>=2.1)"]
 
 [metadata]
 lock-version = "2.0"
 python-versions = "^3.11"
-content-hash = "5d3f34375e7c44d11d5cc37e94d1fca844df06976ae43d5db405d2eca792f3b2"
+content-hash = "635a9b2e8a94649843d01f562597a5a2061802ee31d82714208890bd33d4d2ad"
diff --git a/pyproject.toml b/pyproject.toml
index b9fafedb..50609a10 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -10,20 +10,20 @@ python = "^3.11"
 anytree = "^2.8.0"
 click = "^8.1.3"
 requests = "^2.28.2"
-beautifulsoup4 = "^4.11.1"
+beautifulsoup4 = "^4.11.2"
 tqdm = "^4.64.1"
 parse = "^1.19.0"
 more-itertools = "^9.0.0"
 
 [tool.poetry.dev-dependencies]
-black = "^22.12.0"
+black = "^23.1.0"
 cookiecutter = "^2.1.1"
 pytest = "^7.2.1"
 pytest-cov = "^4.0.0"
-pytest-xdist = "^3.1.0"
+pytest-xdist = "^3.2.0"
 python-dotenv = "^0.21.1"
-tox = "^4.4.4"
-pre-commit = "^3.0.3"
+tox = "^4.4.5"
+pre-commit = "^3.0.4"
 isort = "^5.12.0"
 
 [tool.poetry.scripts]

From 0758106de1a03434f94c48d07ec69c98ab90ca9c Mon Sep 17 00:00:00 2001
From: Roel Adriaans <roel@adriaans.org>
Date: Sun, 30 Jul 2023 21:18:16 +0200
Subject: [PATCH 279/371] First import of advent of code utils lib, needs
 restruct

---
 .gitignore                              | 283 ++++++++++++
 .pre-commit-config.yaml                 |  37 ++
 LICENSE                                 |  21 +
 README.md                               |   3 +
 mypy.ini                                |   4 +
 poetry.lock                             | 576 ++++++++++++++++++++++++
 pyproject.toml                          |  25 +
 src/adventofcodeutils/__init__.py       |   0
 src/adventofcodeutils/abstract.py       |  37 ++
 src/adventofcodeutils/graph.py          |  89 ++++
 src/adventofcodeutils/node.py           |  41 ++
 src/adventofcodeutils/parsing.py        |  41 ++
 src/adventofcodeutils/point.py          |  30 ++
 src/adventofcodeutils/priority_queue.py |  30 ++
 src/adventofcodeutils/queue.py          |  29 ++
 src/adventofcodeutils/stack.py          |  25 +
 tests/__init__.py                       |   0
 tests/test_advent_utils.py              |  53 +++
 tests/test_graph.py                     |  20 +
 tests/test_node.py                      |  13 +
 tests/test_point.py                     |  60 +++
 tests/test_priority_queue.py            |  32 ++
 tests/test_queue.py                     |  31 ++
 tests/test_stack.py                     |  37 ++
 tox.ini                                 | 113 +++++
 25 files changed, 1630 insertions(+)
 create mode 100644 .gitignore
 create mode 100644 .pre-commit-config.yaml
 create mode 100644 LICENSE
 create mode 100644 README.md
 create mode 100644 mypy.ini
 create mode 100644 poetry.lock
 create mode 100644 pyproject.toml
 create mode 100644 src/adventofcodeutils/__init__.py
 create mode 100644 src/adventofcodeutils/abstract.py
 create mode 100644 src/adventofcodeutils/graph.py
 create mode 100644 src/adventofcodeutils/node.py
 create mode 100644 src/adventofcodeutils/parsing.py
 create mode 100644 src/adventofcodeutils/point.py
 create mode 100644 src/adventofcodeutils/priority_queue.py
 create mode 100644 src/adventofcodeutils/queue.py
 create mode 100644 src/adventofcodeutils/stack.py
 create mode 100644 tests/__init__.py
 create mode 100644 tests/test_advent_utils.py
 create mode 100644 tests/test_graph.py
 create mode 100644 tests/test_node.py
 create mode 100644 tests/test_point.py
 create mode 100644 tests/test_priority_queue.py
 create mode 100644 tests/test_queue.py
 create mode 100644 tests/test_stack.py
 create mode 100644 tox.ini

diff --git a/.gitignore b/.gitignore
new file mode 100644
index 00000000..f1e7ffbf
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,283 @@
+
+# Created by https://www.gitignore.io/api/test,python
+# Edit at https://www.gitignore.io/?templates=test,python
+
+### Python ###
+# Byte-compiled / optimized / DLL files
+__pycache__/
+*.py[cod]
+*$py.class
+
+# C extensions
+*.so
+
+# Distribution / packaging
+.Python
+build/
+develop-eggs/
+dist/
+downloads/
+eggs/
+.eggs/
+lib/
+lib64/
+parts/
+sdist/
+var/
+wheels/
+pip-wheel-metadata/
+share/python-wheels/
+*.egg-info/
+.installed.cfg
+*.egg
+MANIFEST
+
+# PyInstaller
+#  Usually these files are written by a python script from a template
+#  before PyInstaller builds the exe, so as to inject date/other infos into it.
+*.manifest
+*.spec
+
+# Installer logs
+pip-log.txt
+pip-delete-this-directory.txt
+
+# Unit test / coverage reports
+htmlcov/
+.typecov/
+.tox/
+.nox/
+.coverage
+.coverage.*
+.cache
+nosetests.xml
+coverage.xml
+junit.xml
+*.cover
+.hypothesis/
+.pytest_cache/
+
+# Translations
+*.mo
+*.pot
+
+# Django stuff:
+*.log
+local_settings.py
+db.sqlite3
+
+# Flask stuff:
+instance/
+.webassets-cache
+
+# Scrapy stuff:
+.scrapy
+
+# Sphinx documentation
+docs/_build/
+
+# PyBuilder
+target/
+
+# Jupyter Notebook
+.ipynb_checkpoints
+
+# IPython
+profile_default/
+ipython_config.py
+
+# pyenv
+.python-version
+
+# pipenv
+#   According to pypa/pipenv#598, it is recommended to include Pipfile.lock in version control.
+#   However, in case of collaboration, if having platform-specific dependencies or dependencies
+#   having no cross-platform support, pipenv may install dependencies that don’t work, or not
+#   install all needed dependencies.
+#Pipfile.lock
+
+# celery beat schedule file
+celerybeat-schedule
+
+# SageMath parsed files
+*.sage.py
+
+# Environments
+.env
+.venv
+.venv*
+env/
+venv/
+venv*/
+ENV/
+env.bak/
+venv.bak/
+
+# Spyder project settings
+.spyderproject
+.spyproject
+
+# Rope project settings
+.ropeproject
+
+# mkdocs documentation
+/site
+
+# mypy
+.mypy_cache/
+.dmypy.json
+dmypy.json
+
+# Pyre type checker
+.pyre/
+
+### Test ###
+### Ignore all files that could be used to test your code and
+### you wouldn't want to push
+
+# Reference https://en.wikipedia.org/wiki/Metasyntactic_variable
+
+# Most common
+*foo
+*bar
+*fubar
+*foobar
+*baz
+
+# Less common
+*qux
+*quux
+*bongo
+*bazola
+*ztesch
+
+# UK, Australia
+*wibble
+*wobble
+*wubble
+*flob
+*blep
+*blah
+*boop
+*beep
+
+# Japanese
+*hoge
+*piyo
+*fuga
+*hogera
+*hogehoge
+
+# Portugal, Spain
+*fulano
+*sicrano
+*beltrano
+*mengano
+*perengano
+*zutano
+
+# France, Italy, the Netherlands
+*toto
+*titi
+*tata
+*tutu
+*pipppo
+*pluto
+*paperino
+*aap
+*noot
+*mies
+
+# Other names that would make sense
+*testsdir
+*testsfile
+*testsfiles
+*testdir
+*testfile
+*testfiles
+*testing
+*testingdir
+*testingfile
+*testingfiles
+*temp
+*tempdir
+*tempfile
+*tempfiles
+*tmp
+*tmpdir
+*tmpfile
+*tmpfiles
+*lol
+
+# End of https://www.gitignore.io/api/test,python
+# Covers JetBrains IDEs: IntelliJ, RubyMine, PhpStorm, AppCode, PyCharm, CLion, Android Studio and WebStorm
+# Reference: https://intellij-support.jetbrains.com/hc/en-us/articles/206544839
+
+# User-specific stuff
+.idea/**/workspace.xml
+.idea/**/tasks.xml
+.idea/**/usage.statistics.xml
+.idea/**/dictionaries
+.idea/**/shelf
+
+# Generated files
+.idea/**/contentModel.xml
+
+# Sensitive or high-churn files
+.idea/**/dataSources/
+.idea/**/dataSources.ids
+.idea/**/dataSources.local.xml
+.idea/**/sqlDataSources.xml
+.idea/**/dynamic.xml
+.idea/**/uiDesigner.xml
+.idea/**/dbnavigator.xml
+
+# Gradle
+.idea/**/gradle.xml
+.idea/**/libraries
+
+# Gradle and Maven with auto-import
+# When using Gradle or Maven with auto-import, you should exclude module files,
+# since they will be recreated, and may cause churn.  Uncomment if using
+# auto-import.
+# .idea/modules.xml
+# .idea/*.iml
+# .idea/modules
+# *.iml
+# *.ipr
+
+# CMake
+cmake-build-*/
+
+# Mongo Explorer plugin
+.idea/**/mongoSettings.xml
+
+# File-based project format
+*.iws
+
+# IntelliJ
+out/
+
+# mpeltonen/sbt-idea plugin
+.idea_modules/
+
+# JIRA plugin
+atlassian-ide-plugin.xml
+
+# Cursive Clojure plugin
+.idea/replstate.xml
+
+# Crashlytics plugin (for Android Studio and IntelliJ)
+com_crashlytics_export_strings.xml
+crashlytics.properties
+crashlytics-build.properties
+fabric.properties
+
+# Editor-based Rest Client
+.idea/httpRequests
+
+# Android studio 3.1+ serialized cache file
+.idea/caches/build_file_checksums.ser
+
+# Whole .idea folder can be ignore
+.idea/*
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
new file mode 100644
index 00000000..88a3b754
--- /dev/null
+++ b/.pre-commit-config.yaml
@@ -0,0 +1,37 @@
+# See README for installation instructions.
+
+repos:
+  - repo: https://github.com/ambv/black
+    rev: 23.7.0
+    hooks:
+    - id: black
+      language_version: 'python3.10'
+
+  - repo: https://github.com/pycqa/flake8
+    rev: 6.0.0
+    hooks:
+    - id: flake8
+      args: ["--ignore", "E203,W503"]
+
+  - repo: https://github.com/PyCQA/isort
+    rev: 5.12.0
+    hooks:
+    - id: isort
+
+  - repo: https://github.com/pre-commit/pre-commit-hooks
+    rev: v4.4.0
+    hooks:
+    - id: check-yaml
+    - id: end-of-file-fixer
+    - id: trailing-whitespace
+    - id: check-ast
+    - id: check-case-conflict
+    - id: check-merge-conflict
+    - id: debug-statements
+      language_version: python3
+
+  - repo: https://github.com/asottile/pyupgrade
+    rev: v3.9.0
+    hooks:
+    - id: pyupgrade
+      args: [ "--py311-plus" ]
diff --git a/LICENSE b/LICENSE
new file mode 100644
index 00000000..be3b9a28
--- /dev/null
+++ b/LICENSE
@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) 2023 Roel Adriaans <roel@adriaans.org>
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
diff --git a/README.md b/README.md
new file mode 100644
index 00000000..af0bc63c
--- /dev/null
+++ b/README.md
@@ -0,0 +1,3 @@
+# Advent of Code Utils
+
+This repository contains some utils used by my advent of code projects.
diff --git a/mypy.ini b/mypy.ini
new file mode 100644
index 00000000..6feba02f
--- /dev/null
+++ b/mypy.ini
@@ -0,0 +1,4 @@
+[mypy]
+follow_imports = silent
+check_untyped_defs = True
+linecount_report = .typecov/report
diff --git a/poetry.lock b/poetry.lock
new file mode 100644
index 00000000..2427319d
--- /dev/null
+++ b/poetry.lock
@@ -0,0 +1,576 @@
+# This file is automatically @generated by Poetry 1.5.1 and should not be changed by hand.
+
+[[package]]
+name = "attrs"
+version = "23.1.0"
+description = "Classes Without Boilerplate"
+optional = false
+python-versions = ">=3.7"
+files = [
+    {file = "attrs-23.1.0-py3-none-any.whl", hash = "sha256:1f28b4522cdc2fb4256ac1a020c78acf9cba2c6b461ccd2c126f3aa8e8335d04"},
+    {file = "attrs-23.1.0.tar.gz", hash = "sha256:6279836d581513a26f1bf235f9acd333bc9115683f14f7e8fae46c98fc50e015"},
+]
+
+[package.extras]
+cov = ["attrs[tests]", "coverage[toml] (>=5.3)"]
+dev = ["attrs[docs,tests]", "pre-commit"]
+docs = ["furo", "myst-parser", "sphinx", "sphinx-notfound-page", "sphinxcontrib-towncrier", "towncrier", "zope-interface"]
+tests = ["attrs[tests-no-zope]", "zope-interface"]
+tests-no-zope = ["cloudpickle", "hypothesis", "mypy (>=1.1.1)", "pympler", "pytest (>=4.3.0)", "pytest-mypy-plugins", "pytest-xdist[psutil]"]
+
+[[package]]
+name = "black"
+version = "23.7.0"
+description = "The uncompromising code formatter."
+optional = false
+python-versions = ">=3.8"
+files = [
+    {file = "black-23.7.0-cp310-cp310-macosx_10_16_arm64.whl", hash = "sha256:5c4bc552ab52f6c1c506ccae05681fab58c3f72d59ae6e6639e8885e94fe2587"},
+    {file = "black-23.7.0-cp310-cp310-macosx_10_16_universal2.whl", hash = "sha256:552513d5cd5694590d7ef6f46e1767a4df9af168d449ff767b13b084c020e63f"},
+    {file = "black-23.7.0-cp310-cp310-macosx_10_16_x86_64.whl", hash = "sha256:86cee259349b4448adb4ef9b204bb4467aae74a386bce85d56ba4f5dc0da27be"},
+    {file = "black-23.7.0-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:501387a9edcb75d7ae8a4412bb8749900386eaef258f1aefab18adddea1936bc"},
+    {file = "black-23.7.0-cp310-cp310-win_amd64.whl", hash = "sha256:fb074d8b213749fa1d077d630db0d5f8cc3b2ae63587ad4116e8a436e9bbe995"},
+    {file = "black-23.7.0-cp311-cp311-macosx_10_16_arm64.whl", hash = "sha256:b5b0ee6d96b345a8b420100b7d71ebfdd19fab5e8301aff48ec270042cd40ac2"},
+    {file = "black-23.7.0-cp311-cp311-macosx_10_16_universal2.whl", hash = "sha256:893695a76b140881531062d48476ebe4a48f5d1e9388177e175d76234ca247cd"},
+    {file = "black-23.7.0-cp311-cp311-macosx_10_16_x86_64.whl", hash = "sha256:c333286dc3ddca6fdff74670b911cccedacb4ef0a60b34e491b8a67c833b343a"},
+    {file = "black-23.7.0-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:831d8f54c3a8c8cf55f64d0422ee875eecac26f5f649fb6c1df65316b67c8926"},
+    {file = "black-23.7.0-cp311-cp311-win_amd64.whl", hash = "sha256:7f3bf2dec7d541b4619b8ce526bda74a6b0bffc480a163fed32eb8b3c9aed8ad"},
+    {file = "black-23.7.0-cp38-cp38-macosx_10_16_arm64.whl", hash = "sha256:f9062af71c59c004cd519e2fb8f5d25d39e46d3af011b41ab43b9c74e27e236f"},
+    {file = "black-23.7.0-cp38-cp38-macosx_10_16_universal2.whl", hash = "sha256:01ede61aac8c154b55f35301fac3e730baf0c9cf8120f65a9cd61a81cfb4a0c3"},
+    {file = "black-23.7.0-cp38-cp38-macosx_10_16_x86_64.whl", hash = "sha256:327a8c2550ddc573b51e2c352adb88143464bb9d92c10416feb86b0f5aee5ff6"},
+    {file = "black-23.7.0-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:6d1c6022b86f83b632d06f2b02774134def5d4d4f1dac8bef16d90cda18ba28a"},
+    {file = "black-23.7.0-cp38-cp38-win_amd64.whl", hash = "sha256:27eb7a0c71604d5de083757fbdb245b1a4fae60e9596514c6ec497eb63f95320"},
+    {file = "black-23.7.0-cp39-cp39-macosx_10_16_arm64.whl", hash = "sha256:8417dbd2f57b5701492cd46edcecc4f9208dc75529bcf76c514864e48da867d9"},
+    {file = "black-23.7.0-cp39-cp39-macosx_10_16_universal2.whl", hash = "sha256:47e56d83aad53ca140da0af87678fb38e44fd6bc0af71eebab2d1f59b1acf1d3"},
+    {file = "black-23.7.0-cp39-cp39-macosx_10_16_x86_64.whl", hash = "sha256:25cc308838fe71f7065df53aedd20327969d05671bac95b38fdf37ebe70ac087"},
+    {file = "black-23.7.0-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:642496b675095d423f9b8448243336f8ec71c9d4d57ec17bf795b67f08132a91"},
+    {file = "black-23.7.0-cp39-cp39-win_amd64.whl", hash = "sha256:ad0014efc7acf0bd745792bd0d8857413652979200ab924fbf239062adc12491"},
+    {file = "black-23.7.0-py3-none-any.whl", hash = "sha256:9fd59d418c60c0348505f2ddf9609c1e1de8e7493eab96198fc89d9f865e7a96"},
+    {file = "black-23.7.0.tar.gz", hash = "sha256:022a582720b0d9480ed82576c920a8c1dde97cc38ff11d8d8859b3bd6ca9eedb"},
+]
+
+[package.dependencies]
+click = ">=8.0.0"
+mypy-extensions = ">=0.4.3"
+packaging = ">=22.0"
+pathspec = ">=0.9.0"
+platformdirs = ">=2"
+
+[package.extras]
+colorama = ["colorama (>=0.4.3)"]
+d = ["aiohttp (>=3.7.4)"]
+jupyter = ["ipython (>=7.8.0)", "tokenize-rt (>=3.2.0)"]
+uvloop = ["uvloop (>=0.15.2)"]
+
+[[package]]
+name = "cachetools"
+version = "5.3.1"
+description = "Extensible memoizing collections and decorators"
+optional = false
+python-versions = ">=3.7"
+files = [
+    {file = "cachetools-5.3.1-py3-none-any.whl", hash = "sha256:95ef631eeaea14ba2e36f06437f36463aac3a096799e876ee55e5cdccb102590"},
+    {file = "cachetools-5.3.1.tar.gz", hash = "sha256:dce83f2d9b4e1f732a8cd44af8e8fab2dbe46201467fc98b3ef8f269092bf62b"},
+]
+
+[[package]]
+name = "cfgv"
+version = "3.3.1"
+description = "Validate configuration and produce human readable error messages."
+optional = false
+python-versions = ">=3.6.1"
+files = [
+    {file = "cfgv-3.3.1-py2.py3-none-any.whl", hash = "sha256:c6a0883f3917a037485059700b9e75da2464e6c27051014ad85ba6aaa5884426"},
+    {file = "cfgv-3.3.1.tar.gz", hash = "sha256:f5a830efb9ce7a445376bb66ec94c638a9787422f96264c98edc6bdeed8ab736"},
+]
+
+[[package]]
+name = "chardet"
+version = "5.1.0"
+description = "Universal encoding detector for Python 3"
+optional = false
+python-versions = ">=3.7"
+files = [
+    {file = "chardet-5.1.0-py3-none-any.whl", hash = "sha256:362777fb014af596ad31334fde1e8c327dfdb076e1960d1694662d46a6917ab9"},
+    {file = "chardet-5.1.0.tar.gz", hash = "sha256:0d62712b956bc154f85fb0a266e2a3c5913c2967e00348701b32411d6def31e5"},
+]
+
+[[package]]
+name = "click"
+version = "8.1.6"
+description = "Composable command line interface toolkit"
+optional = false
+python-versions = ">=3.7"
+files = [
+    {file = "click-8.1.6-py3-none-any.whl", hash = "sha256:fa244bb30b3b5ee2cae3da8f55c9e5e0c0e86093306301fb418eb9dc40fbded5"},
+    {file = "click-8.1.6.tar.gz", hash = "sha256:48ee849951919527a045bfe3bf7baa8a959c423134e1a5b98c05c20ba75a1cbd"},
+]
+
+[package.dependencies]
+colorama = {version = "*", markers = "platform_system == \"Windows\""}
+
+[[package]]
+name = "colorama"
+version = "0.4.6"
+description = "Cross-platform colored terminal text."
+optional = false
+python-versions = "!=3.0.*,!=3.1.*,!=3.2.*,!=3.3.*,!=3.4.*,!=3.5.*,!=3.6.*,>=2.7"
+files = [
+    {file = "colorama-0.4.6-py2.py3-none-any.whl", hash = "sha256:4f1d9991f5acc0ca119f9d443620b77f9d6b33703e51011c16baf57afb285fc6"},
+    {file = "colorama-0.4.6.tar.gz", hash = "sha256:08695f5cb7ed6e0531a20572697297273c47b8cae5a63ffc6d6ed5c201be6e44"},
+]
+
+[[package]]
+name = "coverage"
+version = "7.2.7"
+description = "Code coverage measurement for Python"
+optional = false
+python-versions = ">=3.7"
+files = [
+    {file = "coverage-7.2.7-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:d39b5b4f2a66ccae8b7263ac3c8170994b65266797fb96cbbfd3fb5b23921db8"},
+    {file = "coverage-7.2.7-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:6d040ef7c9859bb11dfeb056ff5b3872436e3b5e401817d87a31e1750b9ae2fb"},
+    {file = "coverage-7.2.7-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:ba90a9563ba44a72fda2e85302c3abc71c5589cea608ca16c22b9804262aaeb6"},
+    {file = "coverage-7.2.7-cp310-cp310-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:e7d9405291c6928619403db1d10bd07888888ec1abcbd9748fdaa971d7d661b2"},
+    {file = "coverage-7.2.7-cp310-cp310-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:31563e97dae5598556600466ad9beea39fb04e0229e61c12eaa206e0aa202063"},
+    {file = "coverage-7.2.7-cp310-cp310-musllinux_1_1_aarch64.whl", hash = "sha256:ebba1cd308ef115925421d3e6a586e655ca5a77b5bf41e02eb0e4562a111f2d1"},
+    {file = "coverage-7.2.7-cp310-cp310-musllinux_1_1_i686.whl", hash = "sha256:cb017fd1b2603ef59e374ba2063f593abe0fc45f2ad9abdde5b4d83bd922a353"},
+    {file = "coverage-7.2.7-cp310-cp310-musllinux_1_1_x86_64.whl", hash = "sha256:d62a5c7dad11015c66fbb9d881bc4caa5b12f16292f857842d9d1871595f4495"},
+    {file = "coverage-7.2.7-cp310-cp310-win32.whl", hash = "sha256:ee57190f24fba796e36bb6d3aa8a8783c643d8fa9760c89f7a98ab5455fbf818"},
+    {file = "coverage-7.2.7-cp310-cp310-win_amd64.whl", hash = "sha256:f75f7168ab25dd93110c8a8117a22450c19976afbc44234cbf71481094c1b850"},
+    {file = "coverage-7.2.7-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:06a9a2be0b5b576c3f18f1a241f0473575c4a26021b52b2a85263a00f034d51f"},
+    {file = "coverage-7.2.7-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:5baa06420f837184130752b7c5ea0808762083bf3487b5038d68b012e5937dbe"},
+    {file = "coverage-7.2.7-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:fdec9e8cbf13a5bf63290fc6013d216a4c7232efb51548594ca3631a7f13c3a3"},
+    {file = "coverage-7.2.7-cp311-cp311-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:52edc1a60c0d34afa421c9c37078817b2e67a392cab17d97283b64c5833f427f"},
+    {file = "coverage-7.2.7-cp311-cp311-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:63426706118b7f5cf6bb6c895dc215d8a418d5952544042c8a2d9fe87fcf09cb"},
+    {file = "coverage-7.2.7-cp311-cp311-musllinux_1_1_aarch64.whl", hash = "sha256:afb17f84d56068a7c29f5fa37bfd38d5aba69e3304af08ee94da8ed5b0865833"},
+    {file = "coverage-7.2.7-cp311-cp311-musllinux_1_1_i686.whl", hash = "sha256:48c19d2159d433ccc99e729ceae7d5293fbffa0bdb94952d3579983d1c8c9d97"},
+    {file = "coverage-7.2.7-cp311-cp311-musllinux_1_1_x86_64.whl", hash = "sha256:0e1f928eaf5469c11e886fe0885ad2bf1ec606434e79842a879277895a50942a"},
+    {file = "coverage-7.2.7-cp311-cp311-win32.whl", hash = "sha256:33d6d3ea29d5b3a1a632b3c4e4f4ecae24ef170b0b9ee493883f2df10039959a"},
+    {file = "coverage-7.2.7-cp311-cp311-win_amd64.whl", hash = "sha256:5b7540161790b2f28143191f5f8ec02fb132660ff175b7747b95dcb77ac26562"},
+    {file = "coverage-7.2.7-cp312-cp312-macosx_10_9_x86_64.whl", hash = "sha256:f2f67fe12b22cd130d34d0ef79206061bfb5eda52feb6ce0dba0644e20a03cf4"},
+    {file = "coverage-7.2.7-cp312-cp312-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:a342242fe22407f3c17f4b499276a02b01e80f861f1682ad1d95b04018e0c0d4"},
+    {file = "coverage-7.2.7-cp312-cp312-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:171717c7cb6b453aebac9a2ef603699da237f341b38eebfee9be75d27dc38e01"},
+    {file = "coverage-7.2.7-cp312-cp312-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:49969a9f7ffa086d973d91cec8d2e31080436ef0fb4a359cae927e742abfaaa6"},
+    {file = "coverage-7.2.7-cp312-cp312-musllinux_1_1_aarch64.whl", hash = "sha256:b46517c02ccd08092f4fa99f24c3b83d8f92f739b4657b0f146246a0ca6a831d"},
+    {file = "coverage-7.2.7-cp312-cp312-musllinux_1_1_i686.whl", hash = "sha256:a3d33a6b3eae87ceaefa91ffdc130b5e8536182cd6dfdbfc1aa56b46ff8c86de"},
+    {file = "coverage-7.2.7-cp312-cp312-musllinux_1_1_x86_64.whl", hash = "sha256:976b9c42fb2a43ebf304fa7d4a310e5f16cc99992f33eced91ef6f908bd8f33d"},
+    {file = "coverage-7.2.7-cp312-cp312-win32.whl", hash = "sha256:8de8bb0e5ad103888d65abef8bca41ab93721647590a3f740100cd65c3b00511"},
+    {file = "coverage-7.2.7-cp312-cp312-win_amd64.whl", hash = "sha256:9e31cb64d7de6b6f09702bb27c02d1904b3aebfca610c12772452c4e6c21a0d3"},
+    {file = "coverage-7.2.7-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:58c2ccc2f00ecb51253cbe5d8d7122a34590fac9646a960d1430d5b15321d95f"},
+    {file = "coverage-7.2.7-cp37-cp37m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:d22656368f0e6189e24722214ed8d66b8022db19d182927b9a248a2a8a2f67eb"},
+    {file = "coverage-7.2.7-cp37-cp37m-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:a895fcc7b15c3fc72beb43cdcbdf0ddb7d2ebc959edac9cef390b0d14f39f8a9"},
+    {file = "coverage-7.2.7-cp37-cp37m-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:e84606b74eb7de6ff581a7915e2dab7a28a0517fbe1c9239eb227e1354064dcd"},
+    {file = "coverage-7.2.7-cp37-cp37m-musllinux_1_1_aarch64.whl", hash = "sha256:0a5f9e1dbd7fbe30196578ca36f3fba75376fb99888c395c5880b355e2875f8a"},
+    {file = "coverage-7.2.7-cp37-cp37m-musllinux_1_1_i686.whl", hash = "sha256:419bfd2caae268623dd469eff96d510a920c90928b60f2073d79f8fe2bbc5959"},
+    {file = "coverage-7.2.7-cp37-cp37m-musllinux_1_1_x86_64.whl", hash = "sha256:2aee274c46590717f38ae5e4650988d1af340fe06167546cc32fe2f58ed05b02"},
+    {file = "coverage-7.2.7-cp37-cp37m-win32.whl", hash = "sha256:61b9a528fb348373c433e8966535074b802c7a5d7f23c4f421e6c6e2f1697a6f"},
+    {file = "coverage-7.2.7-cp37-cp37m-win_amd64.whl", hash = "sha256:b1c546aca0ca4d028901d825015dc8e4d56aac4b541877690eb76490f1dc8ed0"},
+    {file = "coverage-7.2.7-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:54b896376ab563bd38453cecb813c295cf347cf5906e8b41d340b0321a5433e5"},
+    {file = "coverage-7.2.7-cp38-cp38-macosx_11_0_arm64.whl", hash = "sha256:3d376df58cc111dc8e21e3b6e24606b5bb5dee6024f46a5abca99124b2229ef5"},
+    {file = "coverage-7.2.7-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:5e330fc79bd7207e46c7d7fd2bb4af2963f5f635703925543a70b99574b0fea9"},
+    {file = "coverage-7.2.7-cp38-cp38-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:1e9d683426464e4a252bf70c3498756055016f99ddaec3774bf368e76bbe02b6"},
+    {file = "coverage-7.2.7-cp38-cp38-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:8d13c64ee2d33eccf7437961b6ea7ad8673e2be040b4f7fd4fd4d4d28d9ccb1e"},
+    {file = "coverage-7.2.7-cp38-cp38-musllinux_1_1_aarch64.whl", hash = "sha256:b7aa5f8a41217360e600da646004f878250a0d6738bcdc11a0a39928d7dc2050"},
+    {file = "coverage-7.2.7-cp38-cp38-musllinux_1_1_i686.whl", hash = "sha256:8fa03bce9bfbeeef9f3b160a8bed39a221d82308b4152b27d82d8daa7041fee5"},
+    {file = "coverage-7.2.7-cp38-cp38-musllinux_1_1_x86_64.whl", hash = "sha256:245167dd26180ab4c91d5e1496a30be4cd721a5cf2abf52974f965f10f11419f"},
+    {file = "coverage-7.2.7-cp38-cp38-win32.whl", hash = "sha256:d2c2db7fd82e9b72937969bceac4d6ca89660db0a0967614ce2481e81a0b771e"},
+    {file = "coverage-7.2.7-cp38-cp38-win_amd64.whl", hash = "sha256:2e07b54284e381531c87f785f613b833569c14ecacdcb85d56b25c4622c16c3c"},
+    {file = "coverage-7.2.7-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:537891ae8ce59ef63d0123f7ac9e2ae0fc8b72c7ccbe5296fec45fd68967b6c9"},
+    {file = "coverage-7.2.7-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:06fb182e69f33f6cd1d39a6c597294cff3143554b64b9825d1dc69d18cc2fff2"},
+    {file = "coverage-7.2.7-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:201e7389591af40950a6480bd9edfa8ed04346ff80002cec1a66cac4549c1ad7"},
+    {file = "coverage-7.2.7-cp39-cp39-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:f6951407391b639504e3b3be51b7ba5f3528adbf1a8ac3302b687ecababf929e"},
+    {file = "coverage-7.2.7-cp39-cp39-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:6f48351d66575f535669306aa7d6d6f71bc43372473b54a832222803eb956fd1"},
+    {file = "coverage-7.2.7-cp39-cp39-musllinux_1_1_aarch64.whl", hash = "sha256:b29019c76039dc3c0fd815c41392a044ce555d9bcdd38b0fb60fb4cd8e475ba9"},
+    {file = "coverage-7.2.7-cp39-cp39-musllinux_1_1_i686.whl", hash = "sha256:81c13a1fc7468c40f13420732805a4c38a105d89848b7c10af65a90beff25250"},
+    {file = "coverage-7.2.7-cp39-cp39-musllinux_1_1_x86_64.whl", hash = "sha256:975d70ab7e3c80a3fe86001d8751f6778905ec723f5b110aed1e450da9d4b7f2"},
+    {file = "coverage-7.2.7-cp39-cp39-win32.whl", hash = "sha256:7ee7d9d4822c8acc74a5e26c50604dff824710bc8de424904c0982e25c39c6cb"},
+    {file = "coverage-7.2.7-cp39-cp39-win_amd64.whl", hash = "sha256:eb393e5ebc85245347950143969b241d08b52b88a3dc39479822e073a1a8eb27"},
+    {file = "coverage-7.2.7-pp37.pp38.pp39-none-any.whl", hash = "sha256:b7b4c971f05e6ae490fef852c218b0e79d4e52f79ef0c8475566584a8fb3e01d"},
+    {file = "coverage-7.2.7.tar.gz", hash = "sha256:924d94291ca674905fe9481f12294eb11f2d3d3fd1adb20314ba89e94f44ed59"},
+]
+
+[package.extras]
+toml = ["tomli"]
+
+[[package]]
+name = "distlib"
+version = "0.3.7"
+description = "Distribution utilities"
+optional = false
+python-versions = "*"
+files = [
+    {file = "distlib-0.3.7-py2.py3-none-any.whl", hash = "sha256:2e24928bc811348f0feb63014e97aaae3037f2cf48712d51ae61df7fd6075057"},
+    {file = "distlib-0.3.7.tar.gz", hash = "sha256:9dafe54b34a028eafd95039d5e5d4851a13734540f1331060d31c9916e7147a8"},
+]
+
+[[package]]
+name = "execnet"
+version = "2.0.2"
+description = "execnet: rapid multi-Python deployment"
+optional = false
+python-versions = ">=3.7"
+files = [
+    {file = "execnet-2.0.2-py3-none-any.whl", hash = "sha256:88256416ae766bc9e8895c76a87928c0012183da3cc4fc18016e6f050e025f41"},
+    {file = "execnet-2.0.2.tar.gz", hash = "sha256:cc59bc4423742fd71ad227122eb0dd44db51efb3dc4095b45ac9a08c770096af"},
+]
+
+[package.extras]
+testing = ["hatch", "pre-commit", "pytest", "tox"]
+
+[[package]]
+name = "filelock"
+version = "3.12.2"
+description = "A platform independent file lock."
+optional = false
+python-versions = ">=3.7"
+files = [
+    {file = "filelock-3.12.2-py3-none-any.whl", hash = "sha256:cbb791cdea2a72f23da6ac5b5269ab0a0d161e9ef0100e653b69049a7706d1ec"},
+    {file = "filelock-3.12.2.tar.gz", hash = "sha256:002740518d8aa59a26b0c76e10fb8c6e15eae825d34b6fdf670333fd7b938d81"},
+]
+
+[package.extras]
+docs = ["furo (>=2023.5.20)", "sphinx (>=7.0.1)", "sphinx-autodoc-typehints (>=1.23,!=1.23.4)"]
+testing = ["covdefaults (>=2.3)", "coverage (>=7.2.7)", "diff-cover (>=7.5)", "pytest (>=7.3.1)", "pytest-cov (>=4.1)", "pytest-mock (>=3.10)", "pytest-timeout (>=2.1)"]
+
+[[package]]
+name = "identify"
+version = "2.5.26"
+description = "File identification library for Python"
+optional = false
+python-versions = ">=3.8"
+files = [
+    {file = "identify-2.5.26-py2.py3-none-any.whl", hash = "sha256:c22a8ead0d4ca11f1edd6c9418c3220669b3b7533ada0a0ffa6cc0ef85cf9b54"},
+    {file = "identify-2.5.26.tar.gz", hash = "sha256:7243800bce2f58404ed41b7c002e53d4d22bcf3ae1b7900c2d7aefd95394bf7f"},
+]
+
+[package.extras]
+license = ["ukkonen"]
+
+[[package]]
+name = "iniconfig"
+version = "2.0.0"
+description = "brain-dead simple config-ini parsing"
+optional = false
+python-versions = ">=3.7"
+files = [
+    {file = "iniconfig-2.0.0-py3-none-any.whl", hash = "sha256:b6a85871a79d2e3b22d2d1b94ac2824226a63c6b741c88f7ae975f18b6778374"},
+    {file = "iniconfig-2.0.0.tar.gz", hash = "sha256:2d91e135bf72d31a410b17c16da610a82cb55f6b0477d1a902134b24a455b8b3"},
+]
+
+[[package]]
+name = "isort"
+version = "5.12.0"
+description = "A Python utility / library to sort Python imports."
+optional = false
+python-versions = ">=3.8.0"
+files = [
+    {file = "isort-5.12.0-py3-none-any.whl", hash = "sha256:f84c2818376e66cf843d497486ea8fed8700b340f308f076c6fb1229dff318b6"},
+    {file = "isort-5.12.0.tar.gz", hash = "sha256:8bef7dde241278824a6d83f44a544709b065191b95b6e50894bdc722fcba0504"},
+]
+
+[package.extras]
+colors = ["colorama (>=0.4.3)"]
+pipfile-deprecated-finder = ["pip-shims (>=0.5.2)", "pipreqs", "requirementslib"]
+plugins = ["setuptools"]
+requirements-deprecated-finder = ["pip-api", "pipreqs"]
+
+[[package]]
+name = "mypy-extensions"
+version = "1.0.0"
+description = "Type system extensions for programs checked with the mypy type checker."
+optional = false
+python-versions = ">=3.5"
+files = [
+    {file = "mypy_extensions-1.0.0-py3-none-any.whl", hash = "sha256:4392f6c0eb8a5668a69e23d168ffa70f0be9ccfd32b5cc2d26a34ae5b844552d"},
+    {file = "mypy_extensions-1.0.0.tar.gz", hash = "sha256:75dbf8955dc00442a438fc4d0666508a9a97b6bd41aa2f0ffe9d2f2725af0782"},
+]
+
+[[package]]
+name = "nodeenv"
+version = "1.8.0"
+description = "Node.js virtual environment builder"
+optional = false
+python-versions = ">=2.7,!=3.0.*,!=3.1.*,!=3.2.*,!=3.3.*,!=3.4.*,!=3.5.*,!=3.6.*"
+files = [
+    {file = "nodeenv-1.8.0-py2.py3-none-any.whl", hash = "sha256:df865724bb3c3adc86b3876fa209771517b0cfe596beff01a92700e0e8be4cec"},
+    {file = "nodeenv-1.8.0.tar.gz", hash = "sha256:d51e0c37e64fbf47d017feac3145cdbb58836d7eee8c6f6d3b6880c5456227d2"},
+]
+
+[package.dependencies]
+setuptools = "*"
+
+[[package]]
+name = "packaging"
+version = "23.1"
+description = "Core utilities for Python packages"
+optional = false
+python-versions = ">=3.7"
+files = [
+    {file = "packaging-23.1-py3-none-any.whl", hash = "sha256:994793af429502c4ea2ebf6bf664629d07c1a9fe974af92966e4b8d2df7edc61"},
+    {file = "packaging-23.1.tar.gz", hash = "sha256:a392980d2b6cffa644431898be54b0045151319d1e7ec34f0cfed48767dd334f"},
+]
+
+[[package]]
+name = "pathspec"
+version = "0.11.2"
+description = "Utility library for gitignore style pattern matching of file paths."
+optional = false
+python-versions = ">=3.7"
+files = [
+    {file = "pathspec-0.11.2-py3-none-any.whl", hash = "sha256:1d6ed233af05e679efb96b1851550ea95bbb64b7c490b0f5aa52996c11e92a20"},
+    {file = "pathspec-0.11.2.tar.gz", hash = "sha256:e0d8d0ac2f12da61956eb2306b69f9469b42f4deb0f3cb6ed47b9cce9996ced3"},
+]
+
+[[package]]
+name = "platformdirs"
+version = "3.10.0"
+description = "A small Python package for determining appropriate platform-specific dirs, e.g. a \"user data dir\"."
+optional = false
+python-versions = ">=3.7"
+files = [
+    {file = "platformdirs-3.10.0-py3-none-any.whl", hash = "sha256:d7c24979f292f916dc9cbf8648319032f551ea8c49a4c9bf2fb556a02070ec1d"},
+    {file = "platformdirs-3.10.0.tar.gz", hash = "sha256:b45696dab2d7cc691a3226759c0d3b00c47c8b6e293d96f6436f733303f77f6d"},
+]
+
+[package.extras]
+docs = ["furo (>=2023.7.26)", "proselint (>=0.13)", "sphinx (>=7.1.1)", "sphinx-autodoc-typehints (>=1.24)"]
+test = ["appdirs (==1.4.4)", "covdefaults (>=2.3)", "pytest (>=7.4)", "pytest-cov (>=4.1)", "pytest-mock (>=3.11.1)"]
+
+[[package]]
+name = "pluggy"
+version = "1.2.0"
+description = "plugin and hook calling mechanisms for python"
+optional = false
+python-versions = ">=3.7"
+files = [
+    {file = "pluggy-1.2.0-py3-none-any.whl", hash = "sha256:c2fd55a7d7a3863cba1a013e4e2414658b1d07b6bc57b3919e0c63c9abb99849"},
+    {file = "pluggy-1.2.0.tar.gz", hash = "sha256:d12f0c4b579b15f5e054301bb226ee85eeeba08ffec228092f8defbaa3a4c4b3"},
+]
+
+[package.extras]
+dev = ["pre-commit", "tox"]
+testing = ["pytest", "pytest-benchmark"]
+
+[[package]]
+name = "pre-commit"
+version = "3.3.3"
+description = "A framework for managing and maintaining multi-language pre-commit hooks."
+optional = false
+python-versions = ">=3.8"
+files = [
+    {file = "pre_commit-3.3.3-py2.py3-none-any.whl", hash = "sha256:10badb65d6a38caff29703362271d7dca483d01da88f9d7e05d0b97171c136cb"},
+    {file = "pre_commit-3.3.3.tar.gz", hash = "sha256:a2256f489cd913d575c145132ae196fe335da32d91a8294b7afe6622335dd023"},
+]
+
+[package.dependencies]
+cfgv = ">=2.0.0"
+identify = ">=1.0.0"
+nodeenv = ">=0.11.1"
+pyyaml = ">=5.1"
+virtualenv = ">=20.10.0"
+
+[[package]]
+name = "pyproject-api"
+version = "1.5.3"
+description = "API to interact with the python pyproject.toml based projects"
+optional = false
+python-versions = ">=3.7"
+files = [
+    {file = "pyproject_api-1.5.3-py3-none-any.whl", hash = "sha256:14cf09828670c7b08842249c1f28c8ee6581b872e893f81b62d5465bec41502f"},
+    {file = "pyproject_api-1.5.3.tar.gz", hash = "sha256:ffb5b2d7cad43f5b2688ab490de7c4d3f6f15e0b819cb588c4b771567c9729eb"},
+]
+
+[package.dependencies]
+packaging = ">=23.1"
+
+[package.extras]
+docs = ["furo (>=2023.5.20)", "sphinx (>=7.0.1)", "sphinx-autodoc-typehints (>=1.23,!=1.23.4)"]
+testing = ["covdefaults (>=2.3)", "importlib-metadata (>=6.6)", "pytest (>=7.3.1)", "pytest-cov (>=4.1)", "pytest-mock (>=3.10)", "setuptools (>=67.8)", "wheel (>=0.40)"]
+
+[[package]]
+name = "pytest"
+version = "7.4.0"
+description = "pytest: simple powerful testing with Python"
+optional = false
+python-versions = ">=3.7"
+files = [
+    {file = "pytest-7.4.0-py3-none-any.whl", hash = "sha256:78bf16451a2eb8c7a2ea98e32dc119fd2aa758f1d5d66dbf0a59d69a3969df32"},
+    {file = "pytest-7.4.0.tar.gz", hash = "sha256:b4bf8c45bd59934ed84001ad51e11b4ee40d40a1229d2c79f9c592b0a3f6bd8a"},
+]
+
+[package.dependencies]
+colorama = {version = "*", markers = "sys_platform == \"win32\""}
+iniconfig = "*"
+packaging = "*"
+pluggy = ">=0.12,<2.0"
+
+[package.extras]
+testing = ["argcomplete", "attrs (>=19.2.0)", "hypothesis (>=3.56)", "mock", "nose", "pygments (>=2.7.2)", "requests", "setuptools", "xmlschema"]
+
+[[package]]
+name = "pytest-cov"
+version = "4.1.0"
+description = "Pytest plugin for measuring coverage."
+optional = false
+python-versions = ">=3.7"
+files = [
+    {file = "pytest-cov-4.1.0.tar.gz", hash = "sha256:3904b13dfbfec47f003b8e77fd5b589cd11904a21ddf1ab38a64f204d6a10ef6"},
+    {file = "pytest_cov-4.1.0-py3-none-any.whl", hash = "sha256:6ba70b9e97e69fcc3fb45bfeab2d0a138fb65c4d0d6a41ef33983ad114be8c3a"},
+]
+
+[package.dependencies]
+coverage = {version = ">=5.2.1", extras = ["toml"]}
+pytest = ">=4.6"
+
+[package.extras]
+testing = ["fields", "hunter", "process-tests", "pytest-xdist", "six", "virtualenv"]
+
+[[package]]
+name = "pytest-xdist"
+version = "3.3.1"
+description = "pytest xdist plugin for distributed testing, most importantly across multiple CPUs"
+optional = false
+python-versions = ">=3.7"
+files = [
+    {file = "pytest-xdist-3.3.1.tar.gz", hash = "sha256:d5ee0520eb1b7bcca50a60a518ab7a7707992812c578198f8b44fdfac78e8c93"},
+    {file = "pytest_xdist-3.3.1-py3-none-any.whl", hash = "sha256:ff9daa7793569e6a68544850fd3927cd257cc03a7ef76c95e86915355e82b5f2"},
+]
+
+[package.dependencies]
+execnet = ">=1.1"
+pytest = ">=6.2.0"
+
+[package.extras]
+psutil = ["psutil (>=3.0)"]
+setproctitle = ["setproctitle"]
+testing = ["filelock"]
+
+[[package]]
+name = "python-dotenv"
+version = "1.0.0"
+description = "Read key-value pairs from a .env file and set them as environment variables"
+optional = false
+python-versions = ">=3.8"
+files = [
+    {file = "python-dotenv-1.0.0.tar.gz", hash = "sha256:a8df96034aae6d2d50a4ebe8216326c61c3eb64836776504fcca410e5937a3ba"},
+    {file = "python_dotenv-1.0.0-py3-none-any.whl", hash = "sha256:f5971a9226b701070a4bf2c38c89e5a3f0d64de8debda981d1db98583009122a"},
+]
+
+[package.extras]
+cli = ["click (>=5.0)"]
+
+[[package]]
+name = "pyyaml"
+version = "6.0.1"
+description = "YAML parser and emitter for Python"
+optional = false
+python-versions = ">=3.6"
+files = [
+    {file = "PyYAML-6.0.1-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:d858aa552c999bc8a8d57426ed01e40bef403cd8ccdd0fc5f6f04a00414cac2a"},
+    {file = "PyYAML-6.0.1-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:fd66fc5d0da6d9815ba2cebeb4205f95818ff4b79c3ebe268e75d961704af52f"},
+    {file = "PyYAML-6.0.1-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:69b023b2b4daa7548bcfbd4aa3da05b3a74b772db9e23b982788168117739938"},
+    {file = "PyYAML-6.0.1-cp310-cp310-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:81e0b275a9ecc9c0c0c07b4b90ba548307583c125f54d5b6946cfee6360c733d"},
+    {file = "PyYAML-6.0.1-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:ba336e390cd8e4d1739f42dfe9bb83a3cc2e80f567d8805e11b46f4a943f5515"},
+    {file = "PyYAML-6.0.1-cp310-cp310-win32.whl", hash = "sha256:bd4af7373a854424dabd882decdc5579653d7868b8fb26dc7d0e99f823aa5924"},
+    {file = "PyYAML-6.0.1-cp310-cp310-win_amd64.whl", hash = "sha256:fd1592b3fdf65fff2ad0004b5e363300ef59ced41c2e6b3a99d4089fa8c5435d"},
+    {file = "PyYAML-6.0.1-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:6965a7bc3cf88e5a1c3bd2e0b5c22f8d677dc88a455344035f03399034eb3007"},
+    {file = "PyYAML-6.0.1-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:f003ed9ad21d6a4713f0a9b5a7a0a79e08dd0f221aff4525a2be4c346ee60aab"},
+    {file = "PyYAML-6.0.1-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:42f8152b8dbc4fe7d96729ec2b99c7097d656dc1213a3229ca5383f973a5ed6d"},
+    {file = "PyYAML-6.0.1-cp311-cp311-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:062582fca9fabdd2c8b54a3ef1c978d786e0f6b3a1510e0ac93ef59e0ddae2bc"},
+    {file = "PyYAML-6.0.1-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:d2b04aac4d386b172d5b9692e2d2da8de7bfb6c387fa4f801fbf6fb2e6ba4673"},
+    {file = "PyYAML-6.0.1-cp311-cp311-win32.whl", hash = "sha256:1635fd110e8d85d55237ab316b5b011de701ea0f29d07611174a1b42f1444741"},
+    {file = "PyYAML-6.0.1-cp311-cp311-win_amd64.whl", hash = "sha256:bf07ee2fef7014951eeb99f56f39c9bb4af143d8aa3c21b1677805985307da34"},
+    {file = "PyYAML-6.0.1-cp36-cp36m-macosx_10_9_x86_64.whl", hash = "sha256:50550eb667afee136e9a77d6dc71ae76a44df8b3e51e41b77f6de2932bfe0f47"},
+    {file = "PyYAML-6.0.1-cp36-cp36m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:1fe35611261b29bd1de0070f0b2f47cb6ff71fa6595c077e42bd0c419fa27b98"},
+    {file = "PyYAML-6.0.1-cp36-cp36m-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:704219a11b772aea0d8ecd7058d0082713c3562b4e271b849ad7dc4a5c90c13c"},
+    {file = "PyYAML-6.0.1-cp36-cp36m-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:afd7e57eddb1a54f0f1a974bc4391af8bcce0b444685d936840f125cf046d5bd"},
+    {file = "PyYAML-6.0.1-cp36-cp36m-win32.whl", hash = "sha256:fca0e3a251908a499833aa292323f32437106001d436eca0e6e7833256674585"},
+    {file = "PyYAML-6.0.1-cp36-cp36m-win_amd64.whl", hash = "sha256:f22ac1c3cac4dbc50079e965eba2c1058622631e526bd9afd45fedd49ba781fa"},
+    {file = "PyYAML-6.0.1-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:b1275ad35a5d18c62a7220633c913e1b42d44b46ee12554e5fd39c70a243d6a3"},
+    {file = "PyYAML-6.0.1-cp37-cp37m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:18aeb1bf9a78867dc38b259769503436b7c72f7a1f1f4c93ff9a17de54319b27"},
+    {file = "PyYAML-6.0.1-cp37-cp37m-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:596106435fa6ad000c2991a98fa58eeb8656ef2325d7e158344fb33864ed87e3"},
+    {file = "PyYAML-6.0.1-cp37-cp37m-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:baa90d3f661d43131ca170712d903e6295d1f7a0f595074f151c0aed377c9b9c"},
+    {file = "PyYAML-6.0.1-cp37-cp37m-win32.whl", hash = "sha256:9046c58c4395dff28dd494285c82ba00b546adfc7ef001486fbf0324bc174fba"},
+    {file = "PyYAML-6.0.1-cp37-cp37m-win_amd64.whl", hash = "sha256:4fb147e7a67ef577a588a0e2c17b6db51dda102c71de36f8549b6816a96e1867"},
+    {file = "PyYAML-6.0.1-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:1d4c7e777c441b20e32f52bd377e0c409713e8bb1386e1099c2415f26e479595"},
+    {file = "PyYAML-6.0.1-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:a0cd17c15d3bb3fa06978b4e8958dcdc6e0174ccea823003a106c7d4d7899ac5"},
+    {file = "PyYAML-6.0.1-cp38-cp38-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:28c119d996beec18c05208a8bd78cbe4007878c6dd15091efb73a30e90539696"},
+    {file = "PyYAML-6.0.1-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:7e07cbde391ba96ab58e532ff4803f79c4129397514e1413a7dc761ccd755735"},
+    {file = "PyYAML-6.0.1-cp38-cp38-win32.whl", hash = "sha256:184c5108a2aca3c5b3d3bf9395d50893a7ab82a38004c8f61c258d4428e80206"},
+    {file = "PyYAML-6.0.1-cp38-cp38-win_amd64.whl", hash = "sha256:1e2722cc9fbb45d9b87631ac70924c11d3a401b2d7f410cc0e3bbf249f2dca62"},
+    {file = "PyYAML-6.0.1-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:9eb6caa9a297fc2c2fb8862bc5370d0303ddba53ba97e71f08023b6cd73d16a8"},
+    {file = "PyYAML-6.0.1-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:c8098ddcc2a85b61647b2590f825f3db38891662cfc2fc776415143f599bb859"},
+    {file = "PyYAML-6.0.1-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:5773183b6446b2c99bb77e77595dd486303b4faab2b086e7b17bc6bef28865f6"},
+    {file = "PyYAML-6.0.1-cp39-cp39-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:b786eecbdf8499b9ca1d697215862083bd6d2a99965554781d0d8d1ad31e13a0"},
+    {file = "PyYAML-6.0.1-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:bc1bf2925a1ecd43da378f4db9e4f799775d6367bdb94671027b73b393a7c42c"},
+    {file = "PyYAML-6.0.1-cp39-cp39-win32.whl", hash = "sha256:faca3bdcf85b2fc05d06ff3fbc1f83e1391b3e724afa3feba7d13eeab355484c"},
+    {file = "PyYAML-6.0.1-cp39-cp39-win_amd64.whl", hash = "sha256:510c9deebc5c0225e8c96813043e62b680ba2f9c50a08d3724c7f28a747d1486"},
+    {file = "PyYAML-6.0.1.tar.gz", hash = "sha256:bfdf460b1736c775f2ba9f6a92bca30bc2095067b8a9d77876d1fad6cc3b4a43"},
+]
+
+[[package]]
+name = "setuptools"
+version = "68.0.0"
+description = "Easily download, build, install, upgrade, and uninstall Python packages"
+optional = false
+python-versions = ">=3.7"
+files = [
+    {file = "setuptools-68.0.0-py3-none-any.whl", hash = "sha256:11e52c67415a381d10d6b462ced9cfb97066179f0e871399e006c4ab101fc85f"},
+    {file = "setuptools-68.0.0.tar.gz", hash = "sha256:baf1fdb41c6da4cd2eae722e135500da913332ab3f2f5c7d33af9b492acb5235"},
+]
+
+[package.extras]
+docs = ["furo", "jaraco.packaging (>=9)", "jaraco.tidelift (>=1.4)", "pygments-github-lexers (==0.0.5)", "rst.linker (>=1.9)", "sphinx (>=3.5)", "sphinx-favicon", "sphinx-hoverxref (<2)", "sphinx-inline-tabs", "sphinx-lint", "sphinx-notfound-page (==0.8.3)", "sphinx-reredirects", "sphinxcontrib-towncrier"]
+testing = ["build[virtualenv]", "filelock (>=3.4.0)", "flake8-2020", "ini2toml[lite] (>=0.9)", "jaraco.envs (>=2.2)", "jaraco.path (>=3.2.0)", "pip (>=19.1)", "pip-run (>=8.8)", "pytest (>=6)", "pytest-black (>=0.3.7)", "pytest-checkdocs (>=2.4)", "pytest-cov", "pytest-enabler (>=1.3)", "pytest-mypy (>=0.9.1)", "pytest-perf", "pytest-ruff", "pytest-timeout", "pytest-xdist", "tomli-w (>=1.0.0)", "virtualenv (>=13.0.0)", "wheel"]
+testing-integration = ["build[virtualenv]", "filelock (>=3.4.0)", "jaraco.envs (>=2.2)", "jaraco.path (>=3.2.0)", "pytest", "pytest-enabler", "pytest-xdist", "tomli", "virtualenv (>=13.0.0)", "wheel"]
+
+[[package]]
+name = "tox"
+version = "4.6.4"
+description = "tox is a generic virtualenv management and test command line tool"
+optional = false
+python-versions = ">=3.7"
+files = [
+    {file = "tox-4.6.4-py3-none-any.whl", hash = "sha256:1b8f8ae08d6a5475cad9d508236c51ea060620126fd7c3c513d0f5c7f29cc776"},
+    {file = "tox-4.6.4.tar.gz", hash = "sha256:5e2ad8845764706170d3dcaac171704513cc8a725655219acb62fe4380bdadda"},
+]
+
+[package.dependencies]
+cachetools = ">=5.3.1"
+chardet = ">=5.1"
+colorama = ">=0.4.6"
+filelock = ">=3.12.2"
+packaging = ">=23.1"
+platformdirs = ">=3.8"
+pluggy = ">=1.2"
+pyproject-api = ">=1.5.2"
+virtualenv = ">=20.23.1"
+
+[package.extras]
+docs = ["furo (>=2023.5.20)", "sphinx (>=7.0.1)", "sphinx-argparse-cli (>=1.11.1)", "sphinx-autodoc-typehints (>=1.23.3,!=1.23.4)", "sphinx-copybutton (>=0.5.2)", "sphinx-inline-tabs (>=2023.4.21)", "sphinxcontrib-towncrier (>=0.2.1a0)", "towncrier (>=23.6)"]
+testing = ["build[virtualenv] (>=0.10)", "covdefaults (>=2.3)", "detect-test-pollution (>=1.1.1)", "devpi-process (>=0.3.1)", "diff-cover (>=7.6)", "distlib (>=0.3.6)", "flaky (>=3.7)", "hatch-vcs (>=0.3)", "hatchling (>=1.17.1)", "psutil (>=5.9.5)", "pytest (>=7.4)", "pytest-cov (>=4.1)", "pytest-mock (>=3.11.1)", "pytest-xdist (>=3.3.1)", "re-assert (>=1.1)", "time-machine (>=2.10)", "wheel (>=0.40)"]
+
+[[package]]
+name = "virtualenv"
+version = "20.24.2"
+description = "Virtual Python Environment builder"
+optional = false
+python-versions = ">=3.7"
+files = [
+    {file = "virtualenv-20.24.2-py3-none-any.whl", hash = "sha256:43a3052be36080548bdee0b42919c88072037d50d56c28bd3f853cbe92b953ff"},
+    {file = "virtualenv-20.24.2.tar.gz", hash = "sha256:fd8a78f46f6b99a67b7ec5cf73f92357891a7b3a40fd97637c27f854aae3b9e0"},
+]
+
+[package.dependencies]
+distlib = ">=0.3.7,<1"
+filelock = ">=3.12.2,<4"
+platformdirs = ">=3.9.1,<4"
+
+[package.extras]
+docs = ["furo (>=2023.5.20)", "proselint (>=0.13)", "sphinx (>=7.0.1)", "sphinx-argparse (>=0.4)", "sphinxcontrib-towncrier (>=0.2.1a0)", "towncrier (>=23.6)"]
+test = ["covdefaults (>=2.3)", "coverage (>=7.2.7)", "coverage-enable-subprocess (>=1)", "flaky (>=3.7)", "packaging (>=23.1)", "pytest (>=7.4)", "pytest-env (>=0.8.2)", "pytest-freezer (>=0.4.8)", "pytest-mock (>=3.11.1)", "pytest-randomly (>=3.12)", "pytest-timeout (>=2.1)", "setuptools (>=68)", "time-machine (>=2.10)"]
+
+[metadata]
+lock-version = "2.0"
+python-versions = "^3.11"
+content-hash = "96d09125320de2871f75f05ffba9ca97658e2757b53121b5be2f0d92bd2e5e5c"
diff --git a/pyproject.toml b/pyproject.toml
new file mode 100644
index 00000000..e40a1d73
--- /dev/null
+++ b/pyproject.toml
@@ -0,0 +1,25 @@
+[tool.poetry]
+name = "adventofcodeutils"
+version = "0.1.0"
+description = "This repository contains some utils used by my advent of code projects. "
+authors = ["Roel Adriaans <roel@adriaans.org>"]
+readme = "README.md"
+
+[tool.poetry.dependencies]
+python = "^3.11"
+attrs = "^23.1.0"
+
+[tool.poetry.dev-dependencies]
+black = "^23.7.0"
+pytest = "^7.4.0"
+pytest-cov = "^4.1.0"
+pytest-xdist = "^3.3.1"
+python-dotenv = "^1.0.0"
+tox = "^4.6.4"
+pre-commit = "^3.3.3"
+isort = "^5.12.0"
+
+
+[build-system]
+requires = ["poetry-core"]
+build-backend = "poetry.core.masonry.api"
diff --git a/src/adventofcodeutils/__init__.py b/src/adventofcodeutils/__init__.py
new file mode 100644
index 00000000..e69de29b
diff --git a/src/adventofcodeutils/abstract.py b/src/adventofcodeutils/abstract.py
new file mode 100644
index 00000000..7b3eaeb2
--- /dev/null
+++ b/src/adventofcodeutils/abstract.py
@@ -0,0 +1,37 @@
+from abc import ABC, abstractmethod
+from pathlib import Path
+
+
+class AbstractSolution(ABC):
+    @abstractmethod
+    def solve(self, input_data: str) -> str | int:
+        raise NotImplementedError
+
+
+class SimpleSolution(AbstractSolution, ABC):
+    """
+    This solution implements a simple input_text that is used by the solve method.
+    """
+
+    def __call__(self, input_text: str) -> str | int:
+        """
+        Give the input_text as parameter, process this and return the result
+        """
+        res = self.solve(input_text)
+        return res
+
+
+class FileReaderSolution(AbstractSolution, ABC):
+    """
+    Implement filereader
+    """
+
+    def __call__(self, input_file: str) -> str | int:
+        """
+        Give the input_text as parameter, process this and return the result
+        """
+        root_dir = Path(__file__).parent.parent
+        with open(root_dir / "solutions" / "data" / input_file) as f:
+            input_data = f.read()
+            res = self.solve(input_data=input_data)
+            return res
diff --git a/src/adventofcodeutils/graph.py b/src/adventofcodeutils/graph.py
new file mode 100644
index 00000000..eb66ad78
--- /dev/null
+++ b/src/adventofcodeutils/graph.py
@@ -0,0 +1,89 @@
+from collections import defaultdict
+from collections.abc import Iterator
+from dataclasses import dataclass
+from typing import Generic, TypeVar
+
+# The type of the nodes
+V = TypeVar("V")
+
+
+@dataclass
+class Edge(Generic[V]):
+    u: V
+    v: V
+
+    def __repr__(self) -> str:
+        return f"{self.u} -> {self.v}"
+
+    def __hash__(self):
+        return hash((self.u, self.v))
+
+
+class Graph(Generic[V]):
+    """
+    Very simple graph, enough for advent of code.
+
+    Definitions, that I always forget:
+    - Nodes: The Vertices / items that are there
+    - Edges: The links between vertices
+
+    """
+
+    def __init__(self, edges: Iterator[tuple[V, V]] | None = None):
+        """Create a new graph.
+
+        If edges is given, the network is created based on the edges.
+        For example
+
+        >>> g = Graph([("a", "b"), ("b", "c"), ("c", "a")])
+
+        Will create simple Graph with:
+        a <-> b
+        b <-> c
+        c <-> a
+        """
+
+        self._nodes: set[V] = set()
+        self._edges: defaultdict[V, list[Edge]] = defaultdict(list)
+        if edges:
+            self.add_from_list(edges)
+
+    def add_node(self, node: V):
+        self._nodes.add(node)
+
+    def add_edge(self, u: V, v: V):
+        self.add_node(u)
+        self.add_node(v)
+        new_edge = Edge(u, v)
+        self._edges[u].append(new_edge)
+        self._edges[v].append(new_edge)
+
+    def add_from_list(self, edges: Iterator[tuple[V, V]]):
+        """Add edges based on a list"""
+        for edge in edges:
+            self.add_edge(*edge)
+
+    def __repr__(self) -> str:
+        return f"Graph with {len(self.nodes)} nodes and {len(self.edges)} edges"
+
+    @property
+    def edges(self) -> set[Edge]:
+        """Return all the unique edges"""
+        return {item for sublist in self._edges.values() for item in sublist}
+
+    @property
+    def nodes(self) -> set[V]:
+        """Return all the nodes"""
+        return self._nodes
+
+    def edges_from_node(self, node: V) -> list[Edge]:
+        """Return all the edges directly connected to node"""
+        return self._edges[node]
+
+    def nodes_from_node(self, node: V) -> Iterator[V]:
+        """Return all the nodes directly connected to node"""
+        for edge in self._edges[node]:
+            if edge.v == node:
+                yield edge.u
+            else:
+                yield edge.v
diff --git a/src/adventofcodeutils/node.py b/src/adventofcodeutils/node.py
new file mode 100644
index 00000000..d7a34102
--- /dev/null
+++ b/src/adventofcodeutils/node.py
@@ -0,0 +1,41 @@
+from __future__ import annotations
+
+from typing import Generic, TypeVar
+
+T = TypeVar("T")
+
+
+class Node(Generic[T]):
+    def __init__(
+        self,
+        state: T,
+        parent: Node | None,
+        cost: float = 0.0,
+        heuristic: float = 0.0,
+    ) -> None:
+        self.state: T = state
+        self.parent: Node | None = parent
+        self.cost: float = cost
+        self.heuristic: float = heuristic
+
+    def __lt__(self, other: Node) -> bool:
+        return (self.cost + self.heuristic) < (other.cost + other.heuristic)
+
+    def __repr__(self):
+        if self.parent:
+            parents = self.node_to_path(self)
+            return f"{repr(self.state)} <{self.cost}/{self.heuristic}> ({parents})"
+        else:
+            return f"{repr(self.state)} <{self.cost}/{self.heuristic}>"
+
+    @staticmethod
+    def node_to_path(node: Node[T]) -> list[T]:
+        path: list[T] = [node.state]
+
+        # work backwards from end to front
+        while node.parent is not None:
+            node = node.parent
+            path.append(node.state)
+
+        path.reverse()
+        return path
diff --git a/src/adventofcodeutils/parsing.py b/src/adventofcodeutils/parsing.py
new file mode 100644
index 00000000..2e005a0f
--- /dev/null
+++ b/src/adventofcodeutils/parsing.py
@@ -0,0 +1,41 @@
+import re
+
+
+def string_to_list_of_ints(input_string: str, split_string: str = ",") -> list[int]:
+    """
+    Split a string on `split_string` and return a list of integers
+
+    :param input_string: String to split
+    :param split_string: Split by this string
+    :return: List of integers
+    """
+    list_of_ints = list(map(int, input_string.split(split_string)))
+    return list_of_ints
+
+
+def string_of_single_to_list_of_ints(input_string: str) -> list[int]:
+    """
+    Split a string on `split_string` and return a list of integers
+
+    :param input_string: String to split
+    :return: List of integers
+    """
+    list_of_ints = list(map(int, input_string))
+    return list_of_ints
+
+
+digits_re = re.compile(r"\d+")
+
+
+def extract_digits_from_string(input_string: str) -> list[int]:
+    """Extract all the digits from a string. For example:
+
+    >>> extract_digits_from_string("this 5 is a 6 plus 10")
+    [5, 6, 10]
+
+    Does not support decimal:
+
+    >>> extract_digits_from_string("4.5")
+    [4, 5]
+    """
+    return list(map(int, digits_re.findall(input_string)))
diff --git a/src/adventofcodeutils/point.py b/src/adventofcodeutils/point.py
new file mode 100644
index 00000000..39697395
--- /dev/null
+++ b/src/adventofcodeutils/point.py
@@ -0,0 +1,30 @@
+import attrs
+
+
+@attrs.define
+class XYZPoint:
+    x: int
+    y: int
+    z: int
+
+    def __add__(self, other):
+        if not issubclass(type(other), XYZPoint):
+            raise ValueError("Cannot add incompatible types together")
+        return XYZPoint(x=self.x + other.x, y=self.y + other.y, z=self.z + other.z)
+
+    def distance(self, other):
+        return abs(self.x - other.x) + abs(self.y - other.y) + abs(self.z - other.z)
+
+
+@attrs.define
+class XYPoint:
+    x: int
+    y: int
+
+    def __add__(self, other):
+        if not issubclass(type(other), XYPoint):
+            raise ValueError("Cannot add incompatible types together")
+        return XYPoint(x=self.x + other.x, y=self.y + other.y)
+
+    def distance(self, other):
+        return abs(self.x - other.x) + abs(self.y - other.y)
diff --git a/src/adventofcodeutils/priority_queue.py b/src/adventofcodeutils/priority_queue.py
new file mode 100644
index 00000000..3917a03d
--- /dev/null
+++ b/src/adventofcodeutils/priority_queue.py
@@ -0,0 +1,30 @@
+from __future__ import annotations
+
+from heapq import heappop, heappush
+from typing import Generic, TypeVar
+
+T = TypeVar("T")
+
+
+class PriorityQueue(Generic[T]):
+    def __init__(self) -> None:
+        self._container: list[T] = []
+
+    @property
+    def empty(self) -> bool:
+        # not is true for empty container
+        return not self._container
+
+    def push(self, item: T) -> None:
+        # in by priority
+        heappush(self._container, item)
+
+    def pop(self) -> T:
+        # out by priority
+        return heappop(self._container)
+
+    def __repr__(self) -> str:
+        return repr(self._container)
+
+    def __len__(self) -> int:
+        return len(self._container)
diff --git a/src/adventofcodeutils/queue.py b/src/adventofcodeutils/queue.py
new file mode 100644
index 00000000..48c0d882
--- /dev/null
+++ b/src/adventofcodeutils/queue.py
@@ -0,0 +1,29 @@
+from __future__ import annotations
+
+from collections import deque
+from typing import Generic, TypeVar
+
+T = TypeVar("T")
+
+
+class Queue(Generic[T]):
+    def __init__(self) -> None:
+        self._container: deque[T] = deque()
+
+    @property
+    def empty(self) -> bool:
+        # not is true for empty container
+        return not self._container
+
+    def push(self, item: T) -> None:
+        self._container.append(item)
+
+    def pop(self) -> T:
+        # FIFO
+        return self._container.popleft()
+
+    def __repr__(self) -> str:
+        return repr(self._container)
+
+    def __len__(self) -> int:
+        return len(self._container)
diff --git a/src/adventofcodeutils/stack.py b/src/adventofcodeutils/stack.py
new file mode 100644
index 00000000..1831ae1e
--- /dev/null
+++ b/src/adventofcodeutils/stack.py
@@ -0,0 +1,25 @@
+from __future__ import annotations
+
+from typing import Generic, TypeVar
+
+T = TypeVar("T")
+
+
+class Stack(Generic[T]):
+    def __init__(self) -> None:
+        self._container: list[T] = []
+
+    @property
+    def empty(self) -> bool:
+        # not is true for empty container
+        return not self._container
+
+    def push(self, item: T) -> None:
+        self._container.append(item)
+
+    def pop(self) -> T:
+        # LIFO
+        return self._container.pop()
+
+    def __repr__(self) -> str:
+        return repr(self._container)
diff --git a/tests/__init__.py b/tests/__init__.py
new file mode 100644
index 00000000..e69de29b
diff --git a/tests/test_advent_utils.py b/tests/test_advent_utils.py
new file mode 100644
index 00000000..24463c86
--- /dev/null
+++ b/tests/test_advent_utils.py
@@ -0,0 +1,53 @@
+import pytest
+
+from adventofcodeutils import parsing
+
+
+def test_string_to_list_of_ints():
+    input_data = "2,4,5, 300,-3,0"
+    result = parsing.string_to_list_of_ints(input_data)
+
+    assert result == [2, 4, 5, 300, -3, 0]
+
+
+def test_string_to_list_of_ints_with_dash():
+    # Split on a -, does not support negative ints
+    input_data = "2-4-5-300-3-0"
+    result = parsing.string_to_list_of_ints(input_data, "-")
+
+    assert result == [2, 4, 5, 300, 3, 0]
+
+
+def test_invalid_list_to_list_of_ints():
+    input_data = "these,are,not,the,ints,you're,looking,for"
+    with pytest.raises(ValueError):
+        parsing.string_to_list_of_ints(input_data)
+
+
+def test_string_of_single_to_list_of_ints():
+    input_data = "23272930"
+    result = parsing.string_of_single_to_list_of_ints(input_data)
+
+    assert result == [2, 3, 2, 7, 2, 9, 3, 0]
+
+
+def test_string_of_invalid_single_to_list_of_ints():
+    input_data = "2327-2930"
+    with pytest.raises(ValueError):
+        parsing.string_of_single_to_list_of_ints(input_data)
+
+
+@pytest.mark.parametrize(
+    ("input_string", "expected_list"),
+    [
+        ("12", [12]),
+        ("1x2", [1, 2]),
+        ("foo42bar2", [42, 2]),
+        # A . is also found as a deliminator
+        ("3.1598", [3, 1598]),
+        # Leading zero's are skipped
+        ("3.0052", [3, 52]),
+    ],
+)
+def test_extract_digits_from_string(input_string, expected_list):
+    assert parsing.extract_digits_from_string(input_string) == expected_list
diff --git a/tests/test_graph.py b/tests/test_graph.py
new file mode 100644
index 00000000..a57ffd9f
--- /dev/null
+++ b/tests/test_graph.py
@@ -0,0 +1,20 @@
+from adventofcodeutils.graph import Edge, Graph
+
+
+def test_graph():
+    """Test the graph"""
+    g = Graph()
+    g.add_from_list(
+        [
+            ("a", "b"),
+            ("b", "c"),
+            ("a", "d"),
+        ]
+    )
+    assert repr(g) == "Graph with 4 nodes and 3 edges"
+    assert g.nodes == {"a", "b", "c", "d"}
+    assert Edge("a", "b") in list(g.edges)
+
+    # Test the nodes reachable. From "a", we can connect to "b" and "d"
+    assert g.edges_from_node("a") == [Edge("a", "b"), Edge("a", "d")]
+    assert list(g.nodes_from_node("a")) == ["b", "d"]
diff --git a/tests/test_node.py b/tests/test_node.py
new file mode 100644
index 00000000..a599d7ac
--- /dev/null
+++ b/tests/test_node.py
@@ -0,0 +1,13 @@
+from adventofcodeutils.node import Node
+
+
+def test_node():
+    n1 = Node("n1", None, cost=1, heuristic=0.5)
+    n2 = Node("n2", None, cost=3, heuristic=0.5)
+
+    # test __lt__ < and >
+    assert n1 < n2
+    assert n2 > n1
+
+    assert not n1 > n2
+    assert not n2 < n1
diff --git a/tests/test_point.py b/tests/test_point.py
new file mode 100644
index 00000000..49fd719d
--- /dev/null
+++ b/tests/test_point.py
@@ -0,0 +1,60 @@
+import pytest
+
+from adventofcodeutils import point
+
+
+def test_xyzpoint():
+    p1 = point.XYZPoint(1, 2, 3)
+    assert p1.x == 1
+    assert p1.y == 2
+    assert p1.z == 3
+
+    assert repr(p1) == "XYZPoint(x=1, y=2, z=3)"
+
+    p2 = point.XYZPoint(6, 7, 8)
+
+    total = p1 + p2
+    assert total.x == 7
+    assert total.y == 9
+    assert total.z == 11
+
+    p1_same = point.XYZPoint(1, 2, 3)
+    assert p1 == p1_same
+    assert p1 != p2
+
+
+def test_xyzdistance():
+    p1 = point.XYZPoint(1105, -1205, 1229)
+    p2 = point.XYZPoint(-92, -2380, -20)
+
+    assert p1.distance(p2) == 3621
+
+
+def test_xypoint():
+    p1 = point.XYPoint(1, 2)
+    assert p1.x == 1
+    assert p1.y == 2
+
+    assert repr(p1) == "XYPoint(x=1, y=2)"
+
+    p2 = point.XYPoint(6, 7)
+
+    total = p1 + p2
+    assert total.x == 7
+    assert total.y == 9
+
+    p1_same = point.XYPoint(1, 2)
+    assert p1 == p1_same
+    assert p1 != p2
+
+
+def test_invalid_together():
+    xy = point.XYPoint(1, 2)
+    xyz = point.XYZPoint(6, 7, 8)
+
+    with pytest.raises(ValueError):
+        xyz + xy
+    with pytest.raises(ValueError):
+        xy + xyz
+
+    assert xy != xyz
diff --git a/tests/test_priority_queue.py b/tests/test_priority_queue.py
new file mode 100644
index 00000000..0842e808
--- /dev/null
+++ b/tests/test_priority_queue.py
@@ -0,0 +1,32 @@
+import pytest
+
+from adventofcodeutils.priority_queue import PriorityQueue
+
+
+def test_priorityqueue():
+    q = PriorityQueue()
+
+    assert q.empty
+    assert q.__repr__() == "[]"
+
+    # Let's add some stuff. The priority is not in order.
+    q.push((1, "a"))
+    q.push((3, "c"))
+    q.push((2, "b"))
+
+    assert not q.empty
+    assert len(q) == 3
+    # Repr is based on the insert order (?)
+    assert q.__repr__() == "[(1, 'a'), (3, 'c'), (2, 'b')]"
+
+    # Output is based on the priority
+    assert q.pop() == (1, "a")
+    assert q.pop() == (2, "b")
+    assert q.pop() == (3, "c")
+
+    # And empty again
+    assert q.empty
+    assert len(q) == 0
+
+    with pytest.raises(IndexError):
+        q.pop()
diff --git a/tests/test_queue.py b/tests/test_queue.py
new file mode 100644
index 00000000..87dbcace
--- /dev/null
+++ b/tests/test_queue.py
@@ -0,0 +1,31 @@
+import pytest
+
+from adventofcodeutils.queue import Queue
+
+
+def test_queue():
+    q = Queue()
+
+    assert q.empty
+    assert q.__repr__() == "deque([])"
+
+    # Let's add some stuff
+    q.push("a")
+    q.push("b")
+    q.push("c")
+
+    assert not q.empty
+    assert len(q) == 3
+    assert q.__repr__() == "deque(['a', 'b', 'c'])"
+
+    # First in is First out
+    assert q.pop() == "a"
+    assert q.pop() == "b"
+    assert q.pop() == "c"
+
+    # And empty again
+    assert q.empty
+    assert len(q) == 0
+
+    with pytest.raises(IndexError):
+        q.pop()
diff --git a/tests/test_stack.py b/tests/test_stack.py
new file mode 100644
index 00000000..16afac61
--- /dev/null
+++ b/tests/test_stack.py
@@ -0,0 +1,37 @@
+import pytest
+
+from adventofcodeutils.stack import Stack
+
+
+def test_stack():
+    st = Stack()
+
+    # Check if empty
+    assert st.empty
+
+    # Popping empty should raise index error
+    with pytest.raises(IndexError):
+        st.pop()
+
+    # Add some items
+    st.push(1)
+    st.push(2)
+    st.push(3)
+
+    # We should have some data now
+    assert not st.empty
+
+    # Let's look at the data
+    assert repr(st) == repr([1, 2, 3])
+
+    # Stack, to the Last In, First Out.
+    assert st.pop() == 3
+    assert st.pop() == 2
+    assert st.pop() == 1
+
+    # Should be empty again
+    assert st.empty
+    assert repr(st) == repr([])
+
+    with pytest.raises(IndexError):
+        st.pop()
diff --git a/tox.ini b/tox.ini
new file mode 100644
index 00000000..a0b61cec
--- /dev/null
+++ b/tox.ini
@@ -0,0 +1,113 @@
+[tox]
+envlist =
+    linters
+    py
+
+[pytest]
+# Makes all warnings be fatal
+filterwarnings = error
+junit_family = xunit1
+testpaths = tests
+addopts = --cov --cov-report=term --cov-report=html --cov-report=xml
+
+[flake8]
+max-complexity = 16
+filename=
+    ./src/*.py,
+    ./src/**/*.py,
+    ./tests/*.py,
+    ./tests/**/*.py
+
+# Set to 88 for black
+max-line-length = 88
+statistics = True
+exclude =
+    docs
+    build
+    env
+    .tox
+
+[isort]
+multi_line_output = 3
+include_trailing_comma = true
+force_grid_wrap = 0
+use_parentheses = True
+line_length = 88
+
+[coverage:run]
+branch = True
+omit =
+    */__init__.py
+
+source =
+    adventofcodeutils
+    tests
+
+[coverage:report]
+# We're not yet started so test coverage will be low. Increase as time goes on
+fail_under = 10
+exclude_lines =
+    # Have to re-enable the standard pragma
+    pragma: no cover
+
+    # Don't complain if tests don't hit defensive assertion code:
+    raise NotImplementedError
+
+[testenv]
+deps =
+    pytest
+    pytest-cov
+    pytest-xdist
+
+commands =
+    pytest {posargs} -n 4
+
+[testenv:flake8]
+skip_install = true
+deps =
+    flake8
+    pep8-naming
+commands =
+    flake8 \
+        # E203 is not PEP8 compliant https://github.com/ambv/black#slices
+        # W503 is not PEP8 compliant https://github.com/ambv/black#line-breaks--binary-operators
+        --ignore E203,W503 \
+        {posargs}
+
+[testenv:black]
+skip_install = true
+deps =
+    black
+commands =
+    black --target-version py310 --check --diff src/ tests/
+
+[testenv:mypy]
+skip_install = true
+description = type check ourselves
+deps =
+    mypy
+    lxml
+    attrs
+commands =
+    python -m mypy --config-file mypy.ini src/
+
+[testenv:isort]
+skip_install = true
+description = Make sure our imports are nicely sorted
+deps = isort
+commands =
+    isort  --check-only src/ tests/
+
+# Combines all linters in one, fast, env
+[testenv:linters]
+skip_install = true
+deps =
+    {[testenv:black]deps}
+    {[testenv:flake8]deps}
+    {[testenv:isort]deps}
+    {[testenv:mypy]deps}
+commands =
+    {[testenv:black]commands}
+    {[testenv:flake8]commands}
+    {[testenv:isort]commands}
+    {[testenv:mypy]commands}

From 0c98ef82fb99651664243a7f543d6e4f77499bb0 Mon Sep 17 00:00:00 2001
From: Roel Adriaans <roel@adriaans.org>
Date: Sun, 30 Jul 2023 21:31:45 +0200
Subject: [PATCH 280/371] Remove file, better in aoc oslution itself

---
 src/adventofcodeutils/abstract.py | 37 -------------------------------
 1 file changed, 37 deletions(-)
 delete mode 100644 src/adventofcodeutils/abstract.py

diff --git a/src/adventofcodeutils/abstract.py b/src/adventofcodeutils/abstract.py
deleted file mode 100644
index 7b3eaeb2..00000000
--- a/src/adventofcodeutils/abstract.py
+++ /dev/null
@@ -1,37 +0,0 @@
-from abc import ABC, abstractmethod
-from pathlib import Path
-
-
-class AbstractSolution(ABC):
-    @abstractmethod
-    def solve(self, input_data: str) -> str | int:
-        raise NotImplementedError
-
-
-class SimpleSolution(AbstractSolution, ABC):
-    """
-    This solution implements a simple input_text that is used by the solve method.
-    """
-
-    def __call__(self, input_text: str) -> str | int:
-        """
-        Give the input_text as parameter, process this and return the result
-        """
-        res = self.solve(input_text)
-        return res
-
-
-class FileReaderSolution(AbstractSolution, ABC):
-    """
-    Implement filereader
-    """
-
-    def __call__(self, input_file: str) -> str | int:
-        """
-        Give the input_text as parameter, process this and return the result
-        """
-        root_dir = Path(__file__).parent.parent
-        with open(root_dir / "solutions" / "data" / input_file) as f:
-            input_data = f.read()
-            res = self.solve(input_data=input_data)
-            return res

From 822b4c3721fa78ee192678e520f0656a0460b3a7 Mon Sep 17 00:00:00 2001
From: Roel Adriaans <roel@adriaans.org>
Date: Sun, 6 Aug 2023 22:39:36 +0200
Subject: [PATCH 281/371] Add generic_search.py, from advent of code 2022, bump
 version

---
 .pre-commit-config.yaml                 |   4 +-
 pyproject.toml                          |   2 +-
 src/adventofcodeutils/generic_search.py | 106 ++++++++++++++++++++++++
 3 files changed, 109 insertions(+), 3 deletions(-)
 create mode 100644 src/adventofcodeutils/generic_search.py

diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index 88a3b754..45343055 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -8,7 +8,7 @@ repos:
       language_version: 'python3.10'
 
   - repo: https://github.com/pycqa/flake8
-    rev: 6.0.0
+    rev: 6.1.0
     hooks:
     - id: flake8
       args: ["--ignore", "E203,W503"]
@@ -31,7 +31,7 @@ repos:
       language_version: python3
 
   - repo: https://github.com/asottile/pyupgrade
-    rev: v3.9.0
+    rev: v3.10.1
     hooks:
     - id: pyupgrade
       args: [ "--py311-plus" ]
diff --git a/pyproject.toml b/pyproject.toml
index e40a1d73..e8fbc459 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "adventofcodeutils"
-version = "0.1.0"
+version = "0.2.0"
 description = "This repository contains some utils used by my advent of code projects. "
 authors = ["Roel Adriaans <roel@adriaans.org>"]
 readme = "README.md"
diff --git a/src/adventofcodeutils/generic_search.py b/src/adventofcodeutils/generic_search.py
new file mode 100644
index 00000000..508c4015
--- /dev/null
+++ b/src/adventofcodeutils/generic_search.py
@@ -0,0 +1,106 @@
+from __future__ import annotations
+
+from abc import ABC, abstractmethod
+from collections.abc import Callable
+from typing import TypeVar
+
+from adventofcodeutils.node import Node
+from adventofcodeutils.priority_queue import PriorityQueue
+from adventofcodeutils.queue import Queue
+from adventofcodeutils.stack import Stack
+
+T = TypeVar("T")
+
+# @TODO: Make the container a protocol, or pep-0695?
+Container = Queue | Stack
+
+
+class Search(ABC):
+    @abstractmethod
+    def _get_container(self) -> Container:
+        """Return the base container for this class"""
+        raise NotImplementedError
+
+    def search(
+        self,
+        initial: T,
+        goal_test: Callable[[T], bool],
+        successors: Callable[[T], list[T]],
+    ) -> Node[T] | None:
+        # frontier is where we've yet to go
+        # @TODO This is ugly, the base class has knowledge of
+        #   the container implementation
+        frontier: Queue[Node[T]] | Stack[Node[T]] = self._get_container()
+        frontier.push(Node(initial, None))
+
+        # explored is where we've been
+        explored: set[T] = {initial}
+
+        # keep going while there is more to explore
+        while not frontier.empty:
+            current_node: Node[T] = frontier.pop()
+            current_state: T = current_node.state
+
+            # if we found the goal, we're done
+            if goal_test(current_state):
+                return current_node
+
+            # check where we can go next and haven't explored
+            for child in successors(current_state):
+                if child in explored:
+                    # skip children we already explored
+                    continue
+                explored.add(child)
+                frontier.push(Node(child, current_node))
+
+        # went through everything and never found goal
+        return None
+
+
+class DFS(Search):
+    """Perform a Depth-first search (DFS)"""
+
+    def _get_container(self) -> Container:
+        return Stack()
+
+
+class BFS(Search):
+    """Perform a Breadth-first search (BFS)"""
+
+    def _get_container(self) -> Container:
+        return Queue()
+
+
+class Astar:
+    @staticmethod
+    def astar(
+        initial: T,
+        goal_test: Callable[[T], bool],
+        successors: Callable[[T], list[T]],
+        heuristic: Callable[[T], float],
+    ) -> Node[T] | None:
+        # frontier is where we've yet to go
+        frontier: PriorityQueue[Node[T]] = PriorityQueue()
+        frontier.push(Node(initial, None, 0.0, heuristic(initial)))
+
+        # explored is where we've been
+        explored: dict[T, float] = {initial: 0.0}
+
+        # keep going while there is more to explore
+        while not frontier.empty:
+            current_node: Node[T] = frontier.pop()
+            current_state: T = current_node.state
+            # if we found the goal, we're done
+            if goal_test(current_state):
+                return current_node
+            # check where we can go next and haven't explored
+            for child in successors(current_state):
+                # 1 assumes a grid, need a cost function for more sophisticated apps
+                new_cost: float = current_node.cost + 1
+
+                if child not in explored or explored[child] > new_cost:
+                    explored[child] = new_cost
+                    frontier.push(Node(child, current_node, new_cost, heuristic(child)))
+
+        # went through everything and never found goal
+        return None

From d9aa38f5eb8b8fd25cf4903f646fc3bbdc858fee Mon Sep 17 00:00:00 2001
From: Roel Adriaans <roel@adriaans.org>
Date: Sun, 13 Aug 2023 20:45:31 +0200
Subject: [PATCH 282/371] Add stack length,

---
 pyproject.toml                 | 2 +-
 src/adventofcodeutils/stack.py | 3 +++
 tests/test_stack.py            | 2 ++
 3 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/pyproject.toml b/pyproject.toml
index e8fbc459..75cb0719 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "adventofcodeutils"
-version = "0.2.0"
+version = "0.2.1"
 description = "This repository contains some utils used by my advent of code projects. "
 authors = ["Roel Adriaans <roel@adriaans.org>"]
 readme = "README.md"
diff --git a/src/adventofcodeutils/stack.py b/src/adventofcodeutils/stack.py
index 1831ae1e..c215b716 100644
--- a/src/adventofcodeutils/stack.py
+++ b/src/adventofcodeutils/stack.py
@@ -23,3 +23,6 @@ def pop(self) -> T:
 
     def __repr__(self) -> str:
         return repr(self._container)
+
+    def __len__(self) -> int:
+        return len(self._container)
diff --git a/tests/test_stack.py b/tests/test_stack.py
index 16afac61..90ad706a 100644
--- a/tests/test_stack.py
+++ b/tests/test_stack.py
@@ -20,6 +20,7 @@ def test_stack():
 
     # We should have some data now
     assert not st.empty
+    assert len(st) == 3
 
     # Let's look at the data
     assert repr(st) == repr([1, 2, 3])
@@ -31,6 +32,7 @@ def test_stack():
 
     # Should be empty again
     assert st.empty
+    assert len(st) == 0
     assert repr(st) == repr([])
 
     with pytest.raises(IndexError):

From f1609d978c58b2fe094e03b385cdc8fe2dfaa28a Mon Sep 17 00:00:00 2001
From: Roel Adriaans <roel@adriaans.org>
Date: Sun, 13 Aug 2023 20:46:03 +0200
Subject: [PATCH 283/371] Remove the poetry.lock file, best practice not to
 include in a lib

---
 .gitignore  |   2 +
 poetry.lock | 576 ----------------------------------------------------
 2 files changed, 2 insertions(+), 576 deletions(-)
 delete mode 100644 poetry.lock

diff --git a/.gitignore b/.gitignore
index f1e7ffbf..4eaf3758 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,5 @@
+# This is a lib, so we don't need the lockfile.
+poetry.lock
 
 # Created by https://www.gitignore.io/api/test,python
 # Edit at https://www.gitignore.io/?templates=test,python
diff --git a/poetry.lock b/poetry.lock
deleted file mode 100644
index 2427319d..00000000
--- a/poetry.lock
+++ /dev/null
@@ -1,576 +0,0 @@
-# This file is automatically @generated by Poetry 1.5.1 and should not be changed by hand.
-
-[[package]]
-name = "attrs"
-version = "23.1.0"
-description = "Classes Without Boilerplate"
-optional = false
-python-versions = ">=3.7"
-files = [
-    {file = "attrs-23.1.0-py3-none-any.whl", hash = "sha256:1f28b4522cdc2fb4256ac1a020c78acf9cba2c6b461ccd2c126f3aa8e8335d04"},
-    {file = "attrs-23.1.0.tar.gz", hash = "sha256:6279836d581513a26f1bf235f9acd333bc9115683f14f7e8fae46c98fc50e015"},
-]
-
-[package.extras]
-cov = ["attrs[tests]", "coverage[toml] (>=5.3)"]
-dev = ["attrs[docs,tests]", "pre-commit"]
-docs = ["furo", "myst-parser", "sphinx", "sphinx-notfound-page", "sphinxcontrib-towncrier", "towncrier", "zope-interface"]
-tests = ["attrs[tests-no-zope]", "zope-interface"]
-tests-no-zope = ["cloudpickle", "hypothesis", "mypy (>=1.1.1)", "pympler", "pytest (>=4.3.0)", "pytest-mypy-plugins", "pytest-xdist[psutil]"]
-
-[[package]]
-name = "black"
-version = "23.7.0"
-description = "The uncompromising code formatter."
-optional = false
-python-versions = ">=3.8"
-files = [
-    {file = "black-23.7.0-cp310-cp310-macosx_10_16_arm64.whl", hash = "sha256:5c4bc552ab52f6c1c506ccae05681fab58c3f72d59ae6e6639e8885e94fe2587"},
-    {file = "black-23.7.0-cp310-cp310-macosx_10_16_universal2.whl", hash = "sha256:552513d5cd5694590d7ef6f46e1767a4df9af168d449ff767b13b084c020e63f"},
-    {file = "black-23.7.0-cp310-cp310-macosx_10_16_x86_64.whl", hash = "sha256:86cee259349b4448adb4ef9b204bb4467aae74a386bce85d56ba4f5dc0da27be"},
-    {file = "black-23.7.0-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:501387a9edcb75d7ae8a4412bb8749900386eaef258f1aefab18adddea1936bc"},
-    {file = "black-23.7.0-cp310-cp310-win_amd64.whl", hash = "sha256:fb074d8b213749fa1d077d630db0d5f8cc3b2ae63587ad4116e8a436e9bbe995"},
-    {file = "black-23.7.0-cp311-cp311-macosx_10_16_arm64.whl", hash = "sha256:b5b0ee6d96b345a8b420100b7d71ebfdd19fab5e8301aff48ec270042cd40ac2"},
-    {file = "black-23.7.0-cp311-cp311-macosx_10_16_universal2.whl", hash = "sha256:893695a76b140881531062d48476ebe4a48f5d1e9388177e175d76234ca247cd"},
-    {file = "black-23.7.0-cp311-cp311-macosx_10_16_x86_64.whl", hash = "sha256:c333286dc3ddca6fdff74670b911cccedacb4ef0a60b34e491b8a67c833b343a"},
-    {file = "black-23.7.0-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:831d8f54c3a8c8cf55f64d0422ee875eecac26f5f649fb6c1df65316b67c8926"},
-    {file = "black-23.7.0-cp311-cp311-win_amd64.whl", hash = "sha256:7f3bf2dec7d541b4619b8ce526bda74a6b0bffc480a163fed32eb8b3c9aed8ad"},
-    {file = "black-23.7.0-cp38-cp38-macosx_10_16_arm64.whl", hash = "sha256:f9062af71c59c004cd519e2fb8f5d25d39e46d3af011b41ab43b9c74e27e236f"},
-    {file = "black-23.7.0-cp38-cp38-macosx_10_16_universal2.whl", hash = "sha256:01ede61aac8c154b55f35301fac3e730baf0c9cf8120f65a9cd61a81cfb4a0c3"},
-    {file = "black-23.7.0-cp38-cp38-macosx_10_16_x86_64.whl", hash = "sha256:327a8c2550ddc573b51e2c352adb88143464bb9d92c10416feb86b0f5aee5ff6"},
-    {file = "black-23.7.0-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:6d1c6022b86f83b632d06f2b02774134def5d4d4f1dac8bef16d90cda18ba28a"},
-    {file = "black-23.7.0-cp38-cp38-win_amd64.whl", hash = "sha256:27eb7a0c71604d5de083757fbdb245b1a4fae60e9596514c6ec497eb63f95320"},
-    {file = "black-23.7.0-cp39-cp39-macosx_10_16_arm64.whl", hash = "sha256:8417dbd2f57b5701492cd46edcecc4f9208dc75529bcf76c514864e48da867d9"},
-    {file = "black-23.7.0-cp39-cp39-macosx_10_16_universal2.whl", hash = "sha256:47e56d83aad53ca140da0af87678fb38e44fd6bc0af71eebab2d1f59b1acf1d3"},
-    {file = "black-23.7.0-cp39-cp39-macosx_10_16_x86_64.whl", hash = "sha256:25cc308838fe71f7065df53aedd20327969d05671bac95b38fdf37ebe70ac087"},
-    {file = "black-23.7.0-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:642496b675095d423f9b8448243336f8ec71c9d4d57ec17bf795b67f08132a91"},
-    {file = "black-23.7.0-cp39-cp39-win_amd64.whl", hash = "sha256:ad0014efc7acf0bd745792bd0d8857413652979200ab924fbf239062adc12491"},
-    {file = "black-23.7.0-py3-none-any.whl", hash = "sha256:9fd59d418c60c0348505f2ddf9609c1e1de8e7493eab96198fc89d9f865e7a96"},
-    {file = "black-23.7.0.tar.gz", hash = "sha256:022a582720b0d9480ed82576c920a8c1dde97cc38ff11d8d8859b3bd6ca9eedb"},
-]
-
-[package.dependencies]
-click = ">=8.0.0"
-mypy-extensions = ">=0.4.3"
-packaging = ">=22.0"
-pathspec = ">=0.9.0"
-platformdirs = ">=2"
-
-[package.extras]
-colorama = ["colorama (>=0.4.3)"]
-d = ["aiohttp (>=3.7.4)"]
-jupyter = ["ipython (>=7.8.0)", "tokenize-rt (>=3.2.0)"]
-uvloop = ["uvloop (>=0.15.2)"]
-
-[[package]]
-name = "cachetools"
-version = "5.3.1"
-description = "Extensible memoizing collections and decorators"
-optional = false
-python-versions = ">=3.7"
-files = [
-    {file = "cachetools-5.3.1-py3-none-any.whl", hash = "sha256:95ef631eeaea14ba2e36f06437f36463aac3a096799e876ee55e5cdccb102590"},
-    {file = "cachetools-5.3.1.tar.gz", hash = "sha256:dce83f2d9b4e1f732a8cd44af8e8fab2dbe46201467fc98b3ef8f269092bf62b"},
-]
-
-[[package]]
-name = "cfgv"
-version = "3.3.1"
-description = "Validate configuration and produce human readable error messages."
-optional = false
-python-versions = ">=3.6.1"
-files = [
-    {file = "cfgv-3.3.1-py2.py3-none-any.whl", hash = "sha256:c6a0883f3917a037485059700b9e75da2464e6c27051014ad85ba6aaa5884426"},
-    {file = "cfgv-3.3.1.tar.gz", hash = "sha256:f5a830efb9ce7a445376bb66ec94c638a9787422f96264c98edc6bdeed8ab736"},
-]
-
-[[package]]
-name = "chardet"
-version = "5.1.0"
-description = "Universal encoding detector for Python 3"
-optional = false
-python-versions = ">=3.7"
-files = [
-    {file = "chardet-5.1.0-py3-none-any.whl", hash = "sha256:362777fb014af596ad31334fde1e8c327dfdb076e1960d1694662d46a6917ab9"},
-    {file = "chardet-5.1.0.tar.gz", hash = "sha256:0d62712b956bc154f85fb0a266e2a3c5913c2967e00348701b32411d6def31e5"},
-]
-
-[[package]]
-name = "click"
-version = "8.1.6"
-description = "Composable command line interface toolkit"
-optional = false
-python-versions = ">=3.7"
-files = [
-    {file = "click-8.1.6-py3-none-any.whl", hash = "sha256:fa244bb30b3b5ee2cae3da8f55c9e5e0c0e86093306301fb418eb9dc40fbded5"},
-    {file = "click-8.1.6.tar.gz", hash = "sha256:48ee849951919527a045bfe3bf7baa8a959c423134e1a5b98c05c20ba75a1cbd"},
-]
-
-[package.dependencies]
-colorama = {version = "*", markers = "platform_system == \"Windows\""}
-
-[[package]]
-name = "colorama"
-version = "0.4.6"
-description = "Cross-platform colored terminal text."
-optional = false
-python-versions = "!=3.0.*,!=3.1.*,!=3.2.*,!=3.3.*,!=3.4.*,!=3.5.*,!=3.6.*,>=2.7"
-files = [
-    {file = "colorama-0.4.6-py2.py3-none-any.whl", hash = "sha256:4f1d9991f5acc0ca119f9d443620b77f9d6b33703e51011c16baf57afb285fc6"},
-    {file = "colorama-0.4.6.tar.gz", hash = "sha256:08695f5cb7ed6e0531a20572697297273c47b8cae5a63ffc6d6ed5c201be6e44"},
-]
-
-[[package]]
-name = "coverage"
-version = "7.2.7"
-description = "Code coverage measurement for Python"
-optional = false
-python-versions = ">=3.7"
-files = [
-    {file = "coverage-7.2.7-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:d39b5b4f2a66ccae8b7263ac3c8170994b65266797fb96cbbfd3fb5b23921db8"},
-    {file = "coverage-7.2.7-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:6d040ef7c9859bb11dfeb056ff5b3872436e3b5e401817d87a31e1750b9ae2fb"},
-    {file = "coverage-7.2.7-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:ba90a9563ba44a72fda2e85302c3abc71c5589cea608ca16c22b9804262aaeb6"},
-    {file = "coverage-7.2.7-cp310-cp310-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:e7d9405291c6928619403db1d10bd07888888ec1abcbd9748fdaa971d7d661b2"},
-    {file = "coverage-7.2.7-cp310-cp310-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:31563e97dae5598556600466ad9beea39fb04e0229e61c12eaa206e0aa202063"},
-    {file = "coverage-7.2.7-cp310-cp310-musllinux_1_1_aarch64.whl", hash = "sha256:ebba1cd308ef115925421d3e6a586e655ca5a77b5bf41e02eb0e4562a111f2d1"},
-    {file = "coverage-7.2.7-cp310-cp310-musllinux_1_1_i686.whl", hash = "sha256:cb017fd1b2603ef59e374ba2063f593abe0fc45f2ad9abdde5b4d83bd922a353"},
-    {file = "coverage-7.2.7-cp310-cp310-musllinux_1_1_x86_64.whl", hash = "sha256:d62a5c7dad11015c66fbb9d881bc4caa5b12f16292f857842d9d1871595f4495"},
-    {file = "coverage-7.2.7-cp310-cp310-win32.whl", hash = "sha256:ee57190f24fba796e36bb6d3aa8a8783c643d8fa9760c89f7a98ab5455fbf818"},
-    {file = "coverage-7.2.7-cp310-cp310-win_amd64.whl", hash = "sha256:f75f7168ab25dd93110c8a8117a22450c19976afbc44234cbf71481094c1b850"},
-    {file = "coverage-7.2.7-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:06a9a2be0b5b576c3f18f1a241f0473575c4a26021b52b2a85263a00f034d51f"},
-    {file = "coverage-7.2.7-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:5baa06420f837184130752b7c5ea0808762083bf3487b5038d68b012e5937dbe"},
-    {file = "coverage-7.2.7-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:fdec9e8cbf13a5bf63290fc6013d216a4c7232efb51548594ca3631a7f13c3a3"},
-    {file = "coverage-7.2.7-cp311-cp311-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:52edc1a60c0d34afa421c9c37078817b2e67a392cab17d97283b64c5833f427f"},
-    {file = "coverage-7.2.7-cp311-cp311-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:63426706118b7f5cf6bb6c895dc215d8a418d5952544042c8a2d9fe87fcf09cb"},
-    {file = "coverage-7.2.7-cp311-cp311-musllinux_1_1_aarch64.whl", hash = "sha256:afb17f84d56068a7c29f5fa37bfd38d5aba69e3304af08ee94da8ed5b0865833"},
-    {file = "coverage-7.2.7-cp311-cp311-musllinux_1_1_i686.whl", hash = "sha256:48c19d2159d433ccc99e729ceae7d5293fbffa0bdb94952d3579983d1c8c9d97"},
-    {file = "coverage-7.2.7-cp311-cp311-musllinux_1_1_x86_64.whl", hash = "sha256:0e1f928eaf5469c11e886fe0885ad2bf1ec606434e79842a879277895a50942a"},
-    {file = "coverage-7.2.7-cp311-cp311-win32.whl", hash = "sha256:33d6d3ea29d5b3a1a632b3c4e4f4ecae24ef170b0b9ee493883f2df10039959a"},
-    {file = "coverage-7.2.7-cp311-cp311-win_amd64.whl", hash = "sha256:5b7540161790b2f28143191f5f8ec02fb132660ff175b7747b95dcb77ac26562"},
-    {file = "coverage-7.2.7-cp312-cp312-macosx_10_9_x86_64.whl", hash = "sha256:f2f67fe12b22cd130d34d0ef79206061bfb5eda52feb6ce0dba0644e20a03cf4"},
-    {file = "coverage-7.2.7-cp312-cp312-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:a342242fe22407f3c17f4b499276a02b01e80f861f1682ad1d95b04018e0c0d4"},
-    {file = "coverage-7.2.7-cp312-cp312-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:171717c7cb6b453aebac9a2ef603699da237f341b38eebfee9be75d27dc38e01"},
-    {file = "coverage-7.2.7-cp312-cp312-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:49969a9f7ffa086d973d91cec8d2e31080436ef0fb4a359cae927e742abfaaa6"},
-    {file = "coverage-7.2.7-cp312-cp312-musllinux_1_1_aarch64.whl", hash = "sha256:b46517c02ccd08092f4fa99f24c3b83d8f92f739b4657b0f146246a0ca6a831d"},
-    {file = "coverage-7.2.7-cp312-cp312-musllinux_1_1_i686.whl", hash = "sha256:a3d33a6b3eae87ceaefa91ffdc130b5e8536182cd6dfdbfc1aa56b46ff8c86de"},
-    {file = "coverage-7.2.7-cp312-cp312-musllinux_1_1_x86_64.whl", hash = "sha256:976b9c42fb2a43ebf304fa7d4a310e5f16cc99992f33eced91ef6f908bd8f33d"},
-    {file = "coverage-7.2.7-cp312-cp312-win32.whl", hash = "sha256:8de8bb0e5ad103888d65abef8bca41ab93721647590a3f740100cd65c3b00511"},
-    {file = "coverage-7.2.7-cp312-cp312-win_amd64.whl", hash = "sha256:9e31cb64d7de6b6f09702bb27c02d1904b3aebfca610c12772452c4e6c21a0d3"},
-    {file = "coverage-7.2.7-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:58c2ccc2f00ecb51253cbe5d8d7122a34590fac9646a960d1430d5b15321d95f"},
-    {file = "coverage-7.2.7-cp37-cp37m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:d22656368f0e6189e24722214ed8d66b8022db19d182927b9a248a2a8a2f67eb"},
-    {file = "coverage-7.2.7-cp37-cp37m-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:a895fcc7b15c3fc72beb43cdcbdf0ddb7d2ebc959edac9cef390b0d14f39f8a9"},
-    {file = "coverage-7.2.7-cp37-cp37m-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:e84606b74eb7de6ff581a7915e2dab7a28a0517fbe1c9239eb227e1354064dcd"},
-    {file = "coverage-7.2.7-cp37-cp37m-musllinux_1_1_aarch64.whl", hash = "sha256:0a5f9e1dbd7fbe30196578ca36f3fba75376fb99888c395c5880b355e2875f8a"},
-    {file = "coverage-7.2.7-cp37-cp37m-musllinux_1_1_i686.whl", hash = "sha256:419bfd2caae268623dd469eff96d510a920c90928b60f2073d79f8fe2bbc5959"},
-    {file = "coverage-7.2.7-cp37-cp37m-musllinux_1_1_x86_64.whl", hash = "sha256:2aee274c46590717f38ae5e4650988d1af340fe06167546cc32fe2f58ed05b02"},
-    {file = "coverage-7.2.7-cp37-cp37m-win32.whl", hash = "sha256:61b9a528fb348373c433e8966535074b802c7a5d7f23c4f421e6c6e2f1697a6f"},
-    {file = "coverage-7.2.7-cp37-cp37m-win_amd64.whl", hash = "sha256:b1c546aca0ca4d028901d825015dc8e4d56aac4b541877690eb76490f1dc8ed0"},
-    {file = "coverage-7.2.7-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:54b896376ab563bd38453cecb813c295cf347cf5906e8b41d340b0321a5433e5"},
-    {file = "coverage-7.2.7-cp38-cp38-macosx_11_0_arm64.whl", hash = "sha256:3d376df58cc111dc8e21e3b6e24606b5bb5dee6024f46a5abca99124b2229ef5"},
-    {file = "coverage-7.2.7-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:5e330fc79bd7207e46c7d7fd2bb4af2963f5f635703925543a70b99574b0fea9"},
-    {file = "coverage-7.2.7-cp38-cp38-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:1e9d683426464e4a252bf70c3498756055016f99ddaec3774bf368e76bbe02b6"},
-    {file = "coverage-7.2.7-cp38-cp38-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:8d13c64ee2d33eccf7437961b6ea7ad8673e2be040b4f7fd4fd4d4d28d9ccb1e"},
-    {file = "coverage-7.2.7-cp38-cp38-musllinux_1_1_aarch64.whl", hash = "sha256:b7aa5f8a41217360e600da646004f878250a0d6738bcdc11a0a39928d7dc2050"},
-    {file = "coverage-7.2.7-cp38-cp38-musllinux_1_1_i686.whl", hash = "sha256:8fa03bce9bfbeeef9f3b160a8bed39a221d82308b4152b27d82d8daa7041fee5"},
-    {file = "coverage-7.2.7-cp38-cp38-musllinux_1_1_x86_64.whl", hash = "sha256:245167dd26180ab4c91d5e1496a30be4cd721a5cf2abf52974f965f10f11419f"},
-    {file = "coverage-7.2.7-cp38-cp38-win32.whl", hash = "sha256:d2c2db7fd82e9b72937969bceac4d6ca89660db0a0967614ce2481e81a0b771e"},
-    {file = "coverage-7.2.7-cp38-cp38-win_amd64.whl", hash = "sha256:2e07b54284e381531c87f785f613b833569c14ecacdcb85d56b25c4622c16c3c"},
-    {file = "coverage-7.2.7-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:537891ae8ce59ef63d0123f7ac9e2ae0fc8b72c7ccbe5296fec45fd68967b6c9"},
-    {file = "coverage-7.2.7-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:06fb182e69f33f6cd1d39a6c597294cff3143554b64b9825d1dc69d18cc2fff2"},
-    {file = "coverage-7.2.7-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:201e7389591af40950a6480bd9edfa8ed04346ff80002cec1a66cac4549c1ad7"},
-    {file = "coverage-7.2.7-cp39-cp39-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:f6951407391b639504e3b3be51b7ba5f3528adbf1a8ac3302b687ecababf929e"},
-    {file = "coverage-7.2.7-cp39-cp39-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:6f48351d66575f535669306aa7d6d6f71bc43372473b54a832222803eb956fd1"},
-    {file = "coverage-7.2.7-cp39-cp39-musllinux_1_1_aarch64.whl", hash = "sha256:b29019c76039dc3c0fd815c41392a044ce555d9bcdd38b0fb60fb4cd8e475ba9"},
-    {file = "coverage-7.2.7-cp39-cp39-musllinux_1_1_i686.whl", hash = "sha256:81c13a1fc7468c40f13420732805a4c38a105d89848b7c10af65a90beff25250"},
-    {file = "coverage-7.2.7-cp39-cp39-musllinux_1_1_x86_64.whl", hash = "sha256:975d70ab7e3c80a3fe86001d8751f6778905ec723f5b110aed1e450da9d4b7f2"},
-    {file = "coverage-7.2.7-cp39-cp39-win32.whl", hash = "sha256:7ee7d9d4822c8acc74a5e26c50604dff824710bc8de424904c0982e25c39c6cb"},
-    {file = "coverage-7.2.7-cp39-cp39-win_amd64.whl", hash = "sha256:eb393e5ebc85245347950143969b241d08b52b88a3dc39479822e073a1a8eb27"},
-    {file = "coverage-7.2.7-pp37.pp38.pp39-none-any.whl", hash = "sha256:b7b4c971f05e6ae490fef852c218b0e79d4e52f79ef0c8475566584a8fb3e01d"},
-    {file = "coverage-7.2.7.tar.gz", hash = "sha256:924d94291ca674905fe9481f12294eb11f2d3d3fd1adb20314ba89e94f44ed59"},
-]
-
-[package.extras]
-toml = ["tomli"]
-
-[[package]]
-name = "distlib"
-version = "0.3.7"
-description = "Distribution utilities"
-optional = false
-python-versions = "*"
-files = [
-    {file = "distlib-0.3.7-py2.py3-none-any.whl", hash = "sha256:2e24928bc811348f0feb63014e97aaae3037f2cf48712d51ae61df7fd6075057"},
-    {file = "distlib-0.3.7.tar.gz", hash = "sha256:9dafe54b34a028eafd95039d5e5d4851a13734540f1331060d31c9916e7147a8"},
-]
-
-[[package]]
-name = "execnet"
-version = "2.0.2"
-description = "execnet: rapid multi-Python deployment"
-optional = false
-python-versions = ">=3.7"
-files = [
-    {file = "execnet-2.0.2-py3-none-any.whl", hash = "sha256:88256416ae766bc9e8895c76a87928c0012183da3cc4fc18016e6f050e025f41"},
-    {file = "execnet-2.0.2.tar.gz", hash = "sha256:cc59bc4423742fd71ad227122eb0dd44db51efb3dc4095b45ac9a08c770096af"},
-]
-
-[package.extras]
-testing = ["hatch", "pre-commit", "pytest", "tox"]
-
-[[package]]
-name = "filelock"
-version = "3.12.2"
-description = "A platform independent file lock."
-optional = false
-python-versions = ">=3.7"
-files = [
-    {file = "filelock-3.12.2-py3-none-any.whl", hash = "sha256:cbb791cdea2a72f23da6ac5b5269ab0a0d161e9ef0100e653b69049a7706d1ec"},
-    {file = "filelock-3.12.2.tar.gz", hash = "sha256:002740518d8aa59a26b0c76e10fb8c6e15eae825d34b6fdf670333fd7b938d81"},
-]
-
-[package.extras]
-docs = ["furo (>=2023.5.20)", "sphinx (>=7.0.1)", "sphinx-autodoc-typehints (>=1.23,!=1.23.4)"]
-testing = ["covdefaults (>=2.3)", "coverage (>=7.2.7)", "diff-cover (>=7.5)", "pytest (>=7.3.1)", "pytest-cov (>=4.1)", "pytest-mock (>=3.10)", "pytest-timeout (>=2.1)"]
-
-[[package]]
-name = "identify"
-version = "2.5.26"
-description = "File identification library for Python"
-optional = false
-python-versions = ">=3.8"
-files = [
-    {file = "identify-2.5.26-py2.py3-none-any.whl", hash = "sha256:c22a8ead0d4ca11f1edd6c9418c3220669b3b7533ada0a0ffa6cc0ef85cf9b54"},
-    {file = "identify-2.5.26.tar.gz", hash = "sha256:7243800bce2f58404ed41b7c002e53d4d22bcf3ae1b7900c2d7aefd95394bf7f"},
-]
-
-[package.extras]
-license = ["ukkonen"]
-
-[[package]]
-name = "iniconfig"
-version = "2.0.0"
-description = "brain-dead simple config-ini parsing"
-optional = false
-python-versions = ">=3.7"
-files = [
-    {file = "iniconfig-2.0.0-py3-none-any.whl", hash = "sha256:b6a85871a79d2e3b22d2d1b94ac2824226a63c6b741c88f7ae975f18b6778374"},
-    {file = "iniconfig-2.0.0.tar.gz", hash = "sha256:2d91e135bf72d31a410b17c16da610a82cb55f6b0477d1a902134b24a455b8b3"},
-]
-
-[[package]]
-name = "isort"
-version = "5.12.0"
-description = "A Python utility / library to sort Python imports."
-optional = false
-python-versions = ">=3.8.0"
-files = [
-    {file = "isort-5.12.0-py3-none-any.whl", hash = "sha256:f84c2818376e66cf843d497486ea8fed8700b340f308f076c6fb1229dff318b6"},
-    {file = "isort-5.12.0.tar.gz", hash = "sha256:8bef7dde241278824a6d83f44a544709b065191b95b6e50894bdc722fcba0504"},
-]
-
-[package.extras]
-colors = ["colorama (>=0.4.3)"]
-pipfile-deprecated-finder = ["pip-shims (>=0.5.2)", "pipreqs", "requirementslib"]
-plugins = ["setuptools"]
-requirements-deprecated-finder = ["pip-api", "pipreqs"]
-
-[[package]]
-name = "mypy-extensions"
-version = "1.0.0"
-description = "Type system extensions for programs checked with the mypy type checker."
-optional = false
-python-versions = ">=3.5"
-files = [
-    {file = "mypy_extensions-1.0.0-py3-none-any.whl", hash = "sha256:4392f6c0eb8a5668a69e23d168ffa70f0be9ccfd32b5cc2d26a34ae5b844552d"},
-    {file = "mypy_extensions-1.0.0.tar.gz", hash = "sha256:75dbf8955dc00442a438fc4d0666508a9a97b6bd41aa2f0ffe9d2f2725af0782"},
-]
-
-[[package]]
-name = "nodeenv"
-version = "1.8.0"
-description = "Node.js virtual environment builder"
-optional = false
-python-versions = ">=2.7,!=3.0.*,!=3.1.*,!=3.2.*,!=3.3.*,!=3.4.*,!=3.5.*,!=3.6.*"
-files = [
-    {file = "nodeenv-1.8.0-py2.py3-none-any.whl", hash = "sha256:df865724bb3c3adc86b3876fa209771517b0cfe596beff01a92700e0e8be4cec"},
-    {file = "nodeenv-1.8.0.tar.gz", hash = "sha256:d51e0c37e64fbf47d017feac3145cdbb58836d7eee8c6f6d3b6880c5456227d2"},
-]
-
-[package.dependencies]
-setuptools = "*"
-
-[[package]]
-name = "packaging"
-version = "23.1"
-description = "Core utilities for Python packages"
-optional = false
-python-versions = ">=3.7"
-files = [
-    {file = "packaging-23.1-py3-none-any.whl", hash = "sha256:994793af429502c4ea2ebf6bf664629d07c1a9fe974af92966e4b8d2df7edc61"},
-    {file = "packaging-23.1.tar.gz", hash = "sha256:a392980d2b6cffa644431898be54b0045151319d1e7ec34f0cfed48767dd334f"},
-]
-
-[[package]]
-name = "pathspec"
-version = "0.11.2"
-description = "Utility library for gitignore style pattern matching of file paths."
-optional = false
-python-versions = ">=3.7"
-files = [
-    {file = "pathspec-0.11.2-py3-none-any.whl", hash = "sha256:1d6ed233af05e679efb96b1851550ea95bbb64b7c490b0f5aa52996c11e92a20"},
-    {file = "pathspec-0.11.2.tar.gz", hash = "sha256:e0d8d0ac2f12da61956eb2306b69f9469b42f4deb0f3cb6ed47b9cce9996ced3"},
-]
-
-[[package]]
-name = "platformdirs"
-version = "3.10.0"
-description = "A small Python package for determining appropriate platform-specific dirs, e.g. a \"user data dir\"."
-optional = false
-python-versions = ">=3.7"
-files = [
-    {file = "platformdirs-3.10.0-py3-none-any.whl", hash = "sha256:d7c24979f292f916dc9cbf8648319032f551ea8c49a4c9bf2fb556a02070ec1d"},
-    {file = "platformdirs-3.10.0.tar.gz", hash = "sha256:b45696dab2d7cc691a3226759c0d3b00c47c8b6e293d96f6436f733303f77f6d"},
-]
-
-[package.extras]
-docs = ["furo (>=2023.7.26)", "proselint (>=0.13)", "sphinx (>=7.1.1)", "sphinx-autodoc-typehints (>=1.24)"]
-test = ["appdirs (==1.4.4)", "covdefaults (>=2.3)", "pytest (>=7.4)", "pytest-cov (>=4.1)", "pytest-mock (>=3.11.1)"]
-
-[[package]]
-name = "pluggy"
-version = "1.2.0"
-description = "plugin and hook calling mechanisms for python"
-optional = false
-python-versions = ">=3.7"
-files = [
-    {file = "pluggy-1.2.0-py3-none-any.whl", hash = "sha256:c2fd55a7d7a3863cba1a013e4e2414658b1d07b6bc57b3919e0c63c9abb99849"},
-    {file = "pluggy-1.2.0.tar.gz", hash = "sha256:d12f0c4b579b15f5e054301bb226ee85eeeba08ffec228092f8defbaa3a4c4b3"},
-]
-
-[package.extras]
-dev = ["pre-commit", "tox"]
-testing = ["pytest", "pytest-benchmark"]
-
-[[package]]
-name = "pre-commit"
-version = "3.3.3"
-description = "A framework for managing and maintaining multi-language pre-commit hooks."
-optional = false
-python-versions = ">=3.8"
-files = [
-    {file = "pre_commit-3.3.3-py2.py3-none-any.whl", hash = "sha256:10badb65d6a38caff29703362271d7dca483d01da88f9d7e05d0b97171c136cb"},
-    {file = "pre_commit-3.3.3.tar.gz", hash = "sha256:a2256f489cd913d575c145132ae196fe335da32d91a8294b7afe6622335dd023"},
-]
-
-[package.dependencies]
-cfgv = ">=2.0.0"
-identify = ">=1.0.0"
-nodeenv = ">=0.11.1"
-pyyaml = ">=5.1"
-virtualenv = ">=20.10.0"
-
-[[package]]
-name = "pyproject-api"
-version = "1.5.3"
-description = "API to interact with the python pyproject.toml based projects"
-optional = false
-python-versions = ">=3.7"
-files = [
-    {file = "pyproject_api-1.5.3-py3-none-any.whl", hash = "sha256:14cf09828670c7b08842249c1f28c8ee6581b872e893f81b62d5465bec41502f"},
-    {file = "pyproject_api-1.5.3.tar.gz", hash = "sha256:ffb5b2d7cad43f5b2688ab490de7c4d3f6f15e0b819cb588c4b771567c9729eb"},
-]
-
-[package.dependencies]
-packaging = ">=23.1"
-
-[package.extras]
-docs = ["furo (>=2023.5.20)", "sphinx (>=7.0.1)", "sphinx-autodoc-typehints (>=1.23,!=1.23.4)"]
-testing = ["covdefaults (>=2.3)", "importlib-metadata (>=6.6)", "pytest (>=7.3.1)", "pytest-cov (>=4.1)", "pytest-mock (>=3.10)", "setuptools (>=67.8)", "wheel (>=0.40)"]
-
-[[package]]
-name = "pytest"
-version = "7.4.0"
-description = "pytest: simple powerful testing with Python"
-optional = false
-python-versions = ">=3.7"
-files = [
-    {file = "pytest-7.4.0-py3-none-any.whl", hash = "sha256:78bf16451a2eb8c7a2ea98e32dc119fd2aa758f1d5d66dbf0a59d69a3969df32"},
-    {file = "pytest-7.4.0.tar.gz", hash = "sha256:b4bf8c45bd59934ed84001ad51e11b4ee40d40a1229d2c79f9c592b0a3f6bd8a"},
-]
-
-[package.dependencies]
-colorama = {version = "*", markers = "sys_platform == \"win32\""}
-iniconfig = "*"
-packaging = "*"
-pluggy = ">=0.12,<2.0"
-
-[package.extras]
-testing = ["argcomplete", "attrs (>=19.2.0)", "hypothesis (>=3.56)", "mock", "nose", "pygments (>=2.7.2)", "requests", "setuptools", "xmlschema"]
-
-[[package]]
-name = "pytest-cov"
-version = "4.1.0"
-description = "Pytest plugin for measuring coverage."
-optional = false
-python-versions = ">=3.7"
-files = [
-    {file = "pytest-cov-4.1.0.tar.gz", hash = "sha256:3904b13dfbfec47f003b8e77fd5b589cd11904a21ddf1ab38a64f204d6a10ef6"},
-    {file = "pytest_cov-4.1.0-py3-none-any.whl", hash = "sha256:6ba70b9e97e69fcc3fb45bfeab2d0a138fb65c4d0d6a41ef33983ad114be8c3a"},
-]
-
-[package.dependencies]
-coverage = {version = ">=5.2.1", extras = ["toml"]}
-pytest = ">=4.6"
-
-[package.extras]
-testing = ["fields", "hunter", "process-tests", "pytest-xdist", "six", "virtualenv"]
-
-[[package]]
-name = "pytest-xdist"
-version = "3.3.1"
-description = "pytest xdist plugin for distributed testing, most importantly across multiple CPUs"
-optional = false
-python-versions = ">=3.7"
-files = [
-    {file = "pytest-xdist-3.3.1.tar.gz", hash = "sha256:d5ee0520eb1b7bcca50a60a518ab7a7707992812c578198f8b44fdfac78e8c93"},
-    {file = "pytest_xdist-3.3.1-py3-none-any.whl", hash = "sha256:ff9daa7793569e6a68544850fd3927cd257cc03a7ef76c95e86915355e82b5f2"},
-]
-
-[package.dependencies]
-execnet = ">=1.1"
-pytest = ">=6.2.0"
-
-[package.extras]
-psutil = ["psutil (>=3.0)"]
-setproctitle = ["setproctitle"]
-testing = ["filelock"]
-
-[[package]]
-name = "python-dotenv"
-version = "1.0.0"
-description = "Read key-value pairs from a .env file and set them as environment variables"
-optional = false
-python-versions = ">=3.8"
-files = [
-    {file = "python-dotenv-1.0.0.tar.gz", hash = "sha256:a8df96034aae6d2d50a4ebe8216326c61c3eb64836776504fcca410e5937a3ba"},
-    {file = "python_dotenv-1.0.0-py3-none-any.whl", hash = "sha256:f5971a9226b701070a4bf2c38c89e5a3f0d64de8debda981d1db98583009122a"},
-]
-
-[package.extras]
-cli = ["click (>=5.0)"]
-
-[[package]]
-name = "pyyaml"
-version = "6.0.1"
-description = "YAML parser and emitter for Python"
-optional = false
-python-versions = ">=3.6"
-files = [
-    {file = "PyYAML-6.0.1-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:d858aa552c999bc8a8d57426ed01e40bef403cd8ccdd0fc5f6f04a00414cac2a"},
-    {file = "PyYAML-6.0.1-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:fd66fc5d0da6d9815ba2cebeb4205f95818ff4b79c3ebe268e75d961704af52f"},
-    {file = "PyYAML-6.0.1-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:69b023b2b4daa7548bcfbd4aa3da05b3a74b772db9e23b982788168117739938"},
-    {file = "PyYAML-6.0.1-cp310-cp310-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:81e0b275a9ecc9c0c0c07b4b90ba548307583c125f54d5b6946cfee6360c733d"},
-    {file = "PyYAML-6.0.1-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:ba336e390cd8e4d1739f42dfe9bb83a3cc2e80f567d8805e11b46f4a943f5515"},
-    {file = "PyYAML-6.0.1-cp310-cp310-win32.whl", hash = "sha256:bd4af7373a854424dabd882decdc5579653d7868b8fb26dc7d0e99f823aa5924"},
-    {file = "PyYAML-6.0.1-cp310-cp310-win_amd64.whl", hash = "sha256:fd1592b3fdf65fff2ad0004b5e363300ef59ced41c2e6b3a99d4089fa8c5435d"},
-    {file = "PyYAML-6.0.1-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:6965a7bc3cf88e5a1c3bd2e0b5c22f8d677dc88a455344035f03399034eb3007"},
-    {file = "PyYAML-6.0.1-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:f003ed9ad21d6a4713f0a9b5a7a0a79e08dd0f221aff4525a2be4c346ee60aab"},
-    {file = "PyYAML-6.0.1-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:42f8152b8dbc4fe7d96729ec2b99c7097d656dc1213a3229ca5383f973a5ed6d"},
-    {file = "PyYAML-6.0.1-cp311-cp311-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:062582fca9fabdd2c8b54a3ef1c978d786e0f6b3a1510e0ac93ef59e0ddae2bc"},
-    {file = "PyYAML-6.0.1-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:d2b04aac4d386b172d5b9692e2d2da8de7bfb6c387fa4f801fbf6fb2e6ba4673"},
-    {file = "PyYAML-6.0.1-cp311-cp311-win32.whl", hash = "sha256:1635fd110e8d85d55237ab316b5b011de701ea0f29d07611174a1b42f1444741"},
-    {file = "PyYAML-6.0.1-cp311-cp311-win_amd64.whl", hash = "sha256:bf07ee2fef7014951eeb99f56f39c9bb4af143d8aa3c21b1677805985307da34"},
-    {file = "PyYAML-6.0.1-cp36-cp36m-macosx_10_9_x86_64.whl", hash = "sha256:50550eb667afee136e9a77d6dc71ae76a44df8b3e51e41b77f6de2932bfe0f47"},
-    {file = "PyYAML-6.0.1-cp36-cp36m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:1fe35611261b29bd1de0070f0b2f47cb6ff71fa6595c077e42bd0c419fa27b98"},
-    {file = "PyYAML-6.0.1-cp36-cp36m-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:704219a11b772aea0d8ecd7058d0082713c3562b4e271b849ad7dc4a5c90c13c"},
-    {file = "PyYAML-6.0.1-cp36-cp36m-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:afd7e57eddb1a54f0f1a974bc4391af8bcce0b444685d936840f125cf046d5bd"},
-    {file = "PyYAML-6.0.1-cp36-cp36m-win32.whl", hash = "sha256:fca0e3a251908a499833aa292323f32437106001d436eca0e6e7833256674585"},
-    {file = "PyYAML-6.0.1-cp36-cp36m-win_amd64.whl", hash = "sha256:f22ac1c3cac4dbc50079e965eba2c1058622631e526bd9afd45fedd49ba781fa"},
-    {file = "PyYAML-6.0.1-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:b1275ad35a5d18c62a7220633c913e1b42d44b46ee12554e5fd39c70a243d6a3"},
-    {file = "PyYAML-6.0.1-cp37-cp37m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:18aeb1bf9a78867dc38b259769503436b7c72f7a1f1f4c93ff9a17de54319b27"},
-    {file = "PyYAML-6.0.1-cp37-cp37m-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:596106435fa6ad000c2991a98fa58eeb8656ef2325d7e158344fb33864ed87e3"},
-    {file = "PyYAML-6.0.1-cp37-cp37m-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:baa90d3f661d43131ca170712d903e6295d1f7a0f595074f151c0aed377c9b9c"},
-    {file = "PyYAML-6.0.1-cp37-cp37m-win32.whl", hash = "sha256:9046c58c4395dff28dd494285c82ba00b546adfc7ef001486fbf0324bc174fba"},
-    {file = "PyYAML-6.0.1-cp37-cp37m-win_amd64.whl", hash = "sha256:4fb147e7a67ef577a588a0e2c17b6db51dda102c71de36f8549b6816a96e1867"},
-    {file = "PyYAML-6.0.1-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:1d4c7e777c441b20e32f52bd377e0c409713e8bb1386e1099c2415f26e479595"},
-    {file = "PyYAML-6.0.1-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:a0cd17c15d3bb3fa06978b4e8958dcdc6e0174ccea823003a106c7d4d7899ac5"},
-    {file = "PyYAML-6.0.1-cp38-cp38-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:28c119d996beec18c05208a8bd78cbe4007878c6dd15091efb73a30e90539696"},
-    {file = "PyYAML-6.0.1-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:7e07cbde391ba96ab58e532ff4803f79c4129397514e1413a7dc761ccd755735"},
-    {file = "PyYAML-6.0.1-cp38-cp38-win32.whl", hash = "sha256:184c5108a2aca3c5b3d3bf9395d50893a7ab82a38004c8f61c258d4428e80206"},
-    {file = "PyYAML-6.0.1-cp38-cp38-win_amd64.whl", hash = "sha256:1e2722cc9fbb45d9b87631ac70924c11d3a401b2d7f410cc0e3bbf249f2dca62"},
-    {file = "PyYAML-6.0.1-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:9eb6caa9a297fc2c2fb8862bc5370d0303ddba53ba97e71f08023b6cd73d16a8"},
-    {file = "PyYAML-6.0.1-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:c8098ddcc2a85b61647b2590f825f3db38891662cfc2fc776415143f599bb859"},
-    {file = "PyYAML-6.0.1-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:5773183b6446b2c99bb77e77595dd486303b4faab2b086e7b17bc6bef28865f6"},
-    {file = "PyYAML-6.0.1-cp39-cp39-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:b786eecbdf8499b9ca1d697215862083bd6d2a99965554781d0d8d1ad31e13a0"},
-    {file = "PyYAML-6.0.1-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:bc1bf2925a1ecd43da378f4db9e4f799775d6367bdb94671027b73b393a7c42c"},
-    {file = "PyYAML-6.0.1-cp39-cp39-win32.whl", hash = "sha256:faca3bdcf85b2fc05d06ff3fbc1f83e1391b3e724afa3feba7d13eeab355484c"},
-    {file = "PyYAML-6.0.1-cp39-cp39-win_amd64.whl", hash = "sha256:510c9deebc5c0225e8c96813043e62b680ba2f9c50a08d3724c7f28a747d1486"},
-    {file = "PyYAML-6.0.1.tar.gz", hash = "sha256:bfdf460b1736c775f2ba9f6a92bca30bc2095067b8a9d77876d1fad6cc3b4a43"},
-]
-
-[[package]]
-name = "setuptools"
-version = "68.0.0"
-description = "Easily download, build, install, upgrade, and uninstall Python packages"
-optional = false
-python-versions = ">=3.7"
-files = [
-    {file = "setuptools-68.0.0-py3-none-any.whl", hash = "sha256:11e52c67415a381d10d6b462ced9cfb97066179f0e871399e006c4ab101fc85f"},
-    {file = "setuptools-68.0.0.tar.gz", hash = "sha256:baf1fdb41c6da4cd2eae722e135500da913332ab3f2f5c7d33af9b492acb5235"},
-]
-
-[package.extras]
-docs = ["furo", "jaraco.packaging (>=9)", "jaraco.tidelift (>=1.4)", "pygments-github-lexers (==0.0.5)", "rst.linker (>=1.9)", "sphinx (>=3.5)", "sphinx-favicon", "sphinx-hoverxref (<2)", "sphinx-inline-tabs", "sphinx-lint", "sphinx-notfound-page (==0.8.3)", "sphinx-reredirects", "sphinxcontrib-towncrier"]
-testing = ["build[virtualenv]", "filelock (>=3.4.0)", "flake8-2020", "ini2toml[lite] (>=0.9)", "jaraco.envs (>=2.2)", "jaraco.path (>=3.2.0)", "pip (>=19.1)", "pip-run (>=8.8)", "pytest (>=6)", "pytest-black (>=0.3.7)", "pytest-checkdocs (>=2.4)", "pytest-cov", "pytest-enabler (>=1.3)", "pytest-mypy (>=0.9.1)", "pytest-perf", "pytest-ruff", "pytest-timeout", "pytest-xdist", "tomli-w (>=1.0.0)", "virtualenv (>=13.0.0)", "wheel"]
-testing-integration = ["build[virtualenv]", "filelock (>=3.4.0)", "jaraco.envs (>=2.2)", "jaraco.path (>=3.2.0)", "pytest", "pytest-enabler", "pytest-xdist", "tomli", "virtualenv (>=13.0.0)", "wheel"]
-
-[[package]]
-name = "tox"
-version = "4.6.4"
-description = "tox is a generic virtualenv management and test command line tool"
-optional = false
-python-versions = ">=3.7"
-files = [
-    {file = "tox-4.6.4-py3-none-any.whl", hash = "sha256:1b8f8ae08d6a5475cad9d508236c51ea060620126fd7c3c513d0f5c7f29cc776"},
-    {file = "tox-4.6.4.tar.gz", hash = "sha256:5e2ad8845764706170d3dcaac171704513cc8a725655219acb62fe4380bdadda"},
-]
-
-[package.dependencies]
-cachetools = ">=5.3.1"
-chardet = ">=5.1"
-colorama = ">=0.4.6"
-filelock = ">=3.12.2"
-packaging = ">=23.1"
-platformdirs = ">=3.8"
-pluggy = ">=1.2"
-pyproject-api = ">=1.5.2"
-virtualenv = ">=20.23.1"
-
-[package.extras]
-docs = ["furo (>=2023.5.20)", "sphinx (>=7.0.1)", "sphinx-argparse-cli (>=1.11.1)", "sphinx-autodoc-typehints (>=1.23.3,!=1.23.4)", "sphinx-copybutton (>=0.5.2)", "sphinx-inline-tabs (>=2023.4.21)", "sphinxcontrib-towncrier (>=0.2.1a0)", "towncrier (>=23.6)"]
-testing = ["build[virtualenv] (>=0.10)", "covdefaults (>=2.3)", "detect-test-pollution (>=1.1.1)", "devpi-process (>=0.3.1)", "diff-cover (>=7.6)", "distlib (>=0.3.6)", "flaky (>=3.7)", "hatch-vcs (>=0.3)", "hatchling (>=1.17.1)", "psutil (>=5.9.5)", "pytest (>=7.4)", "pytest-cov (>=4.1)", "pytest-mock (>=3.11.1)", "pytest-xdist (>=3.3.1)", "re-assert (>=1.1)", "time-machine (>=2.10)", "wheel (>=0.40)"]
-
-[[package]]
-name = "virtualenv"
-version = "20.24.2"
-description = "Virtual Python Environment builder"
-optional = false
-python-versions = ">=3.7"
-files = [
-    {file = "virtualenv-20.24.2-py3-none-any.whl", hash = "sha256:43a3052be36080548bdee0b42919c88072037d50d56c28bd3f853cbe92b953ff"},
-    {file = "virtualenv-20.24.2.tar.gz", hash = "sha256:fd8a78f46f6b99a67b7ec5cf73f92357891a7b3a40fd97637c27f854aae3b9e0"},
-]
-
-[package.dependencies]
-distlib = ">=0.3.7,<1"
-filelock = ">=3.12.2,<4"
-platformdirs = ">=3.9.1,<4"
-
-[package.extras]
-docs = ["furo (>=2023.5.20)", "proselint (>=0.13)", "sphinx (>=7.0.1)", "sphinx-argparse (>=0.4)", "sphinxcontrib-towncrier (>=0.2.1a0)", "towncrier (>=23.6)"]
-test = ["covdefaults (>=2.3)", "coverage (>=7.2.7)", "coverage-enable-subprocess (>=1)", "flaky (>=3.7)", "packaging (>=23.1)", "pytest (>=7.4)", "pytest-env (>=0.8.2)", "pytest-freezer (>=0.4.8)", "pytest-mock (>=3.11.1)", "pytest-randomly (>=3.12)", "pytest-timeout (>=2.1)", "setuptools (>=68)", "time-machine (>=2.10)"]
-
-[metadata]
-lock-version = "2.0"
-python-versions = "^3.11"
-content-hash = "96d09125320de2871f75f05ffba9ca97658e2757b53121b5be2f0d92bd2e5e5c"

From bd2a2275c53d93e2f0e11119a6aa4c599459b35a Mon Sep 17 00:00:00 2001
From: Roel Adriaans <roel@adriaans.org>
Date: Sun, 20 Aug 2023 23:14:53 +0200
Subject: [PATCH 284/371] Add explore all option to DFS/BFS search

---
 src/adventofcodeutils/generic_search.py | 24 +++++++++++++++++++-----
 1 file changed, 19 insertions(+), 5 deletions(-)

diff --git a/src/adventofcodeutils/generic_search.py b/src/adventofcodeutils/generic_search.py
index 508c4015..95dddc38 100644
--- a/src/adventofcodeutils/generic_search.py
+++ b/src/adventofcodeutils/generic_search.py
@@ -26,7 +26,8 @@ def search(
         initial: T,
         goal_test: Callable[[T], bool],
         successors: Callable[[T], list[T]],
-    ) -> Node[T] | None:
+        explore_all: bool = False,
+    ) -> Node[T] | set[Node[T]] | None:
         # frontier is where we've yet to go
         # @TODO This is ugly, the base class has knowledge of
         #   the container implementation
@@ -36,14 +37,23 @@ def search(
         # explored is where we've been
         explored: set[T] = {initial}
 
+        # All paths
+        all_paths: set[T] = set()
+
         # keep going while there is more to explore
         while not frontier.empty:
             current_node: Node[T] = frontier.pop()
             current_state: T = current_node.state
 
-            # if we found the goal, we're done
             if goal_test(current_state):
-                return current_node
+                if not explore_all:
+                    # if we found the goal, we're done
+                    return current_node
+                else:
+                    # All paths are explored! Add this path and continue on
+                    # If the goal is searched, do not find the children of the goal
+                    all_paths.add(current_node)
+                    continue
 
             # check where we can go next and haven't explored
             for child in successors(current_state):
@@ -53,8 +63,12 @@ def search(
                 explored.add(child)
                 frontier.push(Node(child, current_node))
 
-        # went through everything and never found goal
-        return None
+        if explore_all:
+            # Return all the pats we have found. Could be an empty set
+            return all_paths
+        else:
+            # went through everything and never found goal
+            return None
 
 
 class DFS(Search):

From 0a4b6b3060d281fa5b515348906736c328a70dfa Mon Sep 17 00:00:00 2001
From: Roel Adriaans <roel@adriaans.org>
Date: Sun, 20 Aug 2023 23:15:54 +0200
Subject: [PATCH 285/371] Bumping version from 0.2.1 to 0.2.2

---
 pyproject.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pyproject.toml b/pyproject.toml
index 75cb0719..a170f553 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "adventofcodeutils"
-version = "0.2.1"
+version = "0.2.2"
 description = "This repository contains some utils used by my advent of code projects. "
 authors = ["Roel Adriaans <roel@adriaans.org>"]
 readme = "README.md"

From ab61f9a4795fcc84db1bf6253557da09845cc77c Mon Sep 17 00:00:00 2001
From: Roel Adriaans <roel@adriaans.org>
Date: Sat, 18 Nov 2023 20:45:27 +0100
Subject: [PATCH 286/371] Move tests 2020 to own directory

---
 tests/{solutions => adventofcode2020}/test_day01_a.py | 0
 tests/{solutions => adventofcode2020}/test_day01_b.py | 0
 tests/{solutions => adventofcode2020}/test_day02_a.py | 0
 tests/{solutions => adventofcode2020}/test_day02_b.py | 0
 tests/{solutions => adventofcode2020}/test_day03_a.py | 0
 tests/{solutions => adventofcode2020}/test_day03_b.py | 0
 tests/{solutions => adventofcode2020}/test_day04_a.py | 0
 tests/{solutions => adventofcode2020}/test_day04_b.py | 0
 tests/{solutions => adventofcode2020}/test_day05_a.py | 0
 tests/{solutions => adventofcode2020}/test_day05_b.py | 0
 tests/{solutions => adventofcode2020}/test_day06_a.py | 0
 tests/{solutions => adventofcode2020}/test_day06_b.py | 0
 tests/{solutions => adventofcode2020}/test_day07_a.py | 0
 tests/{solutions => adventofcode2020}/test_day07_b.py | 0
 tests/{solutions => adventofcode2020}/test_day08_a.py | 0
 tests/{solutions => adventofcode2020}/test_day08_b.py | 0
 tests/{solutions => adventofcode2020}/test_day09_a.py | 0
 tests/{solutions => adventofcode2020}/test_day09_b.py | 0
 tests/{solutions => adventofcode2020}/test_day10_a.py | 0
 tests/{solutions => adventofcode2020}/test_day10_b.py | 0
 tests/{solutions => adventofcode2020}/test_day11_a.py | 0
 tests/{solutions => adventofcode2020}/test_day11_b.py | 0
 tests/{solutions => adventofcode2020}/test_day12_a.py | 0
 tests/{solutions => adventofcode2020}/test_day12_b.py | 0
 tests/{solutions => adventofcode2020}/test_day13_a.py | 0
 tests/{solutions => adventofcode2020}/test_day13_b.py | 0
 tests/{solutions => adventofcode2020}/test_day14_a.py | 0
 tests/{solutions => adventofcode2020}/test_day14_b.py | 0
 tests/{solutions => adventofcode2020}/test_day15_a.py | 0
 tests/{solutions => adventofcode2020}/test_day16_a.py | 0
 tests/{solutions => adventofcode2020}/test_day16_b.py | 0
 31 files changed, 0 insertions(+), 0 deletions(-)
 rename tests/{solutions => adventofcode2020}/test_day01_a.py (100%)
 rename tests/{solutions => adventofcode2020}/test_day01_b.py (100%)
 rename tests/{solutions => adventofcode2020}/test_day02_a.py (100%)
 rename tests/{solutions => adventofcode2020}/test_day02_b.py (100%)
 rename tests/{solutions => adventofcode2020}/test_day03_a.py (100%)
 rename tests/{solutions => adventofcode2020}/test_day03_b.py (100%)
 rename tests/{solutions => adventofcode2020}/test_day04_a.py (100%)
 rename tests/{solutions => adventofcode2020}/test_day04_b.py (100%)
 rename tests/{solutions => adventofcode2020}/test_day05_a.py (100%)
 rename tests/{solutions => adventofcode2020}/test_day05_b.py (100%)
 rename tests/{solutions => adventofcode2020}/test_day06_a.py (100%)
 rename tests/{solutions => adventofcode2020}/test_day06_b.py (100%)
 rename tests/{solutions => adventofcode2020}/test_day07_a.py (100%)
 rename tests/{solutions => adventofcode2020}/test_day07_b.py (100%)
 rename tests/{solutions => adventofcode2020}/test_day08_a.py (100%)
 rename tests/{solutions => adventofcode2020}/test_day08_b.py (100%)
 rename tests/{solutions => adventofcode2020}/test_day09_a.py (100%)
 rename tests/{solutions => adventofcode2020}/test_day09_b.py (100%)
 rename tests/{solutions => adventofcode2020}/test_day10_a.py (100%)
 rename tests/{solutions => adventofcode2020}/test_day10_b.py (100%)
 rename tests/{solutions => adventofcode2020}/test_day11_a.py (100%)
 rename tests/{solutions => adventofcode2020}/test_day11_b.py (100%)
 rename tests/{solutions => adventofcode2020}/test_day12_a.py (100%)
 rename tests/{solutions => adventofcode2020}/test_day12_b.py (100%)
 rename tests/{solutions => adventofcode2020}/test_day13_a.py (100%)
 rename tests/{solutions => adventofcode2020}/test_day13_b.py (100%)
 rename tests/{solutions => adventofcode2020}/test_day14_a.py (100%)
 rename tests/{solutions => adventofcode2020}/test_day14_b.py (100%)
 rename tests/{solutions => adventofcode2020}/test_day15_a.py (100%)
 rename tests/{solutions => adventofcode2020}/test_day16_a.py (100%)
 rename tests/{solutions => adventofcode2020}/test_day16_b.py (100%)

diff --git a/tests/solutions/test_day01_a.py b/tests/adventofcode2020/test_day01_a.py
similarity index 100%
rename from tests/solutions/test_day01_a.py
rename to tests/adventofcode2020/test_day01_a.py
diff --git a/tests/solutions/test_day01_b.py b/tests/adventofcode2020/test_day01_b.py
similarity index 100%
rename from tests/solutions/test_day01_b.py
rename to tests/adventofcode2020/test_day01_b.py
diff --git a/tests/solutions/test_day02_a.py b/tests/adventofcode2020/test_day02_a.py
similarity index 100%
rename from tests/solutions/test_day02_a.py
rename to tests/adventofcode2020/test_day02_a.py
diff --git a/tests/solutions/test_day02_b.py b/tests/adventofcode2020/test_day02_b.py
similarity index 100%
rename from tests/solutions/test_day02_b.py
rename to tests/adventofcode2020/test_day02_b.py
diff --git a/tests/solutions/test_day03_a.py b/tests/adventofcode2020/test_day03_a.py
similarity index 100%
rename from tests/solutions/test_day03_a.py
rename to tests/adventofcode2020/test_day03_a.py
diff --git a/tests/solutions/test_day03_b.py b/tests/adventofcode2020/test_day03_b.py
similarity index 100%
rename from tests/solutions/test_day03_b.py
rename to tests/adventofcode2020/test_day03_b.py
diff --git a/tests/solutions/test_day04_a.py b/tests/adventofcode2020/test_day04_a.py
similarity index 100%
rename from tests/solutions/test_day04_a.py
rename to tests/adventofcode2020/test_day04_a.py
diff --git a/tests/solutions/test_day04_b.py b/tests/adventofcode2020/test_day04_b.py
similarity index 100%
rename from tests/solutions/test_day04_b.py
rename to tests/adventofcode2020/test_day04_b.py
diff --git a/tests/solutions/test_day05_a.py b/tests/adventofcode2020/test_day05_a.py
similarity index 100%
rename from tests/solutions/test_day05_a.py
rename to tests/adventofcode2020/test_day05_a.py
diff --git a/tests/solutions/test_day05_b.py b/tests/adventofcode2020/test_day05_b.py
similarity index 100%
rename from tests/solutions/test_day05_b.py
rename to tests/adventofcode2020/test_day05_b.py
diff --git a/tests/solutions/test_day06_a.py b/tests/adventofcode2020/test_day06_a.py
similarity index 100%
rename from tests/solutions/test_day06_a.py
rename to tests/adventofcode2020/test_day06_a.py
diff --git a/tests/solutions/test_day06_b.py b/tests/adventofcode2020/test_day06_b.py
similarity index 100%
rename from tests/solutions/test_day06_b.py
rename to tests/adventofcode2020/test_day06_b.py
diff --git a/tests/solutions/test_day07_a.py b/tests/adventofcode2020/test_day07_a.py
similarity index 100%
rename from tests/solutions/test_day07_a.py
rename to tests/adventofcode2020/test_day07_a.py
diff --git a/tests/solutions/test_day07_b.py b/tests/adventofcode2020/test_day07_b.py
similarity index 100%
rename from tests/solutions/test_day07_b.py
rename to tests/adventofcode2020/test_day07_b.py
diff --git a/tests/solutions/test_day08_a.py b/tests/adventofcode2020/test_day08_a.py
similarity index 100%
rename from tests/solutions/test_day08_a.py
rename to tests/adventofcode2020/test_day08_a.py
diff --git a/tests/solutions/test_day08_b.py b/tests/adventofcode2020/test_day08_b.py
similarity index 100%
rename from tests/solutions/test_day08_b.py
rename to tests/adventofcode2020/test_day08_b.py
diff --git a/tests/solutions/test_day09_a.py b/tests/adventofcode2020/test_day09_a.py
similarity index 100%
rename from tests/solutions/test_day09_a.py
rename to tests/adventofcode2020/test_day09_a.py
diff --git a/tests/solutions/test_day09_b.py b/tests/adventofcode2020/test_day09_b.py
similarity index 100%
rename from tests/solutions/test_day09_b.py
rename to tests/adventofcode2020/test_day09_b.py
diff --git a/tests/solutions/test_day10_a.py b/tests/adventofcode2020/test_day10_a.py
similarity index 100%
rename from tests/solutions/test_day10_a.py
rename to tests/adventofcode2020/test_day10_a.py
diff --git a/tests/solutions/test_day10_b.py b/tests/adventofcode2020/test_day10_b.py
similarity index 100%
rename from tests/solutions/test_day10_b.py
rename to tests/adventofcode2020/test_day10_b.py
diff --git a/tests/solutions/test_day11_a.py b/tests/adventofcode2020/test_day11_a.py
similarity index 100%
rename from tests/solutions/test_day11_a.py
rename to tests/adventofcode2020/test_day11_a.py
diff --git a/tests/solutions/test_day11_b.py b/tests/adventofcode2020/test_day11_b.py
similarity index 100%
rename from tests/solutions/test_day11_b.py
rename to tests/adventofcode2020/test_day11_b.py
diff --git a/tests/solutions/test_day12_a.py b/tests/adventofcode2020/test_day12_a.py
similarity index 100%
rename from tests/solutions/test_day12_a.py
rename to tests/adventofcode2020/test_day12_a.py
diff --git a/tests/solutions/test_day12_b.py b/tests/adventofcode2020/test_day12_b.py
similarity index 100%
rename from tests/solutions/test_day12_b.py
rename to tests/adventofcode2020/test_day12_b.py
diff --git a/tests/solutions/test_day13_a.py b/tests/adventofcode2020/test_day13_a.py
similarity index 100%
rename from tests/solutions/test_day13_a.py
rename to tests/adventofcode2020/test_day13_a.py
diff --git a/tests/solutions/test_day13_b.py b/tests/adventofcode2020/test_day13_b.py
similarity index 100%
rename from tests/solutions/test_day13_b.py
rename to tests/adventofcode2020/test_day13_b.py
diff --git a/tests/solutions/test_day14_a.py b/tests/adventofcode2020/test_day14_a.py
similarity index 100%
rename from tests/solutions/test_day14_a.py
rename to tests/adventofcode2020/test_day14_a.py
diff --git a/tests/solutions/test_day14_b.py b/tests/adventofcode2020/test_day14_b.py
similarity index 100%
rename from tests/solutions/test_day14_b.py
rename to tests/adventofcode2020/test_day14_b.py
diff --git a/tests/solutions/test_day15_a.py b/tests/adventofcode2020/test_day15_a.py
similarity index 100%
rename from tests/solutions/test_day15_a.py
rename to tests/adventofcode2020/test_day15_a.py
diff --git a/tests/solutions/test_day16_a.py b/tests/adventofcode2020/test_day16_a.py
similarity index 100%
rename from tests/solutions/test_day16_a.py
rename to tests/adventofcode2020/test_day16_a.py
diff --git a/tests/solutions/test_day16_b.py b/tests/adventofcode2020/test_day16_b.py
similarity index 100%
rename from tests/solutions/test_day16_b.py
rename to tests/adventofcode2020/test_day16_b.py

From 567cf39aa3be365ab268fa9a0c1b03d88277e891 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sat, 18 Nov 2023 19:46:09 +0000
Subject: [PATCH 287/371] Bump actions/setup-python from 3 to 4

Bumps [actions/setup-python](https://github.com/actions/setup-python) from 3 to 4.
- [Release notes](https://github.com/actions/setup-python/releases)
- [Commits](https://github.com/actions/setup-python/compare/v3...v4)

---
updated-dependencies:
- dependency-name: actions/setup-python
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 .github/workflows/tox.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/tox.yml b/.github/workflows/tox.yml
index 185a47bd..cd4932f4 100644
--- a/.github/workflows/tox.yml
+++ b/.github/workflows/tox.yml
@@ -14,7 +14,7 @@ jobs:
     - uses: actions/checkout@v3
 
     - name: Set up Python ${{ matrix.python-version }}
-      uses: actions/setup-python@v3
+      uses: actions/setup-python@v4
       with:
         python-version: ${{ matrix.python-version }}
 

From 8e198a8644e7f8dcf767192be35af82198c38fd3 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sat, 18 Nov 2023 19:46:11 +0000
Subject: [PATCH 288/371] Bump pascalgn/automerge-action from 0.15.3 to 0.15.6

Bumps [pascalgn/automerge-action](https://github.com/pascalgn/automerge-action) from 0.15.3 to 0.15.6.
- [Release notes](https://github.com/pascalgn/automerge-action/releases)
- [Commits](https://github.com/pascalgn/automerge-action/compare/v0.15.3...v0.15.6)

---
updated-dependencies:
- dependency-name: pascalgn/automerge-action
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 .github/workflows/automerge.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/automerge.yml b/.github/workflows/automerge.yml
index c53ed1b9..1a49943c 100644
--- a/.github/workflows/automerge.yml
+++ b/.github/workflows/automerge.yml
@@ -22,7 +22,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: automerge
-        uses: "pascalgn/automerge-action@v0.15.3"
+        uses: "pascalgn/automerge-action@v0.15.6"
         env:
           GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN }}"
           MERGE_LABELS: automerge

From baf6d305791c7d1e4d12b1735a208b413c3bb03a Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sat, 18 Nov 2023 19:46:13 +0000
Subject: [PATCH 289/371] Bump actions/checkout from 3 to 4

Bumps [actions/checkout](https://github.com/actions/checkout) from 3 to 4.
- [Release notes](https://github.com/actions/checkout/releases)
- [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md)
- [Commits](https://github.com/actions/checkout/compare/v3...v4)

---
updated-dependencies:
- dependency-name: actions/checkout
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 .github/workflows/tox.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/tox.yml b/.github/workflows/tox.yml
index 185a47bd..9c0aafaa 100644
--- a/.github/workflows/tox.yml
+++ b/.github/workflows/tox.yml
@@ -11,7 +11,7 @@ jobs:
         python-version: ['3.9', '3.10']
 
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
 
     - name: Set up Python ${{ matrix.python-version }}
       uses: actions/setup-python@v3

From 3e439f097e1fa970e5dc50cfe5a97bcd33598551 Mon Sep 17 00:00:00 2001
From: Roel Adriaans <roel@adriaans.org>
Date: Sat, 18 Nov 2023 20:53:10 +0100
Subject: [PATCH 290/371] Rename tests to adventofcode2021

---
 tests/{solutions => adventofcode2021}/test_day01_a.py | 0
 tests/{solutions => adventofcode2021}/test_day01_b.py | 0
 tests/{solutions => adventofcode2021}/test_day02_a.py | 0
 tests/{solutions => adventofcode2021}/test_day02_b.py | 0
 tests/{solutions => adventofcode2021}/test_day03_a.py | 0
 tests/{solutions => adventofcode2021}/test_day03_b.py | 0
 tests/{solutions => adventofcode2021}/test_day04_a.py | 0
 tests/{solutions => adventofcode2021}/test_day04_b.py | 0
 tests/{solutions => adventofcode2021}/test_day05_a.py | 0
 tests/{solutions => adventofcode2021}/test_day05_b.py | 0
 tests/{solutions => adventofcode2021}/test_day06_a.py | 0
 tests/{solutions => adventofcode2021}/test_day06_b.py | 0
 tests/{solutions => adventofcode2021}/test_day07_a.py | 0
 tests/{solutions => adventofcode2021}/test_day07_b.py | 0
 tests/{solutions => adventofcode2021}/test_day08_a.py | 0
 tests/{solutions => adventofcode2021}/test_day08_b.py | 0
 tests/{solutions => adventofcode2021}/test_day09_a.py | 0
 tests/{solutions => adventofcode2021}/test_day09_b.py | 0
 tests/{solutions => adventofcode2021}/test_day10_a.py | 0
 tests/{solutions => adventofcode2021}/test_day10_b.py | 0
 tests/{solutions => adventofcode2021}/test_day11_a.py | 0
 tests/{solutions => adventofcode2021}/test_day11_b.py | 0
 tests/{solutions => adventofcode2021}/test_day12_a.py | 0
 tests/{solutions => adventofcode2021}/test_day12_b.py | 0
 tests/{solutions => adventofcode2021}/test_day13_a.py | 0
 tests/{solutions => adventofcode2021}/test_day13_b.py | 0
 tests/{solutions => adventofcode2021}/test_day14_a.py | 0
 tests/{solutions => adventofcode2021}/test_day14_b.py | 0
 tests/{solutions => adventofcode2021}/test_day15_a.py | 0
 tests/{solutions => adventofcode2021}/test_day15_b.py | 0
 tests/{solutions => adventofcode2021}/test_day16_a.py | 0
 tests/{solutions => adventofcode2021}/test_day16_b.py | 0
 tests/{solutions => adventofcode2021}/test_day17_a.py | 0
 tests/{solutions => adventofcode2021}/test_day17_b.py | 0
 tests/{solutions => adventofcode2021}/test_day18_a.py | 0
 tests/{solutions => adventofcode2021}/test_day18_b.py | 0
 tests/{solutions => adventofcode2021}/test_day19_a.py | 0
 tests/{solutions => adventofcode2021}/test_day19_b.py | 0
 tests/{solutions => adventofcode2021}/test_day20_a.py | 0
 tests/{solutions => adventofcode2021}/test_day20_b.py | 0
 tests/{solutions => adventofcode2021}/test_day21_a.py | 0
 tests/{solutions => adventofcode2021}/test_day21_b.py | 0
 tests/{solutions => adventofcode2021}/test_day22_a.py | 0
 tests/{solutions => adventofcode2021}/test_day22_b.py | 0
 44 files changed, 0 insertions(+), 0 deletions(-)
 rename tests/{solutions => adventofcode2021}/test_day01_a.py (100%)
 rename tests/{solutions => adventofcode2021}/test_day01_b.py (100%)
 rename tests/{solutions => adventofcode2021}/test_day02_a.py (100%)
 rename tests/{solutions => adventofcode2021}/test_day02_b.py (100%)
 rename tests/{solutions => adventofcode2021}/test_day03_a.py (100%)
 rename tests/{solutions => adventofcode2021}/test_day03_b.py (100%)
 rename tests/{solutions => adventofcode2021}/test_day04_a.py (100%)
 rename tests/{solutions => adventofcode2021}/test_day04_b.py (100%)
 rename tests/{solutions => adventofcode2021}/test_day05_a.py (100%)
 rename tests/{solutions => adventofcode2021}/test_day05_b.py (100%)
 rename tests/{solutions => adventofcode2021}/test_day06_a.py (100%)
 rename tests/{solutions => adventofcode2021}/test_day06_b.py (100%)
 rename tests/{solutions => adventofcode2021}/test_day07_a.py (100%)
 rename tests/{solutions => adventofcode2021}/test_day07_b.py (100%)
 rename tests/{solutions => adventofcode2021}/test_day08_a.py (100%)
 rename tests/{solutions => adventofcode2021}/test_day08_b.py (100%)
 rename tests/{solutions => adventofcode2021}/test_day09_a.py (100%)
 rename tests/{solutions => adventofcode2021}/test_day09_b.py (100%)
 rename tests/{solutions => adventofcode2021}/test_day10_a.py (100%)
 rename tests/{solutions => adventofcode2021}/test_day10_b.py (100%)
 rename tests/{solutions => adventofcode2021}/test_day11_a.py (100%)
 rename tests/{solutions => adventofcode2021}/test_day11_b.py (100%)
 rename tests/{solutions => adventofcode2021}/test_day12_a.py (100%)
 rename tests/{solutions => adventofcode2021}/test_day12_b.py (100%)
 rename tests/{solutions => adventofcode2021}/test_day13_a.py (100%)
 rename tests/{solutions => adventofcode2021}/test_day13_b.py (100%)
 rename tests/{solutions => adventofcode2021}/test_day14_a.py (100%)
 rename tests/{solutions => adventofcode2021}/test_day14_b.py (100%)
 rename tests/{solutions => adventofcode2021}/test_day15_a.py (100%)
 rename tests/{solutions => adventofcode2021}/test_day15_b.py (100%)
 rename tests/{solutions => adventofcode2021}/test_day16_a.py (100%)
 rename tests/{solutions => adventofcode2021}/test_day16_b.py (100%)
 rename tests/{solutions => adventofcode2021}/test_day17_a.py (100%)
 rename tests/{solutions => adventofcode2021}/test_day17_b.py (100%)
 rename tests/{solutions => adventofcode2021}/test_day18_a.py (100%)
 rename tests/{solutions => adventofcode2021}/test_day18_b.py (100%)
 rename tests/{solutions => adventofcode2021}/test_day19_a.py (100%)
 rename tests/{solutions => adventofcode2021}/test_day19_b.py (100%)
 rename tests/{solutions => adventofcode2021}/test_day20_a.py (100%)
 rename tests/{solutions => adventofcode2021}/test_day20_b.py (100%)
 rename tests/{solutions => adventofcode2021}/test_day21_a.py (100%)
 rename tests/{solutions => adventofcode2021}/test_day21_b.py (100%)
 rename tests/{solutions => adventofcode2021}/test_day22_a.py (100%)
 rename tests/{solutions => adventofcode2021}/test_day22_b.py (100%)

diff --git a/tests/solutions/test_day01_a.py b/tests/adventofcode2021/test_day01_a.py
similarity index 100%
rename from tests/solutions/test_day01_a.py
rename to tests/adventofcode2021/test_day01_a.py
diff --git a/tests/solutions/test_day01_b.py b/tests/adventofcode2021/test_day01_b.py
similarity index 100%
rename from tests/solutions/test_day01_b.py
rename to tests/adventofcode2021/test_day01_b.py
diff --git a/tests/solutions/test_day02_a.py b/tests/adventofcode2021/test_day02_a.py
similarity index 100%
rename from tests/solutions/test_day02_a.py
rename to tests/adventofcode2021/test_day02_a.py
diff --git a/tests/solutions/test_day02_b.py b/tests/adventofcode2021/test_day02_b.py
similarity index 100%
rename from tests/solutions/test_day02_b.py
rename to tests/adventofcode2021/test_day02_b.py
diff --git a/tests/solutions/test_day03_a.py b/tests/adventofcode2021/test_day03_a.py
similarity index 100%
rename from tests/solutions/test_day03_a.py
rename to tests/adventofcode2021/test_day03_a.py
diff --git a/tests/solutions/test_day03_b.py b/tests/adventofcode2021/test_day03_b.py
similarity index 100%
rename from tests/solutions/test_day03_b.py
rename to tests/adventofcode2021/test_day03_b.py
diff --git a/tests/solutions/test_day04_a.py b/tests/adventofcode2021/test_day04_a.py
similarity index 100%
rename from tests/solutions/test_day04_a.py
rename to tests/adventofcode2021/test_day04_a.py
diff --git a/tests/solutions/test_day04_b.py b/tests/adventofcode2021/test_day04_b.py
similarity index 100%
rename from tests/solutions/test_day04_b.py
rename to tests/adventofcode2021/test_day04_b.py
diff --git a/tests/solutions/test_day05_a.py b/tests/adventofcode2021/test_day05_a.py
similarity index 100%
rename from tests/solutions/test_day05_a.py
rename to tests/adventofcode2021/test_day05_a.py
diff --git a/tests/solutions/test_day05_b.py b/tests/adventofcode2021/test_day05_b.py
similarity index 100%
rename from tests/solutions/test_day05_b.py
rename to tests/adventofcode2021/test_day05_b.py
diff --git a/tests/solutions/test_day06_a.py b/tests/adventofcode2021/test_day06_a.py
similarity index 100%
rename from tests/solutions/test_day06_a.py
rename to tests/adventofcode2021/test_day06_a.py
diff --git a/tests/solutions/test_day06_b.py b/tests/adventofcode2021/test_day06_b.py
similarity index 100%
rename from tests/solutions/test_day06_b.py
rename to tests/adventofcode2021/test_day06_b.py
diff --git a/tests/solutions/test_day07_a.py b/tests/adventofcode2021/test_day07_a.py
similarity index 100%
rename from tests/solutions/test_day07_a.py
rename to tests/adventofcode2021/test_day07_a.py
diff --git a/tests/solutions/test_day07_b.py b/tests/adventofcode2021/test_day07_b.py
similarity index 100%
rename from tests/solutions/test_day07_b.py
rename to tests/adventofcode2021/test_day07_b.py
diff --git a/tests/solutions/test_day08_a.py b/tests/adventofcode2021/test_day08_a.py
similarity index 100%
rename from tests/solutions/test_day08_a.py
rename to tests/adventofcode2021/test_day08_a.py
diff --git a/tests/solutions/test_day08_b.py b/tests/adventofcode2021/test_day08_b.py
similarity index 100%
rename from tests/solutions/test_day08_b.py
rename to tests/adventofcode2021/test_day08_b.py
diff --git a/tests/solutions/test_day09_a.py b/tests/adventofcode2021/test_day09_a.py
similarity index 100%
rename from tests/solutions/test_day09_a.py
rename to tests/adventofcode2021/test_day09_a.py
diff --git a/tests/solutions/test_day09_b.py b/tests/adventofcode2021/test_day09_b.py
similarity index 100%
rename from tests/solutions/test_day09_b.py
rename to tests/adventofcode2021/test_day09_b.py
diff --git a/tests/solutions/test_day10_a.py b/tests/adventofcode2021/test_day10_a.py
similarity index 100%
rename from tests/solutions/test_day10_a.py
rename to tests/adventofcode2021/test_day10_a.py
diff --git a/tests/solutions/test_day10_b.py b/tests/adventofcode2021/test_day10_b.py
similarity index 100%
rename from tests/solutions/test_day10_b.py
rename to tests/adventofcode2021/test_day10_b.py
diff --git a/tests/solutions/test_day11_a.py b/tests/adventofcode2021/test_day11_a.py
similarity index 100%
rename from tests/solutions/test_day11_a.py
rename to tests/adventofcode2021/test_day11_a.py
diff --git a/tests/solutions/test_day11_b.py b/tests/adventofcode2021/test_day11_b.py
similarity index 100%
rename from tests/solutions/test_day11_b.py
rename to tests/adventofcode2021/test_day11_b.py
diff --git a/tests/solutions/test_day12_a.py b/tests/adventofcode2021/test_day12_a.py
similarity index 100%
rename from tests/solutions/test_day12_a.py
rename to tests/adventofcode2021/test_day12_a.py
diff --git a/tests/solutions/test_day12_b.py b/tests/adventofcode2021/test_day12_b.py
similarity index 100%
rename from tests/solutions/test_day12_b.py
rename to tests/adventofcode2021/test_day12_b.py
diff --git a/tests/solutions/test_day13_a.py b/tests/adventofcode2021/test_day13_a.py
similarity index 100%
rename from tests/solutions/test_day13_a.py
rename to tests/adventofcode2021/test_day13_a.py
diff --git a/tests/solutions/test_day13_b.py b/tests/adventofcode2021/test_day13_b.py
similarity index 100%
rename from tests/solutions/test_day13_b.py
rename to tests/adventofcode2021/test_day13_b.py
diff --git a/tests/solutions/test_day14_a.py b/tests/adventofcode2021/test_day14_a.py
similarity index 100%
rename from tests/solutions/test_day14_a.py
rename to tests/adventofcode2021/test_day14_a.py
diff --git a/tests/solutions/test_day14_b.py b/tests/adventofcode2021/test_day14_b.py
similarity index 100%
rename from tests/solutions/test_day14_b.py
rename to tests/adventofcode2021/test_day14_b.py
diff --git a/tests/solutions/test_day15_a.py b/tests/adventofcode2021/test_day15_a.py
similarity index 100%
rename from tests/solutions/test_day15_a.py
rename to tests/adventofcode2021/test_day15_a.py
diff --git a/tests/solutions/test_day15_b.py b/tests/adventofcode2021/test_day15_b.py
similarity index 100%
rename from tests/solutions/test_day15_b.py
rename to tests/adventofcode2021/test_day15_b.py
diff --git a/tests/solutions/test_day16_a.py b/tests/adventofcode2021/test_day16_a.py
similarity index 100%
rename from tests/solutions/test_day16_a.py
rename to tests/adventofcode2021/test_day16_a.py
diff --git a/tests/solutions/test_day16_b.py b/tests/adventofcode2021/test_day16_b.py
similarity index 100%
rename from tests/solutions/test_day16_b.py
rename to tests/adventofcode2021/test_day16_b.py
diff --git a/tests/solutions/test_day17_a.py b/tests/adventofcode2021/test_day17_a.py
similarity index 100%
rename from tests/solutions/test_day17_a.py
rename to tests/adventofcode2021/test_day17_a.py
diff --git a/tests/solutions/test_day17_b.py b/tests/adventofcode2021/test_day17_b.py
similarity index 100%
rename from tests/solutions/test_day17_b.py
rename to tests/adventofcode2021/test_day17_b.py
diff --git a/tests/solutions/test_day18_a.py b/tests/adventofcode2021/test_day18_a.py
similarity index 100%
rename from tests/solutions/test_day18_a.py
rename to tests/adventofcode2021/test_day18_a.py
diff --git a/tests/solutions/test_day18_b.py b/tests/adventofcode2021/test_day18_b.py
similarity index 100%
rename from tests/solutions/test_day18_b.py
rename to tests/adventofcode2021/test_day18_b.py
diff --git a/tests/solutions/test_day19_a.py b/tests/adventofcode2021/test_day19_a.py
similarity index 100%
rename from tests/solutions/test_day19_a.py
rename to tests/adventofcode2021/test_day19_a.py
diff --git a/tests/solutions/test_day19_b.py b/tests/adventofcode2021/test_day19_b.py
similarity index 100%
rename from tests/solutions/test_day19_b.py
rename to tests/adventofcode2021/test_day19_b.py
diff --git a/tests/solutions/test_day20_a.py b/tests/adventofcode2021/test_day20_a.py
similarity index 100%
rename from tests/solutions/test_day20_a.py
rename to tests/adventofcode2021/test_day20_a.py
diff --git a/tests/solutions/test_day20_b.py b/tests/adventofcode2021/test_day20_b.py
similarity index 100%
rename from tests/solutions/test_day20_b.py
rename to tests/adventofcode2021/test_day20_b.py
diff --git a/tests/solutions/test_day21_a.py b/tests/adventofcode2021/test_day21_a.py
similarity index 100%
rename from tests/solutions/test_day21_a.py
rename to tests/adventofcode2021/test_day21_a.py
diff --git a/tests/solutions/test_day21_b.py b/tests/adventofcode2021/test_day21_b.py
similarity index 100%
rename from tests/solutions/test_day21_b.py
rename to tests/adventofcode2021/test_day21_b.py
diff --git a/tests/solutions/test_day22_a.py b/tests/adventofcode2021/test_day22_a.py
similarity index 100%
rename from tests/solutions/test_day22_a.py
rename to tests/adventofcode2021/test_day22_a.py
diff --git a/tests/solutions/test_day22_b.py b/tests/adventofcode2021/test_day22_b.py
similarity index 100%
rename from tests/solutions/test_day22_b.py
rename to tests/adventofcode2021/test_day22_b.py

From 1b1af00cde7959fe01216d24a977186c44a994de Mon Sep 17 00:00:00 2001
From: Roel Adriaans <roel@adriaans.org>
Date: Sat, 18 Nov 2023 20:54:58 +0100
Subject: [PATCH 291/371] Rename tests to adventofcode2022

---
 tests/{solutions => adventofcode2022}/conftest.py     | 0
 tests/{solutions => adventofcode2022}/test_day01_a.py | 0
 tests/{solutions => adventofcode2022}/test_day01_b.py | 0
 tests/{solutions => adventofcode2022}/test_day02_a.py | 0
 tests/{solutions => adventofcode2022}/test_day02_b.py | 0
 tests/{solutions => adventofcode2022}/test_day03_a.py | 0
 tests/{solutions => adventofcode2022}/test_day03_b.py | 0
 tests/{solutions => adventofcode2022}/test_day04_a.py | 0
 tests/{solutions => adventofcode2022}/test_day04_b.py | 0
 tests/{solutions => adventofcode2022}/test_day05_a.py | 0
 tests/{solutions => adventofcode2022}/test_day05_b.py | 0
 tests/{solutions => adventofcode2022}/test_day06_a.py | 0
 tests/{solutions => adventofcode2022}/test_day06_b.py | 0
 tests/{solutions => adventofcode2022}/test_day07_a.py | 0
 tests/{solutions => adventofcode2022}/test_day07_b.py | 0
 tests/{solutions => adventofcode2022}/test_day08_a.py | 0
 tests/{solutions => adventofcode2022}/test_day08_b.py | 0
 tests/{solutions => adventofcode2022}/test_day09_a.py | 0
 tests/{solutions => adventofcode2022}/test_day09_b.py | 0
 tests/{solutions => adventofcode2022}/test_day10_a.py | 0
 tests/{solutions => adventofcode2022}/test_day10_b.py | 0
 tests/{solutions => adventofcode2022}/test_day11_a.py | 0
 tests/{solutions => adventofcode2022}/test_day11_b.py | 0
 tests/{solutions => adventofcode2022}/test_day12_a.py | 0
 tests/{solutions => adventofcode2022}/test_day12_b.py | 0
 tests/{solutions => adventofcode2022}/test_day13_a.py | 0
 tests/{solutions => adventofcode2022}/test_day13_b.py | 0
 tests/{solutions => adventofcode2022}/test_day14_a.py | 0
 tests/{solutions => adventofcode2022}/test_day14_b.py | 0
 tests/{solutions => adventofcode2022}/test_day15_a.py | 0
 tests/{solutions => adventofcode2022}/test_day15_b.py | 0
 31 files changed, 0 insertions(+), 0 deletions(-)
 rename tests/{solutions => adventofcode2022}/conftest.py (100%)
 rename tests/{solutions => adventofcode2022}/test_day01_a.py (100%)
 rename tests/{solutions => adventofcode2022}/test_day01_b.py (100%)
 rename tests/{solutions => adventofcode2022}/test_day02_a.py (100%)
 rename tests/{solutions => adventofcode2022}/test_day02_b.py (100%)
 rename tests/{solutions => adventofcode2022}/test_day03_a.py (100%)
 rename tests/{solutions => adventofcode2022}/test_day03_b.py (100%)
 rename tests/{solutions => adventofcode2022}/test_day04_a.py (100%)
 rename tests/{solutions => adventofcode2022}/test_day04_b.py (100%)
 rename tests/{solutions => adventofcode2022}/test_day05_a.py (100%)
 rename tests/{solutions => adventofcode2022}/test_day05_b.py (100%)
 rename tests/{solutions => adventofcode2022}/test_day06_a.py (100%)
 rename tests/{solutions => adventofcode2022}/test_day06_b.py (100%)
 rename tests/{solutions => adventofcode2022}/test_day07_a.py (100%)
 rename tests/{solutions => adventofcode2022}/test_day07_b.py (100%)
 rename tests/{solutions => adventofcode2022}/test_day08_a.py (100%)
 rename tests/{solutions => adventofcode2022}/test_day08_b.py (100%)
 rename tests/{solutions => adventofcode2022}/test_day09_a.py (100%)
 rename tests/{solutions => adventofcode2022}/test_day09_b.py (100%)
 rename tests/{solutions => adventofcode2022}/test_day10_a.py (100%)
 rename tests/{solutions => adventofcode2022}/test_day10_b.py (100%)
 rename tests/{solutions => adventofcode2022}/test_day11_a.py (100%)
 rename tests/{solutions => adventofcode2022}/test_day11_b.py (100%)
 rename tests/{solutions => adventofcode2022}/test_day12_a.py (100%)
 rename tests/{solutions => adventofcode2022}/test_day12_b.py (100%)
 rename tests/{solutions => adventofcode2022}/test_day13_a.py (100%)
 rename tests/{solutions => adventofcode2022}/test_day13_b.py (100%)
 rename tests/{solutions => adventofcode2022}/test_day14_a.py (100%)
 rename tests/{solutions => adventofcode2022}/test_day14_b.py (100%)
 rename tests/{solutions => adventofcode2022}/test_day15_a.py (100%)
 rename tests/{solutions => adventofcode2022}/test_day15_b.py (100%)

diff --git a/tests/solutions/conftest.py b/tests/adventofcode2022/conftest.py
similarity index 100%
rename from tests/solutions/conftest.py
rename to tests/adventofcode2022/conftest.py
diff --git a/tests/solutions/test_day01_a.py b/tests/adventofcode2022/test_day01_a.py
similarity index 100%
rename from tests/solutions/test_day01_a.py
rename to tests/adventofcode2022/test_day01_a.py
diff --git a/tests/solutions/test_day01_b.py b/tests/adventofcode2022/test_day01_b.py
similarity index 100%
rename from tests/solutions/test_day01_b.py
rename to tests/adventofcode2022/test_day01_b.py
diff --git a/tests/solutions/test_day02_a.py b/tests/adventofcode2022/test_day02_a.py
similarity index 100%
rename from tests/solutions/test_day02_a.py
rename to tests/adventofcode2022/test_day02_a.py
diff --git a/tests/solutions/test_day02_b.py b/tests/adventofcode2022/test_day02_b.py
similarity index 100%
rename from tests/solutions/test_day02_b.py
rename to tests/adventofcode2022/test_day02_b.py
diff --git a/tests/solutions/test_day03_a.py b/tests/adventofcode2022/test_day03_a.py
similarity index 100%
rename from tests/solutions/test_day03_a.py
rename to tests/adventofcode2022/test_day03_a.py
diff --git a/tests/solutions/test_day03_b.py b/tests/adventofcode2022/test_day03_b.py
similarity index 100%
rename from tests/solutions/test_day03_b.py
rename to tests/adventofcode2022/test_day03_b.py
diff --git a/tests/solutions/test_day04_a.py b/tests/adventofcode2022/test_day04_a.py
similarity index 100%
rename from tests/solutions/test_day04_a.py
rename to tests/adventofcode2022/test_day04_a.py
diff --git a/tests/solutions/test_day04_b.py b/tests/adventofcode2022/test_day04_b.py
similarity index 100%
rename from tests/solutions/test_day04_b.py
rename to tests/adventofcode2022/test_day04_b.py
diff --git a/tests/solutions/test_day05_a.py b/tests/adventofcode2022/test_day05_a.py
similarity index 100%
rename from tests/solutions/test_day05_a.py
rename to tests/adventofcode2022/test_day05_a.py
diff --git a/tests/solutions/test_day05_b.py b/tests/adventofcode2022/test_day05_b.py
similarity index 100%
rename from tests/solutions/test_day05_b.py
rename to tests/adventofcode2022/test_day05_b.py
diff --git a/tests/solutions/test_day06_a.py b/tests/adventofcode2022/test_day06_a.py
similarity index 100%
rename from tests/solutions/test_day06_a.py
rename to tests/adventofcode2022/test_day06_a.py
diff --git a/tests/solutions/test_day06_b.py b/tests/adventofcode2022/test_day06_b.py
similarity index 100%
rename from tests/solutions/test_day06_b.py
rename to tests/adventofcode2022/test_day06_b.py
diff --git a/tests/solutions/test_day07_a.py b/tests/adventofcode2022/test_day07_a.py
similarity index 100%
rename from tests/solutions/test_day07_a.py
rename to tests/adventofcode2022/test_day07_a.py
diff --git a/tests/solutions/test_day07_b.py b/tests/adventofcode2022/test_day07_b.py
similarity index 100%
rename from tests/solutions/test_day07_b.py
rename to tests/adventofcode2022/test_day07_b.py
diff --git a/tests/solutions/test_day08_a.py b/tests/adventofcode2022/test_day08_a.py
similarity index 100%
rename from tests/solutions/test_day08_a.py
rename to tests/adventofcode2022/test_day08_a.py
diff --git a/tests/solutions/test_day08_b.py b/tests/adventofcode2022/test_day08_b.py
similarity index 100%
rename from tests/solutions/test_day08_b.py
rename to tests/adventofcode2022/test_day08_b.py
diff --git a/tests/solutions/test_day09_a.py b/tests/adventofcode2022/test_day09_a.py
similarity index 100%
rename from tests/solutions/test_day09_a.py
rename to tests/adventofcode2022/test_day09_a.py
diff --git a/tests/solutions/test_day09_b.py b/tests/adventofcode2022/test_day09_b.py
similarity index 100%
rename from tests/solutions/test_day09_b.py
rename to tests/adventofcode2022/test_day09_b.py
diff --git a/tests/solutions/test_day10_a.py b/tests/adventofcode2022/test_day10_a.py
similarity index 100%
rename from tests/solutions/test_day10_a.py
rename to tests/adventofcode2022/test_day10_a.py
diff --git a/tests/solutions/test_day10_b.py b/tests/adventofcode2022/test_day10_b.py
similarity index 100%
rename from tests/solutions/test_day10_b.py
rename to tests/adventofcode2022/test_day10_b.py
diff --git a/tests/solutions/test_day11_a.py b/tests/adventofcode2022/test_day11_a.py
similarity index 100%
rename from tests/solutions/test_day11_a.py
rename to tests/adventofcode2022/test_day11_a.py
diff --git a/tests/solutions/test_day11_b.py b/tests/adventofcode2022/test_day11_b.py
similarity index 100%
rename from tests/solutions/test_day11_b.py
rename to tests/adventofcode2022/test_day11_b.py
diff --git a/tests/solutions/test_day12_a.py b/tests/adventofcode2022/test_day12_a.py
similarity index 100%
rename from tests/solutions/test_day12_a.py
rename to tests/adventofcode2022/test_day12_a.py
diff --git a/tests/solutions/test_day12_b.py b/tests/adventofcode2022/test_day12_b.py
similarity index 100%
rename from tests/solutions/test_day12_b.py
rename to tests/adventofcode2022/test_day12_b.py
diff --git a/tests/solutions/test_day13_a.py b/tests/adventofcode2022/test_day13_a.py
similarity index 100%
rename from tests/solutions/test_day13_a.py
rename to tests/adventofcode2022/test_day13_a.py
diff --git a/tests/solutions/test_day13_b.py b/tests/adventofcode2022/test_day13_b.py
similarity index 100%
rename from tests/solutions/test_day13_b.py
rename to tests/adventofcode2022/test_day13_b.py
diff --git a/tests/solutions/test_day14_a.py b/tests/adventofcode2022/test_day14_a.py
similarity index 100%
rename from tests/solutions/test_day14_a.py
rename to tests/adventofcode2022/test_day14_a.py
diff --git a/tests/solutions/test_day14_b.py b/tests/adventofcode2022/test_day14_b.py
similarity index 100%
rename from tests/solutions/test_day14_b.py
rename to tests/adventofcode2022/test_day14_b.py
diff --git a/tests/solutions/test_day15_a.py b/tests/adventofcode2022/test_day15_a.py
similarity index 100%
rename from tests/solutions/test_day15_a.py
rename to tests/adventofcode2022/test_day15_a.py
diff --git a/tests/solutions/test_day15_b.py b/tests/adventofcode2022/test_day15_b.py
similarity index 100%
rename from tests/solutions/test_day15_b.py
rename to tests/adventofcode2022/test_day15_b.py

From 597c6c8e11201ae627fa015c35ef6e1050ff8800 Mon Sep 17 00:00:00 2001
From: Roel Adriaans <roel@adriaans.org>
Date: Sat, 18 Nov 2023 21:01:08 +0100
Subject: [PATCH 292/371] Fix merge

---
 .pre-commit-config.yaml | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index dd7c0973..45343055 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -2,21 +2,13 @@
 
 repos:
   - repo: https://github.com/ambv/black
-<<<<<<< HEAD
     rev: 23.7.0
-=======
-    rev: 23.1.0
->>>>>>> aoc_2021/main
     hooks:
     - id: black
       language_version: 'python3.10'
 
   - repo: https://github.com/pycqa/flake8
-<<<<<<< HEAD
     rev: 6.1.0
-=======
-    rev: 6.0.0
->>>>>>> aoc_2021/main
     hooks:
     - id: flake8
       args: ["--ignore", "E203,W503"]

From fc4832ac580fb2a19a8952a89f875e22f235dd8b Mon Sep 17 00:00:00 2001
From: Roel Adriaans <roel@adriaans.org>
Date: Sat, 18 Nov 2023 21:04:44 +0100
Subject: [PATCH 293/371] update readme

---
 README.md | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/README.md b/README.md
index ac212058..5b2dc9ad 100644
--- a/README.md
+++ b/README.md
@@ -1,10 +1,14 @@
-# Advent of Code 2016
+# Advent of Code 2016, 2019, 2020, 2021 and 2022
 
-Advent of Code 2016 with tests and utils etc.
-Created as part of Python Discords Revival of Code
+Advent of Code for some years with tests and utils etc.
+Code is in src/adventofcode<years>, tests are in tests/
 
 ## Todo
 
+- Create a global adventofcode tool
+- Add --year to adventofcode function
+- Update documentation, currently copied from the latest version (2016)
+- Use adventofcodeutils package instead of utils per year
 - Complete all puzzles (Doh)
 
 ## Create a new day

From 41d6c70717c839dba3f06b455fae8f6acc92d7a6 Mon Sep 17 00:00:00 2001
From: Roel Adriaans <roel@adriaans.org>
Date: Sat, 18 Nov 2023 21:06:22 +0100
Subject: [PATCH 294/371] Update and remove old files

---
 LICENSE          |  2 +-
 MANIFEST.in      |  2 --
 requirements.txt | 11 -----------
 setup.py         | 18 ------------------
 test.py          |  5 -----
 5 files changed, 1 insertion(+), 37 deletions(-)
 delete mode 100644 MANIFEST.in
 delete mode 100644 requirements.txt
 delete mode 100644 setup.py
 delete mode 100644 test.py

diff --git a/LICENSE b/LICENSE
index 59d2d3c0..8719d665 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2021 Roel Adriaans
+Copyright (c) 2020-2023 Roel Adriaans
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
diff --git a/MANIFEST.in b/MANIFEST.in
deleted file mode 100644
index 6df6c31a..00000000
--- a/MANIFEST.in
+++ /dev/null
@@ -1,2 +0,0 @@
-include requirements.txt
-recursive-include src *.txt *.json
diff --git a/requirements.txt b/requirements.txt
deleted file mode 100644
index 48318330..00000000
--- a/requirements.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-anytree
-black
-Click
-cookiecutter
-matplotlib
-numpy==1.19.3
-pytest
-pytest-cov
-pytest-xdist
-tox
-tqdm
\ No newline at end of file
diff --git a/setup.py b/setup.py
deleted file mode 100644
index cf44d6c4..00000000
--- a/setup.py
+++ /dev/null
@@ -1,18 +0,0 @@
-from setuptools import find_packages, setup
-
-with open("requirements.txt") as f:
-    requirements = f.read().splitlines()
-
-setup(
-    name="adventofcode2019",
-    author="Roel Adriaans",
-    author_email="roel@adriaans.org",
-    url="https://github.com/roeladriaans",
-    entry_points={"console_scripts": ["adventofcode = adventofcode2019.main:main"]},
-    packages=find_packages(where="src", exclude=["tests.*", "test*"]),
-    package_dir={"": "src"},
-    install_requires=requirements,
-    include_package_data=True,
-    use_scm_version=True,
-    setup_requires=["setuptools_scm"],
-)
diff --git a/test.py b/test.py
deleted file mode 100644
index 7981a171..00000000
--- a/test.py
+++ /dev/null
@@ -1,5 +0,0 @@
-for n in range(10):
-    print(n)
-    if n == 3:
-        print("Adding 1 to n")
-        n += 1

From 06d4761b974e685ec9a5be01d4051a29bcf86309 Mon Sep 17 00:00:00 2001
From: Roel Adriaans <roel@adriaans.org>
Date: Sat, 18 Nov 2023 21:10:32 +0100
Subject: [PATCH 295/371] Create seperate apps

---
 pyproject.toml | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/pyproject.toml b/pyproject.toml
index 1ed5b650..2eafe398 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -1,7 +1,7 @@
 [tool.poetry]
-name = "adventofcode2016"
+name = "adventofcode"
 version = "0.1.0"
-description = "Advent of Code - 2016"
+description = "Advent of Code - Roel Adriaans"
 authors = ["Roel Adriaans <roel@adriaans.org>"]
 license = "MIT"
 
@@ -30,7 +30,11 @@ pre-commit = "^3.3.3"
 isort = "^5.12.0"
 
 [tool.poetry.scripts]
-adventofcode = "adventofcode2016.main:main"
+adventofcode2016 = "adventofcode2016.main:main"
+adventofcode2019 = "adventofcode2019.main:main"
+adventofcode2020 = "adventofcode2020.main:main"
+adventofcode2021 = "adventofcode2021.main:main"
+adventofcode2022 = "adventofcode2022.main:main"
 
 [build-system]
 requires = ["poetry-core>=1.0.0"]

From d68f561b7d5370496c3f44cf314c92b6b8ec3495 Mon Sep 17 00:00:00 2001
From: Roel Adriaans <roel@adriaans.org>
Date: Sat, 18 Nov 2023 21:12:46 +0100
Subject: [PATCH 296/371] Apply black

---
 src/adventofcode2019/solutions/day03.py   |  6 +++---
 src/adventofcode2019/solutions/day04.py   |  2 +-
 src/adventofcode2019/solutions/day06.py   |  2 +-
 src/adventofcode2019/solutions/day07.py   |  2 +-
 src/adventofcode2019/solutions/day08.py   |  8 ++++----
 src/adventofcode2019/solutions/day10.py   | 12 ++++++------
 src/adventofcode2019/solutions/day11.py   |  4 ++--
 src/adventofcode2019/solutions/day12.py   | 12 ++++++------
 src/adventofcode2019/solutions/day13.py   |  2 +-
 src/adventofcode2019/solutions/day14.py   |  4 ++--
 src/adventofcode2019/solutions/day15.py   |  2 +-
 src/adventofcode2019/solutions/day17.py   |  2 +-
 src/adventofcode2019/solutions/infi.py    |  2 +-
 src/adventofcode2019/solutions/intcode.py |  4 ++--
 src/adventofcode2020/solutions/day02.py   |  1 -
 src/adventofcode2020/solutions/day04.py   |  1 -
 src/adventofcode2020/solutions/day09.py   |  1 -
 src/adventofcode2020/solutions/day10.py   |  1 -
 src/adventofcode2020/solutions/day12.py   |  1 -
 tests/adventofcode2019/test_day01_a.py    |  2 +-
 tests/adventofcode2019/test_day01_b.py    |  2 +-
 tests/adventofcode2019/test_day02_a.py    |  2 +-
 tests/adventofcode2019/test_day02_b.py    |  2 +-
 tests/adventofcode2019/test_day03_a.py    |  2 +-
 tests/adventofcode2019/test_day03_b.py    |  2 +-
 tests/adventofcode2019/test_day04_a.py    |  2 +-
 tests/adventofcode2019/test_day04_b.py    |  2 +-
 tests/adventofcode2019/test_day05_a.py    |  2 +-
 tests/adventofcode2019/test_day05_b.py    |  3 +--
 tests/adventofcode2019/test_day06_a.py    |  2 +-
 tests/adventofcode2019/test_day06_b.py    |  2 +-
 tests/adventofcode2019/test_day07_a.py    |  2 +-
 tests/adventofcode2019/test_day07_b.py    |  2 +-
 tests/adventofcode2019/test_day08_a.py    |  6 +++---
 tests/adventofcode2019/test_day08_b.py    |  4 ++--
 tests/adventofcode2019/test_day09_a.py    |  8 ++++----
 tests/adventofcode2019/test_day09_b.py    |  2 +-
 tests/adventofcode2019/test_day10_a.py    |  2 +-
 tests/adventofcode2019/test_day10_b.py    |  2 +-
 tests/adventofcode2019/test_day11_a.py    |  2 +-
 tests/adventofcode2019/test_day11_b.py    |  2 +-
 tests/adventofcode2019/test_day12_a.py    |  2 +-
 tests/adventofcode2019/test_day12_b.py    |  2 +-
 tests/adventofcode2019/test_day13_a.py    |  2 +-
 tests/adventofcode2019/test_day13_b.py    |  2 +-
 tests/adventofcode2019/test_day14_a.py    |  2 +-
 tests/adventofcode2019/test_day14_b.py    |  2 +-
 tests/adventofcode2019/test_day15_a.py    |  2 +-
 tests/adventofcode2019/test_day15_b.py    |  2 +-
 tests/adventofcode2019/test_day16_a.py    |  2 +-
 tests/adventofcode2019/test_day16_b.py    |  2 +-
 tests/adventofcode2019/test_day17_a.py    |  2 +-
 52 files changed, 71 insertions(+), 77 deletions(-)

diff --git a/src/adventofcode2019/solutions/day03.py b/src/adventofcode2019/solutions/day03.py
index 4e19f351..e46b011f 100644
--- a/src/adventofcode2019/solutions/day03.py
+++ b/src/adventofcode2019/solutions/day03.py
@@ -67,18 +67,18 @@ def create_line(input_str: str) -> List[Point]:
         return points
 
     def create_lines(self, input_lines: str):
-        """ Create the lines and add them to the internal lines list """
+        """Create the lines and add them to the internal lines list"""
         self.lines = []
         for line in input_lines.splitlines():
             self.lines.append(self.create_line(line))
 
     def find_duplicates(self):
-        """ Find duplicates points in the internal lines list.  """
+        """Find duplicates points in the internal lines list."""
         common = list(set(self.lines[0]).intersection(self.lines[1]))
         return common
 
     def find_closest_point(self):
-        """ Return the discance to the closest points in steps to reach it """
+        """Return the discance to the closest points in steps to reach it"""
         duplicates = self.find_duplicates()
         # Get all the points, that are in
         total_distance = []
diff --git a/src/adventofcode2019/solutions/day04.py b/src/adventofcode2019/solutions/day04.py
index ea6c0bea..25fa0660 100644
--- a/src/adventofcode2019/solutions/day04.py
+++ b/src/adventofcode2019/solutions/day04.py
@@ -22,7 +22,7 @@ def is_consecutive(number_str: str) -> bool:
 
     @staticmethod
     def is_consecutive_no_larger_group(number_str: str) -> bool:
-        """ Check for values, if there is any there is any double digit, success """
+        """Check for values, if there is any there is any double digit, success"""
         for x in str(number_str):
             if str(number_str).count(x) == 2:
                 return True
diff --git a/src/adventofcode2019/solutions/day06.py b/src/adventofcode2019/solutions/day06.py
index 7f5ff92a..3184b7ec 100644
--- a/src/adventofcode2019/solutions/day06.py
+++ b/src/adventofcode2019/solutions/day06.py
@@ -40,7 +40,7 @@ def create_nodes(self, orbits):
             raise ValueError("Too much roots! Found: {len(self.root_node)}")
 
     def find_distance_between_nodes(self, node_from: str, node_to: str) -> int:
-        """ Find the distance between nodes """
+        """Find the distance between nodes"""
         # We are on the node we want to compute from, so we start with our parent
         from_node = self.nodes[node_from].parent
         to_node = self.nodes[node_to].parent
diff --git a/src/adventofcode2019/solutions/day07.py b/src/adventofcode2019/solutions/day07.py
index a5436207..beca31c4 100644
--- a/src/adventofcode2019/solutions/day07.py
+++ b/src/adventofcode2019/solutions/day07.py
@@ -44,7 +44,7 @@ def compute_results_for_looped_sequence(
     def get_best_looped_sequence(
         self, start, stop, instructions: List[int]
     ) -> Tuple[str, int]:
-        """ Get the sequence with the best output """
+        """Get the sequence with the best output"""
         # Generate all the options
         # We loop because we have 10 computers,
         max_result = -1
diff --git a/src/adventofcode2019/solutions/day08.py b/src/adventofcode2019/solutions/day08.py
index bc95aa3c..545e5347 100644
--- a/src/adventofcode2019/solutions/day08.py
+++ b/src/adventofcode2019/solutions/day08.py
@@ -9,7 +9,7 @@ class Day08:
     height = 0
 
     def load_image(self, image_data: str, width: int, height: int):
-        """ Load an image from `image_data`, with `width` and `height` dimensions"""
+        """Load an image from `image_data`, with `width` and `height` dimensions"""
         frame_size = width * height
         self.frames = [
             image_data[i : i + frame_size]
@@ -20,12 +20,12 @@ def load_image(self, image_data: str, width: int, height: int):
         self.height = height
 
     def count_number_per_frame(self, number: int, frame: int) -> int:
-        """ Count the number of times `number` is in frame `frame """
+        """Count the number of times `number` is in frame `frame"""
         needle = str(number)
         return self.frames[frame].count(needle)
 
     def layer_with_fewest_digit(self, number_to_find: int):
-        """ Find the layer with the fewest corrences of `number_to_find` """
+        """Find the layer with the fewest corrences of `number_to_find`"""
         found = {}
         for x in range(0, len(self.frames)):
             found[x] = self.count_number_per_frame(number=number_to_find, frame=x)
@@ -41,7 +41,7 @@ def _compute_per_pixel(pixels: List[int]) -> int:
         return 0
 
     def get_computed_image(self):
-        """ Compute the image"""
+        """Compute the image"""
         resulting_image = []
         for x in range(0, len(self.frames[0])):
             pixels = [int(frame[x]) for frame in self.frames]
diff --git a/src/adventofcode2019/solutions/day10.py b/src/adventofcode2019/solutions/day10.py
index 686c6ed9..f245fc30 100644
--- a/src/adventofcode2019/solutions/day10.py
+++ b/src/adventofcode2019/solutions/day10.py
@@ -21,7 +21,7 @@ class Day10:
     astroids_destroyed: List[Astroid]
 
     def create_map(self, input_data: str):
-        """ Create a map from input_data. """
+        """Create a map from input_data."""
         self.astroids = []
         self.astroids_destroyed = []
         for y, line in enumerate(input_data.splitlines()):
@@ -33,7 +33,7 @@ def create_map(self, input_data: str):
 
     @staticmethod
     def _get_angle(astroid_1: Astroid, astroid_2: Astroid) -> float:
-        """ Compute the angle between two Astroids in degrees """
+        """Compute the angle between two Astroids in degrees"""
         dx = astroid_1.x - astroid_2.x
         dy = astroid_1.y - astroid_2.y
 
@@ -43,7 +43,7 @@ def _get_angle(astroid_1: Astroid, astroid_2: Astroid) -> float:
 
     @staticmethod
     def _get_distance(astroid_1: Astroid, astroid_2: Astroid) -> float:
-        """ Compute the distance between two Astroids """
+        """Compute the distance between two Astroids"""
         a, b = astroid_1.x, astroid_1.y
         x, y = astroid_2.x, astroid_2.y
         euclidean_distance = math.sqrt((a - x) ** 2 + (b - y) ** 2)
@@ -73,7 +73,7 @@ def find_best_spot(self) -> int:
         return self.get_best_astroid()[1]
 
     def get_best_astroid(self) -> Tuple[Astroid, int]:
-        """ Return the best astroid location and the number of visable astroids"""
+        """Return the best astroid location and the number of visable astroids"""
         locations = {
             astroid: self.count_asteroids_for_location(astroid.x, astroid.y)
             for astroid in self.astroids
@@ -82,7 +82,7 @@ def get_best_astroid(self) -> Tuple[Astroid, int]:
         return best_astroid, locations[best_astroid]
 
     def calculate_angles(self, location: Astroid):
-        """ Create a dict with all the angles for the asteroids and the distance"""
+        """Create a dict with all the angles for the asteroids and the distance"""
         angles: Dict[float, List] = defaultdict(list)
         for astroid in self.astroids:
             angle = self._get_angle(location, astroid)
@@ -92,7 +92,7 @@ def calculate_angles(self, location: Astroid):
         return angles
 
     def remove_astroid(self, location: Astroid, n=200):
-        """ Shoot until we have reached `n` targets"""
+        """Shoot until we have reached `n` targets"""
         angle_information = self.calculate_angles(location)
         sorted_angles = sorted(angle_information)
 
diff --git a/src/adventofcode2019/solutions/day11.py b/src/adventofcode2019/solutions/day11.py
index a17fbc14..c3213fd8 100644
--- a/src/adventofcode2019/solutions/day11.py
+++ b/src/adventofcode2019/solutions/day11.py
@@ -128,7 +128,7 @@ def solve(self, input_data: str) -> int:
 
 class Day11PartB(Day11, FileReaderSolution):
     def plot_grid(self):
-        """ Plot the grid using matplotlib"""
+        """Plot the grid using matplotlib"""
         x_points = [point.x for point, color in self.hull.items()]
         y_points = [point.y for point, color in self.hull.items()]
         min_x = min(x_points)
@@ -143,7 +143,7 @@ def plot_grid(self):
         plt.show()
 
     def show(self):
-        """ Plot the grid using Ascii"""
+        """Plot the grid using Ascii"""
         positions = [
             (point.x, point.y) for point, color in self.hull.items() if color == 1
         ]
diff --git a/src/adventofcode2019/solutions/day12.py b/src/adventofcode2019/solutions/day12.py
index 38961c36..39d3fc94 100644
--- a/src/adventofcode2019/solutions/day12.py
+++ b/src/adventofcode2019/solutions/day12.py
@@ -40,7 +40,7 @@ def __eq__(self, other) -> bool:
         )
 
     def apply_movement(self):
-        """ Move the Moon according to the internal speeds """
+        """Move the Moon according to the internal speeds"""
         self.x += self.dx
         self.y += self.dy
         self.z += self.dz
@@ -99,7 +99,7 @@ def create_moons(self, input_str: str):
 
     @staticmethod
     def apply_gravity(moon1: Moon, moon2: Moon):
-        """ Apply gravity to two pairs of moons. """
+        """Apply gravity to two pairs of moons."""
         for attribute in ("x", "y", "z"):
             dxattribute = f"d{attribute}"
             a1 = getattr(moon1, attribute)
@@ -116,7 +116,7 @@ def apply_gravity(moon1: Moon, moon2: Moon):
                 setattr(moon2, dxattribute, dxa2 + 1)
 
     def step(self):
-        """ Step thru our system, one step at a time """
+        """Step thru our system, one step at a time"""
         # Look over two pairs of moons
         for pair in combinations(self.moons, 2):
             self.apply_gravity(pair[0], pair[1])
@@ -126,12 +126,12 @@ def step(self):
             moon.apply_movement()
 
     def step_multi(self, n: int):
-        """ Do `n` steps """
+        """Do `n` steps"""
         for _ in range(n):
             self.step()
 
     def get_total_energy(self) -> int:
-        """ Return the total energy of all the Moons in the system"""
+        """Return the total energy of all the Moons in the system"""
         return sum(moon.get_total_energy() for moon in self.moons)
 
 
@@ -150,7 +150,7 @@ def solve(self, input_data: str) -> int:
 class Day12PartB(Day12, FileReaderSolution):
     @staticmethod
     def return_one_var(galaxy: Galaxy, var: str) -> Tuple[int, ...]:
-        """ Create a tuple with the Position and Velocity values for `var` """
+        """Create a tuple with the Position and Velocity values for `var`"""
         vardx = f"d{var}"
         values = tuple([getattr(moon, var) for moon in galaxy.moons]) + tuple(
             [getattr(moon, vardx) for moon in galaxy.moons]
diff --git a/src/adventofcode2019/solutions/day13.py b/src/adventofcode2019/solutions/day13.py
index 8741afcd..524e4f1b 100644
--- a/src/adventofcode2019/solutions/day13.py
+++ b/src/adventofcode2019/solutions/day13.py
@@ -56,7 +56,7 @@ def show_screen(self):
         return "\n".join(grid)
 
     def draw_tile(self, x: int, y: int, tile: Tile) -> None:
-        """ Draw a single tile """
+        """Draw a single tile"""
         self.screen[(x, y)] = tile
 
     def get_location_for_tiles(self, type: Tile) -> List:
diff --git a/src/adventofcode2019/solutions/day14.py b/src/adventofcode2019/solutions/day14.py
index 0bbfda2f..b6f5e18e 100644
--- a/src/adventofcode2019/solutions/day14.py
+++ b/src/adventofcode2019/solutions/day14.py
@@ -133,14 +133,14 @@ def create_nodes(self) -> Node:
         return root_node
 
     def resolve_tree(self) -> List[Node]:
-        """ Resolve the tree and return a list of nodes in order to process them."""
+        """Resolve the tree and return a list of nodes in order to process them."""
         root_node = self.create_nodes()
         resolved: List[Node] = []
         self.dep_resolve(root_node, resolved, [])
         return resolved
 
     def ore_needed_for_n_fuel(self, n=1) -> int:
-        """ Compute how many ORE we need for `n` fuel object"""
+        """Compute how many ORE we need for `n` fuel object"""
         # Do a recursive from FUEL to ORE
         resolved = self.resolve_tree()
 
diff --git a/src/adventofcode2019/solutions/day15.py b/src/adventofcode2019/solutions/day15.py
index 2661190f..5c4ac95d 100644
--- a/src/adventofcode2019/solutions/day15.py
+++ b/src/adventofcode2019/solutions/day15.py
@@ -63,7 +63,7 @@ def show(tile):
 
 
 class Location:
-    """ Location / Pixel in the maze """
+    """Location / Pixel in the maze"""
 
     point: Point
     location_type: Optional[Tile]
diff --git a/src/adventofcode2019/solutions/day17.py b/src/adventofcode2019/solutions/day17.py
index 849add16..99d8fc3b 100644
--- a/src/adventofcode2019/solutions/day17.py
+++ b/src/adventofcode2019/solutions/day17.py
@@ -35,7 +35,7 @@ def run_bot(self, input_data: str) -> Dict[int, Dict[int, int]]:
 
     @staticmethod
     def compute_points(grid_lines):
-        """ Compute the points in the grid"""
+        """Compute the points in the grid"""
         # First we will make a 2d array
         match = ord("#")
         matches = []
diff --git a/src/adventofcode2019/solutions/infi.py b/src/adventofcode2019/solutions/infi.py
index c3b701b8..48e5e217 100644
--- a/src/adventofcode2019/solutions/infi.py
+++ b/src/adventofcode2019/solutions/infi.py
@@ -33,7 +33,7 @@ def __init__(self, filename: str = "info.json"):
         self._load_data()
 
     def _load_data(self):
-        """ Open the file and parse the json data inside the file """
+        """Open the file and parse the json data inside the file"""
         root_dir = Path(__file__).parent.parent
         # with open(root_dir / "solutions" / "data" / input_file) as f:
 
diff --git a/src/adventofcode2019/solutions/intcode.py b/src/adventofcode2019/solutions/intcode.py
index 40432c33..f96df4af 100644
--- a/src/adventofcode2019/solutions/intcode.py
+++ b/src/adventofcode2019/solutions/intcode.py
@@ -62,7 +62,7 @@ def load(self, load_data: str):
             self.instructions[int(location)] = int(value)
 
     def save(self) -> str:
-        """ Save the state as a json string """
+        """Save the state as a json string"""
         data = {
             "program_counter": self.program_counter,
             "relative_base": self.relative_base,
@@ -165,7 +165,7 @@ def _get_store_position(self, position_mode: int, position: int) -> int:
             raise ValueError(f"Not supported {position_mode=}")
 
     def process_instruction(self):
-        """ Process the current instruction and increase the program counter"""
+        """Process the current instruction and increase the program counter"""
         (current_opcode, position_modes) = self._parse_current_opcode()
         val_1 = self._get_value_from_location(position_modes[0], 1)
         val_2 = self._get_value_from_location(position_modes[1], 2)
diff --git a/src/adventofcode2020/solutions/day02.py b/src/adventofcode2020/solutions/day02.py
index f70a4626..27594ed6 100644
--- a/src/adventofcode2020/solutions/day02.py
+++ b/src/adventofcode2020/solutions/day02.py
@@ -51,7 +51,6 @@ def validate_passwords(self, policy: PassPol) -> bool:
         return True
 
     def solve(self, input_data: str) -> int:
-
         password_list = [
             self.split(x.strip()) for x in input_data.split("\n") if len(x.strip()) >= 1
         ]
diff --git a/src/adventofcode2020/solutions/day04.py b/src/adventofcode2020/solutions/day04.py
index 5a457de2..c0365915 100644
--- a/src/adventofcode2020/solutions/day04.py
+++ b/src/adventofcode2020/solutions/day04.py
@@ -5,7 +5,6 @@
 
 
 class RequiredFields(Enum):
-
     byr = "Birth Year"
     iyr = "Issue Year"
     eyr = "Expiration Year"
diff --git a/src/adventofcode2020/solutions/day09.py b/src/adventofcode2020/solutions/day09.py
index 98b372e8..1a11945f 100644
--- a/src/adventofcode2020/solutions/day09.py
+++ b/src/adventofcode2020/solutions/day09.py
@@ -36,7 +36,6 @@ def find_slice(self, integers: List[int], num_to_find: int) -> int:
             for bottom in range(top, len(integers)):
                 total = sum(integers[top:bottom])
                 if total == num_to_find:
-
                     # Add the largest and smallest number
                     cont_range = integers[top:bottom]
                     return max(cont_range) + min(cont_range)
diff --git a/src/adventofcode2020/solutions/day10.py b/src/adventofcode2020/solutions/day10.py
index 404f0771..e99ede15 100644
--- a/src/adventofcode2020/solutions/day10.py
+++ b/src/adventofcode2020/solutions/day10.py
@@ -26,7 +26,6 @@ def find_diferences(self, joltages: deque) -> typing.Counter:
         return differences
 
     def find_combinations(self, joltages: List[int]) -> int:
-
         connections = {joltages[-1]: 1}
 
         for adapter in reversed(joltages[:-1]):
diff --git a/src/adventofcode2020/solutions/day12.py b/src/adventofcode2020/solutions/day12.py
index d230ace0..77e3aad1 100644
--- a/src/adventofcode2020/solutions/day12.py
+++ b/src/adventofcode2020/solutions/day12.py
@@ -124,7 +124,6 @@ def parse_instructions(self, instructions: List[Instruction]):
                 raise ValueError(f"Unknown action {action}")
 
     def solve(self, input_data: str) -> int:
-
         instructions = [
             Instruction.from_str(input_str.strip())
             for input_str in input_data.splitlines()
diff --git a/tests/adventofcode2019/test_day01_a.py b/tests/adventofcode2019/test_day01_a.py
index 34f59713..aa5ae42b 100644
--- a/tests/adventofcode2019/test_day01_a.py
+++ b/tests/adventofcode2019/test_day01_a.py
@@ -14,7 +14,7 @@ def test_day01a_solve(self, input_data, expected_result):
         assert result == expected_result
 
     def test_day01a_data(self):
-        """ Result we got when we did the real solution """
+        """Result we got when we did the real solution"""
         solution = Day01PartA()
         res = solution("day_01/day01.txt")
         assert res == 3465245
diff --git a/tests/adventofcode2019/test_day01_b.py b/tests/adventofcode2019/test_day01_b.py
index a24b0e40..a0516323 100644
--- a/tests/adventofcode2019/test_day01_b.py
+++ b/tests/adventofcode2019/test_day01_b.py
@@ -14,7 +14,7 @@ def test_day01b_solve_module(self, input_data, expected_result):
         assert result == expected_result
 
     def test_day01b_data(self):
-        """ Result we got when we did the real solution """
+        """Result we got when we did the real solution"""
         solution = Day01PartB()
         res = solution("day_01/day01.txt")
         assert res == 5194970
diff --git a/tests/adventofcode2019/test_day02_a.py b/tests/adventofcode2019/test_day02_a.py
index c174dc70..08d72a5e 100644
--- a/tests/adventofcode2019/test_day02_a.py
+++ b/tests/adventofcode2019/test_day02_a.py
@@ -23,7 +23,7 @@ def test_day02a_solve(self, input_data, expected_result):
         assert result == expected_result
 
     def test_day02a_data(self):
-        """ Result we got when we did the real solution """
+        """Result we got when we did the real solution"""
         solution = Day02PartA()
         res = solution("day_02/day02.txt")
         assert res == 3306701
diff --git a/tests/adventofcode2019/test_day02_b.py b/tests/adventofcode2019/test_day02_b.py
index a18e05a6..d410f5c4 100644
--- a/tests/adventofcode2019/test_day02_b.py
+++ b/tests/adventofcode2019/test_day02_b.py
@@ -3,7 +3,7 @@
 
 class TestDay02PartB:
     def test_day02b_data(self):
-        """ Result we got when we did the real solution """
+        """Result we got when we did the real solution"""
         solution = Day02PartB()
         res = solution("day_02/day02.txt")
         assert res == 7621
diff --git a/tests/adventofcode2019/test_day03_a.py b/tests/adventofcode2019/test_day03_a.py
index 0a50cad6..2900fb9d 100644
--- a/tests/adventofcode2019/test_day03_a.py
+++ b/tests/adventofcode2019/test_day03_a.py
@@ -42,7 +42,7 @@ def test_day03a_solve(self, input_data, expected_result):
         assert result == expected_result
 
     def test_day03a_data(self):
-        """ Result we got when we did the real solution """
+        """Result we got when we did the real solution"""
         solution = Day03PartA()
         res = solution("day_03/day03.txt")
         assert res == 8015
diff --git a/tests/adventofcode2019/test_day03_b.py b/tests/adventofcode2019/test_day03_b.py
index b2e5a383..3d66ec1a 100644
--- a/tests/adventofcode2019/test_day03_b.py
+++ b/tests/adventofcode2019/test_day03_b.py
@@ -26,7 +26,7 @@ def test_day03b_solve(self, input_data, expected_result):
         assert result == expected_result
 
     def test_day03b_data(self):
-        """ Result we got when we did the real solution """
+        """Result we got when we did the real solution"""
         solution = Day03PartB()
         res = solution("day_03/day03.txt")
         assert res == 163676
diff --git a/tests/adventofcode2019/test_day04_a.py b/tests/adventofcode2019/test_day04_a.py
index 42a4d940..0e289724 100644
--- a/tests/adventofcode2019/test_day04_a.py
+++ b/tests/adventofcode2019/test_day04_a.py
@@ -14,7 +14,7 @@ def test_day04a_solve(self, input_data, expected_result):
         assert result == expected_result
 
     def test_day04a_data(self):
-        """ Result we got when we did the real solution """
+        """Result we got when we did the real solution"""
         solution = Day04PartA()
         res = solution("day_04/day04.txt")
         assert res != 246666
diff --git a/tests/adventofcode2019/test_day04_b.py b/tests/adventofcode2019/test_day04_b.py
index ff2a852a..271c52b1 100644
--- a/tests/adventofcode2019/test_day04_b.py
+++ b/tests/adventofcode2019/test_day04_b.py
@@ -22,7 +22,7 @@ def test_day04b_solve(self, input_data, expected_result):
         assert result == expected_result
 
     def test_day04b_data(self):
-        """ Result we got when we did the real solution """
+        """Result we got when we did the real solution"""
         solution = Day04PartB()
         res = solution("day_04/day04.txt")
         assert res != 453
diff --git a/tests/adventofcode2019/test_day05_a.py b/tests/adventofcode2019/test_day05_a.py
index 3b16217e..fb2c422d 100644
--- a/tests/adventofcode2019/test_day05_a.py
+++ b/tests/adventofcode2019/test_day05_a.py
@@ -18,7 +18,7 @@ def test_day05a_test_new(self, input_data, expected_result):
         assert solution.instructions == expected_result
 
     def test_day05a_data(self):
-        """ Result we got when we did the real solution """
+        """Result we got when we did the real solution"""
         solution = Day05PartA()
         res = solution("day_05/day05.txt")
         assert res == 9431221
diff --git a/tests/adventofcode2019/test_day05_b.py b/tests/adventofcode2019/test_day05_b.py
index f56b5381..1c74d286 100644
--- a/tests/adventofcode2019/test_day05_b.py
+++ b/tests/adventofcode2019/test_day05_b.py
@@ -55,7 +55,6 @@ def test_day05b_test_input_equal(self):
             [3, 12, 6, 12, 15, 1, 13, 14, 13, 4, 13, 99, -1, 0, 1, 9],  # Position Mode
             [3, 3, 1105, -1, 9, 1101, 0, 0, 12, 4, 12, 99, 1],  # Immediate mode
         ):
-
             solution.load_instructions(data)
             solution.load_input_values([0])
             res = solution.run()
@@ -95,7 +94,7 @@ def test_day05b_larger_example(self, input_value, exoected_output_value):
         assert res == exoected_output_value
 
     def test_day05b_data(self):
-        """ Result we got when we did the real solution """
+        """Result we got when we did the real solution"""
         solution = Day05PartB()
         res = solution("day_05/day05.txt")
         assert res == 1409363
diff --git a/tests/adventofcode2019/test_day06_a.py b/tests/adventofcode2019/test_day06_a.py
index d612a8f4..46217f9e 100644
--- a/tests/adventofcode2019/test_day06_a.py
+++ b/tests/adventofcode2019/test_day06_a.py
@@ -33,7 +33,7 @@ def test_day06a_solve(self, input_data, expected_result):
         assert result == expected_result
 
     def test_day06a_data(self):
-        """ Result we got when we did the real solution """
+        """Result we got when we did the real solution"""
         solution = Day06PartA()
         res = solution("day_06/day06.txt")
         assert res != 1606
diff --git a/tests/adventofcode2019/test_day06_b.py b/tests/adventofcode2019/test_day06_b.py
index 3b394123..2bc674a5 100644
--- a/tests/adventofcode2019/test_day06_b.py
+++ b/tests/adventofcode2019/test_day06_b.py
@@ -35,7 +35,7 @@ def test_day06b_solve(self, input_data, expected_result):
         assert result == expected_result
 
     def test_day06b_data(self):
-        """ Result we got when we did the real solution """
+        """Result we got when we did the real solution"""
         solution = Day06PartB()
         res = solution("day_06/day06.txt")
         assert res == 322
diff --git a/tests/adventofcode2019/test_day07_a.py b/tests/adventofcode2019/test_day07_a.py
index 29e8bfcb..7b18d50a 100644
--- a/tests/adventofcode2019/test_day07_a.py
+++ b/tests/adventofcode2019/test_day07_a.py
@@ -38,7 +38,7 @@ def test_day07a_solve(self, instructions, expected_sequence, expected_thrust):
         assert thrust == expected_thrust
 
     def test_day07a_data(self):
-        """ Result we got when we did the real solution """
+        """Result we got when we did the real solution"""
         solution = Day07PartA()
         res = solution("day_07/day07.txt")
         assert res == 929800
diff --git a/tests/adventofcode2019/test_day07_b.py b/tests/adventofcode2019/test_day07_b.py
index 912e436c..4e910e3d 100644
--- a/tests/adventofcode2019/test_day07_b.py
+++ b/tests/adventofcode2019/test_day07_b.py
@@ -30,7 +30,7 @@ def test_day07b_solve(self, instructions, expected_sequence, expected_thrust):
         assert thrust == expected_thrust
 
     def test_day07b_data(self):
-        """ Result we got when we did the real solution """
+        """Result we got when we did the real solution"""
         solution = Day07PartB()
         res = solution("day_07/day07.txt")
         assert res == 15432220
diff --git a/tests/adventofcode2019/test_day08_a.py b/tests/adventofcode2019/test_day08_a.py
index 7b8c310a..81e6f6de 100644
--- a/tests/adventofcode2019/test_day08_a.py
+++ b/tests/adventofcode2019/test_day08_a.py
@@ -3,7 +3,7 @@
 
 class TestDay08PartA:
     def test_get_digits_per_layer(self):
-        """ Get the number of digits per layer"""
+        """Get the number of digits per layer"""
         solution = Day08PartA()
         solution.load_image(image_data="123456789012", width=3, height=2)
         assert solution.frames[0] == "123456"
@@ -14,7 +14,7 @@ def test_get_digits_per_layer(self):
         assert solution.count_number_per_frame(number=9, frame=0) == 0
 
     def test_layer_with_fewest_digit(self):
-        """ Get the number of digits per layer"""
+        """Get the number of digits per layer"""
         solution = Day08PartA()
 
         solution.load_image(image_data="123451789012134161", width=3, height=2)
@@ -26,7 +26,7 @@ def test_layer_with_fewest_digit(self):
         assert solution.layer_with_fewest_digit(3) == 1
 
     def test_day08a_data(self):
-        """ Result we got when we did the real solution """
+        """Result we got when we did the real solution"""
         solution = Day08PartA()
         res = solution("day_08/day08.txt")
         assert res == 2904
diff --git a/tests/adventofcode2019/test_day08_b.py b/tests/adventofcode2019/test_day08_b.py
index baed23c3..6e91b6c1 100644
--- a/tests/adventofcode2019/test_day08_b.py
+++ b/tests/adventofcode2019/test_day08_b.py
@@ -13,7 +13,7 @@ def test_compute_per_pixel(self, input_list, expected_result):
         assert result == expected_result
 
     def test_compose_image(self):
-        """ Get the number of digits per layer"""
+        """Get the number of digits per layer"""
         solution = Day08PartB()
         solution.load_image(image_data="0222112222120000", width=2, height=2)
         assert len(solution.frames) == 4
@@ -24,7 +24,7 @@ def test_compose_image(self):
         assert solution.printable_image(result) == "01\n10"
 
     def test_day08a_data(self):
-        """ Result we got when we did the real solution """
+        """Result we got when we did the real solution"""
         solution = Day08PartB()
         res = solution("day_08/day08.txt")
         expected = (
diff --git a/tests/adventofcode2019/test_day09_a.py b/tests/adventofcode2019/test_day09_a.py
index d0fa605a..53d4c5b4 100644
--- a/tests/adventofcode2019/test_day09_a.py
+++ b/tests/adventofcode2019/test_day09_a.py
@@ -4,7 +4,7 @@
 
 class TestDay09PartA:
     def test_day09a_replicating_opcode(self):
-        """ takes no input and produces a copy of itself as output."""
+        """takes no input and produces a copy of itself as output."""
         instructions = "109,1,204,-1,1001,100,1,100,1008,100,16,101,1006,101,0,99"
         opcodes = [int(digit) for digit in instructions.split(",")]
         intcode = IntCode()
@@ -13,7 +13,7 @@ def test_day09a_replicating_opcode(self):
         assert result == opcodes
 
     def test_day09a_16_digits(self):
-        """ should output a 16-digit number."""
+        """should output a 16-digit number."""
         instructions = "1102,34915192,34915192,7,4,7,99,0"
         opcodes = [int(digit) for digit in instructions.split(",")]
         intcode = IntCode()
@@ -22,7 +22,7 @@ def test_day09a_16_digits(self):
         assert len(str(result)) == 16
 
     def test_day09a_output_large_number(self):
-        """  should output the large number in the middle. """
+        """should output the large number in the middle."""
         instructions = "104,1125899906842624,99"
         opcodes = [int(digit) for digit in instructions.split(",")]
         intcode = IntCode()
@@ -31,7 +31,7 @@ def test_day09a_output_large_number(self):
         assert result == opcodes[1]
 
     def test_day09a_data(self):
-        """ Result we got when we did the real solution """
+        """Result we got when we did the real solution"""
         solution = Day09PartA()
         res = solution("day_09/day09.txt")
         assert res != 203
diff --git a/tests/adventofcode2019/test_day09_b.py b/tests/adventofcode2019/test_day09_b.py
index 0f3bf1f4..204566fb 100644
--- a/tests/adventofcode2019/test_day09_b.py
+++ b/tests/adventofcode2019/test_day09_b.py
@@ -3,7 +3,7 @@
 
 class TestDay09PartB:
     def test_day09b_data(self):
-        """ Result we got when we did the real solution """
+        """Result we got when we did the real solution"""
         solution = Day09PartB()
         res = solution("day_09/day09.txt")
         assert res == 78831
diff --git a/tests/adventofcode2019/test_day10_a.py b/tests/adventofcode2019/test_day10_a.py
index 700cead5..54e1d3f2 100644
--- a/tests/adventofcode2019/test_day10_a.py
+++ b/tests/adventofcode2019/test_day10_a.py
@@ -78,7 +78,7 @@ def test_day10a_solve(self, input_data, best_location, expected_result):
         assert best_astroid == Astroid(x=best_location[0], y=best_location[1])
 
     def test_day10a_data(self):
-        """ Result we got when we did the real solution """
+        """Result we got when we did the real solution"""
         solution = Day10PartA()
         res = solution("day_10/day10.txt")
         assert res == 319
diff --git a/tests/adventofcode2019/test_day10_b.py b/tests/adventofcode2019/test_day10_b.py
index 74e490b7..3bcdfa80 100644
--- a/tests/adventofcode2019/test_day10_b.py
+++ b/tests/adventofcode2019/test_day10_b.py
@@ -74,7 +74,7 @@ def test_day10b_big_map(self):
         assert solution.astroids_destroyed[199] == Astroid(8, 2)  # 200th
 
     def test_day10b_data(self):
-        """ Result we got when we did the real solution """
+        """Result we got when we did the real solution"""
         solution = Day10PartB()
         res = solution("day_10/day10.txt")
         assert res == 517
diff --git a/tests/adventofcode2019/test_day11_a.py b/tests/adventofcode2019/test_day11_a.py
index 91c45a16..884a29da 100644
--- a/tests/adventofcode2019/test_day11_a.py
+++ b/tests/adventofcode2019/test_day11_a.py
@@ -22,7 +22,7 @@ def test_direction(self):
         assert direction == Direction.LEFT
 
     def test_day11a_data(self):
-        """ Result we got when we did the real solution """
+        """Result we got when we did the real solution"""
         solution = Day11PartA()
         res = solution("day_11/day11.txt")
         assert res != 10601
diff --git a/tests/adventofcode2019/test_day11_b.py b/tests/adventofcode2019/test_day11_b.py
index bced5fc9..5abe4cdc 100644
--- a/tests/adventofcode2019/test_day11_b.py
+++ b/tests/adventofcode2019/test_day11_b.py
@@ -3,7 +3,7 @@
 
 class TestDay11PartB:
     def test_day11b_data(self):
-        """ Result we got when we did the real solution """
+        """Result we got when we did the real solution"""
         solution = Day11PartB()
         res = solution("day_11/day11.txt")
         output = [
diff --git a/tests/adventofcode2019/test_day12_a.py b/tests/adventofcode2019/test_day12_a.py
index a05c4503..b81e00f6 100644
--- a/tests/adventofcode2019/test_day12_a.py
+++ b/tests/adventofcode2019/test_day12_a.py
@@ -53,7 +53,7 @@ def test_creation(self):
         assert galaxy.get_total_energy() == 179
 
     def test_day12a_data(self):
-        """ Result we got when we did the real solution """
+        """Result we got when we did the real solution"""
         solution = Day12PartA()
         res = solution("day_12/day12.txt")
         assert res == 5350
diff --git a/tests/adventofcode2019/test_day12_b.py b/tests/adventofcode2019/test_day12_b.py
index 41595de1..c7b32789 100644
--- a/tests/adventofcode2019/test_day12_b.py
+++ b/tests/adventofcode2019/test_day12_b.py
@@ -34,7 +34,7 @@ def test_day12b_solve(self, input_data, expected_result):
         assert result == expected_result
 
     def test_day12b_data(self):
-        """ Result we got when we did the real solution """
+        """Result we got when we did the real solution"""
         solution = Day12PartB()
         res = solution("day_12/day12.txt")
         assert res == 467034091553512
diff --git a/tests/adventofcode2019/test_day13_a.py b/tests/adventofcode2019/test_day13_a.py
index bfc89cf5..174b6633 100644
--- a/tests/adventofcode2019/test_day13_a.py
+++ b/tests/adventofcode2019/test_day13_a.py
@@ -3,7 +3,7 @@
 
 class TestDay13PartA:
     def test_day13a_data(self):
-        """ Result we got when we did the real solution """
+        """Result we got when we did the real solution"""
         solution = Day13PartA()
         res = solution("day_13/day13.txt")
         assert res == 205
diff --git a/tests/adventofcode2019/test_day13_b.py b/tests/adventofcode2019/test_day13_b.py
index b9eccf10..42f2bdfb 100644
--- a/tests/adventofcode2019/test_day13_b.py
+++ b/tests/adventofcode2019/test_day13_b.py
@@ -3,7 +3,7 @@
 
 class TestDay13PartB:
     def test_day13b_data(self):
-        """ Result we got when we did the real solution """
+        """Result we got when we did the real solution"""
         solution = Day13PartB()
         res = solution("day_13/day13.txt")
         assert res == 10292
diff --git a/tests/adventofcode2019/test_day14_a.py b/tests/adventofcode2019/test_day14_a.py
index 238a92f4..b058890e 100644
--- a/tests/adventofcode2019/test_day14_a.py
+++ b/tests/adventofcode2019/test_day14_a.py
@@ -99,7 +99,7 @@ def test_day14a_solve(self, input_data, expected_result):
         assert result == expected_result
 
     def test_day14a_data(self):
-        """ Result we got when we did the real solution """
+        """Result we got when we did the real solution"""
         solution = Day14PartA()
         res = solution("day_14/day14.txt")
         assert res == 1065255
diff --git a/tests/adventofcode2019/test_day14_b.py b/tests/adventofcode2019/test_day14_b.py
index fd68bcf5..7cc9117f 100644
--- a/tests/adventofcode2019/test_day14_b.py
+++ b/tests/adventofcode2019/test_day14_b.py
@@ -71,7 +71,7 @@ def test_day14b_solve(self, input_data, expected_result):
         assert result == expected_result
 
     def test_day14b_data(self):
-        """ Result we got when we did the real solution """
+        """Result we got when we did the real solution"""
         solution = Day14PartB()
         res = solution("day_14/day14.txt")
         assert res != 1766155
diff --git a/tests/adventofcode2019/test_day15_a.py b/tests/adventofcode2019/test_day15_a.py
index 4becdd59..bf5df2c7 100644
--- a/tests/adventofcode2019/test_day15_a.py
+++ b/tests/adventofcode2019/test_day15_a.py
@@ -3,7 +3,7 @@
 
 class TestDay15PartA:
     def test_day15a_data(self):
-        """ Result we got when we did the real solution """
+        """Result we got when we did the real solution"""
         solution = Day15PartA()
         res = solution("day_15/day15.txt")
         assert res == 228
diff --git a/tests/adventofcode2019/test_day15_b.py b/tests/adventofcode2019/test_day15_b.py
index a572bc70..fd4bdb20 100644
--- a/tests/adventofcode2019/test_day15_b.py
+++ b/tests/adventofcode2019/test_day15_b.py
@@ -50,7 +50,7 @@ def test_day15b_solve(self):
         assert result == 5
 
     def test_day15b_data(self):
-        """ Result we got when we did the real solution """
+        """Result we got when we did the real solution"""
         solution = Day15PartB()
         res = solution("day_15/day15.txt")
         assert res != 346
diff --git a/tests/adventofcode2019/test_day16_a.py b/tests/adventofcode2019/test_day16_a.py
index 6f6c1469..218b8027 100644
--- a/tests/adventofcode2019/test_day16_a.py
+++ b/tests/adventofcode2019/test_day16_a.py
@@ -40,7 +40,7 @@ def test_day16a_solve(self, input_data, expected_result):
         assert result == expected_result
 
     def test_day16a_data(self):
-        """ Result we got when we did the real solution """
+        """Result we got when we did the real solution"""
         solution = Day16PartA()
         res = solution("day_16/day16.txt")
         assert res == 28430146
diff --git a/tests/adventofcode2019/test_day16_b.py b/tests/adventofcode2019/test_day16_b.py
index fe3f690b..bfee32a4 100644
--- a/tests/adventofcode2019/test_day16_b.py
+++ b/tests/adventofcode2019/test_day16_b.py
@@ -18,7 +18,7 @@ def test_day16b_solve(self, input_data, expected_result):
         assert result == expected_result
 
     def test_day16b_data(self):
-        """ Result we got when we did the real solution """
+        """Result we got when we did the real solution"""
         solution = Day16PartB()
         res = solution("day_16/day16.txt")
         assert res != 36468541
diff --git a/tests/adventofcode2019/test_day17_a.py b/tests/adventofcode2019/test_day17_a.py
index 2d1d313c..533af461 100644
--- a/tests/adventofcode2019/test_day17_a.py
+++ b/tests/adventofcode2019/test_day17_a.py
@@ -62,7 +62,7 @@ def test_day17a_grid(self, capsys):
         assert score == 76
 
     def test_day17a_data(self):
-        """ Result we got when we did the real solution """
+        """Result we got when we did the real solution"""
         solution = Day17PartA()
         res = solution("day_17/day17.txt")
         assert res == 5056

From 9c12f7154f81aabb0cc925d6f86c0b8e9b5b275b Mon Sep 17 00:00:00 2001
From: Roel Adriaans <roel@adriaans.org>
Date: Sat, 18 Nov 2023 21:14:58 +0100
Subject: [PATCH 297/371] Update dependencies

---
 poetry.lock    | 559 ++++++++++++++++++++++++++-----------------------
 pyproject.toml |  16 +-
 2 files changed, 307 insertions(+), 268 deletions(-)

diff --git a/poetry.lock b/poetry.lock
index 704e1c8c..aa85f1c4 100644
--- a/poetry.lock
+++ b/poetry.lock
@@ -20,13 +20,13 @@ resolved_reference = "0a4b6b3060d281fa5b515348906736c328a70dfa"
 
 [[package]]
 name = "anytree"
-version = "2.9.0"
+version = "2.12.1"
 description = "Powerful and Lightweight Python Tree Data Structure with various plugins"
 optional = false
 python-versions = ">=3.7.2,<4"
 files = [
-    {file = "anytree-2.9.0-py3-none-any.whl", hash = "sha256:7f1ad0f9b225705b780ea0593c8ff52af05df9428e7cc34b9379b879fa462663"},
-    {file = "anytree-2.9.0.tar.gz", hash = "sha256:06f7bc294293da2755f4699cc5da5c92d9182a5cfae2842c83fb56f02bd427c8"},
+    {file = "anytree-2.12.1-py3-none-any.whl", hash = "sha256:5ea9e61caf96db1e5b3d0a914378d2cd83c269dfce1fb8242ce96589fa3382f0"},
+    {file = "anytree-2.12.1.tar.gz", hash = "sha256:244def434ccf31b668ed282954e5d315b4e066c4940b94aff4a7962d85947830"},
 ]
 
 [package.dependencies]
@@ -34,17 +34,22 @@ six = "*"
 
 [[package]]
 name = "arrow"
-version = "1.2.3"
+version = "1.3.0"
 description = "Better dates & times for Python"
 optional = false
-python-versions = ">=3.6"
+python-versions = ">=3.8"
 files = [
-    {file = "arrow-1.2.3-py3-none-any.whl", hash = "sha256:5a49ab92e3b7b71d96cd6bfcc4df14efefc9dfa96ea19045815914a6ab6b1fe2"},
-    {file = "arrow-1.2.3.tar.gz", hash = "sha256:3934b30ca1b9f292376d9db15b19446088d12ec58629bc3f0da28fd55fb633a1"},
+    {file = "arrow-1.3.0-py3-none-any.whl", hash = "sha256:c728b120ebc00eb84e01882a6f5e7927a53960aa990ce7dd2b10f39005a67f80"},
+    {file = "arrow-1.3.0.tar.gz", hash = "sha256:d4540617648cb5f895730f1ad8c82a65f2dad0166f57b75f3ca54759c4d67a85"},
 ]
 
 [package.dependencies]
 python-dateutil = ">=2.7.0"
+types-python-dateutil = ">=2.8.10"
+
+[package.extras]
+doc = ["doc8", "sphinx (>=7.0.0)", "sphinx-autobuild", "sphinx-autodoc-typehints", "sphinx_rtd_theme (>=1.3.0)"]
+test = ["dateparser (==1.*)", "pre-commit", "pytest", "pytest-cov", "pytest-mock", "pytz (==2021.1)", "simplejson (==3.*)"]
 
 [[package]]
 name = "attrs"
@@ -98,33 +103,29 @@ chardet = ">=3.0.2"
 
 [[package]]
 name = "black"
-version = "23.7.0"
+version = "23.11.0"
 description = "The uncompromising code formatter."
 optional = false
 python-versions = ">=3.8"
 files = [
-    {file = "black-23.7.0-cp310-cp310-macosx_10_16_arm64.whl", hash = "sha256:5c4bc552ab52f6c1c506ccae05681fab58c3f72d59ae6e6639e8885e94fe2587"},
-    {file = "black-23.7.0-cp310-cp310-macosx_10_16_universal2.whl", hash = "sha256:552513d5cd5694590d7ef6f46e1767a4df9af168d449ff767b13b084c020e63f"},
-    {file = "black-23.7.0-cp310-cp310-macosx_10_16_x86_64.whl", hash = "sha256:86cee259349b4448adb4ef9b204bb4467aae74a386bce85d56ba4f5dc0da27be"},
-    {file = "black-23.7.0-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:501387a9edcb75d7ae8a4412bb8749900386eaef258f1aefab18adddea1936bc"},
-    {file = "black-23.7.0-cp310-cp310-win_amd64.whl", hash = "sha256:fb074d8b213749fa1d077d630db0d5f8cc3b2ae63587ad4116e8a436e9bbe995"},
-    {file = "black-23.7.0-cp311-cp311-macosx_10_16_arm64.whl", hash = "sha256:b5b0ee6d96b345a8b420100b7d71ebfdd19fab5e8301aff48ec270042cd40ac2"},
-    {file = "black-23.7.0-cp311-cp311-macosx_10_16_universal2.whl", hash = "sha256:893695a76b140881531062d48476ebe4a48f5d1e9388177e175d76234ca247cd"},
-    {file = "black-23.7.0-cp311-cp311-macosx_10_16_x86_64.whl", hash = "sha256:c333286dc3ddca6fdff74670b911cccedacb4ef0a60b34e491b8a67c833b343a"},
-    {file = "black-23.7.0-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:831d8f54c3a8c8cf55f64d0422ee875eecac26f5f649fb6c1df65316b67c8926"},
-    {file = "black-23.7.0-cp311-cp311-win_amd64.whl", hash = "sha256:7f3bf2dec7d541b4619b8ce526bda74a6b0bffc480a163fed32eb8b3c9aed8ad"},
-    {file = "black-23.7.0-cp38-cp38-macosx_10_16_arm64.whl", hash = "sha256:f9062af71c59c004cd519e2fb8f5d25d39e46d3af011b41ab43b9c74e27e236f"},
-    {file = "black-23.7.0-cp38-cp38-macosx_10_16_universal2.whl", hash = "sha256:01ede61aac8c154b55f35301fac3e730baf0c9cf8120f65a9cd61a81cfb4a0c3"},
-    {file = "black-23.7.0-cp38-cp38-macosx_10_16_x86_64.whl", hash = "sha256:327a8c2550ddc573b51e2c352adb88143464bb9d92c10416feb86b0f5aee5ff6"},
-    {file = "black-23.7.0-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:6d1c6022b86f83b632d06f2b02774134def5d4d4f1dac8bef16d90cda18ba28a"},
-    {file = "black-23.7.0-cp38-cp38-win_amd64.whl", hash = "sha256:27eb7a0c71604d5de083757fbdb245b1a4fae60e9596514c6ec497eb63f95320"},
-    {file = "black-23.7.0-cp39-cp39-macosx_10_16_arm64.whl", hash = "sha256:8417dbd2f57b5701492cd46edcecc4f9208dc75529bcf76c514864e48da867d9"},
-    {file = "black-23.7.0-cp39-cp39-macosx_10_16_universal2.whl", hash = "sha256:47e56d83aad53ca140da0af87678fb38e44fd6bc0af71eebab2d1f59b1acf1d3"},
-    {file = "black-23.7.0-cp39-cp39-macosx_10_16_x86_64.whl", hash = "sha256:25cc308838fe71f7065df53aedd20327969d05671bac95b38fdf37ebe70ac087"},
-    {file = "black-23.7.0-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:642496b675095d423f9b8448243336f8ec71c9d4d57ec17bf795b67f08132a91"},
-    {file = "black-23.7.0-cp39-cp39-win_amd64.whl", hash = "sha256:ad0014efc7acf0bd745792bd0d8857413652979200ab924fbf239062adc12491"},
-    {file = "black-23.7.0-py3-none-any.whl", hash = "sha256:9fd59d418c60c0348505f2ddf9609c1e1de8e7493eab96198fc89d9f865e7a96"},
-    {file = "black-23.7.0.tar.gz", hash = "sha256:022a582720b0d9480ed82576c920a8c1dde97cc38ff11d8d8859b3bd6ca9eedb"},
+    {file = "black-23.11.0-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:dbea0bb8575c6b6303cc65017b46351dc5953eea5c0a59d7b7e3a2d2f433a911"},
+    {file = "black-23.11.0-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:412f56bab20ac85927f3a959230331de5614aecda1ede14b373083f62ec24e6f"},
+    {file = "black-23.11.0-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:d136ef5b418c81660ad847efe0e55c58c8208b77a57a28a503a5f345ccf01394"},
+    {file = "black-23.11.0-cp310-cp310-win_amd64.whl", hash = "sha256:6c1cac07e64433f646a9a838cdc00c9768b3c362805afc3fce341af0e6a9ae9f"},
+    {file = "black-23.11.0-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:cf57719e581cfd48c4efe28543fea3d139c6b6f1238b3f0102a9c73992cbb479"},
+    {file = "black-23.11.0-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:698c1e0d5c43354ec5d6f4d914d0d553a9ada56c85415700b81dc90125aac244"},
+    {file = "black-23.11.0-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:760415ccc20f9e8747084169110ef75d545f3b0932ee21368f63ac0fee86b221"},
+    {file = "black-23.11.0-cp311-cp311-win_amd64.whl", hash = "sha256:58e5f4d08a205b11800332920e285bd25e1a75c54953e05502052738fe16b3b5"},
+    {file = "black-23.11.0-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:45aa1d4675964946e53ab81aeec7a37613c1cb71647b5394779e6efb79d6d187"},
+    {file = "black-23.11.0-cp38-cp38-macosx_11_0_arm64.whl", hash = "sha256:4c44b7211a3a0570cc097e81135faa5f261264f4dfaa22bd5ee2875a4e773bd6"},
+    {file = "black-23.11.0-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:2a9acad1451632021ee0d146c8765782a0c3846e0e0ea46659d7c4f89d9b212b"},
+    {file = "black-23.11.0-cp38-cp38-win_amd64.whl", hash = "sha256:fc7f6a44d52747e65a02558e1d807c82df1d66ffa80a601862040a43ec2e3142"},
+    {file = "black-23.11.0-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:7f622b6822f02bfaf2a5cd31fdb7cd86fcf33dab6ced5185c35f5db98260b055"},
+    {file = "black-23.11.0-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:250d7e60f323fcfc8ea6c800d5eba12f7967400eb6c2d21ae85ad31c204fb1f4"},
+    {file = "black-23.11.0-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:5133f5507007ba08d8b7b263c7aa0f931af5ba88a29beacc4b2dc23fcefe9c06"},
+    {file = "black-23.11.0-cp39-cp39-win_amd64.whl", hash = "sha256:421f3e44aa67138ab1b9bfbc22ee3780b22fa5b291e4db8ab7eee95200726b07"},
+    {file = "black-23.11.0-py3-none-any.whl", hash = "sha256:54caaa703227c6e0c87b76326d0862184729a69b73d3b7305b6288e1d830067e"},
+    {file = "black-23.11.0.tar.gz", hash = "sha256:4c68855825ff432d197229846f971bc4d6666ce90492e5b02013bcaca4d9ab05"},
 ]
 
 [package.dependencies]
@@ -142,24 +143,24 @@ uvloop = ["uvloop (>=0.15.2)"]
 
 [[package]]
 name = "cachetools"
-version = "5.3.1"
+version = "5.3.2"
 description = "Extensible memoizing collections and decorators"
 optional = false
 python-versions = ">=3.7"
 files = [
-    {file = "cachetools-5.3.1-py3-none-any.whl", hash = "sha256:95ef631eeaea14ba2e36f06437f36463aac3a096799e876ee55e5cdccb102590"},
-    {file = "cachetools-5.3.1.tar.gz", hash = "sha256:dce83f2d9b4e1f732a8cd44af8e8fab2dbe46201467fc98b3ef8f269092bf62b"},
+    {file = "cachetools-5.3.2-py3-none-any.whl", hash = "sha256:861f35a13a451f94e301ce2bec7cac63e881232ccce7ed67fab9b5df4d3beaa1"},
+    {file = "cachetools-5.3.2.tar.gz", hash = "sha256:086ee420196f7b2ab9ca2db2520aca326318b68fe5ba8bc4d49cca91add450f2"},
 ]
 
 [[package]]
 name = "certifi"
-version = "2023.7.22"
+version = "2023.11.17"
 description = "Python package for providing Mozilla's CA Bundle."
 optional = false
 python-versions = ">=3.6"
 files = [
-    {file = "certifi-2023.7.22-py3-none-any.whl", hash = "sha256:92d6037539857d8206b8f6ae472e8b77db8058fec5937a1ef3f54304089edbb9"},
-    {file = "certifi-2023.7.22.tar.gz", hash = "sha256:539cc1d13202e33ca466e88b2807e29f4c13049d6d87031a3c110744495cb082"},
+    {file = "certifi-2023.11.17-py3-none-any.whl", hash = "sha256:e036ab49d5b79556f99cfc2d9320b34cfbe5be05c5871b51de9329f0603b0474"},
+    {file = "certifi-2023.11.17.tar.gz", hash = "sha256:9b469f3a900bf28dc19b8cfbf8019bf47f7fdd1a65a1d4ffb98fc14166beb4d1"},
 ]
 
 [[package]]
@@ -186,86 +187,101 @@ files = [
 
 [[package]]
 name = "charset-normalizer"
-version = "3.2.0"
+version = "3.3.2"
 description = "The Real First Universal Charset Detector. Open, modern and actively maintained alternative to Chardet."
 optional = false
 python-versions = ">=3.7.0"
 files = [
-    {file = "charset-normalizer-3.2.0.tar.gz", hash = "sha256:3bb3d25a8e6c0aedd251753a79ae98a093c7e7b471faa3aa9a93a81431987ace"},
-    {file = "charset_normalizer-3.2.0-cp310-cp310-macosx_10_9_universal2.whl", hash = "sha256:0b87549028f680ca955556e3bd57013ab47474c3124dc069faa0b6545b6c9710"},
-    {file = "charset_normalizer-3.2.0-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:7c70087bfee18a42b4040bb9ec1ca15a08242cf5867c58726530bdf3945672ed"},
-    {file = "charset_normalizer-3.2.0-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:a103b3a7069b62f5d4890ae1b8f0597618f628b286b03d4bc9195230b154bfa9"},
-    {file = "charset_normalizer-3.2.0-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:94aea8eff76ee6d1cdacb07dd2123a68283cb5569e0250feab1240058f53b623"},
-    {file = "charset_normalizer-3.2.0-cp310-cp310-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:db901e2ac34c931d73054d9797383d0f8009991e723dab15109740a63e7f902a"},
-    {file = "charset_normalizer-3.2.0-cp310-cp310-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:b0dac0ff919ba34d4df1b6131f59ce95b08b9065233446be7e459f95554c0dc8"},
-    {file = "charset_normalizer-3.2.0-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:193cbc708ea3aca45e7221ae58f0fd63f933753a9bfb498a3b474878f12caaad"},
-    {file = "charset_normalizer-3.2.0-cp310-cp310-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:09393e1b2a9461950b1c9a45d5fd251dc7c6f228acab64da1c9c0165d9c7765c"},
-    {file = "charset_normalizer-3.2.0-cp310-cp310-musllinux_1_1_aarch64.whl", hash = "sha256:baacc6aee0b2ef6f3d308e197b5d7a81c0e70b06beae1f1fcacffdbd124fe0e3"},
-    {file = "charset_normalizer-3.2.0-cp310-cp310-musllinux_1_1_i686.whl", hash = "sha256:bf420121d4c8dce6b889f0e8e4ec0ca34b7f40186203f06a946fa0276ba54029"},
-    {file = "charset_normalizer-3.2.0-cp310-cp310-musllinux_1_1_ppc64le.whl", hash = "sha256:c04a46716adde8d927adb9457bbe39cf473e1e2c2f5d0a16ceb837e5d841ad4f"},
-    {file = "charset_normalizer-3.2.0-cp310-cp310-musllinux_1_1_s390x.whl", hash = "sha256:aaf63899c94de41fe3cf934601b0f7ccb6b428c6e4eeb80da72c58eab077b19a"},
-    {file = "charset_normalizer-3.2.0-cp310-cp310-musllinux_1_1_x86_64.whl", hash = "sha256:d62e51710986674142526ab9f78663ca2b0726066ae26b78b22e0f5e571238dd"},
-    {file = "charset_normalizer-3.2.0-cp310-cp310-win32.whl", hash = "sha256:04e57ab9fbf9607b77f7d057974694b4f6b142da9ed4a199859d9d4d5c63fe96"},
-    {file = "charset_normalizer-3.2.0-cp310-cp310-win_amd64.whl", hash = "sha256:48021783bdf96e3d6de03a6e39a1171ed5bd7e8bb93fc84cc649d11490f87cea"},
-    {file = "charset_normalizer-3.2.0-cp311-cp311-macosx_10_9_universal2.whl", hash = "sha256:4957669ef390f0e6719db3613ab3a7631e68424604a7b448f079bee145da6e09"},
-    {file = "charset_normalizer-3.2.0-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:46fb8c61d794b78ec7134a715a3e564aafc8f6b5e338417cb19fe9f57a5a9bf2"},
-    {file = "charset_normalizer-3.2.0-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:f779d3ad205f108d14e99bb3859aa7dd8e9c68874617c72354d7ecaec2a054ac"},
-    {file = "charset_normalizer-3.2.0-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:f25c229a6ba38a35ae6e25ca1264621cc25d4d38dca2942a7fce0b67a4efe918"},
-    {file = "charset_normalizer-3.2.0-cp311-cp311-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:2efb1bd13885392adfda4614c33d3b68dee4921fd0ac1d3988f8cbb7d589e72a"},
-    {file = "charset_normalizer-3.2.0-cp311-cp311-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:1f30b48dd7fa1474554b0b0f3fdfdd4c13b5c737a3c6284d3cdc424ec0ffff3a"},
-    {file = "charset_normalizer-3.2.0-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:246de67b99b6851627d945db38147d1b209a899311b1305dd84916f2b88526c6"},
-    {file = "charset_normalizer-3.2.0-cp311-cp311-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:9bd9b3b31adcb054116447ea22caa61a285d92e94d710aa5ec97992ff5eb7cf3"},
-    {file = "charset_normalizer-3.2.0-cp311-cp311-musllinux_1_1_aarch64.whl", hash = "sha256:8c2f5e83493748286002f9369f3e6607c565a6a90425a3a1fef5ae32a36d749d"},
-    {file = "charset_normalizer-3.2.0-cp311-cp311-musllinux_1_1_i686.whl", hash = "sha256:3170c9399da12c9dc66366e9d14da8bf7147e1e9d9ea566067bbce7bb74bd9c2"},
-    {file = "charset_normalizer-3.2.0-cp311-cp311-musllinux_1_1_ppc64le.whl", hash = "sha256:7a4826ad2bd6b07ca615c74ab91f32f6c96d08f6fcc3902ceeedaec8cdc3bcd6"},
-    {file = "charset_normalizer-3.2.0-cp311-cp311-musllinux_1_1_s390x.whl", hash = "sha256:3b1613dd5aee995ec6d4c69f00378bbd07614702a315a2cf6c1d21461fe17c23"},
-    {file = "charset_normalizer-3.2.0-cp311-cp311-musllinux_1_1_x86_64.whl", hash = "sha256:9e608aafdb55eb9f255034709e20d5a83b6d60c054df0802fa9c9883d0a937aa"},
-    {file = "charset_normalizer-3.2.0-cp311-cp311-win32.whl", hash = "sha256:f2a1d0fd4242bd8643ce6f98927cf9c04540af6efa92323e9d3124f57727bfc1"},
-    {file = "charset_normalizer-3.2.0-cp311-cp311-win_amd64.whl", hash = "sha256:681eb3d7e02e3c3655d1b16059fbfb605ac464c834a0c629048a30fad2b27489"},
-    {file = "charset_normalizer-3.2.0-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:c57921cda3a80d0f2b8aec7e25c8aa14479ea92b5b51b6876d975d925a2ea346"},
-    {file = "charset_normalizer-3.2.0-cp37-cp37m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:41b25eaa7d15909cf3ac4c96088c1f266a9a93ec44f87f1d13d4a0e86c81b982"},
-    {file = "charset_normalizer-3.2.0-cp37-cp37m-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:f058f6963fd82eb143c692cecdc89e075fa0828db2e5b291070485390b2f1c9c"},
-    {file = "charset_normalizer-3.2.0-cp37-cp37m-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:a7647ebdfb9682b7bb97e2a5e7cb6ae735b1c25008a70b906aecca294ee96cf4"},
-    {file = "charset_normalizer-3.2.0-cp37-cp37m-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:eef9df1eefada2c09a5e7a40991b9fc6ac6ef20b1372abd48d2794a316dc0449"},
-    {file = "charset_normalizer-3.2.0-cp37-cp37m-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:e03b8895a6990c9ab2cdcd0f2fe44088ca1c65ae592b8f795c3294af00a461c3"},
-    {file = "charset_normalizer-3.2.0-cp37-cp37m-musllinux_1_1_aarch64.whl", hash = "sha256:ee4006268ed33370957f55bf2e6f4d263eaf4dc3cfc473d1d90baff6ed36ce4a"},
-    {file = "charset_normalizer-3.2.0-cp37-cp37m-musllinux_1_1_i686.whl", hash = "sha256:c4983bf937209c57240cff65906b18bb35e64ae872da6a0db937d7b4af845dd7"},
-    {file = "charset_normalizer-3.2.0-cp37-cp37m-musllinux_1_1_ppc64le.whl", hash = "sha256:3bb7fda7260735efe66d5107fb7e6af6a7c04c7fce9b2514e04b7a74b06bf5dd"},
-    {file = "charset_normalizer-3.2.0-cp37-cp37m-musllinux_1_1_s390x.whl", hash = "sha256:72814c01533f51d68702802d74f77ea026b5ec52793c791e2da806a3844a46c3"},
-    {file = "charset_normalizer-3.2.0-cp37-cp37m-musllinux_1_1_x86_64.whl", hash = "sha256:70c610f6cbe4b9fce272c407dd9d07e33e6bf7b4aa1b7ffb6f6ded8e634e3592"},
-    {file = "charset_normalizer-3.2.0-cp37-cp37m-win32.whl", hash = "sha256:a401b4598e5d3f4a9a811f3daf42ee2291790c7f9d74b18d75d6e21dda98a1a1"},
-    {file = "charset_normalizer-3.2.0-cp37-cp37m-win_amd64.whl", hash = "sha256:c0b21078a4b56965e2b12f247467b234734491897e99c1d51cee628da9786959"},
-    {file = "charset_normalizer-3.2.0-cp38-cp38-macosx_10_9_universal2.whl", hash = "sha256:95eb302ff792e12aba9a8b8f8474ab229a83c103d74a750ec0bd1c1eea32e669"},
-    {file = "charset_normalizer-3.2.0-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:1a100c6d595a7f316f1b6f01d20815d916e75ff98c27a01ae817439ea7726329"},
-    {file = "charset_normalizer-3.2.0-cp38-cp38-macosx_11_0_arm64.whl", hash = "sha256:6339d047dab2780cc6220f46306628e04d9750f02f983ddb37439ca47ced7149"},
-    {file = "charset_normalizer-3.2.0-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:e4b749b9cc6ee664a3300bb3a273c1ca8068c46be705b6c31cf5d276f8628a94"},
-    {file = "charset_normalizer-3.2.0-cp38-cp38-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:a38856a971c602f98472050165cea2cdc97709240373041b69030be15047691f"},
-    {file = "charset_normalizer-3.2.0-cp38-cp38-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:f87f746ee241d30d6ed93969de31e5ffd09a2961a051e60ae6bddde9ec3583aa"},
-    {file = "charset_normalizer-3.2.0-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:89f1b185a01fe560bc8ae5f619e924407efca2191b56ce749ec84982fc59a32a"},
-    {file = "charset_normalizer-3.2.0-cp38-cp38-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:e1c8a2f4c69e08e89632defbfabec2feb8a8d99edc9f89ce33c4b9e36ab63037"},
-    {file = "charset_normalizer-3.2.0-cp38-cp38-musllinux_1_1_aarch64.whl", hash = "sha256:2f4ac36d8e2b4cc1aa71df3dd84ff8efbe3bfb97ac41242fbcfc053c67434f46"},
-    {file = "charset_normalizer-3.2.0-cp38-cp38-musllinux_1_1_i686.whl", hash = "sha256:a386ebe437176aab38c041de1260cd3ea459c6ce5263594399880bbc398225b2"},
-    {file = "charset_normalizer-3.2.0-cp38-cp38-musllinux_1_1_ppc64le.whl", hash = "sha256:ccd16eb18a849fd8dcb23e23380e2f0a354e8daa0c984b8a732d9cfaba3a776d"},
-    {file = "charset_normalizer-3.2.0-cp38-cp38-musllinux_1_1_s390x.whl", hash = "sha256:e6a5bf2cba5ae1bb80b154ed68a3cfa2fa00fde979a7f50d6598d3e17d9ac20c"},
-    {file = "charset_normalizer-3.2.0-cp38-cp38-musllinux_1_1_x86_64.whl", hash = "sha256:45de3f87179c1823e6d9e32156fb14c1927fcc9aba21433f088fdfb555b77c10"},
-    {file = "charset_normalizer-3.2.0-cp38-cp38-win32.whl", hash = "sha256:1000fba1057b92a65daec275aec30586c3de2401ccdcd41f8a5c1e2c87078706"},
-    {file = "charset_normalizer-3.2.0-cp38-cp38-win_amd64.whl", hash = "sha256:8b2c760cfc7042b27ebdb4a43a4453bd829a5742503599144d54a032c5dc7e9e"},
-    {file = "charset_normalizer-3.2.0-cp39-cp39-macosx_10_9_universal2.whl", hash = "sha256:855eafa5d5a2034b4621c74925d89c5efef61418570e5ef9b37717d9c796419c"},
-    {file = "charset_normalizer-3.2.0-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:203f0c8871d5a7987be20c72442488a0b8cfd0f43b7973771640fc593f56321f"},
-    {file = "charset_normalizer-3.2.0-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:e857a2232ba53ae940d3456f7533ce6ca98b81917d47adc3c7fd55dad8fab858"},
-    {file = "charset_normalizer-3.2.0-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:5e86d77b090dbddbe78867a0275cb4df08ea195e660f1f7f13435a4649e954e5"},
-    {file = "charset_normalizer-3.2.0-cp39-cp39-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:c4fb39a81950ec280984b3a44f5bd12819953dc5fa3a7e6fa7a80db5ee853952"},
-    {file = "charset_normalizer-3.2.0-cp39-cp39-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:2dee8e57f052ef5353cf608e0b4c871aee320dd1b87d351c28764fc0ca55f9f4"},
-    {file = "charset_normalizer-3.2.0-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:8700f06d0ce6f128de3ccdbc1acaea1ee264d2caa9ca05daaf492fde7c2a7200"},
-    {file = "charset_normalizer-3.2.0-cp39-cp39-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:1920d4ff15ce893210c1f0c0e9d19bfbecb7983c76b33f046c13a8ffbd570252"},
-    {file = "charset_normalizer-3.2.0-cp39-cp39-musllinux_1_1_aarch64.whl", hash = "sha256:c1c76a1743432b4b60ab3358c937a3fe1341c828ae6194108a94c69028247f22"},
-    {file = "charset_normalizer-3.2.0-cp39-cp39-musllinux_1_1_i686.whl", hash = "sha256:f7560358a6811e52e9c4d142d497f1a6e10103d3a6881f18d04dbce3729c0e2c"},
-    {file = "charset_normalizer-3.2.0-cp39-cp39-musllinux_1_1_ppc64le.whl", hash = "sha256:c8063cf17b19661471ecbdb3df1c84f24ad2e389e326ccaf89e3fb2484d8dd7e"},
-    {file = "charset_normalizer-3.2.0-cp39-cp39-musllinux_1_1_s390x.whl", hash = "sha256:cd6dbe0238f7743d0efe563ab46294f54f9bc8f4b9bcf57c3c666cc5bc9d1299"},
-    {file = "charset_normalizer-3.2.0-cp39-cp39-musllinux_1_1_x86_64.whl", hash = "sha256:1249cbbf3d3b04902ff081ffbb33ce3377fa6e4c7356f759f3cd076cc138d020"},
-    {file = "charset_normalizer-3.2.0-cp39-cp39-win32.whl", hash = "sha256:6c409c0deba34f147f77efaa67b8e4bb83d2f11c8806405f76397ae5b8c0d1c9"},
-    {file = "charset_normalizer-3.2.0-cp39-cp39-win_amd64.whl", hash = "sha256:7095f6fbfaa55defb6b733cfeb14efaae7a29f0b59d8cf213be4e7ca0b857b80"},
-    {file = "charset_normalizer-3.2.0-py3-none-any.whl", hash = "sha256:8e098148dd37b4ce3baca71fb394c81dc5d9c7728c95df695d2dca218edf40e6"},
+    {file = "charset-normalizer-3.3.2.tar.gz", hash = "sha256:f30c3cb33b24454a82faecaf01b19c18562b1e89558fb6c56de4d9118a032fd5"},
+    {file = "charset_normalizer-3.3.2-cp310-cp310-macosx_10_9_universal2.whl", hash = "sha256:25baf083bf6f6b341f4121c2f3c548875ee6f5339300e08be3f2b2ba1721cdd3"},
+    {file = "charset_normalizer-3.3.2-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:06435b539f889b1f6f4ac1758871aae42dc3a8c0e24ac9e60c2384973ad73027"},
+    {file = "charset_normalizer-3.3.2-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:9063e24fdb1e498ab71cb7419e24622516c4a04476b17a2dab57e8baa30d6e03"},
+    {file = "charset_normalizer-3.3.2-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:6897af51655e3691ff853668779c7bad41579facacf5fd7253b0133308cf000d"},
+    {file = "charset_normalizer-3.3.2-cp310-cp310-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:1d3193f4a680c64b4b6a9115943538edb896edc190f0b222e73761716519268e"},
+    {file = "charset_normalizer-3.3.2-cp310-cp310-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:cd70574b12bb8a4d2aaa0094515df2463cb429d8536cfb6c7ce983246983e5a6"},
+    {file = "charset_normalizer-3.3.2-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:8465322196c8b4d7ab6d1e049e4c5cb460d0394da4a27d23cc242fbf0034b6b5"},
+    {file = "charset_normalizer-3.3.2-cp310-cp310-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:a9a8e9031d613fd2009c182b69c7b2c1ef8239a0efb1df3f7c8da66d5dd3d537"},
+    {file = "charset_normalizer-3.3.2-cp310-cp310-musllinux_1_1_aarch64.whl", hash = "sha256:beb58fe5cdb101e3a055192ac291b7a21e3b7ef4f67fa1d74e331a7f2124341c"},
+    {file = "charset_normalizer-3.3.2-cp310-cp310-musllinux_1_1_i686.whl", hash = "sha256:e06ed3eb3218bc64786f7db41917d4e686cc4856944f53d5bdf83a6884432e12"},
+    {file = "charset_normalizer-3.3.2-cp310-cp310-musllinux_1_1_ppc64le.whl", hash = "sha256:2e81c7b9c8979ce92ed306c249d46894776a909505d8f5a4ba55b14206e3222f"},
+    {file = "charset_normalizer-3.3.2-cp310-cp310-musllinux_1_1_s390x.whl", hash = "sha256:572c3763a264ba47b3cf708a44ce965d98555f618ca42c926a9c1616d8f34269"},
+    {file = "charset_normalizer-3.3.2-cp310-cp310-musllinux_1_1_x86_64.whl", hash = "sha256:fd1abc0d89e30cc4e02e4064dc67fcc51bd941eb395c502aac3ec19fab46b519"},
+    {file = "charset_normalizer-3.3.2-cp310-cp310-win32.whl", hash = "sha256:3d47fa203a7bd9c5b6cee4736ee84ca03b8ef23193c0d1ca99b5089f72645c73"},
+    {file = "charset_normalizer-3.3.2-cp310-cp310-win_amd64.whl", hash = "sha256:10955842570876604d404661fbccbc9c7e684caf432c09c715ec38fbae45ae09"},
+    {file = "charset_normalizer-3.3.2-cp311-cp311-macosx_10_9_universal2.whl", hash = "sha256:802fe99cca7457642125a8a88a084cef28ff0cf9407060f7b93dca5aa25480db"},
+    {file = "charset_normalizer-3.3.2-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:573f6eac48f4769d667c4442081b1794f52919e7edada77495aaed9236d13a96"},
+    {file = "charset_normalizer-3.3.2-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:549a3a73da901d5bc3ce8d24e0600d1fa85524c10287f6004fbab87672bf3e1e"},
+    {file = "charset_normalizer-3.3.2-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:f27273b60488abe721a075bcca6d7f3964f9f6f067c8c4c605743023d7d3944f"},
+    {file = "charset_normalizer-3.3.2-cp311-cp311-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:1ceae2f17a9c33cb48e3263960dc5fc8005351ee19db217e9b1bb15d28c02574"},
+    {file = "charset_normalizer-3.3.2-cp311-cp311-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:65f6f63034100ead094b8744b3b97965785388f308a64cf8d7c34f2f2e5be0c4"},
+    {file = "charset_normalizer-3.3.2-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:753f10e867343b4511128c6ed8c82f7bec3bd026875576dfd88483c5c73b2fd8"},
+    {file = "charset_normalizer-3.3.2-cp311-cp311-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:4a78b2b446bd7c934f5dcedc588903fb2f5eec172f3d29e52a9096a43722adfc"},
+    {file = "charset_normalizer-3.3.2-cp311-cp311-musllinux_1_1_aarch64.whl", hash = "sha256:e537484df0d8f426ce2afb2d0f8e1c3d0b114b83f8850e5f2fbea0e797bd82ae"},
+    {file = "charset_normalizer-3.3.2-cp311-cp311-musllinux_1_1_i686.whl", hash = "sha256:eb6904c354526e758fda7167b33005998fb68c46fbc10e013ca97f21ca5c8887"},
+    {file = "charset_normalizer-3.3.2-cp311-cp311-musllinux_1_1_ppc64le.whl", hash = "sha256:deb6be0ac38ece9ba87dea880e438f25ca3eddfac8b002a2ec3d9183a454e8ae"},
+    {file = "charset_normalizer-3.3.2-cp311-cp311-musllinux_1_1_s390x.whl", hash = "sha256:4ab2fe47fae9e0f9dee8c04187ce5d09f48eabe611be8259444906793ab7cbce"},
+    {file = "charset_normalizer-3.3.2-cp311-cp311-musllinux_1_1_x86_64.whl", hash = "sha256:80402cd6ee291dcb72644d6eac93785fe2c8b9cb30893c1af5b8fdd753b9d40f"},
+    {file = "charset_normalizer-3.3.2-cp311-cp311-win32.whl", hash = "sha256:7cd13a2e3ddeed6913a65e66e94b51d80a041145a026c27e6bb76c31a853c6ab"},
+    {file = "charset_normalizer-3.3.2-cp311-cp311-win_amd64.whl", hash = "sha256:663946639d296df6a2bb2aa51b60a2454ca1cb29835324c640dafb5ff2131a77"},
+    {file = "charset_normalizer-3.3.2-cp312-cp312-macosx_10_9_universal2.whl", hash = "sha256:0b2b64d2bb6d3fb9112bafa732def486049e63de9618b5843bcdd081d8144cd8"},
+    {file = "charset_normalizer-3.3.2-cp312-cp312-macosx_10_9_x86_64.whl", hash = "sha256:ddbb2551d7e0102e7252db79ba445cdab71b26640817ab1e3e3648dad515003b"},
+    {file = "charset_normalizer-3.3.2-cp312-cp312-macosx_11_0_arm64.whl", hash = "sha256:55086ee1064215781fff39a1af09518bc9255b50d6333f2e4c74ca09fac6a8f6"},
+    {file = "charset_normalizer-3.3.2-cp312-cp312-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:8f4a014bc36d3c57402e2977dada34f9c12300af536839dc38c0beab8878f38a"},
+    {file = "charset_normalizer-3.3.2-cp312-cp312-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:a10af20b82360ab00827f916a6058451b723b4e65030c5a18577c8b2de5b3389"},
+    {file = "charset_normalizer-3.3.2-cp312-cp312-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:8d756e44e94489e49571086ef83b2bb8ce311e730092d2c34ca8f7d925cb20aa"},
+    {file = "charset_normalizer-3.3.2-cp312-cp312-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:90d558489962fd4918143277a773316e56c72da56ec7aa3dc3dbbe20fdfed15b"},
+    {file = "charset_normalizer-3.3.2-cp312-cp312-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:6ac7ffc7ad6d040517be39eb591cac5ff87416c2537df6ba3cba3bae290c0fed"},
+    {file = "charset_normalizer-3.3.2-cp312-cp312-musllinux_1_1_aarch64.whl", hash = "sha256:7ed9e526742851e8d5cc9e6cf41427dfc6068d4f5a3bb03659444b4cabf6bc26"},
+    {file = "charset_normalizer-3.3.2-cp312-cp312-musllinux_1_1_i686.whl", hash = "sha256:8bdb58ff7ba23002a4c5808d608e4e6c687175724f54a5dade5fa8c67b604e4d"},
+    {file = "charset_normalizer-3.3.2-cp312-cp312-musllinux_1_1_ppc64le.whl", hash = "sha256:6b3251890fff30ee142c44144871185dbe13b11bab478a88887a639655be1068"},
+    {file = "charset_normalizer-3.3.2-cp312-cp312-musllinux_1_1_s390x.whl", hash = "sha256:b4a23f61ce87adf89be746c8a8974fe1c823c891d8f86eb218bb957c924bb143"},
+    {file = "charset_normalizer-3.3.2-cp312-cp312-musllinux_1_1_x86_64.whl", hash = "sha256:efcb3f6676480691518c177e3b465bcddf57cea040302f9f4e6e191af91174d4"},
+    {file = "charset_normalizer-3.3.2-cp312-cp312-win32.whl", hash = "sha256:d965bba47ddeec8cd560687584e88cf699fd28f192ceb452d1d7ee807c5597b7"},
+    {file = "charset_normalizer-3.3.2-cp312-cp312-win_amd64.whl", hash = "sha256:96b02a3dc4381e5494fad39be677abcb5e6634bf7b4fa83a6dd3112607547001"},
+    {file = "charset_normalizer-3.3.2-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:95f2a5796329323b8f0512e09dbb7a1860c46a39da62ecb2324f116fa8fdc85c"},
+    {file = "charset_normalizer-3.3.2-cp37-cp37m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:c002b4ffc0be611f0d9da932eb0f704fe2602a9a949d1f738e4c34c75b0863d5"},
+    {file = "charset_normalizer-3.3.2-cp37-cp37m-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:a981a536974bbc7a512cf44ed14938cf01030a99e9b3a06dd59578882f06f985"},
+    {file = "charset_normalizer-3.3.2-cp37-cp37m-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:3287761bc4ee9e33561a7e058c72ac0938c4f57fe49a09eae428fd88aafe7bb6"},
+    {file = "charset_normalizer-3.3.2-cp37-cp37m-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:42cb296636fcc8b0644486d15c12376cb9fa75443e00fb25de0b8602e64c1714"},
+    {file = "charset_normalizer-3.3.2-cp37-cp37m-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:0a55554a2fa0d408816b3b5cedf0045f4b8e1a6065aec45849de2d6f3f8e9786"},
+    {file = "charset_normalizer-3.3.2-cp37-cp37m-musllinux_1_1_aarch64.whl", hash = "sha256:c083af607d2515612056a31f0a8d9e0fcb5876b7bfc0abad3ecd275bc4ebc2d5"},
+    {file = "charset_normalizer-3.3.2-cp37-cp37m-musllinux_1_1_i686.whl", hash = "sha256:87d1351268731db79e0f8e745d92493ee2841c974128ef629dc518b937d9194c"},
+    {file = "charset_normalizer-3.3.2-cp37-cp37m-musllinux_1_1_ppc64le.whl", hash = "sha256:bd8f7df7d12c2db9fab40bdd87a7c09b1530128315d047a086fa3ae3435cb3a8"},
+    {file = "charset_normalizer-3.3.2-cp37-cp37m-musllinux_1_1_s390x.whl", hash = "sha256:c180f51afb394e165eafe4ac2936a14bee3eb10debc9d9e4db8958fe36afe711"},
+    {file = "charset_normalizer-3.3.2-cp37-cp37m-musllinux_1_1_x86_64.whl", hash = "sha256:8c622a5fe39a48f78944a87d4fb8a53ee07344641b0562c540d840748571b811"},
+    {file = "charset_normalizer-3.3.2-cp37-cp37m-win32.whl", hash = "sha256:db364eca23f876da6f9e16c9da0df51aa4f104a972735574842618b8c6d999d4"},
+    {file = "charset_normalizer-3.3.2-cp37-cp37m-win_amd64.whl", hash = "sha256:86216b5cee4b06df986d214f664305142d9c76df9b6512be2738aa72a2048f99"},
+    {file = "charset_normalizer-3.3.2-cp38-cp38-macosx_10_9_universal2.whl", hash = "sha256:6463effa3186ea09411d50efc7d85360b38d5f09b870c48e4600f63af490e56a"},
+    {file = "charset_normalizer-3.3.2-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:6c4caeef8fa63d06bd437cd4bdcf3ffefe6738fb1b25951440d80dc7df8c03ac"},
+    {file = "charset_normalizer-3.3.2-cp38-cp38-macosx_11_0_arm64.whl", hash = "sha256:37e55c8e51c236f95b033f6fb391d7d7970ba5fe7ff453dad675e88cf303377a"},
+    {file = "charset_normalizer-3.3.2-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:fb69256e180cb6c8a894fee62b3afebae785babc1ee98b81cdf68bbca1987f33"},
+    {file = "charset_normalizer-3.3.2-cp38-cp38-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:ae5f4161f18c61806f411a13b0310bea87f987c7d2ecdbdaad0e94eb2e404238"},
+    {file = "charset_normalizer-3.3.2-cp38-cp38-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:b2b0a0c0517616b6869869f8c581d4eb2dd83a4d79e0ebcb7d373ef9956aeb0a"},
+    {file = "charset_normalizer-3.3.2-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:45485e01ff4d3630ec0d9617310448a8702f70e9c01906b0d0118bdf9d124cf2"},
+    {file = "charset_normalizer-3.3.2-cp38-cp38-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:eb00ed941194665c332bf8e078baf037d6c35d7c4f3102ea2d4f16ca94a26dc8"},
+    {file = "charset_normalizer-3.3.2-cp38-cp38-musllinux_1_1_aarch64.whl", hash = "sha256:2127566c664442652f024c837091890cb1942c30937add288223dc895793f898"},
+    {file = "charset_normalizer-3.3.2-cp38-cp38-musllinux_1_1_i686.whl", hash = "sha256:a50aebfa173e157099939b17f18600f72f84eed3049e743b68ad15bd69b6bf99"},
+    {file = "charset_normalizer-3.3.2-cp38-cp38-musllinux_1_1_ppc64le.whl", hash = "sha256:4d0d1650369165a14e14e1e47b372cfcb31d6ab44e6e33cb2d4e57265290044d"},
+    {file = "charset_normalizer-3.3.2-cp38-cp38-musllinux_1_1_s390x.whl", hash = "sha256:923c0c831b7cfcb071580d3f46c4baf50f174be571576556269530f4bbd79d04"},
+    {file = "charset_normalizer-3.3.2-cp38-cp38-musllinux_1_1_x86_64.whl", hash = "sha256:06a81e93cd441c56a9b65d8e1d043daeb97a3d0856d177d5c90ba85acb3db087"},
+    {file = "charset_normalizer-3.3.2-cp38-cp38-win32.whl", hash = "sha256:6ef1d82a3af9d3eecdba2321dc1b3c238245d890843e040e41e470ffa64c3e25"},
+    {file = "charset_normalizer-3.3.2-cp38-cp38-win_amd64.whl", hash = "sha256:eb8821e09e916165e160797a6c17edda0679379a4be5c716c260e836e122f54b"},
+    {file = "charset_normalizer-3.3.2-cp39-cp39-macosx_10_9_universal2.whl", hash = "sha256:c235ebd9baae02f1b77bcea61bce332cb4331dc3617d254df3323aa01ab47bd4"},
+    {file = "charset_normalizer-3.3.2-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:5b4c145409bef602a690e7cfad0a15a55c13320ff7a3ad7ca59c13bb8ba4d45d"},
+    {file = "charset_normalizer-3.3.2-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:68d1f8a9e9e37c1223b656399be5d6b448dea850bed7d0f87a8311f1ff3dabb0"},
+    {file = "charset_normalizer-3.3.2-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:22afcb9f253dac0696b5a4be4a1c0f8762f8239e21b99680099abd9b2b1b2269"},
+    {file = "charset_normalizer-3.3.2-cp39-cp39-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:e27ad930a842b4c5eb8ac0016b0a54f5aebbe679340c26101df33424142c143c"},
+    {file = "charset_normalizer-3.3.2-cp39-cp39-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:1f79682fbe303db92bc2b1136016a38a42e835d932bab5b3b1bfcfbf0640e519"},
+    {file = "charset_normalizer-3.3.2-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:b261ccdec7821281dade748d088bb6e9b69e6d15b30652b74cbbac25e280b796"},
+    {file = "charset_normalizer-3.3.2-cp39-cp39-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:122c7fa62b130ed55f8f285bfd56d5f4b4a5b503609d181f9ad85e55c89f4185"},
+    {file = "charset_normalizer-3.3.2-cp39-cp39-musllinux_1_1_aarch64.whl", hash = "sha256:d0eccceffcb53201b5bfebb52600a5fb483a20b61da9dbc885f8b103cbe7598c"},
+    {file = "charset_normalizer-3.3.2-cp39-cp39-musllinux_1_1_i686.whl", hash = "sha256:9f96df6923e21816da7e0ad3fd47dd8f94b2a5ce594e00677c0013018b813458"},
+    {file = "charset_normalizer-3.3.2-cp39-cp39-musllinux_1_1_ppc64le.whl", hash = "sha256:7f04c839ed0b6b98b1a7501a002144b76c18fb1c1850c8b98d458ac269e26ed2"},
+    {file = "charset_normalizer-3.3.2-cp39-cp39-musllinux_1_1_s390x.whl", hash = "sha256:34d1c8da1e78d2e001f363791c98a272bb734000fcef47a491c1e3b0505657a8"},
+    {file = "charset_normalizer-3.3.2-cp39-cp39-musllinux_1_1_x86_64.whl", hash = "sha256:ff8fa367d09b717b2a17a052544193ad76cd49979c805768879cb63d9ca50561"},
+    {file = "charset_normalizer-3.3.2-cp39-cp39-win32.whl", hash = "sha256:aed38f6e4fb3f5d6bf81bfa990a07806be9d83cf7bacef998ab1a9bd660a581f"},
+    {file = "charset_normalizer-3.3.2-cp39-cp39-win_amd64.whl", hash = "sha256:b01b88d45a6fcb69667cd6d2f7a9aeb4bf53760d7fc536bf679ec94fe9f3ff3d"},
+    {file = "charset_normalizer-3.3.2-py3-none-any.whl", hash = "sha256:3e4d1f6587322d2788836a99c69062fbb091331ec940e02d12d179c1d53e25fc"},
 ]
 
 [[package]]
@@ -295,13 +311,13 @@ files = [
 
 [[package]]
 name = "cookiecutter"
-version = "2.3.0"
+version = "2.4.0"
 description = "A command-line utility that creates projects from project templates, e.g. creating a Python package project from a Python package project template."
 optional = false
 python-versions = ">=3.7"
 files = [
-    {file = "cookiecutter-2.3.0-py3-none-any.whl", hash = "sha256:7e87944757c6e9f8729cf89a4139b6a35ab4d6dcbc6ae3e7d6360d44ad3ad383"},
-    {file = "cookiecutter-2.3.0.tar.gz", hash = "sha256:942a794981747f6d7f439d6e49d39dc91a9a641283614160c93c474c72c29621"},
+    {file = "cookiecutter-2.4.0-py3-none-any.whl", hash = "sha256:8344663028abc08ec09b912e663636a97e1775bffe973425ec0107431acd390e"},
+    {file = "cookiecutter-2.4.0.tar.gz", hash = "sha256:6d1494e66a784f23324df9d593f3e43af3db4f4b926b9e49e6ff060169fc042a"},
 ]
 
 [package.dependencies]
@@ -316,63 +332,63 @@ rich = "*"
 
 [[package]]
 name = "coverage"
-version = "7.3.0"
+version = "7.3.2"
 description = "Code coverage measurement for Python"
 optional = false
 python-versions = ">=3.8"
 files = [
-    {file = "coverage-7.3.0-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:db76a1bcb51f02b2007adacbed4c88b6dee75342c37b05d1822815eed19edee5"},
-    {file = "coverage-7.3.0-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:c02cfa6c36144ab334d556989406837336c1d05215a9bdf44c0bc1d1ac1cb637"},
-    {file = "coverage-7.3.0-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:477c9430ad5d1b80b07f3c12f7120eef40bfbf849e9e7859e53b9c93b922d2af"},
-    {file = "coverage-7.3.0-cp310-cp310-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:ce2ee86ca75f9f96072295c5ebb4ef2a43cecf2870b0ca5e7a1cbdd929cf67e1"},
-    {file = "coverage-7.3.0-cp310-cp310-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:68d8a0426b49c053013e631c0cdc09b952d857efa8f68121746b339912d27a12"},
-    {file = "coverage-7.3.0-cp310-cp310-musllinux_1_1_aarch64.whl", hash = "sha256:b3eb0c93e2ea6445b2173da48cb548364f8f65bf68f3d090404080d338e3a689"},
-    {file = "coverage-7.3.0-cp310-cp310-musllinux_1_1_i686.whl", hash = "sha256:90b6e2f0f66750c5a1178ffa9370dec6c508a8ca5265c42fbad3ccac210a7977"},
-    {file = "coverage-7.3.0-cp310-cp310-musllinux_1_1_x86_64.whl", hash = "sha256:96d7d761aea65b291a98c84e1250cd57b5b51726821a6f2f8df65db89363be51"},
-    {file = "coverage-7.3.0-cp310-cp310-win32.whl", hash = "sha256:63c5b8ecbc3b3d5eb3a9d873dec60afc0cd5ff9d9f1c75981d8c31cfe4df8527"},
-    {file = "coverage-7.3.0-cp310-cp310-win_amd64.whl", hash = "sha256:97c44f4ee13bce914272589b6b41165bbb650e48fdb7bd5493a38bde8de730a1"},
-    {file = "coverage-7.3.0-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:74c160285f2dfe0acf0f72d425f3e970b21b6de04157fc65adc9fd07ee44177f"},
-    {file = "coverage-7.3.0-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:b543302a3707245d454fc49b8ecd2c2d5982b50eb63f3535244fd79a4be0c99d"},
-    {file = "coverage-7.3.0-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:ad0f87826c4ebd3ef484502e79b39614e9c03a5d1510cfb623f4a4a051edc6fd"},
-    {file = "coverage-7.3.0-cp311-cp311-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:13c6cbbd5f31211d8fdb477f0f7b03438591bdd077054076eec362cf2207b4a7"},
-    {file = "coverage-7.3.0-cp311-cp311-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:fac440c43e9b479d1241fe9d768645e7ccec3fb65dc3a5f6e90675e75c3f3e3a"},
-    {file = "coverage-7.3.0-cp311-cp311-musllinux_1_1_aarch64.whl", hash = "sha256:3c9834d5e3df9d2aba0275c9f67989c590e05732439b3318fa37a725dff51e74"},
-    {file = "coverage-7.3.0-cp311-cp311-musllinux_1_1_i686.whl", hash = "sha256:4c8e31cf29b60859876474034a83f59a14381af50cbe8a9dbaadbf70adc4b214"},
-    {file = "coverage-7.3.0-cp311-cp311-musllinux_1_1_x86_64.whl", hash = "sha256:7a9baf8e230f9621f8e1d00c580394a0aa328fdac0df2b3f8384387c44083c0f"},
-    {file = "coverage-7.3.0-cp311-cp311-win32.whl", hash = "sha256:ccc51713b5581e12f93ccb9c5e39e8b5d4b16776d584c0f5e9e4e63381356482"},
-    {file = "coverage-7.3.0-cp311-cp311-win_amd64.whl", hash = "sha256:887665f00ea4e488501ba755a0e3c2cfd6278e846ada3185f42d391ef95e7e70"},
-    {file = "coverage-7.3.0-cp312-cp312-macosx_10_9_x86_64.whl", hash = "sha256:d000a739f9feed900381605a12a61f7aaced6beae832719ae0d15058a1e81c1b"},
-    {file = "coverage-7.3.0-cp312-cp312-macosx_11_0_arm64.whl", hash = "sha256:59777652e245bb1e300e620ce2bef0d341945842e4eb888c23a7f1d9e143c446"},
-    {file = "coverage-7.3.0-cp312-cp312-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:c9737bc49a9255d78da085fa04f628a310c2332b187cd49b958b0e494c125071"},
-    {file = "coverage-7.3.0-cp312-cp312-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:5247bab12f84a1d608213b96b8af0cbb30d090d705b6663ad794c2f2a5e5b9fe"},
-    {file = "coverage-7.3.0-cp312-cp312-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:e2ac9a1de294773b9fa77447ab7e529cf4fe3910f6a0832816e5f3d538cfea9a"},
-    {file = "coverage-7.3.0-cp312-cp312-musllinux_1_1_aarch64.whl", hash = "sha256:85b7335c22455ec12444cec0d600533a238d6439d8d709d545158c1208483873"},
-    {file = "coverage-7.3.0-cp312-cp312-musllinux_1_1_i686.whl", hash = "sha256:36ce5d43a072a036f287029a55b5c6a0e9bd73db58961a273b6dc11a2c6eb9c2"},
-    {file = "coverage-7.3.0-cp312-cp312-musllinux_1_1_x86_64.whl", hash = "sha256:211a4576e984f96d9fce61766ffaed0115d5dab1419e4f63d6992b480c2bd60b"},
-    {file = "coverage-7.3.0-cp312-cp312-win32.whl", hash = "sha256:56afbf41fa4a7b27f6635bc4289050ac3ab7951b8a821bca46f5b024500e6321"},
-    {file = "coverage-7.3.0-cp312-cp312-win_amd64.whl", hash = "sha256:7f297e0c1ae55300ff688568b04ff26b01c13dfbf4c9d2b7d0cb688ac60df479"},
-    {file = "coverage-7.3.0-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:ac0dec90e7de0087d3d95fa0533e1d2d722dcc008bc7b60e1143402a04c117c1"},
-    {file = "coverage-7.3.0-cp38-cp38-macosx_11_0_arm64.whl", hash = "sha256:438856d3f8f1e27f8e79b5410ae56650732a0dcfa94e756df88c7e2d24851fcd"},
-    {file = "coverage-7.3.0-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:1084393c6bda8875c05e04fce5cfe1301a425f758eb012f010eab586f1f3905e"},
-    {file = "coverage-7.3.0-cp38-cp38-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:49ab200acf891e3dde19e5aa4b0f35d12d8b4bd805dc0be8792270c71bd56c54"},
-    {file = "coverage-7.3.0-cp38-cp38-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:a67e6bbe756ed458646e1ef2b0778591ed4d1fcd4b146fc3ba2feb1a7afd4254"},
-    {file = "coverage-7.3.0-cp38-cp38-musllinux_1_1_aarch64.whl", hash = "sha256:8f39c49faf5344af36042b293ce05c0d9004270d811c7080610b3e713251c9b0"},
-    {file = "coverage-7.3.0-cp38-cp38-musllinux_1_1_i686.whl", hash = "sha256:7df91fb24c2edaabec4e0eee512ff3bc6ec20eb8dccac2e77001c1fe516c0c84"},
-    {file = "coverage-7.3.0-cp38-cp38-musllinux_1_1_x86_64.whl", hash = "sha256:34f9f0763d5fa3035a315b69b428fe9c34d4fc2f615262d6be3d3bf3882fb985"},
-    {file = "coverage-7.3.0-cp38-cp38-win32.whl", hash = "sha256:bac329371d4c0d456e8d5f38a9b0816b446581b5f278474e416ea0c68c47dcd9"},
-    {file = "coverage-7.3.0-cp38-cp38-win_amd64.whl", hash = "sha256:b859128a093f135b556b4765658d5d2e758e1fae3e7cc2f8c10f26fe7005e543"},
-    {file = "coverage-7.3.0-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:fc0ed8d310afe013db1eedd37176d0839dc66c96bcfcce8f6607a73ffea2d6ba"},
-    {file = "coverage-7.3.0-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:e61260ec93f99f2c2d93d264b564ba912bec502f679793c56f678ba5251f0393"},
-    {file = "coverage-7.3.0-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:97af9554a799bd7c58c0179cc8dbf14aa7ab50e1fd5fa73f90b9b7215874ba28"},
-    {file = "coverage-7.3.0-cp39-cp39-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:3558e5b574d62f9c46b76120a5c7c16c4612dc2644c3d48a9f4064a705eaee95"},
-    {file = "coverage-7.3.0-cp39-cp39-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:37d5576d35fcb765fca05654f66aa71e2808d4237d026e64ac8b397ffa66a56a"},
-    {file = "coverage-7.3.0-cp39-cp39-musllinux_1_1_aarch64.whl", hash = "sha256:07ea61bcb179f8f05ffd804d2732b09d23a1238642bf7e51dad62082b5019b34"},
-    {file = "coverage-7.3.0-cp39-cp39-musllinux_1_1_i686.whl", hash = "sha256:80501d1b2270d7e8daf1b64b895745c3e234289e00d5f0e30923e706f110334e"},
-    {file = "coverage-7.3.0-cp39-cp39-musllinux_1_1_x86_64.whl", hash = "sha256:4eddd3153d02204f22aef0825409091a91bf2a20bce06fe0f638f5c19a85de54"},
-    {file = "coverage-7.3.0-cp39-cp39-win32.whl", hash = "sha256:2d22172f938455c156e9af2612650f26cceea47dc86ca048fa4e0b2d21646ad3"},
-    {file = "coverage-7.3.0-cp39-cp39-win_amd64.whl", hash = "sha256:60f64e2007c9144375dd0f480a54d6070f00bb1a28f65c408370544091c9bc9e"},
-    {file = "coverage-7.3.0-pp38.pp39.pp310-none-any.whl", hash = "sha256:5492a6ce3bdb15c6ad66cb68a0244854d9917478877a25671d70378bdc8562d0"},
-    {file = "coverage-7.3.0.tar.gz", hash = "sha256:49dbb19cdcafc130f597d9e04a29d0a032ceedf729e41b181f51cd170e6ee865"},
+    {file = "coverage-7.3.2-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:d872145f3a3231a5f20fd48500274d7df222e291d90baa2026cc5152b7ce86bf"},
+    {file = "coverage-7.3.2-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:310b3bb9c91ea66d59c53fa4989f57d2436e08f18fb2f421a1b0b6b8cc7fffda"},
+    {file = "coverage-7.3.2-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:f47d39359e2c3779c5331fc740cf4bce6d9d680a7b4b4ead97056a0ae07cb49a"},
+    {file = "coverage-7.3.2-cp310-cp310-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:aa72dbaf2c2068404b9870d93436e6d23addd8bbe9295f49cbca83f6e278179c"},
+    {file = "coverage-7.3.2-cp310-cp310-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:beaa5c1b4777f03fc63dfd2a6bd820f73f036bfb10e925fce067b00a340d0f3f"},
+    {file = "coverage-7.3.2-cp310-cp310-musllinux_1_1_aarch64.whl", hash = "sha256:dbc1b46b92186cc8074fee9d9fbb97a9dd06c6cbbef391c2f59d80eabdf0faa6"},
+    {file = "coverage-7.3.2-cp310-cp310-musllinux_1_1_i686.whl", hash = "sha256:315a989e861031334d7bee1f9113c8770472db2ac484e5b8c3173428360a9148"},
+    {file = "coverage-7.3.2-cp310-cp310-musllinux_1_1_x86_64.whl", hash = "sha256:d1bc430677773397f64a5c88cb522ea43175ff16f8bfcc89d467d974cb2274f9"},
+    {file = "coverage-7.3.2-cp310-cp310-win32.whl", hash = "sha256:a889ae02f43aa45032afe364c8ae84ad3c54828c2faa44f3bfcafecb5c96b02f"},
+    {file = "coverage-7.3.2-cp310-cp310-win_amd64.whl", hash = "sha256:c0ba320de3fb8c6ec16e0be17ee1d3d69adcda99406c43c0409cb5c41788a611"},
+    {file = "coverage-7.3.2-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:ac8c802fa29843a72d32ec56d0ca792ad15a302b28ca6203389afe21f8fa062c"},
+    {file = "coverage-7.3.2-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:89a937174104339e3a3ffcf9f446c00e3a806c28b1841c63edb2b369310fd074"},
+    {file = "coverage-7.3.2-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:e267e9e2b574a176ddb983399dec325a80dbe161f1a32715c780b5d14b5f583a"},
+    {file = "coverage-7.3.2-cp311-cp311-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:2443cbda35df0d35dcfb9bf8f3c02c57c1d6111169e3c85fc1fcc05e0c9f39a3"},
+    {file = "coverage-7.3.2-cp311-cp311-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:4175e10cc8dda0265653e8714b3174430b07c1dca8957f4966cbd6c2b1b8065a"},
+    {file = "coverage-7.3.2-cp311-cp311-musllinux_1_1_aarch64.whl", hash = "sha256:0cbf38419fb1a347aaf63481c00f0bdc86889d9fbf3f25109cf96c26b403fda1"},
+    {file = "coverage-7.3.2-cp311-cp311-musllinux_1_1_i686.whl", hash = "sha256:5c913b556a116b8d5f6ef834038ba983834d887d82187c8f73dec21049abd65c"},
+    {file = "coverage-7.3.2-cp311-cp311-musllinux_1_1_x86_64.whl", hash = "sha256:1981f785239e4e39e6444c63a98da3a1db8e971cb9ceb50a945ba6296b43f312"},
+    {file = "coverage-7.3.2-cp311-cp311-win32.whl", hash = "sha256:43668cabd5ca8258f5954f27a3aaf78757e6acf13c17604d89648ecc0cc66640"},
+    {file = "coverage-7.3.2-cp311-cp311-win_amd64.whl", hash = "sha256:e10c39c0452bf6e694511c901426d6b5ac005acc0f78ff265dbe36bf81f808a2"},
+    {file = "coverage-7.3.2-cp312-cp312-macosx_10_9_x86_64.whl", hash = "sha256:4cbae1051ab791debecc4a5dcc4a1ff45fc27b91b9aee165c8a27514dd160836"},
+    {file = "coverage-7.3.2-cp312-cp312-macosx_11_0_arm64.whl", hash = "sha256:12d15ab5833a997716d76f2ac1e4b4d536814fc213c85ca72756c19e5a6b3d63"},
+    {file = "coverage-7.3.2-cp312-cp312-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:3c7bba973ebee5e56fe9251300c00f1579652587a9f4a5ed8404b15a0471f216"},
+    {file = "coverage-7.3.2-cp312-cp312-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:fe494faa90ce6381770746077243231e0b83ff3f17069d748f645617cefe19d4"},
+    {file = "coverage-7.3.2-cp312-cp312-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:f6e9589bd04d0461a417562649522575d8752904d35c12907d8c9dfeba588faf"},
+    {file = "coverage-7.3.2-cp312-cp312-musllinux_1_1_aarch64.whl", hash = "sha256:d51ac2a26f71da1b57f2dc81d0e108b6ab177e7d30e774db90675467c847bbdf"},
+    {file = "coverage-7.3.2-cp312-cp312-musllinux_1_1_i686.whl", hash = "sha256:99b89d9f76070237975b315b3d5f4d6956ae354a4c92ac2388a5695516e47c84"},
+    {file = "coverage-7.3.2-cp312-cp312-musllinux_1_1_x86_64.whl", hash = "sha256:fa28e909776dc69efb6ed975a63691bc8172b64ff357e663a1bb06ff3c9b589a"},
+    {file = "coverage-7.3.2-cp312-cp312-win32.whl", hash = "sha256:289fe43bf45a575e3ab10b26d7b6f2ddb9ee2dba447499f5401cfb5ecb8196bb"},
+    {file = "coverage-7.3.2-cp312-cp312-win_amd64.whl", hash = "sha256:7dbc3ed60e8659bc59b6b304b43ff9c3ed858da2839c78b804973f613d3e92ed"},
+    {file = "coverage-7.3.2-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:f94b734214ea6a36fe16e96a70d941af80ff3bfd716c141300d95ebc85339738"},
+    {file = "coverage-7.3.2-cp38-cp38-macosx_11_0_arm64.whl", hash = "sha256:af3d828d2c1cbae52d34bdbb22fcd94d1ce715d95f1a012354a75e5913f1bda2"},
+    {file = "coverage-7.3.2-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:630b13e3036e13c7adc480ca42fa7afc2a5d938081d28e20903cf7fd687872e2"},
+    {file = "coverage-7.3.2-cp38-cp38-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:c9eacf273e885b02a0273bb3a2170f30e2d53a6d53b72dbe02d6701b5296101c"},
+    {file = "coverage-7.3.2-cp38-cp38-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:d8f17966e861ff97305e0801134e69db33b143bbfb36436efb9cfff6ec7b2fd9"},
+    {file = "coverage-7.3.2-cp38-cp38-musllinux_1_1_aarch64.whl", hash = "sha256:b4275802d16882cf9c8b3d057a0839acb07ee9379fa2749eca54efbce1535b82"},
+    {file = "coverage-7.3.2-cp38-cp38-musllinux_1_1_i686.whl", hash = "sha256:72c0cfa5250f483181e677ebc97133ea1ab3eb68645e494775deb6a7f6f83901"},
+    {file = "coverage-7.3.2-cp38-cp38-musllinux_1_1_x86_64.whl", hash = "sha256:cb536f0dcd14149425996821a168f6e269d7dcd2c273a8bff8201e79f5104e76"},
+    {file = "coverage-7.3.2-cp38-cp38-win32.whl", hash = "sha256:307adb8bd3abe389a471e649038a71b4eb13bfd6b7dd9a129fa856f5c695cf92"},
+    {file = "coverage-7.3.2-cp38-cp38-win_amd64.whl", hash = "sha256:88ed2c30a49ea81ea3b7f172e0269c182a44c236eb394718f976239892c0a27a"},
+    {file = "coverage-7.3.2-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:b631c92dfe601adf8f5ebc7fc13ced6bb6e9609b19d9a8cd59fa47c4186ad1ce"},
+    {file = "coverage-7.3.2-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:d3d9df4051c4a7d13036524b66ecf7a7537d14c18a384043f30a303b146164e9"},
+    {file = "coverage-7.3.2-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:5f7363d3b6a1119ef05015959ca24a9afc0ea8a02c687fe7e2d557705375c01f"},
+    {file = "coverage-7.3.2-cp39-cp39-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:2f11cc3c967a09d3695d2a6f03fb3e6236622b93be7a4b5dc09166a861be6d25"},
+    {file = "coverage-7.3.2-cp39-cp39-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:149de1d2401ae4655c436a3dced6dd153f4c3309f599c3d4bd97ab172eaf02d9"},
+    {file = "coverage-7.3.2-cp39-cp39-musllinux_1_1_aarch64.whl", hash = "sha256:3a4006916aa6fee7cd38db3bfc95aa9c54ebb4ffbfc47c677c8bba949ceba0a6"},
+    {file = "coverage-7.3.2-cp39-cp39-musllinux_1_1_i686.whl", hash = "sha256:9028a3871280110d6e1aa2df1afd5ef003bab5fb1ef421d6dc748ae1c8ef2ebc"},
+    {file = "coverage-7.3.2-cp39-cp39-musllinux_1_1_x86_64.whl", hash = "sha256:9f805d62aec8eb92bab5b61c0f07329275b6f41c97d80e847b03eb894f38d083"},
+    {file = "coverage-7.3.2-cp39-cp39-win32.whl", hash = "sha256:d1c88ec1a7ff4ebca0219f5b1ef863451d828cccf889c173e1253aa84b1e07ce"},
+    {file = "coverage-7.3.2-cp39-cp39-win_amd64.whl", hash = "sha256:b4767da59464bb593c07afceaddea61b154136300881844768037fd5e859353f"},
+    {file = "coverage-7.3.2-pp38.pp39.pp310-none-any.whl", hash = "sha256:ae97af89f0fbf373400970c0a21eef5aa941ffeed90aee43650b81f7d7f47637"},
+    {file = "coverage-7.3.2.tar.gz", hash = "sha256:be32ad29341b0170e795ca590e1c07e81fc061cb5b10c74ce7203491484404ef"},
 ]
 
 [package.extras]
@@ -405,28 +421,29 @@ testing = ["hatch", "pre-commit", "pytest", "tox"]
 
 [[package]]
 name = "filelock"
-version = "3.12.2"
+version = "3.13.1"
 description = "A platform independent file lock."
 optional = false
-python-versions = ">=3.7"
+python-versions = ">=3.8"
 files = [
-    {file = "filelock-3.12.2-py3-none-any.whl", hash = "sha256:cbb791cdea2a72f23da6ac5b5269ab0a0d161e9ef0100e653b69049a7706d1ec"},
-    {file = "filelock-3.12.2.tar.gz", hash = "sha256:002740518d8aa59a26b0c76e10fb8c6e15eae825d34b6fdf670333fd7b938d81"},
+    {file = "filelock-3.13.1-py3-none-any.whl", hash = "sha256:57dbda9b35157b05fb3e58ee91448612eb674172fab98ee235ccb0b5bee19a1c"},
+    {file = "filelock-3.13.1.tar.gz", hash = "sha256:521f5f56c50f8426f5e03ad3b281b490a87ef15bc6c526f168290f0c7148d44e"},
 ]
 
 [package.extras]
-docs = ["furo (>=2023.5.20)", "sphinx (>=7.0.1)", "sphinx-autodoc-typehints (>=1.23,!=1.23.4)"]
-testing = ["covdefaults (>=2.3)", "coverage (>=7.2.7)", "diff-cover (>=7.5)", "pytest (>=7.3.1)", "pytest-cov (>=4.1)", "pytest-mock (>=3.10)", "pytest-timeout (>=2.1)"]
+docs = ["furo (>=2023.9.10)", "sphinx (>=7.2.6)", "sphinx-autodoc-typehints (>=1.24)"]
+testing = ["covdefaults (>=2.3)", "coverage (>=7.3.2)", "diff-cover (>=8)", "pytest (>=7.4.3)", "pytest-cov (>=4.1)", "pytest-mock (>=3.12)", "pytest-timeout (>=2.2)"]
+typing = ["typing-extensions (>=4.8)"]
 
 [[package]]
 name = "identify"
-version = "2.5.27"
+version = "2.5.32"
 description = "File identification library for Python"
 optional = false
 python-versions = ">=3.8"
 files = [
-    {file = "identify-2.5.27-py2.py3-none-any.whl", hash = "sha256:fdb527b2dfe24602809b2201e033c2a113d7bdf716db3ca8e3243f735dcecaba"},
-    {file = "identify-2.5.27.tar.gz", hash = "sha256:287b75b04a0e22d727bc9a41f0d4f3c1bcada97490fa6eabb5b28f0e9097e733"},
+    {file = "identify-2.5.32-py2.py3-none-any.whl", hash = "sha256:0b7656ef6cba81664b783352c73f8c24b39cf82f926f78f4550eda928e5e0545"},
+    {file = "identify-2.5.32.tar.gz", hash = "sha256:5d9979348ec1a21c768ae07e0a652924538e8bce67313a73cb0f681cf08ba407"},
 ]
 
 [package.extras]
@@ -620,47 +637,58 @@ setuptools = "*"
 
 [[package]]
 name = "numpy"
-version = "1.25.2"
+version = "1.26.2"
 description = "Fundamental package for array computing in Python"
 optional = false
 python-versions = ">=3.9"
 files = [
-    {file = "numpy-1.25.2-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:db3ccc4e37a6873045580d413fe79b68e47a681af8db2e046f1dacfa11f86eb3"},
-    {file = "numpy-1.25.2-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:90319e4f002795ccfc9050110bbbaa16c944b1c37c0baeea43c5fb881693ae1f"},
-    {file = "numpy-1.25.2-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:dfe4a913e29b418d096e696ddd422d8a5d13ffba4ea91f9f60440a3b759b0187"},
-    {file = "numpy-1.25.2-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:f08f2e037bba04e707eebf4bc934f1972a315c883a9e0ebfa8a7756eabf9e357"},
-    {file = "numpy-1.25.2-cp310-cp310-musllinux_1_1_x86_64.whl", hash = "sha256:bec1e7213c7cb00d67093247f8c4db156fd03075f49876957dca4711306d39c9"},
-    {file = "numpy-1.25.2-cp310-cp310-win32.whl", hash = "sha256:7dc869c0c75988e1c693d0e2d5b26034644399dd929bc049db55395b1379e044"},
-    {file = "numpy-1.25.2-cp310-cp310-win_amd64.whl", hash = "sha256:834b386f2b8210dca38c71a6e0f4fd6922f7d3fcff935dbe3a570945acb1b545"},
-    {file = "numpy-1.25.2-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:c5462d19336db4560041517dbb7759c21d181a67cb01b36ca109b2ae37d32418"},
-    {file = "numpy-1.25.2-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:c5652ea24d33585ea39eb6a6a15dac87a1206a692719ff45d53c5282e66d4a8f"},
-    {file = "numpy-1.25.2-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:0d60fbae8e0019865fc4784745814cff1c421df5afee233db6d88ab4f14655a2"},
-    {file = "numpy-1.25.2-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:60e7f0f7f6d0eee8364b9a6304c2845b9c491ac706048c7e8cf47b83123b8dbf"},
-    {file = "numpy-1.25.2-cp311-cp311-musllinux_1_1_x86_64.whl", hash = "sha256:bb33d5a1cf360304754913a350edda36d5b8c5331a8237268c48f91253c3a364"},
-    {file = "numpy-1.25.2-cp311-cp311-win32.whl", hash = "sha256:5883c06bb92f2e6c8181df7b39971a5fb436288db58b5a1c3967702d4278691d"},
-    {file = "numpy-1.25.2-cp311-cp311-win_amd64.whl", hash = "sha256:5c97325a0ba6f9d041feb9390924614b60b99209a71a69c876f71052521d42a4"},
-    {file = "numpy-1.25.2-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:b79e513d7aac42ae918db3ad1341a015488530d0bb2a6abcbdd10a3a829ccfd3"},
-    {file = "numpy-1.25.2-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:eb942bfb6f84df5ce05dbf4b46673ffed0d3da59f13635ea9b926af3deb76926"},
-    {file = "numpy-1.25.2-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:3e0746410e73384e70d286f93abf2520035250aad8c5714240b0492a7302fdca"},
-    {file = "numpy-1.25.2-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:d7806500e4f5bdd04095e849265e55de20d8cc4b661b038957354327f6d9b295"},
-    {file = "numpy-1.25.2-cp39-cp39-musllinux_1_1_x86_64.whl", hash = "sha256:8b77775f4b7df768967a7c8b3567e309f617dd5e99aeb886fa14dc1a0791141f"},
-    {file = "numpy-1.25.2-cp39-cp39-win32.whl", hash = "sha256:2792d23d62ec51e50ce4d4b7d73de8f67a2fd3ea710dcbc8563a51a03fb07b01"},
-    {file = "numpy-1.25.2-cp39-cp39-win_amd64.whl", hash = "sha256:76b4115d42a7dfc5d485d358728cdd8719be33cc5ec6ec08632a5d6fca2ed380"},
-    {file = "numpy-1.25.2-pp39-pypy39_pp73-macosx_10_9_x86_64.whl", hash = "sha256:1a1329e26f46230bf77b02cc19e900db9b52f398d6722ca853349a782d4cff55"},
-    {file = "numpy-1.25.2-pp39-pypy39_pp73-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:4c3abc71e8b6edba80a01a52e66d83c5d14433cbcd26a40c329ec7ed09f37901"},
-    {file = "numpy-1.25.2-pp39-pypy39_pp73-win_amd64.whl", hash = "sha256:1b9735c27cea5d995496f46a8b1cd7b408b3f34b6d50459d9ac8fe3a20cc17bf"},
-    {file = "numpy-1.25.2.tar.gz", hash = "sha256:fd608e19c8d7c55021dffd43bfe5492fab8cc105cc8986f813f8c3c048b38760"},
+    {file = "numpy-1.26.2-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:3703fc9258a4a122d17043e57b35e5ef1c5a5837c3db8be396c82e04c1cf9b0f"},
+    {file = "numpy-1.26.2-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:cc392fdcbd21d4be6ae1bb4475a03ce3b025cd49a9be5345d76d7585aea69440"},
+    {file = "numpy-1.26.2-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:36340109af8da8805d8851ef1d74761b3b88e81a9bd80b290bbfed61bd2b4f75"},
+    {file = "numpy-1.26.2-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:bcc008217145b3d77abd3e4d5ef586e3bdfba8fe17940769f8aa09b99e856c00"},
+    {file = "numpy-1.26.2-cp310-cp310-musllinux_1_1_aarch64.whl", hash = "sha256:3ced40d4e9e18242f70dd02d739e44698df3dcb010d31f495ff00a31ef6014fe"},
+    {file = "numpy-1.26.2-cp310-cp310-musllinux_1_1_x86_64.whl", hash = "sha256:b272d4cecc32c9e19911891446b72e986157e6a1809b7b56518b4f3755267523"},
+    {file = "numpy-1.26.2-cp310-cp310-win32.whl", hash = "sha256:22f8fc02fdbc829e7a8c578dd8d2e15a9074b630d4da29cda483337e300e3ee9"},
+    {file = "numpy-1.26.2-cp310-cp310-win_amd64.whl", hash = "sha256:26c9d33f8e8b846d5a65dd068c14e04018d05533b348d9eaeef6c1bd787f9919"},
+    {file = "numpy-1.26.2-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:b96e7b9c624ef3ae2ae0e04fa9b460f6b9f17ad8b4bec6d7756510f1f6c0c841"},
+    {file = "numpy-1.26.2-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:aa18428111fb9a591d7a9cc1b48150097ba6a7e8299fb56bdf574df650e7d1f1"},
+    {file = "numpy-1.26.2-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:06fa1ed84aa60ea6ef9f91ba57b5ed963c3729534e6e54055fc151fad0423f0a"},
+    {file = "numpy-1.26.2-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:96ca5482c3dbdd051bcd1fce8034603d6ebfc125a7bd59f55b40d8f5d246832b"},
+    {file = "numpy-1.26.2-cp311-cp311-musllinux_1_1_aarch64.whl", hash = "sha256:854ab91a2906ef29dc3925a064fcd365c7b4da743f84b123002f6139bcb3f8a7"},
+    {file = "numpy-1.26.2-cp311-cp311-musllinux_1_1_x86_64.whl", hash = "sha256:f43740ab089277d403aa07567be138fc2a89d4d9892d113b76153e0e412409f8"},
+    {file = "numpy-1.26.2-cp311-cp311-win32.whl", hash = "sha256:a2bbc29fcb1771cd7b7425f98b05307776a6baf43035d3b80c4b0f29e9545186"},
+    {file = "numpy-1.26.2-cp311-cp311-win_amd64.whl", hash = "sha256:2b3fca8a5b00184828d12b073af4d0fc5fdd94b1632c2477526f6bd7842d700d"},
+    {file = "numpy-1.26.2-cp312-cp312-macosx_10_9_x86_64.whl", hash = "sha256:a4cd6ed4a339c21f1d1b0fdf13426cb3b284555c27ac2f156dfdaaa7e16bfab0"},
+    {file = "numpy-1.26.2-cp312-cp312-macosx_11_0_arm64.whl", hash = "sha256:5d5244aabd6ed7f312268b9247be47343a654ebea52a60f002dc70c769048e75"},
+    {file = "numpy-1.26.2-cp312-cp312-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:6a3cdb4d9c70e6b8c0814239ead47da00934666f668426fc6e94cce869e13fd7"},
+    {file = "numpy-1.26.2-cp312-cp312-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:aa317b2325f7aa0a9471663e6093c210cb2ae9c0ad824732b307d2c51983d5b6"},
+    {file = "numpy-1.26.2-cp312-cp312-musllinux_1_1_aarch64.whl", hash = "sha256:174a8880739c16c925799c018f3f55b8130c1f7c8e75ab0a6fa9d41cab092fd6"},
+    {file = "numpy-1.26.2-cp312-cp312-musllinux_1_1_x86_64.whl", hash = "sha256:f79b231bf5c16b1f39c7f4875e1ded36abee1591e98742b05d8a0fb55d8a3eec"},
+    {file = "numpy-1.26.2-cp312-cp312-win32.whl", hash = "sha256:4a06263321dfd3598cacb252f51e521a8cb4b6df471bb12a7ee5cbab20ea9167"},
+    {file = "numpy-1.26.2-cp312-cp312-win_amd64.whl", hash = "sha256:b04f5dc6b3efdaab541f7857351aac359e6ae3c126e2edb376929bd3b7f92d7e"},
+    {file = "numpy-1.26.2-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:4eb8df4bf8d3d90d091e0146f6c28492b0be84da3e409ebef54349f71ed271ef"},
+    {file = "numpy-1.26.2-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:1a13860fdcd95de7cf58bd6f8bc5a5ef81c0b0625eb2c9a783948847abbef2c2"},
+    {file = "numpy-1.26.2-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:64308ebc366a8ed63fd0bf426b6a9468060962f1a4339ab1074c228fa6ade8e3"},
+    {file = "numpy-1.26.2-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:baf8aab04a2c0e859da118f0b38617e5ee65d75b83795055fb66c0d5e9e9b818"},
+    {file = "numpy-1.26.2-cp39-cp39-musllinux_1_1_aarch64.whl", hash = "sha256:d73a3abcac238250091b11caef9ad12413dab01669511779bc9b29261dd50210"},
+    {file = "numpy-1.26.2-cp39-cp39-musllinux_1_1_x86_64.whl", hash = "sha256:b361d369fc7e5e1714cf827b731ca32bff8d411212fccd29ad98ad622449cc36"},
+    {file = "numpy-1.26.2-cp39-cp39-win32.whl", hash = "sha256:bd3f0091e845164a20bd5a326860c840fe2af79fa12e0469a12768a3ec578d80"},
+    {file = "numpy-1.26.2-cp39-cp39-win_amd64.whl", hash = "sha256:2beef57fb031dcc0dc8fa4fe297a742027b954949cabb52a2a376c144e5e6060"},
+    {file = "numpy-1.26.2-pp39-pypy39_pp73-macosx_10_9_x86_64.whl", hash = "sha256:1cc3d5029a30fb5f06704ad6b23b35e11309491c999838c31f124fee32107c79"},
+    {file = "numpy-1.26.2-pp39-pypy39_pp73-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:94cc3c222bb9fb5a12e334d0479b97bb2df446fbe622b470928f5284ffca3f8d"},
+    {file = "numpy-1.26.2-pp39-pypy39_pp73-win_amd64.whl", hash = "sha256:fe6b44fb8fcdf7eda4ef4461b97b3f63c466b27ab151bec2366db8b197387841"},
+    {file = "numpy-1.26.2.tar.gz", hash = "sha256:f65738447676ab5777f11e6bbbdb8ce11b785e105f690bc45966574816b6d3ea"},
 ]
 
 [[package]]
 name = "packaging"
-version = "23.1"
+version = "23.2"
 description = "Core utilities for Python packages"
 optional = false
 python-versions = ">=3.7"
 files = [
-    {file = "packaging-23.1-py3-none-any.whl", hash = "sha256:994793af429502c4ea2ebf6bf664629d07c1a9fe974af92966e4b8d2df7edc61"},
-    {file = "packaging-23.1.tar.gz", hash = "sha256:a392980d2b6cffa644431898be54b0045151319d1e7ec34f0cfed48767dd334f"},
+    {file = "packaging-23.2-py3-none-any.whl", hash = "sha256:8c491190033a9af7e1d931d0b5dacc2ef47509b34dd0de67ed209b5203fc88c7"},
+    {file = "packaging-23.2.tar.gz", hash = "sha256:048fb0e9405036518eaaf48a55953c750c11e1a1b68e0dd1a9d62ed0c092cfc5"},
 ]
 
 [[package]]
@@ -676,13 +704,13 @@ files = [
 
 [[package]]
 name = "platformdirs"
-version = "3.10.0"
+version = "3.11.0"
 description = "A small Python package for determining appropriate platform-specific dirs, e.g. a \"user data dir\"."
 optional = false
 python-versions = ">=3.7"
 files = [
-    {file = "platformdirs-3.10.0-py3-none-any.whl", hash = "sha256:d7c24979f292f916dc9cbf8648319032f551ea8c49a4c9bf2fb556a02070ec1d"},
-    {file = "platformdirs-3.10.0.tar.gz", hash = "sha256:b45696dab2d7cc691a3226759c0d3b00c47c8b6e293d96f6436f733303f77f6d"},
+    {file = "platformdirs-3.11.0-py3-none-any.whl", hash = "sha256:e9d171d00af68be50e9202731309c4e658fd8bc76f55c11c7dd760d023bda68e"},
+    {file = "platformdirs-3.11.0.tar.gz", hash = "sha256:cf8ee52a3afdb965072dcc652433e0c7e3e40cf5ea1477cd4b3b1d2eb75495b3"},
 ]
 
 [package.extras]
@@ -691,13 +719,13 @@ test = ["appdirs (==1.4.4)", "covdefaults (>=2.3)", "pytest (>=7.4)", "pytest-co
 
 [[package]]
 name = "pluggy"
-version = "1.2.0"
+version = "1.3.0"
 description = "plugin and hook calling mechanisms for python"
 optional = false
-python-versions = ">=3.7"
+python-versions = ">=3.8"
 files = [
-    {file = "pluggy-1.2.0-py3-none-any.whl", hash = "sha256:c2fd55a7d7a3863cba1a013e4e2414658b1d07b6bc57b3919e0c63c9abb99849"},
-    {file = "pluggy-1.2.0.tar.gz", hash = "sha256:d12f0c4b579b15f5e054301bb226ee85eeeba08ffec228092f8defbaa3a4c4b3"},
+    {file = "pluggy-1.3.0-py3-none-any.whl", hash = "sha256:d89c696a773f8bd377d18e5ecda92b7a3793cbe66c87060a6fb58c7b6e1061f7"},
+    {file = "pluggy-1.3.0.tar.gz", hash = "sha256:cf61ae8f126ac6f7c451172cf30e3e43d3ca77615509771b3a984a0730651e12"},
 ]
 
 [package.extras]
@@ -706,13 +734,13 @@ testing = ["pytest", "pytest-benchmark"]
 
 [[package]]
 name = "pre-commit"
-version = "3.3.3"
+version = "3.5.0"
 description = "A framework for managing and maintaining multi-language pre-commit hooks."
 optional = false
 python-versions = ">=3.8"
 files = [
-    {file = "pre_commit-3.3.3-py2.py3-none-any.whl", hash = "sha256:10badb65d6a38caff29703362271d7dca483d01da88f9d7e05d0b97171c136cb"},
-    {file = "pre_commit-3.3.3.tar.gz", hash = "sha256:a2256f489cd913d575c145132ae196fe335da32d91a8294b7afe6622335dd023"},
+    {file = "pre_commit-3.5.0-py2.py3-none-any.whl", hash = "sha256:841dc9aef25daba9a0238cd27984041fa0467b4199fc4852e27950664919f660"},
+    {file = "pre_commit-3.5.0.tar.gz", hash = "sha256:5804465c675b659b0862f07907f96295d490822a450c4c40e747d0b1c6ebcb32"},
 ]
 
 [package.dependencies]
@@ -724,45 +752,46 @@ virtualenv = ">=20.10.0"
 
 [[package]]
 name = "pygments"
-version = "2.16.1"
+version = "2.17.0"
 description = "Pygments is a syntax highlighting package written in Python."
 optional = false
 python-versions = ">=3.7"
 files = [
-    {file = "Pygments-2.16.1-py3-none-any.whl", hash = "sha256:13fc09fa63bc8d8671a6d247e1eb303c4b343eaee81d861f3404db2935653692"},
-    {file = "Pygments-2.16.1.tar.gz", hash = "sha256:1daff0494820c69bc8941e407aa20f577374ee88364ee10a98fdbe0aece96e29"},
+    {file = "pygments-2.17.0-py3-none-any.whl", hash = "sha256:cd0c46944b2551af02ecc15961050182ea120d3895000e2676160820f3421527"},
+    {file = "pygments-2.17.0.tar.gz", hash = "sha256:edaa0fa2453d055d0ac94449d1f73ec7bc52c5e318204da1377c1392978c4a8d"},
 ]
 
 [package.extras]
 plugins = ["importlib-metadata"]
+windows-terminal = ["colorama (>=0.4.6)"]
 
 [[package]]
 name = "pyproject-api"
-version = "1.5.4"
+version = "1.6.1"
 description = "API to interact with the python pyproject.toml based projects"
 optional = false
 python-versions = ">=3.8"
 files = [
-    {file = "pyproject_api-1.5.4-py3-none-any.whl", hash = "sha256:ca462d457880340ceada078678a296ac500061cef77a040e1143004470ab0046"},
-    {file = "pyproject_api-1.5.4.tar.gz", hash = "sha256:8d41f3f0c04f0f6a830c27b1c425fa66699715ae06d8a054a1c5eeaaf8bfb145"},
+    {file = "pyproject_api-1.6.1-py3-none-any.whl", hash = "sha256:4c0116d60476b0786c88692cf4e325a9814965e2469c5998b830bba16b183675"},
+    {file = "pyproject_api-1.6.1.tar.gz", hash = "sha256:1817dc018adc0d1ff9ca1ed8c60e1623d5aaca40814b953af14a9cf9a5cae538"},
 ]
 
 [package.dependencies]
 packaging = ">=23.1"
 
 [package.extras]
-docs = ["furo (>=2023.7.26)", "sphinx (<7.2)", "sphinx-autodoc-typehints (>=1.24)"]
-testing = ["covdefaults (>=2.3)", "pytest (>=7.4)", "pytest-cov (>=4.1)", "pytest-mock (>=3.11.1)", "setuptools (>=68)", "wheel (>=0.41.1)"]
+docs = ["furo (>=2023.8.19)", "sphinx (<7.2)", "sphinx-autodoc-typehints (>=1.24)"]
+testing = ["covdefaults (>=2.3)", "pytest (>=7.4)", "pytest-cov (>=4.1)", "pytest-mock (>=3.11.1)", "setuptools (>=68.1.2)", "wheel (>=0.41.2)"]
 
 [[package]]
 name = "pytest"
-version = "7.4.0"
+version = "7.4.3"
 description = "pytest: simple powerful testing with Python"
 optional = false
 python-versions = ">=3.7"
 files = [
-    {file = "pytest-7.4.0-py3-none-any.whl", hash = "sha256:78bf16451a2eb8c7a2ea98e32dc119fd2aa758f1d5d66dbf0a59d69a3969df32"},
-    {file = "pytest-7.4.0.tar.gz", hash = "sha256:b4bf8c45bd59934ed84001ad51e11b4ee40d40a1229d2c79f9c592b0a3f6bd8a"},
+    {file = "pytest-7.4.3-py3-none-any.whl", hash = "sha256:0d009c083ea859a71b76adf7c1d502e4bc170b80a8ef002da5806527b9591fac"},
+    {file = "pytest-7.4.3.tar.gz", hash = "sha256:d989d136982de4e3b29dabcc838ad581c64e8ed52c11fbe86ddebd9da0818cd5"},
 ]
 
 [package.dependencies]
@@ -794,13 +823,13 @@ testing = ["fields", "hunter", "process-tests", "pytest-xdist", "six", "virtuale
 
 [[package]]
 name = "pytest-xdist"
-version = "3.3.1"
+version = "3.4.0"
 description = "pytest xdist plugin for distributed testing, most importantly across multiple CPUs"
 optional = false
 python-versions = ">=3.7"
 files = [
-    {file = "pytest-xdist-3.3.1.tar.gz", hash = "sha256:d5ee0520eb1b7bcca50a60a518ab7a7707992812c578198f8b44fdfac78e8c93"},
-    {file = "pytest_xdist-3.3.1-py3-none-any.whl", hash = "sha256:ff9daa7793569e6a68544850fd3927cd257cc03a7ef76c95e86915355e82b5f2"},
+    {file = "pytest-xdist-3.4.0.tar.gz", hash = "sha256:3a94a931dd9e268e0b871a877d09fe2efb6175c2c23d60d56a6001359002b832"},
+    {file = "pytest_xdist-3.4.0-py3-none-any.whl", hash = "sha256:e513118bf787677a427e025606f55e95937565e06dfaac8d87f55301e57ae607"},
 ]
 
 [package.dependencies]
@@ -940,13 +969,13 @@ use-chardet-on-py3 = ["chardet (>=3.0.2,<6)"]
 
 [[package]]
 name = "rich"
-version = "13.5.2"
+version = "13.7.0"
 description = "Render rich text, tables, progress bars, syntax highlighting, markdown and more to the terminal"
 optional = false
 python-versions = ">=3.7.0"
 files = [
-    {file = "rich-13.5.2-py3-none-any.whl", hash = "sha256:146a90b3b6b47cac4a73c12866a499e9817426423f57c5a66949c086191a8808"},
-    {file = "rich-13.5.2.tar.gz", hash = "sha256:fb9d6c0a0f643c99eed3875b5377a184132ba9be4d61516a55273d3554d75a39"},
+    {file = "rich-13.7.0-py3-none-any.whl", hash = "sha256:6da14c108c4866ee9520bbffa71f6fe3962e193b7da68720583850cd4548e235"},
+    {file = "rich-13.7.0.tar.gz", hash = "sha256:5cb5123b5cf9ee70584244246816e9114227e0b98ad9176eede6ad54bf5403fa"},
 ]
 
 [package.dependencies]
@@ -958,19 +987,19 @@ jupyter = ["ipywidgets (>=7.5.1,<9)"]
 
 [[package]]
 name = "setuptools"
-version = "68.1.2"
+version = "68.2.2"
 description = "Easily download, build, install, upgrade, and uninstall Python packages"
 optional = false
 python-versions = ">=3.8"
 files = [
-    {file = "setuptools-68.1.2-py3-none-any.whl", hash = "sha256:3d8083eed2d13afc9426f227b24fd1659489ec107c0e86cec2ffdde5c92e790b"},
-    {file = "setuptools-68.1.2.tar.gz", hash = "sha256:3d4dfa6d95f1b101d695a6160a7626e15583af71a5f52176efa5d39a054d475d"},
+    {file = "setuptools-68.2.2-py3-none-any.whl", hash = "sha256:b454a35605876da60632df1a60f736524eb73cc47bbc9f3f1ef1b644de74fd2a"},
+    {file = "setuptools-68.2.2.tar.gz", hash = "sha256:4ac1475276d2f1c48684874089fefcd83bd7162ddaafb81fac866ba0db282a87"},
 ]
 
 [package.extras]
-docs = ["furo", "jaraco.packaging (>=9.3)", "jaraco.tidelift (>=1.4)", "pygments-github-lexers (==0.0.5)", "rst.linker (>=1.9)", "sphinx (>=3.5,<=7.1.2)", "sphinx-favicon", "sphinx-hoverxref (<2)", "sphinx-inline-tabs", "sphinx-lint", "sphinx-notfound-page (==0.8.3)", "sphinx-reredirects", "sphinxcontrib-towncrier"]
+docs = ["furo", "jaraco.packaging (>=9.3)", "jaraco.tidelift (>=1.4)", "pygments-github-lexers (==0.0.5)", "rst.linker (>=1.9)", "sphinx (>=3.5)", "sphinx-favicon", "sphinx-hoverxref (<2)", "sphinx-inline-tabs", "sphinx-lint", "sphinx-notfound-page (>=1,<2)", "sphinx-reredirects", "sphinxcontrib-towncrier"]
 testing = ["build[virtualenv]", "filelock (>=3.4.0)", "flake8-2020", "ini2toml[lite] (>=0.9)", "jaraco.develop (>=7.21)", "jaraco.envs (>=2.2)", "jaraco.path (>=3.2.0)", "pip (>=19.1)", "pytest (>=6)", "pytest-black (>=0.3.7)", "pytest-checkdocs (>=2.4)", "pytest-cov", "pytest-enabler (>=2.2)", "pytest-mypy (>=0.9.1)", "pytest-perf", "pytest-ruff", "pytest-timeout", "pytest-xdist", "tomli-w (>=1.0.0)", "virtualenv (>=13.0.0)", "wheel"]
-testing-integration = ["build[virtualenv]", "filelock (>=3.4.0)", "jaraco.envs (>=2.2)", "jaraco.path (>=3.2.0)", "pytest", "pytest-enabler", "pytest-xdist", "tomli", "virtualenv (>=13.0.0)", "wheel"]
+testing-integration = ["build[virtualenv] (>=1.0.3)", "filelock (>=3.4.0)", "jaraco.envs (>=2.2)", "jaraco.path (>=3.2.0)", "packaging (>=23.1)", "pytest", "pytest-enabler", "pytest-xdist", "tomli", "virtualenv (>=13.0.0)", "wheel"]
 
 [[package]]
 name = "six"
@@ -985,13 +1014,13 @@ files = [
 
 [[package]]
 name = "soupsieve"
-version = "2.4.1"
+version = "2.5"
 description = "A modern CSS selector implementation for Beautiful Soup."
 optional = false
-python-versions = ">=3.7"
+python-versions = ">=3.8"
 files = [
-    {file = "soupsieve-2.4.1-py3-none-any.whl", hash = "sha256:1c1bfee6819544a3447586c889157365a27e10d88cde3ad3da0cf0ddf646feb8"},
-    {file = "soupsieve-2.4.1.tar.gz", hash = "sha256:89d12b2d5dfcd2c9e8c22326da9d9aa9cb3dfab0a83a024f05704076ee8d35ea"},
+    {file = "soupsieve-2.5-py3-none-any.whl", hash = "sha256:eaa337ff55a1579b6549dc679565eac1e3d000563bcb1c8ab0d0fefbc0c2cdc7"},
+    {file = "soupsieve-2.5.tar.gz", hash = "sha256:5663d5a7b3bfaeee0bc4372e7fc48f9cff4940b3eec54a6451cc5299f1097690"},
 ]
 
 [[package]]
@@ -1007,29 +1036,29 @@ files = [
 
 [[package]]
 name = "tox"
-version = "4.10.0"
+version = "4.11.3"
 description = "tox is a generic virtualenv management and test command line tool"
 optional = false
 python-versions = ">=3.8"
 files = [
-    {file = "tox-4.10.0-py3-none-any.whl", hash = "sha256:e4a1b1438955a6da548d69a52350054350cf6a126658c20943261c48ed6d4c92"},
-    {file = "tox-4.10.0.tar.gz", hash = "sha256:e041b2165375be690aca0ec4d96360c6906451380520e4665bf274f66112be35"},
+    {file = "tox-4.11.3-py3-none-any.whl", hash = "sha256:599af5e5bb0cad0148ac1558a0b66f8fff219ef88363483b8d92a81e4246f28f"},
+    {file = "tox-4.11.3.tar.gz", hash = "sha256:5039f68276461fae6a9452a3b2c7295798f00a0e92edcd9a3b78ba1a73577951"},
 ]
 
 [package.dependencies]
 cachetools = ">=5.3.1"
 chardet = ">=5.2"
 colorama = ">=0.4.6"
-filelock = ">=3.12.2"
+filelock = ">=3.12.3"
 packaging = ">=23.1"
 platformdirs = ">=3.10"
-pluggy = ">=1.2"
-pyproject-api = ">=1.5.3"
+pluggy = ">=1.3"
+pyproject-api = ">=1.6.1"
 virtualenv = ">=20.24.3"
 
 [package.extras]
-docs = ["furo (>=2023.7.26)", "sphinx (>=7.1.2)", "sphinx-argparse-cli (>=1.11.1)", "sphinx-autodoc-typehints (>=1.24)", "sphinx-copybutton (>=0.5.2)", "sphinx-inline-tabs (>=2023.4.21)", "sphinxcontrib-towncrier (>=0.2.1a0)", "towncrier (>=23.6)"]
-testing = ["build[virtualenv] (>=0.10)", "covdefaults (>=2.3)", "detect-test-pollution (>=1.1.1)", "devpi-process (>=0.3.1)", "diff-cover (>=7.7)", "distlib (>=0.3.7)", "flaky (>=3.7)", "hatch-vcs (>=0.3)", "hatchling (>=1.18)", "psutil (>=5.9.5)", "pytest (>=7.4)", "pytest-cov (>=4.1)", "pytest-mock (>=3.11.1)", "pytest-xdist (>=3.3.1)", "re-assert (>=1.1)", "time-machine (>=2.12)", "wheel (>=0.41.1)"]
+docs = ["furo (>=2023.8.19)", "sphinx (>=7.2.4)", "sphinx-argparse-cli (>=1.11.1)", "sphinx-autodoc-typehints (>=1.24)", "sphinx-copybutton (>=0.5.2)", "sphinx-inline-tabs (>=2023.4.21)", "sphinxcontrib-towncrier (>=0.2.1a0)", "towncrier (>=23.6)"]
+testing = ["build[virtualenv] (>=0.10)", "covdefaults (>=2.3)", "detect-test-pollution (>=1.1.1)", "devpi-process (>=1)", "diff-cover (>=7.7)", "distlib (>=0.3.7)", "flaky (>=3.7)", "hatch-vcs (>=0.3)", "hatchling (>=1.18)", "psutil (>=5.9.5)", "pytest (>=7.4)", "pytest-cov (>=4.1)", "pytest-mock (>=3.11.1)", "pytest-xdist (>=3.3.1)", "re-assert (>=1.1)", "time-machine (>=2.12)", "wheel (>=0.41.2)"]
 
 [[package]]
 name = "tqdm"
@@ -1051,32 +1080,42 @@ notebook = ["ipywidgets (>=6)"]
 slack = ["slack-sdk"]
 telegram = ["requests"]
 
+[[package]]
+name = "types-python-dateutil"
+version = "2.8.19.14"
+description = "Typing stubs for python-dateutil"
+optional = false
+python-versions = "*"
+files = [
+    {file = "types-python-dateutil-2.8.19.14.tar.gz", hash = "sha256:1f4f10ac98bb8b16ade9dbee3518d9ace017821d94b057a425b069f834737f4b"},
+    {file = "types_python_dateutil-2.8.19.14-py3-none-any.whl", hash = "sha256:f977b8de27787639986b4e28963263fd0e5158942b3ecef91b9335c130cb1ce9"},
+]
+
 [[package]]
 name = "urllib3"
-version = "2.0.4"
+version = "2.1.0"
 description = "HTTP library with thread-safe connection pooling, file post, and more."
 optional = false
-python-versions = ">=3.7"
+python-versions = ">=3.8"
 files = [
-    {file = "urllib3-2.0.4-py3-none-any.whl", hash = "sha256:de7df1803967d2c2a98e4b11bb7d6bd9210474c46e8a0401514e3a42a75ebde4"},
-    {file = "urllib3-2.0.4.tar.gz", hash = "sha256:8d22f86aae8ef5e410d4f539fde9ce6b2113a001bb4d189e0aed70642d602b11"},
+    {file = "urllib3-2.1.0-py3-none-any.whl", hash = "sha256:55901e917a5896a349ff771be919f8bd99aff50b79fe58fec595eb37bbc56bb3"},
+    {file = "urllib3-2.1.0.tar.gz", hash = "sha256:df7aa8afb0148fa78488e7899b2c59b5f4ffcfa82e6c54ccb9dd37c1d7b52d54"},
 ]
 
 [package.extras]
 brotli = ["brotli (>=1.0.9)", "brotlicffi (>=0.8.0)"]
-secure = ["certifi", "cryptography (>=1.9)", "idna (>=2.0.0)", "pyopenssl (>=17.1.0)", "urllib3-secure-extra"]
 socks = ["pysocks (>=1.5.6,!=1.5.7,<2.0)"]
 zstd = ["zstandard (>=0.18.0)"]
 
 [[package]]
 name = "virtualenv"
-version = "20.24.3"
+version = "20.24.6"
 description = "Virtual Python Environment builder"
 optional = false
 python-versions = ">=3.7"
 files = [
-    {file = "virtualenv-20.24.3-py3-none-any.whl", hash = "sha256:95a6e9398b4967fbcb5fef2acec5efaf9aa4972049d9ae41f95e0972a683fd02"},
-    {file = "virtualenv-20.24.3.tar.gz", hash = "sha256:e5c3b4ce817b0b328af041506a2a299418c98747c4b1e68cb7527e74ced23efc"},
+    {file = "virtualenv-20.24.6-py3-none-any.whl", hash = "sha256:520d056652454c5098a00c0f073611ccbea4c79089331f60bf9d7ba247bb7381"},
+    {file = "virtualenv-20.24.6.tar.gz", hash = "sha256:02ece4f56fbf939dbbc33c0715159951d6bf14aaf5457b092e4548e1382455af"},
 ]
 
 [package.dependencies]
@@ -1085,10 +1124,10 @@ filelock = ">=3.12.2,<4"
 platformdirs = ">=3.9.1,<4"
 
 [package.extras]
-docs = ["furo (>=2023.5.20)", "proselint (>=0.13)", "sphinx (>=7.0.1)", "sphinx-argparse (>=0.4)", "sphinxcontrib-towncrier (>=0.2.1a0)", "towncrier (>=23.6)"]
+docs = ["furo (>=2023.7.26)", "proselint (>=0.13)", "sphinx (>=7.1.2)", "sphinx-argparse (>=0.4)", "sphinxcontrib-towncrier (>=0.2.1a0)", "towncrier (>=23.6)"]
 test = ["covdefaults (>=2.3)", "coverage (>=7.2.7)", "coverage-enable-subprocess (>=1)", "flaky (>=3.7)", "packaging (>=23.1)", "pytest (>=7.4)", "pytest-env (>=0.8.2)", "pytest-freezer (>=0.4.8)", "pytest-mock (>=3.11.1)", "pytest-randomly (>=3.12)", "pytest-timeout (>=2.1)", "setuptools (>=68)", "time-machine (>=2.10)"]
 
 [metadata]
 lock-version = "2.0"
 python-versions = "^3.11"
-content-hash = "55b2e30a40c78c6fbb5ce945d91ad5258133073ae88bf1c9fa4234466f030e2b"
+content-hash = "3e5d1e1e4df0b389c4bb8963c5aa816798ffb018b99b3f79a64fd5dcf59b2384"
diff --git a/pyproject.toml b/pyproject.toml
index 2eafe398..92a2d828 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -7,26 +7,26 @@ license = "MIT"
 
 [tool.poetry.dependencies]
 python = "^3.11"
-anytree = "^2.9.0"
+anytree = "^2.12.1"
 click = "^8.1.7"
 requests = "^2.31.0"
 beautifulsoup4 = "^4.12.2"
 tqdm = "^4.66.1"
 attrs = "^23.1.0"
-numpy = "^1.25.2"
+numpy = "^1.26.2"
 adventofcodeutils = {git = "https://github.com/RoelAdriaans/adventofcodeutils.git"}
 more-itertools = "^10.1.0"
 regex-spm = "^1.0.0"
 
 [tool.poetry.dev-dependencies]
-black = "^23.7.0"
-cookiecutter = "^2.3.0"
-pytest = "^7.4.0"
+black = "^23.11.0"
+cookiecutter = "^2.4.0"
+pytest = "^7.4.3"
 pytest-cov = "^4.1.0"
-pytest-xdist = "^3.3.1"
+pytest-xdist = "^3.4.0"
 python-dotenv = "^1.0.0"
-tox = "^4.10.0"
-pre-commit = "^3.3.3"
+tox = "^4.11.3"
+pre-commit = "^3.5.0"
 isort = "^5.12.0"
 
 [tool.poetry.scripts]

From ee79060179eea47c4f65c6967fae719339602c5f Mon Sep 17 00:00:00 2001
From: Roel Adriaans <roel@adriaans.org>
Date: Sat, 18 Nov 2023 21:26:40 +0100
Subject: [PATCH 298/371] Run pyupgrade on all files and remove no longer used
 imports

---
 src/adventofcode2019/solutions/day03.py    |  6 ++----
 src/adventofcode2019/solutions/day06.py    |  4 +---
 src/adventofcode2019/solutions/day07.py    |  9 ++++-----
 src/adventofcode2019/solutions/day08.py    |  8 +++-----
 src/adventofcode2019/solutions/day10.py    | 12 ++++++------
 src/adventofcode2019/solutions/day12.py    |  7 +++----
 src/adventofcode2019/solutions/day13.py    |  3 +--
 src/adventofcode2019/solutions/day14.py    | 14 +++++++-------
 src/adventofcode2019/solutions/day15.py    |  8 ++++----
 src/adventofcode2019/solutions/day16.py    | 10 ++++------
 src/adventofcode2019/solutions/day17.py    |  5 ++---
 src/adventofcode2019/solutions/infi.py     |  6 +++---
 src/adventofcode2019/solutions/intcode.py  | 12 ++++++------
 src/adventofcode2019/utils/abstract.py     |  7 +++----
 src/adventofcode2019/utils/advent_utils.py |  7 ++-----
 src/adventofcode2020/solutions/day05.py    |  4 ++--
 src/adventofcode2020/solutions/day07.py    |  8 ++++----
 src/adventofcode2020/solutions/day08.py    |  6 ++----
 src/adventofcode2020/solutions/day09.py    |  7 +++----
 src/adventofcode2020/solutions/day10.py    |  3 +--
 src/adventofcode2020/solutions/day11.py    |  8 ++++----
 src/adventofcode2020/solutions/day12.py    |  6 +++---
 src/adventofcode2020/solutions/day14.py    | 13 ++++++-------
 src/adventofcode2020/solutions/day16.py    | 14 +++++++-------
 src/adventofcode2020/solutions/handheld.py |  8 ++++----
 src/adventofcode2020/utils/abstract.py     |  7 +++----
 src/adventofcode2020/utils/advent_utils.py |  7 ++-----
 src/adventofcode2022/solutions/day03.py    |  6 +++---
 28 files changed, 95 insertions(+), 120 deletions(-)

diff --git a/src/adventofcode2019/solutions/day03.py b/src/adventofcode2019/solutions/day03.py
index e46b011f..a0846fe4 100644
--- a/src/adventofcode2019/solutions/day03.py
+++ b/src/adventofcode2019/solutions/day03.py
@@ -1,5 +1,3 @@
-from typing import List
-
 from adventofcode2019.utils.abstract import FileReaderSolution
 
 
@@ -34,7 +32,7 @@ def __init__(self):
         self.lines = []
 
     @staticmethod
-    def create_line(input_str: str) -> List[Point]:
+    def create_line(input_str: str) -> list[Point]:
         """
         Create a line from the instructions in `input_str`.
         This function will return a List of `Point` namedtuples.
@@ -42,7 +40,7 @@ def create_line(input_str: str) -> List[Point]:
         LetterNumbers, where letter is in RUDN.
         Example "R20,U10,D9,L83"
         """
-        points: List[Point] = []
+        points: list[Point] = []
 
         # start = Point(100, 100)
         # points.append(start)
diff --git a/src/adventofcode2019/solutions/day06.py b/src/adventofcode2019/solutions/day06.py
index 3184b7ec..72334d61 100644
--- a/src/adventofcode2019/solutions/day06.py
+++ b/src/adventofcode2019/solutions/day06.py
@@ -1,5 +1,3 @@
-from typing import List
-
 from anytree import Node, Walker  # type: ignore
 
 from adventofcode2019.utils.abstract import FileReaderSolution
@@ -11,7 +9,7 @@ def __init__(self):
         self.root_node = None
 
     @staticmethod
-    def parse_lines(input_lines) -> List:
+    def parse_lines(input_lines) -> list:
         orbits = []
         for line in input_lines:
             a, b = line.split(")")
diff --git a/src/adventofcode2019/solutions/day07.py b/src/adventofcode2019/solutions/day07.py
index beca31c4..2097b4b8 100644
--- a/src/adventofcode2019/solutions/day07.py
+++ b/src/adventofcode2019/solutions/day07.py
@@ -1,5 +1,4 @@
 import itertools
-from typing import List, Tuple
 
 from adventofcode2019.solutions.intcode import IntCode, ProgramFinished
 from adventofcode2019.utils.abstract import FileReaderSolution
@@ -9,7 +8,7 @@
 class Day07:
     @staticmethod
     def compute_results_for_looped_sequence(
-        instructions: List[int], sequence: Tuple
+        instructions: list[int], sequence: tuple
     ) -> int:
         """
         For program `instructions`, compute the result for the sequence in the string
@@ -42,13 +41,13 @@ def compute_results_for_looped_sequence(
                     last_value = result
 
     def get_best_looped_sequence(
-        self, start, stop, instructions: List[int]
-    ) -> Tuple[str, int]:
+        self, start, stop, instructions: list[int]
+    ) -> tuple[str, int]:
         """Get the sequence with the best output"""
         # Generate all the options
         # We loop because we have 10 computers,
         max_result = -1
-        max_sequence: Tuple[int, ...] = (0, 0, 0, 0, 0)
+        max_sequence: tuple[int, ...] = (0, 0, 0, 0, 0)
         for sequence in itertools.permutations(range(start, stop)):
             result = self.compute_results_for_looped_sequence(instructions, sequence)
             if result > max_result:
diff --git a/src/adventofcode2019/solutions/day08.py b/src/adventofcode2019/solutions/day08.py
index 545e5347..4f871961 100644
--- a/src/adventofcode2019/solutions/day08.py
+++ b/src/adventofcode2019/solutions/day08.py
@@ -1,10 +1,8 @@
-from typing import List
-
 from adventofcode2019.utils.abstract import FileReaderSolution
 
 
 class Day08:
-    frames: List[str]
+    frames: list[str]
     width = 0
     height = 0
 
@@ -32,7 +30,7 @@ def layer_with_fewest_digit(self, number_to_find: int):
         return min(found, key=found.get)  # type: ignore
 
     @staticmethod
-    def _compute_per_pixel(pixels: List[int]) -> int:
+    def _compute_per_pixel(pixels: list[int]) -> int:
         for pixel in pixels:
             if pixel == 2:
                 continue
@@ -49,7 +47,7 @@ def get_computed_image(self):
             resulting_image.append(result)
         return resulting_image
 
-    def printable_image(self, image_data: List[int]):
+    def printable_image(self, image_data: list[int]):
         lines = [
             "".join(map(str, image_data[i : i + self.width]))
             for i in range(0, len(image_data), self.width)
diff --git a/src/adventofcode2019/solutions/day10.py b/src/adventofcode2019/solutions/day10.py
index f245fc30..8d2281f0 100644
--- a/src/adventofcode2019/solutions/day10.py
+++ b/src/adventofcode2019/solutions/day10.py
@@ -1,6 +1,6 @@
 import math
 from collections import defaultdict
-from typing import Dict, List, NamedTuple, Set, Tuple
+from typing import NamedTuple
 
 from adventofcode2019.utils.abstract import FileReaderSolution
 
@@ -17,8 +17,8 @@ class GridInfo(NamedTuple):
 
 
 class Day10:
-    astroids: List[Astroid]
-    astroids_destroyed: List[Astroid]
+    astroids: list[Astroid]
+    astroids_destroyed: list[Astroid]
 
     def create_map(self, input_data: str):
         """Create a map from input_data."""
@@ -55,7 +55,7 @@ def count_asteroids_for_location(self, x: int, y: int) -> int:
         We do this by calculator the different angles we can see from this point.
         Duplicate angles are ignored.
         """
-        found_angles: Set[float] = set()
+        found_angles: set[float] = set()
         point_in_space = Astroid(x=x, y=y)
 
         for astroid in self.astroids:
@@ -72,7 +72,7 @@ def find_best_spot(self) -> int:
         """Find the best spot to be in, and return how many astroids we can spot"""
         return self.get_best_astroid()[1]
 
-    def get_best_astroid(self) -> Tuple[Astroid, int]:
+    def get_best_astroid(self) -> tuple[Astroid, int]:
         """Return the best astroid location and the number of visable astroids"""
         locations = {
             astroid: self.count_asteroids_for_location(astroid.x, astroid.y)
@@ -83,7 +83,7 @@ def get_best_astroid(self) -> Tuple[Astroid, int]:
 
     def calculate_angles(self, location: Astroid):
         """Create a dict with all the angles for the asteroids and the distance"""
-        angles: Dict[float, List] = defaultdict(list)
+        angles: dict[float, list] = defaultdict(list)
         for astroid in self.astroids:
             angle = self._get_angle(location, astroid)
             distance = self._get_distance(location, astroid)
diff --git a/src/adventofcode2019/solutions/day12.py b/src/adventofcode2019/solutions/day12.py
index 39d3fc94..91bc1062 100644
--- a/src/adventofcode2019/solutions/day12.py
+++ b/src/adventofcode2019/solutions/day12.py
@@ -1,5 +1,4 @@
 from itertools import combinations
-from typing import List, Set, Tuple
 
 import numpy as np  # type: ignore
 
@@ -85,7 +84,7 @@ def get_total_energy(self) -> int:
 
 
 class Galaxy:
-    moons: List[Moon]
+    moons: list[Moon]
 
     def __eq__(self, other) -> bool:
         return self.moons == other.moons
@@ -149,7 +148,7 @@ def solve(self, input_data: str) -> int:
 
 class Day12PartB(Day12, FileReaderSolution):
     @staticmethod
-    def return_one_var(galaxy: Galaxy, var: str) -> Tuple[int, ...]:
+    def return_one_var(galaxy: Galaxy, var: str) -> tuple[int, ...]:
         """Create a tuple with the Position and Velocity values for `var`"""
         vardx = f"d{var}"
         values = tuple([getattr(moon, var) for moon in galaxy.moons]) + tuple(
@@ -165,7 +164,7 @@ def find_returning(self, galaxy: Galaxy, var: str) -> int:
         """
 
         i = 0
-        visited: Set[Tuple] = set()
+        visited: set[tuple] = set()
         while True:
             values = self.return_one_var(galaxy, var)
             if values in visited:
diff --git a/src/adventofcode2019/solutions/day13.py b/src/adventofcode2019/solutions/day13.py
index 524e4f1b..820b41a4 100644
--- a/src/adventofcode2019/solutions/day13.py
+++ b/src/adventofcode2019/solutions/day13.py
@@ -1,6 +1,5 @@
 from collections import defaultdict
 from enum import IntEnum
-from typing import List
 
 from adventofcode2019.solutions.intcode import IntCode, ProgramFinished
 from adventofcode2019.utils.abstract import FileReaderSolution
@@ -59,7 +58,7 @@ def draw_tile(self, x: int, y: int, tile: Tile) -> None:
         """Draw a single tile"""
         self.screen[(x, y)] = tile
 
-    def get_location_for_tiles(self, type: Tile) -> List:
+    def get_location_for_tiles(self, type: Tile) -> list:
         tiles = [location for location, value in self.screen.items() if value == type]
         return tiles
 
diff --git a/src/adventofcode2019/solutions/day14.py b/src/adventofcode2019/solutions/day14.py
index b6f5e18e..d78bb229 100644
--- a/src/adventofcode2019/solutions/day14.py
+++ b/src/adventofcode2019/solutions/day14.py
@@ -2,7 +2,7 @@
 import typing
 from collections import Counter, defaultdict
 from dataclasses import dataclass
-from typing import Dict, List, NamedTuple
+from typing import NamedTuple
 
 from adventofcode2019.utils.abstract import FileReaderSolution
 
@@ -13,7 +13,7 @@ class Chemical(NamedTuple):
 
 
 class Recipe(NamedTuple):
-    inputs: List[Chemical]
+    inputs: list[Chemical]
     output: Chemical
 
     @staticmethod
@@ -57,7 +57,7 @@ def add_edge(self, node: "Node"):
 
 class NanoFactory:
     warehouse: defaultdict
-    recipes: Dict[str, Recipe]
+    recipes: dict[str, Recipe]
 
     def __init__(self):
         self.warehouse = defaultdict(int)
@@ -68,7 +68,7 @@ def read_input(self, input_lines: str):
             recipe = Recipe.parse_recipe_string(line)
             self.recipes[recipe.output.name] = recipe
 
-    def _get_requirement_for_one(self, output: str, n: int) -> Dict[str, int]:
+    def _get_requirement_for_one(self, output: str, n: int) -> dict[str, int]:
         """Compute what we need for `n` units of `output` and return this as a Dict.
         For example, with the recipe `4 C, 1 A => 1 CA`, when we need 4 of `CA`, return
         {"C": 16, "A": 4}
@@ -85,7 +85,7 @@ def _get_requirement_for_one(self, output: str, n: int) -> Dict[str, int]:
                 result[input_recipe.name] = input_recipe.consumable * number_needed
         return result
 
-    def dep_resolve(self, node: Node, resolved: List, unresolved: List):
+    def dep_resolve(self, node: Node, resolved: list, unresolved: list):
         """
         Resolve the order in which we need to process out recipe.
         Does checks for circular dependencies ( A->B->C->A )
@@ -132,10 +132,10 @@ def create_nodes(self) -> Node:
 
         return root_node
 
-    def resolve_tree(self) -> List[Node]:
+    def resolve_tree(self) -> list[Node]:
         """Resolve the tree and return a list of nodes in order to process them."""
         root_node = self.create_nodes()
-        resolved: List[Node] = []
+        resolved: list[Node] = []
         self.dep_resolve(root_node, resolved, [])
         return resolved
 
diff --git a/src/adventofcode2019/solutions/day15.py b/src/adventofcode2019/solutions/day15.py
index 5c4ac95d..2f893dc8 100644
--- a/src/adventofcode2019/solutions/day15.py
+++ b/src/adventofcode2019/solutions/day15.py
@@ -1,6 +1,6 @@
 from collections import deque
 from enum import IntEnum
-from typing import Dict, NamedTuple, Optional
+from typing import NamedTuple
 
 from adventofcode2019.solutions.intcode import IntCode
 from adventofcode2019.utils.abstract import FileReaderSolution
@@ -66,9 +66,9 @@ class Location:
     """Location / Pixel in the maze"""
 
     point: Point
-    location_type: Optional[Tile]
+    location_type: Tile | None
 
-    def __init__(self, point: Point, location_type: Optional[Tile] = None):
+    def __init__(self, point: Point, location_type: Tile | None = None):
         self.point = point
         self.location_type = location_type
 
@@ -85,7 +85,7 @@ class VisitQueue(NamedTuple):
 
 
 class Day15:
-    grid: Dict[Point, Location]
+    grid: dict[Point, Location]
     oxygen_points: set
 
     def show_screen(self, droid_point: Point):
diff --git a/src/adventofcode2019/solutions/day16.py b/src/adventofcode2019/solutions/day16.py
index 247d06a9..f20ef2e2 100644
--- a/src/adventofcode2019/solutions/day16.py
+++ b/src/adventofcode2019/solutions/day16.py
@@ -1,5 +1,3 @@
-from typing import List
-
 from adventofcode2019.utils.abstract import FileReaderSolution
 from adventofcode2019.utils.advent_utils import string_of_single_to_list_of_ints
 
@@ -7,7 +5,7 @@
 class Day16:
     base_pattern = [0, 1, 0, -1]
 
-    def generate_pattern(self, num_digits: int, multiplier: int) -> List[int]:
+    def generate_pattern(self, num_digits: int, multiplier: int) -> list[int]:
         """
         Generate the pattern.
         `num_digits` will be the number of digits in the stream,
@@ -15,7 +13,7 @@ def generate_pattern(self, num_digits: int, multiplier: int) -> List[int]:
 
         The first digit is skipped
         """
-        result: List[int] = []
+        result: list[int] = []
         while len(result) < num_digits + 1:
             for i in self.base_pattern:
                 result.extend([i] * multiplier)
@@ -23,7 +21,7 @@ def generate_pattern(self, num_digits: int, multiplier: int) -> List[int]:
         res = result[1 : num_digits + 1]
         return res
 
-    def compute_phase(self, input_signal: List[int]) -> List[int]:
+    def compute_phase(self, input_signal: list[int]) -> list[int]:
         output_signal = []
         for multiplier in range(1, len(input_signal) + 1):
             matrix = self.generate_pattern(len(input_signal), multiplier)
@@ -32,7 +30,7 @@ def compute_phase(self, input_signal: List[int]) -> List[int]:
             output_signal.append(line_sum)
         return output_signal
 
-    def run_phases(self, input_signal: List[int], num_phases) -> List[int]:
+    def run_phases(self, input_signal: list[int], num_phases) -> list[int]:
         for _ in range(num_phases):
             input_signal = self.compute_phase(input_signal)
         return input_signal
diff --git a/src/adventofcode2019/solutions/day17.py b/src/adventofcode2019/solutions/day17.py
index 99d8fc3b..1b98e5f6 100644
--- a/src/adventofcode2019/solutions/day17.py
+++ b/src/adventofcode2019/solutions/day17.py
@@ -1,5 +1,4 @@
 from collections import defaultdict
-from typing import List, Tuple, Dict
 
 from adventofcode2019.solutions.intcode import IntCode, ProgramFinished
 from adventofcode2019.utils.abstract import FileReaderSolution
@@ -12,7 +11,7 @@ def print_grid(grid):
         for row in grid.values():
             print("".join([chr(i) for i in row.values()]), end="\n")
 
-    def run_bot(self, input_data: str) -> Dict[int, Dict[int, int]]:
+    def run_bot(self, input_data: str) -> dict[int, dict[int, int]]:
         instructions = string_to_list_of_ints(input_data)
 
         intcode = IntCode()
@@ -60,7 +59,7 @@ def compute_points(grid_lines):
         return matches
 
     @staticmethod
-    def compute_scores(matches: List[Tuple[int, int]]) -> int:
+    def compute_scores(matches: list[tuple[int, int]]) -> int:
         return sum([x[0] * x[1] for x in matches])
 
 
diff --git a/src/adventofcode2019/solutions/infi.py b/src/adventofcode2019/solutions/infi.py
index 48e5e217..3f1fa1d6 100644
--- a/src/adventofcode2019/solutions/infi.py
+++ b/src/adventofcode2019/solutions/infi.py
@@ -5,7 +5,7 @@
 from collections import deque
 from dataclasses import dataclass
 from pathlib import Path
-from typing import Dict, NamedTuple
+from typing import NamedTuple
 
 
 class Point(NamedTuple):
@@ -20,7 +20,7 @@ class Santa:
 
 class Infi:
     filename: str
-    flats: Dict[int, Point]
+    flats: dict[int, Point]
     jumps: deque
     santa: Santa
 
@@ -37,7 +37,7 @@ def _load_data(self):
         root_dir = Path(__file__).parent.parent
         # with open(root_dir / "solutions" / "data" / input_file) as f:
 
-        with open(root_dir / "solutions" / "data" / "infi" / self.filename, "r") as f:
+        with open(root_dir / "solutions" / "data" / "infi" / self.filename) as f:
             data = json.load(f)
 
         self.flats = {}
diff --git a/src/adventofcode2019/solutions/intcode.py b/src/adventofcode2019/solutions/intcode.py
index f96df4af..5febe610 100644
--- a/src/adventofcode2019/solutions/intcode.py
+++ b/src/adventofcode2019/solutions/intcode.py
@@ -1,7 +1,7 @@
 import json
 from collections import defaultdict, deque
 from enum import IntEnum
-from typing import DefaultDict, List, Tuple
+from typing import DefaultDict
 
 
 class ProgramFinished(Exception):
@@ -76,21 +76,21 @@ def reset(self):
         self.instructions = defaultdict(int)
         self.input_values = deque([])
 
-    def load_instructions(self, instructions: List[int]):
+    def load_instructions(self, instructions: list[int]):
         self.program_counter = 0
         for i, instruction in enumerate(instructions):
             self.instructions[i] = instruction
 
-    def load_input_values(self, input_values: List[int]):
+    def load_input_values(self, input_values: list[int]):
         self.input_values.extend(input_values)
 
-    def set_input_value(self, input_values: List[int]):
+    def set_input_value(self, input_values: list[int]):
         self.input_values = deque(input_values)
 
     def set_input_function(self, input_function):
         self.input_function = input_function
 
-    def _parse_current_opcode(self) -> Tuple[int, List[int]]:
+    def _parse_current_opcode(self) -> tuple[int, list[int]]:
         current_opcode = self.instructions[self.program_counter]
         opcode_length = len(str(current_opcode))
         if opcode_length >= 6:
@@ -269,7 +269,7 @@ def run_return_or_raise(self) -> int:
             if res is not None:
                 return res
 
-    def run_until_finished(self) -> List[int]:
+    def run_until_finished(self) -> list[int]:
         result = []
         while True:
             try:
diff --git a/src/adventofcode2019/utils/abstract.py b/src/adventofcode2019/utils/abstract.py
index cbf6b2a7..7b3eaeb2 100644
--- a/src/adventofcode2019/utils/abstract.py
+++ b/src/adventofcode2019/utils/abstract.py
@@ -1,11 +1,10 @@
 from abc import ABC, abstractmethod
 from pathlib import Path
-from typing import Union
 
 
 class AbstractSolution(ABC):
     @abstractmethod
-    def solve(self, input_data: str) -> Union[str, int]:
+    def solve(self, input_data: str) -> str | int:
         raise NotImplementedError
 
 
@@ -14,7 +13,7 @@ class SimpleSolution(AbstractSolution, ABC):
     This solution implements a simple input_text that is used by the solve method.
     """
 
-    def __call__(self, input_text: str) -> Union[str, int]:
+    def __call__(self, input_text: str) -> str | int:
         """
         Give the input_text as parameter, process this and return the result
         """
@@ -27,7 +26,7 @@ class FileReaderSolution(AbstractSolution, ABC):
     Implement filereader
     """
 
-    def __call__(self, input_file: str) -> Union[str, int]:
+    def __call__(self, input_file: str) -> str | int:
         """
         Give the input_text as parameter, process this and return the result
         """
diff --git a/src/adventofcode2019/utils/advent_utils.py b/src/adventofcode2019/utils/advent_utils.py
index 8303a142..52b0a5a3 100644
--- a/src/adventofcode2019/utils/advent_utils.py
+++ b/src/adventofcode2019/utils/advent_utils.py
@@ -1,7 +1,4 @@
-from typing import List
-
-
-def string_to_list_of_ints(input_string: str, split_string: str = ",") -> List[int]:
+def string_to_list_of_ints(input_string: str, split_string: str = ",") -> list[int]:
     """
     Split a string on `split_string` and return a list of integers
 
@@ -13,7 +10,7 @@ def string_to_list_of_ints(input_string: str, split_string: str = ",") -> List[i
     return list_of_ints
 
 
-def string_of_single_to_list_of_ints(input_string: str) -> List[int]:
+def string_of_single_to_list_of_ints(input_string: str) -> list[int]:
     """
     Split a string on `split_string` and return a list of integers
 
diff --git a/src/adventofcode2020/solutions/day05.py b/src/adventofcode2020/solutions/day05.py
index 9a8385cd..a9c189c6 100644
--- a/src/adventofcode2020/solutions/day05.py
+++ b/src/adventofcode2020/solutions/day05.py
@@ -1,7 +1,7 @@
 from __future__ import annotations
 
 from collections import defaultdict
-from typing import Dict, NamedTuple
+from typing import NamedTuple
 
 from adventofcode2020.utils.abstract import FileReaderSolution
 
@@ -73,7 +73,7 @@ def solve(self, input_data: str) -> int:
 
 class Day05PartB(Day05, FileReaderSolution):
     def solve(self, input_data: str) -> int:
-        tickets: Dict[int, Dict] = defaultdict(dict)
+        tickets: dict[int, dict] = defaultdict(dict)
         for boarding_str in input_data.splitlines():
             boarding_ticket = BoardingTicket.from_str(boarding_str)
             tickets[boarding_ticket.row][boarding_ticket.col] = boarding_ticket
diff --git a/src/adventofcode2020/solutions/day07.py b/src/adventofcode2020/solutions/day07.py
index 8998d14d..2d540e48 100644
--- a/src/adventofcode2020/solutions/day07.py
+++ b/src/adventofcode2020/solutions/day07.py
@@ -3,7 +3,7 @@
 import logging
 import re
 from dataclasses import dataclass
-from typing import Any, Dict, Optional
+from typing import Any
 
 from adventofcode2020.utils.abstract import FileReaderSolution
 
@@ -18,7 +18,7 @@ class Bag:
 
     color: str
     num_bags: int
-    contains: Dict[Bag, int]  # Edge
+    contains: dict[Bag, int]  # Edge
 
     def __init__(self, color, num_bags):
         self.color = color
@@ -45,8 +45,8 @@ def __hash__(self):
 
 class Day07:
     def __init__(self):
-        self.bags: Dict[str, Bag] = {}
-        self.root_bag: Optional[Bag] = None
+        self.bags: dict[str, Bag] = {}
+        self.root_bag: Bag | None = None
 
     def from_string(self, input_str: str) -> Bag:
         """
diff --git a/src/adventofcode2020/solutions/day08.py b/src/adventofcode2020/solutions/day08.py
index 336cc2ac..92a83c1f 100644
--- a/src/adventofcode2020/solutions/day08.py
+++ b/src/adventofcode2020/solutions/day08.py
@@ -1,5 +1,3 @@
-from typing import List
-
 from adventofcode2020.solutions.handheld import HandHeld
 from adventofcode2020.utils.abstract import FileReaderSolution
 
@@ -7,7 +5,7 @@
 class Day08:
     hh: HandHeld
 
-    def run_handheld(self, instructions: List[str]) -> int:
+    def run_handheld(self, instructions: list[str]) -> int:
         self.hh = HandHeld()
         self.hh.load_instructions(instructions)
         return self.hh.run(infite_loop_detection=True)
@@ -19,7 +17,7 @@ def solve(self, input_data: str) -> int:
 
 
 class Day08PartB(Day08, FileReaderSolution):
-    def run_until_finished_handheld(self, instructions: List[str]) -> int:
+    def run_until_finished_handheld(self, instructions: list[str]) -> int:
         self.hh = HandHeld()
         self.hh.load_instructions(instructions)
         return self.hh.run_until_finished_return_acc(infite_loop_detection=True)
diff --git a/src/adventofcode2020/solutions/day09.py b/src/adventofcode2020/solutions/day09.py
index 1a11945f..e410b82a 100644
--- a/src/adventofcode2020/solutions/day09.py
+++ b/src/adventofcode2020/solutions/day09.py
@@ -1,18 +1,17 @@
 from itertools import combinations
-from typing import List
 
 from adventofcode2020.utils.abstract import FileReaderSolution
 
 
 class Day09:
-    def check_preamble(self, integers: List[int], next_number: int) -> bool:
+    def check_preamble(self, integers: list[int], next_number: int) -> bool:
         for x, y in combinations(integers, r=2):
             if x + y == next_number:
                 return True
 
         return False
 
-    def find_first_invalid_number(self, integers: List[int]) -> int:
+    def find_first_invalid_number(self, integers: list[int]) -> int:
         for i in range(0, len(integers)):
             begin = i
             end = i + 25
@@ -31,7 +30,7 @@ def solve(self, input_data: str) -> int:
 
 
 class Day09PartB(Day09, FileReaderSolution):
-    def find_slice(self, integers: List[int], num_to_find: int) -> int:
+    def find_slice(self, integers: list[int], num_to_find: int) -> int:
         for top in range(0, len(integers)):
             for bottom in range(top, len(integers)):
                 total = sum(integers[top:bottom])
diff --git a/src/adventofcode2020/solutions/day10.py b/src/adventofcode2020/solutions/day10.py
index e99ede15..a00945aa 100644
--- a/src/adventofcode2020/solutions/day10.py
+++ b/src/adventofcode2020/solutions/day10.py
@@ -1,6 +1,5 @@
 import typing
 from collections import Counter, deque
-from typing import List
 
 from adventofcode2020.utils.abstract import FileReaderSolution
 
@@ -25,7 +24,7 @@ def find_diferences(self, joltages: deque) -> typing.Counter:
 
         return differences
 
-    def find_combinations(self, joltages: List[int]) -> int:
+    def find_combinations(self, joltages: list[int]) -> int:
         connections = {joltages[-1]: 1}
 
         for adapter in reversed(joltages[:-1]):
diff --git a/src/adventofcode2020/solutions/day11.py b/src/adventofcode2020/solutions/day11.py
index f4a46d5c..2ff46b0d 100644
--- a/src/adventofcode2020/solutions/day11.py
+++ b/src/adventofcode2020/solutions/day11.py
@@ -1,6 +1,6 @@
 from abc import abstractmethod
 from collections import defaultdict, deque
-from typing import Deque, Dict
+from typing import Deque
 
 from adventofcode2020.utils.abstract import FileReaderSolution
 
@@ -12,18 +12,18 @@ class Day11:
     def count_next_to_it(self, grid, row, col) -> int:
         """Count the number of seats next to it/ Depends on the part"""
 
-    def str_to_map(self, input_data) -> Dict[int, Dict]:
+    def str_to_map(self, input_data) -> dict[int, dict]:
         grid = {}
         for row, line in enumerate(input_data.splitlines()):
             grid[row] = {k: v for k, v in enumerate(line)}
 
         return grid
 
-    def generation(self, grid) -> Dict[int, Dict]:
+    def generation(self, grid) -> dict[int, dict]:
         # First we will compute the numbers, and then assign it to a new dict
         # This works, but it not really performance proof..
 
-        new_grid: Dict[int, Dict] = defaultdict(dict)
+        new_grid: dict[int, dict] = defaultdict(dict)
         for row in range(0, len(grid)):
             for col in range(0, len(grid[row])):
                 if grid[row][col] == ".":
diff --git a/src/adventofcode2020/solutions/day12.py b/src/adventofcode2020/solutions/day12.py
index 77e3aad1..9377778d 100644
--- a/src/adventofcode2020/solutions/day12.py
+++ b/src/adventofcode2020/solutions/day12.py
@@ -3,7 +3,7 @@
 import math
 from dataclasses import dataclass
 from enum import Enum
-from typing import List, NamedTuple
+from typing import NamedTuple
 
 from adventofcode2020.utils.abstract import FileReaderSolution
 
@@ -86,7 +86,7 @@ def compute_manhathan(self) -> int:
 
 
 class Day12PartA(Day12, FileReaderSolution):
-    def parse_instructions(self, instructions: List[Instruction]):
+    def parse_instructions(self, instructions: list[Instruction]):
         for inst in instructions:
             action = inst.action.value
             if action == "F":
@@ -137,7 +137,7 @@ def solve(self, input_data: str) -> int:
 
 
 class Day12PartB(Day12, FileReaderSolution):
-    def parse_instructions(self, instructions: List[Instruction]):
+    def parse_instructions(self, instructions: list[Instruction]):
         for inst in instructions:
             action = inst.action.value
             if action == "F":
diff --git a/src/adventofcode2020/solutions/day14.py b/src/adventofcode2020/solutions/day14.py
index 84cda1bc..f639a3d9 100644
--- a/src/adventofcode2020/solutions/day14.py
+++ b/src/adventofcode2020/solutions/day14.py
@@ -3,7 +3,6 @@
 from abc import abstractmethod
 from collections import defaultdict
 from dataclasses import dataclass
-from typing import List
 
 from adventofcode2020.utils.abstract import FileReaderSolution
 
@@ -17,14 +16,14 @@ class Instruction:
 @dataclass
 class Program:
     bitmask: str
-    entries: List[Instruction]
+    entries: list[Instruction]
 
 
 class Day14:
     memory = typing.DefaultDict[int, int]
 
     @staticmethod
-    def parse_programs(input_data: str) -> List[Program]:
+    def parse_programs(input_data: str) -> list[Program]:
         parts = input_data.split("mask")
         programs = []
         for part in parts:
@@ -49,7 +48,7 @@ def compute_sum(self) -> int:
         return sum(self.memory.values())  # type: ignore
 
     @abstractmethod
-    def process_programs(self, programs: List[Program]):
+    def process_programs(self, programs: list[Program]):
         """Process the program based on the version"""
 
     def solve(self, input_data: str) -> int:
@@ -61,7 +60,7 @@ def solve(self, input_data: str) -> int:
 
 
 class Day14PartA(Day14, FileReaderSolution):
-    def process_programs(self, programs: List[Program]):
+    def process_programs(self, programs: list[Program]):
         """
         Process the instructions in the `programs` list
         mask:
@@ -93,7 +92,7 @@ def clear_bit(value, bit):
         return value & ~(1 << bit)
 
     @staticmethod
-    def mask_to_addresses(address: int, mask: str) -> List[int]:
+    def mask_to_addresses(address: int, mask: str) -> list[int]:
         """
         Convert a mask, for example
         000000000000000000000000000000X1001X
@@ -127,7 +126,7 @@ def mask_to_addresses(address: int, mask: str) -> List[int]:
             addresses.append(new_adr)
         return addresses
 
-    def process_programs(self, programs: List[Program]):
+    def process_programs(self, programs: list[Program]):
         """
         Process the instructions in the `programs` list
         mask. But this time, the mask is for the address line
diff --git a/src/adventofcode2020/solutions/day16.py b/src/adventofcode2020/solutions/day16.py
index b3ba9521..37b5533a 100644
--- a/src/adventofcode2020/solutions/day16.py
+++ b/src/adventofcode2020/solutions/day16.py
@@ -1,6 +1,6 @@
 import math
 import re
-from typing import Dict, List, NamedTuple
+from typing import NamedTuple
 
 from adventofcode2020.utils.abstract import FileReaderSolution
 
@@ -44,9 +44,9 @@ def is_valid(self, number) -> bool:
 
 
 class Day16:
-    ticket_rules: List[Ticket]
-    my_tickets: List[int]
-    nearby_tickets: List[List[int]]
+    ticket_rules: list[Ticket]
+    my_tickets: list[int]
+    nearby_tickets: list[list[int]]
 
     def parse(self, input_data):
         rules, my_tickets, nearby = input_data.split("\n\n")
@@ -91,7 +91,7 @@ def remove_invalid_tickets(self):
                 valid_tickets.append(ticket)
         self.nearby_tickets = valid_tickets
 
-    def compute_mapping(self) -> Dict[str, int]:
+    def compute_mapping(self) -> dict[str, int]:
         """Compute the mapping from all the valid tickets
 
         We need to find the rules that we can apply here. Algorirm:
@@ -109,7 +109,7 @@ def compute_mapping(self) -> Dict[str, int]:
         In the end we should end up with only one option per group.
         """
 
-        options: Dict[str, set[int]] = {}
+        options: dict[str, set[int]] = {}
 
         for rule in self.ticket_rules:
             options[rule.rule] = set(range(len(self.my_tickets)))
@@ -137,7 +137,7 @@ def compute_mapping(self) -> Dict[str, int]:
                             options[remove].discard(list(options[ticket_rule])[0])
 
         # Cleanup, remove set
-        cleaned_options: Dict[str, int] = {}
+        cleaned_options: dict[str, int] = {}
         for cleanup_rule in options:
             cleaned_options[cleanup_rule] = list(options[cleanup_rule])[0]
 
diff --git a/src/adventofcode2020/solutions/handheld.py b/src/adventofcode2020/solutions/handheld.py
index 3cd68be1..a02940b4 100644
--- a/src/adventofcode2020/solutions/handheld.py
+++ b/src/adventofcode2020/solutions/handheld.py
@@ -3,7 +3,7 @@
 import logging
 from dataclasses import dataclass
 from enum import Enum
-from typing import Any, Dict, List, Set
+from typing import Any
 
 logger = logging.getLogger(__name__)
 
@@ -37,8 +37,8 @@ class HandHeld:
 
     accumulator: int
     program_counter: int
-    instructions: Dict[int, Instruction]
-    pc_seen: Set
+    instructions: dict[int, Instruction]
+    pc_seen: set
 
     def __init__(self):
         self.reset()
@@ -48,7 +48,7 @@ def reset(self):
         self.program_counter = 0
         self.pc_seen = set()
 
-    def load_instructions(self, instructions: List[str]):
+    def load_instructions(self, instructions: list[str]):
         self.accumulator = 0
         self.instructions = {}
 
diff --git a/src/adventofcode2020/utils/abstract.py b/src/adventofcode2020/utils/abstract.py
index cbf6b2a7..7b3eaeb2 100644
--- a/src/adventofcode2020/utils/abstract.py
+++ b/src/adventofcode2020/utils/abstract.py
@@ -1,11 +1,10 @@
 from abc import ABC, abstractmethod
 from pathlib import Path
-from typing import Union
 
 
 class AbstractSolution(ABC):
     @abstractmethod
-    def solve(self, input_data: str) -> Union[str, int]:
+    def solve(self, input_data: str) -> str | int:
         raise NotImplementedError
 
 
@@ -14,7 +13,7 @@ class SimpleSolution(AbstractSolution, ABC):
     This solution implements a simple input_text that is used by the solve method.
     """
 
-    def __call__(self, input_text: str) -> Union[str, int]:
+    def __call__(self, input_text: str) -> str | int:
         """
         Give the input_text as parameter, process this and return the result
         """
@@ -27,7 +26,7 @@ class FileReaderSolution(AbstractSolution, ABC):
     Implement filereader
     """
 
-    def __call__(self, input_file: str) -> Union[str, int]:
+    def __call__(self, input_file: str) -> str | int:
         """
         Give the input_text as parameter, process this and return the result
         """
diff --git a/src/adventofcode2020/utils/advent_utils.py b/src/adventofcode2020/utils/advent_utils.py
index 8303a142..52b0a5a3 100644
--- a/src/adventofcode2020/utils/advent_utils.py
+++ b/src/adventofcode2020/utils/advent_utils.py
@@ -1,7 +1,4 @@
-from typing import List
-
-
-def string_to_list_of_ints(input_string: str, split_string: str = ",") -> List[int]:
+def string_to_list_of_ints(input_string: str, split_string: str = ",") -> list[int]:
     """
     Split a string on `split_string` and return a list of integers
 
@@ -13,7 +10,7 @@ def string_to_list_of_ints(input_string: str, split_string: str = ",") -> List[i
     return list_of_ints
 
 
-def string_of_single_to_list_of_ints(input_string: str) -> List[int]:
+def string_of_single_to_list_of_ints(input_string: str) -> list[int]:
     """
     Split a string on `split_string` and return a list of integers
 
diff --git a/src/adventofcode2022/solutions/day03.py b/src/adventofcode2022/solutions/day03.py
index 6b92258b..f0434f1f 100644
--- a/src/adventofcode2022/solutions/day03.py
+++ b/src/adventofcode2022/solutions/day03.py
@@ -32,9 +32,9 @@ def solve(self, input_data: str) -> int:
         total_value = 0
 
         for n in range(0, len(lines), 3):
-            first = set(self.char_to_value(char) for char in lines[n])
-            second = set(self.char_to_value(char) for char in lines[n + 1])
-            third = set(self.char_to_value(char) for char in lines[n + 2])
+            first = {self.char_to_value(char) for char in lines[n]}
+            second = {self.char_to_value(char) for char in lines[n + 1]}
+            third = {self.char_to_value(char) for char in lines[n + 2]}
             difference = first.intersection(second).intersection(third)
             total_value += difference.pop()
 

From d7fd2ea579090ad003764771befbbb2f4bd167fc Mon Sep 17 00:00:00 2001
From: Roel Adriaans <roel@adriaans.org>
Date: Sat, 18 Nov 2023 21:32:07 +0100
Subject: [PATCH 299/371] Fix flake8, and ignore mypy since we have 37 errors
 that need fixing..

---
 src/adventofcode2019/solutions/intcode.py | 2 +-
 tox.ini                                   | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/adventofcode2019/solutions/intcode.py b/src/adventofcode2019/solutions/intcode.py
index 5febe610..59fbebdb 100644
--- a/src/adventofcode2019/solutions/intcode.py
+++ b/src/adventofcode2019/solutions/intcode.py
@@ -4,7 +4,7 @@
 from typing import DefaultDict
 
 
-class ProgramFinished(Exception):
+class ProgramFinished(Exception):  # noqa: N818
     """
     This exception is raised when the program is finished.
     This exception is usually not a fatal error, but used for control structure.
diff --git a/tox.ini b/tox.ini
index dae5d684..49b5eb28 100644
--- a/tox.ini
+++ b/tox.ini
@@ -108,9 +108,9 @@ deps =
     {[testenv:black]deps}
     {[testenv:flake8]deps}
     {[testenv:isort]deps}
-    {[testenv:mypy]deps}
+    #{[testenv:mypy]deps}
 commands =
     {[testenv:black]commands}
     {[testenv:flake8]commands}
     {[testenv:isort]commands}
-    {[testenv:mypy]commands}
+    #{[testenv:mypy]commands}

From 9645d1110fdadddaf104d749bf97b6359b6ec593 Mon Sep 17 00:00:00 2001
From: Roel Adriaans <roel@adriaans.org>
Date: Sat, 18 Nov 2023 21:37:55 +0100
Subject: [PATCH 300/371] Only support python 3.11

---
 .github/workflows/tox.yml | 4 ++--
 pyproject.toml            | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/tox.yml b/.github/workflows/tox.yml
index eef5f7c8..06cf86ac 100644
--- a/.github/workflows/tox.yml
+++ b/.github/workflows/tox.yml
@@ -4,11 +4,11 @@ on: [push, pull_request]
 
 jobs:
   build:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     strategy:
       max-parallel: 4
       matrix:
-        python-version: ['3.9', '3.10']
+        python-version: ['3.12']
 
     steps:
     - uses: actions/checkout@v4
diff --git a/pyproject.toml b/pyproject.toml
index 92a2d828..648cf03b 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -6,7 +6,7 @@ authors = ["Roel Adriaans <roel@adriaans.org>"]
 license = "MIT"
 
 [tool.poetry.dependencies]
-python = "^3.11"
+python = "^3.12"
 anytree = "^2.12.1"
 click = "^8.1.7"
 requests = "^2.31.0"

From 7c1236578c096f2eaf1c0a8f447f450882a8dae2 Mon Sep 17 00:00:00 2001
From: Roel Adriaans <roel@adriaans.org>
Date: Sat, 18 Nov 2023 21:41:48 +0100
Subject: [PATCH 301/371] Update lock to 3.12

---
 poetry.lock | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/poetry.lock b/poetry.lock
index aa85f1c4..01321c2c 100644
--- a/poetry.lock
+++ b/poetry.lock
@@ -1129,5 +1129,5 @@ test = ["covdefaults (>=2.3)", "coverage (>=7.2.7)", "coverage-enable-subprocess
 
 [metadata]
 lock-version = "2.0"
-python-versions = "^3.11"
-content-hash = "3e5d1e1e4df0b389c4bb8963c5aa816798ffb018b99b3f79a64fd5dcf59b2384"
+python-versions = "^3.12"
+content-hash = "e066d041ea8b0505a8beca348922ed6972a2f1ff18d0606e1d4d645d8fdd36b9"

From 3d7c691aebada855bc41037cba8130be9e6acb71 Mon Sep 17 00:00:00 2001
From: Roel Adriaans <roel@adriaans.org>
Date: Sat, 18 Nov 2023 21:44:52 +0100
Subject: [PATCH 302/371] Update pyupgrade and run again

---
 .pre-commit-config.yaml                 | 6 +++---
 src/adventofcode2021/solutions/day13.py | 2 +-
 src/adventofcode2021/solutions/day20.py | 2 +-
 src/adventofcode2021/solutions/day22.py | 2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index 45343055..dc226630 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -2,7 +2,7 @@
 
 repos:
   - repo: https://github.com/ambv/black
-    rev: 23.7.0
+    rev: 23.11.0
     hooks:
     - id: black
       language_version: 'python3.10'
@@ -19,7 +19,7 @@ repos:
     - id: isort
 
   - repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: v4.4.0
+    rev: v4.5.0
     hooks:
     - id: check-yaml
     - id: end-of-file-fixer
@@ -31,7 +31,7 @@ repos:
       language_version: python3
 
   - repo: https://github.com/asottile/pyupgrade
-    rev: v3.10.1
+    rev: v3.15.0
     hooks:
     - id: pyupgrade
       args: [ "--py311-plus" ]
diff --git a/src/adventofcode2021/solutions/day13.py b/src/adventofcode2021/solutions/day13.py
index 52d52a19..b0b1cb22 100644
--- a/src/adventofcode2021/solutions/day13.py
+++ b/src/adventofcode2021/solutions/day13.py
@@ -11,7 +11,7 @@ class Day13:
     size: int
 
     def create_grid(self, lines: list[str]):
-        self.grid = defaultdict(lambda: False)
+        self.grid = defaultdict(bool)
         for line in lines:
             j, i = line.split(",")
             self.grid[int(i), int(j)] = True
diff --git a/src/adventofcode2021/solutions/day20.py b/src/adventofcode2021/solutions/day20.py
index c155d041..e6bb7fce 100644
--- a/src/adventofcode2021/solutions/day20.py
+++ b/src/adventofcode2021/solutions/day20.py
@@ -18,7 +18,7 @@ def parse(self, input_data: str):
         # This causes all the unset pixels to flip everytime.
         self.special_case = self.enhancement[0] == "#" and self.enhancement[-1] == "."
 
-        self.image = defaultdict(lambda: False)
+        self.image = defaultdict(bool)
         for x, line in enumerate(image.splitlines()):
             for y, point in enumerate(line):
                 self.image[Point(x, y)] = True if point == "#" else False
diff --git a/src/adventofcode2021/solutions/day22.py b/src/adventofcode2021/solutions/day22.py
index 8992792e..1ed6531d 100644
--- a/src/adventofcode2021/solutions/day22.py
+++ b/src/adventofcode2021/solutions/day22.py
@@ -155,7 +155,7 @@ def filter_condition(step):
         return list(filterfalse(filter_condition, steps))
 
     def solve(self, input_data: str) -> int:
-        self.grid = defaultdict(lambda: False)
+        self.grid = defaultdict(bool)
         steps = self.parse(input_data)
         # Apply the limit
         steps = self.apply_limit(steps)

From 26849532528ac2a1c2f6b806d5c18155572cc352 Mon Sep 17 00:00:00 2001
From: Roel Adriaans <roel@adriaans.org>
Date: Sun, 19 Nov 2023 01:08:58 +0100
Subject: [PATCH 303/371] Make tests work, add missing dependencies, workaround
 for tqdm not compatible with python 3.12

---
 poetry.lock                            | 398 ++++++++++++++++++++++++-
 pyproject.toml                         |  10 +
 tests/adventofcode2021/test_day04_b.py |   3 +-
 tests/adventofcode2021/test_day09_b.py |   3 +-
 tests/adventofcode2021/test_day10_b.py |   2 +-
 tests/adventofcode2021/test_day12_b.py |   6 +-
 tests/adventofcode2021/test_day15_b.py |   2 +-
 tox.ini                                |   9 +-
 8 files changed, 423 insertions(+), 10 deletions(-)

diff --git a/poetry.lock b/poetry.lock
index 01321c2c..befb0339 100644
--- a/poetry.lock
+++ b/poetry.lock
@@ -309,6 +309,69 @@ files = [
     {file = "colorama-0.4.6.tar.gz", hash = "sha256:08695f5cb7ed6e0531a20572697297273c47b8cae5a63ffc6d6ed5c201be6e44"},
 ]
 
+[[package]]
+name = "contourpy"
+version = "1.2.0"
+description = "Python library for calculating contours of 2D quadrilateral grids"
+optional = false
+python-versions = ">=3.9"
+files = [
+    {file = "contourpy-1.2.0-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:0274c1cb63625972c0c007ab14dd9ba9e199c36ae1a231ce45d725cbcbfd10a8"},
+    {file = "contourpy-1.2.0-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:ab459a1cbbf18e8698399c595a01f6dcc5c138220ca3ea9e7e6126232d102bb4"},
+    {file = "contourpy-1.2.0-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:6fdd887f17c2f4572ce548461e4f96396681212d858cae7bd52ba3310bc6f00f"},
+    {file = "contourpy-1.2.0-cp310-cp310-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:5d16edfc3fc09968e09ddffada434b3bf989bf4911535e04eada58469873e28e"},
+    {file = "contourpy-1.2.0-cp310-cp310-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:1c203f617abc0dde5792beb586f827021069fb6d403d7f4d5c2b543d87edceb9"},
+    {file = "contourpy-1.2.0-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:b69303ceb2e4d4f146bf82fda78891ef7bcd80c41bf16bfca3d0d7eb545448aa"},
+    {file = "contourpy-1.2.0-cp310-cp310-musllinux_1_1_aarch64.whl", hash = "sha256:884c3f9d42d7218304bc74a8a7693d172685c84bd7ab2bab1ee567b769696df9"},
+    {file = "contourpy-1.2.0-cp310-cp310-musllinux_1_1_x86_64.whl", hash = "sha256:4a1b1208102be6e851f20066bf0e7a96b7d48a07c9b0cfe6d0d4545c2f6cadab"},
+    {file = "contourpy-1.2.0-cp310-cp310-win32.whl", hash = "sha256:34b9071c040d6fe45d9826cbbe3727d20d83f1b6110d219b83eb0e2a01d79488"},
+    {file = "contourpy-1.2.0-cp310-cp310-win_amd64.whl", hash = "sha256:bd2f1ae63998da104f16a8b788f685e55d65760cd1929518fd94cd682bf03e41"},
+    {file = "contourpy-1.2.0-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:dd10c26b4eadae44783c45ad6655220426f971c61d9b239e6f7b16d5cdaaa727"},
+    {file = "contourpy-1.2.0-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:5c6b28956b7b232ae801406e529ad7b350d3f09a4fde958dfdf3c0520cdde0dd"},
+    {file = "contourpy-1.2.0-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:ebeac59e9e1eb4b84940d076d9f9a6cec0064e241818bcb6e32124cc5c3e377a"},
+    {file = "contourpy-1.2.0-cp311-cp311-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:139d8d2e1c1dd52d78682f505e980f592ba53c9f73bd6be102233e358b401063"},
+    {file = "contourpy-1.2.0-cp311-cp311-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:1e9dc350fb4c58adc64df3e0703ab076f60aac06e67d48b3848c23647ae4310e"},
+    {file = "contourpy-1.2.0-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:18fc2b4ed8e4a8fe849d18dce4bd3c7ea637758c6343a1f2bae1e9bd4c9f4686"},
+    {file = "contourpy-1.2.0-cp311-cp311-musllinux_1_1_aarch64.whl", hash = "sha256:16a7380e943a6d52472096cb7ad5264ecee36ed60888e2a3d3814991a0107286"},
+    {file = "contourpy-1.2.0-cp311-cp311-musllinux_1_1_x86_64.whl", hash = "sha256:8d8faf05be5ec8e02a4d86f616fc2a0322ff4a4ce26c0f09d9f7fb5330a35c95"},
+    {file = "contourpy-1.2.0-cp311-cp311-win32.whl", hash = "sha256:67b7f17679fa62ec82b7e3e611c43a016b887bd64fb933b3ae8638583006c6d6"},
+    {file = "contourpy-1.2.0-cp311-cp311-win_amd64.whl", hash = "sha256:99ad97258985328b4f207a5e777c1b44a83bfe7cf1f87b99f9c11d4ee477c4de"},
+    {file = "contourpy-1.2.0-cp312-cp312-macosx_10_9_x86_64.whl", hash = "sha256:575bcaf957a25d1194903a10bc9f316c136c19f24e0985a2b9b5608bdf5dbfe0"},
+    {file = "contourpy-1.2.0-cp312-cp312-macosx_11_0_arm64.whl", hash = "sha256:9e6c93b5b2dbcedad20a2f18ec22cae47da0d705d454308063421a3b290d9ea4"},
+    {file = "contourpy-1.2.0-cp312-cp312-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:464b423bc2a009088f19bdf1f232299e8b6917963e2b7e1d277da5041f33a779"},
+    {file = "contourpy-1.2.0-cp312-cp312-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:68ce4788b7d93e47f84edd3f1f95acdcd142ae60bc0e5493bfd120683d2d4316"},
+    {file = "contourpy-1.2.0-cp312-cp312-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:3d7d1f8871998cdff5d2ff6a087e5e1780139abe2838e85b0b46b7ae6cc25399"},
+    {file = "contourpy-1.2.0-cp312-cp312-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:6e739530c662a8d6d42c37c2ed52a6f0932c2d4a3e8c1f90692ad0ce1274abe0"},
+    {file = "contourpy-1.2.0-cp312-cp312-musllinux_1_1_aarch64.whl", hash = "sha256:247b9d16535acaa766d03037d8e8fb20866d054d3c7fbf6fd1f993f11fc60ca0"},
+    {file = "contourpy-1.2.0-cp312-cp312-musllinux_1_1_x86_64.whl", hash = "sha256:461e3ae84cd90b30f8d533f07d87c00379644205b1d33a5ea03381edc4b69431"},
+    {file = "contourpy-1.2.0-cp312-cp312-win32.whl", hash = "sha256:1c2559d6cffc94890b0529ea7eeecc20d6fadc1539273aa27faf503eb4656d8f"},
+    {file = "contourpy-1.2.0-cp312-cp312-win_amd64.whl", hash = "sha256:491b1917afdd8638a05b611a56d46587d5a632cabead889a5440f7c638bc6ed9"},
+    {file = "contourpy-1.2.0-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:5fd1810973a375ca0e097dee059c407913ba35723b111df75671a1976efa04bc"},
+    {file = "contourpy-1.2.0-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:999c71939aad2780f003979b25ac5b8f2df651dac7b38fb8ce6c46ba5abe6ae9"},
+    {file = "contourpy-1.2.0-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:b7caf9b241464c404613512d5594a6e2ff0cc9cb5615c9475cc1d9b514218ae8"},
+    {file = "contourpy-1.2.0-cp39-cp39-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:266270c6f6608340f6c9836a0fb9b367be61dde0c9a9a18d5ece97774105ff3e"},
+    {file = "contourpy-1.2.0-cp39-cp39-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:dbd50d0a0539ae2e96e537553aff6d02c10ed165ef40c65b0e27e744a0f10af8"},
+    {file = "contourpy-1.2.0-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:11f8d2554e52f459918f7b8e6aa20ec2a3bce35ce95c1f0ef4ba36fbda306df5"},
+    {file = "contourpy-1.2.0-cp39-cp39-musllinux_1_1_aarch64.whl", hash = "sha256:ce96dd400486e80ac7d195b2d800b03e3e6a787e2a522bfb83755938465a819e"},
+    {file = "contourpy-1.2.0-cp39-cp39-musllinux_1_1_x86_64.whl", hash = "sha256:6d3364b999c62f539cd403f8123ae426da946e142312a514162adb2addd8d808"},
+    {file = "contourpy-1.2.0-cp39-cp39-win32.whl", hash = "sha256:1c88dfb9e0c77612febebb6ac69d44a8d81e3dc60f993215425b62c1161353f4"},
+    {file = "contourpy-1.2.0-cp39-cp39-win_amd64.whl", hash = "sha256:78e6ad33cf2e2e80c5dfaaa0beec3d61face0fb650557100ee36db808bfa6843"},
+    {file = "contourpy-1.2.0-pp39-pypy39_pp73-macosx_10_9_x86_64.whl", hash = "sha256:be16975d94c320432657ad2402f6760990cb640c161ae6da1363051805fa8108"},
+    {file = "contourpy-1.2.0-pp39-pypy39_pp73-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:b95a225d4948b26a28c08307a60ac00fb8671b14f2047fc5476613252a129776"},
+    {file = "contourpy-1.2.0-pp39-pypy39_pp73-win_amd64.whl", hash = "sha256:0d7e03c0f9a4f90dc18d4e77e9ef4ec7b7bbb437f7f675be8e530d65ae6ef956"},
+    {file = "contourpy-1.2.0.tar.gz", hash = "sha256:171f311cb758de7da13fc53af221ae47a5877be5a0843a9fe150818c51ed276a"},
+]
+
+[package.dependencies]
+numpy = ">=1.20,<2.0"
+
+[package.extras]
+bokeh = ["bokeh", "selenium"]
+docs = ["furo", "sphinx (>=7.2)", "sphinx-copybutton"]
+mypy = ["contourpy[bokeh,docs]", "docutils-stubs", "mypy (==1.6.1)", "types-Pillow"]
+test = ["Pillow", "contourpy[test-no-images]", "matplotlib"]
+test-no-images = ["pytest", "pytest-cov", "pytest-xdist", "wurlitzer"]
+
 [[package]]
 name = "cookiecutter"
 version = "2.4.0"
@@ -394,6 +457,21 @@ files = [
 [package.extras]
 toml = ["tomli"]
 
+[[package]]
+name = "cycler"
+version = "0.12.1"
+description = "Composable style cycles"
+optional = false
+python-versions = ">=3.8"
+files = [
+    {file = "cycler-0.12.1-py3-none-any.whl", hash = "sha256:85cef7cff222d8644161529808465972e51340599459b8ac3ccbac5a854e0d30"},
+    {file = "cycler-0.12.1.tar.gz", hash = "sha256:88bb128f02ba341da8ef447245a9e138fae777f6a23943da4540077d3601eb1c"},
+]
+
+[package.extras]
+docs = ["ipython", "matplotlib", "numpydoc", "sphinx"]
+tests = ["pytest", "pytest-cov", "pytest-xdist"]
+
 [[package]]
 name = "distlib"
 version = "0.3.7"
@@ -435,6 +513,71 @@ docs = ["furo (>=2023.9.10)", "sphinx (>=7.2.6)", "sphinx-autodoc-typehints (>=1
 testing = ["covdefaults (>=2.3)", "coverage (>=7.3.2)", "diff-cover (>=8)", "pytest (>=7.4.3)", "pytest-cov (>=4.1)", "pytest-mock (>=3.12)", "pytest-timeout (>=2.2)"]
 typing = ["typing-extensions (>=4.8)"]
 
+[[package]]
+name = "fonttools"
+version = "4.44.3"
+description = "Tools to manipulate font files"
+optional = false
+python-versions = ">=3.8"
+files = [
+    {file = "fonttools-4.44.3-cp310-cp310-macosx_10_9_universal2.whl", hash = "sha256:192ebdb3bb1882b7ed3ad4b949a106ddd8b428d046ddce64df2d459f7a2db31b"},
+    {file = "fonttools-4.44.3-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:20898476cf9c61795107b91409f4b1cf86de6e92b41095bbe900c05b5b117c96"},
+    {file = "fonttools-4.44.3-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:437204780611f9f80f74cd4402fa451e920d1c4b6cb474a0818a734b4affc477"},
+    {file = "fonttools-4.44.3-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:50152205ed3e16c5878a006ee53ecc402acac9af68357343be1e5c36f66ccb24"},
+    {file = "fonttools-4.44.3-cp310-cp310-musllinux_1_1_aarch64.whl", hash = "sha256:ba9c407d8bd63b21910b98399aeec87e24ca9c3e62ea60c246e505c4a4df6c27"},
+    {file = "fonttools-4.44.3-cp310-cp310-musllinux_1_1_x86_64.whl", hash = "sha256:79a6babb87d7f70f8aed88f157bbdc5d2f01ad8b01e9535ff07e43e96ad25548"},
+    {file = "fonttools-4.44.3-cp310-cp310-win32.whl", hash = "sha256:32e8a5cebfe8f797461b02084104053b2690ebf0cc38eda5beb9ba24ce43c349"},
+    {file = "fonttools-4.44.3-cp310-cp310-win_amd64.whl", hash = "sha256:c26649a6ce6f1ce4dd6748f64b18f70e39c618c6188286ab9534a949da28164c"},
+    {file = "fonttools-4.44.3-cp311-cp311-macosx_10_9_universal2.whl", hash = "sha256:5cd114cb20b491f6812aa397040b06a469563c1a01ec94c8c5d96b76d84916db"},
+    {file = "fonttools-4.44.3-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:e84084cc325f888c3495df7ec25f6133be0f606efb80a9c9e072ea6064ede9ac"},
+    {file = "fonttools-4.44.3-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:877e36afce69cfdbd0453a4f44b16e865ac29f06df29f10f0b822a68ab858e86"},
+    {file = "fonttools-4.44.3-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:b1c2cb1e2a7cfeaeb40b8823f238d7e02929b3a0b53e133e757dec5e99c327c9"},
+    {file = "fonttools-4.44.3-cp311-cp311-musllinux_1_1_aarch64.whl", hash = "sha256:dd752b778b37863cf5146d0112aafcd5693235831f09303809ab9c1e564c236b"},
+    {file = "fonttools-4.44.3-cp311-cp311-musllinux_1_1_x86_64.whl", hash = "sha256:8f4e22c5128cb604d3b0b869eb8d3092a1c10cbe6def402ff46bb920f7169374"},
+    {file = "fonttools-4.44.3-cp311-cp311-win32.whl", hash = "sha256:4831d948bc3cea9cd8bf0c92a087f4392068bcac3b584a61a4c837c48a012337"},
+    {file = "fonttools-4.44.3-cp311-cp311-win_amd64.whl", hash = "sha256:948b35e54b0c1b6acf9d63c70515051b7d400d69b61c91377cf0e8742d71c44d"},
+    {file = "fonttools-4.44.3-cp312-cp312-macosx_10_9_universal2.whl", hash = "sha256:fad1c74aa10b77764d3cdf3481bd181d4949e0b46f2da6f9e57543d4adbda177"},
+    {file = "fonttools-4.44.3-cp312-cp312-macosx_10_9_x86_64.whl", hash = "sha256:b6a77e3b994649f72fb46b0b8cfe64481b5640e5aecc2d77961300a34fe1dc4f"},
+    {file = "fonttools-4.44.3-cp312-cp312-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:2bff4f9d5edc10b29d2a2daeefd78a47289ba2f751c9bf247925b9d43c6efd79"},
+    {file = "fonttools-4.44.3-cp312-cp312-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:3302998e02a854a41c930f9f1366eb8092dbc5fe7ff636d86aeb28d232f4610a"},
+    {file = "fonttools-4.44.3-cp312-cp312-musllinux_1_1_aarch64.whl", hash = "sha256:8c7985017e7fb2c2613fa5c440457cd45a6ea808f8d08ed70c27e02e6862cbbe"},
+    {file = "fonttools-4.44.3-cp312-cp312-musllinux_1_1_x86_64.whl", hash = "sha256:35d88af2b63060ed2b50aa00d38f60edf4c0b9275a77ae1a98e8d2c03540c617"},
+    {file = "fonttools-4.44.3-cp312-cp312-win32.whl", hash = "sha256:5478a77a15d01a21c569fc4ab6f2faba852a21d0932eef02ac4c4a4b50af8070"},
+    {file = "fonttools-4.44.3-cp312-cp312-win_amd64.whl", hash = "sha256:979fc845703e0d9b35bc65379fcf34d050e04c3e0b3381a0f66b0be33183da1c"},
+    {file = "fonttools-4.44.3-cp38-cp38-macosx_10_9_universal2.whl", hash = "sha256:7a8b9f22d3c147ecdc7be46f9f1e1df0523541df0535fac5bdd653726218d068"},
+    {file = "fonttools-4.44.3-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:bcb0fde94374ba00c118d632b0b5f1f4447401313166bcb14d737322928e358f"},
+    {file = "fonttools-4.44.3-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:3eb365cd8ae4765973fa036aed0077ac26f37b2f8240a72c4a29cd9d8a31027f"},
+    {file = "fonttools-4.44.3-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:c329e21502c894fe4c800e32bc3ce37c6b5ca95778d32dff17d7ebf5cac94efa"},
+    {file = "fonttools-4.44.3-cp38-cp38-musllinux_1_1_aarch64.whl", hash = "sha256:345a30db8adfbb868221234fb434dd2fc5bfe27baafbaf418528f6c5a5a95584"},
+    {file = "fonttools-4.44.3-cp38-cp38-musllinux_1_1_x86_64.whl", hash = "sha256:2fe4eed749de2e6bf3aa05d18df04231a712a16c08974af5e67bb9f75a25d10f"},
+    {file = "fonttools-4.44.3-cp38-cp38-win32.whl", hash = "sha256:3b179a284b73802edd6d910e6384f28098cb03bd263fd87db6abb31679f68863"},
+    {file = "fonttools-4.44.3-cp38-cp38-win_amd64.whl", hash = "sha256:4c805a0b0545fd9becf6dfe8d57e45a7c1af7fdbfd0a7d776c5e999e4edec9f5"},
+    {file = "fonttools-4.44.3-cp39-cp39-macosx_10_9_universal2.whl", hash = "sha256:f647d270ee90f70acbf5b31a53d486ba0897624236f9056d624c4e436386a14e"},
+    {file = "fonttools-4.44.3-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:ba82ee938bd7ea16762124a650bf2529f67dfe9999f64e0ebe1ef0a04baceafd"},
+    {file = "fonttools-4.44.3-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:e3bbca4f873d96c20757c24c70a903251a8998e1931bd888b49956f21d94b441"},
+    {file = "fonttools-4.44.3-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:50b43fd55089ae850a050f0c382f13fc9586279a540b646b28b9e93fbc05b8a3"},
+    {file = "fonttools-4.44.3-cp39-cp39-musllinux_1_1_aarch64.whl", hash = "sha256:cde83f83919ae7569a0316e093e04022dbb8ae5217f41cf591f125dd35d4dc0d"},
+    {file = "fonttools-4.44.3-cp39-cp39-musllinux_1_1_x86_64.whl", hash = "sha256:72ec91b85391dd4b06991c0919215ecf910554df2842df32e928155ea5b74aef"},
+    {file = "fonttools-4.44.3-cp39-cp39-win32.whl", hash = "sha256:367aa3e81a096e9a95dfc0d5afcbd0a299d857bac6d0fe5f1614c6f3e53f447f"},
+    {file = "fonttools-4.44.3-cp39-cp39-win_amd64.whl", hash = "sha256:718599de63b337518bfa5ce67e4ae462da3dd582a74fbe805f56b3704eb334a1"},
+    {file = "fonttools-4.44.3-py3-none-any.whl", hash = "sha256:42eefbb1babf81de40ab4a6ace6018c8c5a0d79ece0f986f73a9904b26ee511b"},
+    {file = "fonttools-4.44.3.tar.gz", hash = "sha256:f77b6c0add23a3f1ec8eda40015bcb8e92796f7d06a074de102a31c7d007c05b"},
+]
+
+[package.extras]
+all = ["brotli (>=1.0.1)", "brotlicffi (>=0.8.0)", "fs (>=2.2.0,<3)", "lxml (>=4.0,<5)", "lz4 (>=1.7.4.2)", "matplotlib", "munkres", "scipy", "skia-pathops (>=0.5.0)", "sympy", "uharfbuzz (>=0.23.0)", "unicodedata2 (>=15.1.0)", "xattr", "zopfli (>=0.1.4)"]
+graphite = ["lz4 (>=1.7.4.2)"]
+interpolatable = ["munkres", "scipy"]
+lxml = ["lxml (>=4.0,<5)"]
+pathops = ["skia-pathops (>=0.5.0)"]
+plot = ["matplotlib"]
+repacker = ["uharfbuzz (>=0.23.0)"]
+symfont = ["sympy"]
+type1 = ["xattr"]
+ufo = ["fs (>=2.2.0,<3)"]
+unicode = ["unicodedata2 (>=15.1.0)"]
+woff = ["brotli (>=1.0.1)", "brotlicffi (>=0.8.0)", "zopfli (>=0.1.4)"]
+
 [[package]]
 name = "identify"
 version = "2.5.32"
@@ -505,6 +648,119 @@ MarkupSafe = ">=2.0"
 [package.extras]
 i18n = ["Babel (>=2.7)"]
 
+[[package]]
+name = "kiwisolver"
+version = "1.4.5"
+description = "A fast implementation of the Cassowary constraint solver"
+optional = false
+python-versions = ">=3.7"
+files = [
+    {file = "kiwisolver-1.4.5-cp310-cp310-macosx_10_9_universal2.whl", hash = "sha256:05703cf211d585109fcd72207a31bb170a0f22144d68298dc5e61b3c946518af"},
+    {file = "kiwisolver-1.4.5-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:146d14bebb7f1dc4d5fbf74f8a6cb15ac42baadee8912eb84ac0b3b2a3dc6ac3"},
+    {file = "kiwisolver-1.4.5-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:6ef7afcd2d281494c0a9101d5c571970708ad911d028137cd558f02b851c08b4"},
+    {file = "kiwisolver-1.4.5-cp310-cp310-manylinux_2_12_i686.manylinux2010_i686.whl", hash = "sha256:9eaa8b117dc8337728e834b9c6e2611f10c79e38f65157c4c38e9400286f5cb1"},
+    {file = "kiwisolver-1.4.5-cp310-cp310-manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:ec20916e7b4cbfb1f12380e46486ec4bcbaa91a9c448b97023fde0d5bbf9e4ff"},
+    {file = "kiwisolver-1.4.5-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:39b42c68602539407884cf70d6a480a469b93b81b7701378ba5e2328660c847a"},
+    {file = "kiwisolver-1.4.5-cp310-cp310-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:aa12042de0171fad672b6c59df69106d20d5596e4f87b5e8f76df757a7c399aa"},
+    {file = "kiwisolver-1.4.5-cp310-cp310-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:2a40773c71d7ccdd3798f6489aaac9eee213d566850a9533f8d26332d626b82c"},
+    {file = "kiwisolver-1.4.5-cp310-cp310-musllinux_1_1_aarch64.whl", hash = "sha256:19df6e621f6d8b4b9c4d45f40a66839294ff2bb235e64d2178f7522d9170ac5b"},
+    {file = "kiwisolver-1.4.5-cp310-cp310-musllinux_1_1_i686.whl", hash = "sha256:83d78376d0d4fd884e2c114d0621624b73d2aba4e2788182d286309ebdeed770"},
+    {file = "kiwisolver-1.4.5-cp310-cp310-musllinux_1_1_ppc64le.whl", hash = "sha256:e391b1f0a8a5a10ab3b9bb6afcfd74f2175f24f8975fb87ecae700d1503cdee0"},
+    {file = "kiwisolver-1.4.5-cp310-cp310-musllinux_1_1_s390x.whl", hash = "sha256:852542f9481f4a62dbb5dd99e8ab7aedfeb8fb6342349a181d4036877410f525"},
+    {file = "kiwisolver-1.4.5-cp310-cp310-musllinux_1_1_x86_64.whl", hash = "sha256:59edc41b24031bc25108e210c0def6f6c2191210492a972d585a06ff246bb79b"},
+    {file = "kiwisolver-1.4.5-cp310-cp310-win32.whl", hash = "sha256:a6aa6315319a052b4ee378aa171959c898a6183f15c1e541821c5c59beaa0238"},
+    {file = "kiwisolver-1.4.5-cp310-cp310-win_amd64.whl", hash = "sha256:d0ef46024e6a3d79c01ff13801cb19d0cad7fd859b15037aec74315540acc276"},
+    {file = "kiwisolver-1.4.5-cp311-cp311-macosx_10_9_universal2.whl", hash = "sha256:11863aa14a51fd6ec28688d76f1735f8f69ab1fabf388851a595d0721af042f5"},
+    {file = "kiwisolver-1.4.5-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:8ab3919a9997ab7ef2fbbed0cc99bb28d3c13e6d4b1ad36e97e482558a91be90"},
+    {file = "kiwisolver-1.4.5-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:fcc700eadbbccbf6bc1bcb9dbe0786b4b1cb91ca0dcda336eef5c2beed37b797"},
+    {file = "kiwisolver-1.4.5-cp311-cp311-manylinux_2_12_i686.manylinux2010_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:dfdd7c0b105af050eb3d64997809dc21da247cf44e63dc73ff0fd20b96be55a9"},
+    {file = "kiwisolver-1.4.5-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:76c6a5964640638cdeaa0c359382e5703e9293030fe730018ca06bc2010c4437"},
+    {file = "kiwisolver-1.4.5-cp311-cp311-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:bbea0db94288e29afcc4c28afbf3a7ccaf2d7e027489c449cf7e8f83c6346eb9"},
+    {file = "kiwisolver-1.4.5-cp311-cp311-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:ceec1a6bc6cab1d6ff5d06592a91a692f90ec7505d6463a88a52cc0eb58545da"},
+    {file = "kiwisolver-1.4.5-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:040c1aebeda72197ef477a906782b5ab0d387642e93bda547336b8957c61022e"},
+    {file = "kiwisolver-1.4.5-cp311-cp311-musllinux_1_1_aarch64.whl", hash = "sha256:f91de7223d4c7b793867797bacd1ee53bfe7359bd70d27b7b58a04efbb9436c8"},
+    {file = "kiwisolver-1.4.5-cp311-cp311-musllinux_1_1_i686.whl", hash = "sha256:faae4860798c31530dd184046a900e652c95513796ef51a12bc086710c2eec4d"},
+    {file = "kiwisolver-1.4.5-cp311-cp311-musllinux_1_1_ppc64le.whl", hash = "sha256:b0157420efcb803e71d1b28e2c287518b8808b7cf1ab8af36718fd0a2c453eb0"},
+    {file = "kiwisolver-1.4.5-cp311-cp311-musllinux_1_1_s390x.whl", hash = "sha256:06f54715b7737c2fecdbf140d1afb11a33d59508a47bf11bb38ecf21dc9ab79f"},
+    {file = "kiwisolver-1.4.5-cp311-cp311-musllinux_1_1_x86_64.whl", hash = "sha256:fdb7adb641a0d13bdcd4ef48e062363d8a9ad4a182ac7647ec88f695e719ae9f"},
+    {file = "kiwisolver-1.4.5-cp311-cp311-win32.whl", hash = "sha256:bb86433b1cfe686da83ce32a9d3a8dd308e85c76b60896d58f082136f10bffac"},
+    {file = "kiwisolver-1.4.5-cp311-cp311-win_amd64.whl", hash = "sha256:6c08e1312a9cf1074d17b17728d3dfce2a5125b2d791527f33ffbe805200a355"},
+    {file = "kiwisolver-1.4.5-cp312-cp312-macosx_10_9_universal2.whl", hash = "sha256:32d5cf40c4f7c7b3ca500f8985eb3fb3a7dfc023215e876f207956b5ea26632a"},
+    {file = "kiwisolver-1.4.5-cp312-cp312-macosx_10_9_x86_64.whl", hash = "sha256:f846c260f483d1fd217fe5ed7c173fb109efa6b1fc8381c8b7552c5781756192"},
+    {file = "kiwisolver-1.4.5-cp312-cp312-macosx_11_0_arm64.whl", hash = "sha256:5ff5cf3571589b6d13bfbfd6bcd7a3f659e42f96b5fd1c4830c4cf21d4f5ef45"},
+    {file = "kiwisolver-1.4.5-cp312-cp312-manylinux_2_12_i686.manylinux2010_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:7269d9e5f1084a653d575c7ec012ff57f0c042258bf5db0954bf551c158466e7"},
+    {file = "kiwisolver-1.4.5-cp312-cp312-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:da802a19d6e15dffe4b0c24b38b3af68e6c1a68e6e1d8f30148c83864f3881db"},
+    {file = "kiwisolver-1.4.5-cp312-cp312-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:3aba7311af82e335dd1e36ffff68aaca609ca6290c2cb6d821a39aa075d8e3ff"},
+    {file = "kiwisolver-1.4.5-cp312-cp312-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:763773d53f07244148ccac5b084da5adb90bfaee39c197554f01b286cf869228"},
+    {file = "kiwisolver-1.4.5-cp312-cp312-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:2270953c0d8cdab5d422bee7d2007f043473f9d2999631c86a223c9db56cbd16"},
+    {file = "kiwisolver-1.4.5-cp312-cp312-musllinux_1_1_aarch64.whl", hash = "sha256:d099e745a512f7e3bbe7249ca835f4d357c586d78d79ae8f1dcd4d8adeb9bda9"},
+    {file = "kiwisolver-1.4.5-cp312-cp312-musllinux_1_1_i686.whl", hash = "sha256:74db36e14a7d1ce0986fa104f7d5637aea5c82ca6326ed0ec5694280942d1162"},
+    {file = "kiwisolver-1.4.5-cp312-cp312-musllinux_1_1_ppc64le.whl", hash = "sha256:7e5bab140c309cb3a6ce373a9e71eb7e4873c70c2dda01df6820474f9889d6d4"},
+    {file = "kiwisolver-1.4.5-cp312-cp312-musllinux_1_1_s390x.whl", hash = "sha256:0f114aa76dc1b8f636d077979c0ac22e7cd8f3493abbab152f20eb8d3cda71f3"},
+    {file = "kiwisolver-1.4.5-cp312-cp312-musllinux_1_1_x86_64.whl", hash = "sha256:88a2df29d4724b9237fc0c6eaf2a1adae0cdc0b3e9f4d8e7dc54b16812d2d81a"},
+    {file = "kiwisolver-1.4.5-cp312-cp312-win32.whl", hash = "sha256:72d40b33e834371fd330fb1472ca19d9b8327acb79a5821d4008391db8e29f20"},
+    {file = "kiwisolver-1.4.5-cp312-cp312-win_amd64.whl", hash = "sha256:2c5674c4e74d939b9d91dda0fae10597ac7521768fec9e399c70a1f27e2ea2d9"},
+    {file = "kiwisolver-1.4.5-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:3a2b053a0ab7a3960c98725cfb0bf5b48ba82f64ec95fe06f1d06c99b552e130"},
+    {file = "kiwisolver-1.4.5-cp37-cp37m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:3cd32d6c13807e5c66a7cbb79f90b553642f296ae4518a60d8d76243b0ad2898"},
+    {file = "kiwisolver-1.4.5-cp37-cp37m-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:59ec7b7c7e1a61061850d53aaf8e93db63dce0c936db1fda2658b70e4a1be709"},
+    {file = "kiwisolver-1.4.5-cp37-cp37m-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:da4cfb373035def307905d05041c1d06d8936452fe89d464743ae7fb8371078b"},
+    {file = "kiwisolver-1.4.5-cp37-cp37m-manylinux_2_5_i686.manylinux1_i686.whl", hash = "sha256:2400873bccc260b6ae184b2b8a4fec0e4082d30648eadb7c3d9a13405d861e89"},
+    {file = "kiwisolver-1.4.5-cp37-cp37m-manylinux_2_5_x86_64.manylinux1_x86_64.whl", hash = "sha256:1b04139c4236a0f3aff534479b58f6f849a8b351e1314826c2d230849ed48985"},
+    {file = "kiwisolver-1.4.5-cp37-cp37m-musllinux_1_1_aarch64.whl", hash = "sha256:4e66e81a5779b65ac21764c295087de82235597a2293d18d943f8e9e32746265"},
+    {file = "kiwisolver-1.4.5-cp37-cp37m-musllinux_1_1_i686.whl", hash = "sha256:7931d8f1f67c4be9ba1dd9c451fb0eeca1a25b89e4d3f89e828fe12a519b782a"},
+    {file = "kiwisolver-1.4.5-cp37-cp37m-musllinux_1_1_ppc64le.whl", hash = "sha256:b3f7e75f3015df442238cca659f8baa5f42ce2a8582727981cbfa15fee0ee205"},
+    {file = "kiwisolver-1.4.5-cp37-cp37m-musllinux_1_1_s390x.whl", hash = "sha256:bbf1d63eef84b2e8c89011b7f2235b1e0bf7dacc11cac9431fc6468e99ac77fb"},
+    {file = "kiwisolver-1.4.5-cp37-cp37m-musllinux_1_1_x86_64.whl", hash = "sha256:4c380469bd3f970ef677bf2bcba2b6b0b4d5c75e7a020fb863ef75084efad66f"},
+    {file = "kiwisolver-1.4.5-cp37-cp37m-win32.whl", hash = "sha256:9408acf3270c4b6baad483865191e3e582b638b1654a007c62e3efe96f09a9a3"},
+    {file = "kiwisolver-1.4.5-cp37-cp37m-win_amd64.whl", hash = "sha256:5b94529f9b2591b7af5f3e0e730a4e0a41ea174af35a4fd067775f9bdfeee01a"},
+    {file = "kiwisolver-1.4.5-cp38-cp38-macosx_10_9_universal2.whl", hash = "sha256:11c7de8f692fc99816e8ac50d1d1aef4f75126eefc33ac79aac02c099fd3db71"},
+    {file = "kiwisolver-1.4.5-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:53abb58632235cd154176ced1ae8f0d29a6657aa1aa9decf50b899b755bc2b93"},
+    {file = "kiwisolver-1.4.5-cp38-cp38-macosx_11_0_arm64.whl", hash = "sha256:88b9f257ca61b838b6f8094a62418421f87ac2a1069f7e896c36a7d86b5d4c29"},
+    {file = "kiwisolver-1.4.5-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:3195782b26fc03aa9c6913d5bad5aeb864bdc372924c093b0f1cebad603dd712"},
+    {file = "kiwisolver-1.4.5-cp38-cp38-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:fc579bf0f502e54926519451b920e875f433aceb4624a3646b3252b5caa9e0b6"},
+    {file = "kiwisolver-1.4.5-cp38-cp38-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:5a580c91d686376f0f7c295357595c5a026e6cbc3d77b7c36e290201e7c11ecb"},
+    {file = "kiwisolver-1.4.5-cp38-cp38-manylinux_2_5_i686.manylinux1_i686.whl", hash = "sha256:cfe6ab8da05c01ba6fbea630377b5da2cd9bcbc6338510116b01c1bc939a2c18"},
+    {file = "kiwisolver-1.4.5-cp38-cp38-manylinux_2_5_x86_64.manylinux1_x86_64.whl", hash = "sha256:d2e5a98f0ec99beb3c10e13b387f8db39106d53993f498b295f0c914328b1333"},
+    {file = "kiwisolver-1.4.5-cp38-cp38-musllinux_1_1_aarch64.whl", hash = "sha256:a51a263952b1429e429ff236d2f5a21c5125437861baeed77f5e1cc2d2c7c6da"},
+    {file = "kiwisolver-1.4.5-cp38-cp38-musllinux_1_1_i686.whl", hash = "sha256:3edd2fa14e68c9be82c5b16689e8d63d89fe927e56debd6e1dbce7a26a17f81b"},
+    {file = "kiwisolver-1.4.5-cp38-cp38-musllinux_1_1_ppc64le.whl", hash = "sha256:74d1b44c6cfc897df648cc9fdaa09bc3e7679926e6f96df05775d4fb3946571c"},
+    {file = "kiwisolver-1.4.5-cp38-cp38-musllinux_1_1_s390x.whl", hash = "sha256:76d9289ed3f7501012e05abb8358bbb129149dbd173f1f57a1bf1c22d19ab7cc"},
+    {file = "kiwisolver-1.4.5-cp38-cp38-musllinux_1_1_x86_64.whl", hash = "sha256:92dea1ffe3714fa8eb6a314d2b3c773208d865a0e0d35e713ec54eea08a66250"},
+    {file = "kiwisolver-1.4.5-cp38-cp38-win32.whl", hash = "sha256:5c90ae8c8d32e472be041e76f9d2f2dbff4d0b0be8bd4041770eddb18cf49a4e"},
+    {file = "kiwisolver-1.4.5-cp38-cp38-win_amd64.whl", hash = "sha256:c7940c1dc63eb37a67721b10d703247552416f719c4188c54e04334321351ced"},
+    {file = "kiwisolver-1.4.5-cp39-cp39-macosx_10_9_universal2.whl", hash = "sha256:9407b6a5f0d675e8a827ad8742e1d6b49d9c1a1da5d952a67d50ef5f4170b18d"},
+    {file = "kiwisolver-1.4.5-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:15568384086b6df3c65353820a4473575dbad192e35010f622c6ce3eebd57af9"},
+    {file = "kiwisolver-1.4.5-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:0dc9db8e79f0036e8173c466d21ef18e1befc02de8bf8aa8dc0813a6dc8a7046"},
+    {file = "kiwisolver-1.4.5-cp39-cp39-manylinux_2_12_i686.manylinux2010_i686.whl", hash = "sha256:cdc8a402aaee9a798b50d8b827d7ecf75edc5fb35ea0f91f213ff927c15f4ff0"},
+    {file = "kiwisolver-1.4.5-cp39-cp39-manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:6c3bd3cde54cafb87d74d8db50b909705c62b17c2099b8f2e25b461882e544ff"},
+    {file = "kiwisolver-1.4.5-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:955e8513d07a283056b1396e9a57ceddbd272d9252c14f154d450d227606eb54"},
+    {file = "kiwisolver-1.4.5-cp39-cp39-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:346f5343b9e3f00b8db8ba359350eb124b98c99efd0b408728ac6ebf38173958"},
+    {file = "kiwisolver-1.4.5-cp39-cp39-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:b9098e0049e88c6a24ff64545cdfc50807818ba6c1b739cae221bbbcbc58aad3"},
+    {file = "kiwisolver-1.4.5-cp39-cp39-musllinux_1_1_aarch64.whl", hash = "sha256:00bd361b903dc4bbf4eb165f24d1acbee754fce22ded24c3d56eec268658a5cf"},
+    {file = "kiwisolver-1.4.5-cp39-cp39-musllinux_1_1_i686.whl", hash = "sha256:7b8b454bac16428b22560d0a1cf0a09875339cab69df61d7805bf48919415901"},
+    {file = "kiwisolver-1.4.5-cp39-cp39-musllinux_1_1_ppc64le.whl", hash = "sha256:f1d072c2eb0ad60d4c183f3fb44ac6f73fb7a8f16a2694a91f988275cbf352f9"},
+    {file = "kiwisolver-1.4.5-cp39-cp39-musllinux_1_1_s390x.whl", hash = "sha256:31a82d498054cac9f6d0b53d02bb85811185bcb477d4b60144f915f3b3126342"},
+    {file = "kiwisolver-1.4.5-cp39-cp39-musllinux_1_1_x86_64.whl", hash = "sha256:6512cb89e334e4700febbffaaa52761b65b4f5a3cf33f960213d5656cea36a77"},
+    {file = "kiwisolver-1.4.5-cp39-cp39-win32.whl", hash = "sha256:9db8ea4c388fdb0f780fe91346fd438657ea602d58348753d9fb265ce1bca67f"},
+    {file = "kiwisolver-1.4.5-cp39-cp39-win_amd64.whl", hash = "sha256:59415f46a37f7f2efeec758353dd2eae1b07640d8ca0f0c42548ec4125492635"},
+    {file = "kiwisolver-1.4.5-pp37-pypy37_pp73-macosx_10_9_x86_64.whl", hash = "sha256:5c7b3b3a728dc6faf3fc372ef24f21d1e3cee2ac3e9596691d746e5a536de920"},
+    {file = "kiwisolver-1.4.5-pp37-pypy37_pp73-manylinux_2_12_i686.manylinux2010_i686.whl", hash = "sha256:620ced262a86244e2be10a676b646f29c34537d0d9cc8eb26c08f53d98013390"},
+    {file = "kiwisolver-1.4.5-pp37-pypy37_pp73-manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:378a214a1e3bbf5ac4a8708304318b4f890da88c9e6a07699c4ae7174c09a68d"},
+    {file = "kiwisolver-1.4.5-pp37-pypy37_pp73-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:aaf7be1207676ac608a50cd08f102f6742dbfc70e8d60c4db1c6897f62f71523"},
+    {file = "kiwisolver-1.4.5-pp37-pypy37_pp73-win_amd64.whl", hash = "sha256:ba55dce0a9b8ff59495ddd050a0225d58bd0983d09f87cfe2b6aec4f2c1234e4"},
+    {file = "kiwisolver-1.4.5-pp38-pypy38_pp73-macosx_10_9_x86_64.whl", hash = "sha256:fd32ea360bcbb92d28933fc05ed09bffcb1704ba3fc7942e81db0fd4f81a7892"},
+    {file = "kiwisolver-1.4.5-pp38-pypy38_pp73-manylinux_2_12_i686.manylinux2010_i686.whl", hash = "sha256:5e7139af55d1688f8b960ee9ad5adafc4ac17c1c473fe07133ac092310d76544"},
+    {file = "kiwisolver-1.4.5-pp38-pypy38_pp73-manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:dced8146011d2bc2e883f9bd68618b8247387f4bbec46d7392b3c3b032640126"},
+    {file = "kiwisolver-1.4.5-pp38-pypy38_pp73-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:c9bf3325c47b11b2e51bca0824ea217c7cd84491d8ac4eefd1e409705ef092bd"},
+    {file = "kiwisolver-1.4.5-pp38-pypy38_pp73-win_amd64.whl", hash = "sha256:5794cf59533bc3f1b1c821f7206a3617999db9fbefc345360aafe2e067514929"},
+    {file = "kiwisolver-1.4.5-pp39-pypy39_pp73-macosx_10_9_x86_64.whl", hash = "sha256:e368f200bbc2e4f905b8e71eb38b3c04333bddaa6a2464a6355487b02bb7fb09"},
+    {file = "kiwisolver-1.4.5-pp39-pypy39_pp73-manylinux_2_12_i686.manylinux2010_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:e5d706eba36b4c4d5bc6c6377bb6568098765e990cfc21ee16d13963fab7b3e7"},
+    {file = "kiwisolver-1.4.5-pp39-pypy39_pp73-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:85267bd1aa8880a9c88a8cb71e18d3d64d2751a790e6ca6c27b8ccc724bcd5ad"},
+    {file = "kiwisolver-1.4.5-pp39-pypy39_pp73-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:210ef2c3a1f03272649aff1ef992df2e724748918c4bc2d5a90352849eb40bea"},
+    {file = "kiwisolver-1.4.5-pp39-pypy39_pp73-win_amd64.whl", hash = "sha256:11d011a7574eb3b82bcc9c1a1d35c1d7075677fdd15de527d91b46bd35e935ee"},
+    {file = "kiwisolver-1.4.5.tar.gz", hash = "sha256:e57e563a57fb22a142da34f38acc2fc1a5c864bc29ca1517a88abc963e60d6ec"},
+]
+
 [[package]]
 name = "markdown-it-py"
 version = "3.0.0"
@@ -588,6 +844,54 @@ files = [
     {file = "MarkupSafe-2.1.3.tar.gz", hash = "sha256:af598ed32d6ae86f1b747b82783958b1a4ab8f617b06fe68795c7f026abbdcad"},
 ]
 
+[[package]]
+name = "matplotlib"
+version = "3.8.2"
+description = "Python plotting package"
+optional = false
+python-versions = ">=3.9"
+files = [
+    {file = "matplotlib-3.8.2-cp310-cp310-macosx_10_12_x86_64.whl", hash = "sha256:09796f89fb71a0c0e1e2f4bdaf63fb2cefc84446bb963ecdeb40dfee7dfa98c7"},
+    {file = "matplotlib-3.8.2-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:6f9c6976748a25e8b9be51ea028df49b8e561eed7809146da7a47dbecebab367"},
+    {file = "matplotlib-3.8.2-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:b78e4f2cedf303869b782071b55fdde5987fda3038e9d09e58c91cc261b5ad18"},
+    {file = "matplotlib-3.8.2-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:4e208f46cf6576a7624195aa047cb344a7f802e113bb1a06cfd4bee431de5e31"},
+    {file = "matplotlib-3.8.2-cp310-cp310-musllinux_1_1_x86_64.whl", hash = "sha256:46a569130ff53798ea5f50afce7406e91fdc471ca1e0e26ba976a8c734c9427a"},
+    {file = "matplotlib-3.8.2-cp310-cp310-win_amd64.whl", hash = "sha256:830f00640c965c5b7f6bc32f0d4ce0c36dfe0379f7dd65b07a00c801713ec40a"},
+    {file = "matplotlib-3.8.2-cp311-cp311-macosx_10_12_x86_64.whl", hash = "sha256:d86593ccf546223eb75a39b44c32788e6f6440d13cfc4750c1c15d0fcb850b63"},
+    {file = "matplotlib-3.8.2-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:9a5430836811b7652991939012f43d2808a2db9b64ee240387e8c43e2e5578c8"},
+    {file = "matplotlib-3.8.2-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:b9576723858a78751d5aacd2497b8aef29ffea6d1c95981505877f7ac28215c6"},
+    {file = "matplotlib-3.8.2-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:5ba9cbd8ac6cf422f3102622b20f8552d601bf8837e49a3afed188d560152788"},
+    {file = "matplotlib-3.8.2-cp311-cp311-musllinux_1_1_x86_64.whl", hash = "sha256:03f9d160a29e0b65c0790bb07f4f45d6a181b1ac33eb1bb0dd225986450148f0"},
+    {file = "matplotlib-3.8.2-cp311-cp311-win_amd64.whl", hash = "sha256:3773002da767f0a9323ba1a9b9b5d00d6257dbd2a93107233167cfb581f64717"},
+    {file = "matplotlib-3.8.2-cp312-cp312-macosx_10_12_x86_64.whl", hash = "sha256:4c318c1e95e2f5926fba326f68177dee364aa791d6df022ceb91b8221bd0a627"},
+    {file = "matplotlib-3.8.2-cp312-cp312-macosx_11_0_arm64.whl", hash = "sha256:091275d18d942cf1ee9609c830a1bc36610607d8223b1b981c37d5c9fc3e46a4"},
+    {file = "matplotlib-3.8.2-cp312-cp312-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:1b0f3b8ea0e99e233a4bcc44590f01604840d833c280ebb8fe5554fd3e6cfe8d"},
+    {file = "matplotlib-3.8.2-cp312-cp312-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:d7b1704a530395aaf73912be741c04d181f82ca78084fbd80bc737be04848331"},
+    {file = "matplotlib-3.8.2-cp312-cp312-musllinux_1_1_x86_64.whl", hash = "sha256:533b0e3b0c6768eef8cbe4b583731ce25a91ab54a22f830db2b031e83cca9213"},
+    {file = "matplotlib-3.8.2-cp312-cp312-win_amd64.whl", hash = "sha256:0f4fc5d72b75e2c18e55eb32292659cf731d9d5b312a6eb036506304f4675630"},
+    {file = "matplotlib-3.8.2-cp39-cp39-macosx_10_12_x86_64.whl", hash = "sha256:deaed9ad4da0b1aea77fe0aa0cebb9ef611c70b3177be936a95e5d01fa05094f"},
+    {file = "matplotlib-3.8.2-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:172f4d0fbac3383d39164c6caafd3255ce6fa58f08fc392513a0b1d3b89c4f89"},
+    {file = "matplotlib-3.8.2-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:c7d36c2209d9136cd8e02fab1c0ddc185ce79bc914c45054a9f514e44c787917"},
+    {file = "matplotlib-3.8.2-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:5864bdd7da445e4e5e011b199bb67168cdad10b501750367c496420f2ad00843"},
+    {file = "matplotlib-3.8.2-cp39-cp39-musllinux_1_1_x86_64.whl", hash = "sha256:ef8345b48e95cee45ff25192ed1f4857273117917a4dcd48e3905619bcd9c9b8"},
+    {file = "matplotlib-3.8.2-cp39-cp39-win_amd64.whl", hash = "sha256:7c48d9e221b637c017232e3760ed30b4e8d5dfd081daf327e829bf2a72c731b4"},
+    {file = "matplotlib-3.8.2-pp39-pypy39_pp73-macosx_10_12_x86_64.whl", hash = "sha256:aa11b3c6928a1e496c1a79917d51d4cd5d04f8a2e75f21df4949eeefdf697f4b"},
+    {file = "matplotlib-3.8.2-pp39-pypy39_pp73-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:d1095fecf99eeb7384dabad4bf44b965f929a5f6079654b681193edf7169ec20"},
+    {file = "matplotlib-3.8.2-pp39-pypy39_pp73-win_amd64.whl", hash = "sha256:bddfb1db89bfaa855912261c805bd0e10218923cc262b9159a49c29a7a1c1afa"},
+    {file = "matplotlib-3.8.2.tar.gz", hash = "sha256:01a978b871b881ee76017152f1f1a0cbf6bd5f7b8ff8c96df0df1bd57d8755a1"},
+]
+
+[package.dependencies]
+contourpy = ">=1.0.1"
+cycler = ">=0.10"
+fonttools = ">=4.22.0"
+kiwisolver = ">=1.3.1"
+numpy = ">=1.21,<2"
+packaging = ">=20.0"
+pillow = ">=8"
+pyparsing = ">=2.3.1"
+python-dateutil = ">=2.7"
+
 [[package]]
 name = "mdurl"
 version = "0.1.2"
@@ -691,6 +995,17 @@ files = [
     {file = "packaging-23.2.tar.gz", hash = "sha256:048fb0e9405036518eaaf48a55953c750c11e1a1b68e0dd1a9d62ed0c092cfc5"},
 ]
 
+[[package]]
+name = "parse"
+version = "1.19.1"
+description = "parse() is the opposite of format()"
+optional = false
+python-versions = "*"
+files = [
+    {file = "parse-1.19.1-py2.py3-none-any.whl", hash = "sha256:371ed3800dc63983832159cc9373156613947707bc448b5215473a219dbd4362"},
+    {file = "parse-1.19.1.tar.gz", hash = "sha256:cc3a47236ff05da377617ddefa867b7ba983819c664e1afe46249e5b469be464"},
+]
+
 [[package]]
 name = "pathspec"
 version = "0.11.2"
@@ -702,6 +1017,73 @@ files = [
     {file = "pathspec-0.11.2.tar.gz", hash = "sha256:e0d8d0ac2f12da61956eb2306b69f9469b42f4deb0f3cb6ed47b9cce9996ced3"},
 ]
 
+[[package]]
+name = "pillow"
+version = "10.1.0"
+description = "Python Imaging Library (Fork)"
+optional = false
+python-versions = ">=3.8"
+files = [
+    {file = "Pillow-10.1.0-cp310-cp310-macosx_10_10_x86_64.whl", hash = "sha256:1ab05f3db77e98f93964697c8efc49c7954b08dd61cff526b7f2531a22410106"},
+    {file = "Pillow-10.1.0-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:6932a7652464746fcb484f7fc3618e6503d2066d853f68a4bd97193a3996e273"},
+    {file = "Pillow-10.1.0-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:a5f63b5a68daedc54c7c3464508d8c12075e56dcfbd42f8c1bf40169061ae666"},
+    {file = "Pillow-10.1.0-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:c0949b55eb607898e28eaccb525ab104b2d86542a85c74baf3a6dc24002edec2"},
+    {file = "Pillow-10.1.0-cp310-cp310-manylinux_2_28_aarch64.whl", hash = "sha256:ae88931f93214777c7a3aa0a8f92a683f83ecde27f65a45f95f22d289a69e593"},
+    {file = "Pillow-10.1.0-cp310-cp310-manylinux_2_28_x86_64.whl", hash = "sha256:b0eb01ca85b2361b09480784a7931fc648ed8b7836f01fb9241141b968feb1db"},
+    {file = "Pillow-10.1.0-cp310-cp310-musllinux_1_1_aarch64.whl", hash = "sha256:d27b5997bdd2eb9fb199982bb7eb6164db0426904020dc38c10203187ae2ff2f"},
+    {file = "Pillow-10.1.0-cp310-cp310-musllinux_1_1_x86_64.whl", hash = "sha256:7df5608bc38bd37ef585ae9c38c9cd46d7c81498f086915b0f97255ea60c2818"},
+    {file = "Pillow-10.1.0-cp310-cp310-win_amd64.whl", hash = "sha256:41f67248d92a5e0a2076d3517d8d4b1e41a97e2df10eb8f93106c89107f38b57"},
+    {file = "Pillow-10.1.0-cp311-cp311-macosx_10_10_x86_64.whl", hash = "sha256:1fb29c07478e6c06a46b867e43b0bcdb241b44cc52be9bc25ce5944eed4648e7"},
+    {file = "Pillow-10.1.0-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:2cdc65a46e74514ce742c2013cd4a2d12e8553e3a2563c64879f7c7e4d28bce7"},
+    {file = "Pillow-10.1.0-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:50d08cd0a2ecd2a8657bd3d82c71efd5a58edb04d9308185d66c3a5a5bed9610"},
+    {file = "Pillow-10.1.0-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:062a1610e3bc258bff2328ec43f34244fcec972ee0717200cb1425214fe5b839"},
+    {file = "Pillow-10.1.0-cp311-cp311-manylinux_2_28_aarch64.whl", hash = "sha256:61f1a9d247317fa08a308daaa8ee7b3f760ab1809ca2da14ecc88ae4257d6172"},
+    {file = "Pillow-10.1.0-cp311-cp311-manylinux_2_28_x86_64.whl", hash = "sha256:a646e48de237d860c36e0db37ecaecaa3619e6f3e9d5319e527ccbc8151df061"},
+    {file = "Pillow-10.1.0-cp311-cp311-musllinux_1_1_aarch64.whl", hash = "sha256:47e5bf85b80abc03be7455c95b6d6e4896a62f6541c1f2ce77a7d2bb832af262"},
+    {file = "Pillow-10.1.0-cp311-cp311-musllinux_1_1_x86_64.whl", hash = "sha256:a92386125e9ee90381c3369f57a2a50fa9e6aa8b1cf1d9c4b200d41a7dd8e992"},
+    {file = "Pillow-10.1.0-cp311-cp311-win_amd64.whl", hash = "sha256:0f7c276c05a9767e877a0b4c5050c8bee6a6d960d7f0c11ebda6b99746068c2a"},
+    {file = "Pillow-10.1.0-cp312-cp312-macosx_10_10_x86_64.whl", hash = "sha256:a89b8312d51715b510a4fe9fc13686283f376cfd5abca8cd1c65e4c76e21081b"},
+    {file = "Pillow-10.1.0-cp312-cp312-macosx_11_0_arm64.whl", hash = "sha256:00f438bb841382b15d7deb9a05cc946ee0f2c352653c7aa659e75e592f6fa17d"},
+    {file = "Pillow-10.1.0-cp312-cp312-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:3d929a19f5469b3f4df33a3df2983db070ebb2088a1e145e18facbc28cae5b27"},
+    {file = "Pillow-10.1.0-cp312-cp312-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:9a92109192b360634a4489c0c756364c0c3a2992906752165ecb50544c251312"},
+    {file = "Pillow-10.1.0-cp312-cp312-manylinux_2_28_aarch64.whl", hash = "sha256:0248f86b3ea061e67817c47ecbe82c23f9dd5d5226200eb9090b3873d3ca32de"},
+    {file = "Pillow-10.1.0-cp312-cp312-manylinux_2_28_x86_64.whl", hash = "sha256:9882a7451c680c12f232a422730f986a1fcd808da0fd428f08b671237237d651"},
+    {file = "Pillow-10.1.0-cp312-cp312-musllinux_1_1_aarch64.whl", hash = "sha256:1c3ac5423c8c1da5928aa12c6e258921956757d976405e9467c5f39d1d577a4b"},
+    {file = "Pillow-10.1.0-cp312-cp312-musllinux_1_1_x86_64.whl", hash = "sha256:806abdd8249ba3953c33742506fe414880bad78ac25cc9a9b1c6ae97bedd573f"},
+    {file = "Pillow-10.1.0-cp312-cp312-win_amd64.whl", hash = "sha256:eaed6977fa73408b7b8a24e8b14e59e1668cfc0f4c40193ea7ced8e210adf996"},
+    {file = "Pillow-10.1.0-cp38-cp38-macosx_10_10_x86_64.whl", hash = "sha256:fe1e26e1ffc38be097f0ba1d0d07fcade2bcfd1d023cda5b29935ae8052bd793"},
+    {file = "Pillow-10.1.0-cp38-cp38-macosx_11_0_arm64.whl", hash = "sha256:7a7e3daa202beb61821c06d2517428e8e7c1aab08943e92ec9e5755c2fc9ba5e"},
+    {file = "Pillow-10.1.0-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:24fadc71218ad2b8ffe437b54876c9382b4a29e030a05a9879f615091f42ffc2"},
+    {file = "Pillow-10.1.0-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:fa1d323703cfdac2036af05191b969b910d8f115cf53093125e4058f62012c9a"},
+    {file = "Pillow-10.1.0-cp38-cp38-manylinux_2_28_aarch64.whl", hash = "sha256:912e3812a1dbbc834da2b32299b124b5ddcb664ed354916fd1ed6f193f0e2d01"},
+    {file = "Pillow-10.1.0-cp38-cp38-manylinux_2_28_x86_64.whl", hash = "sha256:7dbaa3c7de82ef37e7708521be41db5565004258ca76945ad74a8e998c30af8d"},
+    {file = "Pillow-10.1.0-cp38-cp38-musllinux_1_1_aarch64.whl", hash = "sha256:9d7bc666bd8c5a4225e7ac71f2f9d12466ec555e89092728ea0f5c0c2422ea80"},
+    {file = "Pillow-10.1.0-cp38-cp38-musllinux_1_1_x86_64.whl", hash = "sha256:baada14941c83079bf84c037e2d8b7506ce201e92e3d2fa0d1303507a8538212"},
+    {file = "Pillow-10.1.0-cp38-cp38-win_amd64.whl", hash = "sha256:2ef6721c97894a7aa77723740a09547197533146fba8355e86d6d9a4a1056b14"},
+    {file = "Pillow-10.1.0-cp39-cp39-macosx_10_10_x86_64.whl", hash = "sha256:0a026c188be3b443916179f5d04548092e253beb0c3e2ee0a4e2cdad72f66099"},
+    {file = "Pillow-10.1.0-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:04f6f6149f266a100374ca3cc368b67fb27c4af9f1cc8cb6306d849dcdf12616"},
+    {file = "Pillow-10.1.0-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:bb40c011447712d2e19cc261c82655f75f32cb724788df315ed992a4d65696bb"},
+    {file = "Pillow-10.1.0-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:1a8413794b4ad9719346cd9306118450b7b00d9a15846451549314a58ac42219"},
+    {file = "Pillow-10.1.0-cp39-cp39-manylinux_2_28_aarch64.whl", hash = "sha256:c9aeea7b63edb7884b031a35305629a7593272b54f429a9869a4f63a1bf04c34"},
+    {file = "Pillow-10.1.0-cp39-cp39-manylinux_2_28_x86_64.whl", hash = "sha256:b4005fee46ed9be0b8fb42be0c20e79411533d1fd58edabebc0dd24626882cfd"},
+    {file = "Pillow-10.1.0-cp39-cp39-musllinux_1_1_aarch64.whl", hash = "sha256:4d0152565c6aa6ebbfb1e5d8624140a440f2b99bf7afaafbdbf6430426497f28"},
+    {file = "Pillow-10.1.0-cp39-cp39-musllinux_1_1_x86_64.whl", hash = "sha256:d921bc90b1defa55c9917ca6b6b71430e4286fc9e44c55ead78ca1a9f9eba5f2"},
+    {file = "Pillow-10.1.0-cp39-cp39-win_amd64.whl", hash = "sha256:cfe96560c6ce2f4c07d6647af2d0f3c54cc33289894ebd88cfbb3bcd5391e256"},
+    {file = "Pillow-10.1.0-pp310-pypy310_pp73-macosx_10_10_x86_64.whl", hash = "sha256:937bdc5a7f5343d1c97dc98149a0be7eb9704e937fe3dc7140e229ae4fc572a7"},
+    {file = "Pillow-10.1.0-pp310-pypy310_pp73-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:b1c25762197144e211efb5f4e8ad656f36c8d214d390585d1d21281f46d556ba"},
+    {file = "Pillow-10.1.0-pp310-pypy310_pp73-manylinux_2_28_x86_64.whl", hash = "sha256:afc8eef765d948543a4775f00b7b8c079b3321d6b675dde0d02afa2ee23000b4"},
+    {file = "Pillow-10.1.0-pp310-pypy310_pp73-win_amd64.whl", hash = "sha256:883f216eac8712b83a63f41b76ddfb7b2afab1b74abbb413c5df6680f071a6b9"},
+    {file = "Pillow-10.1.0-pp39-pypy39_pp73-macosx_10_10_x86_64.whl", hash = "sha256:b920e4d028f6442bea9a75b7491c063f0b9a3972520731ed26c83e254302eb1e"},
+    {file = "Pillow-10.1.0-pp39-pypy39_pp73-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:1c41d960babf951e01a49c9746f92c5a7e0d939d1652d7ba30f6b3090f27e412"},
+    {file = "Pillow-10.1.0-pp39-pypy39_pp73-manylinux_2_28_x86_64.whl", hash = "sha256:1fafabe50a6977ac70dfe829b2d5735fd54e190ab55259ec8aea4aaea412fa0b"},
+    {file = "Pillow-10.1.0-pp39-pypy39_pp73-win_amd64.whl", hash = "sha256:3b834f4b16173e5b92ab6566f0473bfb09f939ba14b23b8da1f54fa63e4b623f"},
+    {file = "Pillow-10.1.0.tar.gz", hash = "sha256:e6bf8de6c36ed96c86ea3b6e1d5273c53f46ef518a062464cd7ef5dd2cf92e38"},
+]
+
+[package.extras]
+docs = ["furo", "olefile", "sphinx (>=2.4)", "sphinx-copybutton", "sphinx-inline-tabs", "sphinx-removed-in", "sphinxext-opengraph"]
+tests = ["check-manifest", "coverage", "defusedxml", "markdown2", "olefile", "packaging", "pyroma", "pytest", "pytest-cov", "pytest-timeout"]
+
 [[package]]
 name = "platformdirs"
 version = "3.11.0"
@@ -765,6 +1147,20 @@ files = [
 plugins = ["importlib-metadata"]
 windows-terminal = ["colorama (>=0.4.6)"]
 
+[[package]]
+name = "pyparsing"
+version = "3.1.1"
+description = "pyparsing module - Classes and methods to define and execute parsing grammars"
+optional = false
+python-versions = ">=3.6.8"
+files = [
+    {file = "pyparsing-3.1.1-py3-none-any.whl", hash = "sha256:32c7c0b711493c72ff18a981d24f28aaf9c1fb7ed5e9667c9e84e3db623bdbfb"},
+    {file = "pyparsing-3.1.1.tar.gz", hash = "sha256:ede28a1a32462f5a9705e07aea48001a08f7cf81a021585011deba701581a0db"},
+]
+
+[package.extras]
+diagrams = ["jinja2", "railroad-diagrams"]
+
 [[package]]
 name = "pyproject-api"
 version = "1.6.1"
@@ -1130,4 +1526,4 @@ test = ["covdefaults (>=2.3)", "coverage (>=7.2.7)", "coverage-enable-subprocess
 [metadata]
 lock-version = "2.0"
 python-versions = "^3.12"
-content-hash = "e066d041ea8b0505a8beca348922ed6972a2f1ff18d0606e1d4d645d8fdd36b9"
+content-hash = "c622e26aedbd60f2fdb0cb18146bfdab2a6f32e3517ed7f1e15f01093c8cf1e4"
diff --git a/pyproject.toml b/pyproject.toml
index 648cf03b..9910e195 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -5,6 +5,14 @@ description = "Advent of Code - Roel Adriaans"
 authors = ["Roel Adriaans <roel@adriaans.org>"]
 license = "MIT"
 
+packages = [
+    { include = "adventofcode2016", from="src" },
+    { include = "adventofcode2019", from="src" },
+    { include = "adventofcode2020", from="src" },
+    { include = "adventofcode2021", from="src" },
+    { include = "adventofcode2022", from="src" }
+]
+
 [tool.poetry.dependencies]
 python = "^3.12"
 anytree = "^2.12.1"
@@ -17,6 +25,8 @@ numpy = "^1.26.2"
 adventofcodeutils = {git = "https://github.com/RoelAdriaans/adventofcodeutils.git"}
 more-itertools = "^10.1.0"
 regex-spm = "^1.0.0"
+parse = "^1.19.1"
+matplotlib = "^3.8.2"
 
 [tool.poetry.dev-dependencies]
 black = "^23.11.0"
diff --git a/tests/adventofcode2021/test_day04_b.py b/tests/adventofcode2021/test_day04_b.py
index ffeebe02..afcf1178 100644
--- a/tests/adventofcode2021/test_day04_b.py
+++ b/tests/adventofcode2021/test_day04_b.py
@@ -1,6 +1,5 @@
-from test_day04_a import test_data
-
 from adventofcode2021.solutions.day04 import Day04PartB
+from tests.adventofcode2021.test_day04_a import test_data
 
 
 class TestDay04PartB:
diff --git a/tests/adventofcode2021/test_day09_b.py b/tests/adventofcode2021/test_day09_b.py
index e1833399..9cc9a637 100644
--- a/tests/adventofcode2021/test_day09_b.py
+++ b/tests/adventofcode2021/test_day09_b.py
@@ -1,6 +1,5 @@
-from test_day09_a import test_input
-
 from adventofcode2021.solutions.day09 import Day09PartB
+from tests.adventofcode2021.test_day09_a import test_input
 
 
 class TestDay09PartB:
diff --git a/tests/adventofcode2021/test_day10_b.py b/tests/adventofcode2021/test_day10_b.py
index 7986010c..a5531a23 100644
--- a/tests/adventofcode2021/test_day10_b.py
+++ b/tests/adventofcode2021/test_day10_b.py
@@ -1,7 +1,7 @@
 import pytest
-from test_day10_a import test_data
 
 from adventofcode2021.solutions.day10 import Day10PartB
+from tests.adventofcode2021.test_day10_a import test_data
 
 
 class TestDay10PartB:
diff --git a/tests/adventofcode2021/test_day12_b.py b/tests/adventofcode2021/test_day12_b.py
index 01dfea28..e4c4cadd 100644
--- a/tests/adventofcode2021/test_day12_b.py
+++ b/tests/adventofcode2021/test_day12_b.py
@@ -1,7 +1,11 @@
 import pytest
-from test_day12_a import test_data, test_data_longer, test_data_short
 
 from adventofcode2021.solutions.day12 import Day12PartB
+from tests.adventofcode2021.test_day12_a import (
+    test_data,
+    test_data_longer,
+    test_data_short,
+)
 
 
 class TestDay12PartB:
diff --git a/tests/adventofcode2021/test_day15_b.py b/tests/adventofcode2021/test_day15_b.py
index 2a7d28c7..5bac46f4 100644
--- a/tests/adventofcode2021/test_day15_b.py
+++ b/tests/adventofcode2021/test_day15_b.py
@@ -1,7 +1,7 @@
 import pytest
-from test_day15_a import test_data
 
 from adventofcode2021.solutions.day15 import Day15PartB
+from tests.adventofcode2021.test_day15_a import test_data
 
 
 class TestDay15PartB:
diff --git a/tox.ini b/tox.ini
index 49b5eb28..85a0576b 100644
--- a/tox.ini
+++ b/tox.ini
@@ -5,10 +5,12 @@ envlist =
 
 [pytest]
 # Makes all warnings be fatal
-filterwarnings = error
+# Disabled due to tqdm incompatibility to python 3.12 :
+# https://github.com/tqdm/tqdm/issues/1517
+# filterwarnings = error
 junit_family = xunit1
 testpaths = tests
-addopts = --cov --cov-report=term --cov-report=html --cov-report=xml
+addopts = --cov --cov-report=term --cov-report=html --cov-report=xml --import-mode=importlib --ignore=template
 
 [flake8]
 max-complexity = 16
@@ -42,6 +44,9 @@ omit =
 source =
     adventofcode2016
     adventofcode2019
+    adventofcode2020
+    adventofcode2021
+    adventofcode2022
     tests
 
 [coverage:report]

From b6190ab51f96bee74fc58c21060477ad5b185dae Mon Sep 17 00:00:00 2001
From: Roel Adriaans <roel@adriaans.org>
Date: Sun, 19 Nov 2023 01:24:10 +0100
Subject: [PATCH 304/371] Move to generic aoc functions, and remove duplicates

---
 src/adventofcode2019/solutions/day04.py      |   3 +-
 src/adventofcode2019/solutions/day05.py      |   3 +-
 src/adventofcode2019/solutions/day07.py      |   3 +-
 src/adventofcode2019/solutions/day09.py      |   3 +-
 src/adventofcode2019/solutions/day11.py      |   2 +-
 src/adventofcode2019/solutions/day13.py      |   3 +-
 src/adventofcode2019/solutions/day15.py      |   3 +-
 src/adventofcode2019/solutions/day16.py      |   3 +-
 src/adventofcode2019/solutions/day17.py      |   3 +-
 src/adventofcode2019/utils/advent_utils.py   |  21 ----
 src/adventofcode2020/utils/advent_utils.py   |  21 ----
 src/adventofcode2021/solutions/day10.py      |   3 +-
 src/adventofcode2021/solutions/day12.py      |   7 +-
 src/adventofcode2021/solutions/day13.py      |   3 +-
 src/adventofcode2021/solutions/day15.py      |   5 +-
 src/adventofcode2021/solutions/day18.py      |   3 +-
 src/adventofcode2021/solutions/day19.py      |   3 +-
 src/adventofcode2021/solutions/day20.py      |   3 +-
 src/adventofcode2021/solutions/day22.py      |   3 +-
 src/adventofcode2021/utils/advent_utils.py   |  21 ----
 src/adventofcode2021/utils/graph.py          |  89 ----------------
 src/adventofcode2021/utils/node.py           |  41 -------
 src/adventofcode2021/utils/point.py          |  25 -----
 src/adventofcode2021/utils/priority_queue.py |  30 ------
 src/adventofcode2021/utils/queue.py          |  29 -----
 src/adventofcode2021/utils/stack.py          |  25 -----
 src/adventofcode2022/solutions/day05.py      |   2 +-
 src/adventofcode2022/solutions/day08.py      |   3 +-
 src/adventofcode2022/solutions/day09.py      |   2 +-
 src/adventofcode2022/solutions/day11.py      |   2 +-
 src/adventofcode2022/solutions/day12.py      |   7 +-
 src/adventofcode2022/solutions/day14.py      |   3 +-
 src/adventofcode2022/solutions/day15.py      |   2 +-
 src/adventofcode2022/utils/advent_utils.py   |  21 ----
 src/adventofcode2022/utils/generic_search.py | 106 -------------------
 src/adventofcode2022/utils/graph.py          |  89 ----------------
 src/adventofcode2022/utils/node.py           |  41 -------
 src/adventofcode2022/utils/point.py          |  39 -------
 src/adventofcode2022/utils/priority_queue.py |  30 ------
 src/adventofcode2022/utils/queue.py          |  29 -----
 src/adventofcode2022/utils/stack.py          |  25 -----
 tests/adventofcode2019/test_advent_utils.py  |  37 -------
 tests/adventofcode2021/test_day20_a.py       |   3 +-
 tests/adventofcode2022/test_day08_a.py       |   2 +-
 tests/adventofcode2022/test_day08_b.py       |   3 +-
 tests/test_advent_utils.py                   |  37 -------
 tests/test_generic_search.py                 |   0
 tests/test_graph.py                          |  20 ----
 tests/test_node.py                           |  13 ---
 tests/test_point.py                          |  66 ------------
 tests/test_priority_queue.py                 |  32 ------
 tests/test_queue.py                          |  31 ------
 tests/test_stack.py                          |  37 -------
 53 files changed, 53 insertions(+), 987 deletions(-)
 delete mode 100644 src/adventofcode2019/utils/advent_utils.py
 delete mode 100644 src/adventofcode2020/utils/advent_utils.py
 delete mode 100644 src/adventofcode2021/utils/advent_utils.py
 delete mode 100644 src/adventofcode2021/utils/graph.py
 delete mode 100644 src/adventofcode2021/utils/node.py
 delete mode 100644 src/adventofcode2021/utils/point.py
 delete mode 100644 src/adventofcode2021/utils/priority_queue.py
 delete mode 100644 src/adventofcode2021/utils/queue.py
 delete mode 100644 src/adventofcode2021/utils/stack.py
 delete mode 100644 src/adventofcode2022/utils/advent_utils.py
 delete mode 100644 src/adventofcode2022/utils/generic_search.py
 delete mode 100644 src/adventofcode2022/utils/graph.py
 delete mode 100644 src/adventofcode2022/utils/node.py
 delete mode 100644 src/adventofcode2022/utils/point.py
 delete mode 100644 src/adventofcode2022/utils/priority_queue.py
 delete mode 100644 src/adventofcode2022/utils/queue.py
 delete mode 100644 src/adventofcode2022/utils/stack.py
 delete mode 100644 tests/adventofcode2019/test_advent_utils.py
 delete mode 100644 tests/test_advent_utils.py
 delete mode 100644 tests/test_generic_search.py
 delete mode 100644 tests/test_graph.py
 delete mode 100644 tests/test_node.py
 delete mode 100644 tests/test_point.py
 delete mode 100644 tests/test_priority_queue.py
 delete mode 100644 tests/test_queue.py
 delete mode 100644 tests/test_stack.py

diff --git a/src/adventofcode2019/solutions/day04.py b/src/adventofcode2019/solutions/day04.py
index 25fa0660..60ddfb6e 100644
--- a/src/adventofcode2019/solutions/day04.py
+++ b/src/adventofcode2019/solutions/day04.py
@@ -1,5 +1,6 @@
+from adventofcodeutils.parsing import string_to_list_of_ints
+
 from adventofcode2019.utils.abstract import FileReaderSolution
-from adventofcode2019.utils.advent_utils import string_to_list_of_ints
 
 
 class Day04:
diff --git a/src/adventofcode2019/solutions/day05.py b/src/adventofcode2019/solutions/day05.py
index 3d7d7da1..9b8c1d05 100644
--- a/src/adventofcode2019/solutions/day05.py
+++ b/src/adventofcode2019/solutions/day05.py
@@ -1,6 +1,7 @@
+from adventofcodeutils.parsing import string_to_list_of_ints
+
 from adventofcode2019.solutions.intcode import IntCode
 from adventofcode2019.utils.abstract import FileReaderSolution
-from adventofcode2019.utils.advent_utils import string_to_list_of_ints
 
 
 class Day05:
diff --git a/src/adventofcode2019/solutions/day07.py b/src/adventofcode2019/solutions/day07.py
index 2097b4b8..bb214e6d 100644
--- a/src/adventofcode2019/solutions/day07.py
+++ b/src/adventofcode2019/solutions/day07.py
@@ -1,8 +1,9 @@
 import itertools
 
+from adventofcodeutils.parsing import string_to_list_of_ints
+
 from adventofcode2019.solutions.intcode import IntCode, ProgramFinished
 from adventofcode2019.utils.abstract import FileReaderSolution
-from adventofcode2019.utils.advent_utils import string_to_list_of_ints
 
 
 class Day07:
diff --git a/src/adventofcode2019/solutions/day09.py b/src/adventofcode2019/solutions/day09.py
index f8cc4e88..f50140c5 100644
--- a/src/adventofcode2019/solutions/day09.py
+++ b/src/adventofcode2019/solutions/day09.py
@@ -1,6 +1,7 @@
+from adventofcodeutils.parsing import string_to_list_of_ints
+
 from adventofcode2019.solutions.intcode import IntCode
 from adventofcode2019.utils.abstract import FileReaderSolution
-from adventofcode2019.utils.advent_utils import string_to_list_of_ints
 
 
 class Day09:
diff --git a/src/adventofcode2019/solutions/day11.py b/src/adventofcode2019/solutions/day11.py
index c3213fd8..e212afc5 100644
--- a/src/adventofcode2019/solutions/day11.py
+++ b/src/adventofcode2019/solutions/day11.py
@@ -3,10 +3,10 @@
 from typing import NamedTuple
 
 import matplotlib.pyplot as plt  # type: ignore
+from adventofcodeutils.parsing import string_to_list_of_ints
 
 from adventofcode2019.solutions.intcode import IntCode, ProgramFinished
 from adventofcode2019.utils.abstract import FileReaderSolution
-from adventofcode2019.utils.advent_utils import string_to_list_of_ints
 
 
 class Location(NamedTuple):
diff --git a/src/adventofcode2019/solutions/day13.py b/src/adventofcode2019/solutions/day13.py
index 820b41a4..0ebb660b 100644
--- a/src/adventofcode2019/solutions/day13.py
+++ b/src/adventofcode2019/solutions/day13.py
@@ -1,9 +1,10 @@
 from collections import defaultdict
 from enum import IntEnum
 
+from adventofcodeutils.parsing import string_to_list_of_ints
+
 from adventofcode2019.solutions.intcode import IntCode, ProgramFinished
 from adventofcode2019.utils.abstract import FileReaderSolution
-from adventofcode2019.utils.advent_utils import string_to_list_of_ints
 
 
 class Tile(IntEnum):
diff --git a/src/adventofcode2019/solutions/day15.py b/src/adventofcode2019/solutions/day15.py
index 2f893dc8..cdb200b5 100644
--- a/src/adventofcode2019/solutions/day15.py
+++ b/src/adventofcode2019/solutions/day15.py
@@ -2,9 +2,10 @@
 from enum import IntEnum
 from typing import NamedTuple
 
+from adventofcodeutils.parsing import string_to_list_of_ints
+
 from adventofcode2019.solutions.intcode import IntCode
 from adventofcode2019.utils.abstract import FileReaderSolution
-from adventofcode2019.utils.advent_utils import string_to_list_of_ints
 
 
 class Point(NamedTuple):
diff --git a/src/adventofcode2019/solutions/day16.py b/src/adventofcode2019/solutions/day16.py
index f20ef2e2..ea6b7c19 100644
--- a/src/adventofcode2019/solutions/day16.py
+++ b/src/adventofcode2019/solutions/day16.py
@@ -1,5 +1,6 @@
+from adventofcodeutils.parsing import string_of_single_to_list_of_ints
+
 from adventofcode2019.utils.abstract import FileReaderSolution
-from adventofcode2019.utils.advent_utils import string_of_single_to_list_of_ints
 
 
 class Day16:
diff --git a/src/adventofcode2019/solutions/day17.py b/src/adventofcode2019/solutions/day17.py
index 1b98e5f6..53e4bbdd 100644
--- a/src/adventofcode2019/solutions/day17.py
+++ b/src/adventofcode2019/solutions/day17.py
@@ -1,8 +1,9 @@
 from collections import defaultdict
 
+from adventofcodeutils.parsing import string_to_list_of_ints
+
 from adventofcode2019.solutions.intcode import IntCode, ProgramFinished
 from adventofcode2019.utils.abstract import FileReaderSolution
-from adventofcode2019.utils.advent_utils import string_to_list_of_ints
 
 
 class Day17:
diff --git a/src/adventofcode2019/utils/advent_utils.py b/src/adventofcode2019/utils/advent_utils.py
deleted file mode 100644
index 52b0a5a3..00000000
--- a/src/adventofcode2019/utils/advent_utils.py
+++ /dev/null
@@ -1,21 +0,0 @@
-def string_to_list_of_ints(input_string: str, split_string: str = ",") -> list[int]:
-    """
-    Split a string on `split_string` and return a list of integers
-
-    :param input_string: String to split
-    :param split_string: Split by this string
-    :return: List of integers
-    """
-    list_of_ints = list(map(int, input_string.split(split_string)))
-    return list_of_ints
-
-
-def string_of_single_to_list_of_ints(input_string: str) -> list[int]:
-    """
-    Split a string on `split_string` and return a list of integers
-
-    :param input_string: String to split
-    :return: List of integers
-    """
-    list_of_ints = list(map(int, input_string))
-    return list_of_ints
diff --git a/src/adventofcode2020/utils/advent_utils.py b/src/adventofcode2020/utils/advent_utils.py
deleted file mode 100644
index 52b0a5a3..00000000
--- a/src/adventofcode2020/utils/advent_utils.py
+++ /dev/null
@@ -1,21 +0,0 @@
-def string_to_list_of_ints(input_string: str, split_string: str = ",") -> list[int]:
-    """
-    Split a string on `split_string` and return a list of integers
-
-    :param input_string: String to split
-    :param split_string: Split by this string
-    :return: List of integers
-    """
-    list_of_ints = list(map(int, input_string.split(split_string)))
-    return list_of_ints
-
-
-def string_of_single_to_list_of_ints(input_string: str) -> list[int]:
-    """
-    Split a string on `split_string` and return a list of integers
-
-    :param input_string: String to split
-    :return: List of integers
-    """
-    list_of_ints = list(map(int, input_string))
-    return list_of_ints
diff --git a/src/adventofcode2021/solutions/day10.py b/src/adventofcode2021/solutions/day10.py
index a1478688..0e7b6eb8 100644
--- a/src/adventofcode2021/solutions/day10.py
+++ b/src/adventofcode2021/solutions/day10.py
@@ -1,5 +1,6 @@
+from adventofcodeutils.stack import Stack
+
 from adventofcode2021.utils.abstract import FileReaderSolution
-from adventofcode2021.utils.stack import Stack
 
 
 class Day10:
diff --git a/src/adventofcode2021/solutions/day12.py b/src/adventofcode2021/solutions/day12.py
index 079e6ee0..8f073eec 100644
--- a/src/adventofcode2021/solutions/day12.py
+++ b/src/adventofcode2021/solutions/day12.py
@@ -1,9 +1,10 @@
 from __future__ import annotations
 
+from adventofcodeutils.graph import Graph
+from adventofcodeutils.node import Node
+from adventofcodeutils.stack import Stack
+
 from adventofcode2021.utils.abstract import FileReaderSolution
-from adventofcode2021.utils.graph import Graph
-from adventofcode2021.utils.node import Node
-from adventofcode2021.utils.stack import Stack
 
 
 class Day12:
diff --git a/src/adventofcode2021/solutions/day13.py b/src/adventofcode2021/solutions/day13.py
index b0b1cb22..923ca703 100644
--- a/src/adventofcode2021/solutions/day13.py
+++ b/src/adventofcode2021/solutions/day13.py
@@ -1,8 +1,9 @@
 import re
 from collections import defaultdict
 
+from adventofcodeutils.queue import Queue
+
 from adventofcode2021.utils.abstract import FileReaderSolution
-from adventofcode2021.utils.queue import Queue
 
 
 class Day13:
diff --git a/src/adventofcode2021/solutions/day15.py b/src/adventofcode2021/solutions/day15.py
index 506e9f96..f5b40c3e 100644
--- a/src/adventofcode2021/solutions/day15.py
+++ b/src/adventofcode2021/solutions/day15.py
@@ -4,9 +4,10 @@
 from collections.abc import Iterator
 from functools import cache
 
+from adventofcodeutils.node import Node
+from adventofcodeutils.priority_queue import PriorityQueue
+
 from adventofcode2021.utils.abstract import FileReaderSolution
-from adventofcode2021.utils.node import Node
-from adventofcode2021.utils.priority_queue import PriorityQueue
 
 Point = tuple[int, int]
 
diff --git a/src/adventofcode2021/solutions/day18.py b/src/adventofcode2021/solutions/day18.py
index f7779ec4..3d50782b 100644
--- a/src/adventofcode2021/solutions/day18.py
+++ b/src/adventofcode2021/solutions/day18.py
@@ -4,8 +4,9 @@
 import math
 from collections import deque
 
+from adventofcodeutils.priority_queue import PriorityQueue
+
 from adventofcode2021.utils.abstract import FileReaderSolution
-from adventofcode2021.utils.priority_queue import PriorityQueue
 
 
 class Snail:
diff --git a/src/adventofcode2021/solutions/day19.py b/src/adventofcode2021/solutions/day19.py
index 5df08ab2..aca63ef5 100644
--- a/src/adventofcode2021/solutions/day19.py
+++ b/src/adventofcode2021/solutions/day19.py
@@ -2,8 +2,9 @@
 import itertools
 from typing import NamedTuple
 
+from adventofcodeutils.point import XYZPoint as Point
+
 from adventofcode2021.utils.abstract import FileReaderSolution
-from adventofcode2021.utils.point import XYZPoint as Point
 
 
 class Scanner(NamedTuple):
diff --git a/src/adventofcode2021/solutions/day20.py b/src/adventofcode2021/solutions/day20.py
index e6bb7fce..d60aaa1a 100644
--- a/src/adventofcode2021/solutions/day20.py
+++ b/src/adventofcode2021/solutions/day20.py
@@ -1,7 +1,8 @@
 from collections import defaultdict
 
+from adventofcodeutils.point import XYPoint as Point
+
 from adventofcode2021.utils.abstract import FileReaderSolution
-from adventofcode2021.utils.point import XYPoint as Point
 
 
 class Day20:
diff --git a/src/adventofcode2021/solutions/day22.py b/src/adventofcode2021/solutions/day22.py
index 1ed6531d..2044653a 100644
--- a/src/adventofcode2021/solutions/day22.py
+++ b/src/adventofcode2021/solutions/day22.py
@@ -5,8 +5,9 @@
 from itertools import filterfalse
 from typing import NamedTuple
 
+from adventofcodeutils.point import XYZPoint as Point
+
 from adventofcode2021.utils.abstract import FileReaderSolution
-from adventofcode2021.utils.point import XYZPoint as Point
 
 
 class Step(NamedTuple):
diff --git a/src/adventofcode2021/utils/advent_utils.py b/src/adventofcode2021/utils/advent_utils.py
deleted file mode 100644
index 52b0a5a3..00000000
--- a/src/adventofcode2021/utils/advent_utils.py
+++ /dev/null
@@ -1,21 +0,0 @@
-def string_to_list_of_ints(input_string: str, split_string: str = ",") -> list[int]:
-    """
-    Split a string on `split_string` and return a list of integers
-
-    :param input_string: String to split
-    :param split_string: Split by this string
-    :return: List of integers
-    """
-    list_of_ints = list(map(int, input_string.split(split_string)))
-    return list_of_ints
-
-
-def string_of_single_to_list_of_ints(input_string: str) -> list[int]:
-    """
-    Split a string on `split_string` and return a list of integers
-
-    :param input_string: String to split
-    :return: List of integers
-    """
-    list_of_ints = list(map(int, input_string))
-    return list_of_ints
diff --git a/src/adventofcode2021/utils/graph.py b/src/adventofcode2021/utils/graph.py
deleted file mode 100644
index eb66ad78..00000000
--- a/src/adventofcode2021/utils/graph.py
+++ /dev/null
@@ -1,89 +0,0 @@
-from collections import defaultdict
-from collections.abc import Iterator
-from dataclasses import dataclass
-from typing import Generic, TypeVar
-
-# The type of the nodes
-V = TypeVar("V")
-
-
-@dataclass
-class Edge(Generic[V]):
-    u: V
-    v: V
-
-    def __repr__(self) -> str:
-        return f"{self.u} -> {self.v}"
-
-    def __hash__(self):
-        return hash((self.u, self.v))
-
-
-class Graph(Generic[V]):
-    """
-    Very simple graph, enough for advent of code.
-
-    Definitions, that I always forget:
-    - Nodes: The Vertices / items that are there
-    - Edges: The links between vertices
-
-    """
-
-    def __init__(self, edges: Iterator[tuple[V, V]] | None = None):
-        """Create a new graph.
-
-        If edges is given, the network is created based on the edges.
-        For example
-
-        >>> g = Graph([("a", "b"), ("b", "c"), ("c", "a")])
-
-        Will create simple Graph with:
-        a <-> b
-        b <-> c
-        c <-> a
-        """
-
-        self._nodes: set[V] = set()
-        self._edges: defaultdict[V, list[Edge]] = defaultdict(list)
-        if edges:
-            self.add_from_list(edges)
-
-    def add_node(self, node: V):
-        self._nodes.add(node)
-
-    def add_edge(self, u: V, v: V):
-        self.add_node(u)
-        self.add_node(v)
-        new_edge = Edge(u, v)
-        self._edges[u].append(new_edge)
-        self._edges[v].append(new_edge)
-
-    def add_from_list(self, edges: Iterator[tuple[V, V]]):
-        """Add edges based on a list"""
-        for edge in edges:
-            self.add_edge(*edge)
-
-    def __repr__(self) -> str:
-        return f"Graph with {len(self.nodes)} nodes and {len(self.edges)} edges"
-
-    @property
-    def edges(self) -> set[Edge]:
-        """Return all the unique edges"""
-        return {item for sublist in self._edges.values() for item in sublist}
-
-    @property
-    def nodes(self) -> set[V]:
-        """Return all the nodes"""
-        return self._nodes
-
-    def edges_from_node(self, node: V) -> list[Edge]:
-        """Return all the edges directly connected to node"""
-        return self._edges[node]
-
-    def nodes_from_node(self, node: V) -> Iterator[V]:
-        """Return all the nodes directly connected to node"""
-        for edge in self._edges[node]:
-            if edge.v == node:
-                yield edge.u
-            else:
-                yield edge.v
diff --git a/src/adventofcode2021/utils/node.py b/src/adventofcode2021/utils/node.py
deleted file mode 100644
index d7a34102..00000000
--- a/src/adventofcode2021/utils/node.py
+++ /dev/null
@@ -1,41 +0,0 @@
-from __future__ import annotations
-
-from typing import Generic, TypeVar
-
-T = TypeVar("T")
-
-
-class Node(Generic[T]):
-    def __init__(
-        self,
-        state: T,
-        parent: Node | None,
-        cost: float = 0.0,
-        heuristic: float = 0.0,
-    ) -> None:
-        self.state: T = state
-        self.parent: Node | None = parent
-        self.cost: float = cost
-        self.heuristic: float = heuristic
-
-    def __lt__(self, other: Node) -> bool:
-        return (self.cost + self.heuristic) < (other.cost + other.heuristic)
-
-    def __repr__(self):
-        if self.parent:
-            parents = self.node_to_path(self)
-            return f"{repr(self.state)} <{self.cost}/{self.heuristic}> ({parents})"
-        else:
-            return f"{repr(self.state)} <{self.cost}/{self.heuristic}>"
-
-    @staticmethod
-    def node_to_path(node: Node[T]) -> list[T]:
-        path: list[T] = [node.state]
-
-        # work backwards from end to front
-        while node.parent is not None:
-            node = node.parent
-            path.append(node.state)
-
-        path.reverse()
-        return path
diff --git a/src/adventofcode2021/utils/point.py b/src/adventofcode2021/utils/point.py
deleted file mode 100644
index 445e2322..00000000
--- a/src/adventofcode2021/utils/point.py
+++ /dev/null
@@ -1,25 +0,0 @@
-from typing import NamedTuple
-
-
-class XYZPoint(NamedTuple):
-    x: int
-    y: int
-    z: int
-
-    def __add__(self, other):
-        if not issubclass(type(other), XYZPoint):
-            raise ValueError("Cannot add incompatible types together")
-        return XYZPoint(x=self.x + other.x, y=self.y + other.y, z=self.z + other.z)
-
-    def distance(self, other):
-        return abs(self.x - other.x) + abs(self.y - other.y) + abs(self.z - other.z)
-
-
-class XYPoint(NamedTuple):
-    x: int
-    y: int
-
-    def __add__(self, other):
-        if not issubclass(type(other), XYPoint):
-            raise ValueError("Cannot add incompatible types together")
-        return XYPoint(x=self.x + other.x, y=self.y + other.y)
diff --git a/src/adventofcode2021/utils/priority_queue.py b/src/adventofcode2021/utils/priority_queue.py
deleted file mode 100644
index 3917a03d..00000000
--- a/src/adventofcode2021/utils/priority_queue.py
+++ /dev/null
@@ -1,30 +0,0 @@
-from __future__ import annotations
-
-from heapq import heappop, heappush
-from typing import Generic, TypeVar
-
-T = TypeVar("T")
-
-
-class PriorityQueue(Generic[T]):
-    def __init__(self) -> None:
-        self._container: list[T] = []
-
-    @property
-    def empty(self) -> bool:
-        # not is true for empty container
-        return not self._container
-
-    def push(self, item: T) -> None:
-        # in by priority
-        heappush(self._container, item)
-
-    def pop(self) -> T:
-        # out by priority
-        return heappop(self._container)
-
-    def __repr__(self) -> str:
-        return repr(self._container)
-
-    def __len__(self) -> int:
-        return len(self._container)
diff --git a/src/adventofcode2021/utils/queue.py b/src/adventofcode2021/utils/queue.py
deleted file mode 100644
index 48c0d882..00000000
--- a/src/adventofcode2021/utils/queue.py
+++ /dev/null
@@ -1,29 +0,0 @@
-from __future__ import annotations
-
-from collections import deque
-from typing import Generic, TypeVar
-
-T = TypeVar("T")
-
-
-class Queue(Generic[T]):
-    def __init__(self) -> None:
-        self._container: deque[T] = deque()
-
-    @property
-    def empty(self) -> bool:
-        # not is true for empty container
-        return not self._container
-
-    def push(self, item: T) -> None:
-        self._container.append(item)
-
-    def pop(self) -> T:
-        # FIFO
-        return self._container.popleft()
-
-    def __repr__(self) -> str:
-        return repr(self._container)
-
-    def __len__(self) -> int:
-        return len(self._container)
diff --git a/src/adventofcode2021/utils/stack.py b/src/adventofcode2021/utils/stack.py
deleted file mode 100644
index 1831ae1e..00000000
--- a/src/adventofcode2021/utils/stack.py
+++ /dev/null
@@ -1,25 +0,0 @@
-from __future__ import annotations
-
-from typing import Generic, TypeVar
-
-T = TypeVar("T")
-
-
-class Stack(Generic[T]):
-    def __init__(self) -> None:
-        self._container: list[T] = []
-
-    @property
-    def empty(self) -> bool:
-        # not is true for empty container
-        return not self._container
-
-    def push(self, item: T) -> None:
-        self._container.append(item)
-
-    def pop(self) -> T:
-        # LIFO
-        return self._container.pop()
-
-    def __repr__(self) -> str:
-        return repr(self._container)
diff --git a/src/adventofcode2022/solutions/day05.py b/src/adventofcode2022/solutions/day05.py
index 77bc326e..3e730670 100644
--- a/src/adventofcode2022/solutions/day05.py
+++ b/src/adventofcode2022/solutions/day05.py
@@ -1,10 +1,10 @@
 from abc import abstractmethod
 from typing import NamedTuple
 
+from adventofcodeutils.stack import Stack
 from parse import parse
 
 from adventofcode2022.utils.abstract import FileReaderSolution
-from adventofcode2022.utils.stack import Stack
 
 
 class Instruction(NamedTuple):
diff --git a/src/adventofcode2022/solutions/day08.py b/src/adventofcode2022/solutions/day08.py
index 35f7a591..c5dda677 100644
--- a/src/adventofcode2022/solutions/day08.py
+++ b/src/adventofcode2022/solutions/day08.py
@@ -1,7 +1,8 @@
 import math
 
+from adventofcodeutils.point import XYPoint as Point
+
 from adventofcode2022.utils.abstract import FileReaderSolution
-from adventofcode2022.utils.point import XYPoint as Point
 
 
 class Day08:
diff --git a/src/adventofcode2022/solutions/day09.py b/src/adventofcode2022/solutions/day09.py
index b8ff9cec..227ece10 100644
--- a/src/adventofcode2022/solutions/day09.py
+++ b/src/adventofcode2022/solutions/day09.py
@@ -1,7 +1,7 @@
 import more_itertools
+from adventofcodeutils.point import XYPoint as Point
 
 from adventofcode2022.utils.abstract import FileReaderSolution
-from adventofcode2022.utils.point import XYPoint as Point
 
 
 class Day09:
diff --git a/src/adventofcode2022/solutions/day11.py b/src/adventofcode2022/solutions/day11.py
index 971435b3..d24db42c 100644
--- a/src/adventofcode2022/solutions/day11.py
+++ b/src/adventofcode2022/solutions/day11.py
@@ -4,9 +4,9 @@
 from typing import NamedTuple
 
 import parse
+from adventofcodeutils.queue import Queue
 
 from adventofcode2022.utils.abstract import FileReaderSolution
-from adventofcode2022.utils.queue import Queue
 
 
 class Throw(NamedTuple):
diff --git a/src/adventofcode2022/solutions/day12.py b/src/adventofcode2022/solutions/day12.py
index 1111d798..6c1006a0 100644
--- a/src/adventofcode2022/solutions/day12.py
+++ b/src/adventofcode2022/solutions/day12.py
@@ -1,7 +1,8 @@
+from adventofcodeutils.generic_search import BFS
+from adventofcodeutils.node import Node
+from adventofcodeutils.point import XYPoint as Point
+
 from adventofcode2022.utils.abstract import FileReaderSolution
-from adventofcode2022.utils.generic_search import BFS
-from adventofcode2022.utils.node import Node
-from adventofcode2022.utils.point import XYPoint as Point
 
 
 class Day12:
diff --git a/src/adventofcode2022/solutions/day14.py b/src/adventofcode2022/solutions/day14.py
index ffed8506..0d507bdc 100644
--- a/src/adventofcode2022/solutions/day14.py
+++ b/src/adventofcode2022/solutions/day14.py
@@ -1,8 +1,9 @@
 from collections import defaultdict
 from enum import StrEnum
 
+from adventofcodeutils.point import XYPoint as Point
+
 from adventofcode2022.utils.abstract import FileReaderSolution
-from adventofcode2022.utils.point import XYPoint as Point
 
 
 class Pixel(StrEnum):
diff --git a/src/adventofcode2022/solutions/day15.py b/src/adventofcode2022/solutions/day15.py
index 71fdf586..88c4e019 100644
--- a/src/adventofcode2022/solutions/day15.py
+++ b/src/adventofcode2022/solutions/day15.py
@@ -1,9 +1,9 @@
 from typing import NamedTuple
 
+from adventofcodeutils.point import XYPoint as Point
 from parse import parse
 
 from adventofcode2022.utils.abstract import FileReaderSolution
-from adventofcode2022.utils.point import XYPoint as Point
 
 
 class Line(NamedTuple):
diff --git a/src/adventofcode2022/utils/advent_utils.py b/src/adventofcode2022/utils/advent_utils.py
deleted file mode 100644
index 52b0a5a3..00000000
--- a/src/adventofcode2022/utils/advent_utils.py
+++ /dev/null
@@ -1,21 +0,0 @@
-def string_to_list_of_ints(input_string: str, split_string: str = ",") -> list[int]:
-    """
-    Split a string on `split_string` and return a list of integers
-
-    :param input_string: String to split
-    :param split_string: Split by this string
-    :return: List of integers
-    """
-    list_of_ints = list(map(int, input_string.split(split_string)))
-    return list_of_ints
-
-
-def string_of_single_to_list_of_ints(input_string: str) -> list[int]:
-    """
-    Split a string on `split_string` and return a list of integers
-
-    :param input_string: String to split
-    :return: List of integers
-    """
-    list_of_ints = list(map(int, input_string))
-    return list_of_ints
diff --git a/src/adventofcode2022/utils/generic_search.py b/src/adventofcode2022/utils/generic_search.py
deleted file mode 100644
index b93f310e..00000000
--- a/src/adventofcode2022/utils/generic_search.py
+++ /dev/null
@@ -1,106 +0,0 @@
-from __future__ import annotations
-
-from abc import ABC, abstractmethod
-from collections.abc import Callable
-from typing import TypeVar
-
-from adventofcode2022.utils.node import Node
-from adventofcode2022.utils.priority_queue import PriorityQueue
-from adventofcode2022.utils.queue import Queue
-from adventofcode2022.utils.stack import Stack
-
-T = TypeVar("T")
-
-# @TODO: Make the container a protocol?
-Container = Queue | Stack
-
-
-class Search(ABC):
-    @abstractmethod
-    def _get_container(self) -> Container:
-        """Return the base container for this class"""
-        raise NotImplementedError
-
-    def search(
-        self,
-        initial: T,
-        goal_test: Callable[[T], bool],
-        successors: Callable[[T], list[T]],
-    ) -> Node[T] | None:
-        # frontier is where we've yet to go
-        # @TODO This is ugly, the base class has knowledge of
-        #   the container implementation
-        frontier: Queue[Node[T]] | Stack[Node[T]] = self._get_container()
-        frontier.push(Node(initial, None))
-
-        # explored is where we've been
-        explored: set[T] = {initial}
-
-        # keep going while there is more to explore
-        while not frontier.empty:
-            current_node: Node[T] = frontier.pop()
-            current_state: T = current_node.state
-
-            # if we found the goal, we're done
-            if goal_test(current_state):
-                return current_node
-
-            # check where we can go next and haven't explored
-            for child in successors(current_state):
-                if child in explored:
-                    # skip children we already explored
-                    continue
-                explored.add(child)
-                frontier.push(Node(child, current_node))
-
-        # went through everything and never found goal
-        return None
-
-
-class DFS(Search):
-    """Perform a Depth-first search (DFS)"""
-
-    def _get_container(self) -> Container:
-        return Stack()
-
-
-class BFS(Search):
-    """Perform a Breadth-first search (BFS)"""
-
-    def _get_container(self) -> Container:
-        return Queue()
-
-
-class Astar:
-    @staticmethod
-    def astar(
-        initial: T,
-        goal_test: Callable[[T], bool],
-        successors: Callable[[T], list[T]],
-        heuristic: Callable[[T], float],
-    ) -> Node[T] | None:
-        # frontier is where we've yet to go
-        frontier: PriorityQueue[Node[T]] = PriorityQueue()
-        frontier.push(Node(initial, None, 0.0, heuristic(initial)))
-
-        # explored is where we've been
-        explored: dict[T, float] = {initial: 0.0}
-
-        # keep going while there is more to explore
-        while not frontier.empty:
-            current_node: Node[T] = frontier.pop()
-            current_state: T = current_node.state
-            # if we found the goal, we're done
-            if goal_test(current_state):
-                return current_node
-            # check where we can go next and haven't explored
-            for child in successors(current_state):
-                # 1 assumes a grid, need a cost function for more sophisticated apps
-                new_cost: float = current_node.cost + 1
-
-                if child not in explored or explored[child] > new_cost:
-                    explored[child] = new_cost
-                    frontier.push(Node(child, current_node, new_cost, heuristic(child)))
-
-        # went through everything and never found goal
-        return None
diff --git a/src/adventofcode2022/utils/graph.py b/src/adventofcode2022/utils/graph.py
deleted file mode 100644
index eb66ad78..00000000
--- a/src/adventofcode2022/utils/graph.py
+++ /dev/null
@@ -1,89 +0,0 @@
-from collections import defaultdict
-from collections.abc import Iterator
-from dataclasses import dataclass
-from typing import Generic, TypeVar
-
-# The type of the nodes
-V = TypeVar("V")
-
-
-@dataclass
-class Edge(Generic[V]):
-    u: V
-    v: V
-
-    def __repr__(self) -> str:
-        return f"{self.u} -> {self.v}"
-
-    def __hash__(self):
-        return hash((self.u, self.v))
-
-
-class Graph(Generic[V]):
-    """
-    Very simple graph, enough for advent of code.
-
-    Definitions, that I always forget:
-    - Nodes: The Vertices / items that are there
-    - Edges: The links between vertices
-
-    """
-
-    def __init__(self, edges: Iterator[tuple[V, V]] | None = None):
-        """Create a new graph.
-
-        If edges is given, the network is created based on the edges.
-        For example
-
-        >>> g = Graph([("a", "b"), ("b", "c"), ("c", "a")])
-
-        Will create simple Graph with:
-        a <-> b
-        b <-> c
-        c <-> a
-        """
-
-        self._nodes: set[V] = set()
-        self._edges: defaultdict[V, list[Edge]] = defaultdict(list)
-        if edges:
-            self.add_from_list(edges)
-
-    def add_node(self, node: V):
-        self._nodes.add(node)
-
-    def add_edge(self, u: V, v: V):
-        self.add_node(u)
-        self.add_node(v)
-        new_edge = Edge(u, v)
-        self._edges[u].append(new_edge)
-        self._edges[v].append(new_edge)
-
-    def add_from_list(self, edges: Iterator[tuple[V, V]]):
-        """Add edges based on a list"""
-        for edge in edges:
-            self.add_edge(*edge)
-
-    def __repr__(self) -> str:
-        return f"Graph with {len(self.nodes)} nodes and {len(self.edges)} edges"
-
-    @property
-    def edges(self) -> set[Edge]:
-        """Return all the unique edges"""
-        return {item for sublist in self._edges.values() for item in sublist}
-
-    @property
-    def nodes(self) -> set[V]:
-        """Return all the nodes"""
-        return self._nodes
-
-    def edges_from_node(self, node: V) -> list[Edge]:
-        """Return all the edges directly connected to node"""
-        return self._edges[node]
-
-    def nodes_from_node(self, node: V) -> Iterator[V]:
-        """Return all the nodes directly connected to node"""
-        for edge in self._edges[node]:
-            if edge.v == node:
-                yield edge.u
-            else:
-                yield edge.v
diff --git a/src/adventofcode2022/utils/node.py b/src/adventofcode2022/utils/node.py
deleted file mode 100644
index d7a34102..00000000
--- a/src/adventofcode2022/utils/node.py
+++ /dev/null
@@ -1,41 +0,0 @@
-from __future__ import annotations
-
-from typing import Generic, TypeVar
-
-T = TypeVar("T")
-
-
-class Node(Generic[T]):
-    def __init__(
-        self,
-        state: T,
-        parent: Node | None,
-        cost: float = 0.0,
-        heuristic: float = 0.0,
-    ) -> None:
-        self.state: T = state
-        self.parent: Node | None = parent
-        self.cost: float = cost
-        self.heuristic: float = heuristic
-
-    def __lt__(self, other: Node) -> bool:
-        return (self.cost + self.heuristic) < (other.cost + other.heuristic)
-
-    def __repr__(self):
-        if self.parent:
-            parents = self.node_to_path(self)
-            return f"{repr(self.state)} <{self.cost}/{self.heuristic}> ({parents})"
-        else:
-            return f"{repr(self.state)} <{self.cost}/{self.heuristic}>"
-
-    @staticmethod
-    def node_to_path(node: Node[T]) -> list[T]:
-        path: list[T] = [node.state]
-
-        # work backwards from end to front
-        while node.parent is not None:
-            node = node.parent
-            path.append(node.state)
-
-        path.reverse()
-        return path
diff --git a/src/adventofcode2022/utils/point.py b/src/adventofcode2022/utils/point.py
deleted file mode 100644
index 982972a9..00000000
--- a/src/adventofcode2022/utils/point.py
+++ /dev/null
@@ -1,39 +0,0 @@
-from dataclasses import dataclass
-
-
-@dataclass(unsafe_hash=True)
-class XYZPoint:
-    x: int
-    y: int
-    z: int
-
-    def __add__(self, other):
-        if not issubclass(type(other), XYZPoint):
-            raise ValueError("Cannot add incompatible types together")
-        return XYZPoint(x=self.x + other.x, y=self.y + other.y, z=self.z + other.z)
-
-    def __iter__(self):
-        yield self.x
-        yield self.y
-        yield self.z
-
-    def distance(self, other):
-        return abs(self.x - other.x) + abs(self.y - other.y) + abs(self.z - other.z)
-
-
-@dataclass(unsafe_hash=True)
-class XYPoint:
-    x: int
-    y: int
-
-    def __add__(self, other):
-        if not issubclass(type(other), XYPoint):
-            raise ValueError("Cannot add incompatible types together")
-        return XYPoint(x=self.x + other.x, y=self.y + other.y)
-
-    def __iter__(self):
-        yield self.x
-        yield self.y
-
-    def distance(self, other):
-        return abs(self.x - other.x) + abs(self.y - other.y)
diff --git a/src/adventofcode2022/utils/priority_queue.py b/src/adventofcode2022/utils/priority_queue.py
deleted file mode 100644
index 3917a03d..00000000
--- a/src/adventofcode2022/utils/priority_queue.py
+++ /dev/null
@@ -1,30 +0,0 @@
-from __future__ import annotations
-
-from heapq import heappop, heappush
-from typing import Generic, TypeVar
-
-T = TypeVar("T")
-
-
-class PriorityQueue(Generic[T]):
-    def __init__(self) -> None:
-        self._container: list[T] = []
-
-    @property
-    def empty(self) -> bool:
-        # not is true for empty container
-        return not self._container
-
-    def push(self, item: T) -> None:
-        # in by priority
-        heappush(self._container, item)
-
-    def pop(self) -> T:
-        # out by priority
-        return heappop(self._container)
-
-    def __repr__(self) -> str:
-        return repr(self._container)
-
-    def __len__(self) -> int:
-        return len(self._container)
diff --git a/src/adventofcode2022/utils/queue.py b/src/adventofcode2022/utils/queue.py
deleted file mode 100644
index 48c0d882..00000000
--- a/src/adventofcode2022/utils/queue.py
+++ /dev/null
@@ -1,29 +0,0 @@
-from __future__ import annotations
-
-from collections import deque
-from typing import Generic, TypeVar
-
-T = TypeVar("T")
-
-
-class Queue(Generic[T]):
-    def __init__(self) -> None:
-        self._container: deque[T] = deque()
-
-    @property
-    def empty(self) -> bool:
-        # not is true for empty container
-        return not self._container
-
-    def push(self, item: T) -> None:
-        self._container.append(item)
-
-    def pop(self) -> T:
-        # FIFO
-        return self._container.popleft()
-
-    def __repr__(self) -> str:
-        return repr(self._container)
-
-    def __len__(self) -> int:
-        return len(self._container)
diff --git a/src/adventofcode2022/utils/stack.py b/src/adventofcode2022/utils/stack.py
deleted file mode 100644
index 1831ae1e..00000000
--- a/src/adventofcode2022/utils/stack.py
+++ /dev/null
@@ -1,25 +0,0 @@
-from __future__ import annotations
-
-from typing import Generic, TypeVar
-
-T = TypeVar("T")
-
-
-class Stack(Generic[T]):
-    def __init__(self) -> None:
-        self._container: list[T] = []
-
-    @property
-    def empty(self) -> bool:
-        # not is true for empty container
-        return not self._container
-
-    def push(self, item: T) -> None:
-        self._container.append(item)
-
-    def pop(self) -> T:
-        # LIFO
-        return self._container.pop()
-
-    def __repr__(self) -> str:
-        return repr(self._container)
diff --git a/tests/adventofcode2019/test_advent_utils.py b/tests/adventofcode2019/test_advent_utils.py
deleted file mode 100644
index c92aeeda..00000000
--- a/tests/adventofcode2019/test_advent_utils.py
+++ /dev/null
@@ -1,37 +0,0 @@
-import pytest
-
-from adventofcode2019.utils import advent_utils
-
-
-def test_string_to_list_of_ints():
-    input_data = "2,4,5, 300,-3,0"
-    result = advent_utils.string_to_list_of_ints(input_data)
-
-    assert result == [2, 4, 5, 300, -3, 0]
-
-
-def test_string_to_list_of_ints_with_dash():
-    # Split on a -, does not support negative ints
-    input_data = "2-4-5-300-3-0"
-    result = advent_utils.string_to_list_of_ints(input_data, "-")
-
-    assert result == [2, 4, 5, 300, 3, 0]
-
-
-def test_invalid_list_to_list_of_ints():
-    input_data = "these,are,not,the,ints,you're,looking,for"
-    with pytest.raises(ValueError):
-        advent_utils.string_to_list_of_ints(input_data)
-
-
-def test_string_of_single_to_list_of_ints():
-    input_data = "23272930"
-    result = advent_utils.string_of_single_to_list_of_ints(input_data)
-
-    assert result == [2, 3, 2, 7, 2, 9, 3, 0]
-
-
-def test_string_of_invalid_single_to_list_of_ints():
-    input_data = "2327-2930"
-    with pytest.raises(ValueError):
-        advent_utils.string_of_single_to_list_of_ints(input_data)
diff --git a/tests/adventofcode2021/test_day20_a.py b/tests/adventofcode2021/test_day20_a.py
index 93b62959..50614d7f 100644
--- a/tests/adventofcode2021/test_day20_a.py
+++ b/tests/adventofcode2021/test_day20_a.py
@@ -1,7 +1,8 @@
 import pathlib
 
+from adventofcodeutils.point import XYPoint as Point
+
 from adventofcode2021.solutions.day20 import Day20PartA
-from adventofcode2021.utils.point import XYPoint as Point
 
 
 class TestDay20PartA:
diff --git a/tests/adventofcode2022/test_day08_a.py b/tests/adventofcode2022/test_day08_a.py
index 58c8cbfe..b2ca29f5 100644
--- a/tests/adventofcode2022/test_day08_a.py
+++ b/tests/adventofcode2022/test_day08_a.py
@@ -1,9 +1,9 @@
 from textwrap import dedent
 
 import pytest
+from adventofcodeutils.point import XYPoint as Point
 
 from adventofcode2022.solutions.day08 import Day08PartA
-from adventofcode2022.utils.point import XYPoint as Point
 
 
 class TestDay08PartA:
diff --git a/tests/adventofcode2022/test_day08_b.py b/tests/adventofcode2022/test_day08_b.py
index 3d5c3da8..3a626790 100644
--- a/tests/adventofcode2022/test_day08_b.py
+++ b/tests/adventofcode2022/test_day08_b.py
@@ -1,7 +1,8 @@
 from textwrap import dedent
 
+from adventofcodeutils.point import XYPoint as Point
+
 from adventofcode2022.solutions.day08 import Day08PartB
-from adventofcode2022.utils.point import XYPoint as Point
 
 
 class TestDay08PartB:
diff --git a/tests/test_advent_utils.py b/tests/test_advent_utils.py
deleted file mode 100644
index 595caf9e..00000000
--- a/tests/test_advent_utils.py
+++ /dev/null
@@ -1,37 +0,0 @@
-import pytest
-
-from adventofcode2021.utils import advent_utils
-
-
-def test_string_to_list_of_ints():
-    input_data = "2,4,5, 300,-3,0"
-    result = advent_utils.string_to_list_of_ints(input_data)
-
-    assert result == [2, 4, 5, 300, -3, 0]
-
-
-def test_string_to_list_of_ints_with_dash():
-    # Split on a -, does not support negative ints
-    input_data = "2-4-5-300-3-0"
-    result = advent_utils.string_to_list_of_ints(input_data, "-")
-
-    assert result == [2, 4, 5, 300, 3, 0]
-
-
-def test_invalid_list_to_list_of_ints():
-    input_data = "these,are,not,the,ints,you're,looking,for"
-    with pytest.raises(ValueError):
-        advent_utils.string_to_list_of_ints(input_data)
-
-
-def test_string_of_single_to_list_of_ints():
-    input_data = "23272930"
-    result = advent_utils.string_of_single_to_list_of_ints(input_data)
-
-    assert result == [2, 3, 2, 7, 2, 9, 3, 0]
-
-
-def test_string_of_invalid_single_to_list_of_ints():
-    input_data = "2327-2930"
-    with pytest.raises(ValueError):
-        advent_utils.string_of_single_to_list_of_ints(input_data)
diff --git a/tests/test_generic_search.py b/tests/test_generic_search.py
deleted file mode 100644
index e69de29b..00000000
diff --git a/tests/test_graph.py b/tests/test_graph.py
deleted file mode 100644
index ba6bda45..00000000
--- a/tests/test_graph.py
+++ /dev/null
@@ -1,20 +0,0 @@
-from adventofcode2021.utils.graph import Edge, Graph
-
-
-def test_graph():
-    """Test the graph"""
-    g = Graph()
-    g.add_from_list(
-        [
-            ("a", "b"),
-            ("b", "c"),
-            ("a", "d"),
-        ]
-    )
-    assert repr(g) == "Graph with 4 nodes and 3 edges"
-    assert g.nodes == {"a", "b", "c", "d"}
-    assert Edge("a", "b") in list(g.edges)
-
-    # Test the nodes reachable. From "a", we can connect to "b" and "d"
-    assert g.edges_from_node("a") == [Edge("a", "b"), Edge("a", "d")]
-    assert list(g.nodes_from_node("a")) == ["b", "d"]
diff --git a/tests/test_node.py b/tests/test_node.py
deleted file mode 100644
index 438cae9e..00000000
--- a/tests/test_node.py
+++ /dev/null
@@ -1,13 +0,0 @@
-from adventofcode2021.utils.node import Node
-
-
-def test_node():
-    n1 = Node("n1", None, cost=1, heuristic=0.5)
-    n2 = Node("n2", None, cost=3, heuristic=0.5)
-
-    # test __lt__ < and >
-    assert n1 < n2
-    assert n2 > n1
-
-    assert not n1 > n2
-    assert not n2 < n1
diff --git a/tests/test_point.py b/tests/test_point.py
deleted file mode 100644
index 08a1810d..00000000
--- a/tests/test_point.py
+++ /dev/null
@@ -1,66 +0,0 @@
-import pytest
-
-from adventofcode2021.utils import point
-
-
-def test_xyzpoint():
-    p1 = point.XYZPoint(1, 2, 3)
-    assert p1.x == 1
-    assert p1.y == 2
-    assert p1.z == 3
-
-    assert repr(p1) == "XYZPoint(x=1, y=2, z=3)"
-
-    p2 = point.XYZPoint(6, 7, 8)
-
-    total = p1 + p2
-    assert total.x == 7
-    assert total.y == 9
-    assert total.z == 11
-
-    p1_same = point.XYZPoint(1, 2, 3)
-    assert p1 == p1_same
-    assert p1 != p2
-
-    # Since it's a named tuple, we can also get the values from it:
-    x, y, z = p1
-    assert x == 1
-    assert y == 2
-    assert z == 3
-
-
-def test_xyzdistance():
-    p1 = point.XYZPoint(1105, -1205, 1229)
-    p2 = point.XYZPoint(-92, -2380, -20)
-
-    assert p1.distance(p2) == 3621
-
-
-def test_xypoint():
-    p1 = point.XYPoint(1, 2)
-    assert p1.x == 1
-    assert p1.y == 2
-
-    assert repr(p1) == "XYPoint(x=1, y=2)"
-
-    p2 = point.XYPoint(6, 7)
-
-    total = p1 + p2
-    assert total.x == 7
-    assert total.y == 9
-
-    p1_same = point.XYPoint(1, 2)
-    assert p1 == p1_same
-    assert p1 != p2
-
-
-def test_invalid_together():
-    xy = point.XYPoint(1, 2)
-    xyz = point.XYZPoint(6, 7, 8)
-
-    with pytest.raises(ValueError):
-        xyz + xy
-    with pytest.raises(ValueError):
-        xy + xyz
-
-    assert xy != xyz
diff --git a/tests/test_priority_queue.py b/tests/test_priority_queue.py
deleted file mode 100644
index 48cccd1e..00000000
--- a/tests/test_priority_queue.py
+++ /dev/null
@@ -1,32 +0,0 @@
-import pytest
-
-from adventofcode2021.utils.priority_queue import PriorityQueue
-
-
-def test_priorityqueue():
-    q = PriorityQueue()
-
-    assert q.empty
-    assert q.__repr__() == "[]"
-
-    # Let's add some stuff. The priority is not in order.
-    q.push((1, "a"))
-    q.push((3, "c"))
-    q.push((2, "b"))
-
-    assert not q.empty
-    assert len(q) == 3
-    # Repr is based on the insert order (?)
-    assert q.__repr__() == "[(1, 'a'), (3, 'c'), (2, 'b')]"
-
-    # Output is based on the priority
-    assert q.pop() == (1, "a")
-    assert q.pop() == (2, "b")
-    assert q.pop() == (3, "c")
-
-    # And empty again
-    assert q.empty
-    assert len(q) == 0
-
-    with pytest.raises(IndexError):
-        q.pop()
diff --git a/tests/test_queue.py b/tests/test_queue.py
deleted file mode 100644
index 45079cfc..00000000
--- a/tests/test_queue.py
+++ /dev/null
@@ -1,31 +0,0 @@
-import pytest
-
-from adventofcode2021.utils.queue import Queue
-
-
-def test_queue():
-    q = Queue()
-
-    assert q.empty
-    assert q.__repr__() == "deque([])"
-
-    # Let's add some stuff
-    q.push("a")
-    q.push("b")
-    q.push("c")
-
-    assert not q.empty
-    assert len(q) == 3
-    assert q.__repr__() == "deque(['a', 'b', 'c'])"
-
-    # First in is First out
-    assert q.pop() == "a"
-    assert q.pop() == "b"
-    assert q.pop() == "c"
-
-    # And empty again
-    assert q.empty
-    assert len(q) == 0
-
-    with pytest.raises(IndexError):
-        q.pop()
diff --git a/tests/test_stack.py b/tests/test_stack.py
deleted file mode 100644
index 1b12970e..00000000
--- a/tests/test_stack.py
+++ /dev/null
@@ -1,37 +0,0 @@
-import pytest
-
-from adventofcode2021.utils.stack import Stack
-
-
-def test_stack():
-    st = Stack()
-
-    # Check if empty
-    assert st.empty
-
-    # Popping empty should raise index error
-    with pytest.raises(IndexError):
-        st.pop()
-
-    # Add some items
-    st.push(1)
-    st.push(2)
-    st.push(3)
-
-    # We should have some data now
-    assert not st.empty
-
-    # Let's look at the data
-    assert repr(st) == repr([1, 2, 3])
-
-    # Stack, to the Last In, First Out.
-    assert st.pop() == 3
-    assert st.pop() == 2
-    assert st.pop() == 1
-
-    # Should be empty again
-    assert st.empty
-    assert repr(st) == repr([])
-
-    with pytest.raises(IndexError):
-        st.pop()

From 229cbe6c10bac049ff8233d5ab7d5a8e7c088014 Mon Sep 17 00:00:00 2001
From: Roel Adriaans <roel@adriaans.org>
Date: Tue, 21 Nov 2023 22:10:27 +0100
Subject: [PATCH 305/371] Make old code work with new adventutils, run tests
 that where skipped, remove obsolete tests

---
 src/adventofcode2021/solutions/day19.py | 14 +++++++-------
 src/adventofcode2022/solutions/day14.py |  4 ++--
 tests/adventofcode2016/test_day11_a.py  |  5 -----
 tests/adventofcode2016/test_day17_a.py  |  1 -
 tests/adventofcode2019/test_day17_a.py  | 17 -----------------
 tests/adventofcode2021/test_day19_b.py  |  3 ---
 tests/adventofcode2022/test_day15_b.py  |  1 -
 7 files changed, 9 insertions(+), 36 deletions(-)

diff --git a/src/adventofcode2021/solutions/day19.py b/src/adventofcode2021/solutions/day19.py
index aca63ef5..dedcd019 100644
--- a/src/adventofcode2021/solutions/day19.py
+++ b/src/adventofcode2021/solutions/day19.py
@@ -45,12 +45,12 @@ def x_edges_from(
     ) -> dict[int, AxisInfo]:
         x_edges = {}
         for other in scanners_by_id.values():
-            for axis in (0, 1, 2):
+            for axis in ("x", "y", "z"):
                 for sign in (-1, 1):
                     d_x: collections.Counter[int] = collections.Counter()
-                    for x, _, _ in src.beacons:
+                    for point in src.beacons:
                         for other_pt in other.beacons:
-                            d_x[x - other_pt[axis] * sign] += 1
+                            d_x[point.x - other_pt[axis] * sign] += 1
 
                     ((x_diff, n),) = d_x.most_common(1)
                     if n >= 12:
@@ -72,14 +72,14 @@ def yz_edges_from(
 
         for dst_id in x_edges:
             other = scanners_by_id[dst_id]
-            for axis in (0, 1, 2):
+            for axis in ("x", "y", "z"):
                 for sign in (-1, 1):
                     d_y: collections.Counter[int] = collections.Counter()
                     d_z: collections.Counter[int] = collections.Counter()
-                    for _, y, z in src.beacons:
+                    for point in src.beacons:
                         for other_pt in other.beacons:
-                            d_y[y - other_pt[axis] * sign] += 1
-                            d_z[z - other_pt[axis] * sign] += 1
+                            d_y[point.y - other_pt[axis] * sign] += 1
+                            d_z[point.z - other_pt[axis] * sign] += 1
 
                     ((y_diff, y_n),) = d_y.most_common(1)
                     if y_n >= 12:
diff --git a/src/adventofcode2022/solutions/day14.py b/src/adventofcode2022/solutions/day14.py
index 0d507bdc..2687041f 100644
--- a/src/adventofcode2022/solutions/day14.py
+++ b/src/adventofcode2022/solutions/day14.py
@@ -93,7 +93,7 @@ def loop(self, start):
         _, _, max_y, _ = self.min_max_values()
         bottom = max_y + 1
         while True:
-            sand = Point(*start)
+            sand = Point(start.x, start.y)
             while True:
                 new_location = self.move_sand(sand)
                 if not new_location:
@@ -121,7 +121,7 @@ def loop(self, start):
         bottom = max_y + 2
 
         while True:
-            sand = Point(*start)
+            sand = Point(start.x, start.y)
             first = True
             while True:
                 new_location = self.move_sand(sand)
diff --git a/tests/adventofcode2016/test_day11_a.py b/tests/adventofcode2016/test_day11_a.py
index e9d8cfa2..d412866e 100644
--- a/tests/adventofcode2016/test_day11_a.py
+++ b/tests/adventofcode2016/test_day11_a.py
@@ -61,11 +61,6 @@ def test_eq_facility(self, testdata):
         assert facility1 == facility2
         assert hash(facility1) == hash(facility2)
 
-    @pytest.mark.skip
-    def test_facility_without_elevator(self):
-        with pytest.raises(ValueError, match="Elevator not found"):
-            FacilityState(floors=[])
-
     f1 = "The first floor contains a "
 
     @pytest.mark.parametrize(
diff --git a/tests/adventofcode2016/test_day17_a.py b/tests/adventofcode2016/test_day17_a.py
index ea194b8e..62c07a4c 100644
--- a/tests/adventofcode2016/test_day17_a.py
+++ b/tests/adventofcode2016/test_day17_a.py
@@ -31,7 +31,6 @@ def test_day17a_solve(self, input_data, expected_result):
         result = Day17PartA().run_search(input_data)
         assert result == expected_result
 
-    @pytest.mark.xfail(reason="Not yet implemented", raises=NotImplementedError)
     def test_day17a_data(self):
         """Result we got when we did the real solution"""
         solution = Day17PartA()
diff --git a/tests/adventofcode2019/test_day17_a.py b/tests/adventofcode2019/test_day17_a.py
index 533af461..e7754aeb 100644
--- a/tests/adventofcode2019/test_day17_a.py
+++ b/tests/adventofcode2019/test_day17_a.py
@@ -1,26 +1,9 @@
 from collections import defaultdict
 
-import pytest
-
 from adventofcode2019.solutions.day17 import Day17PartA
 
 
 class TestDay17PartA:
-    @pytest.mark.skip("No longer required")
-    def test_day17a_grid_to_lists(self):
-        solution = Day17PartA()
-
-        # fmt: off
-        grid = [
-            40, 50, 10,
-            14, 15, 10,
-            55, 66, 10,
-        ]
-        # fmt: on
-
-        result = solution.grid_to_lists(grid)
-        assert result == [[40, 50], [14, 15], [55, 66]]
-
     def test_day17a_grid(self, capsys):
         solution = Day17PartA()
 
diff --git a/tests/adventofcode2021/test_day19_b.py b/tests/adventofcode2021/test_day19_b.py
index 799b4419..b92fb659 100644
--- a/tests/adventofcode2021/test_day19_b.py
+++ b/tests/adventofcode2021/test_day19_b.py
@@ -1,7 +1,5 @@
 import pathlib
 
-import pytest
-
 from adventofcode2021.solutions.day19 import Day19PartB
 
 
@@ -25,7 +23,6 @@ def test_day19b_solve(self):
         result = solution.solve(self.load_testdata())
         assert result == 3621
 
-    @pytest.mark.xfail(reason="Not yet implemented", raises=NotImplementedError)
     def test_day19b_data(self):
         """Result we got when we did the real solution"""
         solution = Day19PartB()
diff --git a/tests/adventofcode2022/test_day15_b.py b/tests/adventofcode2022/test_day15_b.py
index 5b65445f..a1a84179 100644
--- a/tests/adventofcode2022/test_day15_b.py
+++ b/tests/adventofcode2022/test_day15_b.py
@@ -4,7 +4,6 @@
 
 
 class TestDay15PartB:
-    @pytest.mark.xfail(reason="Not the right implementation", raises=AssertionError)
     def test_day15b_solve(self, testdata):
         solution = Day15PartB()
         result = solution.execute(testdata, 20)

From 4d1c81bfab5282841c3621abc5e909fda382a3fe Mon Sep 17 00:00:00 2001
From: Roel Adriaans <roel@adriaans.org>
Date: Tue, 21 Nov 2023 22:12:42 +0100
Subject: [PATCH 306/371] Make points hashable and indexable via point.x and
 point["x"]

---
 pyproject.toml                 |  2 +-
 src/adventofcodeutils/point.py | 12 ++++++++++++
 2 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/pyproject.toml b/pyproject.toml
index 75cb0719..123b15b1 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "adventofcodeutils"
-version = "0.2.1"
+version = "0.3.0"
 description = "This repository contains some utils used by my advent of code projects. "
 authors = ["Roel Adriaans <roel@adriaans.org>"]
 readme = "README.md"
diff --git a/src/adventofcodeutils/point.py b/src/adventofcodeutils/point.py
index 39697395..0c59284e 100644
--- a/src/adventofcodeutils/point.py
+++ b/src/adventofcodeutils/point.py
@@ -12,6 +12,12 @@ def __add__(self, other):
             raise ValueError("Cannot add incompatible types together")
         return XYZPoint(x=self.x + other.x, y=self.y + other.y, z=self.z + other.z)
 
+    def __getitem__(self, key):
+        return self.__getattribute__(key)
+
+    def __hash__(self):
+        return hash((self.x, self.y, self.z))
+
     def distance(self, other):
         return abs(self.x - other.x) + abs(self.y - other.y) + abs(self.z - other.z)
 
@@ -26,5 +32,11 @@ def __add__(self, other):
             raise ValueError("Cannot add incompatible types together")
         return XYPoint(x=self.x + other.x, y=self.y + other.y)
 
+    def __getitem__(self, key):
+        return self.__getattribute__(key)
+
+    def __hash__(self):
+        return hash((self.x, self.y))
+
     def distance(self, other):
         return abs(self.x - other.x) + abs(self.y - other.y)

From 32046d1996e5174a2501369f021cd0d2ea52241e Mon Sep 17 00:00:00 2001
From: Roel Adriaans <roel@adriaans.org>
Date: Tue, 21 Nov 2023 22:14:59 +0100
Subject: [PATCH 307/371] Update dependencies

---
 poetry.lock    | 132 ++++++++++++++++++++++++-------------------------
 pyproject.toml |   4 +-
 2 files changed, 68 insertions(+), 68 deletions(-)

diff --git a/poetry.lock b/poetry.lock
index befb0339..647d1551 100644
--- a/poetry.lock
+++ b/poetry.lock
@@ -2,7 +2,7 @@
 
 [[package]]
 name = "adventofcodeutils"
-version = "0.2.2"
+version = "0.3.0"
 description = "This repository contains some utils used by my advent of code projects. "
 optional = false
 python-versions = "^3.11"
@@ -16,7 +16,7 @@ attrs = "^23.1.0"
 type = "git"
 url = "https://github.com/RoelAdriaans/adventofcodeutils.git"
 reference = "HEAD"
-resolved_reference = "0a4b6b3060d281fa5b515348906736c328a70dfa"
+resolved_reference = "865f86a58af3daadf75678b0ff29bb53b62df17a"
 
 [[package]]
 name = "anytree"
@@ -374,13 +374,13 @@ test-no-images = ["pytest", "pytest-cov", "pytest-xdist", "wurlitzer"]
 
 [[package]]
 name = "cookiecutter"
-version = "2.4.0"
+version = "2.5.0"
 description = "A command-line utility that creates projects from project templates, e.g. creating a Python package project from a Python package project template."
 optional = false
 python-versions = ">=3.7"
 files = [
-    {file = "cookiecutter-2.4.0-py3-none-any.whl", hash = "sha256:8344663028abc08ec09b912e663636a97e1775bffe973425ec0107431acd390e"},
-    {file = "cookiecutter-2.4.0.tar.gz", hash = "sha256:6d1494e66a784f23324df9d593f3e43af3db4f4b926b9e49e6ff060169fc042a"},
+    {file = "cookiecutter-2.5.0-py3-none-any.whl", hash = "sha256:8aa2f12ed11bc05628651e9dc4353a10571dd9908aaaaeec959a2b9ea465a5d2"},
+    {file = "cookiecutter-2.5.0.tar.gz", hash = "sha256:e61e9034748e3f41b8bd2c11f00d030784b48711c4d5c42363c50989a65331ec"},
 ]
 
 [package.dependencies]
@@ -515,53 +515,53 @@ typing = ["typing-extensions (>=4.8)"]
 
 [[package]]
 name = "fonttools"
-version = "4.44.3"
+version = "4.45.0"
 description = "Tools to manipulate font files"
 optional = false
 python-versions = ">=3.8"
 files = [
-    {file = "fonttools-4.44.3-cp310-cp310-macosx_10_9_universal2.whl", hash = "sha256:192ebdb3bb1882b7ed3ad4b949a106ddd8b428d046ddce64df2d459f7a2db31b"},
-    {file = "fonttools-4.44.3-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:20898476cf9c61795107b91409f4b1cf86de6e92b41095bbe900c05b5b117c96"},
-    {file = "fonttools-4.44.3-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:437204780611f9f80f74cd4402fa451e920d1c4b6cb474a0818a734b4affc477"},
-    {file = "fonttools-4.44.3-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:50152205ed3e16c5878a006ee53ecc402acac9af68357343be1e5c36f66ccb24"},
-    {file = "fonttools-4.44.3-cp310-cp310-musllinux_1_1_aarch64.whl", hash = "sha256:ba9c407d8bd63b21910b98399aeec87e24ca9c3e62ea60c246e505c4a4df6c27"},
-    {file = "fonttools-4.44.3-cp310-cp310-musllinux_1_1_x86_64.whl", hash = "sha256:79a6babb87d7f70f8aed88f157bbdc5d2f01ad8b01e9535ff07e43e96ad25548"},
-    {file = "fonttools-4.44.3-cp310-cp310-win32.whl", hash = "sha256:32e8a5cebfe8f797461b02084104053b2690ebf0cc38eda5beb9ba24ce43c349"},
-    {file = "fonttools-4.44.3-cp310-cp310-win_amd64.whl", hash = "sha256:c26649a6ce6f1ce4dd6748f64b18f70e39c618c6188286ab9534a949da28164c"},
-    {file = "fonttools-4.44.3-cp311-cp311-macosx_10_9_universal2.whl", hash = "sha256:5cd114cb20b491f6812aa397040b06a469563c1a01ec94c8c5d96b76d84916db"},
-    {file = "fonttools-4.44.3-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:e84084cc325f888c3495df7ec25f6133be0f606efb80a9c9e072ea6064ede9ac"},
-    {file = "fonttools-4.44.3-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:877e36afce69cfdbd0453a4f44b16e865ac29f06df29f10f0b822a68ab858e86"},
-    {file = "fonttools-4.44.3-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:b1c2cb1e2a7cfeaeb40b8823f238d7e02929b3a0b53e133e757dec5e99c327c9"},
-    {file = "fonttools-4.44.3-cp311-cp311-musllinux_1_1_aarch64.whl", hash = "sha256:dd752b778b37863cf5146d0112aafcd5693235831f09303809ab9c1e564c236b"},
-    {file = "fonttools-4.44.3-cp311-cp311-musllinux_1_1_x86_64.whl", hash = "sha256:8f4e22c5128cb604d3b0b869eb8d3092a1c10cbe6def402ff46bb920f7169374"},
-    {file = "fonttools-4.44.3-cp311-cp311-win32.whl", hash = "sha256:4831d948bc3cea9cd8bf0c92a087f4392068bcac3b584a61a4c837c48a012337"},
-    {file = "fonttools-4.44.3-cp311-cp311-win_amd64.whl", hash = "sha256:948b35e54b0c1b6acf9d63c70515051b7d400d69b61c91377cf0e8742d71c44d"},
-    {file = "fonttools-4.44.3-cp312-cp312-macosx_10_9_universal2.whl", hash = "sha256:fad1c74aa10b77764d3cdf3481bd181d4949e0b46f2da6f9e57543d4adbda177"},
-    {file = "fonttools-4.44.3-cp312-cp312-macosx_10_9_x86_64.whl", hash = "sha256:b6a77e3b994649f72fb46b0b8cfe64481b5640e5aecc2d77961300a34fe1dc4f"},
-    {file = "fonttools-4.44.3-cp312-cp312-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:2bff4f9d5edc10b29d2a2daeefd78a47289ba2f751c9bf247925b9d43c6efd79"},
-    {file = "fonttools-4.44.3-cp312-cp312-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:3302998e02a854a41c930f9f1366eb8092dbc5fe7ff636d86aeb28d232f4610a"},
-    {file = "fonttools-4.44.3-cp312-cp312-musllinux_1_1_aarch64.whl", hash = "sha256:8c7985017e7fb2c2613fa5c440457cd45a6ea808f8d08ed70c27e02e6862cbbe"},
-    {file = "fonttools-4.44.3-cp312-cp312-musllinux_1_1_x86_64.whl", hash = "sha256:35d88af2b63060ed2b50aa00d38f60edf4c0b9275a77ae1a98e8d2c03540c617"},
-    {file = "fonttools-4.44.3-cp312-cp312-win32.whl", hash = "sha256:5478a77a15d01a21c569fc4ab6f2faba852a21d0932eef02ac4c4a4b50af8070"},
-    {file = "fonttools-4.44.3-cp312-cp312-win_amd64.whl", hash = "sha256:979fc845703e0d9b35bc65379fcf34d050e04c3e0b3381a0f66b0be33183da1c"},
-    {file = "fonttools-4.44.3-cp38-cp38-macosx_10_9_universal2.whl", hash = "sha256:7a8b9f22d3c147ecdc7be46f9f1e1df0523541df0535fac5bdd653726218d068"},
-    {file = "fonttools-4.44.3-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:bcb0fde94374ba00c118d632b0b5f1f4447401313166bcb14d737322928e358f"},
-    {file = "fonttools-4.44.3-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:3eb365cd8ae4765973fa036aed0077ac26f37b2f8240a72c4a29cd9d8a31027f"},
-    {file = "fonttools-4.44.3-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:c329e21502c894fe4c800e32bc3ce37c6b5ca95778d32dff17d7ebf5cac94efa"},
-    {file = "fonttools-4.44.3-cp38-cp38-musllinux_1_1_aarch64.whl", hash = "sha256:345a30db8adfbb868221234fb434dd2fc5bfe27baafbaf418528f6c5a5a95584"},
-    {file = "fonttools-4.44.3-cp38-cp38-musllinux_1_1_x86_64.whl", hash = "sha256:2fe4eed749de2e6bf3aa05d18df04231a712a16c08974af5e67bb9f75a25d10f"},
-    {file = "fonttools-4.44.3-cp38-cp38-win32.whl", hash = "sha256:3b179a284b73802edd6d910e6384f28098cb03bd263fd87db6abb31679f68863"},
-    {file = "fonttools-4.44.3-cp38-cp38-win_amd64.whl", hash = "sha256:4c805a0b0545fd9becf6dfe8d57e45a7c1af7fdbfd0a7d776c5e999e4edec9f5"},
-    {file = "fonttools-4.44.3-cp39-cp39-macosx_10_9_universal2.whl", hash = "sha256:f647d270ee90f70acbf5b31a53d486ba0897624236f9056d624c4e436386a14e"},
-    {file = "fonttools-4.44.3-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:ba82ee938bd7ea16762124a650bf2529f67dfe9999f64e0ebe1ef0a04baceafd"},
-    {file = "fonttools-4.44.3-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:e3bbca4f873d96c20757c24c70a903251a8998e1931bd888b49956f21d94b441"},
-    {file = "fonttools-4.44.3-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:50b43fd55089ae850a050f0c382f13fc9586279a540b646b28b9e93fbc05b8a3"},
-    {file = "fonttools-4.44.3-cp39-cp39-musllinux_1_1_aarch64.whl", hash = "sha256:cde83f83919ae7569a0316e093e04022dbb8ae5217f41cf591f125dd35d4dc0d"},
-    {file = "fonttools-4.44.3-cp39-cp39-musllinux_1_1_x86_64.whl", hash = "sha256:72ec91b85391dd4b06991c0919215ecf910554df2842df32e928155ea5b74aef"},
-    {file = "fonttools-4.44.3-cp39-cp39-win32.whl", hash = "sha256:367aa3e81a096e9a95dfc0d5afcbd0a299d857bac6d0fe5f1614c6f3e53f447f"},
-    {file = "fonttools-4.44.3-cp39-cp39-win_amd64.whl", hash = "sha256:718599de63b337518bfa5ce67e4ae462da3dd582a74fbe805f56b3704eb334a1"},
-    {file = "fonttools-4.44.3-py3-none-any.whl", hash = "sha256:42eefbb1babf81de40ab4a6ace6018c8c5a0d79ece0f986f73a9904b26ee511b"},
-    {file = "fonttools-4.44.3.tar.gz", hash = "sha256:f77b6c0add23a3f1ec8eda40015bcb8e92796f7d06a074de102a31c7d007c05b"},
+    {file = "fonttools-4.45.0-cp310-cp310-macosx_10_9_universal2.whl", hash = "sha256:18138744540413eb2ebeff6ce8b9d617926f1ed08da5d1676f99f1966988264e"},
+    {file = "fonttools-4.45.0-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:0b3d240933045b9dbbe6e8c1e28ffe89be72c9be927b6e572e55be5e2b2604f7"},
+    {file = "fonttools-4.45.0-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:5853263505f407b69c0d1cbf3ed1c30f985b9505523989b20aa18a5231d4a08a"},
+    {file = "fonttools-4.45.0-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:4c21f306f1e71146cf7587916d6de5e9c4bf26057aad602a6c7fad4b6e05bf1f"},
+    {file = "fonttools-4.45.0-cp310-cp310-musllinux_1_1_aarch64.whl", hash = "sha256:1bb4f01018b9f4e2d7b07c2bf79e2ef498acb6f99321b72b5c44b1333481f569"},
+    {file = "fonttools-4.45.0-cp310-cp310-musllinux_1_1_x86_64.whl", hash = "sha256:d0e6603c3b00604574d84fabbcf9dee81efa7c89d38ed4dcbf4e6c654e1ebb99"},
+    {file = "fonttools-4.45.0-cp310-cp310-win32.whl", hash = "sha256:c3e676e50a0713c9a1e46185b806967d3c012643d1936ca814eb9ab62027c090"},
+    {file = "fonttools-4.45.0-cp310-cp310-win_amd64.whl", hash = "sha256:e819f14d315024750b1ad2842da605051444b944cd983ea987359ace5213bcb9"},
+    {file = "fonttools-4.45.0-cp311-cp311-macosx_10_9_universal2.whl", hash = "sha256:a6d68b97b967a3361e0ddf14425e4fe030c9f19462b445ce0b190c4a6834eb46"},
+    {file = "fonttools-4.45.0-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:619227c7b9088add4d4e5959bf0fa3c29a71c191baa8b989bf532645876b2168"},
+    {file = "fonttools-4.45.0-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:cafe001811ad1ac2a5d357fc99c490357d758569f69511d14da0311c02814e15"},
+    {file = "fonttools-4.45.0-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:756c6f4324fd4bb4d7517462d7237ff65e45da7a002f9e6e08a48c25a11bf073"},
+    {file = "fonttools-4.45.0-cp311-cp311-musllinux_1_1_aarch64.whl", hash = "sha256:ecc97628be1bf7fa93463e1e791915da66de51df8e655a5a6c846fd9b8ceaa98"},
+    {file = "fonttools-4.45.0-cp311-cp311-musllinux_1_1_x86_64.whl", hash = "sha256:636177ffc4479bc824a356c00a3c9a74a2ce591fa6057109321e0a0ffd126e40"},
+    {file = "fonttools-4.45.0-cp311-cp311-win32.whl", hash = "sha256:cac462dbd9058778c89bc608ac29ba93ab3fbc37f305d260aa2d771cfb0fa694"},
+    {file = "fonttools-4.45.0-cp311-cp311-win_amd64.whl", hash = "sha256:2bd3f33a5d5630cc20cf3f8631074cac6eafdb2aa3ac8745966c3b4bf93656b4"},
+    {file = "fonttools-4.45.0-cp312-cp312-macosx_10_9_universal2.whl", hash = "sha256:5b3da7791a58c97763d1704c2b76a9d654b8f2ef233e64248960bd2c6e669fe4"},
+    {file = "fonttools-4.45.0-cp312-cp312-macosx_10_9_x86_64.whl", hash = "sha256:4fbc3d8acb578ba0932fcabc01a962f23b0dd254ab103dd0606128fff0175095"},
+    {file = "fonttools-4.45.0-cp312-cp312-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:5f69e07ebfd89d96485349dc10bd81a027fc0e927f988fa31bd9cd06359e06ed"},
+    {file = "fonttools-4.45.0-cp312-cp312-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:b122fe802839bfc8f9603233e5fcbdc98b5e27876f7945b426adfea983918a7b"},
+    {file = "fonttools-4.45.0-cp312-cp312-musllinux_1_1_aarch64.whl", hash = "sha256:8f8736e885700ae22970519b8f5c7f4c2f29c6e9459d05c649c4e99012c20b23"},
+    {file = "fonttools-4.45.0-cp312-cp312-musllinux_1_1_x86_64.whl", hash = "sha256:70f047ba37c6aac3d331b71bb784373e251bd86678da72526edc8585e79418e1"},
+    {file = "fonttools-4.45.0-cp312-cp312-win32.whl", hash = "sha256:fdb43f68bce545f494fed1bfb60d2c32b53f410758919112923c2d600cb9a24c"},
+    {file = "fonttools-4.45.0-cp312-cp312-win_amd64.whl", hash = "sha256:102a7ca8700a078265c002c29d2ae498edeb14b636375ceec2425b561ce08037"},
+    {file = "fonttools-4.45.0-cp38-cp38-macosx_10_9_universal2.whl", hash = "sha256:4b154cbf93515e4eb477f5cf99de79b46c17229781f321907940bdbabbd64708"},
+    {file = "fonttools-4.45.0-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:f546a1b676622638a12c721d89cfb513ad7189548eadac885cdd555e35021557"},
+    {file = "fonttools-4.45.0-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:45c5a0612049e0d06b467c3a0837d9efe37934acab64ba922f00e1d07c1555a7"},
+    {file = "fonttools-4.45.0-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:f27166d00e0cd3ea49461b053f55e75676f1109e5483170a14d70c397d082a4c"},
+    {file = "fonttools-4.45.0-cp38-cp38-musllinux_1_1_aarch64.whl", hash = "sha256:980ba4e673439db22a00501fac087957ce0731351b042816f6c02df81cadc612"},
+    {file = "fonttools-4.45.0-cp38-cp38-musllinux_1_1_x86_64.whl", hash = "sha256:83b70b99f3f55b046cb51ca20fc15702567710233b2cd757a79e1916c25a25f8"},
+    {file = "fonttools-4.45.0-cp38-cp38-win32.whl", hash = "sha256:fe8ad943f62bf16273154ebcdf855c44a3b46eac36abea338c209209439b4eb6"},
+    {file = "fonttools-4.45.0-cp38-cp38-win_amd64.whl", hash = "sha256:6fb1fdcee2b36e012283805ef0380e4508dbb504950b1c94d0343f8dbbad7d7e"},
+    {file = "fonttools-4.45.0-cp39-cp39-macosx_10_9_universal2.whl", hash = "sha256:5bbcb75ffcea64543ab8203e132e2019b226f59a4a6958637e78c21f9ca560ff"},
+    {file = "fonttools-4.45.0-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:ade07953b35ebf66c445a5e02f28ecd038ea588dc7673c555afe319b6e3c5168"},
+    {file = "fonttools-4.45.0-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:54ac8be3f693062fc08550213edd40db8f4fe1dd095a1246ed18e887fc254d76"},
+    {file = "fonttools-4.45.0-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:dc991712aaea9d545b13ec480aaf2ebd12ccdea180fce864dd9863f5134f5a06"},
+    {file = "fonttools-4.45.0-cp39-cp39-musllinux_1_1_aarch64.whl", hash = "sha256:420139743e21d832de230757fb7b0c285d8024d602af8064d9506fa055bb62ae"},
+    {file = "fonttools-4.45.0-cp39-cp39-musllinux_1_1_x86_64.whl", hash = "sha256:58da830a52c05f18a7cc8a279a8bdddf2e45cdc685b360699653fb3405557459"},
+    {file = "fonttools-4.45.0-cp39-cp39-win32.whl", hash = "sha256:715e18f67f0587a16476c7f62b8ff9a165ddceb8c2a262fb08df9f71c7790f0e"},
+    {file = "fonttools-4.45.0-cp39-cp39-win_amd64.whl", hash = "sha256:dd26fda8c879558216458a801c1dba52f35dca0e96640fd9c75e86b6574cf1c3"},
+    {file = "fonttools-4.45.0-py3-none-any.whl", hash = "sha256:835cf5d0e1b37bbed1d64c286611cc4da9ff19df952400f191ba9142b3cb97f6"},
+    {file = "fonttools-4.45.0.tar.gz", hash = "sha256:c1c79d7d4093396892575115c214b24f09e68997cb5c0ab2d99bfdaff74c64b6"},
 ]
 
 [package.extras]
@@ -1086,13 +1086,13 @@ tests = ["check-manifest", "coverage", "defusedxml", "markdown2", "olefile", "pa
 
 [[package]]
 name = "platformdirs"
-version = "3.11.0"
+version = "4.0.0"
 description = "A small Python package for determining appropriate platform-specific dirs, e.g. a \"user data dir\"."
 optional = false
 python-versions = ">=3.7"
 files = [
-    {file = "platformdirs-3.11.0-py3-none-any.whl", hash = "sha256:e9d171d00af68be50e9202731309c4e658fd8bc76f55c11c7dd760d023bda68e"},
-    {file = "platformdirs-3.11.0.tar.gz", hash = "sha256:cf8ee52a3afdb965072dcc652433e0c7e3e40cf5ea1477cd4b3b1d2eb75495b3"},
+    {file = "platformdirs-4.0.0-py3-none-any.whl", hash = "sha256:118c954d7e949b35437270383a3f2531e99dd93cf7ce4dc8340d3356d30f173b"},
+    {file = "platformdirs-4.0.0.tar.gz", hash = "sha256:cb633b2bcf10c51af60beb0ab06d2f1d69064b43abf4c185ca6b28865f3f9731"},
 ]
 
 [package.extras]
@@ -1134,13 +1134,13 @@ virtualenv = ">=20.10.0"
 
 [[package]]
 name = "pygments"
-version = "2.17.0"
+version = "2.17.2"
 description = "Pygments is a syntax highlighting package written in Python."
 optional = false
 python-versions = ">=3.7"
 files = [
-    {file = "pygments-2.17.0-py3-none-any.whl", hash = "sha256:cd0c46944b2551af02ecc15961050182ea120d3895000e2676160820f3421527"},
-    {file = "pygments-2.17.0.tar.gz", hash = "sha256:edaa0fa2453d055d0ac94449d1f73ec7bc52c5e318204da1377c1392978c4a8d"},
+    {file = "pygments-2.17.2-py3-none-any.whl", hash = "sha256:b27c2826c47d0f3219f29554824c30c5e8945175d888647acd804ddd04af846c"},
+    {file = "pygments-2.17.2.tar.gz", hash = "sha256:da46cec9fd2de5be3a8a784f434e4c4ab670b4ff54d605c4c2717e9d49c4c367"},
 ]
 
 [package.extras]
@@ -1219,13 +1219,13 @@ testing = ["fields", "hunter", "process-tests", "pytest-xdist", "six", "virtuale
 
 [[package]]
 name = "pytest-xdist"
-version = "3.4.0"
+version = "3.5.0"
 description = "pytest xdist plugin for distributed testing, most importantly across multiple CPUs"
 optional = false
 python-versions = ">=3.7"
 files = [
-    {file = "pytest-xdist-3.4.0.tar.gz", hash = "sha256:3a94a931dd9e268e0b871a877d09fe2efb6175c2c23d60d56a6001359002b832"},
-    {file = "pytest_xdist-3.4.0-py3-none-any.whl", hash = "sha256:e513118bf787677a427e025606f55e95937565e06dfaac8d87f55301e57ae607"},
+    {file = "pytest-xdist-3.5.0.tar.gz", hash = "sha256:cbb36f3d67e0c478baa57fa4edc8843887e0f6cfc42d677530a36d7472b32d8a"},
+    {file = "pytest_xdist-3.5.0-py3-none-any.whl", hash = "sha256:d075629c7e00b611df89f490a5063944bee7a4362a5ff11c7cc7824a03dfce24"},
 ]
 
 [package.dependencies]
@@ -1383,17 +1383,17 @@ jupyter = ["ipywidgets (>=7.5.1,<9)"]
 
 [[package]]
 name = "setuptools"
-version = "68.2.2"
+version = "69.0.2"
 description = "Easily download, build, install, upgrade, and uninstall Python packages"
 optional = false
 python-versions = ">=3.8"
 files = [
-    {file = "setuptools-68.2.2-py3-none-any.whl", hash = "sha256:b454a35605876da60632df1a60f736524eb73cc47bbc9f3f1ef1b644de74fd2a"},
-    {file = "setuptools-68.2.2.tar.gz", hash = "sha256:4ac1475276d2f1c48684874089fefcd83bd7162ddaafb81fac866ba0db282a87"},
+    {file = "setuptools-69.0.2-py3-none-any.whl", hash = "sha256:1e8fdff6797d3865f37397be788a4e3cba233608e9b509382a2777d25ebde7f2"},
+    {file = "setuptools-69.0.2.tar.gz", hash = "sha256:735896e78a4742605974de002ac60562d286fa8051a7e2299445e8e8fbb01aa6"},
 ]
 
 [package.extras]
-docs = ["furo", "jaraco.packaging (>=9.3)", "jaraco.tidelift (>=1.4)", "pygments-github-lexers (==0.0.5)", "rst.linker (>=1.9)", "sphinx (>=3.5)", "sphinx-favicon", "sphinx-hoverxref (<2)", "sphinx-inline-tabs", "sphinx-lint", "sphinx-notfound-page (>=1,<2)", "sphinx-reredirects", "sphinxcontrib-towncrier"]
+docs = ["furo", "jaraco.packaging (>=9.3)", "jaraco.tidelift (>=1.4)", "pygments-github-lexers (==0.0.5)", "rst.linker (>=1.9)", "sphinx (<7.2.5)", "sphinx (>=3.5)", "sphinx-favicon", "sphinx-inline-tabs", "sphinx-lint", "sphinx-notfound-page (>=1,<2)", "sphinx-reredirects", "sphinxcontrib-towncrier"]
 testing = ["build[virtualenv]", "filelock (>=3.4.0)", "flake8-2020", "ini2toml[lite] (>=0.9)", "jaraco.develop (>=7.21)", "jaraco.envs (>=2.2)", "jaraco.path (>=3.2.0)", "pip (>=19.1)", "pytest (>=6)", "pytest-black (>=0.3.7)", "pytest-checkdocs (>=2.4)", "pytest-cov", "pytest-enabler (>=2.2)", "pytest-mypy (>=0.9.1)", "pytest-perf", "pytest-ruff", "pytest-timeout", "pytest-xdist", "tomli-w (>=1.0.0)", "virtualenv (>=13.0.0)", "wheel"]
 testing-integration = ["build[virtualenv] (>=1.0.3)", "filelock (>=3.4.0)", "jaraco.envs (>=2.2)", "jaraco.path (>=3.2.0)", "packaging (>=23.1)", "pytest", "pytest-enabler", "pytest-xdist", "tomli", "virtualenv (>=13.0.0)", "wheel"]
 
@@ -1505,19 +1505,19 @@ zstd = ["zstandard (>=0.18.0)"]
 
 [[package]]
 name = "virtualenv"
-version = "20.24.6"
+version = "20.24.7"
 description = "Virtual Python Environment builder"
 optional = false
 python-versions = ">=3.7"
 files = [
-    {file = "virtualenv-20.24.6-py3-none-any.whl", hash = "sha256:520d056652454c5098a00c0f073611ccbea4c79089331f60bf9d7ba247bb7381"},
-    {file = "virtualenv-20.24.6.tar.gz", hash = "sha256:02ece4f56fbf939dbbc33c0715159951d6bf14aaf5457b092e4548e1382455af"},
+    {file = "virtualenv-20.24.7-py3-none-any.whl", hash = "sha256:a18b3fd0314ca59a2e9f4b556819ed07183b3e9a3702ecfe213f593d44f7b3fd"},
+    {file = "virtualenv-20.24.7.tar.gz", hash = "sha256:69050ffb42419c91f6c1284a7b24e0475d793447e35929b488bf6a0aade39353"},
 ]
 
 [package.dependencies]
 distlib = ">=0.3.7,<1"
 filelock = ">=3.12.2,<4"
-platformdirs = ">=3.9.1,<4"
+platformdirs = ">=3.9.1,<5"
 
 [package.extras]
 docs = ["furo (>=2023.7.26)", "proselint (>=0.13)", "sphinx (>=7.1.2)", "sphinx-argparse (>=0.4)", "sphinxcontrib-towncrier (>=0.2.1a0)", "towncrier (>=23.6)"]
@@ -1526,4 +1526,4 @@ test = ["covdefaults (>=2.3)", "coverage (>=7.2.7)", "coverage-enable-subprocess
 [metadata]
 lock-version = "2.0"
 python-versions = "^3.12"
-content-hash = "c622e26aedbd60f2fdb0cb18146bfdab2a6f32e3517ed7f1e15f01093c8cf1e4"
+content-hash = "75ac694ef0318c8f222af9998b5f1b47137577acd2a5f04784ccf899a30f8304"
diff --git a/pyproject.toml b/pyproject.toml
index 9910e195..0c3a34ac 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -30,10 +30,10 @@ matplotlib = "^3.8.2"
 
 [tool.poetry.dev-dependencies]
 black = "^23.11.0"
-cookiecutter = "^2.4.0"
+cookiecutter = "^2.5.0"
 pytest = "^7.4.3"
 pytest-cov = "^4.1.0"
-pytest-xdist = "^3.4.0"
+pytest-xdist = "^3.5.0"
 python-dotenv = "^1.0.0"
 tox = "^4.11.3"
 pre-commit = "^3.5.0"

From ed61d478bbde24391e9a54363cab2b232a55fafd Mon Sep 17 00:00:00 2001
From: Roel Adriaans <roel.adriaans@asml.com>
Date: Wed, 22 Nov 2023 02:42:17 +0100
Subject: [PATCH 308/371] Add bandit + config in CI pipeline

---
 pyproject.toml | 6 ++++++
 tox.ini        | 9 +++++++++
 2 files changed, 15 insertions(+)

diff --git a/pyproject.toml b/pyproject.toml
index 0c3a34ac..0b8d70b9 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -49,3 +49,9 @@ adventofcode2022 = "adventofcode2022.main:main"
 [build-system]
 requires = ["poetry-core>=1.0.0"]
 build-backend = "poetry.core.masonry.api"
+
+[tool.bandit]
+exclude_dirs = ["template"]
+
+[tool.bandit.assert_used]
+skips = ["*/*_test.py", "*/test_*.py"]
diff --git a/tox.ini b/tox.ini
index 85a0576b..8ecc8771 100644
--- a/tox.ini
+++ b/tox.ini
@@ -106,6 +106,13 @@ deps = isort
 commands =
     isort  --check-only src/ tests/
 
+[testenv:bandit]
+skip_install = true
+description = Find common security issues in Python code
+deps = bandit
+commands =
+    bandit -c pyproject.toml -r src/ tests/
+
 # Combines all linters in one, fast, env
 [testenv:linters]
 skip_install = true
@@ -113,9 +120,11 @@ deps =
     {[testenv:black]deps}
     {[testenv:flake8]deps}
     {[testenv:isort]deps}
+    {[testenv:bandit]deps}
     #{[testenv:mypy]deps}
 commands =
     {[testenv:black]commands}
     {[testenv:flake8]commands}
     {[testenv:isort]commands}
+    {[testenv:bandit]commands}
     #{[testenv:mypy]commands}

From 0a6cbfbad2dc4fd63f96b731a9f7ce2055987b62 Mon Sep 17 00:00:00 2001
From: Roel Adriaans <roel.adriaans@asml.com>
Date: Wed, 22 Nov 2023 09:48:59 +0100
Subject: [PATCH 309/371] Fix issues bandit found

---
 src/adventofcode2016/main.py            | 2 ++
 src/adventofcode2016/solutions/day03.py | 4 +++-
 src/adventofcode2016/solutions/day04.py | 4 +++-
 src/adventofcode2016/solutions/day05.py | 4 +++-
 src/adventofcode2016/solutions/day14.py | 8 ++++++--
 src/adventofcode2016/solutions/day17.py | 2 +-
 src/adventofcode2020/main.py            | 2 ++
 src/adventofcode2020/solutions/day02.py | 3 ++-
 src/adventofcode2020/solutions/day07.py | 3 ++-
 src/adventofcode2020/solutions/day14.py | 4 +++-
 src/adventofcode2021/main.py            | 2 ++
 src/adventofcode2021/solutions/day05.py | 4 +++-
 src/adventofcode2022/main.py            | 2 ++
 tests/adventofcode2020/test_day02_a.py  | 6 +++++-
 14 files changed, 39 insertions(+), 11 deletions(-)

diff --git a/src/adventofcode2016/main.py b/src/adventofcode2016/main.py
index 09fd0463..d36ad907 100644
--- a/src/adventofcode2016/main.py
+++ b/src/adventofcode2016/main.py
@@ -147,6 +147,7 @@ def download_input_data(year: str, day: str):
     r = requests.get(
         f"https://adventofcode.com/{year}/day/{day.lstrip('0')}/input",
         cookies={"session": _get_session()},
+        timeout=30,
     )
     if r.status_code != 200:
         print(f"Unable to download the input data. Response code {r.status_code}")
@@ -254,6 +255,7 @@ def submit_result(year, day, part, result):
         url=post_url,
         data=data,
         cookies={"session": _get_session()},
+        timeout=30,
     )
 
     result = parse_result(r.text)
diff --git a/src/adventofcode2016/solutions/day03.py b/src/adventofcode2016/solutions/day03.py
index c90ab09e..53264c82 100644
--- a/src/adventofcode2016/solutions/day03.py
+++ b/src/adventofcode2016/solutions/day03.py
@@ -18,7 +18,9 @@ def _split_into_parts(input_data: str) -> list[list[int]]:
         res = []
         for line in lines:
             m = re.match(find_digits_re, line)
-            assert m is not None
+            if not m:
+                raise ValueError(f"Match not found in {line}")
+
             sides = [int(m.group(1)), int(m.group(2)), int(m.group(3))]
             res.append(sides)
         return res
diff --git a/src/adventofcode2016/solutions/day04.py b/src/adventofcode2016/solutions/day04.py
index a1ab8803..629218a9 100644
--- a/src/adventofcode2016/solutions/day04.py
+++ b/src/adventofcode2016/solutions/day04.py
@@ -19,7 +19,9 @@ class Room:
     @classmethod
     def from_string(cls, input_string: str) -> Room:
         group = re.match(r"^([\w-]*)-(\d*)\[(\w*)\]$", input_string)
-        assert group
+        if not group:
+            raise ValueError(f"Match not found in {input_string}")
+
         return cls(encrypted_name=group[1], sector_id=int(group[2]), checksum=group[3])
 
     def is_valid(self) -> bool:
diff --git a/src/adventofcode2016/solutions/day05.py b/src/adventofcode2016/solutions/day05.py
index 8c05bd62..e810bbb8 100644
--- a/src/adventofcode2016/solutions/day05.py
+++ b/src/adventofcode2016/solutions/day05.py
@@ -22,7 +22,9 @@ def find_match(prefix: str, starting: int) -> MatchResult:
         non-zero number, and the current position"""
         position = starting
         while True:
-            pos_hash = hashlib.md5(f"{prefix}{position}".encode()).hexdigest()
+            pos_hash = hashlib.md5(
+                f"{prefix}{position}".encode(), usedforsecurity=False
+            ).hexdigest()
             if pos_hash[:5] == "00000":
                 return MatchResult(
                     hash=pos_hash, first_code=pos_hash[5], current_position=position
diff --git a/src/adventofcode2016/solutions/day14.py b/src/adventofcode2016/solutions/day14.py
index 4ea96bdf..9142795f 100644
--- a/src/adventofcode2016/solutions/day14.py
+++ b/src/adventofcode2016/solutions/day14.py
@@ -18,9 +18,13 @@ class Day14:
     def find_hash(self, input_string: str) -> str:
         if self.stretched:
             for n in range(2017):
-                input_string = hashlib.md5(input_string.encode()).hexdigest()
+                input_string = hashlib.md5(
+                    input_string.encode(), usedforsecurity=False
+                ).hexdigest()
         else:
-            input_string = hashlib.md5(input_string.encode()).hexdigest()
+            input_string = hashlib.md5(
+                input_string.encode(), usedforsecurity=False
+            ).hexdigest()
         return input_string
 
     def get_five_match(self, salt: str, start_index: int, letter: str) -> int:
diff --git a/src/adventofcode2016/solutions/day17.py b/src/adventofcode2016/solutions/day17.py
index 5e76b016..cf47a863 100644
--- a/src/adventofcode2016/solutions/day17.py
+++ b/src/adventofcode2016/solutions/day17.py
@@ -14,7 +14,7 @@
 @cache
 def md5(input_string: str) -> str:
     """Calculate md5"""
-    return hashlib.md5(input_string.encode()).hexdigest()
+    return hashlib.md5(input_string.encode(), usedforsecurity=False).hexdigest()
 
 
 @attrs.define(frozen=True)
diff --git a/src/adventofcode2020/main.py b/src/adventofcode2020/main.py
index 61fa7adb..cabac7cb 100644
--- a/src/adventofcode2020/main.py
+++ b/src/adventofcode2020/main.py
@@ -147,6 +147,7 @@ def download_input_data(year: str, day: str):
     r = requests.get(
         f"https://adventofcode.com/{year}/day/{day.lstrip('0')}/input",
         cookies={"session": _get_session()},
+        timeout=30,
     )
     if r.status_code != 200:
         print(f"Unable to download the input data. Response code {r.status_code}")
@@ -254,6 +255,7 @@ def submit_result(year, day, part, result):
         url=post_url,
         data=data,
         cookies={"session": _get_session()},
+        timeout=30,
     )
 
     result = parse_result(r.text)
diff --git a/src/adventofcode2020/solutions/day02.py b/src/adventofcode2020/solutions/day02.py
index 27594ed6..618a6ddf 100644
--- a/src/adventofcode2020/solutions/day02.py
+++ b/src/adventofcode2020/solutions/day02.py
@@ -20,7 +20,8 @@ def split(input_password) -> PassPol:
         results = re.match(r"(\d*)-(\d*) (.): (\w*)", input_password)
 
         # Make mypy happy
-        assert results
+        if not results:
+            raise ValueError(f"Match not found in {input_password}")
 
         passpol = PassPol(
             at_least=int(results[1]),
diff --git a/src/adventofcode2020/solutions/day07.py b/src/adventofcode2020/solutions/day07.py
index 2d540e48..c4c79c0b 100644
--- a/src/adventofcode2020/solutions/day07.py
+++ b/src/adventofcode2020/solutions/day07.py
@@ -59,7 +59,8 @@ def from_string(self, input_str: str) -> Bag:
 
         color_regex = r"^([\w\s]+) bags contain ([\w\s,]+)"
         color_match = re.match(color_regex, input_str)
-        assert color_match
+        if not color_match:
+            raise ValueError(f"Match not found in {input_str}")
 
         color = color_match[1]
 
diff --git a/src/adventofcode2020/solutions/day14.py b/src/adventofcode2020/solutions/day14.py
index f639a3d9..2c0e4b4a 100644
--- a/src/adventofcode2020/solutions/day14.py
+++ b/src/adventofcode2020/solutions/day14.py
@@ -36,7 +36,9 @@ def parse_programs(input_data: str) -> list[Program]:
             entries = []
             for line in lines[1:]:
                 matches = re.match(r"mem\[(\d*)] = (\d*)", line)
-                assert matches
+                if not matches:
+                    raise ValueError(f"Match not found in {line}")
+
                 group = matches.groups()
                 entries.append(Instruction(address=int(group[0]), value=int(group[1])))
 
diff --git a/src/adventofcode2021/main.py b/src/adventofcode2021/main.py
index e79b0607..249c5ae2 100644
--- a/src/adventofcode2021/main.py
+++ b/src/adventofcode2021/main.py
@@ -147,6 +147,7 @@ def download_input_data(year: str, day: str):
     r = requests.get(
         f"https://adventofcode.com/{year}/day/{day.lstrip('0')}/input",
         cookies={"session": _get_session()},
+        timeout=30,
     )
     if r.status_code != 200:
         print(f"Unable to download the input data. Response code {r.status_code}")
@@ -254,6 +255,7 @@ def submit_result(year, day, part, result):
         url=post_url,
         data=data,
         cookies={"session": _get_session()},
+        timeout=30,
     )
 
     result = parse_result(r.text)
diff --git a/src/adventofcode2021/solutions/day05.py b/src/adventofcode2021/solutions/day05.py
index 24600959..94f61e36 100644
--- a/src/adventofcode2021/solutions/day05.py
+++ b/src/adventofcode2021/solutions/day05.py
@@ -23,7 +23,9 @@ def parse_lines(self, line) -> tuple[Point, Point]:
         """
         regex = r"^(?P<x1>\d*),(?P<y1>\d*) -> (?P<x2>\d*),(?P<y2>\d*)$"
         matches = re.search(regex, line)
-        assert matches
+        if not matches:
+            raise ValueError(f"Match not found in {line}")
+
         p1 = Point(x=int(matches["x1"]), y=int(matches["y1"]))
         p2 = Point(x=int(matches["x2"]), y=int(matches["y2"]))
         return p1, p2
diff --git a/src/adventofcode2022/main.py b/src/adventofcode2022/main.py
index 6467065e..b4b7da49 100644
--- a/src/adventofcode2022/main.py
+++ b/src/adventofcode2022/main.py
@@ -147,6 +147,7 @@ def download_input_data(year: str, day: str):
     r = requests.get(
         f"https://adventofcode.com/{year}/day/{day.lstrip('0')}/input",
         cookies={"session": _get_session()},
+        timeout=30,
     )
     if r.status_code != 200:
         print(f"Unable to download the input data. Response code {r.status_code}")
@@ -256,6 +257,7 @@ def submit_result(year, day, part, result):
         url=post_url,
         data=data,
         cookies={"session": _get_session()},
+        timeout=30,
     )
 
     result = parse_result(r.text)
diff --git a/tests/adventofcode2020/test_day02_a.py b/tests/adventofcode2020/test_day02_a.py
index 92a56828..43e4cc60 100644
--- a/tests/adventofcode2020/test_day02_a.py
+++ b/tests/adventofcode2020/test_day02_a.py
@@ -8,8 +8,12 @@ def test_day02_split(self):
         input_str = "7-9 r: rrrkrrrrrnrrmj"
 
         result = Day02PartA.split(input_str)
+
         assert result == PassPol(
-            at_least=7, at_most=9, letter="r", password="rrrkrrrrrnrrmj"
+            at_least=7,
+            at_most=9,
+            letter="r",
+            password="rrrkrrrrrnrrmj",  # nosec B106
         )
 
     @pytest.mark.parametrize(

From 14cce85dadc9e51a67f63dc89fa13ffa779bae74 Mon Sep 17 00:00:00 2001
From: Roel Adriaans <roel@adriaans.org>
Date: Wed, 22 Nov 2023 09:59:25 +0100
Subject: [PATCH 310/371] Update tox.yml

---
 .github/workflows/tox.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/tox.yml b/.github/workflows/tox.yml
index 06cf86ac..0e4f485f 100644
--- a/.github/workflows/tox.yml
+++ b/.github/workflows/tox.yml
@@ -1,6 +1,6 @@
 name: Python Run Tox
 
-on: [push, pull_request]
+on: [pull_request]
 
 jobs:
   build:

From 04dcda8aa2e31186f822fd130535a629767c233d Mon Sep 17 00:00:00 2001
From: Roel Adriaans <roel@adriaans.org>
Date: Wed, 22 Nov 2023 10:06:56 +0100
Subject: [PATCH 311/371] Update dependabot.yml, add automerge

---
 .github/dependabot.yml | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/.github/dependabot.yml b/.github/dependabot.yml
index 4ac925c7..7247f688 100644
--- a/.github/dependabot.yml
+++ b/.github/dependabot.yml
@@ -3,12 +3,19 @@ updates:
   # Maintain dependencies for GitHub Actions
 - package-ecosystem: "github-actions"
   directory: "/"
+  labels:
+    - "dependencies"
+    - "github_actions"
+    - "automerge"
   schedule:
     interval: "daily"
 
 - package-ecosystem: pip
   directory: "/"
+  labels:
+    - "dependencies"
+    - "python"
+    - "automerge"
   schedule:
     interval: daily
     time: "04:00"
-  open-pull-requests-limit: 10

From 24ab00321c8b9c6bdbe067b51d587f9a3ba31771 Mon Sep 17 00:00:00 2001
From: Roel Adriaans <roel@adriaans.org>
Date: Sun, 26 Nov 2023 13:54:26 +0100
Subject: [PATCH 312/371] Move FileReaderSolution / AbstractSolution to own
 package

---
 pyproject.toml                                |  1 +
 .../utils => adventofcode}/__init__.py        |  0
 .../utils/__init__.py                         |  0
 .../utils/abstract.py                         | 14 ++++++-
 src/adventofcode2016/solutions/day01.py       |  2 +-
 src/adventofcode2016/solutions/day02.py       |  2 +-
 src/adventofcode2016/solutions/day03.py       |  2 +-
 src/adventofcode2016/solutions/day04.py       |  2 +-
 src/adventofcode2016/solutions/day05.py       |  2 +-
 src/adventofcode2016/solutions/day06.py       |  2 +-
 src/adventofcode2016/solutions/day07.py       |  2 +-
 src/adventofcode2016/solutions/day08.py       |  2 +-
 src/adventofcode2016/solutions/day09.py       |  2 +-
 src/adventofcode2016/solutions/day10.py       |  2 +-
 src/adventofcode2016/solutions/day11.py       |  2 +-
 src/adventofcode2016/solutions/day12.py       |  2 +-
 src/adventofcode2016/solutions/day13.py       |  2 +-
 src/adventofcode2016/solutions/day14.py       |  2 +-
 src/adventofcode2016/solutions/day15.py       |  2 +-
 src/adventofcode2016/solutions/day16.py       |  2 +-
 src/adventofcode2016/solutions/day17.py       |  2 +-
 src/adventofcode2016/solutions/day18.py       |  2 +-
 src/adventofcode2016/solutions/day19.py       |  2 +-
 src/adventofcode2016/solutions/day20.py       |  2 +-
 src/adventofcode2016/solutions/day21.py       |  2 +-
 src/adventofcode2016/solutions/day22.py       |  2 +-
 src/adventofcode2019/solutions/day01.py       |  2 +-
 src/adventofcode2019/solutions/day02.py       |  2 +-
 src/adventofcode2019/solutions/day03.py       |  2 +-
 src/adventofcode2019/solutions/day04.py       |  2 +-
 src/adventofcode2019/solutions/day05.py       |  2 +-
 src/adventofcode2019/solutions/day06.py       |  2 +-
 src/adventofcode2019/solutions/day07.py       |  2 +-
 src/adventofcode2019/solutions/day08.py       |  2 +-
 src/adventofcode2019/solutions/day09.py       |  2 +-
 src/adventofcode2019/solutions/day10.py       |  2 +-
 src/adventofcode2019/solutions/day11.py       |  2 +-
 src/adventofcode2019/solutions/day12.py       |  2 +-
 src/adventofcode2019/solutions/day13.py       |  2 +-
 src/adventofcode2019/solutions/day14.py       |  2 +-
 src/adventofcode2019/solutions/day15.py       |  2 +-
 src/adventofcode2019/solutions/day16.py       |  2 +-
 src/adventofcode2019/solutions/day17.py       |  2 +-
 src/adventofcode2019/utils/abstract.py        | 37 -------------------
 src/adventofcode2020/solutions/day01.py       |  2 +-
 src/adventofcode2020/solutions/day02.py       |  2 +-
 src/adventofcode2020/solutions/day03.py       |  2 +-
 src/adventofcode2020/solutions/day04.py       |  2 +-
 src/adventofcode2020/solutions/day05.py       |  2 +-
 src/adventofcode2020/solutions/day06.py       |  2 +-
 src/adventofcode2020/solutions/day07.py       |  2 +-
 src/adventofcode2020/solutions/day08.py       |  2 +-
 src/adventofcode2020/solutions/day09.py       |  2 +-
 src/adventofcode2020/solutions/day10.py       |  2 +-
 src/adventofcode2020/solutions/day11.py       |  2 +-
 src/adventofcode2020/solutions/day12.py       |  2 +-
 src/adventofcode2020/solutions/day13.py       |  2 +-
 src/adventofcode2020/solutions/day14.py       |  2 +-
 src/adventofcode2020/solutions/day15.py       |  2 +-
 src/adventofcode2020/solutions/day16.py       |  2 +-
 src/adventofcode2020/utils/__init__.py        |  0
 src/adventofcode2020/utils/abstract.py        | 37 -------------------
 src/adventofcode2021/solutions/day01.py       |  2 +-
 src/adventofcode2021/solutions/day02.py       |  2 +-
 src/adventofcode2021/solutions/day03.py       |  2 +-
 src/adventofcode2021/solutions/day04.py       |  2 +-
 src/adventofcode2021/solutions/day05.py       |  2 +-
 src/adventofcode2021/solutions/day06.py       |  2 +-
 src/adventofcode2021/solutions/day07.py       |  2 +-
 src/adventofcode2021/solutions/day08.py       |  2 +-
 src/adventofcode2021/solutions/day09.py       |  2 +-
 src/adventofcode2021/solutions/day10.py       |  2 +-
 src/adventofcode2021/solutions/day11.py       |  2 +-
 src/adventofcode2021/solutions/day12.py       |  2 +-
 src/adventofcode2021/solutions/day13.py       |  2 +-
 src/adventofcode2021/solutions/day14.py       |  2 +-
 src/adventofcode2021/solutions/day15.py       |  2 +-
 src/adventofcode2021/solutions/day16.py       |  2 +-
 src/adventofcode2021/solutions/day17.py       |  2 +-
 src/adventofcode2021/solutions/day18.py       |  2 +-
 src/adventofcode2021/solutions/day19.py       |  2 +-
 src/adventofcode2021/solutions/day20.py       |  2 +-
 src/adventofcode2021/solutions/day21.py       |  2 +-
 src/adventofcode2021/solutions/day22.py       |  2 +-
 src/adventofcode2021/utils/__init__.py        |  0
 src/adventofcode2021/utils/abstract.py        | 37 -------------------
 src/adventofcode2022/solutions/day01.py       |  2 +-
 src/adventofcode2022/solutions/day02.py       |  2 +-
 src/adventofcode2022/solutions/day03.py       |  2 +-
 src/adventofcode2022/solutions/day04.py       |  2 +-
 src/adventofcode2022/solutions/day05.py       |  2 +-
 src/adventofcode2022/solutions/day06.py       |  2 +-
 src/adventofcode2022/solutions/day07.py       |  2 +-
 src/adventofcode2022/solutions/day08.py       |  2 +-
 src/adventofcode2022/solutions/day09.py       |  2 +-
 src/adventofcode2022/solutions/day10.py       |  2 +-
 src/adventofcode2022/solutions/day11.py       |  2 +-
 src/adventofcode2022/solutions/day12.py       |  2 +-
 src/adventofcode2022/solutions/day13.py       |  2 +-
 src/adventofcode2022/solutions/day14.py       |  2 +-
 src/adventofcode2022/solutions/day15.py       |  2 +-
 src/adventofcode2022/utils/__init__.py        |  0
 src/adventofcode2022/utils/abstract.py        | 37 -------------------
 tox.ini                                       |  1 +
 104 files changed, 106 insertions(+), 242 deletions(-)
 rename src/{adventofcode2016/utils => adventofcode}/__init__.py (100%)
 rename src/{adventofcode2019 => adventofcode}/utils/__init__.py (100%)
 rename src/{adventofcode2016 => adventofcode}/utils/abstract.py (65%)
 delete mode 100644 src/adventofcode2019/utils/abstract.py
 delete mode 100644 src/adventofcode2020/utils/__init__.py
 delete mode 100644 src/adventofcode2020/utils/abstract.py
 delete mode 100644 src/adventofcode2021/utils/__init__.py
 delete mode 100644 src/adventofcode2021/utils/abstract.py
 delete mode 100644 src/adventofcode2022/utils/__init__.py
 delete mode 100644 src/adventofcode2022/utils/abstract.py

diff --git a/pyproject.toml b/pyproject.toml
index 0b8d70b9..b30cf4e6 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -6,6 +6,7 @@ authors = ["Roel Adriaans <roel@adriaans.org>"]
 license = "MIT"
 
 packages = [
+    { include = "adventofcode", from="src" },
     { include = "adventofcode2016", from="src" },
     { include = "adventofcode2019", from="src" },
     { include = "adventofcode2020", from="src" },
diff --git a/src/adventofcode2016/utils/__init__.py b/src/adventofcode/__init__.py
similarity index 100%
rename from src/adventofcode2016/utils/__init__.py
rename to src/adventofcode/__init__.py
diff --git a/src/adventofcode2019/utils/__init__.py b/src/adventofcode/utils/__init__.py
similarity index 100%
rename from src/adventofcode2019/utils/__init__.py
rename to src/adventofcode/utils/__init__.py
diff --git a/src/adventofcode2016/utils/abstract.py b/src/adventofcode/utils/abstract.py
similarity index 65%
rename from src/adventofcode2016/utils/abstract.py
rename to src/adventofcode/utils/abstract.py
index 7b3eaeb2..721cf05f 100644
--- a/src/adventofcode2016/utils/abstract.py
+++ b/src/adventofcode/utils/abstract.py
@@ -1,3 +1,4 @@
+import re
 from abc import ABC, abstractmethod
 from pathlib import Path
 
@@ -30,8 +31,17 @@ def __call__(self, input_file: str) -> str | int:
         """
         Give the input_text as parameter, process this and return the result
         """
-        root_dir = Path(__file__).parent.parent
-        with open(root_dir / "solutions" / "data" / input_file) as f:
+        # Find the year from the class. Convert self to string, and extract the year
+        # after <adventofcode1234>
+        year = re.findall("adventofcode([\d]{4})", str(self))
+        if not year:
+            raise ValueError("Path not found")
+        else:
+            year = int(year[0])
+        root_dir = Path(__file__).parent.parent.parent
+        with open(
+            root_dir / f"adventofcode{year}" / "solutions" / "data" / input_file
+        ) as f:
             input_data = f.read()
             res = self.solve(input_data=input_data)
             return res
diff --git a/src/adventofcode2016/solutions/day01.py b/src/adventofcode2016/solutions/day01.py
index 930aa467..834a367e 100644
--- a/src/adventofcode2016/solutions/day01.py
+++ b/src/adventofcode2016/solutions/day01.py
@@ -3,7 +3,7 @@
 import attrs
 from adventofcodeutils.point import XYPoint
 
-from adventofcode2016.utils.abstract import FileReaderSolution
+from adventofcode.utils.abstract import FileReaderSolution
 
 
 @attrs.define(kw_only=True)
diff --git a/src/adventofcode2016/solutions/day02.py b/src/adventofcode2016/solutions/day02.py
index dcef97b4..548b031b 100644
--- a/src/adventofcode2016/solutions/day02.py
+++ b/src/adventofcode2016/solutions/day02.py
@@ -2,7 +2,7 @@
 
 from adventofcodeutils.point import XYPoint
 
-from adventofcode2016.utils.abstract import FileReaderSolution
+from adventofcode.utils.abstract import FileReaderSolution
 
 
 class Day02:
diff --git a/src/adventofcode2016/solutions/day03.py b/src/adventofcode2016/solutions/day03.py
index 53264c82..eefbc3e7 100644
--- a/src/adventofcode2016/solutions/day03.py
+++ b/src/adventofcode2016/solutions/day03.py
@@ -1,7 +1,7 @@
 import itertools
 import re
 
-from adventofcode2016.utils.abstract import FileReaderSolution
+from adventofcode.utils.abstract import FileReaderSolution
 
 
 class Day03:
diff --git a/src/adventofcode2016/solutions/day04.py b/src/adventofcode2016/solutions/day04.py
index 629218a9..69288fa7 100644
--- a/src/adventofcode2016/solutions/day04.py
+++ b/src/adventofcode2016/solutions/day04.py
@@ -5,7 +5,7 @@
 
 import attrs
 
-from adventofcode2016.utils.abstract import FileReaderSolution
+from adventofcode.utils.abstract import FileReaderSolution
 
 
 @attrs.define
diff --git a/src/adventofcode2016/solutions/day05.py b/src/adventofcode2016/solutions/day05.py
index e810bbb8..23ffefa2 100644
--- a/src/adventofcode2016/solutions/day05.py
+++ b/src/adventofcode2016/solutions/day05.py
@@ -5,7 +5,7 @@
 
 import attrs
 
-from adventofcode2016.utils.abstract import FileReaderSolution
+from adventofcode.utils.abstract import FileReaderSolution
 
 
 @attrs.define
diff --git a/src/adventofcode2016/solutions/day06.py b/src/adventofcode2016/solutions/day06.py
index 28a7e41f..45f278f1 100644
--- a/src/adventofcode2016/solutions/day06.py
+++ b/src/adventofcode2016/solutions/day06.py
@@ -2,7 +2,7 @@
 
 from collections import Counter
 
-from adventofcode2016.utils.abstract import FileReaderSolution
+from adventofcode.utils.abstract import FileReaderSolution
 
 
 class Day06:
diff --git a/src/adventofcode2016/solutions/day07.py b/src/adventofcode2016/solutions/day07.py
index 231639c7..dc846816 100644
--- a/src/adventofcode2016/solutions/day07.py
+++ b/src/adventofcode2016/solutions/day07.py
@@ -5,7 +5,7 @@
 
 import attrs
 
-from adventofcode2016.utils.abstract import FileReaderSolution
+from adventofcode.utils.abstract import FileReaderSolution
 
 
 @attrs.define
diff --git a/src/adventofcode2016/solutions/day08.py b/src/adventofcode2016/solutions/day08.py
index de18b91b..f31e83a2 100644
--- a/src/adventofcode2016/solutions/day08.py
+++ b/src/adventofcode2016/solutions/day08.py
@@ -6,7 +6,7 @@
 import numpy as np
 from adventofcodeutils.parsing import extract_digits_from_string
 
-from adventofcode2016.utils.abstract import FileReaderSolution
+from adventofcode.utils.abstract import FileReaderSolution
 
 
 class Operation(Enum):
diff --git a/src/adventofcode2016/solutions/day09.py b/src/adventofcode2016/solutions/day09.py
index 8e1d8747..719bbab4 100644
--- a/src/adventofcode2016/solutions/day09.py
+++ b/src/adventofcode2016/solutions/day09.py
@@ -1,6 +1,6 @@
 from __future__ import annotations
 
-from adventofcode2016.utils.abstract import FileReaderSolution
+from adventofcode.utils.abstract import FileReaderSolution
 
 
 class Day09:
diff --git a/src/adventofcode2016/solutions/day10.py b/src/adventofcode2016/solutions/day10.py
index 2c481303..9292d125 100644
--- a/src/adventofcode2016/solutions/day10.py
+++ b/src/adventofcode2016/solutions/day10.py
@@ -7,7 +7,7 @@
 import attrs
 from adventofcodeutils.parsing import extract_digits_from_string
 
-from adventofcode2016.utils.abstract import FileReaderSolution
+from adventofcode.utils.abstract import FileReaderSolution
 
 
 @attrs.define
diff --git a/src/adventofcode2016/solutions/day11.py b/src/adventofcode2016/solutions/day11.py
index e7aa8bbf..c55d1d25 100644
--- a/src/adventofcode2016/solutions/day11.py
+++ b/src/adventofcode2016/solutions/day11.py
@@ -4,7 +4,7 @@
 
 from adventofcodeutils.generic_search import BFS
 
-from adventofcode2016.utils.abstract import FileReaderSolution
+from adventofcode.utils.abstract import FileReaderSolution
 
 
 class FacilityState:
diff --git a/src/adventofcode2016/solutions/day12.py b/src/adventofcode2016/solutions/day12.py
index cb43c5dc..5a1679ee 100644
--- a/src/adventofcode2016/solutions/day12.py
+++ b/src/adventofcode2016/solutions/day12.py
@@ -3,7 +3,7 @@
 import logging
 from abc import ABC, abstractmethod
 
-from adventofcode2016.utils.abstract import FileReaderSolution
+from adventofcode.utils.abstract import FileReaderSolution
 
 
 class Instruction(ABC):
diff --git a/src/adventofcode2016/solutions/day13.py b/src/adventofcode2016/solutions/day13.py
index d1759d66..541782c7 100644
--- a/src/adventofcode2016/solutions/day13.py
+++ b/src/adventofcode2016/solutions/day13.py
@@ -7,7 +7,7 @@
 import attrs
 from adventofcodeutils.generic_search import Astar
 
-from adventofcode2016.utils.abstract import FileReaderSolution
+from adventofcode.utils.abstract import FileReaderSolution
 
 
 @attrs.define(frozen=True)
diff --git a/src/adventofcode2016/solutions/day14.py b/src/adventofcode2016/solutions/day14.py
index 9142795f..a21b22a6 100644
--- a/src/adventofcode2016/solutions/day14.py
+++ b/src/adventofcode2016/solutions/day14.py
@@ -5,7 +5,7 @@
 import logging
 import re
 
-from adventofcode2016.utils.abstract import FileReaderSolution
+from adventofcode.utils.abstract import FileReaderSolution
 
 # Following regex will match 3 OR more matches
 three_char = re.compile(r"(\w)\1{2,}")
diff --git a/src/adventofcode2016/solutions/day15.py b/src/adventofcode2016/solutions/day15.py
index e38d549d..d78a6f24 100644
--- a/src/adventofcode2016/solutions/day15.py
+++ b/src/adventofcode2016/solutions/day15.py
@@ -3,7 +3,7 @@
 import attrs
 from adventofcodeutils.parsing import extract_digits_from_string
 
-from adventofcode2016.utils.abstract import FileReaderSolution
+from adventofcode.utils.abstract import FileReaderSolution
 
 
 @attrs.define
diff --git a/src/adventofcode2016/solutions/day16.py b/src/adventofcode2016/solutions/day16.py
index a6dbe4e1..b83d284a 100644
--- a/src/adventofcode2016/solutions/day16.py
+++ b/src/adventofcode2016/solutions/day16.py
@@ -2,7 +2,7 @@
 
 from more_itertools import grouper
 
-from adventofcode2016.utils.abstract import FileReaderSolution
+from adventofcode.utils.abstract import FileReaderSolution
 
 
 class Day16:
diff --git a/src/adventofcode2016/solutions/day17.py b/src/adventofcode2016/solutions/day17.py
index cf47a863..b08fba48 100644
--- a/src/adventofcode2016/solutions/day17.py
+++ b/src/adventofcode2016/solutions/day17.py
@@ -8,7 +8,7 @@
 import attrs
 from adventofcodeutils.generic_search import DFS, Astar
 
-from adventofcode2016.utils.abstract import FileReaderSolution
+from adventofcode.utils.abstract import FileReaderSolution
 
 
 @cache
diff --git a/src/adventofcode2016/solutions/day18.py b/src/adventofcode2016/solutions/day18.py
index 9431e471..6c9c4998 100644
--- a/src/adventofcode2016/solutions/day18.py
+++ b/src/adventofcode2016/solutions/day18.py
@@ -2,7 +2,7 @@
 
 import tqdm
 
-from adventofcode2016.utils.abstract import FileReaderSolution
+from adventofcode.utils.abstract import FileReaderSolution
 
 SAFE = "."
 TRAP = "^"
diff --git a/src/adventofcode2016/solutions/day19.py b/src/adventofcode2016/solutions/day19.py
index abc37904..6a0e3cf3 100644
--- a/src/adventofcode2016/solutions/day19.py
+++ b/src/adventofcode2016/solutions/day19.py
@@ -2,7 +2,7 @@
 
 from collections import deque
 
-from adventofcode2016.utils.abstract import FileReaderSolution
+from adventofcode.utils.abstract import FileReaderSolution
 
 
 class Day19:
diff --git a/src/adventofcode2016/solutions/day20.py b/src/adventofcode2016/solutions/day20.py
index a6ea3ee6..4cb43982 100644
--- a/src/adventofcode2016/solutions/day20.py
+++ b/src/adventofcode2016/solutions/day20.py
@@ -4,7 +4,7 @@
 
 from adventofcodeutils.parsing import extract_digits_from_string
 
-from adventofcode2016.utils.abstract import FileReaderSolution
+from adventofcode.utils.abstract import FileReaderSolution
 
 
 class Day20:
diff --git a/src/adventofcode2016/solutions/day21.py b/src/adventofcode2016/solutions/day21.py
index a4ec958d..ec809fe4 100644
--- a/src/adventofcode2016/solutions/day21.py
+++ b/src/adventofcode2016/solutions/day21.py
@@ -4,7 +4,7 @@
 
 import regex_spm
 
-from adventofcode2016.utils.abstract import FileReaderSolution
+from adventofcode.utils.abstract import FileReaderSolution
 
 
 class Day21:
diff --git a/src/adventofcode2016/solutions/day22.py b/src/adventofcode2016/solutions/day22.py
index 19d8b4dd..de9f90b3 100644
--- a/src/adventofcode2016/solutions/day22.py
+++ b/src/adventofcode2016/solutions/day22.py
@@ -3,7 +3,7 @@
 import attrs
 from adventofcodeutils.parsing import extract_digits_from_string
 
-from adventofcode2016.utils.abstract import FileReaderSolution
+from adventofcode.utils.abstract import FileReaderSolution
 
 
 @attrs.define
diff --git a/src/adventofcode2019/solutions/day01.py b/src/adventofcode2019/solutions/day01.py
index 83be5f64..a9f5d670 100644
--- a/src/adventofcode2019/solutions/day01.py
+++ b/src/adventofcode2019/solutions/day01.py
@@ -1,4 +1,4 @@
-from adventofcode2019.utils.abstract import FileReaderSolution
+from adventofcode.utils.abstract import FileReaderSolution
 
 
 class Day01:
diff --git a/src/adventofcode2019/solutions/day02.py b/src/adventofcode2019/solutions/day02.py
index 0ec2f458..f69d6744 100644
--- a/src/adventofcode2019/solutions/day02.py
+++ b/src/adventofcode2019/solutions/day02.py
@@ -1,5 +1,5 @@
 from adventofcode2019.solutions.intcode import IntCode
-from adventofcode2019.utils.abstract import FileReaderSolution
+from adventofcode.utils.abstract import FileReaderSolution
 
 
 class Day02:
diff --git a/src/adventofcode2019/solutions/day03.py b/src/adventofcode2019/solutions/day03.py
index a0846fe4..73526386 100644
--- a/src/adventofcode2019/solutions/day03.py
+++ b/src/adventofcode2019/solutions/day03.py
@@ -1,4 +1,4 @@
-from adventofcode2019.utils.abstract import FileReaderSolution
+from adventofcode.utils.abstract import FileReaderSolution
 
 
 class Point:
diff --git a/src/adventofcode2019/solutions/day04.py b/src/adventofcode2019/solutions/day04.py
index 60ddfb6e..c8cafe6f 100644
--- a/src/adventofcode2019/solutions/day04.py
+++ b/src/adventofcode2019/solutions/day04.py
@@ -1,6 +1,6 @@
 from adventofcodeutils.parsing import string_to_list_of_ints
 
-from adventofcode2019.utils.abstract import FileReaderSolution
+from adventofcode.utils.abstract import FileReaderSolution
 
 
 class Day04:
diff --git a/src/adventofcode2019/solutions/day05.py b/src/adventofcode2019/solutions/day05.py
index 9b8c1d05..f0da4d16 100644
--- a/src/adventofcode2019/solutions/day05.py
+++ b/src/adventofcode2019/solutions/day05.py
@@ -1,7 +1,7 @@
 from adventofcodeutils.parsing import string_to_list_of_ints
 
 from adventofcode2019.solutions.intcode import IntCode
-from adventofcode2019.utils.abstract import FileReaderSolution
+from adventofcode.utils.abstract import FileReaderSolution
 
 
 class Day05:
diff --git a/src/adventofcode2019/solutions/day06.py b/src/adventofcode2019/solutions/day06.py
index 72334d61..55d64d97 100644
--- a/src/adventofcode2019/solutions/day06.py
+++ b/src/adventofcode2019/solutions/day06.py
@@ -1,6 +1,6 @@
 from anytree import Node, Walker  # type: ignore
 
-from adventofcode2019.utils.abstract import FileReaderSolution
+from adventofcode.utils.abstract import FileReaderSolution
 
 
 class Day06:
diff --git a/src/adventofcode2019/solutions/day07.py b/src/adventofcode2019/solutions/day07.py
index bb214e6d..ef0a0e84 100644
--- a/src/adventofcode2019/solutions/day07.py
+++ b/src/adventofcode2019/solutions/day07.py
@@ -3,7 +3,7 @@
 from adventofcodeutils.parsing import string_to_list_of_ints
 
 from adventofcode2019.solutions.intcode import IntCode, ProgramFinished
-from adventofcode2019.utils.abstract import FileReaderSolution
+from adventofcode.utils.abstract import FileReaderSolution
 
 
 class Day07:
diff --git a/src/adventofcode2019/solutions/day08.py b/src/adventofcode2019/solutions/day08.py
index 4f871961..f3a69c01 100644
--- a/src/adventofcode2019/solutions/day08.py
+++ b/src/adventofcode2019/solutions/day08.py
@@ -1,4 +1,4 @@
-from adventofcode2019.utils.abstract import FileReaderSolution
+from adventofcode.utils.abstract import FileReaderSolution
 
 
 class Day08:
diff --git a/src/adventofcode2019/solutions/day09.py b/src/adventofcode2019/solutions/day09.py
index f50140c5..06f2c303 100644
--- a/src/adventofcode2019/solutions/day09.py
+++ b/src/adventofcode2019/solutions/day09.py
@@ -1,7 +1,7 @@
 from adventofcodeutils.parsing import string_to_list_of_ints
 
 from adventofcode2019.solutions.intcode import IntCode
-from adventofcode2019.utils.abstract import FileReaderSolution
+from adventofcode.utils.abstract import FileReaderSolution
 
 
 class Day09:
diff --git a/src/adventofcode2019/solutions/day10.py b/src/adventofcode2019/solutions/day10.py
index 8d2281f0..71bff370 100644
--- a/src/adventofcode2019/solutions/day10.py
+++ b/src/adventofcode2019/solutions/day10.py
@@ -2,7 +2,7 @@
 from collections import defaultdict
 from typing import NamedTuple
 
-from adventofcode2019.utils.abstract import FileReaderSolution
+from adventofcode.utils.abstract import FileReaderSolution
 
 
 class Astroid(NamedTuple):
diff --git a/src/adventofcode2019/solutions/day11.py b/src/adventofcode2019/solutions/day11.py
index e212afc5..e3954cc2 100644
--- a/src/adventofcode2019/solutions/day11.py
+++ b/src/adventofcode2019/solutions/day11.py
@@ -6,7 +6,7 @@
 from adventofcodeutils.parsing import string_to_list_of_ints
 
 from adventofcode2019.solutions.intcode import IntCode, ProgramFinished
-from adventofcode2019.utils.abstract import FileReaderSolution
+from adventofcode.utils.abstract import FileReaderSolution
 
 
 class Location(NamedTuple):
diff --git a/src/adventofcode2019/solutions/day12.py b/src/adventofcode2019/solutions/day12.py
index 91bc1062..0231a6e2 100644
--- a/src/adventofcode2019/solutions/day12.py
+++ b/src/adventofcode2019/solutions/day12.py
@@ -2,7 +2,7 @@
 
 import numpy as np  # type: ignore
 
-from adventofcode2019.utils.abstract import FileReaderSolution
+from adventofcode.utils.abstract import FileReaderSolution
 
 
 class Moon:
diff --git a/src/adventofcode2019/solutions/day13.py b/src/adventofcode2019/solutions/day13.py
index 0ebb660b..a239f95e 100644
--- a/src/adventofcode2019/solutions/day13.py
+++ b/src/adventofcode2019/solutions/day13.py
@@ -4,7 +4,7 @@
 from adventofcodeutils.parsing import string_to_list_of_ints
 
 from adventofcode2019.solutions.intcode import IntCode, ProgramFinished
-from adventofcode2019.utils.abstract import FileReaderSolution
+from adventofcode.utils.abstract import FileReaderSolution
 
 
 class Tile(IntEnum):
diff --git a/src/adventofcode2019/solutions/day14.py b/src/adventofcode2019/solutions/day14.py
index d78bb229..b00132c6 100644
--- a/src/adventofcode2019/solutions/day14.py
+++ b/src/adventofcode2019/solutions/day14.py
@@ -4,7 +4,7 @@
 from dataclasses import dataclass
 from typing import NamedTuple
 
-from adventofcode2019.utils.abstract import FileReaderSolution
+from adventofcode.utils.abstract import FileReaderSolution
 
 
 class Chemical(NamedTuple):
diff --git a/src/adventofcode2019/solutions/day15.py b/src/adventofcode2019/solutions/day15.py
index cdb200b5..bcdb4736 100644
--- a/src/adventofcode2019/solutions/day15.py
+++ b/src/adventofcode2019/solutions/day15.py
@@ -5,7 +5,7 @@
 from adventofcodeutils.parsing import string_to_list_of_ints
 
 from adventofcode2019.solutions.intcode import IntCode
-from adventofcode2019.utils.abstract import FileReaderSolution
+from adventofcode.utils.abstract import FileReaderSolution
 
 
 class Point(NamedTuple):
diff --git a/src/adventofcode2019/solutions/day16.py b/src/adventofcode2019/solutions/day16.py
index ea6b7c19..65dd5636 100644
--- a/src/adventofcode2019/solutions/day16.py
+++ b/src/adventofcode2019/solutions/day16.py
@@ -1,6 +1,6 @@
 from adventofcodeutils.parsing import string_of_single_to_list_of_ints
 
-from adventofcode2019.utils.abstract import FileReaderSolution
+from adventofcode.utils.abstract import FileReaderSolution
 
 
 class Day16:
diff --git a/src/adventofcode2019/solutions/day17.py b/src/adventofcode2019/solutions/day17.py
index 53e4bbdd..bcf12637 100644
--- a/src/adventofcode2019/solutions/day17.py
+++ b/src/adventofcode2019/solutions/day17.py
@@ -3,7 +3,7 @@
 from adventofcodeutils.parsing import string_to_list_of_ints
 
 from adventofcode2019.solutions.intcode import IntCode, ProgramFinished
-from adventofcode2019.utils.abstract import FileReaderSolution
+from adventofcode.utils.abstract import FileReaderSolution
 
 
 class Day17:
diff --git a/src/adventofcode2019/utils/abstract.py b/src/adventofcode2019/utils/abstract.py
deleted file mode 100644
index 7b3eaeb2..00000000
--- a/src/adventofcode2019/utils/abstract.py
+++ /dev/null
@@ -1,37 +0,0 @@
-from abc import ABC, abstractmethod
-from pathlib import Path
-
-
-class AbstractSolution(ABC):
-    @abstractmethod
-    def solve(self, input_data: str) -> str | int:
-        raise NotImplementedError
-
-
-class SimpleSolution(AbstractSolution, ABC):
-    """
-    This solution implements a simple input_text that is used by the solve method.
-    """
-
-    def __call__(self, input_text: str) -> str | int:
-        """
-        Give the input_text as parameter, process this and return the result
-        """
-        res = self.solve(input_text)
-        return res
-
-
-class FileReaderSolution(AbstractSolution, ABC):
-    """
-    Implement filereader
-    """
-
-    def __call__(self, input_file: str) -> str | int:
-        """
-        Give the input_text as parameter, process this and return the result
-        """
-        root_dir = Path(__file__).parent.parent
-        with open(root_dir / "solutions" / "data" / input_file) as f:
-            input_data = f.read()
-            res = self.solve(input_data=input_data)
-            return res
diff --git a/src/adventofcode2020/solutions/day01.py b/src/adventofcode2020/solutions/day01.py
index 6bc51286..5e617af7 100644
--- a/src/adventofcode2020/solutions/day01.py
+++ b/src/adventofcode2020/solutions/day01.py
@@ -2,7 +2,7 @@
 import math
 from itertools import combinations
 
-from adventofcode2020.utils.abstract import FileReaderSolution
+from adventofcode.utils.abstract import FileReaderSolution
 
 logger = logging.getLogger(__name__)
 
diff --git a/src/adventofcode2020/solutions/day02.py b/src/adventofcode2020/solutions/day02.py
index 618a6ddf..531d14dd 100644
--- a/src/adventofcode2020/solutions/day02.py
+++ b/src/adventofcode2020/solutions/day02.py
@@ -1,7 +1,7 @@
 import re
 from typing import NamedTuple
 
-from adventofcode2020.utils.abstract import FileReaderSolution
+from adventofcode.utils.abstract import FileReaderSolution
 
 
 class PassPol(NamedTuple):
diff --git a/src/adventofcode2020/solutions/day03.py b/src/adventofcode2020/solutions/day03.py
index 4add0793..e2050fa8 100644
--- a/src/adventofcode2020/solutions/day03.py
+++ b/src/adventofcode2020/solutions/day03.py
@@ -1,6 +1,6 @@
 import math
 
-from adventofcode2020.utils.abstract import FileReaderSolution
+from adventofcode.utils.abstract import FileReaderSolution
 
 
 class Day03:
diff --git a/src/adventofcode2020/solutions/day04.py b/src/adventofcode2020/solutions/day04.py
index c0365915..2eecc743 100644
--- a/src/adventofcode2020/solutions/day04.py
+++ b/src/adventofcode2020/solutions/day04.py
@@ -1,7 +1,7 @@
 import re
 from enum import Enum
 
-from adventofcode2020.utils.abstract import FileReaderSolution
+from adventofcode.utils.abstract import FileReaderSolution
 
 
 class RequiredFields(Enum):
diff --git a/src/adventofcode2020/solutions/day05.py b/src/adventofcode2020/solutions/day05.py
index a9c189c6..4f674961 100644
--- a/src/adventofcode2020/solutions/day05.py
+++ b/src/adventofcode2020/solutions/day05.py
@@ -3,7 +3,7 @@
 from collections import defaultdict
 from typing import NamedTuple
 
-from adventofcode2020.utils.abstract import FileReaderSolution
+from adventofcode.utils.abstract import FileReaderSolution
 
 
 class BoardingTicket(NamedTuple):
diff --git a/src/adventofcode2020/solutions/day06.py b/src/adventofcode2020/solutions/day06.py
index 77283072..d4f1fec1 100644
--- a/src/adventofcode2020/solutions/day06.py
+++ b/src/adventofcode2020/solutions/day06.py
@@ -1,7 +1,7 @@
 import typing
 from collections import Counter
 
-from adventofcode2020.utils.abstract import FileReaderSolution
+from adventofcode.utils.abstract import FileReaderSolution
 
 
 class Day06:
diff --git a/src/adventofcode2020/solutions/day07.py b/src/adventofcode2020/solutions/day07.py
index c4c79c0b..2e5f46fd 100644
--- a/src/adventofcode2020/solutions/day07.py
+++ b/src/adventofcode2020/solutions/day07.py
@@ -5,7 +5,7 @@
 from dataclasses import dataclass
 from typing import Any
 
-from adventofcode2020.utils.abstract import FileReaderSolution
+from adventofcode.utils.abstract import FileReaderSolution
 
 logger = logging.getLogger(__name__)
 
diff --git a/src/adventofcode2020/solutions/day08.py b/src/adventofcode2020/solutions/day08.py
index 92a83c1f..126bc90f 100644
--- a/src/adventofcode2020/solutions/day08.py
+++ b/src/adventofcode2020/solutions/day08.py
@@ -1,5 +1,5 @@
 from adventofcode2020.solutions.handheld import HandHeld
-from adventofcode2020.utils.abstract import FileReaderSolution
+from adventofcode.utils.abstract import FileReaderSolution
 
 
 class Day08:
diff --git a/src/adventofcode2020/solutions/day09.py b/src/adventofcode2020/solutions/day09.py
index e410b82a..e9b19104 100644
--- a/src/adventofcode2020/solutions/day09.py
+++ b/src/adventofcode2020/solutions/day09.py
@@ -1,6 +1,6 @@
 from itertools import combinations
 
-from adventofcode2020.utils.abstract import FileReaderSolution
+from adventofcode.utils.abstract import FileReaderSolution
 
 
 class Day09:
diff --git a/src/adventofcode2020/solutions/day10.py b/src/adventofcode2020/solutions/day10.py
index a00945aa..a6bc2872 100644
--- a/src/adventofcode2020/solutions/day10.py
+++ b/src/adventofcode2020/solutions/day10.py
@@ -1,7 +1,7 @@
 import typing
 from collections import Counter, deque
 
-from adventofcode2020.utils.abstract import FileReaderSolution
+from adventofcode.utils.abstract import FileReaderSolution
 
 
 class Day10:
diff --git a/src/adventofcode2020/solutions/day11.py b/src/adventofcode2020/solutions/day11.py
index 2ff46b0d..5edb2d97 100644
--- a/src/adventofcode2020/solutions/day11.py
+++ b/src/adventofcode2020/solutions/day11.py
@@ -2,7 +2,7 @@
 from collections import defaultdict, deque
 from typing import Deque
 
-from adventofcode2020.utils.abstract import FileReaderSolution
+from adventofcode.utils.abstract import FileReaderSolution
 
 
 class Day11:
diff --git a/src/adventofcode2020/solutions/day12.py b/src/adventofcode2020/solutions/day12.py
index 9377778d..39f2ed59 100644
--- a/src/adventofcode2020/solutions/day12.py
+++ b/src/adventofcode2020/solutions/day12.py
@@ -5,7 +5,7 @@
 from enum import Enum
 from typing import NamedTuple
 
-from adventofcode2020.utils.abstract import FileReaderSolution
+from adventofcode.utils.abstract import FileReaderSolution
 
 
 class Instruction(NamedTuple):
diff --git a/src/adventofcode2020/solutions/day13.py b/src/adventofcode2020/solutions/day13.py
index 3ae4a41d..f9787bc2 100644
--- a/src/adventofcode2020/solutions/day13.py
+++ b/src/adventofcode2020/solutions/day13.py
@@ -1,4 +1,4 @@
-from adventofcode2020.utils.abstract import FileReaderSolution
+from adventofcode.utils.abstract import FileReaderSolution
 
 
 class Day13:
diff --git a/src/adventofcode2020/solutions/day14.py b/src/adventofcode2020/solutions/day14.py
index 2c0e4b4a..e74909cf 100644
--- a/src/adventofcode2020/solutions/day14.py
+++ b/src/adventofcode2020/solutions/day14.py
@@ -4,7 +4,7 @@
 from collections import defaultdict
 from dataclasses import dataclass
 
-from adventofcode2020.utils.abstract import FileReaderSolution
+from adventofcode.utils.abstract import FileReaderSolution
 
 
 @dataclass
diff --git a/src/adventofcode2020/solutions/day15.py b/src/adventofcode2020/solutions/day15.py
index 0b252723..c0edcff7 100644
--- a/src/adventofcode2020/solutions/day15.py
+++ b/src/adventofcode2020/solutions/day15.py
@@ -1,7 +1,7 @@
 from collections import defaultdict
 from typing import DefaultDict
 
-from adventofcode2020.utils.abstract import FileReaderSolution
+from adventofcode.utils.abstract import FileReaderSolution
 
 
 class Day15:
diff --git a/src/adventofcode2020/solutions/day16.py b/src/adventofcode2020/solutions/day16.py
index 37b5533a..2b9609ee 100644
--- a/src/adventofcode2020/solutions/day16.py
+++ b/src/adventofcode2020/solutions/day16.py
@@ -2,7 +2,7 @@
 import re
 from typing import NamedTuple
 
-from adventofcode2020.utils.abstract import FileReaderSolution
+from adventofcode.utils.abstract import FileReaderSolution
 
 
 class Ticket(NamedTuple):
diff --git a/src/adventofcode2020/utils/__init__.py b/src/adventofcode2020/utils/__init__.py
deleted file mode 100644
index e69de29b..00000000
diff --git a/src/adventofcode2020/utils/abstract.py b/src/adventofcode2020/utils/abstract.py
deleted file mode 100644
index 7b3eaeb2..00000000
--- a/src/adventofcode2020/utils/abstract.py
+++ /dev/null
@@ -1,37 +0,0 @@
-from abc import ABC, abstractmethod
-from pathlib import Path
-
-
-class AbstractSolution(ABC):
-    @abstractmethod
-    def solve(self, input_data: str) -> str | int:
-        raise NotImplementedError
-
-
-class SimpleSolution(AbstractSolution, ABC):
-    """
-    This solution implements a simple input_text that is used by the solve method.
-    """
-
-    def __call__(self, input_text: str) -> str | int:
-        """
-        Give the input_text as parameter, process this and return the result
-        """
-        res = self.solve(input_text)
-        return res
-
-
-class FileReaderSolution(AbstractSolution, ABC):
-    """
-    Implement filereader
-    """
-
-    def __call__(self, input_file: str) -> str | int:
-        """
-        Give the input_text as parameter, process this and return the result
-        """
-        root_dir = Path(__file__).parent.parent
-        with open(root_dir / "solutions" / "data" / input_file) as f:
-            input_data = f.read()
-            res = self.solve(input_data=input_data)
-            return res
diff --git a/src/adventofcode2021/solutions/day01.py b/src/adventofcode2021/solutions/day01.py
index 211a5a7c..c7fb9be6 100644
--- a/src/adventofcode2021/solutions/day01.py
+++ b/src/adventofcode2021/solutions/day01.py
@@ -1,4 +1,4 @@
-from adventofcode2021.utils.abstract import FileReaderSolution
+from adventofcode.utils.abstract import FileReaderSolution
 
 
 class Day01:
diff --git a/src/adventofcode2021/solutions/day02.py b/src/adventofcode2021/solutions/day02.py
index b04bdd59..c24988f3 100644
--- a/src/adventofcode2021/solutions/day02.py
+++ b/src/adventofcode2021/solutions/day02.py
@@ -1,4 +1,4 @@
-from adventofcode2021.utils.abstract import FileReaderSolution
+from adventofcode.utils.abstract import FileReaderSolution
 
 
 class Day02:
diff --git a/src/adventofcode2021/solutions/day03.py b/src/adventofcode2021/solutions/day03.py
index a4a941f3..dc6130a3 100644
--- a/src/adventofcode2021/solutions/day03.py
+++ b/src/adventofcode2021/solutions/day03.py
@@ -1,6 +1,6 @@
 from collections import Counter
 
-from adventofcode2021.utils.abstract import FileReaderSolution
+from adventofcode.utils.abstract import FileReaderSolution
 
 
 class Day03:
diff --git a/src/adventofcode2021/solutions/day04.py b/src/adventofcode2021/solutions/day04.py
index 9b9f56cd..0532f974 100644
--- a/src/adventofcode2021/solutions/day04.py
+++ b/src/adventofcode2021/solutions/day04.py
@@ -1,7 +1,7 @@
 from collections import defaultdict
 from typing import Literal
 
-from adventofcode2021.utils.abstract import FileReaderSolution
+from adventofcode.utils.abstract import FileReaderSolution
 
 
 class Number:
diff --git a/src/adventofcode2021/solutions/day05.py b/src/adventofcode2021/solutions/day05.py
index 94f61e36..2283da15 100644
--- a/src/adventofcode2021/solutions/day05.py
+++ b/src/adventofcode2021/solutions/day05.py
@@ -4,7 +4,7 @@
 from collections import Counter
 from dataclasses import dataclass
 
-from adventofcode2021.utils.abstract import FileReaderSolution
+from adventofcode.utils.abstract import FileReaderSolution
 
 logger = logging.getLogger(__name__)
 
diff --git a/src/adventofcode2021/solutions/day06.py b/src/adventofcode2021/solutions/day06.py
index a48cad2d..9335a8a8 100644
--- a/src/adventofcode2021/solutions/day06.py
+++ b/src/adventofcode2021/solutions/day06.py
@@ -1,6 +1,6 @@
 from collections import Counter
 
-from adventofcode2021.utils.abstract import FileReaderSolution
+from adventofcode.utils.abstract import FileReaderSolution
 
 
 class Day06:
diff --git a/src/adventofcode2021/solutions/day07.py b/src/adventofcode2021/solutions/day07.py
index e70df9b0..0d472eca 100644
--- a/src/adventofcode2021/solutions/day07.py
+++ b/src/adventofcode2021/solutions/day07.py
@@ -1,6 +1,6 @@
 import logging
 
-from adventofcode2021.utils.abstract import FileReaderSolution
+from adventofcode.utils.abstract import FileReaderSolution
 
 logger = logging.getLogger(__name__)
 
diff --git a/src/adventofcode2021/solutions/day08.py b/src/adventofcode2021/solutions/day08.py
index c7bef245..457e9968 100644
--- a/src/adventofcode2021/solutions/day08.py
+++ b/src/adventofcode2021/solutions/day08.py
@@ -1,4 +1,4 @@
-from adventofcode2021.utils.abstract import FileReaderSolution
+from adventofcode.utils.abstract import FileReaderSolution
 
 
 class Day08:
diff --git a/src/adventofcode2021/solutions/day09.py b/src/adventofcode2021/solutions/day09.py
index 0355dd5e..98081567 100644
--- a/src/adventofcode2021/solutions/day09.py
+++ b/src/adventofcode2021/solutions/day09.py
@@ -1,6 +1,6 @@
 from __future__ import annotations
 
-from adventofcode2021.utils.abstract import FileReaderSolution
+from adventofcode.utils.abstract import FileReaderSolution
 
 
 class Day09:
diff --git a/src/adventofcode2021/solutions/day10.py b/src/adventofcode2021/solutions/day10.py
index 0e7b6eb8..51702366 100644
--- a/src/adventofcode2021/solutions/day10.py
+++ b/src/adventofcode2021/solutions/day10.py
@@ -1,6 +1,6 @@
 from adventofcodeutils.stack import Stack
 
-from adventofcode2021.utils.abstract import FileReaderSolution
+from adventofcode.utils.abstract import FileReaderSolution
 
 
 class Day10:
diff --git a/src/adventofcode2021/solutions/day11.py b/src/adventofcode2021/solutions/day11.py
index a3249281..d73b23c6 100644
--- a/src/adventofcode2021/solutions/day11.py
+++ b/src/adventofcode2021/solutions/day11.py
@@ -2,7 +2,7 @@
 
 from collections.abc import Iterator
 
-from adventofcode2021.utils.abstract import FileReaderSolution
+from adventofcode.utils.abstract import FileReaderSolution
 
 
 class Octopus:
diff --git a/src/adventofcode2021/solutions/day12.py b/src/adventofcode2021/solutions/day12.py
index 8f073eec..f5bebfdd 100644
--- a/src/adventofcode2021/solutions/day12.py
+++ b/src/adventofcode2021/solutions/day12.py
@@ -4,7 +4,7 @@
 from adventofcodeutils.node import Node
 from adventofcodeutils.stack import Stack
 
-from adventofcode2021.utils.abstract import FileReaderSolution
+from adventofcode.utils.abstract import FileReaderSolution
 
 
 class Day12:
diff --git a/src/adventofcode2021/solutions/day13.py b/src/adventofcode2021/solutions/day13.py
index 923ca703..b2f1d954 100644
--- a/src/adventofcode2021/solutions/day13.py
+++ b/src/adventofcode2021/solutions/day13.py
@@ -3,7 +3,7 @@
 
 from adventofcodeutils.queue import Queue
 
-from adventofcode2021.utils.abstract import FileReaderSolution
+from adventofcode.utils.abstract import FileReaderSolution
 
 
 class Day13:
diff --git a/src/adventofcode2021/solutions/day14.py b/src/adventofcode2021/solutions/day14.py
index 7e6a5aab..82bcedec 100644
--- a/src/adventofcode2021/solutions/day14.py
+++ b/src/adventofcode2021/solutions/day14.py
@@ -4,7 +4,7 @@
 from collections import Counter
 from typing import Generic, TypeVar
 
-from adventofcode2021.utils.abstract import FileReaderSolution
+from adventofcode.utils.abstract import FileReaderSolution
 
 T = TypeVar("T")
 
diff --git a/src/adventofcode2021/solutions/day15.py b/src/adventofcode2021/solutions/day15.py
index f5b40c3e..b41e447c 100644
--- a/src/adventofcode2021/solutions/day15.py
+++ b/src/adventofcode2021/solutions/day15.py
@@ -7,7 +7,7 @@
 from adventofcodeutils.node import Node
 from adventofcodeutils.priority_queue import PriorityQueue
 
-from adventofcode2021.utils.abstract import FileReaderSolution
+from adventofcode.utils.abstract import FileReaderSolution
 
 Point = tuple[int, int]
 
diff --git a/src/adventofcode2021/solutions/day16.py b/src/adventofcode2021/solutions/day16.py
index 86a0d0fa..2d26ce67 100644
--- a/src/adventofcode2021/solutions/day16.py
+++ b/src/adventofcode2021/solutions/day16.py
@@ -4,7 +4,7 @@
 from collections import deque
 from enum import IntEnum
 
-from adventofcode2021.utils.abstract import FileReaderSolution
+from adventofcode.utils.abstract import FileReaderSolution
 
 
 class TypeID(IntEnum):
diff --git a/src/adventofcode2021/solutions/day17.py b/src/adventofcode2021/solutions/day17.py
index fdb03814..4735387d 100644
--- a/src/adventofcode2021/solutions/day17.py
+++ b/src/adventofcode2021/solutions/day17.py
@@ -2,7 +2,7 @@
 from dataclasses import dataclass
 from typing import NamedTuple
 
-from adventofcode2021.utils.abstract import FileReaderSolution
+from adventofcode.utils.abstract import FileReaderSolution
 
 
 class Point(NamedTuple):
diff --git a/src/adventofcode2021/solutions/day18.py b/src/adventofcode2021/solutions/day18.py
index 3d50782b..93b8b7ea 100644
--- a/src/adventofcode2021/solutions/day18.py
+++ b/src/adventofcode2021/solutions/day18.py
@@ -6,7 +6,7 @@
 
 from adventofcodeutils.priority_queue import PriorityQueue
 
-from adventofcode2021.utils.abstract import FileReaderSolution
+from adventofcode.utils.abstract import FileReaderSolution
 
 
 class Snail:
diff --git a/src/adventofcode2021/solutions/day19.py b/src/adventofcode2021/solutions/day19.py
index dedcd019..cb6c07fa 100644
--- a/src/adventofcode2021/solutions/day19.py
+++ b/src/adventofcode2021/solutions/day19.py
@@ -4,7 +4,7 @@
 
 from adventofcodeutils.point import XYZPoint as Point
 
-from adventofcode2021.utils.abstract import FileReaderSolution
+from adventofcode.utils.abstract import FileReaderSolution
 
 
 class Scanner(NamedTuple):
diff --git a/src/adventofcode2021/solutions/day20.py b/src/adventofcode2021/solutions/day20.py
index d60aaa1a..352e59d2 100644
--- a/src/adventofcode2021/solutions/day20.py
+++ b/src/adventofcode2021/solutions/day20.py
@@ -2,7 +2,7 @@
 
 from adventofcodeutils.point import XYPoint as Point
 
-from adventofcode2021.utils.abstract import FileReaderSolution
+from adventofcode.utils.abstract import FileReaderSolution
 
 
 class Day20:
diff --git a/src/adventofcode2021/solutions/day21.py b/src/adventofcode2021/solutions/day21.py
index 240c2434..d39868dd 100644
--- a/src/adventofcode2021/solutions/day21.py
+++ b/src/adventofcode2021/solutions/day21.py
@@ -3,7 +3,7 @@
 from collections.abc import Iterator
 from functools import cache
 
-from adventofcode2021.utils.abstract import FileReaderSolution
+from adventofcode.utils.abstract import FileReaderSolution
 
 
 class Day21:
diff --git a/src/adventofcode2021/solutions/day22.py b/src/adventofcode2021/solutions/day22.py
index 2044653a..9aa702fe 100644
--- a/src/adventofcode2021/solutions/day22.py
+++ b/src/adventofcode2021/solutions/day22.py
@@ -7,7 +7,7 @@
 
 from adventofcodeutils.point import XYZPoint as Point
 
-from adventofcode2021.utils.abstract import FileReaderSolution
+from adventofcode.utils.abstract import FileReaderSolution
 
 
 class Step(NamedTuple):
diff --git a/src/adventofcode2021/utils/__init__.py b/src/adventofcode2021/utils/__init__.py
deleted file mode 100644
index e69de29b..00000000
diff --git a/src/adventofcode2021/utils/abstract.py b/src/adventofcode2021/utils/abstract.py
deleted file mode 100644
index 7b3eaeb2..00000000
--- a/src/adventofcode2021/utils/abstract.py
+++ /dev/null
@@ -1,37 +0,0 @@
-from abc import ABC, abstractmethod
-from pathlib import Path
-
-
-class AbstractSolution(ABC):
-    @abstractmethod
-    def solve(self, input_data: str) -> str | int:
-        raise NotImplementedError
-
-
-class SimpleSolution(AbstractSolution, ABC):
-    """
-    This solution implements a simple input_text that is used by the solve method.
-    """
-
-    def __call__(self, input_text: str) -> str | int:
-        """
-        Give the input_text as parameter, process this and return the result
-        """
-        res = self.solve(input_text)
-        return res
-
-
-class FileReaderSolution(AbstractSolution, ABC):
-    """
-    Implement filereader
-    """
-
-    def __call__(self, input_file: str) -> str | int:
-        """
-        Give the input_text as parameter, process this and return the result
-        """
-        root_dir = Path(__file__).parent.parent
-        with open(root_dir / "solutions" / "data" / input_file) as f:
-            input_data = f.read()
-            res = self.solve(input_data=input_data)
-            return res
diff --git a/src/adventofcode2022/solutions/day01.py b/src/adventofcode2022/solutions/day01.py
index a006f5d1..dd00599e 100644
--- a/src/adventofcode2022/solutions/day01.py
+++ b/src/adventofcode2022/solutions/day01.py
@@ -1,4 +1,4 @@
-from adventofcode2022.utils.abstract import FileReaderSolution
+from adventofcode.utils.abstract import FileReaderSolution
 
 
 class Day01:
diff --git a/src/adventofcode2022/solutions/day02.py b/src/adventofcode2022/solutions/day02.py
index 3cd67b59..1f0ddc4d 100644
--- a/src/adventofcode2022/solutions/day02.py
+++ b/src/adventofcode2022/solutions/day02.py
@@ -1,6 +1,6 @@
 from __future__ import annotations
 
-from adventofcode2022.utils.abstract import FileReaderSolution
+from adventofcode.utils.abstract import FileReaderSolution
 
 
 class RPC:
diff --git a/src/adventofcode2022/solutions/day03.py b/src/adventofcode2022/solutions/day03.py
index f0434f1f..1e0670c5 100644
--- a/src/adventofcode2022/solutions/day03.py
+++ b/src/adventofcode2022/solutions/day03.py
@@ -1,4 +1,4 @@
-from adventofcode2022.utils.abstract import FileReaderSolution
+from adventofcode.utils.abstract import FileReaderSolution
 
 
 class Day03:
diff --git a/src/adventofcode2022/solutions/day04.py b/src/adventofcode2022/solutions/day04.py
index 41635e3d..ea5f19f1 100644
--- a/src/adventofcode2022/solutions/day04.py
+++ b/src/adventofcode2022/solutions/day04.py
@@ -1,6 +1,6 @@
 from parse import parse
 
-from adventofcode2022.utils.abstract import FileReaderSolution
+from adventofcode.utils.abstract import FileReaderSolution
 
 
 class Day04(FileReaderSolution):
diff --git a/src/adventofcode2022/solutions/day05.py b/src/adventofcode2022/solutions/day05.py
index 3e730670..4836e6f8 100644
--- a/src/adventofcode2022/solutions/day05.py
+++ b/src/adventofcode2022/solutions/day05.py
@@ -4,7 +4,7 @@
 from adventofcodeutils.stack import Stack
 from parse import parse
 
-from adventofcode2022.utils.abstract import FileReaderSolution
+from adventofcode.utils.abstract import FileReaderSolution
 
 
 class Instruction(NamedTuple):
diff --git a/src/adventofcode2022/solutions/day06.py b/src/adventofcode2022/solutions/day06.py
index a83e2c08..399cd3c0 100644
--- a/src/adventofcode2022/solutions/day06.py
+++ b/src/adventofcode2022/solutions/day06.py
@@ -1,6 +1,6 @@
 from more_itertools import sliding_window
 
-from adventofcode2022.utils.abstract import FileReaderSolution
+from adventofcode.utils.abstract import FileReaderSolution
 
 
 class Day06:
diff --git a/src/adventofcode2022/solutions/day07.py b/src/adventofcode2022/solutions/day07.py
index f9540c41..eddf248e 100644
--- a/src/adventofcode2022/solutions/day07.py
+++ b/src/adventofcode2022/solutions/day07.py
@@ -4,7 +4,7 @@
 from collections import Counter
 from enum import Enum
 
-from adventofcode2022.utils.abstract import FileReaderSolution
+from adventofcode.utils.abstract import FileReaderSolution
 
 logger = logging.getLogger(__name__)
 
diff --git a/src/adventofcode2022/solutions/day08.py b/src/adventofcode2022/solutions/day08.py
index c5dda677..884be7c4 100644
--- a/src/adventofcode2022/solutions/day08.py
+++ b/src/adventofcode2022/solutions/day08.py
@@ -2,7 +2,7 @@
 
 from adventofcodeutils.point import XYPoint as Point
 
-from adventofcode2022.utils.abstract import FileReaderSolution
+from adventofcode.utils.abstract import FileReaderSolution
 
 
 class Day08:
diff --git a/src/adventofcode2022/solutions/day09.py b/src/adventofcode2022/solutions/day09.py
index 227ece10..1f5b7f5b 100644
--- a/src/adventofcode2022/solutions/day09.py
+++ b/src/adventofcode2022/solutions/day09.py
@@ -1,7 +1,7 @@
 import more_itertools
 from adventofcodeutils.point import XYPoint as Point
 
-from adventofcode2022.utils.abstract import FileReaderSolution
+from adventofcode.utils.abstract import FileReaderSolution
 
 
 class Day09:
diff --git a/src/adventofcode2022/solutions/day10.py b/src/adventofcode2022/solutions/day10.py
index 67d24ea9..209dc7fc 100644
--- a/src/adventofcode2022/solutions/day10.py
+++ b/src/adventofcode2022/solutions/day10.py
@@ -1,6 +1,6 @@
 from typing import NamedTuple
 
-from adventofcode2022.utils.abstract import FileReaderSolution
+from adventofcode.utils.abstract import FileReaderSolution
 
 
 class Instruction(NamedTuple):
diff --git a/src/adventofcode2022/solutions/day11.py b/src/adventofcode2022/solutions/day11.py
index d24db42c..36b644f9 100644
--- a/src/adventofcode2022/solutions/day11.py
+++ b/src/adventofcode2022/solutions/day11.py
@@ -6,7 +6,7 @@
 import parse
 from adventofcodeutils.queue import Queue
 
-from adventofcode2022.utils.abstract import FileReaderSolution
+from adventofcode.utils.abstract import FileReaderSolution
 
 
 class Throw(NamedTuple):
diff --git a/src/adventofcode2022/solutions/day12.py b/src/adventofcode2022/solutions/day12.py
index 6c1006a0..a550bbbb 100644
--- a/src/adventofcode2022/solutions/day12.py
+++ b/src/adventofcode2022/solutions/day12.py
@@ -2,7 +2,7 @@
 from adventofcodeutils.node import Node
 from adventofcodeutils.point import XYPoint as Point
 
-from adventofcode2022.utils.abstract import FileReaderSolution
+from adventofcode.utils.abstract import FileReaderSolution
 
 
 class Day12:
diff --git a/src/adventofcode2022/solutions/day13.py b/src/adventofcode2022/solutions/day13.py
index 720b49b5..98d7e223 100644
--- a/src/adventofcode2022/solutions/day13.py
+++ b/src/adventofcode2022/solutions/day13.py
@@ -3,7 +3,7 @@
 from ast import literal_eval
 from functools import cmp_to_key
 
-from adventofcode2022.utils.abstract import FileReaderSolution
+from adventofcode.utils.abstract import FileReaderSolution
 
 Packet = list[int | list]
 
diff --git a/src/adventofcode2022/solutions/day14.py b/src/adventofcode2022/solutions/day14.py
index 2687041f..b06245df 100644
--- a/src/adventofcode2022/solutions/day14.py
+++ b/src/adventofcode2022/solutions/day14.py
@@ -3,7 +3,7 @@
 
 from adventofcodeutils.point import XYPoint as Point
 
-from adventofcode2022.utils.abstract import FileReaderSolution
+from adventofcode.utils.abstract import FileReaderSolution
 
 
 class Pixel(StrEnum):
diff --git a/src/adventofcode2022/solutions/day15.py b/src/adventofcode2022/solutions/day15.py
index 88c4e019..46521d42 100644
--- a/src/adventofcode2022/solutions/day15.py
+++ b/src/adventofcode2022/solutions/day15.py
@@ -3,7 +3,7 @@
 from adventofcodeutils.point import XYPoint as Point
 from parse import parse
 
-from adventofcode2022.utils.abstract import FileReaderSolution
+from adventofcode.utils.abstract import FileReaderSolution
 
 
 class Line(NamedTuple):
diff --git a/src/adventofcode2022/utils/__init__.py b/src/adventofcode2022/utils/__init__.py
deleted file mode 100644
index e69de29b..00000000
diff --git a/src/adventofcode2022/utils/abstract.py b/src/adventofcode2022/utils/abstract.py
deleted file mode 100644
index 7b3eaeb2..00000000
--- a/src/adventofcode2022/utils/abstract.py
+++ /dev/null
@@ -1,37 +0,0 @@
-from abc import ABC, abstractmethod
-from pathlib import Path
-
-
-class AbstractSolution(ABC):
-    @abstractmethod
-    def solve(self, input_data: str) -> str | int:
-        raise NotImplementedError
-
-
-class SimpleSolution(AbstractSolution, ABC):
-    """
-    This solution implements a simple input_text that is used by the solve method.
-    """
-
-    def __call__(self, input_text: str) -> str | int:
-        """
-        Give the input_text as parameter, process this and return the result
-        """
-        res = self.solve(input_text)
-        return res
-
-
-class FileReaderSolution(AbstractSolution, ABC):
-    """
-    Implement filereader
-    """
-
-    def __call__(self, input_file: str) -> str | int:
-        """
-        Give the input_text as parameter, process this and return the result
-        """
-        root_dir = Path(__file__).parent.parent
-        with open(root_dir / "solutions" / "data" / input_file) as f:
-            input_data = f.read()
-            res = self.solve(input_data=input_data)
-            return res
diff --git a/tox.ini b/tox.ini
index 8ecc8771..a113ba78 100644
--- a/tox.ini
+++ b/tox.ini
@@ -42,6 +42,7 @@ omit =
     */__init__.py
 
 source =
+    adventofcode
     adventofcode2016
     adventofcode2019
     adventofcode2020

From ea7e92672e345c2958c6c501be30ad7f2831592b Mon Sep 17 00:00:00 2001
From: Roel Adriaans <roel@adriaans.org>
Date: Sun, 26 Nov 2023 13:58:03 +0100
Subject: [PATCH 313/371] Simplify regex and make it a raw string

---
 src/adventofcode/utils/abstract.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/adventofcode/utils/abstract.py b/src/adventofcode/utils/abstract.py
index 721cf05f..77a609c0 100644
--- a/src/adventofcode/utils/abstract.py
+++ b/src/adventofcode/utils/abstract.py
@@ -33,7 +33,7 @@ def __call__(self, input_file: str) -> str | int:
         """
         # Find the year from the class. Convert self to string, and extract the year
         # after <adventofcode1234>
-        year = re.findall("adventofcode([\d]{4})", str(self))
+        year = re.findall(r"adventofcode(\d{4})", str(self))
         if not year:
             raise ValueError("Path not found")
         else:

From 8c530d58130b5de656c1ef22b6ef3c114c34de6a Mon Sep 17 00:00:00 2001
From: Roel Adriaans <roel@adriaans.org>
Date: Sun, 26 Nov 2023 14:02:08 +0100
Subject: [PATCH 314/371] Name pipeline to be visible

Name the pipeline build step to be visible in branch protection view
---
 .github/workflows/tox.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/workflows/tox.yml b/.github/workflows/tox.yml
index 0e4f485f..62f0c552 100644
--- a/.github/workflows/tox.yml
+++ b/.github/workflows/tox.yml
@@ -4,6 +4,7 @@ on: [pull_request]
 
 jobs:
   build:
+    name: Python Tests
     runs-on: ubuntu-22.04
     strategy:
       max-parallel: 4

From ecde5f749442213949223504e272fa74a747270b Mon Sep 17 00:00:00 2001
From: Roel Adriaans <roel.adriaans@asml.com>
Date: Mon, 27 Nov 2023 11:07:13 +0100
Subject: [PATCH 315/371] Fix day 20

---
 src/adventofcode/utils/abstract.py      | 2 +-
 src/adventofcode2021/solutions/day20.py | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/adventofcode/utils/abstract.py b/src/adventofcode/utils/abstract.py
index 77a609c0..4c91b28f 100644
--- a/src/adventofcode/utils/abstract.py
+++ b/src/adventofcode/utils/abstract.py
@@ -33,7 +33,7 @@ def __call__(self, input_file: str) -> str | int:
         """
         # Find the year from the class. Convert self to string, and extract the year
         # after <adventofcode1234>
-        year = re.findall(r"adventofcode(\d{4})", str(self))
+        year = re.findall(r"adventofcode(\d{4})", repr(self))
         if not year:
             raise ValueError("Path not found")
         else:
diff --git a/src/adventofcode2021/solutions/day20.py b/src/adventofcode2021/solutions/day20.py
index 352e59d2..13c7f59d 100644
--- a/src/adventofcode2021/solutions/day20.py
+++ b/src/adventofcode2021/solutions/day20.py
@@ -62,7 +62,7 @@ def min_max_values(image: defaultdict[Point, bool]) -> tuple[int, int, int, int]
         min_y = min(pnt.y for pnt in true_values)
         return max_x, min_x, max_y, min_y
 
-    def __repr__(self):  # pragma: nocover
+    def __str__(self):  # pragma: nocover
         return self.print_image(self.image)
 
     def print_image(self, image):  # pragma: nocover

From 985c92806a0d46ad6ffddd4a67e8624b29675f8f Mon Sep 17 00:00:00 2001
From: Roel Adriaans <roel.adriaans@asml.com>
Date: Tue, 28 Nov 2023 09:11:39 +0100
Subject: [PATCH 316/371] Move to generic advent of code util

---
 README.md                                     |  14 +-
 pyproject.toml                                |   6 +-
 .../main.py                                   |  49 +--
 src/adventofcode2019/main.py                  | 108 -------
 src/adventofcode2020/main.py                  | 283 -----------------
 src/adventofcode2021/main.py                  | 283 -----------------
 src/adventofcode2022/main.py                  | 285 ------------------
 7 files changed, 38 insertions(+), 990 deletions(-)
 rename src/{adventofcode2016 => adventofcode}/main.py (81%)
 delete mode 100644 src/adventofcode2019/main.py
 delete mode 100644 src/adventofcode2020/main.py
 delete mode 100644 src/adventofcode2021/main.py
 delete mode 100644 src/adventofcode2022/main.py

diff --git a/README.md b/README.md
index 5b2dc9ad..0db80946 100644
--- a/README.md
+++ b/README.md
@@ -5,20 +5,22 @@ Code is in src/adventofcode<years>, tests are in tests/
 
 ## Todo
 
-- Create a global adventofcode tool
-- Add --year to adventofcode function
+✅ Create a global adventofcode tool
+✅ Add --year to adventofcode function
+✅ Use adventofcodeutils package instead of utils per year
+- Update coockiecutter templates
 - Update documentation, currently copied from the latest version (2016)
-- Use adventofcodeutils package instead of utils per year
 - Complete all puzzles (Doh)
 
 ## Create a new day
 
 You can use the adventofcode script to create the scaffolding and download the
-input file for that day.
+input file for that day. If no year is given, the current year is set as a default.
+A default year can also be stored in `.env`.
 
 An example:
 
-    adventofcode --create 20
+    adventofcode --year 2023 --create 20
 
 ### Env variables
 
@@ -27,6 +29,8 @@ Create a file `.env` with the content:
 ```ini
 # Store the session key here
 AOC_SESSION = ""
+# Select the year. If None, the current year is used.
+AOC_YEAR = None
 ```
 
 The variable `AOC_SESSION` is the cookie from <https://adventofcode.com/>. This is available
diff --git a/pyproject.toml b/pyproject.toml
index b30cf4e6..2b76075c 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -41,11 +41,7 @@ pre-commit = "^3.5.0"
 isort = "^5.12.0"
 
 [tool.poetry.scripts]
-adventofcode2016 = "adventofcode2016.main:main"
-adventofcode2019 = "adventofcode2019.main:main"
-adventofcode2020 = "adventofcode2020.main:main"
-adventofcode2021 = "adventofcode2021.main:main"
-adventofcode2022 = "adventofcode2022.main:main"
+adventofcode = "adventofcode.main:main"
 
 [build-system]
 requires = ["poetry-core>=1.0.0"]
diff --git a/src/adventofcode2016/main.py b/src/adventofcode/main.py
similarity index 81%
rename from src/adventofcode2016/main.py
rename to src/adventofcode/main.py
index d36ad907..b031513a 100644
--- a/src/adventofcode2016/main.py
+++ b/src/adventofcode/main.py
@@ -3,6 +3,7 @@
 import os
 import sys
 import timeit
+from datetime import datetime
 from pathlib import Path
 
 import click
@@ -14,12 +15,21 @@
 
 logger = logging.getLogger(__name__)
 
+# Load env values from .env file, or from environment variables if set
+load_dotenv()
+
 
 @click.command()
 @click.argument(
     "day",
     type=click.IntRange(1, 25),
 )
+@click.option(
+    "--year",
+    default=lambda: os.environ.get("AOC_YEAR", datetime.now().year),
+    type=click.IntRange(2016, 2025),
+    help="The year to run. Defaults to current year. Can be overriden in .env by using value AOC_YEAR",
+)
 @click.option(
     "--create",
     is_flag=True,
@@ -50,7 +60,7 @@
     help="Test the solution using timeit with timeit iterations",
 )
 @click.option("-v", "--verbose", is_flag=True)
-def main(day, create, force, submit, download, part, timeit_, verbose):
+def main(day, year, create, force, submit, download, part, timeit_, verbose):
     """
     Simple program that runs a module from the advent of code.
     DAY is an integer representing the day (1 - 25) that runs that day.
@@ -76,31 +86,28 @@ def main(day, create, force, submit, download, part, timeit_, verbose):
         datefmt="%H:%M:%S",
     )
 
-    # Load env values from .env file, or from environment variables if set
-    load_dotenv()
-
     day = f"{int(day):02}"
 
     print(
-        f"Welcome to Advent of Code 2016 - {day=} - {part=} - {timeit_=} - "
+        f"Welcome to Advent of Code - {year=} - {day=} - {part=} - {timeit_=} - "
         f"{verbose=} - {create=}"
     )
 
     if create:
         # Create a new solution
         ensure_correct_directory()
-        create_solution(force=force, day=day)
-        download_input_data(year="2016", day=day)
+        create_solution(force=force, year=year, day=day)
+        download_input_data(year=year, day=day)
     else:
         # Run a specific day
         if download:
-            download_input_data(year="2016", day=day)
-        run_solution(day=day, timeit_=timeit_, part=part, submit=submit)
+            download_input_data(year=year, day=day)
+        run_solution(year=year, day=day, timeit_=timeit_, part=part, submit=submit)
 
 
 def ensure_correct_directory():
     """Make sure that we are in the correct directory: Main sources root"""
-    main_file = Path("src/adventofcode2016/main.py")
+    main_file = Path("src/adventofcode/main.py")
     if main_file.exists():
         return True
     else:
@@ -109,11 +116,11 @@ def ensure_correct_directory():
         sys.exit(-65)
 
 
-def create_solution(force, day):
-    print(f"Creating solution for {day} --")
+def create_solution(force, year, day):
+    print(f"Creating solution for {year}-{day} --")
 
     # Check before we overwrite
-    import_path = f"adventofcode2016.solutions.day{day}"
+    import_path = f"adventofcode{year}.solutions.day{day}"
     logger.debug(f"Importing {import_path}")
     try:
         importlib.import_module(import_path)
@@ -152,7 +159,7 @@ def download_input_data(year: str, day: str):
     if r.status_code != 200:
         print(f"Unable to download the input data. Response code {r.status_code}")
         if r.status_code == 500:
-            print("An internal server error accured. Is your session valid?")
+            print("An internal server error occurred. Is your session valid?")
         elif r.status_code == 404:
             print(
                 "Solution not found: You are too early, or this day does not"
@@ -174,9 +181,9 @@ def download_input_data(year: str, day: str):
     logger.info(f"Input data writen to {filename}")
 
 
-def run_solution(day, timeit_, part, submit):
+def run_solution(year, day, timeit_, part, submit):
     # Try to import the solution
-    import_path = f"adventofcode2016.solutions.day{day}"
+    import_path = f"adventofcode{year}.solutions.day{day}"
     data_path = f"day_{day}/day{day}.txt"
 
     logger.debug(f"Importing {import_path}")
@@ -193,7 +200,7 @@ def run_solution(day, timeit_, part, submit):
         for _ in tqdm.trange(timeit_):
             time_prior = timeit.default_timer()
 
-            results = run_day(data_path, day, day_module, part, submit=False)
+            results = run_day(data_path, year, day, day_module, part, submit=False)
 
             time_after = timeit.default_timer()
             execution_times.append(time_after - time_prior)
@@ -207,20 +214,20 @@ def run_solution(day, timeit_, part, submit):
         )
     else:
         print("Results:")
-        print(run_day(data_path, day, day_module, part, submit))
+        print(run_day(data_path, year, day, day_module, part, submit))
 
 
-def run_day(data_path, day, day_module, part, submit):
+def run_day(data_path, year, day, day_module, part, submit):
     if part == "parta":
         result = run_parta(data_path, day, day_module)
         if submit:
-            submit_result(year=2016, day=day, part=part, result=result)
+            submit_result(year=year, day=day, part=part, result=result)
         return result
 
     elif part == "partb":
         result = run_partb(data_path, day, day_module)
         if submit:
-            submit_result(year=2016, day=day, part=part, result=result)
+            submit_result(year=year, day=day, part=part, result=result)
         return result
 
     else:
diff --git a/src/adventofcode2019/main.py b/src/adventofcode2019/main.py
deleted file mode 100644
index e354f5db..00000000
--- a/src/adventofcode2019/main.py
+++ /dev/null
@@ -1,108 +0,0 @@
-import importlib
-import logging
-import sys
-import timeit
-
-import click
-import tqdm
-
-logger = logging.getLogger(__name__)
-
-
-@click.command()
-@click.argument(
-    "day",
-    type=click.IntRange(1, 25),
-)
-@click.option("--parta", "part", flag_value="parta")
-@click.option("--partb", "part", flag_value="partb")
-@click.option(
-    "-t",
-    "--timeit",
-    "timeit_",
-    type=click.INT,
-    help="Test the solution using timeit with timeit iterations",
-)
-@click.option("-v", "--verbose", is_flag=True)
-def main(day, part, timeit_, verbose):
-    """
-    Simple program that runs a module from the advent of code.
-    DAY is an integer representing the day (1 - 25) that runs that day.
-    """
-    if verbose:
-        level = logging.DEBUG
-    else:
-        level = logging.WARNING
-    logging.basicConfig(
-        level=level,
-        format="%(asctime)s - %(name)s - %(levelname)s - %(message)s",
-        datefmt="%H:%M:%S",
-    )
-
-    day = f"{int(day):02}"
-
-    print(
-        f"Welcome to Advent of Code 2019 - {day=} - {part=} - {timeit_=} - {verbose=}"
-    )
-
-    # Try to import the solution
-    import_path = f"adventofcode2019.solutions.day{day}"
-    data_path = f"day_{day}/day{day}.txt"
-
-    logger.debug(f"Importing {import_path}")
-
-    try:
-        day_module = importlib.import_module(import_path)
-    except ModuleNotFoundError:
-        print(f"Module {day} is not yet available")
-        sys.exit(-65)
-    if timeit_:
-        execution_times = []
-        results = ""
-
-        for _ in tqdm.trange(timeit_):
-            time_prior = timeit.default_timer()
-
-            results = run_day(data_path, day, day_module, part)
-
-            time_after = timeit.default_timer()
-            execution_times.append(time_after - time_prior)
-
-        average_time = sum(execution_times) / len(execution_times)
-
-        print("Results:")
-        print(results)
-        print(
-            f"Average running time: {average_time:.6f} seconds ({timeit_} iterations)"
-        )
-    else:
-        print("Results:")
-        print(run_day(data_path, day, day_module, part))
-
-
-def run_day(data_path, day, day_module, part):
-    if part == "parta":
-        return run_parta(data_path, day, day_module)
-
-    elif part == "partb":
-        return run_partb(data_path, day, day_module)
-
-    else:
-        a = run_parta(data_path, day, day_module)
-        b = run_partb(data_path, day, day_module)
-
-        return f"Part A:\n{a}\n\nPart B:\n{b}\n"
-
-
-def run_parta(data_path, day, day_module):
-    result = getattr(day_module, f"Day{day}PartA")()(data_path)
-    return result
-
-
-def run_partb(data_path, day, day_module):
-    result = getattr(day_module, f"Day{day}PartB")()(data_path)
-    return result
-
-
-if __name__ == "__main__":
-    main()
diff --git a/src/adventofcode2020/main.py b/src/adventofcode2020/main.py
deleted file mode 100644
index cabac7cb..00000000
--- a/src/adventofcode2020/main.py
+++ /dev/null
@@ -1,283 +0,0 @@
-import importlib
-import logging
-import os
-import sys
-import timeit
-from pathlib import Path
-
-import click
-import requests
-import tqdm
-from bs4 import BeautifulSoup
-from cookiecutter.main import cookiecutter
-from dotenv import load_dotenv
-
-logger = logging.getLogger(__name__)
-
-
-@click.command()
-@click.argument(
-    "day",
-    type=click.IntRange(1, 25),
-)
-@click.option(
-    "--create",
-    is_flag=True,
-    help="Create the files for a specific day",
-)
-@click.option(
-    "--force",
-    is_flag=True,
-    help="Overwrite if files already exist",
-)
-@click.option(
-    "--submit",
-    is_flag=True,
-    help="Submit the results to Advent of Code",
-)
-@click.option(
-    "--download",
-    is_flag=True,
-    help="Download fresh copy of the input before starting",
-)
-@click.option("--parta", "part", flag_value="parta")
-@click.option("--partb", "part", flag_value="partb")
-@click.option(
-    "-t",
-    "--timeit",
-    "timeit_",
-    type=click.INT,
-    help="Test the solution using timeit with timeit iterations",
-)
-@click.option("-v", "--verbose", is_flag=True)
-def main(day, create, force, submit, download, part, timeit_, verbose):
-    """
-    Simple program that runs a module from the advent of code.
-    DAY is an integer representing the day (1 - 25) that runs that day.
-    """
-    if verbose:
-        level = logging.DEBUG
-    else:
-        level = logging.WARNING
-
-    if create and submit:
-        print("Create and submit cannot be used at the same time")
-        sys.exit(-65)
-
-    if submit and not part:
-        print(
-            "Submit can only be used ony part at a time (Eg specify --parta or --partb)"
-        )
-        sys.exit(-65)
-
-    logging.basicConfig(
-        level=level,
-        format="%(asctime)s - %(name)s - %(levelname)s - %(message)s",
-        datefmt="%H:%M:%S",
-    )
-
-    # Load env values from .env file, or from environment variables if set
-    load_dotenv()
-
-    day = f"{int(day):02}"
-
-    print(
-        f"Welcome to Advent of Code 2020 - {day=} - {part=} - {timeit_=} - "
-        f"{verbose=} - {create=}"
-    )
-
-    if create:
-        # Create a new solution
-        ensure_correct_directory()
-        create_solution(force=force, day=day)
-        download_input_data(year="2020", day=day)
-    else:
-        # Run a specific day
-        if download:
-            download_input_data(year="2020", day=day)
-        run_solution(day=day, timeit_=timeit_, part=part, submit=submit)
-
-
-def ensure_correct_directory():
-    """Make sure that we are in the correct directory: Main sources root"""
-    main_file = Path("src/adventofcode2020/main.py")
-    if main_file.exists():
-        return True
-    else:
-        current_path = Path(__file__).parent.parent.parent.resolve()
-        print(f"Not in the correct folder. Please execute: cd {current_path}")
-        sys.exit(-65)
-
-
-def create_solution(force, day):
-    print(f"Creating solution for {day} --")
-
-    # Check before we overwrite
-    import_path = f"adventofcode2020.solutions.day{day}"
-    logger.debug(f"Importing {import_path}")
-    try:
-        importlib.import_module(import_path)
-    except ModuleNotFoundError:
-        pass
-        logger.debug(f"{import_path} does not exist, we can continue")
-    else:
-        if not force:
-            print("Module already exists - Not creating")
-            sys.exit(-65)
-
-    cookiecutter(
-        "template/",
-        no_input=True,
-        extra_context={"day": day},
-        overwrite_if_exists=True,
-    )
-
-
-def _get_session():
-    session = os.environ.get("AOC_SESSION")
-    if not session:
-        print("AOC_SESSION key is not set in envonrment or .env file")
-        sys.exit(-65)
-    return session
-
-
-def download_input_data(year: str, day: str):
-    """Download the input data"""
-    # Download the content, using the session key
-    r = requests.get(
-        f"https://adventofcode.com/{year}/day/{day.lstrip('0')}/input",
-        cookies={"session": _get_session()},
-        timeout=30,
-    )
-    if r.status_code != 200:
-        print(f"Unable to download the input data. Response code {r.status_code}")
-        if r.status_code == 500:
-            print("An internal server error accured. Is your session valid?")
-        elif r.status_code == 404:
-            print(
-                "Solution not found: You are too early, or this day does not"
-                "have an input file."
-            )
-        else:
-            print(r.content)
-
-        sys.exit(-65)
-
-    logger.debug(f"Received data, length {len(r.content)}")
-
-    data_path = f"day_{day}/day{day}.txt"
-    root_dir = Path(__file__).parent
-    filename = root_dir / "solutions" / "data" / data_path
-    with open(filename, "wb") as f:
-        f.write(r.content)
-
-    logger.info(f"Input data writen to {filename}")
-
-
-def run_solution(day, timeit_, part, submit):
-    # Try to import the solution
-    import_path = f"adventofcode2020.solutions.day{day}"
-    data_path = f"day_{day}/day{day}.txt"
-
-    logger.debug(f"Importing {import_path}")
-
-    try:
-        day_module = importlib.import_module(import_path)
-    except ModuleNotFoundError:
-        print(f"Module {day} is not yet available")
-        sys.exit(-65)
-    if timeit_:
-        execution_times = []
-        results = ""
-
-        for _ in tqdm.trange(timeit_):
-            time_prior = timeit.default_timer()
-
-            results = run_day(data_path, day, day_module, part, submit=False)
-
-            time_after = timeit.default_timer()
-            execution_times.append(time_after - time_prior)
-
-        average_time = sum(execution_times) / len(execution_times)
-
-        print("Results:")
-        print(results)
-        print(
-            f"Average running time: {average_time:.6f} seconds ({timeit_} iterations)"
-        )
-    else:
-        print("Results:")
-        print(run_day(data_path, day, day_module, part, submit))
-
-
-def run_day(data_path, day, day_module, part, submit):
-    if part == "parta":
-        result = run_parta(data_path, day, day_module)
-        if submit:
-            submit_result(year=2020, day=day, part=part, result=result)
-        return result
-
-    elif part == "partb":
-        result = run_partb(data_path, day, day_module)
-        if submit:
-            submit_result(year=2020, day=day, part=part, result=result)
-        return result
-
-    else:
-        a = run_parta(data_path, day, day_module)
-        b = run_partb(data_path, day, day_module)
-
-        return f"Part A:\n{a}\n\nPart B:\n{b}\n"
-
-
-def run_parta(data_path, day, day_module):
-    result = getattr(day_module, f"Day{day}PartA")()(data_path)
-    return result
-
-
-def run_partb(data_path, day, day_module):
-    result = getattr(day_module, f"Day{day}PartB")()(data_path)
-    return result
-
-
-def submit_result(year, day, part, result):
-    """Submit a solution to advent of code"""
-    day = day.lstrip("0")
-    post_url = f"https://adventofcode.com/{year}/day/{day}/answer"
-    logger.debug(f"Posting to {post_url}")
-
-    level = 1 if part == "parta" else 2
-    data = {"level": level, "answer": result}
-
-    logger.debug(f"Posting data: {data}")
-
-    r = requests.post(
-        url=post_url,
-        data=data,
-        cookies={"session": _get_session()},
-        timeout=30,
-    )
-
-    result = parse_result(r.text)
-
-    if result:
-        print(f"{result}")
-    else:
-        print(f"Could not parse content. Raw result:\n{str(r.content)}")
-
-
-def parse_result(html_doc):
-    # Parse the result, and print the first main.article
-    soup = BeautifulSoup(html_doc, "html.parser")
-    result = []
-    for m in soup.main:
-        # Skip empty sections or java scripts
-        if m == "\n" or "<script>" in str(m):
-            continue
-        else:
-            result.append(str(m.get_text()))
-    return result
-
-
-if __name__ == "__main__":
-    main()
diff --git a/src/adventofcode2021/main.py b/src/adventofcode2021/main.py
deleted file mode 100644
index 249c5ae2..00000000
--- a/src/adventofcode2021/main.py
+++ /dev/null
@@ -1,283 +0,0 @@
-import importlib
-import logging
-import os
-import sys
-import timeit
-from pathlib import Path
-
-import click
-import requests
-import tqdm
-from bs4 import BeautifulSoup
-from cookiecutter.main import cookiecutter
-from dotenv import load_dotenv
-
-logger = logging.getLogger(__name__)
-
-
-@click.command()
-@click.argument(
-    "day",
-    type=click.IntRange(1, 25),
-)
-@click.option(
-    "--create",
-    is_flag=True,
-    help="Create the files for a specific day",
-)
-@click.option(
-    "--force",
-    is_flag=True,
-    help="Overwrite if files already exist",
-)
-@click.option(
-    "--submit",
-    is_flag=True,
-    help="Submit the results to Advent of Code",
-)
-@click.option(
-    "--download",
-    is_flag=True,
-    help="Download fresh copy of the input before starting",
-)
-@click.option("--parta", "part", flag_value="parta")
-@click.option("--partb", "part", flag_value="partb")
-@click.option(
-    "-t",
-    "--timeit",
-    "timeit_",
-    type=click.INT,
-    help="Test the solution using timeit with timeit iterations",
-)
-@click.option("-v", "--verbose", is_flag=True)
-def main(day, create, force, submit, download, part, timeit_, verbose):
-    """
-    Simple program that runs a module from the advent of code.
-    DAY is an integer representing the day (1 - 25) that runs that day.
-    """
-    if verbose:
-        level = logging.DEBUG
-    else:
-        level = logging.WARNING
-
-    if create and submit:
-        print("Create and submit cannot be used at the same time")
-        sys.exit(-65)
-
-    if submit and not part:
-        print(
-            "Submit can only be used ony part at a time (Eg specify --parta or --partb)"
-        )
-        sys.exit(-65)
-
-    logging.basicConfig(
-        level=level,
-        format="%(asctime)s - %(name)s - %(levelname)s - %(message)s",
-        datefmt="%H:%M:%S",
-    )
-
-    # Load env values from .env file, or from environment variables if set
-    load_dotenv()
-
-    day = f"{int(day):02}"
-
-    print(
-        f"Welcome to Advent of Code 2021 - {day=} - {part=} - {timeit_=} - "
-        f"{verbose=} - {create=}"
-    )
-
-    if create:
-        # Create a new solution
-        ensure_correct_directory()
-        create_solution(force=force, day=day)
-        download_input_data(year="2021", day=day)
-    else:
-        # Run a specific day
-        if download:
-            download_input_data(year="2021", day=day)
-        run_solution(day=day, timeit_=timeit_, part=part, submit=submit)
-
-
-def ensure_correct_directory():
-    """Make sure that we are in the correct directory: Main sources root"""
-    main_file = Path("src/adventofcode2021/main.py")
-    if main_file.exists():
-        return True
-    else:
-        current_path = Path(__file__).parent.parent.parent.resolve()
-        print(f"Not in the correct folder. Please execute: cd {current_path}")
-        sys.exit(-65)
-
-
-def create_solution(force, day):
-    print(f"Creating solution for {day} --")
-
-    # Check before we overwrite
-    import_path = f"adventofcode2021.solutions.day{day}"
-    logger.debug(f"Importing {import_path}")
-    try:
-        importlib.import_module(import_path)
-    except ModuleNotFoundError:
-        pass
-        logger.debug(f"{import_path} does not exist, we can continue")
-    else:
-        if not force:
-            print("Module already exists - Not creating")
-            sys.exit(-65)
-
-    cookiecutter(
-        "template/",
-        no_input=True,
-        extra_context={"day": day},
-        overwrite_if_exists=True,
-    )
-
-
-def _get_session():
-    session = os.environ.get("AOC_SESSION")
-    if not session:
-        print("AOC_SESSION key is not set in envonrment or .env file")
-        sys.exit(-65)
-    return session
-
-
-def download_input_data(year: str, day: str):
-    """Download the input data"""
-    # Download the content, using the session key
-    r = requests.get(
-        f"https://adventofcode.com/{year}/day/{day.lstrip('0')}/input",
-        cookies={"session": _get_session()},
-        timeout=30,
-    )
-    if r.status_code != 200:
-        print(f"Unable to download the input data. Response code {r.status_code}")
-        if r.status_code == 500:
-            print("An internal server error accured. Is your session valid?")
-        elif r.status_code == 404:
-            print(
-                "Solution not found: You are too early, or this day does not"
-                "have an input file."
-            )
-        else:
-            print(r.content)
-
-        sys.exit(-65)
-
-    logger.debug(f"Received data, length {len(r.content)}")
-
-    data_path = f"day_{day}/day{day}.txt"
-    root_dir = Path(__file__).parent
-    filename = root_dir / "solutions" / "data" / data_path
-    with open(filename, "wb") as f:
-        f.write(r.content)
-
-    logger.info(f"Input data writen to {filename}")
-
-
-def run_solution(day, timeit_, part, submit):
-    # Try to import the solution
-    import_path = f"adventofcode2021.solutions.day{day}"
-    data_path = f"day_{day}/day{day}.txt"
-
-    logger.debug(f"Importing {import_path}")
-
-    try:
-        day_module = importlib.import_module(import_path)
-    except ModuleNotFoundError:
-        print(f"Module {day} is not yet available")
-        sys.exit(-65)
-    if timeit_:
-        execution_times = []
-        results = ""
-
-        for _ in tqdm.trange(timeit_):
-            time_prior = timeit.default_timer()
-
-            results = run_day(data_path, day, day_module, part, submit=False)
-
-            time_after = timeit.default_timer()
-            execution_times.append(time_after - time_prior)
-
-        average_time = sum(execution_times) / len(execution_times)
-
-        print("Results:")
-        print(results)
-        print(
-            f"Average running time: {average_time:.6f} seconds ({timeit_} iterations)"
-        )
-    else:
-        print("Results:")
-        print(run_day(data_path, day, day_module, part, submit))
-
-
-def run_day(data_path, day, day_module, part, submit):
-    if part == "parta":
-        result = run_parta(data_path, day, day_module)
-        if submit:
-            submit_result(year=2021, day=day, part=part, result=result)
-        return result
-
-    elif part == "partb":
-        result = run_partb(data_path, day, day_module)
-        if submit:
-            submit_result(year=2021, day=day, part=part, result=result)
-        return result
-
-    else:
-        a = run_parta(data_path, day, day_module)
-        b = run_partb(data_path, day, day_module)
-
-        return f"Part A:\n{a}\n\nPart B:\n{b}\n"
-
-
-def run_parta(data_path, day, day_module):
-    result = getattr(day_module, f"Day{day}PartA")()(data_path)
-    return result
-
-
-def run_partb(data_path, day, day_module):
-    result = getattr(day_module, f"Day{day}PartB")()(data_path)
-    return result
-
-
-def submit_result(year, day, part, result):
-    """Submit a solution to advent of code"""
-    day = day.lstrip("0")
-    post_url = f"https://adventofcode.com/{year}/day/{day}/answer"
-    logger.debug(f"Posting to {post_url}")
-
-    level = 1 if part == "parta" else 2
-    data = {"level": level, "answer": result}
-
-    logger.debug(f"Posting data: {data}")
-
-    r = requests.post(
-        url=post_url,
-        data=data,
-        cookies={"session": _get_session()},
-        timeout=30,
-    )
-
-    result = parse_result(r.text)
-
-    if result:
-        print(f"{result}")
-    else:
-        print(f"Could not parse content. Raw result:\n{str(r.content)}")
-
-
-def parse_result(html_doc):
-    # Parse the result, and print the first main.article
-    soup = BeautifulSoup(html_doc, "html.parser")
-    result = []
-    for m in soup.main:
-        # Skip empty sections or java scripts
-        if m == "\n" or "<script>" in str(m):
-            continue
-        else:
-            result.append(str(m.get_text()))
-    return result
-
-
-if __name__ == "__main__":
-    main()
diff --git a/src/adventofcode2022/main.py b/src/adventofcode2022/main.py
deleted file mode 100644
index b4b7da49..00000000
--- a/src/adventofcode2022/main.py
+++ /dev/null
@@ -1,285 +0,0 @@
-import importlib
-import logging
-import os
-import sys
-import timeit
-from pathlib import Path
-
-import click
-import requests
-import tqdm
-from bs4 import BeautifulSoup
-from cookiecutter.main import cookiecutter
-from dotenv import load_dotenv
-
-logger = logging.getLogger(__name__)
-
-
-@click.command()
-@click.argument(
-    "day",
-    type=click.IntRange(1, 25),
-)
-@click.option(
-    "--create",
-    is_flag=True,
-    help="Create the files for a specific day",
-)
-@click.option(
-    "--force",
-    is_flag=True,
-    help="Overwrite if files already exist",
-)
-@click.option(
-    "--submit",
-    is_flag=True,
-    help="Submit the results to Advent of Code",
-)
-@click.option(
-    "--download",
-    is_flag=True,
-    help="Download fresh copy of the input before starting",
-)
-@click.option("--parta", "part", flag_value="parta")
-@click.option("--partb", "part", flag_value="partb")
-@click.option(
-    "-t",
-    "--timeit",
-    "timeit_",
-    type=click.INT,
-    help="Test the solution using timeit with timeit iterations",
-)
-@click.option("-v", "--verbose", is_flag=True)
-def main(day, create, force, submit, download, part, timeit_, verbose):
-    """
-    Simple program that runs a module from the advent of code.
-    DAY is an integer representing the day (1 - 25) that runs that day.
-    """
-    if verbose:
-        level = logging.DEBUG
-    else:
-        level = logging.WARNING
-
-    if create and submit:
-        print("Create and submit cannot be used at the same time")
-        sys.exit(-65)
-
-    if submit and not part:
-        print(
-            "Submit can only be used ony part at a time (Eg specify --parta or --partb)"
-        )
-        sys.exit(-65)
-
-    logging.basicConfig(
-        level=level,
-        format="%(asctime)s - %(name)s - %(levelname)s - %(message)s",
-        datefmt="%H:%M:%S",
-    )
-
-    # Load env values from .env file, or from environment variables if set
-    load_dotenv()
-
-    day = f"{int(day):02}"
-
-    print(
-        f"Welcome to Advent of Code 2022 - {day=} - {part=} - {timeit_=} - "
-        f"{verbose=} - {create=}"
-    )
-
-    if create:
-        # Create a new solution
-        ensure_correct_directory()
-        create_solution(force=force, day=day)
-        download_input_data(year="2022", day=day)
-    else:
-        # Run a specific day
-        if download:
-            download_input_data(year="2022", day=day)
-        run_solution(day=day, timeit_=timeit_, part=part, submit=submit)
-
-
-def ensure_correct_directory():
-    """Make sure that we are in the correct directory: Main sources root"""
-    main_file = Path("src/adventofcode2022/main.py")
-    if main_file.exists():
-        return True
-    else:
-        current_path = Path(__file__).parent.parent.parent.resolve()
-        print(f"Not in the correct folder. Please execute: cd {current_path}")
-        sys.exit(-65)
-
-
-def create_solution(force, day):
-    print(f"Creating solution for {day} --")
-
-    # Check before we overwrite
-    import_path = f"adventofcode2022.solutions.day{day}"
-    logger.debug(f"Importing {import_path}")
-    try:
-        importlib.import_module(import_path)
-    except ModuleNotFoundError:
-        pass
-        logger.debug(f"{import_path} does not exist, we can continue")
-    else:
-        if not force:
-            print("Module already exists - Not creating")
-            sys.exit(-65)
-
-    cookiecutter(
-        "template/",
-        no_input=True,
-        extra_context={"day": day},
-        overwrite_if_exists=True,
-    )
-
-
-def _get_session():
-    session = os.environ.get("AOC_SESSION")
-    if not session:
-        print("AOC_SESSION key is not set in envonrment or .env file")
-        sys.exit(-65)
-    return session
-
-
-def download_input_data(year: str, day: str):
-    """Download the input data"""
-    # Download the content, using the session key
-    r = requests.get(
-        f"https://adventofcode.com/{year}/day/{day.lstrip('0')}/input",
-        cookies={"session": _get_session()},
-        timeout=30,
-    )
-    if r.status_code != 200:
-        print(f"Unable to download the input data. Response code {r.status_code}")
-        if r.status_code == 500:
-            print("An internal server error occured. Is your session valid?")
-        elif r.status_code == 404:
-            print(
-                "Solution not found: You are too early, or this day does not "
-                "have an input file."
-            )
-        else:
-            print(r.content)
-
-        sys.exit(-65)
-
-    logger.debug(f"Received data, length {len(r.content)}")
-
-    data_path = f"day_{day}/day{day}.txt"
-    root_dir = Path(__file__).parent
-    filename = root_dir / "solutions" / "data" / data_path
-    with open(filename, "wb") as f:
-        f.write(r.content)
-
-    logger.info(f"Input data writen to {filename}")
-    print("First lines:")
-    print(r.content.decode("utf-8")[:300])
-
-
-def run_solution(day, timeit_, part, submit):
-    # Try to import the solution
-    import_path = f"adventofcode2022.solutions.day{day}"
-    data_path = f"day_{day}/day{day}.txt"
-
-    logger.debug(f"Importing {import_path}")
-
-    try:
-        day_module = importlib.import_module(import_path)
-    except ModuleNotFoundError:
-        print(f"Module {day} is not yet available")
-        sys.exit(-65)
-    if timeit_:
-        execution_times = []
-        results = ""
-
-        for _ in tqdm.trange(timeit_):
-            time_prior = timeit.default_timer()
-
-            results = run_day(data_path, day, day_module, part, submit=False)
-
-            time_after = timeit.default_timer()
-            execution_times.append(time_after - time_prior)
-
-        average_time = sum(execution_times) / len(execution_times)
-
-        print("Results:")
-        print(results)
-        print(
-            f"Average running time: {average_time:.6f} seconds ({timeit_} iterations)"
-        )
-    else:
-        print("Results:")
-        print(run_day(data_path, day, day_module, part, submit))
-
-
-def run_day(data_path, day, day_module, part, submit):
-    if part == "parta":
-        result = run_parta(data_path, day, day_module)
-        if submit:
-            submit_result(year=2022, day=day, part=part, result=result)
-        return result
-
-    elif part == "partb":
-        result = run_partb(data_path, day, day_module)
-        if submit:
-            submit_result(year=2022, day=day, part=part, result=result)
-        return result
-
-    else:
-        a = run_parta(data_path, day, day_module)
-        b = run_partb(data_path, day, day_module)
-
-        return f"Part A:\n{a}\n\nPart B:\n{b}\n"
-
-
-def run_parta(data_path, day, day_module):
-    result = getattr(day_module, f"Day{day}PartA")()(data_path)
-    return result
-
-
-def run_partb(data_path, day, day_module):
-    result = getattr(day_module, f"Day{day}PartB")()(data_path)
-    return result
-
-
-def submit_result(year, day, part, result):
-    """Submit a solution to advent of code"""
-    day = day.lstrip("0")
-    post_url = f"https://adventofcode.com/{year}/day/{day}/answer"
-    logger.debug(f"Posting to {post_url}")
-
-    level = 1 if part == "parta" else 2
-    data = {"level": level, "answer": result}
-
-    logger.debug(f"Posting data: {data}")
-
-    r = requests.post(
-        url=post_url,
-        data=data,
-        cookies={"session": _get_session()},
-        timeout=30,
-    )
-
-    result = parse_result(r.text)
-
-    if result:
-        print(f"{result}")
-    else:
-        print(f"Could not parse content. Raw result:\n{str(r.content)}")
-
-
-def parse_result(html_doc):
-    # Parse the result, and print the first main.article
-    soup = BeautifulSoup(html_doc, "html.parser")
-    result = []
-    for m in soup.main:
-        # Skip empty sections or java scripts
-        if m == "\n" or "<script>" in str(m):
-            continue
-        else:
-            result.append(str(m.get_text()))
-    return result
-
-
-if __name__ == "__main__":
-    main()

From eade07806bcf2c4faf9295f8d611e6e0f165eb9b Mon Sep 17 00:00:00 2001
From: Roel Adriaans <roel.adriaans@asml.com>
Date: Tue, 28 Nov 2023 09:48:26 +0100
Subject: [PATCH 317/371] Fix long line

---
 src/adventofcode/main.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/adventofcode/main.py b/src/adventofcode/main.py
index b031513a..07f79e05 100644
--- a/src/adventofcode/main.py
+++ b/src/adventofcode/main.py
@@ -28,7 +28,8 @@
     "--year",
     default=lambda: os.environ.get("AOC_YEAR", datetime.now().year),
     type=click.IntRange(2016, 2025),
-    help="The year to run. Defaults to current year. Can be overriden in .env by using value AOC_YEAR",
+    help="The year to run. Defaults to current year. Can be overriden in .env "
+    "by using value AOC_YEAR",
 )
 @click.option(
     "--create",

From 2c7add88a20769a331434486463147fa7fee69ba Mon Sep 17 00:00:00 2001
From: Roel Adriaans <roel.adriaans@asml.com>
Date: Tue, 28 Nov 2023 11:32:10 +0100
Subject: [PATCH 318/371] Make coockiecutter generic for all years.

Commit before testing deletes anything
---
 template/cookiecutter.json                    |  3 ++-
 template/hooks/pre_gen_project.py             | 12 ++++++++++++
 .../test_{{cookiecutter.file_name}}_b.py      | 19 -------------------
 .../{{cookiecutter.file_name}}.txt            |  0
 .../solutions/{{cookiecutter.file_name}}.py   | 15 ---------------
 .../test_{{cookiecutter.file_name}}_a.py      | 19 -------------------
 .../test_{{cookiecutter.file_name}}_b.py      | 19 -------------------
 .../{{cookiecutter.file_name}}.txt            |  0
 .../solutions/{{cookiecutter.file_name}}.py   | 15 ---------------
 .../test_{{cookiecutter.file_name}}_a.py      | 19 -------------------
 .../test_{{cookiecutter.file_name}}_b.py      | 19 -------------------
 .../{{cookiecutter.file_name}}.txt            |  0
 .../solutions/{{cookiecutter.file_name}}.py   | 15 ---------------
 .../test_{{cookiecutter.file_name}}_a.py      | 19 -------------------
 .../test_{{cookiecutter.file_name}}_b.py      | 19 -------------------
 .../{{cookiecutter.file_name}}.txt            |  0
 .../{{cookiecutter.file_name}}_test.txt       |  0
 .../solutions/{{cookiecutter.file_name}}.py   | 15 ---------------
 .../test_{{cookiecutter.file_name}}_a.py      | 19 -------------------
 .../{{cookiecutter.file_name}}.txt            |  0
 .../solutions/{{cookiecutter.file_name}}.py   |  2 +-
 .../test_{{cookiecutter.file_name}}_a.py      |  2 +-
 .../test_{{cookiecutter.file_name}}_b.py      |  2 +-
 23 files changed, 17 insertions(+), 216 deletions(-)
 delete mode 100644 template/{{cookiecutter.advendofcode2016}}/tests/solutions/test_{{cookiecutter.file_name}}_b.py
 delete mode 100644 template/{{cookiecutter.advendofcode2019}}/src/solutions/data/{{cookiecutter.directory_name}}/{{cookiecutter.file_name}}.txt
 delete mode 100644 template/{{cookiecutter.advendofcode2019}}/src/solutions/{{cookiecutter.file_name}}.py
 delete mode 100644 template/{{cookiecutter.advendofcode2019}}/tests/solutions/test_{{cookiecutter.file_name}}_a.py
 delete mode 100644 template/{{cookiecutter.advendofcode2019}}/tests/solutions/test_{{cookiecutter.file_name}}_b.py
 delete mode 100644 template/{{cookiecutter.advendofcode2020}}/src/adventofcode2020/solutions/data/{{cookiecutter.directory_name}}/{{cookiecutter.file_name}}.txt
 delete mode 100644 template/{{cookiecutter.advendofcode2020}}/src/adventofcode2020/solutions/{{cookiecutter.file_name}}.py
 delete mode 100644 template/{{cookiecutter.advendofcode2020}}/tests/solutions/test_{{cookiecutter.file_name}}_a.py
 delete mode 100644 template/{{cookiecutter.advendofcode2020}}/tests/solutions/test_{{cookiecutter.file_name}}_b.py
 delete mode 100644 template/{{cookiecutter.advendofcode2021}}/src/adventofcode2021/solutions/data/{{cookiecutter.directory_name}}/{{cookiecutter.file_name}}.txt
 delete mode 100644 template/{{cookiecutter.advendofcode2021}}/src/adventofcode2021/solutions/{{cookiecutter.file_name}}.py
 delete mode 100644 template/{{cookiecutter.advendofcode2021}}/tests/solutions/test_{{cookiecutter.file_name}}_a.py
 delete mode 100644 template/{{cookiecutter.advendofcode2021}}/tests/solutions/test_{{cookiecutter.file_name}}_b.py
 delete mode 100644 template/{{cookiecutter.advendofcode2022}}/src/adventofcode2022/solutions/data/{{cookiecutter.directory_name}}/{{cookiecutter.file_name}}.txt
 delete mode 100644 template/{{cookiecutter.advendofcode2022}}/src/adventofcode2022/solutions/data/{{cookiecutter.directory_name}}/{{cookiecutter.file_name}}_test.txt
 delete mode 100644 template/{{cookiecutter.advendofcode2022}}/src/adventofcode2022/solutions/{{cookiecutter.file_name}}.py
 delete mode 100644 template/{{cookiecutter.advendofcode2022}}/tests/solutions/test_{{cookiecutter.file_name}}_a.py
 rename template/{{{cookiecutter.advendofcode2016}}/src/adventofcode2016 => {{cookiecutter}}/src/adventofcode{{cookiecutter.year}}}/solutions/data/{{cookiecutter.directory_name}}/{{cookiecutter.file_name}}.txt (100%)
 rename template/{{{cookiecutter.advendofcode2016}}/src/adventofcode2016 => {{cookiecutter}}/src/adventofcode{{cookiecutter.year}}}/solutions/{{cookiecutter.file_name}}.py (87%)
 rename template/{{{cookiecutter.advendofcode2016}}/tests/solutions => {{cookiecutter}}/tests/adventofcode{{cookiecutter.year}}}/test_{{cookiecutter.file_name}}_a.py (87%)
 rename template/{{{cookiecutter.advendofcode2022}}/tests/solutions => {{cookiecutter}}/tests/adventofcode{{cookiecutter.year}}}/test_{{cookiecutter.file_name}}_b.py (87%)

diff --git a/template/cookiecutter.json b/template/cookiecutter.json
index c3698059..35281e37 100644
--- a/template/cookiecutter.json
+++ b/template/cookiecutter.json
@@ -1,6 +1,7 @@
 {
-    "advendofcode2016": ".",
+    "advendofcode": ".",
     "day": "32",
+    "year": "2030",
     "directory_name": "day_{{cookiecutter.day}}",
     "file_name": "day{{cookiecutter.day}}",
     "class_name": "Day{{cookiecutter.day}}"
diff --git a/template/hooks/pre_gen_project.py b/template/hooks/pre_gen_project.py
index adb581af..0c0a534b 100644
--- a/template/hooks/pre_gen_project.py
+++ b/template/hooks/pre_gen_project.py
@@ -3,6 +3,7 @@
 MODULE_REGEX = r"^[_a-zA-Z][_a-zA-Z0-9]+$"
 
 day_name = "{{ cookiecutter.day }}"
+year_name = "{{ cookiecutter.year }}"
 
 # Convert to int:
 try:
@@ -11,11 +12,22 @@
     print(f"ERROR: day_name: {day_name} is not a valid integer!")
     sys.exit(1)
 
+try:
+    int_year_name = int(year_name)
+except ValueError:
+    print(f"ERROR: day_name: {year_name} is not a valid integer!")
+    sys.exit(1)
 
 if not (1 <= int_day_name <= 25):
     print(f"ERROR: day_name: {day_name} is not a valid day, must be between 1 and 25")
     sys.exit(1)
 
+if not (2015 <= int_year_name <= 2025):
+    print(
+        f"ERROR: day_name: {day_name} is not a valid day, must be between 2015 and 2025"
+    )
+    sys.exit(1)
+
 # Check that we have a leading zero when needed:
 prefix_day_name = f"{int_day_name:02d}"
 if prefix_day_name != day_name:
diff --git a/template/{{cookiecutter.advendofcode2016}}/tests/solutions/test_{{cookiecutter.file_name}}_b.py b/template/{{cookiecutter.advendofcode2016}}/tests/solutions/test_{{cookiecutter.file_name}}_b.py
deleted file mode 100644
index 7db011e4..00000000
--- a/template/{{cookiecutter.advendofcode2016}}/tests/solutions/test_{{cookiecutter.file_name}}_b.py
+++ /dev/null
@@ -1,19 +0,0 @@
-import pytest
-
-from adventofcode2016.solutions.{{cookiecutter.file_name}} import {{cookiecutter.class_name}}PartB
-
-
-class Test{{cookiecutter.class_name}}PartB:
-    @pytest.mark.xfail(reason="Not yet implemented", raises=NotImplementedError)
-    @pytest.mark.parametrize(("input_data", "expected_result"), [("", ""), ("", "")])
-    def test_{{cookiecutter.file_name}}b_solve(self, input_data, expected_result):
-        solution = {{cookiecutter.class_name}}PartB()
-        result = solution.solve(input_data)
-        assert result == expected_result
-
-    @pytest.mark.xfail(reason="Not yet implemented", raises=NotImplementedError)
-    def test_{{cookiecutter.file_name}}b_data(self):
-        """Result we got when we did the real solution"""
-        solution = {{cookiecutter.class_name}}PartB()
-        res = solution("{{cookiecutter.directory_name}}/{{cookiecutter.file_name}}.txt")
-        assert res == 0
diff --git a/template/{{cookiecutter.advendofcode2019}}/src/solutions/data/{{cookiecutter.directory_name}}/{{cookiecutter.file_name}}.txt b/template/{{cookiecutter.advendofcode2019}}/src/solutions/data/{{cookiecutter.directory_name}}/{{cookiecutter.file_name}}.txt
deleted file mode 100644
index e69de29b..00000000
diff --git a/template/{{cookiecutter.advendofcode2019}}/src/solutions/{{cookiecutter.file_name}}.py b/template/{{cookiecutter.advendofcode2019}}/src/solutions/{{cookiecutter.file_name}}.py
deleted file mode 100644
index 29ba2d1b..00000000
--- a/template/{{cookiecutter.advendofcode2019}}/src/solutions/{{cookiecutter.file_name}}.py
+++ /dev/null
@@ -1,15 +0,0 @@
-from utils.abstract import FileReaderSolution
-
-
-class {{cookiecutter.class_name}}:
-    pass
-
-
-class {{cookiecutter.class_name}}PartA({{cookiecutter.class_name}}, FileReaderSolution):
-    def solve(self, input_data: str) -> int:
-        raise NotImplementedError
-
-
-class {{cookiecutter.class_name}}PartB({{cookiecutter.class_name}}, FileReaderSolution):
-    def solve(self, input_data: str) -> int:
-        raise NotImplementedError
diff --git a/template/{{cookiecutter.advendofcode2019}}/tests/solutions/test_{{cookiecutter.file_name}}_a.py b/template/{{cookiecutter.advendofcode2019}}/tests/solutions/test_{{cookiecutter.file_name}}_a.py
deleted file mode 100644
index e2b0ed6a..00000000
--- a/template/{{cookiecutter.advendofcode2019}}/tests/solutions/test_{{cookiecutter.file_name}}_a.py
+++ /dev/null
@@ -1,19 +0,0 @@
-import pytest
-
-from solutions.{{cookiecutter.file_name}} import {{cookiecutter.class_name}}PartA
-
-
-class Test{{cookiecutter.class_name}}PartA:
-    @pytest.mark.skip("This code is not yet implemented.")
-    @pytest.mark.parametrize(("input_data", "expected_result"), [("", ""), ("", "")])
-    def test_{{cookiecutter.file_name}}a_solve(self, input_data, expected_result):
-        solution = {{cookiecutter.class_name}}PartA()
-        result = solution.solve(input_data)
-        assert result == expected_result
-
-    @pytest.mark.skip("This code is not yet implemented.")
-    def test_{{cookiecutter.file_name}}a_data(self):
-        """ Result we got when we did the real solution """
-        solution = {{cookiecutter.class_name}}PartA()
-        res = solution("{{cookiecutter.directory_name}}/{{cookiecutter.file_name}}.txt")
-        assert res == 0
diff --git a/template/{{cookiecutter.advendofcode2019}}/tests/solutions/test_{{cookiecutter.file_name}}_b.py b/template/{{cookiecutter.advendofcode2019}}/tests/solutions/test_{{cookiecutter.file_name}}_b.py
deleted file mode 100644
index 543ac75e..00000000
--- a/template/{{cookiecutter.advendofcode2019}}/tests/solutions/test_{{cookiecutter.file_name}}_b.py
+++ /dev/null
@@ -1,19 +0,0 @@
-import pytest
-
-from solutions.{{cookiecutter.file_name}} import {{cookiecutter.class_name}}PartB
-
-
-class Test{{cookiecutter.class_name}}PartB:
-    @pytest.mark.skip("This code is not yet implemented.")
-    @pytest.mark.parametrize(("input_data", "expected_result"), [("", ""), ("", "")])
-    def test_{{cookiecutter.file_name}}b_solve(self, input_data, expected_result):
-        solution = {{cookiecutter.class_name}}PartB()
-        result = solution.solve(input_data)
-        assert result == expected_result
-
-    @pytest.mark.skip("This code is not yet implemented.")
-    def test_{{cookiecutter.file_name}}b_data(self):
-        """ Result we got when we did the real solution """
-        solution = {{cookiecutter.class_name}}PartB()
-        res = solution("{{cookiecutter.directory_name}}/{{cookiecutter.file_name}}.txt")
-        assert res == 0
diff --git a/template/{{cookiecutter.advendofcode2020}}/src/adventofcode2020/solutions/data/{{cookiecutter.directory_name}}/{{cookiecutter.file_name}}.txt b/template/{{cookiecutter.advendofcode2020}}/src/adventofcode2020/solutions/data/{{cookiecutter.directory_name}}/{{cookiecutter.file_name}}.txt
deleted file mode 100644
index e69de29b..00000000
diff --git a/template/{{cookiecutter.advendofcode2020}}/src/adventofcode2020/solutions/{{cookiecutter.file_name}}.py b/template/{{cookiecutter.advendofcode2020}}/src/adventofcode2020/solutions/{{cookiecutter.file_name}}.py
deleted file mode 100644
index 1ff399b5..00000000
--- a/template/{{cookiecutter.advendofcode2020}}/src/adventofcode2020/solutions/{{cookiecutter.file_name}}.py
+++ /dev/null
@@ -1,15 +0,0 @@
-from adventofcode2020.utils.abstract import FileReaderSolution
-
-
-class {{cookiecutter.class_name}}:
-    pass
-
-
-class {{cookiecutter.class_name}}PartA({{cookiecutter.class_name}}, FileReaderSolution):
-    def solve(self, input_data: str) -> int:
-        raise NotImplementedError
-
-
-class {{cookiecutter.class_name}}PartB({{cookiecutter.class_name}}, FileReaderSolution):
-    def solve(self, input_data: str) -> int:
-        raise NotImplementedError
diff --git a/template/{{cookiecutter.advendofcode2020}}/tests/solutions/test_{{cookiecutter.file_name}}_a.py b/template/{{cookiecutter.advendofcode2020}}/tests/solutions/test_{{cookiecutter.file_name}}_a.py
deleted file mode 100644
index ae9e5997..00000000
--- a/template/{{cookiecutter.advendofcode2020}}/tests/solutions/test_{{cookiecutter.file_name}}_a.py
+++ /dev/null
@@ -1,19 +0,0 @@
-import pytest
-
-from adventofcode2020.solutions.{{cookiecutter.file_name}} import (
-    {{cookiecutter.class_name}}PartA,
-)
-
-
-class Test{{cookiecutter.class_name}}PartA:
-    @pytest.mark.parametrize(("input_data", "expected_result"), [("", ""), ("", "")])
-    def test_{{cookiecutter.file_name}}a_solve(self, input_data, expected_result):
-        solution = {{cookiecutter.class_name}}PartA()
-        result = solution.solve(input_data)
-        assert result == expected_result
-
-    def test_{{cookiecutter.file_name}}a_data(self):
-        """Result we got when we did the real solution"""
-        solution = {{cookiecutter.class_name}}PartA()
-        res = solution("{{cookiecutter.directory_name}}/{{cookiecutter.file_name}}.txt")
-        assert res == 0
diff --git a/template/{{cookiecutter.advendofcode2020}}/tests/solutions/test_{{cookiecutter.file_name}}_b.py b/template/{{cookiecutter.advendofcode2020}}/tests/solutions/test_{{cookiecutter.file_name}}_b.py
deleted file mode 100644
index fa002abb..00000000
--- a/template/{{cookiecutter.advendofcode2020}}/tests/solutions/test_{{cookiecutter.file_name}}_b.py
+++ /dev/null
@@ -1,19 +0,0 @@
-import pytest
-
-from adventofcode2020.solutions.{{cookiecutter.file_name}} import (
-    {{cookiecutter.class_name}}PartB,
-)
-
-
-class Test{{cookiecutter.class_name}}PartB:
-    @pytest.mark.parametrize(("input_data", "expected_result"), [("", ""), ("", "")])
-    def test_{{cookiecutter.file_name}}b_solve(self, input_data, expected_result):
-        solution = {{cookiecutter.class_name}}PartB()
-        result = solution.solve(input_data)
-        assert result == expected_result
-
-    def test_{{cookiecutter.file_name}}b_data(self):
-        """Result we got when we did the real solution"""
-        solution = {{cookiecutter.class_name}}PartB()
-        res = solution("{{cookiecutter.directory_name}}/{{cookiecutter.file_name}}.txt")
-        assert res == 0
diff --git a/template/{{cookiecutter.advendofcode2021}}/src/adventofcode2021/solutions/data/{{cookiecutter.directory_name}}/{{cookiecutter.file_name}}.txt b/template/{{cookiecutter.advendofcode2021}}/src/adventofcode2021/solutions/data/{{cookiecutter.directory_name}}/{{cookiecutter.file_name}}.txt
deleted file mode 100644
index e69de29b..00000000
diff --git a/template/{{cookiecutter.advendofcode2021}}/src/adventofcode2021/solutions/{{cookiecutter.file_name}}.py b/template/{{cookiecutter.advendofcode2021}}/src/adventofcode2021/solutions/{{cookiecutter.file_name}}.py
deleted file mode 100644
index 8e7a5c9b..00000000
--- a/template/{{cookiecutter.advendofcode2021}}/src/adventofcode2021/solutions/{{cookiecutter.file_name}}.py
+++ /dev/null
@@ -1,15 +0,0 @@
-from adventofcode2021.utils.abstract import FileReaderSolution
-
-
-class {{cookiecutter.class_name}}:
-    pass
-
-
-class {{cookiecutter.class_name}}PartA({{cookiecutter.class_name}}, FileReaderSolution):
-    def solve(self, input_data: str) -> int:
-        raise NotImplementedError
-
-
-class {{cookiecutter.class_name}}PartB({{cookiecutter.class_name}}, FileReaderSolution):
-    def solve(self, input_data: str) -> int:
-        raise NotImplementedError
diff --git a/template/{{cookiecutter.advendofcode2021}}/tests/solutions/test_{{cookiecutter.file_name}}_a.py b/template/{{cookiecutter.advendofcode2021}}/tests/solutions/test_{{cookiecutter.file_name}}_a.py
deleted file mode 100644
index d94d9bb0..00000000
--- a/template/{{cookiecutter.advendofcode2021}}/tests/solutions/test_{{cookiecutter.file_name}}_a.py
+++ /dev/null
@@ -1,19 +0,0 @@
-import pytest
-
-from adventofcode2021.solutions.{{cookiecutter.file_name}} import {{cookiecutter.class_name}}PartA
-
-
-class Test{{cookiecutter.class_name}}PartA:
-    @pytest.mark.xfail(reason="Not yet implemented", raises=NotImplementedError)
-    @pytest.mark.parametrize(("input_data", "expected_result"), [("", ""), ("", "")])
-    def test_{{cookiecutter.file_name}}a_solve(self, input_data, expected_result):
-        solution = {{cookiecutter.class_name}}PartA()
-        result = solution.solve(input_data)
-        assert result == expected_result
-
-    @pytest.mark.xfail(reason="Not yet implemented", raises=NotImplementedError)
-    def test_{{cookiecutter.file_name}}a_data(self):
-        """Result we got when we did the real solution"""
-        solution = {{cookiecutter.class_name}}PartA()
-        res = solution("{{cookiecutter.directory_name}}/{{cookiecutter.file_name}}.txt")
-        assert res == 0
diff --git a/template/{{cookiecutter.advendofcode2021}}/tests/solutions/test_{{cookiecutter.file_name}}_b.py b/template/{{cookiecutter.advendofcode2021}}/tests/solutions/test_{{cookiecutter.file_name}}_b.py
deleted file mode 100644
index 9a2b7fab..00000000
--- a/template/{{cookiecutter.advendofcode2021}}/tests/solutions/test_{{cookiecutter.file_name}}_b.py
+++ /dev/null
@@ -1,19 +0,0 @@
-import pytest
-
-from adventofcode2021.solutions.{{cookiecutter.file_name}} import {{cookiecutter.class_name}}PartB
-
-
-class Test{{cookiecutter.class_name}}PartB:
-    @pytest.mark.xfail(reason="Not yet implemented", raises=NotImplementedError)
-    @pytest.mark.parametrize(("input_data", "expected_result"), [("", ""), ("", "")])
-    def test_{{cookiecutter.file_name}}b_solve(self, input_data, expected_result):
-        solution = {{cookiecutter.class_name}}PartB()
-        result = solution.solve(input_data)
-        assert result == expected_result
-
-    @pytest.mark.xfail(reason="Not yet implemented", raises=NotImplementedError)
-    def test_{{cookiecutter.file_name}}b_data(self):
-        """Result we got when we did the real solution"""
-        solution = {{cookiecutter.class_name}}PartB()
-        res = solution("{{cookiecutter.directory_name}}/{{cookiecutter.file_name}}.txt")
-        assert res == 0
diff --git a/template/{{cookiecutter.advendofcode2022}}/src/adventofcode2022/solutions/data/{{cookiecutter.directory_name}}/{{cookiecutter.file_name}}.txt b/template/{{cookiecutter.advendofcode2022}}/src/adventofcode2022/solutions/data/{{cookiecutter.directory_name}}/{{cookiecutter.file_name}}.txt
deleted file mode 100644
index e69de29b..00000000
diff --git a/template/{{cookiecutter.advendofcode2022}}/src/adventofcode2022/solutions/data/{{cookiecutter.directory_name}}/{{cookiecutter.file_name}}_test.txt b/template/{{cookiecutter.advendofcode2022}}/src/adventofcode2022/solutions/data/{{cookiecutter.directory_name}}/{{cookiecutter.file_name}}_test.txt
deleted file mode 100644
index e69de29b..00000000
diff --git a/template/{{cookiecutter.advendofcode2022}}/src/adventofcode2022/solutions/{{cookiecutter.file_name}}.py b/template/{{cookiecutter.advendofcode2022}}/src/adventofcode2022/solutions/{{cookiecutter.file_name}}.py
deleted file mode 100644
index 077e744e..00000000
--- a/template/{{cookiecutter.advendofcode2022}}/src/adventofcode2022/solutions/{{cookiecutter.file_name}}.py
+++ /dev/null
@@ -1,15 +0,0 @@
-from adventofcode2022.utils.abstract import FileReaderSolution
-
-
-class {{cookiecutter.class_name}}:
-    pass
-
-
-class {{cookiecutter.class_name}}PartA({{cookiecutter.class_name}}, FileReaderSolution):
-    def solve(self, input_data: str) -> int:
-        raise NotImplementedError
-
-
-class {{cookiecutter.class_name}}PartB({{cookiecutter.class_name}}, FileReaderSolution):
-    def solve(self, input_data: str) -> int:
-        raise NotImplementedError
diff --git a/template/{{cookiecutter.advendofcode2022}}/tests/solutions/test_{{cookiecutter.file_name}}_a.py b/template/{{cookiecutter.advendofcode2022}}/tests/solutions/test_{{cookiecutter.file_name}}_a.py
deleted file mode 100644
index 0d99b9f1..00000000
--- a/template/{{cookiecutter.advendofcode2022}}/tests/solutions/test_{{cookiecutter.file_name}}_a.py
+++ /dev/null
@@ -1,19 +0,0 @@
-import pytest
-
-from adventofcode2022.solutions.{{cookiecutter.file_name}} import {{cookiecutter.class_name}}PartA
-
-
-class Test{{cookiecutter.class_name}}PartA:
-    @pytest.mark.xfail(reason="Not yet implemented", raises=NotImplementedError)
-    @pytest.mark.parametrize(("input_data", "expected_result"), [("", ""), ("", "")])
-    def test_{{cookiecutter.file_name}}a_solve(self, input_data, expected_result):
-        solution = {{cookiecutter.class_name}}PartA()
-        result = solution.solve(input_data)
-        assert result == expected_result
-
-    @pytest.mark.xfail(reason="Not yet implemented", raises=NotImplementedError)
-    def test_{{cookiecutter.file_name}}a_data(self):
-        """Result we got when we did the real solution"""
-        solution = {{cookiecutter.class_name}}PartA()
-        res = solution("{{cookiecutter.directory_name}}/{{cookiecutter.file_name}}.txt")
-        assert res == 0
diff --git a/template/{{cookiecutter.advendofcode2016}}/src/adventofcode2016/solutions/data/{{cookiecutter.directory_name}}/{{cookiecutter.file_name}}.txt b/template/{{cookiecutter}}/src/adventofcode{{cookiecutter.year}}/solutions/data/{{cookiecutter.directory_name}}/{{cookiecutter.file_name}}.txt
similarity index 100%
rename from template/{{cookiecutter.advendofcode2016}}/src/adventofcode2016/solutions/data/{{cookiecutter.directory_name}}/{{cookiecutter.file_name}}.txt
rename to template/{{cookiecutter}}/src/adventofcode{{cookiecutter.year}}/solutions/data/{{cookiecutter.directory_name}}/{{cookiecutter.file_name}}.txt
diff --git a/template/{{cookiecutter.advendofcode2016}}/src/adventofcode2016/solutions/{{cookiecutter.file_name}}.py b/template/{{cookiecutter}}/src/adventofcode{{cookiecutter.year}}/solutions/{{cookiecutter.file_name}}.py
similarity index 87%
rename from template/{{cookiecutter.advendofcode2016}}/src/adventofcode2016/solutions/{{cookiecutter.file_name}}.py
rename to template/{{cookiecutter}}/src/adventofcode{{cookiecutter.year}}/solutions/{{cookiecutter.file_name}}.py
index c9dbeb81..06b803b0 100644
--- a/template/{{cookiecutter.advendofcode2016}}/src/adventofcode2016/solutions/{{cookiecutter.file_name}}.py
+++ b/template/{{cookiecutter}}/src/adventofcode{{cookiecutter.year}}/solutions/{{cookiecutter.file_name}}.py
@@ -1,6 +1,6 @@
 from __future__ import annotations
 
-from adventofcode2016.utils.abstract import FileReaderSolution
+from adventofcode.utils.abstract import FileReaderSolution
 
 
 class {{cookiecutter.class_name}}:
diff --git a/template/{{cookiecutter.advendofcode2016}}/tests/solutions/test_{{cookiecutter.file_name}}_a.py b/template/{{cookiecutter}}/tests/adventofcode{{cookiecutter.year}}/test_{{cookiecutter.file_name}}_a.py
similarity index 87%
rename from template/{{cookiecutter.advendofcode2016}}/tests/solutions/test_{{cookiecutter.file_name}}_a.py
rename to template/{{cookiecutter}}/tests/adventofcode{{cookiecutter.year}}/test_{{cookiecutter.file_name}}_a.py
index b1d0d5d4..515a3891 100644
--- a/template/{{cookiecutter.advendofcode2016}}/tests/solutions/test_{{cookiecutter.file_name}}_a.py
+++ b/template/{{cookiecutter}}/tests/adventofcode{{cookiecutter.year}}/test_{{cookiecutter.file_name}}_a.py
@@ -1,6 +1,6 @@
 import pytest
 
-from adventofcode2016.solutions.{{cookiecutter.file_name}} import {{cookiecutter.class_name}}PartA
+from adventofcode{{cookiecutter.year}}.solutions.{{cookiecutter.file_name}} import {{cookiecutter.class_name}}PartA
 
 
 class Test{{cookiecutter.class_name}}PartA:
diff --git a/template/{{cookiecutter.advendofcode2022}}/tests/solutions/test_{{cookiecutter.file_name}}_b.py b/template/{{cookiecutter}}/tests/adventofcode{{cookiecutter.year}}/test_{{cookiecutter.file_name}}_b.py
similarity index 87%
rename from template/{{cookiecutter.advendofcode2022}}/tests/solutions/test_{{cookiecutter.file_name}}_b.py
rename to template/{{cookiecutter}}/tests/adventofcode{{cookiecutter.year}}/test_{{cookiecutter.file_name}}_b.py
index e7743f7f..cba644f0 100644
--- a/template/{{cookiecutter.advendofcode2022}}/tests/solutions/test_{{cookiecutter.file_name}}_b.py
+++ b/template/{{cookiecutter}}/tests/adventofcode{{cookiecutter.year}}/test_{{cookiecutter.file_name}}_b.py
@@ -1,6 +1,6 @@
 import pytest
 
-from adventofcode2022.solutions.{{cookiecutter.file_name}} import {{cookiecutter.class_name}}PartB
+from adventofcode{{cookiecutter.year}}.solutions.{{cookiecutter.file_name}} import {{cookiecutter.class_name}}PartB
 
 
 class Test{{cookiecutter.class_name}}PartB:

From bd1a58b102bf1abfdf04adbbb502c5e2dca0bfc2 Mon Sep 17 00:00:00 2001
From: Roel Adriaans <roel.adriaans@asml.com>
Date: Tue, 28 Nov 2023 11:46:09 +0100
Subject: [PATCH 319/371] Creating base files now works

---
 src/adventofcode/main.py                                        | 2 +-
 template/cookiecutter.json                                      | 2 +-
 .../{{cookiecutter.file_name}}.txt                              | 0
 .../solutions/{{cookiecutter.file_name}}.py                     | 0
 .../test_{{cookiecutter.file_name}}_a.py                        | 0
 .../test_{{cookiecutter.file_name}}_b.py                        | 0
 6 files changed, 2 insertions(+), 2 deletions(-)
 rename template/{{{cookiecutter}} => {{cookiecutter.adventofcode}}}/src/adventofcode{{cookiecutter.year}}/solutions/data/{{cookiecutter.directory_name}}/{{cookiecutter.file_name}}.txt (100%)
 rename template/{{{cookiecutter}} => {{cookiecutter.adventofcode}}}/src/adventofcode{{cookiecutter.year}}/solutions/{{cookiecutter.file_name}}.py (100%)
 rename template/{{{cookiecutter}} => {{cookiecutter.adventofcode}}}/tests/adventofcode{{cookiecutter.year}}/test_{{cookiecutter.file_name}}_a.py (100%)
 rename template/{{{cookiecutter}} => {{cookiecutter.adventofcode}}}/tests/adventofcode{{cookiecutter.year}}/test_{{cookiecutter.file_name}}_b.py (100%)

diff --git a/src/adventofcode/main.py b/src/adventofcode/main.py
index 07f79e05..70464c52 100644
--- a/src/adventofcode/main.py
+++ b/src/adventofcode/main.py
@@ -136,7 +136,7 @@ def create_solution(force, year, day):
     cookiecutter(
         "template/",
         no_input=True,
-        extra_context={"day": day},
+        extra_context={"day": day, "year": year},
         overwrite_if_exists=True,
     )
 
diff --git a/template/cookiecutter.json b/template/cookiecutter.json
index 35281e37..edb0bde0 100644
--- a/template/cookiecutter.json
+++ b/template/cookiecutter.json
@@ -1,5 +1,5 @@
 {
-    "advendofcode": ".",
+    "adventofcode": ".",
     "day": "32",
     "year": "2030",
     "directory_name": "day_{{cookiecutter.day}}",
diff --git a/template/{{cookiecutter}}/src/adventofcode{{cookiecutter.year}}/solutions/data/{{cookiecutter.directory_name}}/{{cookiecutter.file_name}}.txt b/template/{{cookiecutter.adventofcode}}/src/adventofcode{{cookiecutter.year}}/solutions/data/{{cookiecutter.directory_name}}/{{cookiecutter.file_name}}.txt
similarity index 100%
rename from template/{{cookiecutter}}/src/adventofcode{{cookiecutter.year}}/solutions/data/{{cookiecutter.directory_name}}/{{cookiecutter.file_name}}.txt
rename to template/{{cookiecutter.adventofcode}}/src/adventofcode{{cookiecutter.year}}/solutions/data/{{cookiecutter.directory_name}}/{{cookiecutter.file_name}}.txt
diff --git a/template/{{cookiecutter}}/src/adventofcode{{cookiecutter.year}}/solutions/{{cookiecutter.file_name}}.py b/template/{{cookiecutter.adventofcode}}/src/adventofcode{{cookiecutter.year}}/solutions/{{cookiecutter.file_name}}.py
similarity index 100%
rename from template/{{cookiecutter}}/src/adventofcode{{cookiecutter.year}}/solutions/{{cookiecutter.file_name}}.py
rename to template/{{cookiecutter.adventofcode}}/src/adventofcode{{cookiecutter.year}}/solutions/{{cookiecutter.file_name}}.py
diff --git a/template/{{cookiecutter}}/tests/adventofcode{{cookiecutter.year}}/test_{{cookiecutter.file_name}}_a.py b/template/{{cookiecutter.adventofcode}}/tests/adventofcode{{cookiecutter.year}}/test_{{cookiecutter.file_name}}_a.py
similarity index 100%
rename from template/{{cookiecutter}}/tests/adventofcode{{cookiecutter.year}}/test_{{cookiecutter.file_name}}_a.py
rename to template/{{cookiecutter.adventofcode}}/tests/adventofcode{{cookiecutter.year}}/test_{{cookiecutter.file_name}}_a.py
diff --git a/template/{{cookiecutter}}/tests/adventofcode{{cookiecutter.year}}/test_{{cookiecutter.file_name}}_b.py b/template/{{cookiecutter.adventofcode}}/tests/adventofcode{{cookiecutter.year}}/test_{{cookiecutter.file_name}}_b.py
similarity index 100%
rename from template/{{cookiecutter}}/tests/adventofcode{{cookiecutter.year}}/test_{{cookiecutter.file_name}}_b.py
rename to template/{{cookiecutter.adventofcode}}/tests/adventofcode{{cookiecutter.year}}/test_{{cookiecutter.file_name}}_b.py

From 4fb13c3544909717768667238f30b78719ed382b Mon Sep 17 00:00:00 2001
From: Roel Adriaans <roel.adriaans@asml.com>
Date: Tue, 28 Nov 2023 11:57:53 +0100
Subject: [PATCH 320/371] Write file to the correct location, fix typo

---
 src/adventofcode/main.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/adventofcode/main.py b/src/adventofcode/main.py
index 70464c52..d9b4d67b 100644
--- a/src/adventofcode/main.py
+++ b/src/adventofcode/main.py
@@ -144,7 +144,7 @@ def create_solution(force, year, day):
 def _get_session():
     session = os.environ.get("AOC_SESSION")
     if not session:
-        print("AOC_SESSION key is not set in envonrment or .env file")
+        print("AOC_SESSION key is not set in environment or .env file")
         sys.exit(-65)
     return session
 
@@ -174,8 +174,8 @@ def download_input_data(year: str, day: str):
     logger.debug(f"Received data, length {len(r.content)}")
 
     data_path = f"day_{day}/day{day}.txt"
-    root_dir = Path(__file__).parent
-    filename = root_dir / "solutions" / "data" / data_path
+    root_dir = Path(__file__).parent.parent
+    filename = root_dir / f"adventofcode{year}" / "solutions" / "data" / data_path
     with open(filename, "wb") as f:
         f.write(r.content)
 

From 261a4ef021cea3e3ffe5a55f6a983d1099a51e67 Mon Sep 17 00:00:00 2001
From: Roel Adriaans <roel.adriaans@asml.com>
Date: Tue, 28 Nov 2023 11:59:02 +0100
Subject: [PATCH 321/371] Also create empty test file

---
 .../{{cookiecutter.file_name}}_test.txt                           | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 create mode 100644 template/{{cookiecutter.adventofcode}}/src/adventofcode{{cookiecutter.year}}/solutions/data/{{cookiecutter.directory_name}}/{{cookiecutter.file_name}}_test.txt

diff --git a/template/{{cookiecutter.adventofcode}}/src/adventofcode{{cookiecutter.year}}/solutions/data/{{cookiecutter.directory_name}}/{{cookiecutter.file_name}}_test.txt b/template/{{cookiecutter.adventofcode}}/src/adventofcode{{cookiecutter.year}}/solutions/data/{{cookiecutter.directory_name}}/{{cookiecutter.file_name}}_test.txt
new file mode 100644
index 00000000..e69de29b

From e09783534700f2a0d826d628bb3b1400947de7e0 Mon Sep 17 00:00:00 2001
From: Roel Adriaans <roel.adriaans@asml.com>
Date: Tue, 28 Nov 2023 12:01:11 +0100
Subject: [PATCH 322/371] Update readme

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 0db80946..2eb7c37b 100644
--- a/README.md
+++ b/README.md
@@ -8,7 +8,7 @@ Code is in src/adventofcode<years>, tests are in tests/
 ✅ Create a global adventofcode tool
 ✅ Add --year to adventofcode function
 ✅ Use adventofcodeutils package instead of utils per year
-- Update coockiecutter templates
+✅- Update coockiecutter templates
 - Update documentation, currently copied from the latest version (2016)
 - Complete all puzzles (Doh)
 

From cfe3452db8aa4cc0fdfcde1ee01a5844bd64f4ae Mon Sep 17 00:00:00 2001
From: Roel Adriaans <roel.adriaans@asml.com>
Date: Tue, 28 Nov 2023 13:30:20 +0100
Subject: [PATCH 323/371] Fix day 12 under windows

---
 src/adventofcode2019/solutions/day12.py | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/adventofcode2019/solutions/day12.py b/src/adventofcode2019/solutions/day12.py
index 0231a6e2..840b4fda 100644
--- a/src/adventofcode2019/solutions/day12.py
+++ b/src/adventofcode2019/solutions/day12.py
@@ -187,6 +187,11 @@ def solve(self, input_data: str) -> int:
         repeating_z = self.find_returning(galaxy, "z")
 
         # Find the lowest common multiple for all the axis
-        repeating = np.lcm.reduce([repeating_x, repeating_y, repeating_z])
+        # Create a numpy array with int64. On windows the array is only 32 bits,
+        # leading to an overflow. On Linux, by default, it's 64 bits. See
+        # https://stackoverflow.com/a/72483130/550104
+
+        found_steps = np.array([repeating_x, repeating_y, repeating_z], dtype=np.int64)
+        repeating = np.lcm.reduce(found_steps)
 
         return repeating

From 4c9d183e8ed3ae4b0891d2abf574bc1ada0ab63f Mon Sep 17 00:00:00 2001
From: Roel Adriaans <roel.adriaans@asml.com>
Date: Tue, 28 Nov 2023 13:31:46 +0100
Subject: [PATCH 324/371] Move conftest from 2016 to all tests, remove conftest
 from 2022

---
 tests/adventofcode2022/conftest.py       | 27 ----------------------
 tests/{adventofcode2016 => }/conftest.py | 29 +++++++++++++++---------
 2 files changed, 18 insertions(+), 38 deletions(-)
 delete mode 100644 tests/adventofcode2022/conftest.py
 rename tests/{adventofcode2016 => }/conftest.py (54%)

diff --git a/tests/adventofcode2022/conftest.py b/tests/adventofcode2022/conftest.py
deleted file mode 100644
index 72c55462..00000000
--- a/tests/adventofcode2022/conftest.py
+++ /dev/null
@@ -1,27 +0,0 @@
-import pathlib
-
-import pytest
-
-
-@pytest.fixture
-def testdata(request) -> str:
-    """Load data from a testfile.
-    If `filename` is given, this file is loaded, otherwise the default `daynn_test.txt`
-    file is used.
-    """
-
-    # Parse the class name, eg
-    day = int("".join(x for x in request.keywords.parent.name if x.isdigit()))
-
-    test_path = (
-        pathlib.Path(__file__).parent.parent.parent
-        / "src"
-        / "adventofcode2022"
-        / "solutions"
-        / "data"
-        / f"day_{day:02}"
-        / f"day{day:02}_test.txt"
-    )
-    with open(test_path) as f:
-        test_data = f.read()
-    return test_data
diff --git a/tests/adventofcode2016/conftest.py b/tests/conftest.py
similarity index 54%
rename from tests/adventofcode2016/conftest.py
rename to tests/conftest.py
index 24da9980..558d36c4 100644
--- a/tests/adventofcode2016/conftest.py
+++ b/tests/conftest.py
@@ -1,14 +1,15 @@
 import pathlib
+import re
 
 import pytest
 
 
-def read_file(day: int, filename: str) -> str:
+def read_file(year: int, day: int, filename: str) -> str:
     """Load data from a file in data directory."""
     test_path = (
-        pathlib.Path(__file__).parent.parent.parent
+        pathlib.Path(__file__).parent.parent
         / "src"
-        / "adventofcode2016"
+        / f"adventofcode{year}"
         / "solutions"
         / "data"
         / f"day_{day:02}"
@@ -19,30 +20,36 @@ def read_file(day: int, filename: str) -> str:
     return test_data
 
 
-def parse_classname(request) -> int:
+def parse_classname(request) -> tuple[int, int]:
     # Parse the class name
     day = int("".join(x for x in request.keywords.parent.name if x.isdigit()))
-    return day
+    year = re.findall(r"adventofcode(\d{4})", repr(request.keywords.parent.cls))
+    if not year:
+        raise ValueError("Path not found")
+    else:
+        year = int(year[0])
+
+    return year, day
 
 
 @pytest.fixture
 def testdata(request) -> str:
     """Load data from a testfile."""
-    day = parse_classname(request)
-    return read_file(day, f"day{day:02}_test.txt")
+    year, day = parse_classname(request)
+    return read_file(year, day, f"day{day:02}_test.txt")
 
 
 @pytest.fixture
 def testdata_by_postfix(postfix, request) -> str:
     """Run with `testdata_by_postfix("test2")` to load `day03_test2.txt`"""
     """Load data from a testfile."""
-    day = parse_classname(request)
+    year, day = parse_classname(request)
     filename = f"day{day:02}_{postfix}.txt"
-    return read_file(day, filename)
+    return read_file(year, day, filename)
 
 
 @pytest.fixture
 def solutiondata(request) -> str:
     """Load data from a solution file."""
-    day = parse_classname(request)
-    return read_file(day, f"day{day:02}.txt")
+    year, day = parse_classname(request)
+    return read_file(year, day, f"day{day:02}.txt")

From 83b945d587ad7dc0bf37f8f2adcce205d55a4bd5 Mon Sep 17 00:00:00 2001
From: Roel Adriaans <roel.adriaans@asml.com>
Date: Tue, 28 Nov 2023 14:20:51 +0100
Subject: [PATCH 325/371] Use generic testdata pytest fixure for every  tests
 that loaded test data

---
 .../day_14/{test_data.txt => day14_test.txt}  |  0
 .../day_19/{test_data.txt => day19_test.txt}  |  0
 .../day_20/{test_data.txt => day20_test.txt}  |  0
 tests/adventofcode2021/test_day14_a.py        | 24 +++------------
 tests/adventofcode2021/test_day14_b.py        | 24 +++------------
 tests/adventofcode2021/test_day19_a.py        | 20 ++-----------
 tests/adventofcode2021/test_day19_b.py        | 20 ++-----------
 tests/adventofcode2021/test_day20_a.py        | 30 ++++---------------
 tests/adventofcode2021/test_day20_b.py        | 21 ++-----------
 9 files changed, 20 insertions(+), 119 deletions(-)
 rename src/adventofcode2021/solutions/data/day_14/{test_data.txt => day14_test.txt} (100%)
 rename src/adventofcode2021/solutions/data/day_19/{test_data.txt => day19_test.txt} (100%)
 rename src/adventofcode2021/solutions/data/day_20/{test_data.txt => day20_test.txt} (100%)

diff --git a/src/adventofcode2021/solutions/data/day_14/test_data.txt b/src/adventofcode2021/solutions/data/day_14/day14_test.txt
similarity index 100%
rename from src/adventofcode2021/solutions/data/day_14/test_data.txt
rename to src/adventofcode2021/solutions/data/day_14/day14_test.txt
diff --git a/src/adventofcode2021/solutions/data/day_19/test_data.txt b/src/adventofcode2021/solutions/data/day_19/day19_test.txt
similarity index 100%
rename from src/adventofcode2021/solutions/data/day_19/test_data.txt
rename to src/adventofcode2021/solutions/data/day_19/day19_test.txt
diff --git a/src/adventofcode2021/solutions/data/day_20/test_data.txt b/src/adventofcode2021/solutions/data/day_20/day20_test.txt
similarity index 100%
rename from src/adventofcode2021/solutions/data/day_20/test_data.txt
rename to src/adventofcode2021/solutions/data/day_20/day20_test.txt
diff --git a/tests/adventofcode2021/test_day14_a.py b/tests/adventofcode2021/test_day14_a.py
index 69612a27..3ab70ccc 100644
--- a/tests/adventofcode2021/test_day14_a.py
+++ b/tests/adventofcode2021/test_day14_a.py
@@ -1,26 +1,10 @@
-import pathlib
-
 from adventofcode2021.solutions.day14 import Day14PartA
 
 
 class TestDay14PartA:
-    def load_testdata(self):
-        test_path = (
-            pathlib.Path(__file__).parent.parent.parent
-            / "src"
-            / "adventofcode2021"
-            / "solutions"
-            / "data"
-            / "day_14"
-            / "test_data.txt"
-        )
-        with open(test_path) as f:
-            test_data = f.read()
-        return test_data
-
-    def test_day14a_steps(self):
+    def test_day14a_steps(self, testdata):
         solution = Day14PartA()
-        solution.initialize(self.load_testdata())
+        solution.initialize(testdata)
 
         assert "".join(solution.polimers_to_list()) == "NNCB"
 
@@ -37,9 +21,9 @@ def test_day14a_steps(self):
             == "NBBNBNBBCCNBCNCCNBBNBBNBBBNBBNBBCBHCBHHNHCBBCBHCB"
         )
 
-    def test_day14a_solve(self):
+    def test_day14a_solve(self, testdata):
         solution = Day14PartA()
-        result = solution.solve(self.load_testdata())
+        result = solution.solve(testdata)
         assert result == 1588
 
     def test_day14a_data(self):
diff --git a/tests/adventofcode2021/test_day14_b.py b/tests/adventofcode2021/test_day14_b.py
index 0243b20d..18ccdbd6 100644
--- a/tests/adventofcode2021/test_day14_b.py
+++ b/tests/adventofcode2021/test_day14_b.py
@@ -1,26 +1,10 @@
-import pathlib
-
 from adventofcode2021.solutions.day14 import Day14PartB
 
 
 class TestDay14PartB:
-    def load_testdata(self):
-        test_path = (
-            pathlib.Path(__file__).parent.parent.parent
-            / "src"
-            / "adventofcode2021"
-            / "solutions"
-            / "data"
-            / "day_14"
-            / "test_data.txt"
-        )
-        with open(test_path) as f:
-            test_data = f.read()
-        return test_data
-
-    def test_day14a_steps(self):
+    def test_day14a_steps(self, testdata):
         solution = Day14PartB()
-        solution.initialize(self.load_testdata())
+        solution.initialize(testdata)
 
         assert list(solution.cnt.keys()) == ["NN", "NC", "CB"]
 
@@ -39,9 +23,9 @@ def test_day14a_steps(self):
             "HC",
         ]
 
-    def test_day14b_solve(self):
+    def test_day14b_solve(self, testdata):
         solution = Day14PartB()
-        result = solution.solve(self.load_testdata())
+        result = solution.solve(testdata)
         assert result == 2188189693529
 
     def test_day14b_data(self):
diff --git a/tests/adventofcode2021/test_day19_a.py b/tests/adventofcode2021/test_day19_a.py
index 2b4bfa81..7896159b 100644
--- a/tests/adventofcode2021/test_day19_a.py
+++ b/tests/adventofcode2021/test_day19_a.py
@@ -1,26 +1,10 @@
-import pathlib
-
 from adventofcode2021.solutions.day19 import Day19PartA
 
 
 class TestDay19PartA:
-    def load_testdata(self):
-        test_path = (
-            pathlib.Path(__file__).parent.parent.parent
-            / "src"
-            / "adventofcode2021"
-            / "solutions"
-            / "data"
-            / "day_19"
-            / "test_data.txt"
-        )
-        with open(test_path) as f:
-            test_data = f.read()
-        return test_data
-
-    def test_day19a_solve(self):
+    def test_day19a_solve(self, testdata):
         solution = Day19PartA()
-        result = solution.solve(self.load_testdata())
+        result = solution.solve(testdata)
         assert result == 79
 
     def test_day19a_data(self):
diff --git a/tests/adventofcode2021/test_day19_b.py b/tests/adventofcode2021/test_day19_b.py
index b92fb659..791792b1 100644
--- a/tests/adventofcode2021/test_day19_b.py
+++ b/tests/adventofcode2021/test_day19_b.py
@@ -1,26 +1,10 @@
-import pathlib
-
 from adventofcode2021.solutions.day19 import Day19PartB
 
 
 class TestDay19PartB:
-    def load_testdata(self):
-        test_path = (
-            pathlib.Path(__file__).parent.parent.parent
-            / "src"
-            / "adventofcode2021"
-            / "solutions"
-            / "data"
-            / "day_19"
-            / "test_data.txt"
-        )
-        with open(test_path) as f:
-            test_data = f.read()
-        return test_data
-
-    def test_day19b_solve(self):
+    def test_day19b_solve(self, testdata):
         solution = Day19PartB()
-        result = solution.solve(self.load_testdata())
+        result = solution.solve(testdata)
         assert result == 3621
 
     def test_day19b_data(self):
diff --git a/tests/adventofcode2021/test_day20_a.py b/tests/adventofcode2021/test_day20_a.py
index 50614d7f..af1cb254 100644
--- a/tests/adventofcode2021/test_day20_a.py
+++ b/tests/adventofcode2021/test_day20_a.py
@@ -1,30 +1,12 @@
-import pathlib
-
 from adventofcodeutils.point import XYPoint as Point
 
 from adventofcode2021.solutions.day20 import Day20PartA
 
 
 class TestDay20PartA:
-    @staticmethod
-    def load_testdata():
-        test_path = (
-            pathlib.Path(__file__).parent.parent.parent
-            / "src"
-            / "adventofcode2021"
-            / "solutions"
-            / "data"
-            / "day_20"
-            / "test_data.txt"
-        )
-        with open(test_path) as f:
-            test_data = f.read()
-        return test_data
-
-    def test_parsing(self):
-        data = self.load_testdata()
+    def test_parsing(self, testdata):
         solution = Day20PartA()
-        solution.parse(data)
+        solution.parse(testdata)
 
         assert len(solution.enhancement) == 512
 
@@ -32,9 +14,9 @@ def test_parsing(self):
         assert solution.image[Point(1, 0)] is True
         assert solution.image[Point(0, 1)] is False
 
-    def test_points(self):
+    def test_points(self, testdata):
         solution = Day20PartA()
-        solution.parse(self.load_testdata())
+        solution.parse(testdata)
         assert not solution.special_case
         points = solution.get_pixels(Point(5, 10))
         assert len(points) == 9
@@ -56,9 +38,9 @@ def test_points(self):
         assert idx == 34
         assert solution.points_to_pixel(points) is True
 
-    def test_day20a_solve(self):
+    def test_day20a_solve(self, testdata):
         solution = Day20PartA()
-        result = solution.solve(self.load_testdata())
+        result = solution.solve(testdata)
         assert result == 35
 
     def test_day20a_data(self):
diff --git a/tests/adventofcode2021/test_day20_b.py b/tests/adventofcode2021/test_day20_b.py
index 53162232..91d4c6e1 100644
--- a/tests/adventofcode2021/test_day20_b.py
+++ b/tests/adventofcode2021/test_day20_b.py
@@ -1,27 +1,10 @@
-import pathlib
-
 from adventofcode2021.solutions.day20 import Day20PartB
 
 
 class TestDay20PartB:
-    @staticmethod
-    def load_testdata():
-        test_path = (
-            pathlib.Path(__file__).parent.parent.parent
-            / "src"
-            / "adventofcode2021"
-            / "solutions"
-            / "data"
-            / "day_20"
-            / "test_data.txt"
-        )
-        with open(test_path) as f:
-            test_data = f.read()
-        return test_data
-
-    def test_day20b_solve(self):
+    def test_day20b_solve(self, testdata):
         solution = Day20PartB()
-        result = solution.solve(self.load_testdata())
+        result = solution.solve(testdata)
         assert result == 3351
 
     def test_day20b_data(self):

From dfccedbb4675a3aaa2ff6fbdd78a0ba4c84e9b66 Mon Sep 17 00:00:00 2001
From: Roel Adriaans <roel.adriaans@asml.com>
Date: Tue, 28 Nov 2023 14:41:06 +0100
Subject: [PATCH 326/371] Update readme

---
 README.md | 26 ++++++++++----------------
 1 file changed, 10 insertions(+), 16 deletions(-)

diff --git a/README.md b/README.md
index 2eb7c37b..43e47cd0 100644
--- a/README.md
+++ b/README.md
@@ -1,15 +1,10 @@
-# Advent of Code 2016, 2019, 2020, 2021 and 2022
+# Advent of Code 2016, 2019, 2020, 2021, 2022 and ...
 
 Advent of Code for some years with tests and utils etc.
 Code is in src/adventofcode<years>, tests are in tests/
 
 ## Todo
 
-✅ Create a global adventofcode tool
-✅ Add --year to adventofcode function
-✅ Use adventofcodeutils package instead of utils per year
-✅- Update coockiecutter templates
-- Update documentation, currently copied from the latest version (2016)
 - Complete all puzzles (Doh)
 
 ## Create a new day
@@ -39,27 +34,26 @@ in your browser after you've logged in.
 ## Cookiecutter
 
 To create a new day with the CookieCutter version run the command from the
-`advent2016` directory.
+`adventofcode` directory.
+
+Preferred option is to use the `adventofcode` util, since this util also downloads the solution data.
+
+To use cookiecutter:
 
 ```shell script
 cookiecutter template -f
 ```
 
 Answer the questions:
-* `advendofcode2016` : Accept default answer. This installs the result in the current directory
-* `day` : Answer with day you're working on, with leading zero. Eg: 07, 10, 31.
-* `directory_name`, `file_name`, `class_name` : Accept default answer
+* `adventofcode` : Accept default answer. This installs the result in the current directory.
+* `day` : Answer with the day you're working on, with leading zero. Eg: 07, 10, 31.
+* `year` : Answer with the year you're working on, eg 2023.
+* `directory_name`, `file_name`, `class_name` : Accept default answer.
 
 This will create the correct files in the `src` and `tests` directories.
 The `-f` option is required to make the files in the current subdirectory.
 When the project supports modules this is probably no longer needed.
 
-The new solution still have to be added to the `main.py` file.
-
-### Cookiecutter Todo
-
-* Nothing at the moment
-
 ## Install
 
 Install the application with:

From 27bc699bf1b3cd0d39a5261390e2153fd43608c3 Mon Sep 17 00:00:00 2001
From: Roel Adriaans <roel.adriaans@asml.com>
Date: Tue, 28 Nov 2023 14:54:10 +0100
Subject: [PATCH 327/371] Move from src/adventofcode<year>/solutions to
 src/adventofcode<year>

Eg, we remove the solutions path from the package.
---
 src/adventofcode/main.py                      |   6 +-
 src/adventofcode/utils/abstract.py            |   4 +-
 .../{solutions => }/data/day_01/day01.txt     |   0
 .../{solutions => }/data/day_02/day02.txt     |   0
 .../data/day_02/day02_test.txt                |   0
 .../{solutions => }/data/day_03/day03.txt     |   0
 .../data/day_03/day03_test.txt                |   0
 .../{solutions => }/data/day_04/day04.txt     |   0
 .../data/day_04/day04_test.txt                |   0
 .../{solutions => }/data/day_05/day05.txt     |   0
 .../{solutions => }/data/day_06/day06.txt     |   0
 .../data/day_06/day06_test.txt                |   0
 .../{solutions => }/data/day_07/day07.txt     |   0
 .../{solutions => }/data/day_08/day08.txt     |   0
 .../{solutions => }/data/day_09/day09.txt     |   0
 .../{solutions => }/data/day_10/day10.txt     |   0
 .../data/day_10/day10_test.txt                |   0
 .../{solutions => }/data/day_11/day11.txt     |   0
 .../data/day_11/day11_test.txt                |   0
 .../{solutions => }/data/day_12/day12.txt     |   0
 .../data/day_12/day12_test.txt                |   0
 .../{solutions => }/data/day_13/day13.txt     |   0
 .../{solutions => }/data/day_14/day14.txt     |   0
 .../{solutions => }/data/day_15/day15.txt     |   0
 .../data/day_15/day15_test.txt                |   0
 .../{solutions => }/data/day_16/day16.txt     |   0
 .../{solutions => }/data/day_17/day17.txt     |   0
 .../{solutions => }/data/day_18/day18.txt     |   0
 .../data/day_18/day18_test.txt                |   0
 .../data/day_18/day18_test2.txt               |   0
 .../{solutions => }/data/day_19/day19.txt     |   0
 .../{solutions => }/data/day_20/day20.txt     |   0
 .../data/day_20/day20_test.txt                |   0
 .../data/day_20/day20_test2.txt               |   0
 .../{solutions => }/data/day_21/day21.txt     |   0
 .../data/day_21/day21_test.txt                |   0
 .../{solutions => }/data/day_22/day22.txt     |   0
 src/adventofcode2016/{solutions => }/day01.py |   0
 src/adventofcode2016/{solutions => }/day02.py |   0
 src/adventofcode2016/{solutions => }/day03.py |   0
 src/adventofcode2016/{solutions => }/day04.py |   0
 src/adventofcode2016/{solutions => }/day05.py |   0
 src/adventofcode2016/{solutions => }/day06.py |   0
 src/adventofcode2016/{solutions => }/day07.py |   0
 src/adventofcode2016/{solutions => }/day08.py |   0
 src/adventofcode2016/{solutions => }/day09.py |   0
 src/adventofcode2016/{solutions => }/day10.py |   0
 src/adventofcode2016/{solutions => }/day11.py |   0
 src/adventofcode2016/{solutions => }/day12.py |   0
 src/adventofcode2016/{solutions => }/day13.py |   0
 src/adventofcode2016/{solutions => }/day14.py |   0
 src/adventofcode2016/{solutions => }/day15.py |   0
 src/adventofcode2016/{solutions => }/day16.py |   0
 src/adventofcode2016/{solutions => }/day17.py |   0
 src/adventofcode2016/{solutions => }/day18.py |   0
 src/adventofcode2016/{solutions => }/day19.py |   0
 src/adventofcode2016/{solutions => }/day20.py |   0
 src/adventofcode2016/{solutions => }/day21.py |   0
 src/adventofcode2016/{solutions => }/day22.py |   0
 .../{solutions => }/data/day_01/day01.txt     |   0
 .../{solutions => }/data/day_02/day02.txt     |   0
 .../{solutions => }/data/day_03/day03.txt     |   2 +-
 .../{solutions => }/data/day_04/day04.txt     |   0
 .../{solutions => }/data/day_05/day05.txt     |   0
 .../{solutions => }/data/day_06/day06.txt     |   0
 .../{solutions => }/data/day_07/day07.txt     |   2 +-
 .../{solutions => }/data/day_08/day08.txt     |   2 +-
 .../{solutions => }/data/day_09/day09.txt     |   2 +-
 .../{solutions => }/data/day_10/day10.txt     |   0
 .../{solutions => }/data/day_11/day11.txt     |   2 +-
 .../{solutions => }/data/day_12/day12.txt     |   2 +-
 .../{solutions => }/data/day_13/day13.txt     |   2 +-
 .../{solutions => }/data/day_14/day14.txt     |   2 +-
 .../{solutions => }/data/day_15/day15.txt     |   2 +-
 .../{solutions => }/data/day_16/day16.txt     |   2 +-
 .../{solutions => }/data/day_17/day17.txt     |   2 +-
 .../{solutions => }/data/infi/example.json    |   2 +-
 .../{solutions => }/data/infi/infi.json       |   0
 src/adventofcode2019/{solutions => }/day01.py |   0
 src/adventofcode2019/{solutions => }/day02.py |   2 +-
 src/adventofcode2019/{solutions => }/day03.py |   0
 src/adventofcode2019/{solutions => }/day04.py |   0
 src/adventofcode2019/{solutions => }/day05.py |   2 +-
 src/adventofcode2019/{solutions => }/day06.py |   0
 src/adventofcode2019/{solutions => }/day07.py |   2 +-
 src/adventofcode2019/{solutions => }/day08.py |   0
 src/adventofcode2019/{solutions => }/day09.py |   2 +-
 src/adventofcode2019/{solutions => }/day10.py |   0
 src/adventofcode2019/{solutions => }/day11.py |   2 +-
 src/adventofcode2019/{solutions => }/day12.py |   0
 src/adventofcode2019/{solutions => }/day13.py |   2 +-
 src/adventofcode2019/{solutions => }/day14.py |   0
 src/adventofcode2019/{solutions => }/day15.py |   2 +-
 src/adventofcode2019/{solutions => }/day16.py |   0
 src/adventofcode2019/{solutions => }/day17.py |   2 +-
 src/adventofcode2019/{solutions => }/infi.py  |   3 +-
 .../{solutions => }/intcode.py                |   0
 src/adventofcode2019/solutions/__init__.py    |   0
 .../{solutions => }/data/day_01/day01.txt     |   2 +-
 .../{solutions => }/data/day_02/day02.txt     |   2 +-
 .../{solutions => }/data/day_03/day03.txt     |   2 +-
 .../{solutions => }/data/day_04/day04.txt     |   2 +-
 .../{solutions => }/data/day_05/day05.txt     |   0
 .../{solutions => }/data/day_06/day06.txt     |   0
 .../{solutions => }/data/day_07/day07.txt     |   0
 .../{solutions => }/data/day_08/day08.txt     |   0
 .../{solutions => }/data/day_09/day09.txt     |   0
 .../{solutions => }/data/day_10/day10.txt     |   0
 .../{solutions => }/data/day_11/day11.txt     |   0
 .../{solutions => }/data/day_12/day12.txt     |   0
 .../{solutions => }/data/day_13/day13.txt     |   0
 .../{solutions => }/data/day_14/day14.txt     |   2 +-
 .../{solutions => }/data/day_15/day15.txt     |   0
 .../{solutions => }/data/day_16/day16.txt     |   0
 src/adventofcode2020/{solutions => }/day01.py |   0
 src/adventofcode2020/{solutions => }/day02.py |   0
 src/adventofcode2020/{solutions => }/day03.py |   0
 src/adventofcode2020/{solutions => }/day04.py |   0
 src/adventofcode2020/{solutions => }/day05.py |   0
 src/adventofcode2020/{solutions => }/day06.py |   0
 src/adventofcode2020/{solutions => }/day07.py |   0
 src/adventofcode2020/{solutions => }/day08.py |   2 +-
 src/adventofcode2020/{solutions => }/day09.py |   0
 src/adventofcode2020/{solutions => }/day10.py |   0
 src/adventofcode2020/{solutions => }/day11.py |   0
 src/adventofcode2020/{solutions => }/day12.py |   0
 src/adventofcode2020/{solutions => }/day13.py |   0
 src/adventofcode2020/{solutions => }/day14.py |   0
 src/adventofcode2020/{solutions => }/day15.py |   0
 src/adventofcode2020/{solutions => }/day16.py |   0
 .../{solutions => }/handheld.py               |   0
 src/adventofcode2020/solutions/__init__.py    |   0
 .../{solutions => }/data/day_01/day01.txt     |   0
 .../{solutions => }/data/day_02/day02.txt     |   0
 .../{solutions => }/data/day_03/day03.txt     |   0
 .../{solutions => }/data/day_04/day04.txt     |   0
 .../{solutions => }/data/day_05/day05.txt     |   0
 .../{solutions => }/data/day_06/day06.txt     |   0
 .../{solutions => }/data/day_07/day07.txt     |   0
 .../{solutions => }/data/day_08/day08.txt     |   0
 .../{solutions => }/data/day_09/day09.txt     |   0
 .../{solutions => }/data/day_10/day10.txt     |   0
 .../{solutions => }/data/day_11/day11.txt     |   0
 .../{solutions => }/data/day_12/day12.txt     |   0
 .../{solutions => }/data/day_13/day13.txt     |   0
 .../{solutions => }/data/day_14/day14.txt     |   0
 .../data/day_14/day14_test.txt                |   0
 .../{solutions => }/data/day_15/day15.txt     |   0
 .../{solutions => }/data/day_16/day16.txt     |   0
 .../{solutions => }/data/day_17/day17.txt     |   0
 .../{solutions => }/data/day_18/day18.txt     |   0
 .../{solutions => }/data/day_19/day19.txt     |   0
 .../data/day_19/day19_test.txt                |   0
 .../{solutions => }/data/day_20/day20.txt     |   0
 .../data/day_20/day20_test.txt                |   0
 .../{solutions => }/data/day_21/day21.txt     |   0
 .../{solutions => }/data/day_22/day22.txt     |   0
 src/adventofcode2021/{solutions => }/day01.py |   0
 src/adventofcode2021/{solutions => }/day02.py |   0
 src/adventofcode2021/{solutions => }/day03.py |   0
 src/adventofcode2021/{solutions => }/day04.py |   0
 src/adventofcode2021/{solutions => }/day05.py |   0
 src/adventofcode2021/{solutions => }/day06.py |   0
 src/adventofcode2021/{solutions => }/day07.py |   0
 src/adventofcode2021/{solutions => }/day08.py |   0
 src/adventofcode2021/{solutions => }/day09.py |   0
 src/adventofcode2021/{solutions => }/day10.py |   0
 src/adventofcode2021/{solutions => }/day11.py |   0
 src/adventofcode2021/{solutions => }/day12.py |   0
 src/adventofcode2021/{solutions => }/day13.py |   0
 src/adventofcode2021/{solutions => }/day14.py |   0
 src/adventofcode2021/{solutions => }/day15.py |   0
 src/adventofcode2021/{solutions => }/day16.py |   0
 src/adventofcode2021/{solutions => }/day17.py |   0
 src/adventofcode2021/{solutions => }/day18.py |   0
 src/adventofcode2021/{solutions => }/day19.py |   0
 src/adventofcode2021/{solutions => }/day20.py |   0
 src/adventofcode2021/{solutions => }/day21.py |   0
 src/adventofcode2021/{solutions => }/day22.py |   0
 src/adventofcode2021/solutions/__init__.py    |   0
 .../{solutions => }/data/day_01/day01.txt     |   0
 .../{solutions => }/data/day_02/day02.txt     |   0
 .../{solutions => }/data/day_03/day03.txt     |   0
 .../{solutions => }/data/day_04/day04.txt     |   0
 .../{solutions => }/data/day_05/day05.txt     |   2 +-
 .../{solutions => }/data/day_06/day06.txt     |   0
 .../{solutions => }/data/day_07/day07.txt     |   0
 .../{solutions => }/data/day_08/day08.txt     |   0
 .../{solutions => }/data/day_09/day09.txt     |   0
 .../{solutions => }/data/day_10/day10.txt     |   0
 .../data/day_10/day10_test.txt                |   0
 .../{solutions => }/data/day_11/day11.txt     |   0
 .../data/day_11/day11_test.txt                |   0
 .../{solutions => }/data/day_12/day12.txt     |   0
 .../data/day_12/day12_test.txt                |   0
 .../{solutions => }/data/day_13/day13.txt     |   0
 .../data/day_13/day13_test.txt                |   0
 .../{solutions => }/data/day_14/day14.txt     |   0
 .../data/day_14/day14_test.txt                |   0
 .../{solutions => }/data/day_15/day15.txt     |   0
 .../data/day_15/day15_test.txt                |   0
 src/adventofcode2022/data/day_22/day22.txt    | 202 ++++++++++++++++++
 .../data/day_22/day22_test.txt}               |   0
 src/adventofcode2022/{solutions => }/day01.py |   0
 src/adventofcode2022/{solutions => }/day02.py |   0
 src/adventofcode2022/{solutions => }/day03.py |   0
 src/adventofcode2022/{solutions => }/day04.py |   0
 src/adventofcode2022/{solutions => }/day05.py |   0
 src/adventofcode2022/{solutions => }/day06.py |   0
 src/adventofcode2022/{solutions => }/day07.py |   0
 src/adventofcode2022/{solutions => }/day08.py |   0
 src/adventofcode2022/{solutions => }/day09.py |   0
 src/adventofcode2022/{solutions => }/day10.py |   0
 src/adventofcode2022/{solutions => }/day11.py |   0
 src/adventofcode2022/{solutions => }/day12.py |   0
 src/adventofcode2022/{solutions => }/day13.py |   0
 src/adventofcode2022/{solutions => }/day14.py |   0
 src/adventofcode2022/{solutions => }/day15.py |   0
 src/adventofcode2022/day22.py                 |  17 ++
 src/adventofcode2022/solutions/__init__.py    |   0
 .../{{cookiecutter.file_name}}.txt            |   0
 .../{{cookiecutter.file_name}}_test.txt       |   0
 .../{{cookiecutter.file_name}}.py             |   0
 tests/adventofcode2016/test_day01_a.py        |   2 +-
 tests/adventofcode2016/test_day01_b.py        |   2 +-
 tests/adventofcode2016/test_day02_a.py        |   2 +-
 tests/adventofcode2016/test_day02_b.py        |   2 +-
 tests/adventofcode2016/test_day03_a.py        |   2 +-
 tests/adventofcode2016/test_day03_b.py        |   2 +-
 tests/adventofcode2016/test_day04_a.py        |   2 +-
 tests/adventofcode2016/test_day04_b.py        |   2 +-
 tests/adventofcode2016/test_day05_a.py        |   2 +-
 tests/adventofcode2016/test_day05_b.py        |   2 +-
 tests/adventofcode2016/test_day06_a.py        |   2 +-
 tests/adventofcode2016/test_day06_b.py        |   2 +-
 tests/adventofcode2016/test_day07_a.py        |   2 +-
 tests/adventofcode2016/test_day07_b.py        |   2 +-
 tests/adventofcode2016/test_day08_a.py        |   7 +-
 tests/adventofcode2016/test_day08_b.py        |   2 +-
 tests/adventofcode2016/test_day09_a.py        |   2 +-
 tests/adventofcode2016/test_day09_b.py        |   2 +-
 tests/adventofcode2016/test_day10_a.py        |   2 +-
 tests/adventofcode2016/test_day10_b.py        |   2 +-
 tests/adventofcode2016/test_day11_a.py        |   2 +-
 tests/adventofcode2016/test_day11_b.py        |   2 +-
 tests/adventofcode2016/test_day12_a.py        |   2 +-
 tests/adventofcode2016/test_day12_b.py        |   2 +-
 tests/adventofcode2016/test_day13_a.py        |   2 +-
 tests/adventofcode2016/test_day13_b.py        |   2 +-
 tests/adventofcode2016/test_day14_a.py        |   2 +-
 tests/adventofcode2016/test_day14_b.py        |   2 +-
 tests/adventofcode2016/test_day15_a.py        |   2 +-
 tests/adventofcode2016/test_day15_b.py        |   2 +-
 tests/adventofcode2016/test_day16_a.py        |   2 +-
 tests/adventofcode2016/test_day16_b.py        |   2 +-
 tests/adventofcode2016/test_day17_a.py        |   2 +-
 tests/adventofcode2016/test_day17_b.py        |   2 +-
 tests/adventofcode2016/test_day18_a.py        |   2 +-
 tests/adventofcode2016/test_day18_b.py        |   2 +-
 tests/adventofcode2016/test_day19_a.py        |   2 +-
 tests/adventofcode2016/test_day19_b.py        |   2 +-
 tests/adventofcode2016/test_day20_a.py        |   2 +-
 tests/adventofcode2016/test_day20_b.py        |   2 +-
 tests/adventofcode2016/test_day21_a.py        |   2 +-
 tests/adventofcode2016/test_day21_b.py        |   2 +-
 tests/adventofcode2016/test_day22_a.py        |   2 +-
 tests/adventofcode2016/test_day22_b.py        |   2 +-
 tests/adventofcode2019/test_day01_a.py        |   2 +-
 tests/adventofcode2019/test_day01_b.py        |   2 +-
 tests/adventofcode2019/test_day02_a.py        |   2 +-
 tests/adventofcode2019/test_day02_b.py        |   2 +-
 tests/adventofcode2019/test_day03_a.py        |   2 +-
 tests/adventofcode2019/test_day03_b.py        |   2 +-
 tests/adventofcode2019/test_day04_a.py        |   2 +-
 tests/adventofcode2019/test_day04_b.py        |   2 +-
 tests/adventofcode2019/test_day05_a.py        |   2 +-
 tests/adventofcode2019/test_day05_b.py        |   2 +-
 tests/adventofcode2019/test_day06_a.py        |   2 +-
 tests/adventofcode2019/test_day06_b.py        |   2 +-
 tests/adventofcode2019/test_day07_a.py        |   2 +-
 tests/adventofcode2019/test_day07_b.py        |   2 +-
 tests/adventofcode2019/test_day08_a.py        |   2 +-
 tests/adventofcode2019/test_day08_b.py        |   2 +-
 tests/adventofcode2019/test_day09_a.py        |   4 +-
 tests/adventofcode2019/test_day09_b.py        |   2 +-
 tests/adventofcode2019/test_day10_a.py        |   2 +-
 tests/adventofcode2019/test_day10_b.py        |   2 +-
 tests/adventofcode2019/test_day11_a.py        |   2 +-
 tests/adventofcode2019/test_day11_b.py        |   2 +-
 tests/adventofcode2019/test_day12_a.py        |   2 +-
 tests/adventofcode2019/test_day12_b.py        |   2 +-
 tests/adventofcode2019/test_day13_a.py        |   2 +-
 tests/adventofcode2019/test_day13_b.py        |   2 +-
 tests/adventofcode2019/test_day14_a.py        |   2 +-
 tests/adventofcode2019/test_day14_b.py        |   2 +-
 tests/adventofcode2019/test_day15_a.py        |   2 +-
 tests/adventofcode2019/test_day15_b.py        |   2 +-
 tests/adventofcode2019/test_day16_a.py        |   2 +-
 tests/adventofcode2019/test_day16_b.py        |   2 +-
 tests/adventofcode2019/test_day17_a.py        |   2 +-
 tests/adventofcode2019/test_infi.py           |   2 +-
 tests/adventofcode2019/test_intcode.py        |   2 +-
 tests/adventofcode2020/test_day01_a.py        |   2 +-
 tests/adventofcode2020/test_day01_b.py        |   2 +-
 tests/adventofcode2020/test_day02_a.py        |   2 +-
 tests/adventofcode2020/test_day02_b.py        |   2 +-
 tests/adventofcode2020/test_day03_a.py        |   2 +-
 tests/adventofcode2020/test_day03_b.py        |   2 +-
 tests/adventofcode2020/test_day04_a.py        |   2 +-
 tests/adventofcode2020/test_day04_b.py        |   2 +-
 tests/adventofcode2020/test_day05_a.py        |   2 +-
 tests/adventofcode2020/test_day05_b.py        |   2 +-
 tests/adventofcode2020/test_day06_a.py        |   2 +-
 tests/adventofcode2020/test_day06_b.py        |   2 +-
 tests/adventofcode2020/test_day07_a.py        |   2 +-
 tests/adventofcode2020/test_day07_b.py        |   2 +-
 tests/adventofcode2020/test_day08_a.py        |   2 +-
 tests/adventofcode2020/test_day08_b.py        |   2 +-
 tests/adventofcode2020/test_day09_a.py        |   2 +-
 tests/adventofcode2020/test_day09_b.py        |   2 +-
 tests/adventofcode2020/test_day10_a.py        |   2 +-
 tests/adventofcode2020/test_day10_b.py        |   2 +-
 tests/adventofcode2020/test_day11_a.py        |   2 +-
 tests/adventofcode2020/test_day11_b.py        |   2 +-
 tests/adventofcode2020/test_day12_a.py        |   2 +-
 tests/adventofcode2020/test_day12_b.py        |   2 +-
 tests/adventofcode2020/test_day13_a.py        |   2 +-
 tests/adventofcode2020/test_day13_b.py        |   2 +-
 tests/adventofcode2020/test_day14_a.py        |   2 +-
 tests/adventofcode2020/test_day14_b.py        |   2 +-
 tests/adventofcode2020/test_day15_a.py        |   2 +-
 tests/adventofcode2020/test_day16_a.py        |   2 +-
 tests/adventofcode2020/test_day16_b.py        |   2 +-
 tests/adventofcode2021/test_day01_a.py        |   2 +-
 tests/adventofcode2021/test_day01_b.py        |   2 +-
 tests/adventofcode2021/test_day02_a.py        |   2 +-
 tests/adventofcode2021/test_day02_b.py        |   2 +-
 tests/adventofcode2021/test_day03_a.py        |   2 +-
 tests/adventofcode2021/test_day03_b.py        |   2 +-
 tests/adventofcode2021/test_day04_a.py        |   2 +-
 tests/adventofcode2021/test_day04_b.py        |   2 +-
 tests/adventofcode2021/test_day05_a.py        |   2 +-
 tests/adventofcode2021/test_day05_b.py        |   2 +-
 tests/adventofcode2021/test_day06_a.py        |   2 +-
 tests/adventofcode2021/test_day06_b.py        |   2 +-
 tests/adventofcode2021/test_day07_a.py        |   2 +-
 tests/adventofcode2021/test_day07_b.py        |   2 +-
 tests/adventofcode2021/test_day08_a.py        |   2 +-
 tests/adventofcode2021/test_day08_b.py        |   2 +-
 tests/adventofcode2021/test_day09_a.py        |   2 +-
 tests/adventofcode2021/test_day09_b.py        |   2 +-
 tests/adventofcode2021/test_day10_a.py        |   2 +-
 tests/adventofcode2021/test_day10_b.py        |   2 +-
 tests/adventofcode2021/test_day11_a.py        |   2 +-
 tests/adventofcode2021/test_day11_b.py        |   2 +-
 tests/adventofcode2021/test_day12_a.py        |   2 +-
 tests/adventofcode2021/test_day12_b.py        |   2 +-
 tests/adventofcode2021/test_day13_a.py        |   2 +-
 tests/adventofcode2021/test_day13_b.py        |   2 +-
 tests/adventofcode2021/test_day14_a.py        |   2 +-
 tests/adventofcode2021/test_day14_b.py        |   2 +-
 tests/adventofcode2021/test_day15_a.py        |   2 +-
 tests/adventofcode2021/test_day15_b.py        |   2 +-
 tests/adventofcode2021/test_day16_a.py        |   2 +-
 tests/adventofcode2021/test_day16_b.py        |   2 +-
 tests/adventofcode2021/test_day17_a.py        |   2 +-
 tests/adventofcode2021/test_day17_b.py        |   2 +-
 tests/adventofcode2021/test_day18_a.py        |   2 +-
 tests/adventofcode2021/test_day18_b.py        |   2 +-
 tests/adventofcode2021/test_day19_a.py        |   2 +-
 tests/adventofcode2021/test_day19_b.py        |   2 +-
 tests/adventofcode2021/test_day20_a.py        |   2 +-
 tests/adventofcode2021/test_day20_b.py        |   2 +-
 tests/adventofcode2021/test_day21_a.py        |   2 +-
 tests/adventofcode2021/test_day21_b.py        |   2 +-
 tests/adventofcode2021/test_day22_a.py        |   2 +-
 tests/adventofcode2021/test_day22_b.py        |   2 +-
 tests/adventofcode2022/test_day01_a.py        |   2 +-
 tests/adventofcode2022/test_day01_b.py        |   2 +-
 tests/adventofcode2022/test_day02_a.py        |   2 +-
 tests/adventofcode2022/test_day02_b.py        |   2 +-
 tests/adventofcode2022/test_day03_a.py        |   2 +-
 tests/adventofcode2022/test_day03_b.py        |   2 +-
 tests/adventofcode2022/test_day04_a.py        |   2 +-
 tests/adventofcode2022/test_day04_b.py        |   2 +-
 tests/adventofcode2022/test_day05_a.py        |   8 +-
 tests/adventofcode2022/test_day05_b.py        |   8 +-
 tests/adventofcode2022/test_day06_a.py        |   2 +-
 tests/adventofcode2022/test_day06_b.py        |   2 +-
 tests/adventofcode2022/test_day07_a.py        |   2 +-
 tests/adventofcode2022/test_day07_b.py        |   2 +-
 tests/adventofcode2022/test_day08_a.py        |   2 +-
 tests/adventofcode2022/test_day08_b.py        |   2 +-
 tests/adventofcode2022/test_day09_a.py        |   2 +-
 tests/adventofcode2022/test_day09_b.py        |   2 +-
 tests/adventofcode2022/test_day10_a.py        |   2 +-
 tests/adventofcode2022/test_day10_b.py        |   2 +-
 tests/adventofcode2022/test_day11_a.py        |   2 +-
 tests/adventofcode2022/test_day11_b.py        |   2 +-
 tests/adventofcode2022/test_day12_a.py        |   2 +-
 tests/adventofcode2022/test_day12_b.py        |   2 +-
 tests/adventofcode2022/test_day13_a.py        |   2 +-
 tests/adventofcode2022/test_day13_b.py        |   2 +-
 tests/adventofcode2022/test_day14_a.py        |   2 +-
 tests/adventofcode2022/test_day14_b.py        |   2 +-
 tests/adventofcode2022/test_day15_a.py        |   2 +-
 tests/adventofcode2022/test_day15_b.py        |   2 +-
 tests/adventofcode2022/test_day22_a.py        |  19 ++
 tests/adventofcode2022/test_day22_b.py        |  19 ++
 tests/conftest.py                             |   1 -
 410 files changed, 480 insertions(+), 232 deletions(-)
 rename src/adventofcode2016/{solutions => }/data/day_01/day01.txt (100%)
 rename src/adventofcode2016/{solutions => }/data/day_02/day02.txt (100%)
 rename src/adventofcode2016/{solutions => }/data/day_02/day02_test.txt (100%)
 rename src/adventofcode2016/{solutions => }/data/day_03/day03.txt (100%)
 rename src/adventofcode2016/{solutions => }/data/day_03/day03_test.txt (100%)
 rename src/adventofcode2016/{solutions => }/data/day_04/day04.txt (100%)
 rename src/adventofcode2016/{solutions => }/data/day_04/day04_test.txt (100%)
 rename src/adventofcode2016/{solutions => }/data/day_05/day05.txt (100%)
 rename src/adventofcode2016/{solutions => }/data/day_06/day06.txt (100%)
 rename src/adventofcode2016/{solutions => }/data/day_06/day06_test.txt (100%)
 rename src/adventofcode2016/{solutions => }/data/day_07/day07.txt (100%)
 rename src/adventofcode2016/{solutions => }/data/day_08/day08.txt (100%)
 rename src/adventofcode2016/{solutions => }/data/day_09/day09.txt (100%)
 rename src/adventofcode2016/{solutions => }/data/day_10/day10.txt (100%)
 rename src/adventofcode2016/{solutions => }/data/day_10/day10_test.txt (100%)
 rename src/adventofcode2016/{solutions => }/data/day_11/day11.txt (100%)
 rename src/adventofcode2016/{solutions => }/data/day_11/day11_test.txt (100%)
 rename src/adventofcode2016/{solutions => }/data/day_12/day12.txt (100%)
 rename src/adventofcode2016/{solutions => }/data/day_12/day12_test.txt (100%)
 rename src/adventofcode2016/{solutions => }/data/day_13/day13.txt (100%)
 rename src/adventofcode2016/{solutions => }/data/day_14/day14.txt (100%)
 rename src/adventofcode2016/{solutions => }/data/day_15/day15.txt (100%)
 rename src/adventofcode2016/{solutions => }/data/day_15/day15_test.txt (100%)
 rename src/adventofcode2016/{solutions => }/data/day_16/day16.txt (100%)
 rename src/adventofcode2016/{solutions => }/data/day_17/day17.txt (100%)
 rename src/adventofcode2016/{solutions => }/data/day_18/day18.txt (100%)
 rename src/adventofcode2016/{solutions => }/data/day_18/day18_test.txt (100%)
 rename src/adventofcode2016/{solutions => }/data/day_18/day18_test2.txt (100%)
 rename src/adventofcode2016/{solutions => }/data/day_19/day19.txt (100%)
 rename src/adventofcode2016/{solutions => }/data/day_20/day20.txt (100%)
 rename src/adventofcode2016/{solutions => }/data/day_20/day20_test.txt (100%)
 rename src/adventofcode2016/{solutions => }/data/day_20/day20_test2.txt (100%)
 rename src/adventofcode2016/{solutions => }/data/day_21/day21.txt (100%)
 rename src/adventofcode2016/{solutions => }/data/day_21/day21_test.txt (100%)
 rename src/adventofcode2016/{solutions => }/data/day_22/day22.txt (100%)
 rename src/adventofcode2016/{solutions => }/day01.py (100%)
 rename src/adventofcode2016/{solutions => }/day02.py (100%)
 rename src/adventofcode2016/{solutions => }/day03.py (100%)
 rename src/adventofcode2016/{solutions => }/day04.py (100%)
 rename src/adventofcode2016/{solutions => }/day05.py (100%)
 rename src/adventofcode2016/{solutions => }/day06.py (100%)
 rename src/adventofcode2016/{solutions => }/day07.py (100%)
 rename src/adventofcode2016/{solutions => }/day08.py (100%)
 rename src/adventofcode2016/{solutions => }/day09.py (100%)
 rename src/adventofcode2016/{solutions => }/day10.py (100%)
 rename src/adventofcode2016/{solutions => }/day11.py (100%)
 rename src/adventofcode2016/{solutions => }/day12.py (100%)
 rename src/adventofcode2016/{solutions => }/day13.py (100%)
 rename src/adventofcode2016/{solutions => }/day14.py (100%)
 rename src/adventofcode2016/{solutions => }/day15.py (100%)
 rename src/adventofcode2016/{solutions => }/day16.py (100%)
 rename src/adventofcode2016/{solutions => }/day17.py (100%)
 rename src/adventofcode2016/{solutions => }/day18.py (100%)
 rename src/adventofcode2016/{solutions => }/day19.py (100%)
 rename src/adventofcode2016/{solutions => }/day20.py (100%)
 rename src/adventofcode2016/{solutions => }/day21.py (100%)
 rename src/adventofcode2016/{solutions => }/day22.py (100%)
 rename src/adventofcode2019/{solutions => }/data/day_01/day01.txt (100%)
 rename src/adventofcode2019/{solutions => }/data/day_02/day02.txt (100%)
 rename src/adventofcode2019/{solutions => }/data/day_03/day03.txt (98%)
 rename src/adventofcode2019/{solutions => }/data/day_04/day04.txt (100%)
 rename src/adventofcode2019/{solutions => }/data/day_05/day05.txt (100%)
 rename src/adventofcode2019/{solutions => }/data/day_06/day06.txt (100%)
 rename src/adventofcode2019/{solutions => }/data/day_07/day07.txt (96%)
 rename src/adventofcode2019/{solutions => }/data/day_08/day08.txt (99%)
 rename src/adventofcode2019/{solutions => }/data/day_09/day09.txt (99%)
 rename src/adventofcode2019/{solutions => }/data/day_10/day10.txt (100%)
 rename src/adventofcode2019/{solutions => }/data/day_11/day11.txt (99%)
 rename src/adventofcode2019/{solutions => }/data/day_12/day12.txt (73%)
 rename src/adventofcode2019/{solutions => }/data/day_13/day13.txt (99%)
 rename src/adventofcode2019/{solutions => }/data/day_14/day14.txt (97%)
 rename src/adventofcode2019/{solutions => }/data/day_15/day15.txt (98%)
 rename src/adventofcode2019/{solutions => }/data/day_16/day16.txt (98%)
 rename src/adventofcode2019/{solutions => }/data/day_17/day17.txt (99%)
 rename src/adventofcode2019/{solutions => }/data/infi/example.json (97%)
 rename src/adventofcode2019/{solutions => }/data/infi/infi.json (100%)
 rename src/adventofcode2019/{solutions => }/day01.py (100%)
 rename src/adventofcode2019/{solutions => }/day02.py (94%)
 rename src/adventofcode2019/{solutions => }/day03.py (100%)
 rename src/adventofcode2019/{solutions => }/day04.py (100%)
 rename src/adventofcode2019/{solutions => }/day05.py (93%)
 rename src/adventofcode2019/{solutions => }/day06.py (100%)
 rename src/adventofcode2019/{solutions => }/day07.py (97%)
 rename src/adventofcode2019/{solutions => }/day08.py (100%)
 rename src/adventofcode2019/{solutions => }/day09.py (93%)
 rename src/adventofcode2019/{solutions => }/day10.py (100%)
 rename src/adventofcode2019/{solutions => }/day11.py (98%)
 rename src/adventofcode2019/{solutions => }/day12.py (100%)
 rename src/adventofcode2019/{solutions => }/day13.py (98%)
 rename src/adventofcode2019/{solutions => }/day14.py (100%)
 rename src/adventofcode2019/{solutions => }/day15.py (99%)
 rename src/adventofcode2019/{solutions => }/day16.py (100%)
 rename src/adventofcode2019/{solutions => }/day17.py (96%)
 rename src/adventofcode2019/{solutions => }/infi.py (93%)
 rename src/adventofcode2019/{solutions => }/intcode.py (100%)
 delete mode 100644 src/adventofcode2019/solutions/__init__.py
 rename src/adventofcode2020/{solutions => }/data/day_01/day01.txt (99%)
 rename src/adventofcode2020/{solutions => }/data/day_02/day02.txt (99%)
 rename src/adventofcode2020/{solutions => }/data/day_03/day03.txt (99%)
 rename src/adventofcode2020/{solutions => }/data/day_04/day04.txt (99%)
 rename src/adventofcode2020/{solutions => }/data/day_05/day05.txt (100%)
 rename src/adventofcode2020/{solutions => }/data/day_06/day06.txt (100%)
 rename src/adventofcode2020/{solutions => }/data/day_07/day07.txt (100%)
 rename src/adventofcode2020/{solutions => }/data/day_08/day08.txt (100%)
 rename src/adventofcode2020/{solutions => }/data/day_09/day09.txt (100%)
 rename src/adventofcode2020/{solutions => }/data/day_10/day10.txt (100%)
 rename src/adventofcode2020/{solutions => }/data/day_11/day11.txt (100%)
 rename src/adventofcode2020/{solutions => }/data/day_12/day12.txt (100%)
 rename src/adventofcode2020/{solutions => }/data/day_13/day13.txt (100%)
 rename src/adventofcode2020/{solutions => }/data/day_14/day14.txt (99%)
 rename src/adventofcode2020/{solutions => }/data/day_15/day15.txt (100%)
 rename src/adventofcode2020/{solutions => }/data/day_16/day16.txt (100%)
 rename src/adventofcode2020/{solutions => }/day01.py (100%)
 rename src/adventofcode2020/{solutions => }/day02.py (100%)
 rename src/adventofcode2020/{solutions => }/day03.py (100%)
 rename src/adventofcode2020/{solutions => }/day04.py (100%)
 rename src/adventofcode2020/{solutions => }/day05.py (100%)
 rename src/adventofcode2020/{solutions => }/day06.py (100%)
 rename src/adventofcode2020/{solutions => }/day07.py (100%)
 rename src/adventofcode2020/{solutions => }/day08.py (96%)
 rename src/adventofcode2020/{solutions => }/day09.py (100%)
 rename src/adventofcode2020/{solutions => }/day10.py (100%)
 rename src/adventofcode2020/{solutions => }/day11.py (100%)
 rename src/adventofcode2020/{solutions => }/day12.py (100%)
 rename src/adventofcode2020/{solutions => }/day13.py (100%)
 rename src/adventofcode2020/{solutions => }/day14.py (100%)
 rename src/adventofcode2020/{solutions => }/day15.py (100%)
 rename src/adventofcode2020/{solutions => }/day16.py (100%)
 rename src/adventofcode2020/{solutions => }/handheld.py (100%)
 delete mode 100644 src/adventofcode2020/solutions/__init__.py
 rename src/adventofcode2021/{solutions => }/data/day_01/day01.txt (100%)
 rename src/adventofcode2021/{solutions => }/data/day_02/day02.txt (100%)
 rename src/adventofcode2021/{solutions => }/data/day_03/day03.txt (100%)
 rename src/adventofcode2021/{solutions => }/data/day_04/day04.txt (100%)
 rename src/adventofcode2021/{solutions => }/data/day_05/day05.txt (100%)
 rename src/adventofcode2021/{solutions => }/data/day_06/day06.txt (100%)
 rename src/adventofcode2021/{solutions => }/data/day_07/day07.txt (100%)
 rename src/adventofcode2021/{solutions => }/data/day_08/day08.txt (100%)
 rename src/adventofcode2021/{solutions => }/data/day_09/day09.txt (100%)
 rename src/adventofcode2021/{solutions => }/data/day_10/day10.txt (100%)
 rename src/adventofcode2021/{solutions => }/data/day_11/day11.txt (100%)
 rename src/adventofcode2021/{solutions => }/data/day_12/day12.txt (100%)
 rename src/adventofcode2021/{solutions => }/data/day_13/day13.txt (100%)
 rename src/adventofcode2021/{solutions => }/data/day_14/day14.txt (100%)
 rename src/adventofcode2021/{solutions => }/data/day_14/day14_test.txt (100%)
 rename src/adventofcode2021/{solutions => }/data/day_15/day15.txt (100%)
 rename src/adventofcode2021/{solutions => }/data/day_16/day16.txt (100%)
 rename src/adventofcode2021/{solutions => }/data/day_17/day17.txt (100%)
 rename src/adventofcode2021/{solutions => }/data/day_18/day18.txt (100%)
 rename src/adventofcode2021/{solutions => }/data/day_19/day19.txt (100%)
 rename src/adventofcode2021/{solutions => }/data/day_19/day19_test.txt (100%)
 rename src/adventofcode2021/{solutions => }/data/day_20/day20.txt (100%)
 rename src/adventofcode2021/{solutions => }/data/day_20/day20_test.txt (100%)
 rename src/adventofcode2021/{solutions => }/data/day_21/day21.txt (100%)
 rename src/adventofcode2021/{solutions => }/data/day_22/day22.txt (100%)
 rename src/adventofcode2021/{solutions => }/day01.py (100%)
 rename src/adventofcode2021/{solutions => }/day02.py (100%)
 rename src/adventofcode2021/{solutions => }/day03.py (100%)
 rename src/adventofcode2021/{solutions => }/day04.py (100%)
 rename src/adventofcode2021/{solutions => }/day05.py (100%)
 rename src/adventofcode2021/{solutions => }/day06.py (100%)
 rename src/adventofcode2021/{solutions => }/day07.py (100%)
 rename src/adventofcode2021/{solutions => }/day08.py (100%)
 rename src/adventofcode2021/{solutions => }/day09.py (100%)
 rename src/adventofcode2021/{solutions => }/day10.py (100%)
 rename src/adventofcode2021/{solutions => }/day11.py (100%)
 rename src/adventofcode2021/{solutions => }/day12.py (100%)
 rename src/adventofcode2021/{solutions => }/day13.py (100%)
 rename src/adventofcode2021/{solutions => }/day14.py (100%)
 rename src/adventofcode2021/{solutions => }/day15.py (100%)
 rename src/adventofcode2021/{solutions => }/day16.py (100%)
 rename src/adventofcode2021/{solutions => }/day17.py (100%)
 rename src/adventofcode2021/{solutions => }/day18.py (100%)
 rename src/adventofcode2021/{solutions => }/day19.py (100%)
 rename src/adventofcode2021/{solutions => }/day20.py (100%)
 rename src/adventofcode2021/{solutions => }/day21.py (100%)
 rename src/adventofcode2021/{solutions => }/day22.py (100%)
 delete mode 100644 src/adventofcode2021/solutions/__init__.py
 rename src/adventofcode2022/{solutions => }/data/day_01/day01.txt (100%)
 rename src/adventofcode2022/{solutions => }/data/day_02/day02.txt (100%)
 rename src/adventofcode2022/{solutions => }/data/day_03/day03.txt (100%)
 rename src/adventofcode2022/{solutions => }/data/day_04/day04.txt (100%)
 rename src/adventofcode2022/{solutions => }/data/day_05/day05.txt (99%)
 rename src/adventofcode2022/{solutions => }/data/day_06/day06.txt (100%)
 rename src/adventofcode2022/{solutions => }/data/day_07/day07.txt (100%)
 rename src/adventofcode2022/{solutions => }/data/day_08/day08.txt (100%)
 rename src/adventofcode2022/{solutions => }/data/day_09/day09.txt (100%)
 rename src/adventofcode2022/{solutions => }/data/day_10/day10.txt (100%)
 rename src/adventofcode2022/{solutions => }/data/day_10/day10_test.txt (100%)
 rename src/adventofcode2022/{solutions => }/data/day_11/day11.txt (100%)
 rename src/adventofcode2022/{solutions => }/data/day_11/day11_test.txt (100%)
 rename src/adventofcode2022/{solutions => }/data/day_12/day12.txt (100%)
 rename src/adventofcode2022/{solutions => }/data/day_12/day12_test.txt (100%)
 rename src/adventofcode2022/{solutions => }/data/day_13/day13.txt (100%)
 rename src/adventofcode2022/{solutions => }/data/day_13/day13_test.txt (100%)
 rename src/adventofcode2022/{solutions => }/data/day_14/day14.txt (100%)
 rename src/adventofcode2022/{solutions => }/data/day_14/day14_test.txt (100%)
 rename src/adventofcode2022/{solutions => }/data/day_15/day15.txt (100%)
 rename src/adventofcode2022/{solutions => }/data/day_15/day15_test.txt (100%)
 create mode 100644 src/adventofcode2022/data/day_22/day22.txt
 rename src/{adventofcode2016/solutions/__init__.py => adventofcode2022/data/day_22/day22_test.txt} (100%)
 rename src/adventofcode2022/{solutions => }/day01.py (100%)
 rename src/adventofcode2022/{solutions => }/day02.py (100%)
 rename src/adventofcode2022/{solutions => }/day03.py (100%)
 rename src/adventofcode2022/{solutions => }/day04.py (100%)
 rename src/adventofcode2022/{solutions => }/day05.py (100%)
 rename src/adventofcode2022/{solutions => }/day06.py (100%)
 rename src/adventofcode2022/{solutions => }/day07.py (100%)
 rename src/adventofcode2022/{solutions => }/day08.py (100%)
 rename src/adventofcode2022/{solutions => }/day09.py (100%)
 rename src/adventofcode2022/{solutions => }/day10.py (100%)
 rename src/adventofcode2022/{solutions => }/day11.py (100%)
 rename src/adventofcode2022/{solutions => }/day12.py (100%)
 rename src/adventofcode2022/{solutions => }/day13.py (100%)
 rename src/adventofcode2022/{solutions => }/day14.py (100%)
 rename src/adventofcode2022/{solutions => }/day15.py (100%)
 create mode 100644 src/adventofcode2022/day22.py
 delete mode 100644 src/adventofcode2022/solutions/__init__.py
 rename template/{{cookiecutter.adventofcode}}/src/adventofcode{{cookiecutter.year}}/{solutions => }/data/{{cookiecutter.directory_name}}/{{cookiecutter.file_name}}.txt (100%)
 rename template/{{cookiecutter.adventofcode}}/src/adventofcode{{cookiecutter.year}}/{solutions => }/data/{{cookiecutter.directory_name}}/{{cookiecutter.file_name}}_test.txt (100%)
 rename template/{{cookiecutter.adventofcode}}/src/adventofcode{{cookiecutter.year}}/{solutions => }/{{cookiecutter.file_name}}.py (100%)
 create mode 100644 tests/adventofcode2022/test_day22_a.py
 create mode 100644 tests/adventofcode2022/test_day22_b.py

diff --git a/src/adventofcode/main.py b/src/adventofcode/main.py
index d9b4d67b..e62b1809 100644
--- a/src/adventofcode/main.py
+++ b/src/adventofcode/main.py
@@ -121,7 +121,7 @@ def create_solution(force, year, day):
     print(f"Creating solution for {year}-{day} --")
 
     # Check before we overwrite
-    import_path = f"adventofcode{year}.solutions.day{day}"
+    import_path = f"adventofcode{year}.day{day}"
     logger.debug(f"Importing {import_path}")
     try:
         importlib.import_module(import_path)
@@ -175,7 +175,7 @@ def download_input_data(year: str, day: str):
 
     data_path = f"day_{day}/day{day}.txt"
     root_dir = Path(__file__).parent.parent
-    filename = root_dir / f"adventofcode{year}" / "solutions" / "data" / data_path
+    filename = root_dir / f"adventofcode{year}" / "data" / data_path
     with open(filename, "wb") as f:
         f.write(r.content)
 
@@ -184,7 +184,7 @@ def download_input_data(year: str, day: str):
 
 def run_solution(year, day, timeit_, part, submit):
     # Try to import the solution
-    import_path = f"adventofcode{year}.solutions.day{day}"
+    import_path = f"adventofcode{year}.day{day}"
     data_path = f"day_{day}/day{day}.txt"
 
     logger.debug(f"Importing {import_path}")
diff --git a/src/adventofcode/utils/abstract.py b/src/adventofcode/utils/abstract.py
index 4c91b28f..eade4de3 100644
--- a/src/adventofcode/utils/abstract.py
+++ b/src/adventofcode/utils/abstract.py
@@ -39,9 +39,7 @@ def __call__(self, input_file: str) -> str | int:
         else:
             year = int(year[0])
         root_dir = Path(__file__).parent.parent.parent
-        with open(
-            root_dir / f"adventofcode{year}" / "solutions" / "data" / input_file
-        ) as f:
+        with open(root_dir / f"adventofcode{year}" / "data" / input_file) as f:
             input_data = f.read()
             res = self.solve(input_data=input_data)
             return res
diff --git a/src/adventofcode2016/solutions/data/day_01/day01.txt b/src/adventofcode2016/data/day_01/day01.txt
similarity index 100%
rename from src/adventofcode2016/solutions/data/day_01/day01.txt
rename to src/adventofcode2016/data/day_01/day01.txt
diff --git a/src/adventofcode2016/solutions/data/day_02/day02.txt b/src/adventofcode2016/data/day_02/day02.txt
similarity index 100%
rename from src/adventofcode2016/solutions/data/day_02/day02.txt
rename to src/adventofcode2016/data/day_02/day02.txt
diff --git a/src/adventofcode2016/solutions/data/day_02/day02_test.txt b/src/adventofcode2016/data/day_02/day02_test.txt
similarity index 100%
rename from src/adventofcode2016/solutions/data/day_02/day02_test.txt
rename to src/adventofcode2016/data/day_02/day02_test.txt
diff --git a/src/adventofcode2016/solutions/data/day_03/day03.txt b/src/adventofcode2016/data/day_03/day03.txt
similarity index 100%
rename from src/adventofcode2016/solutions/data/day_03/day03.txt
rename to src/adventofcode2016/data/day_03/day03.txt
diff --git a/src/adventofcode2016/solutions/data/day_03/day03_test.txt b/src/adventofcode2016/data/day_03/day03_test.txt
similarity index 100%
rename from src/adventofcode2016/solutions/data/day_03/day03_test.txt
rename to src/adventofcode2016/data/day_03/day03_test.txt
diff --git a/src/adventofcode2016/solutions/data/day_04/day04.txt b/src/adventofcode2016/data/day_04/day04.txt
similarity index 100%
rename from src/adventofcode2016/solutions/data/day_04/day04.txt
rename to src/adventofcode2016/data/day_04/day04.txt
diff --git a/src/adventofcode2016/solutions/data/day_04/day04_test.txt b/src/adventofcode2016/data/day_04/day04_test.txt
similarity index 100%
rename from src/adventofcode2016/solutions/data/day_04/day04_test.txt
rename to src/adventofcode2016/data/day_04/day04_test.txt
diff --git a/src/adventofcode2016/solutions/data/day_05/day05.txt b/src/adventofcode2016/data/day_05/day05.txt
similarity index 100%
rename from src/adventofcode2016/solutions/data/day_05/day05.txt
rename to src/adventofcode2016/data/day_05/day05.txt
diff --git a/src/adventofcode2016/solutions/data/day_06/day06.txt b/src/adventofcode2016/data/day_06/day06.txt
similarity index 100%
rename from src/adventofcode2016/solutions/data/day_06/day06.txt
rename to src/adventofcode2016/data/day_06/day06.txt
diff --git a/src/adventofcode2016/solutions/data/day_06/day06_test.txt b/src/adventofcode2016/data/day_06/day06_test.txt
similarity index 100%
rename from src/adventofcode2016/solutions/data/day_06/day06_test.txt
rename to src/adventofcode2016/data/day_06/day06_test.txt
diff --git a/src/adventofcode2016/solutions/data/day_07/day07.txt b/src/adventofcode2016/data/day_07/day07.txt
similarity index 100%
rename from src/adventofcode2016/solutions/data/day_07/day07.txt
rename to src/adventofcode2016/data/day_07/day07.txt
diff --git a/src/adventofcode2016/solutions/data/day_08/day08.txt b/src/adventofcode2016/data/day_08/day08.txt
similarity index 100%
rename from src/adventofcode2016/solutions/data/day_08/day08.txt
rename to src/adventofcode2016/data/day_08/day08.txt
diff --git a/src/adventofcode2016/solutions/data/day_09/day09.txt b/src/adventofcode2016/data/day_09/day09.txt
similarity index 100%
rename from src/adventofcode2016/solutions/data/day_09/day09.txt
rename to src/adventofcode2016/data/day_09/day09.txt
diff --git a/src/adventofcode2016/solutions/data/day_10/day10.txt b/src/adventofcode2016/data/day_10/day10.txt
similarity index 100%
rename from src/adventofcode2016/solutions/data/day_10/day10.txt
rename to src/adventofcode2016/data/day_10/day10.txt
diff --git a/src/adventofcode2016/solutions/data/day_10/day10_test.txt b/src/adventofcode2016/data/day_10/day10_test.txt
similarity index 100%
rename from src/adventofcode2016/solutions/data/day_10/day10_test.txt
rename to src/adventofcode2016/data/day_10/day10_test.txt
diff --git a/src/adventofcode2016/solutions/data/day_11/day11.txt b/src/adventofcode2016/data/day_11/day11.txt
similarity index 100%
rename from src/adventofcode2016/solutions/data/day_11/day11.txt
rename to src/adventofcode2016/data/day_11/day11.txt
diff --git a/src/adventofcode2016/solutions/data/day_11/day11_test.txt b/src/adventofcode2016/data/day_11/day11_test.txt
similarity index 100%
rename from src/adventofcode2016/solutions/data/day_11/day11_test.txt
rename to src/adventofcode2016/data/day_11/day11_test.txt
diff --git a/src/adventofcode2016/solutions/data/day_12/day12.txt b/src/adventofcode2016/data/day_12/day12.txt
similarity index 100%
rename from src/adventofcode2016/solutions/data/day_12/day12.txt
rename to src/adventofcode2016/data/day_12/day12.txt
diff --git a/src/adventofcode2016/solutions/data/day_12/day12_test.txt b/src/adventofcode2016/data/day_12/day12_test.txt
similarity index 100%
rename from src/adventofcode2016/solutions/data/day_12/day12_test.txt
rename to src/adventofcode2016/data/day_12/day12_test.txt
diff --git a/src/adventofcode2016/solutions/data/day_13/day13.txt b/src/adventofcode2016/data/day_13/day13.txt
similarity index 100%
rename from src/adventofcode2016/solutions/data/day_13/day13.txt
rename to src/adventofcode2016/data/day_13/day13.txt
diff --git a/src/adventofcode2016/solutions/data/day_14/day14.txt b/src/adventofcode2016/data/day_14/day14.txt
similarity index 100%
rename from src/adventofcode2016/solutions/data/day_14/day14.txt
rename to src/adventofcode2016/data/day_14/day14.txt
diff --git a/src/adventofcode2016/solutions/data/day_15/day15.txt b/src/adventofcode2016/data/day_15/day15.txt
similarity index 100%
rename from src/adventofcode2016/solutions/data/day_15/day15.txt
rename to src/adventofcode2016/data/day_15/day15.txt
diff --git a/src/adventofcode2016/solutions/data/day_15/day15_test.txt b/src/adventofcode2016/data/day_15/day15_test.txt
similarity index 100%
rename from src/adventofcode2016/solutions/data/day_15/day15_test.txt
rename to src/adventofcode2016/data/day_15/day15_test.txt
diff --git a/src/adventofcode2016/solutions/data/day_16/day16.txt b/src/adventofcode2016/data/day_16/day16.txt
similarity index 100%
rename from src/adventofcode2016/solutions/data/day_16/day16.txt
rename to src/adventofcode2016/data/day_16/day16.txt
diff --git a/src/adventofcode2016/solutions/data/day_17/day17.txt b/src/adventofcode2016/data/day_17/day17.txt
similarity index 100%
rename from src/adventofcode2016/solutions/data/day_17/day17.txt
rename to src/adventofcode2016/data/day_17/day17.txt
diff --git a/src/adventofcode2016/solutions/data/day_18/day18.txt b/src/adventofcode2016/data/day_18/day18.txt
similarity index 100%
rename from src/adventofcode2016/solutions/data/day_18/day18.txt
rename to src/adventofcode2016/data/day_18/day18.txt
diff --git a/src/adventofcode2016/solutions/data/day_18/day18_test.txt b/src/adventofcode2016/data/day_18/day18_test.txt
similarity index 100%
rename from src/adventofcode2016/solutions/data/day_18/day18_test.txt
rename to src/adventofcode2016/data/day_18/day18_test.txt
diff --git a/src/adventofcode2016/solutions/data/day_18/day18_test2.txt b/src/adventofcode2016/data/day_18/day18_test2.txt
similarity index 100%
rename from src/adventofcode2016/solutions/data/day_18/day18_test2.txt
rename to src/adventofcode2016/data/day_18/day18_test2.txt
diff --git a/src/adventofcode2016/solutions/data/day_19/day19.txt b/src/adventofcode2016/data/day_19/day19.txt
similarity index 100%
rename from src/adventofcode2016/solutions/data/day_19/day19.txt
rename to src/adventofcode2016/data/day_19/day19.txt
diff --git a/src/adventofcode2016/solutions/data/day_20/day20.txt b/src/adventofcode2016/data/day_20/day20.txt
similarity index 100%
rename from src/adventofcode2016/solutions/data/day_20/day20.txt
rename to src/adventofcode2016/data/day_20/day20.txt
diff --git a/src/adventofcode2016/solutions/data/day_20/day20_test.txt b/src/adventofcode2016/data/day_20/day20_test.txt
similarity index 100%
rename from src/adventofcode2016/solutions/data/day_20/day20_test.txt
rename to src/adventofcode2016/data/day_20/day20_test.txt
diff --git a/src/adventofcode2016/solutions/data/day_20/day20_test2.txt b/src/adventofcode2016/data/day_20/day20_test2.txt
similarity index 100%
rename from src/adventofcode2016/solutions/data/day_20/day20_test2.txt
rename to src/adventofcode2016/data/day_20/day20_test2.txt
diff --git a/src/adventofcode2016/solutions/data/day_21/day21.txt b/src/adventofcode2016/data/day_21/day21.txt
similarity index 100%
rename from src/adventofcode2016/solutions/data/day_21/day21.txt
rename to src/adventofcode2016/data/day_21/day21.txt
diff --git a/src/adventofcode2016/solutions/data/day_21/day21_test.txt b/src/adventofcode2016/data/day_21/day21_test.txt
similarity index 100%
rename from src/adventofcode2016/solutions/data/day_21/day21_test.txt
rename to src/adventofcode2016/data/day_21/day21_test.txt
diff --git a/src/adventofcode2016/solutions/data/day_22/day22.txt b/src/adventofcode2016/data/day_22/day22.txt
similarity index 100%
rename from src/adventofcode2016/solutions/data/day_22/day22.txt
rename to src/adventofcode2016/data/day_22/day22.txt
diff --git a/src/adventofcode2016/solutions/day01.py b/src/adventofcode2016/day01.py
similarity index 100%
rename from src/adventofcode2016/solutions/day01.py
rename to src/adventofcode2016/day01.py
diff --git a/src/adventofcode2016/solutions/day02.py b/src/adventofcode2016/day02.py
similarity index 100%
rename from src/adventofcode2016/solutions/day02.py
rename to src/adventofcode2016/day02.py
diff --git a/src/adventofcode2016/solutions/day03.py b/src/adventofcode2016/day03.py
similarity index 100%
rename from src/adventofcode2016/solutions/day03.py
rename to src/adventofcode2016/day03.py
diff --git a/src/adventofcode2016/solutions/day04.py b/src/adventofcode2016/day04.py
similarity index 100%
rename from src/adventofcode2016/solutions/day04.py
rename to src/adventofcode2016/day04.py
diff --git a/src/adventofcode2016/solutions/day05.py b/src/adventofcode2016/day05.py
similarity index 100%
rename from src/adventofcode2016/solutions/day05.py
rename to src/adventofcode2016/day05.py
diff --git a/src/adventofcode2016/solutions/day06.py b/src/adventofcode2016/day06.py
similarity index 100%
rename from src/adventofcode2016/solutions/day06.py
rename to src/adventofcode2016/day06.py
diff --git a/src/adventofcode2016/solutions/day07.py b/src/adventofcode2016/day07.py
similarity index 100%
rename from src/adventofcode2016/solutions/day07.py
rename to src/adventofcode2016/day07.py
diff --git a/src/adventofcode2016/solutions/day08.py b/src/adventofcode2016/day08.py
similarity index 100%
rename from src/adventofcode2016/solutions/day08.py
rename to src/adventofcode2016/day08.py
diff --git a/src/adventofcode2016/solutions/day09.py b/src/adventofcode2016/day09.py
similarity index 100%
rename from src/adventofcode2016/solutions/day09.py
rename to src/adventofcode2016/day09.py
diff --git a/src/adventofcode2016/solutions/day10.py b/src/adventofcode2016/day10.py
similarity index 100%
rename from src/adventofcode2016/solutions/day10.py
rename to src/adventofcode2016/day10.py
diff --git a/src/adventofcode2016/solutions/day11.py b/src/adventofcode2016/day11.py
similarity index 100%
rename from src/adventofcode2016/solutions/day11.py
rename to src/adventofcode2016/day11.py
diff --git a/src/adventofcode2016/solutions/day12.py b/src/adventofcode2016/day12.py
similarity index 100%
rename from src/adventofcode2016/solutions/day12.py
rename to src/adventofcode2016/day12.py
diff --git a/src/adventofcode2016/solutions/day13.py b/src/adventofcode2016/day13.py
similarity index 100%
rename from src/adventofcode2016/solutions/day13.py
rename to src/adventofcode2016/day13.py
diff --git a/src/adventofcode2016/solutions/day14.py b/src/adventofcode2016/day14.py
similarity index 100%
rename from src/adventofcode2016/solutions/day14.py
rename to src/adventofcode2016/day14.py
diff --git a/src/adventofcode2016/solutions/day15.py b/src/adventofcode2016/day15.py
similarity index 100%
rename from src/adventofcode2016/solutions/day15.py
rename to src/adventofcode2016/day15.py
diff --git a/src/adventofcode2016/solutions/day16.py b/src/adventofcode2016/day16.py
similarity index 100%
rename from src/adventofcode2016/solutions/day16.py
rename to src/adventofcode2016/day16.py
diff --git a/src/adventofcode2016/solutions/day17.py b/src/adventofcode2016/day17.py
similarity index 100%
rename from src/adventofcode2016/solutions/day17.py
rename to src/adventofcode2016/day17.py
diff --git a/src/adventofcode2016/solutions/day18.py b/src/adventofcode2016/day18.py
similarity index 100%
rename from src/adventofcode2016/solutions/day18.py
rename to src/adventofcode2016/day18.py
diff --git a/src/adventofcode2016/solutions/day19.py b/src/adventofcode2016/day19.py
similarity index 100%
rename from src/adventofcode2016/solutions/day19.py
rename to src/adventofcode2016/day19.py
diff --git a/src/adventofcode2016/solutions/day20.py b/src/adventofcode2016/day20.py
similarity index 100%
rename from src/adventofcode2016/solutions/day20.py
rename to src/adventofcode2016/day20.py
diff --git a/src/adventofcode2016/solutions/day21.py b/src/adventofcode2016/day21.py
similarity index 100%
rename from src/adventofcode2016/solutions/day21.py
rename to src/adventofcode2016/day21.py
diff --git a/src/adventofcode2016/solutions/day22.py b/src/adventofcode2016/day22.py
similarity index 100%
rename from src/adventofcode2016/solutions/day22.py
rename to src/adventofcode2016/day22.py
diff --git a/src/adventofcode2019/solutions/data/day_01/day01.txt b/src/adventofcode2019/data/day_01/day01.txt
similarity index 100%
rename from src/adventofcode2019/solutions/data/day_01/day01.txt
rename to src/adventofcode2019/data/day_01/day01.txt
diff --git a/src/adventofcode2019/solutions/data/day_02/day02.txt b/src/adventofcode2019/data/day_02/day02.txt
similarity index 100%
rename from src/adventofcode2019/solutions/data/day_02/day02.txt
rename to src/adventofcode2019/data/day_02/day02.txt
diff --git a/src/adventofcode2019/solutions/data/day_03/day03.txt b/src/adventofcode2019/data/day_03/day03.txt
similarity index 98%
rename from src/adventofcode2019/solutions/data/day_03/day03.txt
rename to src/adventofcode2019/data/day_03/day03.txt
index dc45abaf..bfa570c3 100644
--- a/src/adventofcode2019/solutions/data/day_03/day03.txt
+++ b/src/adventofcode2019/data/day_03/day03.txt
@@ -1,2 +1,2 @@
 R999,D467,L84,D619,L49,U380,R287,U80,R744,D642,L340,U738,R959,U710,R882,U861,L130,D354,L579,D586,R798,D735,L661,D453,L828,U953,R604,D834,R921,D348,R620,U775,R364,U552,L221,U119,R590,U29,L267,D745,L128,U468,L978,D717,R883,D227,R691,D330,L33,U520,L862,D132,R99,U400,L455,U737,L603,U220,L689,U131,R158,D674,R617,D287,R422,U734,L73,U327,L525,D245,R849,D692,R114,U136,R762,D5,R329,U429,L849,U748,R816,U556,R614,D412,R416,D306,R307,U826,R880,U936,L164,U984,L689,D934,R790,D14,R561,D736,L3,D442,R301,D520,L451,U76,R844,D307,L144,D800,L462,D138,R956,U225,L393,D186,L924,D445,L86,D640,L920,D877,L197,U191,L371,D701,R826,D282,R856,D412,L788,D417,R69,D678,R978,D268,L268,U112,L69,U164,L748,U191,R227,D227,R59,U749,R134,U779,R865,U247,R55,D567,R821,U799,R937,D942,L445,D571,R685,D111,R107,D769,R269,D968,R102,U335,R538,U125,L725,D654,R451,D242,R777,U813,R799,D786,L804,U313,L322,U771,R219,U316,L973,U963,R84,D289,R825,D299,L425,D49,R995,D486,R550,D789,R735,D501,R966,U955,R432,U635,L353,D600,R675,D236,R864,U322,R719,D418,L877,U833,R839,D634,L533,D438,L734,U130,L578,U498,L984,D413,L615,U40,L699,U656,L653,U419,R856,U882,R30,D266,R386,D692,L210,U802,L390,U753,L406,U338,R743,D320,L125,U204,R391,U537,R887,D194,L302,U400,R510,U92,L310,D382,R597,U498,R851,D357,L568,U800,R918,D106,R673,D735,L86,D67,R398,D677,R355,D501,L909,D133,R729,D293,L498,U222,R832,U671,R751,U36,R422,U840,L636,D476,L292,D105,L239,U199,R669,U736,L345,D911,L277,U452,L979,D153,R882,U604,R602,U495,L311,U453,L215,D713,R873
-L996,U773,L865,D472,L988,D570,L388,U458,L87,U885,L115,U55,R75,U582,R695,U883,R83,U285,R96,D244,L647,D359,R136,U107,R912,U871,L844,U395,L63,U899,L205,D137,R549,U221,L859,D429,L809,U127,R304,U679,L511,U144,R926,U95,L805,U811,R42,D248,L546,D644,L551,D897,R368,D391,L224,U164,L490,D991,L146,D615,R536,U247,R10,U998,L957,D233,R706,D926,R760,U438,R270,D983,R134,U738,L262,U301,L480,D635,L702,D715,R479,U500,R19,D291,R368,U203,R305,D999,R106,U355,L683,D298,R90,U968,L254,D936,R89,U496,R253,U688,R99,U637,L783,D451,R673,D762,R997,D50,L488,U551,L871,U388,R949,D371,R584,D908,L880,U523,R557,U436,R520,U587,L56,U18,R397,U541,R660,D444,R51,U187,R221,U902,R726,U303,R97,D817,R185,D218,L240,D67,L259,U334,R821,U629,R21,D970,R282,U155,R555,D678,L99,D570,R863,D405,R941,U584,L303,D109,L871,U180,R595,D226,L670,D943,L127,U647,R452,D570,R75,D284,R414,U404,R515,U993,R408,U488,R890,D318,L415,U969,R769,D976,L732,U1,R489,U655,R930,U638,R649,D254,R161,U287,L659,D26,L477,D821,L124,U538,R17,D711,L203,U888,R904,U648,L908,D65,L215,U283,R698,U28,R72,U214,R499,D89,R489,D58,R949,D91,L710,U960,L755,D402,L27,D873,R61,U607,R57,D548,R369,U622,L244,U19,R61,D606,R928,D968,R10,D988,R816,U500,R915,D400,R546,D283,L627,D919,L259,U337,R374,U795,L355,D989,L224,D77,L872,U901,R476,U765,L320,U768,L937,D437,R141,D822,L326,D324,L498,U994,L518,D857,R973,D681,L710,D590,L879,U499,R488,D151,L242,U988,L944,U683,L24,U491,R823,D246,R872,D654,R28,U581,L142,U31,R435,D686,L147,D102,R952,D607,L959,D929,L46
\ No newline at end of file
+L996,U773,L865,D472,L988,D570,L388,U458,L87,U885,L115,U55,R75,U582,R695,U883,R83,U285,R96,D244,L647,D359,R136,U107,R912,U871,L844,U395,L63,U899,L205,D137,R549,U221,L859,D429,L809,U127,R304,U679,L511,U144,R926,U95,L805,U811,R42,D248,L546,D644,L551,D897,R368,D391,L224,U164,L490,D991,L146,D615,R536,U247,R10,U998,L957,D233,R706,D926,R760,U438,R270,D983,R134,U738,L262,U301,L480,D635,L702,D715,R479,U500,R19,D291,R368,U203,R305,D999,R106,U355,L683,D298,R90,U968,L254,D936,R89,U496,R253,U688,R99,U637,L783,D451,R673,D762,R997,D50,L488,U551,L871,U388,R949,D371,R584,D908,L880,U523,R557,U436,R520,U587,L56,U18,R397,U541,R660,D444,R51,U187,R221,U902,R726,U303,R97,D817,R185,D218,L240,D67,L259,U334,R821,U629,R21,D970,R282,U155,R555,D678,L99,D570,R863,D405,R941,U584,L303,D109,L871,U180,R595,D226,L670,D943,L127,U647,R452,D570,R75,D284,R414,U404,R515,U993,R408,U488,R890,D318,L415,U969,R769,D976,L732,U1,R489,U655,R930,U638,R649,D254,R161,U287,L659,D26,L477,D821,L124,U538,R17,D711,L203,U888,R904,U648,L908,D65,L215,U283,R698,U28,R72,U214,R499,D89,R489,D58,R949,D91,L710,U960,L755,D402,L27,D873,R61,U607,R57,D548,R369,U622,L244,U19,R61,D606,R928,D968,R10,D988,R816,U500,R915,D400,R546,D283,L627,D919,L259,U337,R374,U795,L355,D989,L224,D77,L872,U901,R476,U765,L320,U768,L937,D437,R141,D822,L326,D324,L498,U994,L518,D857,R973,D681,L710,D590,L879,U499,R488,D151,L242,U988,L944,U683,L24,U491,R823,D246,R872,D654,R28,U581,L142,U31,R435,D686,L147,D102,R952,D607,L959,D929,L46
diff --git a/src/adventofcode2019/solutions/data/day_04/day04.txt b/src/adventofcode2019/data/day_04/day04.txt
similarity index 100%
rename from src/adventofcode2019/solutions/data/day_04/day04.txt
rename to src/adventofcode2019/data/day_04/day04.txt
diff --git a/src/adventofcode2019/solutions/data/day_05/day05.txt b/src/adventofcode2019/data/day_05/day05.txt
similarity index 100%
rename from src/adventofcode2019/solutions/data/day_05/day05.txt
rename to src/adventofcode2019/data/day_05/day05.txt
diff --git a/src/adventofcode2019/solutions/data/day_06/day06.txt b/src/adventofcode2019/data/day_06/day06.txt
similarity index 100%
rename from src/adventofcode2019/solutions/data/day_06/day06.txt
rename to src/adventofcode2019/data/day_06/day06.txt
diff --git a/src/adventofcode2019/solutions/data/day_07/day07.txt b/src/adventofcode2019/data/day_07/day07.txt
similarity index 96%
rename from src/adventofcode2019/solutions/data/day_07/day07.txt
rename to src/adventofcode2019/data/day_07/day07.txt
index 53bbd9fb..d1550e65 100644
--- a/src/adventofcode2019/solutions/data/day_07/day07.txt
+++ b/src/adventofcode2019/data/day_07/day07.txt
@@ -1 +1 @@
-3,8,1001,8,10,8,105,1,0,0,21,30,51,76,101,118,199,280,361,442,99999,3,9,102,5,9,9,4,9,99,3,9,102,4,9,9,1001,9,3,9,102,2,9,9,101,2,9,9,4,9,99,3,9,1002,9,3,9,1001,9,4,9,102,5,9,9,101,3,9,9,1002,9,3,9,4,9,99,3,9,101,5,9,9,102,4,9,9,1001,9,3,9,1002,9,2,9,101,4,9,9,4,9,99,3,9,1002,9,2,9,1001,9,3,9,102,5,9,9,4,9,99,3,9,1002,9,2,9,4,9,3,9,1002,9,2,9,4,9,3,9,1002,9,2,9,4,9,3,9,1001,9,2,9,4,9,3,9,102,2,9,9,4,9,3,9,102,2,9,9,4,9,3,9,1002,9,2,9,4,9,3,9,101,2,9,9,4,9,3,9,1002,9,2,9,4,9,3,9,1002,9,2,9,4,9,99,3,9,1001,9,1,9,4,9,3,9,1002,9,2,9,4,9,3,9,1002,9,2,9,4,9,3,9,101,2,9,9,4,9,3,9,102,2,9,9,4,9,3,9,102,2,9,9,4,9,3,9,101,1,9,9,4,9,3,9,102,2,9,9,4,9,3,9,101,1,9,9,4,9,3,9,102,2,9,9,4,9,99,3,9,1001,9,1,9,4,9,3,9,1001,9,2,9,4,9,3,9,101,1,9,9,4,9,3,9,101,1,9,9,4,9,3,9,1002,9,2,9,4,9,3,9,1001,9,2,9,4,9,3,9,101,1,9,9,4,9,3,9,1002,9,2,9,4,9,3,9,1001,9,1,9,4,9,3,9,101,1,9,9,4,9,99,3,9,1001,9,1,9,4,9,3,9,1002,9,2,9,4,9,3,9,1002,9,2,9,4,9,3,9,1002,9,2,9,4,9,3,9,101,2,9,9,4,9,3,9,1001,9,2,9,4,9,3,9,101,2,9,9,4,9,3,9,1001,9,1,9,4,9,3,9,1001,9,1,9,4,9,3,9,1002,9,2,9,4,9,99,3,9,102,2,9,9,4,9,3,9,1001,9,2,9,4,9,3,9,101,1,9,9,4,9,3,9,102,2,9,9,4,9,3,9,101,2,9,9,4,9,3,9,1001,9,1,9,4,9,3,9,101,1,9,9,4,9,3,9,101,1,9,9,4,9,3,9,1001,9,2,9,4,9,3,9,1001,9,2,9,4,9,99
\ No newline at end of file
+3,8,1001,8,10,8,105,1,0,0,21,30,51,76,101,118,199,280,361,442,99999,3,9,102,5,9,9,4,9,99,3,9,102,4,9,9,1001,9,3,9,102,2,9,9,101,2,9,9,4,9,99,3,9,1002,9,3,9,1001,9,4,9,102,5,9,9,101,3,9,9,1002,9,3,9,4,9,99,3,9,101,5,9,9,102,4,9,9,1001,9,3,9,1002,9,2,9,101,4,9,9,4,9,99,3,9,1002,9,2,9,1001,9,3,9,102,5,9,9,4,9,99,3,9,1002,9,2,9,4,9,3,9,1002,9,2,9,4,9,3,9,1002,9,2,9,4,9,3,9,1001,9,2,9,4,9,3,9,102,2,9,9,4,9,3,9,102,2,9,9,4,9,3,9,1002,9,2,9,4,9,3,9,101,2,9,9,4,9,3,9,1002,9,2,9,4,9,3,9,1002,9,2,9,4,9,99,3,9,1001,9,1,9,4,9,3,9,1002,9,2,9,4,9,3,9,1002,9,2,9,4,9,3,9,101,2,9,9,4,9,3,9,102,2,9,9,4,9,3,9,102,2,9,9,4,9,3,9,101,1,9,9,4,9,3,9,102,2,9,9,4,9,3,9,101,1,9,9,4,9,3,9,102,2,9,9,4,9,99,3,9,1001,9,1,9,4,9,3,9,1001,9,2,9,4,9,3,9,101,1,9,9,4,9,3,9,101,1,9,9,4,9,3,9,1002,9,2,9,4,9,3,9,1001,9,2,9,4,9,3,9,101,1,9,9,4,9,3,9,1002,9,2,9,4,9,3,9,1001,9,1,9,4,9,3,9,101,1,9,9,4,9,99,3,9,1001,9,1,9,4,9,3,9,1002,9,2,9,4,9,3,9,1002,9,2,9,4,9,3,9,1002,9,2,9,4,9,3,9,101,2,9,9,4,9,3,9,1001,9,2,9,4,9,3,9,101,2,9,9,4,9,3,9,1001,9,1,9,4,9,3,9,1001,9,1,9,4,9,3,9,1002,9,2,9,4,9,99,3,9,102,2,9,9,4,9,3,9,1001,9,2,9,4,9,3,9,101,1,9,9,4,9,3,9,102,2,9,9,4,9,3,9,101,2,9,9,4,9,3,9,1001,9,1,9,4,9,3,9,101,1,9,9,4,9,3,9,101,1,9,9,4,9,3,9,1001,9,2,9,4,9,3,9,1001,9,2,9,4,9,99
diff --git a/src/adventofcode2019/solutions/data/day_08/day08.txt b/src/adventofcode2019/data/day_08/day08.txt
similarity index 99%
rename from src/adventofcode2019/solutions/data/day_08/day08.txt
rename to src/adventofcode2019/data/day_08/day08.txt
index 0dde1876..ec92280f 100644
--- a/src/adventofcode2019/solutions/data/day_08/day08.txt
+++ b/src/adventofcode2019/data/day_08/day08.txt
@@ -1 +1 @@
-222202222222222222222221022222220122202022222220222212222220222022002022222200122222222212222222222220222222122222220222122222221222220222222122220222222222222222222222222211022222220222202222222221222202222222222022022222222212022222222202222222222222222222122222211222222222222222122222222222221222222212222222222222222212022222220222202222222222222222222222122222022222222212022222222202222222222220222222222222221222122222221222120222222022222222222222222222222222222212022222220022202122222221222202222222022222002022222202222222222212222222222222222222122222200222022222221222021222222022220222222212222212222222222221222222220222222122222221222222222220222121222022222222022222220212222222222220222222122222200222122222221222022222222022222222222222222222222222222211022222221122212022222220222222222222022020202222222222022222221222222222222220222222122222212222222222221222220222222222220222222222222212222222222210022222222222202122222222222202222221022221012222222200222222220202222222222222022222122222211222022222221222122222222222220222222222222222222222222220122222220222212122222220222222222221222100222022222212222222221202222222222222122222222222210222122222220222022222222022222222222212222212222222222221022222220222202222222222222222222221122101112222222222022222222212222222222221022222222222201222222222220222122222222022221222222222222212222222222210222222222222202222222222222222222220022011122022222201222222221202222222222221022222022222221222222222220222220222222222222222222222222202222222222201122222222022212022222221222212222220022020220222222202222222222212122222222222022222222222212222022222221222020222220222221222222222222212222222222220222222220022212122222222222222222221122111202222222200222222221222122222222220022222222222222222222222020222121222221022221222222212222202222222222220222222222222222222222121222202222220022121210122222220022222221202022222222220222222222222221222022222220222020222221222220222222212222212222222222211122222221122212122222120222212222222122112211222222211122222222222022222222221222222222222210222222222021222120222222122222222222202222222222222222221122222222122202122222020222202222221222122111222222222122222221222022222222220222222122222202222222222220222222222221222220222222222222212222222222202122222220022202022222221222202222220122001000222222220122222220202222222222221222222022222201222122222020222020222222022222222222222222202222222222221222222221122222022222122222212222221122120211122222210202222221212222222222222122222022222210222220222121222220222220022221222222202222202222222222210222212222022202222222022222222222222122000110122222221112222222212122222222220022222222222220222121222120222121222220222221222222202222211222222222211222212220022222122222021222202222221022100002022222200102222222212022222222220022222022222212222020222022222220222220122222222222222222212222222222220222222220022202122222021222212222221122202201222222202002222220202022222222222122222222222201222121222021222222222221222221222202222222200222222222202022202222222212122222022222222222222022111120122222210122222221202122221222221122222122222212222022222121222120222220222221222222222222222222222222210022202222222222022222020222212222221122020222022222202012222220202122220222220022222022222202222120221222222022222220022221222212212222202222222222222020212222222212122222122222212222222022121200222222221022222222202022222222222222222222222201222221221020222120222221222221222212212222222222222222220220212222022202122222021222212222222122002011122222222102221220202022220222222122222122222211222221220022222021222222122221222222212222201222222222201222212220122202222222221222221222220022202101022222210102220222202122220222221022222122222222222221221020222020222221022221222212202222201222222222222122212220122212022222222222221222222122102001221222201102221220222122220222220122222222222221222220222222222120222222222220222222212222200222222222200022202221122202022222022222222222220222111111020222220222222222202222221222220122222122222222222121222021222121222221222220222222212222212222222222222021202221222222122222100222221222220122201102022222202112221220202122221222221022220022222200222021222021222122222221222221222222212222222222222222202222202220222202022222201222212222222222021110021222211002221220202122220222221222220022222210222120220022222021222221022220222212222222220222222222222020202220122202122222211222200222221122000001020222220112221221202222221222221022222122222201222222220022222221222222122220222202202222220222222222222022212221022212222222222222212222221022002120021222220102221220202022221222222122221121222221222222220221222021222222022220222222222222221222222222222022212222222212222222222222202222220222111221121222200122221210222022220222221122222020222201222020220122222122122220222222222212202222220222222222222021202201022222122222012222202222221122102211220222200222222212222122221222221022222020222222222021220122222021022221122221202222212222202222222222221110212211122222122222200222221222220222001100121222211222222220212122222222222122221222222222222222222120222020022220022220212222222222221222222222202102212221022222022222011222201222221222021121022222202222221220222122221222220122220122222221220120221022222122022221122221202212202220221222222222220020222210222222122022001202200222222222022011121222200222221201212022220222221122220020222210222221220022202222122220022221222222222220211222221222200201202212122222222022200212221222220222212111221222202202221202222022221222220022221122222220221220220222222220022221022222222212222222220222220222210010202210022212022122100222220222221022000220020222202202220220212122221222220122220221222210222220222122202022022222122220222222202221222222222222222001202211022202022222121212211222220222202112221222102012220202202122222222221022221120222200222220222021212022022221022220202202222220220222222222202212212210222222122222000202202222220022011011122222101012221220222022222222221222221122222202222221220221222222222220122221212222202222212222221222220001212210222222222222201202201022222022000200120222222122220212212122220222221222222121222211222121222220212020022221222222222202212222210222222222211102202210122212220222012212222022221022202222222222102212221010202022220222220122221122222201220022221121222122122220022220202202202222222222222222201212202211122212220022002222200122222222221010021222212102221110222022222222222222222021222200211221221221202220122221122221212222202222211222220222201102212210222222222022022222221122220122201010021222210012220111202222220222220222221021222221222022220120212122222220222220222212222220202222220222220100202221222202221022212202211022222222211222020222020212221010222222222220220222220220222222221022220121222021222222122222212202222220220222222222202110202210022212021222112222212022221022212220020202220222221222212222222221222222220021222211212122222021212221222221222220222202222221201222222222210212202220222202222222001222212022220022000021120222120112221210212022222220222122221220222011201121222222202122122221122222222202212221220222221022222020222211022222022022012222202222221122122000122202100012220120212122220220221022220122222000202121221020222021022220222222202212212221220222220022220202202212022202121222202222220122220122122100220212011202220111212222220220222222222120222110220222221120222121122222122222202212212220201222221022220221222202222202220022200222200022221212022211020212112112220122202222220221220120222122222002212022200220202121122220022220202212202222220222220222211122222221222202021122210202201022220222010202220212201222220221222122221222220220222222022011221020202120212021122220122221212212222120201222221222220222222201222222222022011212202022220102222020120222201202221102202122221222220021220020022001222121201021222021022222222222202222222022201222221122222221222200222222022122201202220022221102222112222202022202222102212022220221221222222022222001202122212021202121022222122220202222212020202222222022212200222201222222220122011212212022222222200222022202222012222002202222221220220020220020022220202220220020202222222221022222222222212221220222222122202121212201222202220022002202221122222112110102022202000022221000222022221222210021221121022110202022212021212220022222022220202202202120212220222222222012222210222202022222010222210022222222110212122222100212222001202122221221221222202020122110201021212122202112022222222220222202202021202222222022202201222200122212121222011222210022220222212201220222200022222002202222220220221222202222122021201121201121202201022221222222222202212020221220222222212000202210122212020212200202211022222112221110221222211002220001222222220220202222221222122000210222220222222112012221122220202212212121220221222022200001202200022202021012222212212222222222020220120212122222220100202122221020221020212121122221202020221220212021212220222220202202212220221221221222201120202201122212021022021222221220222202022211221212212112220210202022222122202121221021222201220020211022212201102202222220212212222122201221220122220201222201122212220012110202201120222112022010120222010102221012202120220022200221212122022111222220210221202012222221122222202202212022212222221022220020202202122202020212212212211121222122111012220222000002221201202120222122201022221220022211220120202120212121112201122222202212202221202220220122222012202221122222021022211202211221221202102220221222112202222212212020220222211220201222122111210120220221212220122222122221202222222021210220221122200020202222022212120212110202212120222122000122022222011102221220212021222020221121212121222101202122220122212122222211022222002202202021210221221022220121212222022222221202110222202221221002221101221212011202220021202122222122210021212121122101221220211021202221212210122221012222222122222222222022210010002212022222021022101212201222222112120011221222111022220021212020221020221021212220222112001122222122212111002200222222012212222220210222222122202101212220222222021012221222222120220102221221021212111022220001222121220121200022211020021100021122222220212102102212122220222212212222001222221022222221012201022212222212122202200222221202012002020222012012222120222022221121221220220120122022100120221020212121112201222220212202212122221220222022201220022200122202022102021202220022021122001212222212221202222102212021222022200220220120220210222021212020212000012220122221212202222120212221222022211212022202222222220022020202222222221022010120022222011002220012212120220021202212221222120221022022200201222201202201022221222212212121100221222222211210122211222222220002011212202021021222121020121222121102222211222121222120222211210121222002100020210211212220112201222221002222222021021222222122201022222221222202020012110212210122122121220102122202202112220110202220221122220121221221120212211020221211202021212221112221012222212022112221221022202022102212222212021202010222220121020010101121120222010202222022222221220020220002211220120121112022200101212001002222220222002212212021122220220222201000102210222202020012022222220221221012001121120202210122222121012221222122200202222120221001002221210212202200202220010221212212222221100221220122210100222211222212020022120202202022121100102220120212021222221000102020222222200020222121122221111122220112202012022222210220012222212120112220220022202201122202222202120212111222210122121212211212120202111022221002212122221021201012211122222220122221212000212210222220201220112222212222121221221122222110202222022202121102022202202221222222221210021212022022220011022220220021221122212120122110000220212001222120202222012222022202212122212222220222220022012222122222021122120221222220022112121221120212212122222201122221222021212101222121122000001221210200212002001011000221212202222122001220220122222211022210222202122012012202212120222122022010221202202012221122102022221022201212202101020121221020221221202201220212020222222212202220120220222222200010122221122212122202010202210221022012102221221212012122220012122021221222221220201110020202012222222110222012002111011220202212212021002222221022202222102222122202120022211222221220122011202221022212122102220220012021022122211210211111021022020220220100202110200101021220002222202022112121221122202002012222122212222222220211200120122112201120122212211102220201022120222122221100210220222202000221222112222200012100101222112212102220211022222122212102212220122221122012001220222020121011021122021212202112221012022221120222222201212220222202112221220021222120122021110211222202122021012022221122222212022220122222121222122220201121020102122111220222112112222001222221220120201202202221022000012021211211212012011110102202022202002221121220220022220112022201022210021022210222220221220022011001120222102002220120022222022021210002212210122002002022222010222121101211021222212202122220010022021222222002022201022200021202210202112221020002212221020202101222221110020021122120220201221102221212012122212100202200200121220011022222102221002020020222211100222210222222022122022211201022221211111210122202000212222001112022020021200010201212121000101220222011222210100102112200212202210222210220122122211120122221022201021102010211002122020200210212121222010022222012101120022120210210211011020001020120200010222122210102111001102222000021020021020122212222222212122202020202011222212120021002022012220222101002221012102120120102221202210110020202020021221220222000100121110112022222202022002221021222211221002222022201022122221221120220120100210201022222111112222202020220121202221001202011221122120020220211222220120222120221012222200220022220022222221002112212222212222002221210101021120111020101122212211102222122120021121111201221220110022211000222201020212221121201101102212212200022122122020121120100212200102212121112001221110221120201210201122212100012222100122021222020000201202022221011121220201110202020122021010011222212212122211021121220021122102210202210221222200221210220102002100002021222010202220101020022022011222200222001122001012021210202202012002000021010212222020020022221022220011202122220112222221202122212102221111200221020221212211102221101012022201021100222211021120022101022220111222000212020120120212222212020011122221021102111222222222202222212121211101222001201202110020212200002220120201221220212101212222101022001121220202011202112121212202010112212102020020121220022220211222222202202020002202222210022012001022000120202021012221222200120201211202220210120022000222122211220202100002101222200122212212221022201222022011212222210112212120112011202202220111022211012222222101102221200221222112220102202202100020112000221212010212121102120020001010222112022010201122121122210122220002222220122222220121022202201212010120212002212222211102222100120001102211122020212011022202211212110221112110200212222200022201112220121202010212212012201122212121211102221200122011002221212201212222122112122200210111021201112121121110020211100212220111201102110100120202112201101211001111111220100121022110210011011222111121100221020111120010201010001201000000020211220100120001110012102001220021012001110111121111
\ No newline at end of file
+222202222222222222222221022222220122202022222220222212222220222022002022222200122222222212222222222220222222122222220222122222221222220222222122220222222222222222222222222211022222220222202222222221222202222222222022022222222212022222222202222222222222222222122222211222222222222222122222222222221222222212222222222222222212022222220222202222222222222222222222122222022222222212022222222202222222222220222222222222221222122222221222120222222022222222222222222222222222222212022222220022202122222221222202222222022222002022222202222222222212222222222222222222122222200222022222221222021222222022220222222212222212222222222221222222220222222122222221222222222220222121222022222222022222220212222222222220222222122222200222122222221222022222222022222222222222222222222222222211022222221122212022222220222222222222022020202222222222022222221222222222222220222222122222212222222222221222220222222222220222222222222212222222222210022222222222202122222222222202222221022221012222222200222222220202222222222222022222122222211222022222221222122222222222220222222222222222222222222220122222220222212122222220222222222221222100222022222212222222221202222222222222122222222222210222122222220222022222222022222222222212222212222222222221022222220222202222222222222222222221122101112222222222022222222212222222222221022222222222201222222222220222122222222022221222222222222212222222222210222222222222202222222222222222222220022011122022222201222222221202222222222221022222022222221222222222220222220222222222222222222222222202222222222201122222222022212022222221222212222220022020220222222202222222222212122222222222022222222222212222022222221222020222220222221222222222222212222222222220222222220022212122222222222222222221122111202222222200222222221222122222222220022222222222222222222222020222121222221022221222222212222202222222222220222222222222222222222121222202222220022121210122222220022222221202022222222220222222222222221222022222220222020222221222220222222212222212222222222211122222221122212122222120222212222222122112211222222211122222222222022222222221222222222222210222222222021222120222222122222222222202222222222222222221122222222122202122222020222202222221222122111222222222122222221222022222222220222222122222202222222222220222222222221222220222222222222212222222222202122222220022202022222221222202222220122001000222222220122222220202222222222221222222022222201222122222020222020222222022222222222222222202222222222221222222221122222022222122222212222221122120211122222210202222221212222222222222122222022222210222220222121222220222220022221222222202222202222222222210222212222022202222222022222222222222122000110122222221112222222212122222222220022222222222220222121222120222121222220222221222222202222211222222222211222212220022222122222021222202222221022100002022222200102222222212022222222220022222022222212222020222022222220222220122222222222222222212222222222220222222220022202122222021222212222221122202201222222202002222220202022222222222122222222222201222121222021222222222221222221222202222222200222222222202022202222222212122222022222222222222022111120122222210122222221202122221222221122222122222212222022222121222120222220222221222222222222222222222222210022202222222222022222020222212222221122020222022222202012222220202122220222220022222022222202222120221222222022222220022221222212212222202222222222222020212222222212122222122222212222222022121200222222221022222222202022222222222222222222222201222221221020222120222221222221222212212222222222222222220220212222022202122222021222212222222122002011122222222102221220202022220222222122222122222211222221220022222021222222122221222222212222201222222222201222212220122202222222221222221222220022202101022222210102220222202122220222221022222122222222222221221020222020222221022221222212202222201222222222222122212220122212022222222222221222222122102001221222201102221220222122220222220122222222222221222220222222222120222222222220222222212222200222222222200022202221122202022222022222222222220222111111020222220222222222202222221222220122222122222222222121222021222121222221222220222222212222212222222222222021202221222222122222100222221222220122201102022222202112221220202122221222221022220022222200222021222021222122222221222221222222212222222222222222202222202220222202022222201222212222222222021110021222211002221220202122220222221222220022222210222120220022222021222221022220222212222222220222222222222020202220122202122222211222200222221122000001020222220112221221202222221222221022222122222201222222220022222221222222122220222202202222220222222222222022212221022212222222222222212222221022002120021222220102221220202022221222222122221121222221222222220221222021222222022220222222222222221222222222222022212222222212222222222222202222220222111221121222200122221210222022220222221122222020222201222020220122222122122220222222222212202222220222222222222021202201022222122222012222202222221122102211220222200222222212222122221222221022222020222222222021220122222021022221122221202222212222202222222222221110212211122222122222200222221222220222001100121222211222222220212122222222222122221222222222222222222120222020022220022220212222222222221222222222202102212221022222022222011222201222221222021121022222202222221220222122221222220122220122222221220120221022222122022221122221202212202220221222222222220020222210222222122022001202200222222222022011121222200222221201212022220222221122220020222210222221220022202222122220022221222222222220211222221222200201202212122222222022200212221222220222212111221222202202221202222022221222220022221122222220221220220222222220022221022222222212222222220222220222210010202210022212022122100222220222221022000220020222202202220220212122221222220122220221222210222220222122202022022222122220222222202221222222222222222001202211022202022222121212211222220222202112221222102012220202202122222222221022221120222200222220222021212022022221022220202202222220220222222222202212212210222222122222000202202222220022011011122222101012221220222022222222221222221122222202222221220221222222222220122221212222202222212222221222220001212210222222222222201202201022222022000200120222222122220212212122220222221222222121222211222121222220212020022221222222222202212222210222222222211102202210122212220222012212222022221022202222222222102212221010202022220222220122221122222201220022221121222122122220022220202202202222222222222222201212202211122212220022002222200122222222221010021222212102221110222022222222222222222021222200211221221221202220122221122221212222202222211222220222201102212210222222222022022222221122220122201010021222210012220111202222220222220222221021222221222022220120212122222220222220222212222220202222220222220100202221222202221022212202211022222222211222020222020212221010222222222220220222220220222222221022220121222021222222122222212202222220220222222222202110202210022212021222112222212022221022212220020202220222221222212222222221222222220021222211212122222021212221222221222220222202222221201222222222210212202220222202222222001222212022220022000021120222120112221210212022222220222122221220222011201121222222202122122221122222222202212221220222221022222020222211022222022022012222202222221122122000122202100012220120212122220220221022220122222000202121221020222021022220222222202212212221220222220022220202202212022202121222202222220122220122122100220212011202220111212222220220222222222120222110220222221120222121122222122222202212212220201222221022220221222202222202220022200222200022221212022211020212112112220122202222220221220120222122222002212022200220202121122220022220202212202222220222220222211122222221222202021122210202201022220222010202220212201222220221222122221222220220222222022011221020202120212021122220122221212212222120201222221222220222222201222222222022011212202022220102222020120222201202221102202122221222220021220020022001222121201021222021022222222222202222222022201222221122222221222200222222022122201202220022221102222112222202022202222102212022220221221222222022222001202122212021202121022222122220202222212020202222222022212200222201222222220122011212212022222222200222022202222012222002202222221220220020220020022220202220220020202222222221022222222222212221220222222122202121212201222202220022002202221122222112110102022202000022221000222022221222210021221121022110202022212021212220022222022220202202202120212220222222222012222210222202022222010222210022222222110212122222100212222001202122221221221222202020122110201021212122202112022222222220222202202021202222222022202201222200122212121222011222210022220222212201220222200022222002202222220220221222202222122021201121201121202201022221222222222202212020221220222222212000202210122212020212200202211022222112221110221222211002220001222222220220202222221222122000210222220222222112012221122220202212212121220221222022200001202200022202021012222212212222222222020220120212122222220100202122221020221020212121122221202020221220212021212220222220202202212220221221221222201120202201122212021022021222221220222202022211221212212112220210202022222122202121221021222201220020211022212201102202222220212212222122201221220122220201222201122212220012110202201120222112022010120222010102221012202120220022200221212122022111222220210221202012222221122222202202212022212222221022220020202202122202020212212212211121222122111012220222000002221201202120222122201022221220022211220120202120212121112201122222202212202221202220220122222012202221122222021022211202211221221202102220221222112202222212212020220222211220201222122111210120220221212220122222122221202222222021210220221122200020202222022212120212110202212120222122000122022222011102221220212021222020221121212121222101202122220122212122222211022222002202202021210221221022220121212222022222221202110222202221221002221101221212011202220021202122222122210021212121122101221220211021202221212210122221012222222122222222222022210010002212022222021022101212201222222112120011221222111022220021212020221020221021212220222112001122222122212111002200222222012212222220210222222122202101212220222222021012221222222120220102221221021212111022220001222121220121200022211020021100021122222220212102102212122220222212212222001222221022222221012201022212222212122202200222221202012002020222012012222120222022221121221220220120122022100120221020212121112201222220212202212122221220222022201220022200122202022102021202220022021122001212222212221202222102212021222022200220220120220210222021212020212000012220122221212202222120212221222022211212022202222222220022020202222222221022010120022222011002220012212120220021202212221222120221022022200201222201202201022221222212212121100221222222211210122211222222220002011212202021021222121020121222121102222211222121222120222211210121222002100020210211212220112201222221002222222021021222222122201022222221222202020012110212210122122121220102122202202112220110202220221122220121221221120212211020221211202021212221112221012222212022112221221022202022102212222212021202010222220121020010101121120222010202222022222221220020220002211220120121112022200101212001002222220222002212212021122220220222201000102210222202020012022222220221221012001121120202210122222121012221222122200202222120221001002221210212202200202220010221212212222221100221220122210100222211222212020022120202202022121100102220120212021222221000102020222222200020222121122221111122220112202012022222210220012222212120112220220022202201122202222202120212111222210122121212211212120202111022221002212122221021201012211122222220122221212000212210222220201220112222212222121221221122222110202222022202121102022202202221222222221210021212022022220011022220220021221122212120122110000220212001222120202222012222022202212122212222220222220022012222122222021122120221222220022112121221120212212122222201122221222021212101222121122000001221210200212002001011000221212202222122001220220122222211022210222202122012012202212120222122022010221202202012221122102022221022201212202101020121221020221221202201220212020222222212202220120220222222200010122221122212122202010202210221022012102221221212012122220012122021221222221220201110020202012222222110222012002111011220202212212021002222221022202222102222122202120022211222221220122011202221022212122102220220012021022122211210211111021022020220220100202110200101021220002222202022112121221122202002012222122212222222220211200120122112201120122212211102220201022120222122221100210220222202000221222112222200012100101222112212102220211022222122212102212220122221122012001220222020121011021122021212202112221012022221120222222201212220222202112221220021222120122021110211222202122021012022221122222212022220122222121222122220201121020102122111220222112112222001222221220120201202202221022000012021211211212012011110102202022202002221121220220022220112022201022210021022210222220221220022011001120222102002220120022222022021210002212210122002002022222010222121101211021222212202122220010022021222222002022201022200021202210202112221020002212221020202101222221110020021122120220201221102221212012122212100202200200121220011022222102221002020020222211100222210222222022122022211201022221211111210122202000212222001112022020021200010201212121000101220222011222210100102112200212202210222210220122122211120122221022201021102010211002122020200210212121222010022222012101120022120210210211011020001020120200010222122210102111001102222000021020021020122212222222212122202020202011222212120021002022012220222101002221012102120120102221202210110020202020021221220222000100121110112022222202022002221021222211221002222022201022122221221120220120100210201022222111112222202020220121202221001202011221122120020220211222220120222120221012222200220022220022222221002112212222212222002221210101021120111020101122212211102222122120021121111201221220110022211000222201020212221121201101102212212200022122122020121120100212200102212121112001221110221120201210201122212100012222100122021222020000201202022221011121220201110202020122021010011222212212122211021121220021122102210202210221222200221210220102002100002021222010202220101020022022011222200222001122001012021210202202012002000021010212222020020022221022220011202122220112222221202122212102221111200221020221212211102221101012022201021100222211021120022101022220111222000212020120120212222212020011122221021102111222222222202222212121211101222001201202110020212200002220120201221220212101212222101022001121220202011202112121212202010112212102020020121220022220211222222202202020002202222210022012001022000120202021012221222200120201211202220210120022000222122211220202100002101222200122212212221022201222022011212222210112212120112011202202220111022211012222222101102221200221222112220102202202100020112000221212010212121102120020001010222112022010201122121122210122220002222220122222220121022202201212010120212002212222211102222100120001102211122020212011022202211212110221112110200212222200022201112220121202010212212012201122212121211102221200122011002221212201212222122112122200210111021201112121121110020211100212220111201102110100120202112201101211001111111220100121022110210011011222111121100221020111120010201010001201000000020211220100120001110012102001220021012001110111121111
diff --git a/src/adventofcode2019/solutions/data/day_09/day09.txt b/src/adventofcode2019/data/day_09/day09.txt
similarity index 99%
rename from src/adventofcode2019/solutions/data/day_09/day09.txt
rename to src/adventofcode2019/data/day_09/day09.txt
index f62f256a..059bbe75 100644
--- a/src/adventofcode2019/solutions/data/day_09/day09.txt
+++ b/src/adventofcode2019/data/day_09/day09.txt
@@ -1 +1 @@
-1102,34463338,34463338,63,1007,63,34463338,63,1005,63,53,1101,0,3,1000,109,988,209,12,9,1000,209,6,209,3,203,0,1008,1000,1,63,1005,63,65,1008,1000,2,63,1005,63,904,1008,1000,0,63,1005,63,58,4,25,104,0,99,4,0,104,0,99,4,17,104,0,99,0,0,1101,0,36,1015,1102,1,387,1028,1101,24,0,1016,1101,0,23,1008,1102,1,35,1012,1102,1,554,1023,1101,29,0,1003,1101,27,0,1011,1101,25,0,1000,1101,0,38,1018,1102,20,1,1019,1102,28,1,1005,1102,1,619,1026,1102,1,22,1004,1101,0,0,1020,1101,0,31,1009,1102,1,783,1024,1102,1,33,1001,1102,616,1,1027,1102,1,21,1006,1101,32,0,1013,1102,39,1,1014,1102,1,378,1029,1101,774,0,1025,1102,1,1,1021,1102,30,1,1007,1102,37,1,1002,1102,1,26,1017,1101,0,557,1022,1102,1,34,1010,109,13,2101,0,-5,63,1008,63,23,63,1005,63,203,4,187,1105,1,207,1001,64,1,64,1002,64,2,64,109,-14,2107,28,4,63,1005,63,225,4,213,1106,0,229,1001,64,1,64,1002,64,2,64,109,10,1207,-3,20,63,1005,63,245,1106,0,251,4,235,1001,64,1,64,1002,64,2,64,109,8,1205,3,263,1105,1,269,4,257,1001,64,1,64,1002,64,2,64,109,-9,1207,-7,34,63,1005,63,287,4,275,1105,1,291,1001,64,1,64,1002,64,2,64,109,-4,2102,1,-3,63,1008,63,32,63,1005,63,311,1105,1,317,4,297,1001,64,1,64,1002,64,2,64,109,21,21101,40,0,-6,1008,1019,43,63,1005,63,337,1106,0,343,4,323,1001,64,1,64,1002,64,2,64,109,-26,1202,7,1,63,1008,63,21,63,1005,63,365,4,349,1106,0,369,1001,64,1,64,1002,64,2,64,109,26,2106,0,3,4,375,1001,64,1,64,1105,1,387,1002,64,2,64,109,-9,21108,41,40,3,1005,1019,407,1001,64,1,64,1106,0,409,4,393,1002,64,2,64,109,13,1205,-8,423,4,415,1106,0,427,1001,64,1,64,1002,64,2,64,109,-19,21107,42,41,5,1005,1015,447,1001,64,1,64,1106,0,449,4,433,1002,64,2,64,109,-3,2102,1,-5,63,1008,63,37,63,1005,63,471,4,455,1105,1,475,1001,64,1,64,1002,64,2,64,109,-2,1201,0,0,63,1008,63,28,63,1005,63,497,4,481,1105,1,501,1001,64,1,64,1002,64,2,64,109,8,2107,29,-8,63,1005,63,521,1001,64,1,64,1106,0,523,4,507,1002,64,2,64,109,-3,1208,-3,30,63,1005,63,541,4,529,1106,0,545,1001,64,1,64,1002,64,2,64,109,4,2105,1,9,1105,1,563,4,551,1001,64,1,64,1002,64,2,64,109,9,1206,-3,581,4,569,1001,64,1,64,1106,0,581,1002,64,2,64,109,-8,1201,-9,0,63,1008,63,23,63,1005,63,605,1001,64,1,64,1106,0,607,4,587,1002,64,2,64,109,21,2106,0,-9,1106,0,625,4,613,1001,64,1,64,1002,64,2,64,109,-35,2108,31,8,63,1005,63,647,4,631,1001,64,1,64,1105,1,647,1002,64,2,64,109,2,1202,0,1,63,1008,63,30,63,1005,63,667,1105,1,673,4,653,1001,64,1,64,1002,64,2,64,109,17,21108,43,43,-4,1005,1016,691,4,679,1106,0,695,1001,64,1,64,1002,64,2,64,109,-14,1208,-1,30,63,1005,63,711,1106,0,717,4,701,1001,64,1,64,1002,64,2,64,109,6,21101,44,0,-1,1008,1011,44,63,1005,63,739,4,723,1105,1,743,1001,64,1,64,1002,64,2,64,109,-15,2108,30,8,63,1005,63,759,1106,0,765,4,749,1001,64,1,64,1002,64,2,64,109,27,2105,1,0,4,771,1001,64,1,64,1105,1,783,1002,64,2,64,109,-9,1206,6,795,1105,1,801,4,789,1001,64,1,64,1002,64,2,64,109,4,21102,45,1,-7,1008,1012,45,63,1005,63,823,4,807,1105,1,827,1001,64,1,64,1002,64,2,64,109,-14,21102,46,1,5,1008,1010,43,63,1005,63,851,1001,64,1,64,1105,1,853,4,833,1002,64,2,64,109,-1,2101,0,1,63,1008,63,25,63,1005,63,873,1105,1,879,4,859,1001,64,1,64,1002,64,2,64,109,9,21107,47,48,-3,1005,1010,897,4,885,1105,1,901,1001,64,1,64,4,64,99,21101,0,27,1,21101,915,0,0,1106,0,922,21201,1,57526,1,204,1,99,109,3,1207,-2,3,63,1005,63,964,21201,-2,-1,1,21101,942,0,0,1106,0,922,21201,1,0,-1,21201,-2,-3,1,21101,957,0,0,1106,0,922,22201,1,-1,-2,1105,1,968,21202,-2,1,-2,109,-3,2106,0,0
\ No newline at end of file
+1102,34463338,34463338,63,1007,63,34463338,63,1005,63,53,1101,0,3,1000,109,988,209,12,9,1000,209,6,209,3,203,0,1008,1000,1,63,1005,63,65,1008,1000,2,63,1005,63,904,1008,1000,0,63,1005,63,58,4,25,104,0,99,4,0,104,0,99,4,17,104,0,99,0,0,1101,0,36,1015,1102,1,387,1028,1101,24,0,1016,1101,0,23,1008,1102,1,35,1012,1102,1,554,1023,1101,29,0,1003,1101,27,0,1011,1101,25,0,1000,1101,0,38,1018,1102,20,1,1019,1102,28,1,1005,1102,1,619,1026,1102,1,22,1004,1101,0,0,1020,1101,0,31,1009,1102,1,783,1024,1102,1,33,1001,1102,616,1,1027,1102,1,21,1006,1101,32,0,1013,1102,39,1,1014,1102,1,378,1029,1101,774,0,1025,1102,1,1,1021,1102,30,1,1007,1102,37,1,1002,1102,1,26,1017,1101,0,557,1022,1102,1,34,1010,109,13,2101,0,-5,63,1008,63,23,63,1005,63,203,4,187,1105,1,207,1001,64,1,64,1002,64,2,64,109,-14,2107,28,4,63,1005,63,225,4,213,1106,0,229,1001,64,1,64,1002,64,2,64,109,10,1207,-3,20,63,1005,63,245,1106,0,251,4,235,1001,64,1,64,1002,64,2,64,109,8,1205,3,263,1105,1,269,4,257,1001,64,1,64,1002,64,2,64,109,-9,1207,-7,34,63,1005,63,287,4,275,1105,1,291,1001,64,1,64,1002,64,2,64,109,-4,2102,1,-3,63,1008,63,32,63,1005,63,311,1105,1,317,4,297,1001,64,1,64,1002,64,2,64,109,21,21101,40,0,-6,1008,1019,43,63,1005,63,337,1106,0,343,4,323,1001,64,1,64,1002,64,2,64,109,-26,1202,7,1,63,1008,63,21,63,1005,63,365,4,349,1106,0,369,1001,64,1,64,1002,64,2,64,109,26,2106,0,3,4,375,1001,64,1,64,1105,1,387,1002,64,2,64,109,-9,21108,41,40,3,1005,1019,407,1001,64,1,64,1106,0,409,4,393,1002,64,2,64,109,13,1205,-8,423,4,415,1106,0,427,1001,64,1,64,1002,64,2,64,109,-19,21107,42,41,5,1005,1015,447,1001,64,1,64,1106,0,449,4,433,1002,64,2,64,109,-3,2102,1,-5,63,1008,63,37,63,1005,63,471,4,455,1105,1,475,1001,64,1,64,1002,64,2,64,109,-2,1201,0,0,63,1008,63,28,63,1005,63,497,4,481,1105,1,501,1001,64,1,64,1002,64,2,64,109,8,2107,29,-8,63,1005,63,521,1001,64,1,64,1106,0,523,4,507,1002,64,2,64,109,-3,1208,-3,30,63,1005,63,541,4,529,1106,0,545,1001,64,1,64,1002,64,2,64,109,4,2105,1,9,1105,1,563,4,551,1001,64,1,64,1002,64,2,64,109,9,1206,-3,581,4,569,1001,64,1,64,1106,0,581,1002,64,2,64,109,-8,1201,-9,0,63,1008,63,23,63,1005,63,605,1001,64,1,64,1106,0,607,4,587,1002,64,2,64,109,21,2106,0,-9,1106,0,625,4,613,1001,64,1,64,1002,64,2,64,109,-35,2108,31,8,63,1005,63,647,4,631,1001,64,1,64,1105,1,647,1002,64,2,64,109,2,1202,0,1,63,1008,63,30,63,1005,63,667,1105,1,673,4,653,1001,64,1,64,1002,64,2,64,109,17,21108,43,43,-4,1005,1016,691,4,679,1106,0,695,1001,64,1,64,1002,64,2,64,109,-14,1208,-1,30,63,1005,63,711,1106,0,717,4,701,1001,64,1,64,1002,64,2,64,109,6,21101,44,0,-1,1008,1011,44,63,1005,63,739,4,723,1105,1,743,1001,64,1,64,1002,64,2,64,109,-15,2108,30,8,63,1005,63,759,1106,0,765,4,749,1001,64,1,64,1002,64,2,64,109,27,2105,1,0,4,771,1001,64,1,64,1105,1,783,1002,64,2,64,109,-9,1206,6,795,1105,1,801,4,789,1001,64,1,64,1002,64,2,64,109,4,21102,45,1,-7,1008,1012,45,63,1005,63,823,4,807,1105,1,827,1001,64,1,64,1002,64,2,64,109,-14,21102,46,1,5,1008,1010,43,63,1005,63,851,1001,64,1,64,1105,1,853,4,833,1002,64,2,64,109,-1,2101,0,1,63,1008,63,25,63,1005,63,873,1105,1,879,4,859,1001,64,1,64,1002,64,2,64,109,9,21107,47,48,-3,1005,1010,897,4,885,1105,1,901,1001,64,1,64,4,64,99,21101,0,27,1,21101,915,0,0,1106,0,922,21201,1,57526,1,204,1,99,109,3,1207,-2,3,63,1005,63,964,21201,-2,-1,1,21101,942,0,0,1106,0,922,21201,1,0,-1,21201,-2,-3,1,21101,957,0,0,1106,0,922,22201,1,-1,-2,1105,1,968,21202,-2,1,-2,109,-3,2106,0,0
diff --git a/src/adventofcode2019/solutions/data/day_10/day10.txt b/src/adventofcode2019/data/day_10/day10.txt
similarity index 100%
rename from src/adventofcode2019/solutions/data/day_10/day10.txt
rename to src/adventofcode2019/data/day_10/day10.txt
diff --git a/src/adventofcode2019/solutions/data/day_11/day11.txt b/src/adventofcode2019/data/day_11/day11.txt
similarity index 99%
rename from src/adventofcode2019/solutions/data/day_11/day11.txt
rename to src/adventofcode2019/data/day_11/day11.txt
index 8b99bcc6..64f15f85 100644
--- a/src/adventofcode2019/solutions/data/day_11/day11.txt
+++ b/src/adventofcode2019/data/day_11/day11.txt
@@ -1 +1 @@
-3,8,1005,8,299,1106,0,11,0,0,0,104,1,104,0,3,8,102,-1,8,10,101,1,10,10,4,10,1008,8,0,10,4,10,1002,8,1,29,1,1007,14,10,2,1106,8,10,3,8,1002,8,-1,10,1001,10,1,10,4,10,108,1,8,10,4,10,1002,8,1,58,3,8,1002,8,-1,10,101,1,10,10,4,10,108,0,8,10,4,10,1002,8,1,80,3,8,1002,8,-1,10,1001,10,1,10,4,10,1008,8,0,10,4,10,102,1,8,103,1,5,6,10,3,8,102,-1,8,10,101,1,10,10,4,10,108,1,8,10,4,10,101,0,8,128,1,106,18,10,1,7,20,10,1006,0,72,1006,0,31,3,8,1002,8,-1,10,1001,10,1,10,4,10,108,0,8,10,4,10,1002,8,1,164,3,8,1002,8,-1,10,1001,10,1,10,4,10,108,1,8,10,4,10,102,1,8,186,1,1007,8,10,1006,0,98,3,8,1002,8,-1,10,1001,10,1,10,4,10,1008,8,0,10,4,10,101,0,8,216,2,102,8,10,1,1008,18,10,1,1108,8,10,1006,0,68,3,8,1002,8,-1,10,1001,10,1,10,4,10,1008,8,1,10,4,10,1001,8,0,253,3,8,102,-1,8,10,1001,10,1,10,4,10,108,1,8,10,4,10,1002,8,1,274,1,1105,7,10,101,1,9,9,1007,9,1060,10,1005,10,15,99,109,621,104,0,104,1,21102,936995738520,1,1,21102,316,1,0,1106,0,420,21101,0,936995824276,1,21102,1,327,0,1106,0,420,3,10,104,0,104,1,3,10,104,0,104,0,3,10,104,0,104,1,3,10,104,0,104,1,3,10,104,0,104,0,3,10,104,0,104,1,21102,248129784923,1,1,21102,1,374,0,1105,1,420,21102,29015149735,1,1,21101,385,0,0,1106,0,420,3,10,104,0,104,0,3,10,104,0,104,0,21101,983925826304,0,1,21101,0,408,0,1105,1,420,21102,825012036364,1,1,21101,0,419,0,1105,1,420,99,109,2,22101,0,-1,1,21101,0,40,2,21101,0,451,3,21102,441,1,0,1105,1,484,109,-2,2105,1,0,0,1,0,0,1,109,2,3,10,204,-1,1001,446,447,462,4,0,1001,446,1,446,108,4,446,10,1006,10,478,1101,0,0,446,109,-2,2105,1,0,0,109,4,2102,1,-1,483,1207,-3,0,10,1006,10,501,21102,0,1,-3,21201,-3,0,1,22102,1,-2,2,21102,1,1,3,21101,520,0,0,1106,0,525,109,-4,2105,1,0,109,5,1207,-3,1,10,1006,10,548,2207,-4,-2,10,1006,10,548,21201,-4,0,-4,1105,1,616,21201,-4,0,1,21201,-3,-1,2,21202,-2,2,3,21102,1,567,0,1105,1,525,21202,1,1,-4,21102,1,1,-1,2207,-4,-2,10,1006,10,586,21102,0,1,-1,22202,-2,-1,-2,2107,0,-3,10,1006,10,608,21201,-1,0,1,21102,1,608,0,106,0,483,21202,-2,-1,-2,22201,-4,-2,-4,109,-5,2106,0,0
\ No newline at end of file
+3,8,1005,8,299,1106,0,11,0,0,0,104,1,104,0,3,8,102,-1,8,10,101,1,10,10,4,10,1008,8,0,10,4,10,1002,8,1,29,1,1007,14,10,2,1106,8,10,3,8,1002,8,-1,10,1001,10,1,10,4,10,108,1,8,10,4,10,1002,8,1,58,3,8,1002,8,-1,10,101,1,10,10,4,10,108,0,8,10,4,10,1002,8,1,80,3,8,1002,8,-1,10,1001,10,1,10,4,10,1008,8,0,10,4,10,102,1,8,103,1,5,6,10,3,8,102,-1,8,10,101,1,10,10,4,10,108,1,8,10,4,10,101,0,8,128,1,106,18,10,1,7,20,10,1006,0,72,1006,0,31,3,8,1002,8,-1,10,1001,10,1,10,4,10,108,0,8,10,4,10,1002,8,1,164,3,8,1002,8,-1,10,1001,10,1,10,4,10,108,1,8,10,4,10,102,1,8,186,1,1007,8,10,1006,0,98,3,8,1002,8,-1,10,1001,10,1,10,4,10,1008,8,0,10,4,10,101,0,8,216,2,102,8,10,1,1008,18,10,1,1108,8,10,1006,0,68,3,8,1002,8,-1,10,1001,10,1,10,4,10,1008,8,1,10,4,10,1001,8,0,253,3,8,102,-1,8,10,1001,10,1,10,4,10,108,1,8,10,4,10,1002,8,1,274,1,1105,7,10,101,1,9,9,1007,9,1060,10,1005,10,15,99,109,621,104,0,104,1,21102,936995738520,1,1,21102,316,1,0,1106,0,420,21101,0,936995824276,1,21102,1,327,0,1106,0,420,3,10,104,0,104,1,3,10,104,0,104,0,3,10,104,0,104,1,3,10,104,0,104,1,3,10,104,0,104,0,3,10,104,0,104,1,21102,248129784923,1,1,21102,1,374,0,1105,1,420,21102,29015149735,1,1,21101,385,0,0,1106,0,420,3,10,104,0,104,0,3,10,104,0,104,0,21101,983925826304,0,1,21101,0,408,0,1105,1,420,21102,825012036364,1,1,21101,0,419,0,1105,1,420,99,109,2,22101,0,-1,1,21101,0,40,2,21101,0,451,3,21102,441,1,0,1105,1,484,109,-2,2105,1,0,0,1,0,0,1,109,2,3,10,204,-1,1001,446,447,462,4,0,1001,446,1,446,108,4,446,10,1006,10,478,1101,0,0,446,109,-2,2105,1,0,0,109,4,2102,1,-1,483,1207,-3,0,10,1006,10,501,21102,0,1,-3,21201,-3,0,1,22102,1,-2,2,21102,1,1,3,21101,520,0,0,1106,0,525,109,-4,2105,1,0,109,5,1207,-3,1,10,1006,10,548,2207,-4,-2,10,1006,10,548,21201,-4,0,-4,1105,1,616,21201,-4,0,1,21201,-3,-1,2,21202,-2,2,3,21102,1,567,0,1105,1,525,21202,1,1,-4,21102,1,1,-1,2207,-4,-2,10,1006,10,586,21102,0,1,-1,22202,-2,-1,-2,2107,0,-3,10,1006,10,608,21201,-1,0,1,21102,1,608,0,106,0,483,21202,-2,-1,-2,22201,-4,-2,-4,109,-5,2106,0,0
diff --git a/src/adventofcode2019/solutions/data/day_12/day12.txt b/src/adventofcode2019/data/day_12/day12.txt
similarity index 73%
rename from src/adventofcode2019/solutions/data/day_12/day12.txt
rename to src/adventofcode2019/data/day_12/day12.txt
index cd37d27f..7c9cc367 100644
--- a/src/adventofcode2019/solutions/data/day_12/day12.txt
+++ b/src/adventofcode2019/data/day_12/day12.txt
@@ -1,4 +1,4 @@
 <x=4, y=12, z=13>
 <x=-9, y=14, z=-3>
 <x=-7, y=-1, z=2>
-<x=-11, y=17, z=-1>
\ No newline at end of file
+<x=-11, y=17, z=-1>
diff --git a/src/adventofcode2019/solutions/data/day_13/day13.txt b/src/adventofcode2019/data/day_13/day13.txt
similarity index 99%
rename from src/adventofcode2019/solutions/data/day_13/day13.txt
rename to src/adventofcode2019/data/day_13/day13.txt
index 88fcb50c..94ffd411 100644
--- a/src/adventofcode2019/solutions/data/day_13/day13.txt
+++ b/src/adventofcode2019/data/day_13/day13.txt
@@ -1 +1 @@
-1,380,379,385,1008,2159,334192,381,1005,381,12,99,109,2160,1102,0,1,383,1101,0,0,382,20101,0,382,1,21002,383,1,2,21102,37,1,0,1106,0,578,4,382,4,383,204,1,1001,382,1,382,1007,382,38,381,1005,381,22,1001,383,1,383,1007,383,20,381,1005,381,18,1006,385,69,99,104,-1,104,0,4,386,3,384,1007,384,0,381,1005,381,94,107,0,384,381,1005,381,108,1105,1,161,107,1,392,381,1006,381,161,1101,0,-1,384,1105,1,119,1007,392,36,381,1006,381,161,1102,1,1,384,20102,1,392,1,21101,0,18,2,21101,0,0,3,21102,1,138,0,1105,1,549,1,392,384,392,21001,392,0,1,21102,18,1,2,21102,3,1,3,21101,0,161,0,1105,1,549,1102,0,1,384,20001,388,390,1,21001,389,0,2,21102,180,1,0,1105,1,578,1206,1,213,1208,1,2,381,1006,381,205,20001,388,390,1,20102,1,389,2,21102,1,205,0,1106,0,393,1002,390,-1,390,1102,1,1,384,21002,388,1,1,20001,389,391,2,21102,1,228,0,1105,1,578,1206,1,261,1208,1,2,381,1006,381,253,21001,388,0,1,20001,389,391,2,21102,253,1,0,1106,0,393,1002,391,-1,391,1101,0,1,384,1005,384,161,20001,388,390,1,20001,389,391,2,21101,0,279,0,1106,0,578,1206,1,316,1208,1,2,381,1006,381,304,20001,388,390,1,20001,389,391,2,21101,304,0,0,1105,1,393,1002,390,-1,390,1002,391,-1,391,1102,1,1,384,1005,384,161,20101,0,388,1,20102,1,389,2,21102,0,1,3,21101,0,338,0,1106,0,549,1,388,390,388,1,389,391,389,21001,388,0,1,20101,0,389,2,21101,4,0,3,21101,0,365,0,1105,1,549,1007,389,19,381,1005,381,75,104,-1,104,0,104,0,99,0,1,0,0,0,0,0,0,205,17,15,1,1,19,109,3,21201,-2,0,1,21201,-1,0,2,21102,1,0,3,21101,414,0,0,1106,0,549,22102,1,-2,1,22101,0,-1,2,21102,1,429,0,1105,1,601,1202,1,1,435,1,386,0,386,104,-1,104,0,4,386,1001,387,-1,387,1005,387,451,99,109,-3,2106,0,0,109,8,22202,-7,-6,-3,22201,-3,-5,-3,21202,-4,64,-2,2207,-3,-2,381,1005,381,492,21202,-2,-1,-1,22201,-3,-1,-3,2207,-3,-2,381,1006,381,481,21202,-4,8,-2,2207,-3,-2,381,1005,381,518,21202,-2,-1,-1,22201,-3,-1,-3,2207,-3,-2,381,1006,381,507,2207,-3,-4,381,1005,381,540,21202,-4,-1,-1,22201,-3,-1,-3,2207,-3,-4,381,1006,381,529,21202,-3,1,-7,109,-8,2105,1,0,109,4,1202,-2,38,566,201,-3,566,566,101,639,566,566,1201,-1,0,0,204,-3,204,-2,204,-1,109,-4,2106,0,0,109,3,1202,-1,38,593,201,-2,593,593,101,639,593,593,21001,0,0,-2,109,-3,2106,0,0,109,3,22102,20,-2,1,22201,1,-1,1,21102,1,383,2,21102,218,1,3,21102,1,760,4,21102,1,630,0,1105,1,456,21201,1,1399,-2,109,-3,2106,0,0,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,1,0,0,2,0,0,2,0,2,2,0,0,2,2,2,2,2,2,2,2,0,2,0,0,2,2,2,2,0,0,0,2,0,0,2,0,0,1,1,0,0,2,2,2,0,2,0,0,2,0,2,2,0,2,2,0,2,2,2,0,2,2,0,0,2,2,0,2,0,0,0,0,2,2,0,1,1,0,2,0,2,2,2,0,2,0,0,0,2,2,2,0,2,2,2,0,2,2,0,0,2,0,2,0,0,2,0,0,0,0,0,2,0,1,1,0,2,0,2,2,2,0,0,0,0,0,2,2,2,0,2,0,2,2,2,0,0,0,0,2,2,0,2,0,2,2,2,2,2,0,0,1,1,0,2,2,0,2,2,0,0,2,0,2,0,0,0,0,2,2,2,0,2,2,0,2,2,2,0,2,0,0,2,0,0,2,2,2,0,1,1,0,2,2,2,0,2,2,0,2,2,0,2,2,0,0,2,0,2,0,2,2,0,0,0,2,0,2,0,2,2,0,2,2,0,0,0,1,1,0,2,2,2,0,0,2,0,0,0,0,2,2,2,2,2,2,0,2,2,0,0,0,0,2,2,0,0,2,2,2,2,2,0,0,0,1,1,0,0,2,0,0,0,0,2,2,0,2,0,0,2,2,2,0,0,0,0,0,0,2,2,2,0,0,0,0,2,0,2,0,0,2,0,1,1,0,2,0,0,2,2,2,2,0,2,2,0,0,2,0,0,0,2,2,0,2,2,2,0,2,0,2,0,0,0,2,2,0,2,0,0,1,1,0,2,0,0,2,0,0,0,0,2,0,0,2,2,2,0,0,0,0,0,2,2,2,0,0,0,2,0,0,0,0,2,0,0,0,0,1,1,0,0,2,0,2,2,0,2,2,2,0,2,0,2,2,2,0,0,0,2,0,0,2,2,0,2,0,2,2,2,0,0,0,2,2,0,1,1,0,2,2,2,0,0,0,0,2,2,0,2,0,0,0,2,0,0,2,0,0,0,0,0,0,2,2,0,0,2,0,2,2,0,0,0,1,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,4,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,3,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,93,28,50,41,28,28,5,61,57,40,39,86,74,63,37,7,89,55,13,59,61,39,41,25,89,55,1,13,39,76,27,49,19,29,79,37,48,8,16,71,78,19,92,45,6,66,28,76,40,88,77,71,92,17,44,68,62,29,48,11,98,6,88,71,96,77,87,30,90,3,58,73,29,87,40,48,79,16,91,29,77,2,37,83,49,81,42,91,6,23,89,97,30,43,7,40,76,35,76,15,13,53,44,55,34,27,32,1,57,81,61,57,90,86,4,4,39,47,39,52,38,70,38,33,54,84,34,63,61,76,93,5,38,38,47,75,38,94,38,81,98,89,19,54,32,42,82,30,50,25,5,71,8,34,86,23,42,43,7,83,98,37,4,53,83,52,1,36,20,59,76,16,56,23,27,90,83,64,22,54,3,15,74,67,53,16,28,77,35,84,18,65,2,56,27,90,32,40,83,4,66,95,96,32,51,40,92,27,62,2,53,78,31,46,89,84,23,31,75,2,79,76,73,55,24,17,97,43,49,80,1,75,92,22,27,36,39,87,20,73,79,74,29,17,55,60,20,23,19,34,71,28,73,41,7,67,66,21,81,93,93,65,95,15,35,47,44,56,3,50,20,89,74,35,86,76,70,46,96,60,67,58,84,50,6,79,51,91,97,40,13,3,48,91,77,14,84,94,42,33,46,88,92,73,73,40,55,37,63,26,93,8,14,71,37,65,57,86,95,65,87,12,3,57,31,89,42,57,71,41,36,1,79,9,97,55,98,14,1,36,39,39,77,65,61,1,32,47,58,57,81,93,73,81,21,77,5,2,81,34,64,84,57,50,30,57,27,42,18,19,76,43,17,21,16,26,5,93,66,61,5,72,26,53,48,80,54,85,55,56,80,91,61,52,79,86,16,71,20,46,89,54,63,5,31,73,26,87,8,82,32,26,71,35,23,39,33,3,55,70,23,13,40,48,78,78,94,76,46,94,90,18,73,92,27,70,90,44,45,14,79,39,83,17,94,23,98,42,7,2,90,9,95,4,89,54,89,69,5,57,5,75,52,56,94,41,53,56,74,69,84,92,58,15,96,26,48,66,67,92,55,75,37,74,81,65,74,23,14,42,92,24,58,66,52,94,96,18,23,30,66,17,43,68,47,83,85,43,43,64,63,83,90,81,60,62,87,37,48,26,71,63,60,47,60,59,40,49,28,32,54,63,94,3,21,6,64,36,77,1,86,11,57,79,97,4,55,7,49,31,60,38,14,15,78,35,94,43,78,78,70,56,87,76,44,43,15,50,79,22,62,2,44,41,45,34,62,38,31,92,19,55,14,7,78,35,33,40,69,8,90,52,19,33,38,41,15,49,62,23,29,78,73,76,87,82,18,62,30,53,85,37,18,20,86,86,92,46,96,69,88,48,71,69,43,90,88,46,7,61,28,30,84,22,19,44,60,6,21,53,98,58,55,95,23,96,56,12,10,19,92,10,30,43,91,18,26,78,71,22,78,34,17,36,82,12,97,28,8,86,48,41,47,28,52,22,14,6,25,24,17,76,25,5,70,29,92,36,80,64,40,12,74,96,74,33,59,59,32,96,26,24,93,64,6,48,49,62,73,48,96,75,14,62,29,18,71,71,61,26,97,77,76,59,24,11,96,19,34,80,16,23,77,76,71,19,7,58,20,43,25,75,30,78,54,13,16,47,92,17,64,30,15,83,17,66,37,31,95,95,334192
\ No newline at end of file
+1,380,379,385,1008,2159,334192,381,1005,381,12,99,109,2160,1102,0,1,383,1101,0,0,382,20101,0,382,1,21002,383,1,2,21102,37,1,0,1106,0,578,4,382,4,383,204,1,1001,382,1,382,1007,382,38,381,1005,381,22,1001,383,1,383,1007,383,20,381,1005,381,18,1006,385,69,99,104,-1,104,0,4,386,3,384,1007,384,0,381,1005,381,94,107,0,384,381,1005,381,108,1105,1,161,107,1,392,381,1006,381,161,1101,0,-1,384,1105,1,119,1007,392,36,381,1006,381,161,1102,1,1,384,20102,1,392,1,21101,0,18,2,21101,0,0,3,21102,1,138,0,1105,1,549,1,392,384,392,21001,392,0,1,21102,18,1,2,21102,3,1,3,21101,0,161,0,1105,1,549,1102,0,1,384,20001,388,390,1,21001,389,0,2,21102,180,1,0,1105,1,578,1206,1,213,1208,1,2,381,1006,381,205,20001,388,390,1,20102,1,389,2,21102,1,205,0,1106,0,393,1002,390,-1,390,1102,1,1,384,21002,388,1,1,20001,389,391,2,21102,1,228,0,1105,1,578,1206,1,261,1208,1,2,381,1006,381,253,21001,388,0,1,20001,389,391,2,21102,253,1,0,1106,0,393,1002,391,-1,391,1101,0,1,384,1005,384,161,20001,388,390,1,20001,389,391,2,21101,0,279,0,1106,0,578,1206,1,316,1208,1,2,381,1006,381,304,20001,388,390,1,20001,389,391,2,21101,304,0,0,1105,1,393,1002,390,-1,390,1002,391,-1,391,1102,1,1,384,1005,384,161,20101,0,388,1,20102,1,389,2,21102,0,1,3,21101,0,338,0,1106,0,549,1,388,390,388,1,389,391,389,21001,388,0,1,20101,0,389,2,21101,4,0,3,21101,0,365,0,1105,1,549,1007,389,19,381,1005,381,75,104,-1,104,0,104,0,99,0,1,0,0,0,0,0,0,205,17,15,1,1,19,109,3,21201,-2,0,1,21201,-1,0,2,21102,1,0,3,21101,414,0,0,1106,0,549,22102,1,-2,1,22101,0,-1,2,21102,1,429,0,1105,1,601,1202,1,1,435,1,386,0,386,104,-1,104,0,4,386,1001,387,-1,387,1005,387,451,99,109,-3,2106,0,0,109,8,22202,-7,-6,-3,22201,-3,-5,-3,21202,-4,64,-2,2207,-3,-2,381,1005,381,492,21202,-2,-1,-1,22201,-3,-1,-3,2207,-3,-2,381,1006,381,481,21202,-4,8,-2,2207,-3,-2,381,1005,381,518,21202,-2,-1,-1,22201,-3,-1,-3,2207,-3,-2,381,1006,381,507,2207,-3,-4,381,1005,381,540,21202,-4,-1,-1,22201,-3,-1,-3,2207,-3,-4,381,1006,381,529,21202,-3,1,-7,109,-8,2105,1,0,109,4,1202,-2,38,566,201,-3,566,566,101,639,566,566,1201,-1,0,0,204,-3,204,-2,204,-1,109,-4,2106,0,0,109,3,1202,-1,38,593,201,-2,593,593,101,639,593,593,21001,0,0,-2,109,-3,2106,0,0,109,3,22102,20,-2,1,22201,1,-1,1,21102,1,383,2,21102,218,1,3,21102,1,760,4,21102,1,630,0,1105,1,456,21201,1,1399,-2,109,-3,2106,0,0,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,1,0,0,2,0,0,2,0,2,2,0,0,2,2,2,2,2,2,2,2,0,2,0,0,2,2,2,2,0,0,0,2,0,0,2,0,0,1,1,0,0,2,2,2,0,2,0,0,2,0,2,2,0,2,2,0,2,2,2,0,2,2,0,0,2,2,0,2,0,0,0,0,2,2,0,1,1,0,2,0,2,2,2,0,2,0,0,0,2,2,2,0,2,2,2,0,2,2,0,0,2,0,2,0,0,2,0,0,0,0,0,2,0,1,1,0,2,0,2,2,2,0,0,0,0,0,2,2,2,0,2,0,2,2,2,0,0,0,0,2,2,0,2,0,2,2,2,2,2,0,0,1,1,0,2,2,0,2,2,0,0,2,0,2,0,0,0,0,2,2,2,0,2,2,0,2,2,2,0,2,0,0,2,0,0,2,2,2,0,1,1,0,2,2,2,0,2,2,0,2,2,0,2,2,0,0,2,0,2,0,2,2,0,0,0,2,0,2,0,2,2,0,2,2,0,0,0,1,1,0,2,2,2,0,0,2,0,0,0,0,2,2,2,2,2,2,0,2,2,0,0,0,0,2,2,0,0,2,2,2,2,2,0,0,0,1,1,0,0,2,0,0,0,0,2,2,0,2,0,0,2,2,2,0,0,0,0,0,0,2,2,2,0,0,0,0,2,0,2,0,0,2,0,1,1,0,2,0,0,2,2,2,2,0,2,2,0,0,2,0,0,0,2,2,0,2,2,2,0,2,0,2,0,0,0,2,2,0,2,0,0,1,1,0,2,0,0,2,0,0,0,0,2,0,0,2,2,2,0,0,0,0,0,2,2,2,0,0,0,2,0,0,0,0,2,0,0,0,0,1,1,0,0,2,0,2,2,0,2,2,2,0,2,0,2,2,2,0,0,0,2,0,0,2,2,0,2,0,2,2,2,0,0,0,2,2,0,1,1,0,2,2,2,0,0,0,0,2,2,0,2,0,0,0,2,0,0,2,0,0,0,0,0,0,2,2,0,0,2,0,2,2,0,0,0,1,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,4,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,3,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,93,28,50,41,28,28,5,61,57,40,39,86,74,63,37,7,89,55,13,59,61,39,41,25,89,55,1,13,39,76,27,49,19,29,79,37,48,8,16,71,78,19,92,45,6,66,28,76,40,88,77,71,92,17,44,68,62,29,48,11,98,6,88,71,96,77,87,30,90,3,58,73,29,87,40,48,79,16,91,29,77,2,37,83,49,81,42,91,6,23,89,97,30,43,7,40,76,35,76,15,13,53,44,55,34,27,32,1,57,81,61,57,90,86,4,4,39,47,39,52,38,70,38,33,54,84,34,63,61,76,93,5,38,38,47,75,38,94,38,81,98,89,19,54,32,42,82,30,50,25,5,71,8,34,86,23,42,43,7,83,98,37,4,53,83,52,1,36,20,59,76,16,56,23,27,90,83,64,22,54,3,15,74,67,53,16,28,77,35,84,18,65,2,56,27,90,32,40,83,4,66,95,96,32,51,40,92,27,62,2,53,78,31,46,89,84,23,31,75,2,79,76,73,55,24,17,97,43,49,80,1,75,92,22,27,36,39,87,20,73,79,74,29,17,55,60,20,23,19,34,71,28,73,41,7,67,66,21,81,93,93,65,95,15,35,47,44,56,3,50,20,89,74,35,86,76,70,46,96,60,67,58,84,50,6,79,51,91,97,40,13,3,48,91,77,14,84,94,42,33,46,88,92,73,73,40,55,37,63,26,93,8,14,71,37,65,57,86,95,65,87,12,3,57,31,89,42,57,71,41,36,1,79,9,97,55,98,14,1,36,39,39,77,65,61,1,32,47,58,57,81,93,73,81,21,77,5,2,81,34,64,84,57,50,30,57,27,42,18,19,76,43,17,21,16,26,5,93,66,61,5,72,26,53,48,80,54,85,55,56,80,91,61,52,79,86,16,71,20,46,89,54,63,5,31,73,26,87,8,82,32,26,71,35,23,39,33,3,55,70,23,13,40,48,78,78,94,76,46,94,90,18,73,92,27,70,90,44,45,14,79,39,83,17,94,23,98,42,7,2,90,9,95,4,89,54,89,69,5,57,5,75,52,56,94,41,53,56,74,69,84,92,58,15,96,26,48,66,67,92,55,75,37,74,81,65,74,23,14,42,92,24,58,66,52,94,96,18,23,30,66,17,43,68,47,83,85,43,43,64,63,83,90,81,60,62,87,37,48,26,71,63,60,47,60,59,40,49,28,32,54,63,94,3,21,6,64,36,77,1,86,11,57,79,97,4,55,7,49,31,60,38,14,15,78,35,94,43,78,78,70,56,87,76,44,43,15,50,79,22,62,2,44,41,45,34,62,38,31,92,19,55,14,7,78,35,33,40,69,8,90,52,19,33,38,41,15,49,62,23,29,78,73,76,87,82,18,62,30,53,85,37,18,20,86,86,92,46,96,69,88,48,71,69,43,90,88,46,7,61,28,30,84,22,19,44,60,6,21,53,98,58,55,95,23,96,56,12,10,19,92,10,30,43,91,18,26,78,71,22,78,34,17,36,82,12,97,28,8,86,48,41,47,28,52,22,14,6,25,24,17,76,25,5,70,29,92,36,80,64,40,12,74,96,74,33,59,59,32,96,26,24,93,64,6,48,49,62,73,48,96,75,14,62,29,18,71,71,61,26,97,77,76,59,24,11,96,19,34,80,16,23,77,76,71,19,7,58,20,43,25,75,30,78,54,13,16,47,92,17,64,30,15,83,17,66,37,31,95,95,334192
diff --git a/src/adventofcode2019/solutions/data/day_14/day14.txt b/src/adventofcode2019/data/day_14/day14.txt
similarity index 97%
rename from src/adventofcode2019/solutions/data/day_14/day14.txt
rename to src/adventofcode2019/data/day_14/day14.txt
index df2efcf3..d9fed8c1 100644
--- a/src/adventofcode2019/solutions/data/day_14/day14.txt
+++ b/src/adventofcode2019/data/day_14/day14.txt
@@ -60,4 +60,4 @@
 7 DNLQF => 9 NWPC
 1 FLQSP => 6 ZPKP
 5 VLKQ => 7 RSHRF
-6 TNRBS, 4 DZDQN, 6 TWHBV => 6 TJLKW
\ No newline at end of file
+6 TNRBS, 4 DZDQN, 6 TWHBV => 6 TJLKW
diff --git a/src/adventofcode2019/solutions/data/day_15/day15.txt b/src/adventofcode2019/data/day_15/day15.txt
similarity index 98%
rename from src/adventofcode2019/solutions/data/day_15/day15.txt
rename to src/adventofcode2019/data/day_15/day15.txt
index 7233c9d1..57a58027 100644
--- a/src/adventofcode2019/solutions/data/day_15/day15.txt
+++ b/src/adventofcode2019/data/day_15/day15.txt
@@ -1 +1 @@
-3,1033,1008,1033,1,1032,1005,1032,31,1008,1033,2,1032,1005,1032,58,1008,1033,3,1032,1005,1032,81,1008,1033,4,1032,1005,1032,104,99,101,0,1034,1039,1001,1036,0,1041,1001,1035,-1,1040,1008,1038,0,1043,102,-1,1043,1032,1,1037,1032,1042,1105,1,124,102,1,1034,1039,1002,1036,1,1041,1001,1035,1,1040,1008,1038,0,1043,1,1037,1038,1042,1106,0,124,1001,1034,-1,1039,1008,1036,0,1041,1002,1035,1,1040,102,1,1038,1043,102,1,1037,1042,1106,0,124,1001,1034,1,1039,1008,1036,0,1041,1001,1035,0,1040,1002,1038,1,1043,101,0,1037,1042,1006,1039,217,1006,1040,217,1008,1039,40,1032,1005,1032,217,1008,1040,40,1032,1005,1032,217,1008,1039,37,1032,1006,1032,165,1008,1040,33,1032,1006,1032,165,1101,0,2,1044,1106,0,224,2,1041,1043,1032,1006,1032,179,1101,0,1,1044,1105,1,224,1,1041,1043,1032,1006,1032,217,1,1042,1043,1032,1001,1032,-1,1032,1002,1032,39,1032,1,1032,1039,1032,101,-1,1032,1032,101,252,1032,211,1007,0,62,1044,1106,0,224,1101,0,0,1044,1106,0,224,1006,1044,247,101,0,1039,1034,1002,1040,1,1035,102,1,1041,1036,101,0,1043,1038,1001,1042,0,1037,4,1044,1106,0,0,60,10,88,42,71,78,10,10,70,23,65,29,47,58,86,53,77,61,77,63,18,9,20,68,45,15,67,3,95,10,14,30,81,53,3,83,46,31,95,43,94,40,21,54,93,91,35,80,9,17,81,94,59,83,49,96,61,63,24,85,69,82,45,71,48,39,32,69,93,11,90,19,78,54,79,66,6,13,76,2,67,69,10,9,66,43,73,2,92,39,12,99,33,89,18,9,78,11,96,23,55,96,49,12,85,93,49,22,70,93,59,76,68,55,66,54,32,34,36,53,64,84,87,61,43,79,7,9,66,40,69,9,76,92,18,78,49,39,80,32,70,52,74,37,86,11,77,51,15,28,84,19,13,75,28,86,3,82,93,15,79,61,93,93,31,87,43,67,44,83,78,43,46,46,12,89,19,85,44,95,65,24,70,93,50,98,72,66,80,23,87,19,97,40,25,9,49,6,81,35,9,52,71,27,63,3,96,94,21,24,48,79,67,72,72,15,85,93,22,95,34,3,63,21,79,9,51,92,45,87,25,41,80,13,88,68,66,18,85,75,39,80,17,54,93,89,65,21,91,73,53,60,69,29,82,99,5,22,65,9,69,61,80,63,38,71,61,61,11,68,30,74,11,26,53,59,97,2,12,74,79,44,73,72,27,17,34,92,26,27,88,66,5,97,34,81,86,30,35,6,64,36,34,65,80,12,90,65,95,21,90,55,43,71,89,56,97,91,27,27,73,80,34,22,48,89,84,35,88,90,47,4,32,77,31,2,82,66,76,43,74,68,56,78,36,59,66,58,75,89,96,51,51,97,34,49,86,70,26,46,89,43,99,97,66,32,51,32,77,33,86,92,56,68,64,39,83,55,25,98,24,56,73,21,98,39,24,67,21,4,76,10,32,91,53,82,37,59,72,63,78,43,67,2,72,69,50,71,19,72,92,51,12,93,61,88,24,84,35,93,30,63,70,7,78,83,42,63,6,25,24,73,76,22,99,68,14,85,14,75,32,88,42,47,97,2,91,97,51,79,12,71,91,7,1,87,82,21,98,63,37,19,85,1,48,77,54,76,12,92,28,91,25,85,88,8,92,32,67,18,56,51,67,58,80,59,77,76,25,7,73,58,72,96,75,15,27,37,23,83,58,68,83,50,67,41,39,89,24,1,83,63,8,64,54,76,50,3,89,97,74,48,15,91,22,37,71,77,9,1,85,38,23,58,10,75,86,72,80,59,24,64,7,63,85,53,61,89,68,7,80,4,68,56,39,66,31,69,6,7,76,88,17,89,42,64,56,11,97,65,64,71,88,61,31,32,53,88,99,55,73,20,90,10,86,32,50,89,53,83,42,80,28,63,98,38,85,72,57,88,23,52,96,77,39,65,88,40,26,91,56,1,94,51,94,24,20,81,74,23,45,72,56,22,84,70,44,50,68,32,98,51,75,3,61,75,59,3,7,98,76,45,78,47,74,60,69,78,54,67,29,63,47,79,72,57,73,44,63,98,6,93,36,20,27,90,77,39,44,64,68,47,48,69,78,29,76,48,1,81,10,67,32,72,47,89,83,18,39,85,65,97,15,59,13,74,29,84,50,80,94,8,27,83,67,43,75,52,96,17,82,29,83,45,85,82,71,76,44,30,10,91,16,7,31,63,2,68,75,46,70,28,93,91,17,13,81,57,93,32,27,65,61,93,11,84,10,66,14,83,14,77,26,77,13,86,21,84,87,87,34,99,69,88,1,74,61,72,54,93,16,76,54,86,63,94,13,79,24,97,0,0,21,21,1,10,1,0,0,0,0,0,0
\ No newline at end of file
+3,1033,1008,1033,1,1032,1005,1032,31,1008,1033,2,1032,1005,1032,58,1008,1033,3,1032,1005,1032,81,1008,1033,4,1032,1005,1032,104,99,101,0,1034,1039,1001,1036,0,1041,1001,1035,-1,1040,1008,1038,0,1043,102,-1,1043,1032,1,1037,1032,1042,1105,1,124,102,1,1034,1039,1002,1036,1,1041,1001,1035,1,1040,1008,1038,0,1043,1,1037,1038,1042,1106,0,124,1001,1034,-1,1039,1008,1036,0,1041,1002,1035,1,1040,102,1,1038,1043,102,1,1037,1042,1106,0,124,1001,1034,1,1039,1008,1036,0,1041,1001,1035,0,1040,1002,1038,1,1043,101,0,1037,1042,1006,1039,217,1006,1040,217,1008,1039,40,1032,1005,1032,217,1008,1040,40,1032,1005,1032,217,1008,1039,37,1032,1006,1032,165,1008,1040,33,1032,1006,1032,165,1101,0,2,1044,1106,0,224,2,1041,1043,1032,1006,1032,179,1101,0,1,1044,1105,1,224,1,1041,1043,1032,1006,1032,217,1,1042,1043,1032,1001,1032,-1,1032,1002,1032,39,1032,1,1032,1039,1032,101,-1,1032,1032,101,252,1032,211,1007,0,62,1044,1106,0,224,1101,0,0,1044,1106,0,224,1006,1044,247,101,0,1039,1034,1002,1040,1,1035,102,1,1041,1036,101,0,1043,1038,1001,1042,0,1037,4,1044,1106,0,0,60,10,88,42,71,78,10,10,70,23,65,29,47,58,86,53,77,61,77,63,18,9,20,68,45,15,67,3,95,10,14,30,81,53,3,83,46,31,95,43,94,40,21,54,93,91,35,80,9,17,81,94,59,83,49,96,61,63,24,85,69,82,45,71,48,39,32,69,93,11,90,19,78,54,79,66,6,13,76,2,67,69,10,9,66,43,73,2,92,39,12,99,33,89,18,9,78,11,96,23,55,96,49,12,85,93,49,22,70,93,59,76,68,55,66,54,32,34,36,53,64,84,87,61,43,79,7,9,66,40,69,9,76,92,18,78,49,39,80,32,70,52,74,37,86,11,77,51,15,28,84,19,13,75,28,86,3,82,93,15,79,61,93,93,31,87,43,67,44,83,78,43,46,46,12,89,19,85,44,95,65,24,70,93,50,98,72,66,80,23,87,19,97,40,25,9,49,6,81,35,9,52,71,27,63,3,96,94,21,24,48,79,67,72,72,15,85,93,22,95,34,3,63,21,79,9,51,92,45,87,25,41,80,13,88,68,66,18,85,75,39,80,17,54,93,89,65,21,91,73,53,60,69,29,82,99,5,22,65,9,69,61,80,63,38,71,61,61,11,68,30,74,11,26,53,59,97,2,12,74,79,44,73,72,27,17,34,92,26,27,88,66,5,97,34,81,86,30,35,6,64,36,34,65,80,12,90,65,95,21,90,55,43,71,89,56,97,91,27,27,73,80,34,22,48,89,84,35,88,90,47,4,32,77,31,2,82,66,76,43,74,68,56,78,36,59,66,58,75,89,96,51,51,97,34,49,86,70,26,46,89,43,99,97,66,32,51,32,77,33,86,92,56,68,64,39,83,55,25,98,24,56,73,21,98,39,24,67,21,4,76,10,32,91,53,82,37,59,72,63,78,43,67,2,72,69,50,71,19,72,92,51,12,93,61,88,24,84,35,93,30,63,70,7,78,83,42,63,6,25,24,73,76,22,99,68,14,85,14,75,32,88,42,47,97,2,91,97,51,79,12,71,91,7,1,87,82,21,98,63,37,19,85,1,48,77,54,76,12,92,28,91,25,85,88,8,92,32,67,18,56,51,67,58,80,59,77,76,25,7,73,58,72,96,75,15,27,37,23,83,58,68,83,50,67,41,39,89,24,1,83,63,8,64,54,76,50,3,89,97,74,48,15,91,22,37,71,77,9,1,85,38,23,58,10,75,86,72,80,59,24,64,7,63,85,53,61,89,68,7,80,4,68,56,39,66,31,69,6,7,76,88,17,89,42,64,56,11,97,65,64,71,88,61,31,32,53,88,99,55,73,20,90,10,86,32,50,89,53,83,42,80,28,63,98,38,85,72,57,88,23,52,96,77,39,65,88,40,26,91,56,1,94,51,94,24,20,81,74,23,45,72,56,22,84,70,44,50,68,32,98,51,75,3,61,75,59,3,7,98,76,45,78,47,74,60,69,78,54,67,29,63,47,79,72,57,73,44,63,98,6,93,36,20,27,90,77,39,44,64,68,47,48,69,78,29,76,48,1,81,10,67,32,72,47,89,83,18,39,85,65,97,15,59,13,74,29,84,50,80,94,8,27,83,67,43,75,52,96,17,82,29,83,45,85,82,71,76,44,30,10,91,16,7,31,63,2,68,75,46,70,28,93,91,17,13,81,57,93,32,27,65,61,93,11,84,10,66,14,83,14,77,26,77,13,86,21,84,87,87,34,99,69,88,1,74,61,72,54,93,16,76,54,86,63,94,13,79,24,97,0,0,21,21,1,10,1,0,0,0,0,0,0
diff --git a/src/adventofcode2019/solutions/data/day_16/day16.txt b/src/adventofcode2019/data/day_16/day16.txt
similarity index 98%
rename from src/adventofcode2019/solutions/data/day_16/day16.txt
rename to src/adventofcode2019/data/day_16/day16.txt
index e9cabfa5..cf0e280a 100644
--- a/src/adventofcode2019/solutions/data/day_16/day16.txt
+++ b/src/adventofcode2019/data/day_16/day16.txt
@@ -1 +1 @@
-59704176224151213770484189932636989396016853707543672704688031159981571127975101449262562108536062222616286393177775420275833561490214618092338108958319534766917790598728831388012618201701341130599267905059417956666371111749252733037090364984971914108277005170417001289652084308389839318318592713462923155468396822247189750655575623017333088246364350280299985979331660143758996484413769438651303748536351772868104792161361952505811489060546839032499706132682563962136170941039904873411038529684473891392104152677551989278815089949043159200373061921992851799948057507078358356630228490883482290389217471790233756775862302710944760078623023456856105493
\ No newline at end of file
+59704176224151213770484189932636989396016853707543672704688031159981571127975101449262562108536062222616286393177775420275833561490214618092338108958319534766917790598728831388012618201701341130599267905059417956666371111749252733037090364984971914108277005170417001289652084308389839318318592713462923155468396822247189750655575623017333088246364350280299985979331660143758996484413769438651303748536351772868104792161361952505811489060546839032499706132682563962136170941039904873411038529684473891392104152677551989278815089949043159200373061921992851799948057507078358356630228490883482290389217471790233756775862302710944760078623023456856105493
diff --git a/src/adventofcode2019/solutions/data/day_17/day17.txt b/src/adventofcode2019/data/day_17/day17.txt
similarity index 99%
rename from src/adventofcode2019/solutions/data/day_17/day17.txt
rename to src/adventofcode2019/data/day_17/day17.txt
index 2598948a..a6b451c6 100644
--- a/src/adventofcode2019/solutions/data/day_17/day17.txt
+++ b/src/adventofcode2019/data/day_17/day17.txt
@@ -1 +1 @@
-1,330,331,332,109,3468,1102,1182,1,16,1101,0,1479,24,101,0,0,570,1006,570,36,1002,571,1,0,1001,570,-1,570,1001,24,1,24,1106,0,18,1008,571,0,571,1001,16,1,16,1008,16,1479,570,1006,570,14,21102,58,1,0,1105,1,786,1006,332,62,99,21101,0,333,1,21101,73,0,0,1105,1,579,1101,0,0,572,1102,1,0,573,3,574,101,1,573,573,1007,574,65,570,1005,570,151,107,67,574,570,1005,570,151,1001,574,-64,574,1002,574,-1,574,1001,572,1,572,1007,572,11,570,1006,570,165,101,1182,572,127,101,0,574,0,3,574,101,1,573,573,1008,574,10,570,1005,570,189,1008,574,44,570,1006,570,158,1105,1,81,21101,0,340,1,1106,0,177,21102,477,1,1,1106,0,177,21101,0,514,1,21102,176,1,0,1105,1,579,99,21101,0,184,0,1106,0,579,4,574,104,10,99,1007,573,22,570,1006,570,165,1001,572,0,1182,21102,375,1,1,21102,211,1,0,1105,1,579,21101,1182,11,1,21102,222,1,0,1106,0,979,21101,0,388,1,21101,233,0,0,1106,0,579,21101,1182,22,1,21102,244,1,0,1106,0,979,21101,0,401,1,21101,0,255,0,1105,1,579,21101,1182,33,1,21102,266,1,0,1105,1,979,21102,414,1,1,21102,1,277,0,1106,0,579,3,575,1008,575,89,570,1008,575,121,575,1,575,570,575,3,574,1008,574,10,570,1006,570,291,104,10,21101,1182,0,1,21102,313,1,0,1106,0,622,1005,575,327,1101,1,0,575,21101,0,327,0,1105,1,786,4,438,99,0,1,1,6,77,97,105,110,58,10,33,10,69,120,112,101,99,116,101,100,32,102,117,110,99,116,105,111,110,32,110,97,109,101,32,98,117,116,32,103,111,116,58,32,0,12,70,117,110,99,116,105,111,110,32,65,58,10,12,70,117,110,99,116,105,111,110,32,66,58,10,12,70,117,110,99,116,105,111,110,32,67,58,10,23,67,111,110,116,105,110,117,111,117,115,32,118,105,100,101,111,32,102,101,101,100,63,10,0,37,10,69,120,112,101,99,116,101,100,32,82,44,32,76,44,32,111,114,32,100,105,115,116,97,110,99,101,32,98,117,116,32,103,111,116,58,32,36,10,69,120,112,101,99,116,101,100,32,99,111,109,109,97,32,111,114,32,110,101,119,108,105,110,101,32,98,117,116,32,103,111,116,58,32,43,10,68,101,102,105,110,105,116,105,111,110,115,32,109,97,121,32,98,101,32,97,116,32,109,111,115,116,32,50,48,32,99,104,97,114,97,99,116,101,114,115,33,10,94,62,118,60,0,1,0,-1,-1,0,1,0,0,0,0,0,0,1,24,22,0,109,4,2102,1,-3,586,21002,0,1,-1,22101,1,-3,-3,21101,0,0,-2,2208,-2,-1,570,1005,570,617,2201,-3,-2,609,4,0,21201,-2,1,-2,1105,1,597,109,-4,2106,0,0,109,5,1202,-4,1,630,20101,0,0,-2,22101,1,-4,-4,21102,0,1,-3,2208,-3,-2,570,1005,570,781,2201,-4,-3,652,21002,0,1,-1,1208,-1,-4,570,1005,570,709,1208,-1,-5,570,1005,570,734,1207,-1,0,570,1005,570,759,1206,-1,774,1001,578,562,684,1,0,576,576,1001,578,566,692,1,0,577,577,21101,702,0,0,1105,1,786,21201,-1,-1,-1,1105,1,676,1001,578,1,578,1008,578,4,570,1006,570,724,1001,578,-4,578,21101,0,731,0,1105,1,786,1105,1,774,1001,578,-1,578,1008,578,-1,570,1006,570,749,1001,578,4,578,21101,756,0,0,1106,0,786,1105,1,774,21202,-1,-11,1,22101,1182,1,1,21102,1,774,0,1105,1,622,21201,-3,1,-3,1105,1,640,109,-5,2106,0,0,109,7,1005,575,802,20101,0,576,-6,20101,0,577,-5,1106,0,814,21102,0,1,-1,21101,0,0,-5,21102,0,1,-6,20208,-6,576,-2,208,-5,577,570,22002,570,-2,-2,21202,-5,51,-3,22201,-6,-3,-3,22101,1479,-3,-3,1202,-3,1,843,1005,0,863,21202,-2,42,-4,22101,46,-4,-4,1206,-2,924,21101,1,0,-1,1106,0,924,1205,-2,873,21102,1,35,-4,1106,0,924,1201,-3,0,878,1008,0,1,570,1006,570,916,1001,374,1,374,1201,-3,0,895,1101,0,2,0,1201,-3,0,902,1001,438,0,438,2202,-6,-5,570,1,570,374,570,1,570,438,438,1001,578,558,922,20101,0,0,-4,1006,575,959,204,-4,22101,1,-6,-6,1208,-6,51,570,1006,570,814,104,10,22101,1,-5,-5,1208,-5,39,570,1006,570,810,104,10,1206,-1,974,99,1206,-1,974,1102,1,1,575,21101,973,0,0,1105,1,786,99,109,-7,2106,0,0,109,6,21102,0,1,-4,21102,1,0,-3,203,-2,22101,1,-3,-3,21208,-2,82,-1,1205,-1,1030,21208,-2,76,-1,1205,-1,1037,21207,-2,48,-1,1205,-1,1124,22107,57,-2,-1,1205,-1,1124,21201,-2,-48,-2,1106,0,1041,21102,1,-4,-2,1106,0,1041,21102,-5,1,-2,21201,-4,1,-4,21207,-4,11,-1,1206,-1,1138,2201,-5,-4,1059,1201,-2,0,0,203,-2,22101,1,-3,-3,21207,-2,48,-1,1205,-1,1107,22107,57,-2,-1,1205,-1,1107,21201,-2,-48,-2,2201,-5,-4,1090,20102,10,0,-1,22201,-2,-1,-2,2201,-5,-4,1103,2102,1,-2,0,1105,1,1060,21208,-2,10,-1,1205,-1,1162,21208,-2,44,-1,1206,-1,1131,1105,1,989,21102,439,1,1,1105,1,1150,21102,477,1,1,1105,1,1150,21102,1,514,1,21101,1149,0,0,1105,1,579,99,21101,0,1157,0,1106,0,579,204,-2,104,10,99,21207,-3,22,-1,1206,-1,1138,1201,-5,0,1176,1202,-4,1,0,109,-6,2105,1,0,22,7,44,1,5,1,40,7,3,1,40,1,3,1,1,1,3,1,22,9,9,1,3,1,1,1,3,1,22,1,7,1,9,1,3,1,1,1,3,1,22,1,7,1,1,13,1,1,3,1,22,1,7,1,1,1,7,1,5,1,3,1,22,1,7,1,1,1,7,1,3,7,22,1,7,1,1,1,7,1,5,1,26,7,1,9,1,9,30,1,3,1,5,1,7,1,1,1,30,1,3,1,5,1,7,1,1,1,30,1,3,1,5,1,7,1,1,1,30,1,3,1,1,13,1,1,9,7,14,1,3,1,1,1,3,1,9,1,9,1,5,1,14,1,3,1,1,1,3,1,9,9,1,1,5,1,14,1,3,1,1,1,3,1,17,1,1,1,5,1,14,1,3,7,17,1,1,1,5,1,14,1,5,1,21,1,1,1,5,1,14,1,5,1,21,1,1,1,5,1,14,1,5,1,21,1,1,1,5,1,14,7,11,13,1,9,38,1,3,1,3,1,3,1,38,1,3,1,3,1,3,1,38,1,3,1,3,1,3,1,38,1,3,1,3,9,34,1,3,1,7,1,3,1,34,13,3,1,38,1,11,1,32,7,11,1,32,1,17,1,32,1,5,13,32,1,5,1,44,1,5,1,44,1,5,1,44,1,5,1,44,1,5,1,44,7,12
\ No newline at end of file
+1,330,331,332,109,3468,1102,1182,1,16,1101,0,1479,24,101,0,0,570,1006,570,36,1002,571,1,0,1001,570,-1,570,1001,24,1,24,1106,0,18,1008,571,0,571,1001,16,1,16,1008,16,1479,570,1006,570,14,21102,58,1,0,1105,1,786,1006,332,62,99,21101,0,333,1,21101,73,0,0,1105,1,579,1101,0,0,572,1102,1,0,573,3,574,101,1,573,573,1007,574,65,570,1005,570,151,107,67,574,570,1005,570,151,1001,574,-64,574,1002,574,-1,574,1001,572,1,572,1007,572,11,570,1006,570,165,101,1182,572,127,101,0,574,0,3,574,101,1,573,573,1008,574,10,570,1005,570,189,1008,574,44,570,1006,570,158,1105,1,81,21101,0,340,1,1106,0,177,21102,477,1,1,1106,0,177,21101,0,514,1,21102,176,1,0,1105,1,579,99,21101,0,184,0,1106,0,579,4,574,104,10,99,1007,573,22,570,1006,570,165,1001,572,0,1182,21102,375,1,1,21102,211,1,0,1105,1,579,21101,1182,11,1,21102,222,1,0,1106,0,979,21101,0,388,1,21101,233,0,0,1106,0,579,21101,1182,22,1,21102,244,1,0,1106,0,979,21101,0,401,1,21101,0,255,0,1105,1,579,21101,1182,33,1,21102,266,1,0,1105,1,979,21102,414,1,1,21102,1,277,0,1106,0,579,3,575,1008,575,89,570,1008,575,121,575,1,575,570,575,3,574,1008,574,10,570,1006,570,291,104,10,21101,1182,0,1,21102,313,1,0,1106,0,622,1005,575,327,1101,1,0,575,21101,0,327,0,1105,1,786,4,438,99,0,1,1,6,77,97,105,110,58,10,33,10,69,120,112,101,99,116,101,100,32,102,117,110,99,116,105,111,110,32,110,97,109,101,32,98,117,116,32,103,111,116,58,32,0,12,70,117,110,99,116,105,111,110,32,65,58,10,12,70,117,110,99,116,105,111,110,32,66,58,10,12,70,117,110,99,116,105,111,110,32,67,58,10,23,67,111,110,116,105,110,117,111,117,115,32,118,105,100,101,111,32,102,101,101,100,63,10,0,37,10,69,120,112,101,99,116,101,100,32,82,44,32,76,44,32,111,114,32,100,105,115,116,97,110,99,101,32,98,117,116,32,103,111,116,58,32,36,10,69,120,112,101,99,116,101,100,32,99,111,109,109,97,32,111,114,32,110,101,119,108,105,110,101,32,98,117,116,32,103,111,116,58,32,43,10,68,101,102,105,110,105,116,105,111,110,115,32,109,97,121,32,98,101,32,97,116,32,109,111,115,116,32,50,48,32,99,104,97,114,97,99,116,101,114,115,33,10,94,62,118,60,0,1,0,-1,-1,0,1,0,0,0,0,0,0,1,24,22,0,109,4,2102,1,-3,586,21002,0,1,-1,22101,1,-3,-3,21101,0,0,-2,2208,-2,-1,570,1005,570,617,2201,-3,-2,609,4,0,21201,-2,1,-2,1105,1,597,109,-4,2106,0,0,109,5,1202,-4,1,630,20101,0,0,-2,22101,1,-4,-4,21102,0,1,-3,2208,-3,-2,570,1005,570,781,2201,-4,-3,652,21002,0,1,-1,1208,-1,-4,570,1005,570,709,1208,-1,-5,570,1005,570,734,1207,-1,0,570,1005,570,759,1206,-1,774,1001,578,562,684,1,0,576,576,1001,578,566,692,1,0,577,577,21101,702,0,0,1105,1,786,21201,-1,-1,-1,1105,1,676,1001,578,1,578,1008,578,4,570,1006,570,724,1001,578,-4,578,21101,0,731,0,1105,1,786,1105,1,774,1001,578,-1,578,1008,578,-1,570,1006,570,749,1001,578,4,578,21101,756,0,0,1106,0,786,1105,1,774,21202,-1,-11,1,22101,1182,1,1,21102,1,774,0,1105,1,622,21201,-3,1,-3,1105,1,640,109,-5,2106,0,0,109,7,1005,575,802,20101,0,576,-6,20101,0,577,-5,1106,0,814,21102,0,1,-1,21101,0,0,-5,21102,0,1,-6,20208,-6,576,-2,208,-5,577,570,22002,570,-2,-2,21202,-5,51,-3,22201,-6,-3,-3,22101,1479,-3,-3,1202,-3,1,843,1005,0,863,21202,-2,42,-4,22101,46,-4,-4,1206,-2,924,21101,1,0,-1,1106,0,924,1205,-2,873,21102,1,35,-4,1106,0,924,1201,-3,0,878,1008,0,1,570,1006,570,916,1001,374,1,374,1201,-3,0,895,1101,0,2,0,1201,-3,0,902,1001,438,0,438,2202,-6,-5,570,1,570,374,570,1,570,438,438,1001,578,558,922,20101,0,0,-4,1006,575,959,204,-4,22101,1,-6,-6,1208,-6,51,570,1006,570,814,104,10,22101,1,-5,-5,1208,-5,39,570,1006,570,810,104,10,1206,-1,974,99,1206,-1,974,1102,1,1,575,21101,973,0,0,1105,1,786,99,109,-7,2106,0,0,109,6,21102,0,1,-4,21102,1,0,-3,203,-2,22101,1,-3,-3,21208,-2,82,-1,1205,-1,1030,21208,-2,76,-1,1205,-1,1037,21207,-2,48,-1,1205,-1,1124,22107,57,-2,-1,1205,-1,1124,21201,-2,-48,-2,1106,0,1041,21102,1,-4,-2,1106,0,1041,21102,-5,1,-2,21201,-4,1,-4,21207,-4,11,-1,1206,-1,1138,2201,-5,-4,1059,1201,-2,0,0,203,-2,22101,1,-3,-3,21207,-2,48,-1,1205,-1,1107,22107,57,-2,-1,1205,-1,1107,21201,-2,-48,-2,2201,-5,-4,1090,20102,10,0,-1,22201,-2,-1,-2,2201,-5,-4,1103,2102,1,-2,0,1105,1,1060,21208,-2,10,-1,1205,-1,1162,21208,-2,44,-1,1206,-1,1131,1105,1,989,21102,439,1,1,1105,1,1150,21102,477,1,1,1105,1,1150,21102,1,514,1,21101,1149,0,0,1105,1,579,99,21101,0,1157,0,1106,0,579,204,-2,104,10,99,21207,-3,22,-1,1206,-1,1138,1201,-5,0,1176,1202,-4,1,0,109,-6,2105,1,0,22,7,44,1,5,1,40,7,3,1,40,1,3,1,1,1,3,1,22,9,9,1,3,1,1,1,3,1,22,1,7,1,9,1,3,1,1,1,3,1,22,1,7,1,1,13,1,1,3,1,22,1,7,1,1,1,7,1,5,1,3,1,22,1,7,1,1,1,7,1,3,7,22,1,7,1,1,1,7,1,5,1,26,7,1,9,1,9,30,1,3,1,5,1,7,1,1,1,30,1,3,1,5,1,7,1,1,1,30,1,3,1,5,1,7,1,1,1,30,1,3,1,1,13,1,1,9,7,14,1,3,1,1,1,3,1,9,1,9,1,5,1,14,1,3,1,1,1,3,1,9,9,1,1,5,1,14,1,3,1,1,1,3,1,17,1,1,1,5,1,14,1,3,7,17,1,1,1,5,1,14,1,5,1,21,1,1,1,5,1,14,1,5,1,21,1,1,1,5,1,14,1,5,1,21,1,1,1,5,1,14,7,11,13,1,9,38,1,3,1,3,1,3,1,38,1,3,1,3,1,3,1,38,1,3,1,3,1,3,1,38,1,3,1,3,9,34,1,3,1,7,1,3,1,34,13,3,1,38,1,11,1,32,7,11,1,32,1,17,1,32,1,5,13,32,1,5,1,44,1,5,1,44,1,5,1,44,1,5,1,44,1,5,1,44,7,12
diff --git a/src/adventofcode2019/solutions/data/infi/example.json b/src/adventofcode2019/data/infi/example.json
similarity index 97%
rename from src/adventofcode2019/solutions/data/infi/example.json
rename to src/adventofcode2019/data/infi/example.json
index 5ce71bca..77c83a11 100644
--- a/src/adventofcode2019/solutions/data/infi/example.json
+++ b/src/adventofcode2019/data/infi/example.json
@@ -1,4 +1,4 @@
 {
 "flats": [[1,4],[3,8],[4,3],[5,7],[7,4],[10,3]],
 "sprongen": [[2,0],[0,4],[1,0],[0,0]]
-}
\ No newline at end of file
+}
diff --git a/src/adventofcode2019/solutions/data/infi/infi.json b/src/adventofcode2019/data/infi/infi.json
similarity index 100%
rename from src/adventofcode2019/solutions/data/infi/infi.json
rename to src/adventofcode2019/data/infi/infi.json
diff --git a/src/adventofcode2019/solutions/day01.py b/src/adventofcode2019/day01.py
similarity index 100%
rename from src/adventofcode2019/solutions/day01.py
rename to src/adventofcode2019/day01.py
diff --git a/src/adventofcode2019/solutions/day02.py b/src/adventofcode2019/day02.py
similarity index 94%
rename from src/adventofcode2019/solutions/day02.py
rename to src/adventofcode2019/day02.py
index f69d6744..1a0e78c4 100644
--- a/src/adventofcode2019/solutions/day02.py
+++ b/src/adventofcode2019/day02.py
@@ -1,4 +1,4 @@
-from adventofcode2019.solutions.intcode import IntCode
+from adventofcode2019.intcode import IntCode
 from adventofcode.utils.abstract import FileReaderSolution
 
 
diff --git a/src/adventofcode2019/solutions/day03.py b/src/adventofcode2019/day03.py
similarity index 100%
rename from src/adventofcode2019/solutions/day03.py
rename to src/adventofcode2019/day03.py
diff --git a/src/adventofcode2019/solutions/day04.py b/src/adventofcode2019/day04.py
similarity index 100%
rename from src/adventofcode2019/solutions/day04.py
rename to src/adventofcode2019/day04.py
diff --git a/src/adventofcode2019/solutions/day05.py b/src/adventofcode2019/day05.py
similarity index 93%
rename from src/adventofcode2019/solutions/day05.py
rename to src/adventofcode2019/day05.py
index f0da4d16..3075fe62 100644
--- a/src/adventofcode2019/solutions/day05.py
+++ b/src/adventofcode2019/day05.py
@@ -1,6 +1,6 @@
 from adventofcodeutils.parsing import string_to_list_of_ints
 
-from adventofcode2019.solutions.intcode import IntCode
+from adventofcode2019.intcode import IntCode
 from adventofcode.utils.abstract import FileReaderSolution
 
 
diff --git a/src/adventofcode2019/solutions/day06.py b/src/adventofcode2019/day06.py
similarity index 100%
rename from src/adventofcode2019/solutions/day06.py
rename to src/adventofcode2019/day06.py
diff --git a/src/adventofcode2019/solutions/day07.py b/src/adventofcode2019/day07.py
similarity index 97%
rename from src/adventofcode2019/solutions/day07.py
rename to src/adventofcode2019/day07.py
index ef0a0e84..1a053514 100644
--- a/src/adventofcode2019/solutions/day07.py
+++ b/src/adventofcode2019/day07.py
@@ -2,7 +2,7 @@
 
 from adventofcodeutils.parsing import string_to_list_of_ints
 
-from adventofcode2019.solutions.intcode import IntCode, ProgramFinished
+from adventofcode2019.intcode import IntCode, ProgramFinished
 from adventofcode.utils.abstract import FileReaderSolution
 
 
diff --git a/src/adventofcode2019/solutions/day08.py b/src/adventofcode2019/day08.py
similarity index 100%
rename from src/adventofcode2019/solutions/day08.py
rename to src/adventofcode2019/day08.py
diff --git a/src/adventofcode2019/solutions/day09.py b/src/adventofcode2019/day09.py
similarity index 93%
rename from src/adventofcode2019/solutions/day09.py
rename to src/adventofcode2019/day09.py
index 06f2c303..b4f138aa 100644
--- a/src/adventofcode2019/solutions/day09.py
+++ b/src/adventofcode2019/day09.py
@@ -1,6 +1,6 @@
 from adventofcodeutils.parsing import string_to_list_of_ints
 
-from adventofcode2019.solutions.intcode import IntCode
+from adventofcode2019.intcode import IntCode
 from adventofcode.utils.abstract import FileReaderSolution
 
 
diff --git a/src/adventofcode2019/solutions/day10.py b/src/adventofcode2019/day10.py
similarity index 100%
rename from src/adventofcode2019/solutions/day10.py
rename to src/adventofcode2019/day10.py
diff --git a/src/adventofcode2019/solutions/day11.py b/src/adventofcode2019/day11.py
similarity index 98%
rename from src/adventofcode2019/solutions/day11.py
rename to src/adventofcode2019/day11.py
index e3954cc2..aeb89761 100644
--- a/src/adventofcode2019/solutions/day11.py
+++ b/src/adventofcode2019/day11.py
@@ -5,7 +5,7 @@
 import matplotlib.pyplot as plt  # type: ignore
 from adventofcodeutils.parsing import string_to_list_of_ints
 
-from adventofcode2019.solutions.intcode import IntCode, ProgramFinished
+from adventofcode2019.intcode import IntCode, ProgramFinished
 from adventofcode.utils.abstract import FileReaderSolution
 
 
diff --git a/src/adventofcode2019/solutions/day12.py b/src/adventofcode2019/day12.py
similarity index 100%
rename from src/adventofcode2019/solutions/day12.py
rename to src/adventofcode2019/day12.py
diff --git a/src/adventofcode2019/solutions/day13.py b/src/adventofcode2019/day13.py
similarity index 98%
rename from src/adventofcode2019/solutions/day13.py
rename to src/adventofcode2019/day13.py
index a239f95e..84e0b038 100644
--- a/src/adventofcode2019/solutions/day13.py
+++ b/src/adventofcode2019/day13.py
@@ -3,7 +3,7 @@
 
 from adventofcodeutils.parsing import string_to_list_of_ints
 
-from adventofcode2019.solutions.intcode import IntCode, ProgramFinished
+from adventofcode2019.intcode import IntCode, ProgramFinished
 from adventofcode.utils.abstract import FileReaderSolution
 
 
diff --git a/src/adventofcode2019/solutions/day14.py b/src/adventofcode2019/day14.py
similarity index 100%
rename from src/adventofcode2019/solutions/day14.py
rename to src/adventofcode2019/day14.py
diff --git a/src/adventofcode2019/solutions/day15.py b/src/adventofcode2019/day15.py
similarity index 99%
rename from src/adventofcode2019/solutions/day15.py
rename to src/adventofcode2019/day15.py
index bcdb4736..0a674986 100644
--- a/src/adventofcode2019/solutions/day15.py
+++ b/src/adventofcode2019/day15.py
@@ -4,7 +4,7 @@
 
 from adventofcodeutils.parsing import string_to_list_of_ints
 
-from adventofcode2019.solutions.intcode import IntCode
+from adventofcode2019.intcode import IntCode
 from adventofcode.utils.abstract import FileReaderSolution
 
 
diff --git a/src/adventofcode2019/solutions/day16.py b/src/adventofcode2019/day16.py
similarity index 100%
rename from src/adventofcode2019/solutions/day16.py
rename to src/adventofcode2019/day16.py
diff --git a/src/adventofcode2019/solutions/day17.py b/src/adventofcode2019/day17.py
similarity index 96%
rename from src/adventofcode2019/solutions/day17.py
rename to src/adventofcode2019/day17.py
index bcf12637..27f69268 100644
--- a/src/adventofcode2019/solutions/day17.py
+++ b/src/adventofcode2019/day17.py
@@ -2,7 +2,7 @@
 
 from adventofcodeutils.parsing import string_to_list_of_ints
 
-from adventofcode2019.solutions.intcode import IntCode, ProgramFinished
+from adventofcode2019.intcode import IntCode, ProgramFinished
 from adventofcode.utils.abstract import FileReaderSolution
 
 
diff --git a/src/adventofcode2019/solutions/infi.py b/src/adventofcode2019/infi.py
similarity index 93%
rename from src/adventofcode2019/solutions/infi.py
rename to src/adventofcode2019/infi.py
index 3f1fa1d6..762ee403 100644
--- a/src/adventofcode2019/solutions/infi.py
+++ b/src/adventofcode2019/infi.py
@@ -35,9 +35,8 @@ def __init__(self, filename: str = "info.json"):
     def _load_data(self):
         """Open the file and parse the json data inside the file"""
         root_dir = Path(__file__).parent.parent
-        # with open(root_dir / "solutions" / "data" / input_file) as f:
 
-        with open(root_dir / "solutions" / "data" / "infi" / self.filename) as f:
+        with open(root_dir / "data" / "infi" / self.filename) as f:
             data = json.load(f)
 
         self.flats = {}
diff --git a/src/adventofcode2019/solutions/intcode.py b/src/adventofcode2019/intcode.py
similarity index 100%
rename from src/adventofcode2019/solutions/intcode.py
rename to src/adventofcode2019/intcode.py
diff --git a/src/adventofcode2019/solutions/__init__.py b/src/adventofcode2019/solutions/__init__.py
deleted file mode 100644
index e69de29b..00000000
diff --git a/src/adventofcode2020/solutions/data/day_01/day01.txt b/src/adventofcode2020/data/day_01/day01.txt
similarity index 99%
rename from src/adventofcode2020/solutions/data/day_01/day01.txt
rename to src/adventofcode2020/data/day_01/day01.txt
index 8da27c1a..4ac5daa9 100644
--- a/src/adventofcode2020/solutions/data/day_01/day01.txt
+++ b/src/adventofcode2020/data/day_01/day01.txt
@@ -197,4 +197,4 @@
 1731
 1451
 549
-1570
\ No newline at end of file
+1570
diff --git a/src/adventofcode2020/solutions/data/day_02/day02.txt b/src/adventofcode2020/data/day_02/day02.txt
similarity index 99%
rename from src/adventofcode2020/solutions/data/day_02/day02.txt
rename to src/adventofcode2020/data/day_02/day02.txt
index bf9a9901..713f7fda 100644
--- a/src/adventofcode2020/solutions/data/day_02/day02.txt
+++ b/src/adventofcode2020/data/day_02/day02.txt
@@ -997,4 +997,4 @@
 7-11 z: zzzzzzzzzzzz
 4-6 s: xwssttdqtc
 7-9 t: ttzmqqdtqtt
-6-19 g: gggggggggggggggggggg
\ No newline at end of file
+6-19 g: gggggggggggggggggggg
diff --git a/src/adventofcode2020/solutions/data/day_03/day03.txt b/src/adventofcode2020/data/day_03/day03.txt
similarity index 99%
rename from src/adventofcode2020/solutions/data/day_03/day03.txt
rename to src/adventofcode2020/data/day_03/day03.txt
index bc75c6d7..a3ac5068 100644
--- a/src/adventofcode2020/solutions/data/day_03/day03.txt
+++ b/src/adventofcode2020/data/day_03/day03.txt
@@ -320,4 +320,4 @@
 .#........##.#.#...#..#........
 .....##...##...#......#..#...#.
 ..#.....#....###.#..##....#..#.
-......#..#...####.#.....##.####
\ No newline at end of file
+......#..#...####.#.....##.####
diff --git a/src/adventofcode2020/solutions/data/day_04/day04.txt b/src/adventofcode2020/data/day_04/day04.txt
similarity index 99%
rename from src/adventofcode2020/solutions/data/day_04/day04.txt
rename to src/adventofcode2020/data/day_04/day04.txt
index 66be59b2..36096909 100644
--- a/src/adventofcode2020/solutions/data/day_04/day04.txt
+++ b/src/adventofcode2020/data/day_04/day04.txt
@@ -1099,4 +1099,4 @@ pid:713080083 ecl:#d624ca iyr:2030 hcl:z
 hcl:#7d3b0c pid:431742871
 ecl:hzl hgt:169cm cid:340
 eyr:2023
-iyr:2017 byr:1994
\ No newline at end of file
+iyr:2017 byr:1994
diff --git a/src/adventofcode2020/solutions/data/day_05/day05.txt b/src/adventofcode2020/data/day_05/day05.txt
similarity index 100%
rename from src/adventofcode2020/solutions/data/day_05/day05.txt
rename to src/adventofcode2020/data/day_05/day05.txt
diff --git a/src/adventofcode2020/solutions/data/day_06/day06.txt b/src/adventofcode2020/data/day_06/day06.txt
similarity index 100%
rename from src/adventofcode2020/solutions/data/day_06/day06.txt
rename to src/adventofcode2020/data/day_06/day06.txt
diff --git a/src/adventofcode2020/solutions/data/day_07/day07.txt b/src/adventofcode2020/data/day_07/day07.txt
similarity index 100%
rename from src/adventofcode2020/solutions/data/day_07/day07.txt
rename to src/adventofcode2020/data/day_07/day07.txt
diff --git a/src/adventofcode2020/solutions/data/day_08/day08.txt b/src/adventofcode2020/data/day_08/day08.txt
similarity index 100%
rename from src/adventofcode2020/solutions/data/day_08/day08.txt
rename to src/adventofcode2020/data/day_08/day08.txt
diff --git a/src/adventofcode2020/solutions/data/day_09/day09.txt b/src/adventofcode2020/data/day_09/day09.txt
similarity index 100%
rename from src/adventofcode2020/solutions/data/day_09/day09.txt
rename to src/adventofcode2020/data/day_09/day09.txt
diff --git a/src/adventofcode2020/solutions/data/day_10/day10.txt b/src/adventofcode2020/data/day_10/day10.txt
similarity index 100%
rename from src/adventofcode2020/solutions/data/day_10/day10.txt
rename to src/adventofcode2020/data/day_10/day10.txt
diff --git a/src/adventofcode2020/solutions/data/day_11/day11.txt b/src/adventofcode2020/data/day_11/day11.txt
similarity index 100%
rename from src/adventofcode2020/solutions/data/day_11/day11.txt
rename to src/adventofcode2020/data/day_11/day11.txt
diff --git a/src/adventofcode2020/solutions/data/day_12/day12.txt b/src/adventofcode2020/data/day_12/day12.txt
similarity index 100%
rename from src/adventofcode2020/solutions/data/day_12/day12.txt
rename to src/adventofcode2020/data/day_12/day12.txt
diff --git a/src/adventofcode2020/solutions/data/day_13/day13.txt b/src/adventofcode2020/data/day_13/day13.txt
similarity index 100%
rename from src/adventofcode2020/solutions/data/day_13/day13.txt
rename to src/adventofcode2020/data/day_13/day13.txt
diff --git a/src/adventofcode2020/solutions/data/day_14/day14.txt b/src/adventofcode2020/data/day_14/day14.txt
similarity index 99%
rename from src/adventofcode2020/solutions/data/day_14/day14.txt
rename to src/adventofcode2020/data/day_14/day14.txt
index 55183eeb..5e1b5bcd 100644
--- a/src/adventofcode2020/solutions/data/day_14/day14.txt
+++ b/src/adventofcode2020/data/day_14/day14.txt
@@ -574,4 +574,4 @@ mem[1129] = 28366135
 mask = 1X110101X01110111X010X0000000X0XX001
 mem[22024] = 945785
 mem[55321] = 56363
-mem[28412] = 3465
\ No newline at end of file
+mem[28412] = 3465
diff --git a/src/adventofcode2020/solutions/data/day_15/day15.txt b/src/adventofcode2020/data/day_15/day15.txt
similarity index 100%
rename from src/adventofcode2020/solutions/data/day_15/day15.txt
rename to src/adventofcode2020/data/day_15/day15.txt
diff --git a/src/adventofcode2020/solutions/data/day_16/day16.txt b/src/adventofcode2020/data/day_16/day16.txt
similarity index 100%
rename from src/adventofcode2020/solutions/data/day_16/day16.txt
rename to src/adventofcode2020/data/day_16/day16.txt
diff --git a/src/adventofcode2020/solutions/day01.py b/src/adventofcode2020/day01.py
similarity index 100%
rename from src/adventofcode2020/solutions/day01.py
rename to src/adventofcode2020/day01.py
diff --git a/src/adventofcode2020/solutions/day02.py b/src/adventofcode2020/day02.py
similarity index 100%
rename from src/adventofcode2020/solutions/day02.py
rename to src/adventofcode2020/day02.py
diff --git a/src/adventofcode2020/solutions/day03.py b/src/adventofcode2020/day03.py
similarity index 100%
rename from src/adventofcode2020/solutions/day03.py
rename to src/adventofcode2020/day03.py
diff --git a/src/adventofcode2020/solutions/day04.py b/src/adventofcode2020/day04.py
similarity index 100%
rename from src/adventofcode2020/solutions/day04.py
rename to src/adventofcode2020/day04.py
diff --git a/src/adventofcode2020/solutions/day05.py b/src/adventofcode2020/day05.py
similarity index 100%
rename from src/adventofcode2020/solutions/day05.py
rename to src/adventofcode2020/day05.py
diff --git a/src/adventofcode2020/solutions/day06.py b/src/adventofcode2020/day06.py
similarity index 100%
rename from src/adventofcode2020/solutions/day06.py
rename to src/adventofcode2020/day06.py
diff --git a/src/adventofcode2020/solutions/day07.py b/src/adventofcode2020/day07.py
similarity index 100%
rename from src/adventofcode2020/solutions/day07.py
rename to src/adventofcode2020/day07.py
diff --git a/src/adventofcode2020/solutions/day08.py b/src/adventofcode2020/day08.py
similarity index 96%
rename from src/adventofcode2020/solutions/day08.py
rename to src/adventofcode2020/day08.py
index 126bc90f..0d54ace3 100644
--- a/src/adventofcode2020/solutions/day08.py
+++ b/src/adventofcode2020/day08.py
@@ -1,4 +1,4 @@
-from adventofcode2020.solutions.handheld import HandHeld
+from adventofcode2020.handheld import HandHeld
 from adventofcode.utils.abstract import FileReaderSolution
 
 
diff --git a/src/adventofcode2020/solutions/day09.py b/src/adventofcode2020/day09.py
similarity index 100%
rename from src/adventofcode2020/solutions/day09.py
rename to src/adventofcode2020/day09.py
diff --git a/src/adventofcode2020/solutions/day10.py b/src/adventofcode2020/day10.py
similarity index 100%
rename from src/adventofcode2020/solutions/day10.py
rename to src/adventofcode2020/day10.py
diff --git a/src/adventofcode2020/solutions/day11.py b/src/adventofcode2020/day11.py
similarity index 100%
rename from src/adventofcode2020/solutions/day11.py
rename to src/adventofcode2020/day11.py
diff --git a/src/adventofcode2020/solutions/day12.py b/src/adventofcode2020/day12.py
similarity index 100%
rename from src/adventofcode2020/solutions/day12.py
rename to src/adventofcode2020/day12.py
diff --git a/src/adventofcode2020/solutions/day13.py b/src/adventofcode2020/day13.py
similarity index 100%
rename from src/adventofcode2020/solutions/day13.py
rename to src/adventofcode2020/day13.py
diff --git a/src/adventofcode2020/solutions/day14.py b/src/adventofcode2020/day14.py
similarity index 100%
rename from src/adventofcode2020/solutions/day14.py
rename to src/adventofcode2020/day14.py
diff --git a/src/adventofcode2020/solutions/day15.py b/src/adventofcode2020/day15.py
similarity index 100%
rename from src/adventofcode2020/solutions/day15.py
rename to src/adventofcode2020/day15.py
diff --git a/src/adventofcode2020/solutions/day16.py b/src/adventofcode2020/day16.py
similarity index 100%
rename from src/adventofcode2020/solutions/day16.py
rename to src/adventofcode2020/day16.py
diff --git a/src/adventofcode2020/solutions/handheld.py b/src/adventofcode2020/handheld.py
similarity index 100%
rename from src/adventofcode2020/solutions/handheld.py
rename to src/adventofcode2020/handheld.py
diff --git a/src/adventofcode2020/solutions/__init__.py b/src/adventofcode2020/solutions/__init__.py
deleted file mode 100644
index e69de29b..00000000
diff --git a/src/adventofcode2021/solutions/data/day_01/day01.txt b/src/adventofcode2021/data/day_01/day01.txt
similarity index 100%
rename from src/adventofcode2021/solutions/data/day_01/day01.txt
rename to src/adventofcode2021/data/day_01/day01.txt
diff --git a/src/adventofcode2021/solutions/data/day_02/day02.txt b/src/adventofcode2021/data/day_02/day02.txt
similarity index 100%
rename from src/adventofcode2021/solutions/data/day_02/day02.txt
rename to src/adventofcode2021/data/day_02/day02.txt
diff --git a/src/adventofcode2021/solutions/data/day_03/day03.txt b/src/adventofcode2021/data/day_03/day03.txt
similarity index 100%
rename from src/adventofcode2021/solutions/data/day_03/day03.txt
rename to src/adventofcode2021/data/day_03/day03.txt
diff --git a/src/adventofcode2021/solutions/data/day_04/day04.txt b/src/adventofcode2021/data/day_04/day04.txt
similarity index 100%
rename from src/adventofcode2021/solutions/data/day_04/day04.txt
rename to src/adventofcode2021/data/day_04/day04.txt
diff --git a/src/adventofcode2021/solutions/data/day_05/day05.txt b/src/adventofcode2021/data/day_05/day05.txt
similarity index 100%
rename from src/adventofcode2021/solutions/data/day_05/day05.txt
rename to src/adventofcode2021/data/day_05/day05.txt
diff --git a/src/adventofcode2021/solutions/data/day_06/day06.txt b/src/adventofcode2021/data/day_06/day06.txt
similarity index 100%
rename from src/adventofcode2021/solutions/data/day_06/day06.txt
rename to src/adventofcode2021/data/day_06/day06.txt
diff --git a/src/adventofcode2021/solutions/data/day_07/day07.txt b/src/adventofcode2021/data/day_07/day07.txt
similarity index 100%
rename from src/adventofcode2021/solutions/data/day_07/day07.txt
rename to src/adventofcode2021/data/day_07/day07.txt
diff --git a/src/adventofcode2021/solutions/data/day_08/day08.txt b/src/adventofcode2021/data/day_08/day08.txt
similarity index 100%
rename from src/adventofcode2021/solutions/data/day_08/day08.txt
rename to src/adventofcode2021/data/day_08/day08.txt
diff --git a/src/adventofcode2021/solutions/data/day_09/day09.txt b/src/adventofcode2021/data/day_09/day09.txt
similarity index 100%
rename from src/adventofcode2021/solutions/data/day_09/day09.txt
rename to src/adventofcode2021/data/day_09/day09.txt
diff --git a/src/adventofcode2021/solutions/data/day_10/day10.txt b/src/adventofcode2021/data/day_10/day10.txt
similarity index 100%
rename from src/adventofcode2021/solutions/data/day_10/day10.txt
rename to src/adventofcode2021/data/day_10/day10.txt
diff --git a/src/adventofcode2021/solutions/data/day_11/day11.txt b/src/adventofcode2021/data/day_11/day11.txt
similarity index 100%
rename from src/adventofcode2021/solutions/data/day_11/day11.txt
rename to src/adventofcode2021/data/day_11/day11.txt
diff --git a/src/adventofcode2021/solutions/data/day_12/day12.txt b/src/adventofcode2021/data/day_12/day12.txt
similarity index 100%
rename from src/adventofcode2021/solutions/data/day_12/day12.txt
rename to src/adventofcode2021/data/day_12/day12.txt
diff --git a/src/adventofcode2021/solutions/data/day_13/day13.txt b/src/adventofcode2021/data/day_13/day13.txt
similarity index 100%
rename from src/adventofcode2021/solutions/data/day_13/day13.txt
rename to src/adventofcode2021/data/day_13/day13.txt
diff --git a/src/adventofcode2021/solutions/data/day_14/day14.txt b/src/adventofcode2021/data/day_14/day14.txt
similarity index 100%
rename from src/adventofcode2021/solutions/data/day_14/day14.txt
rename to src/adventofcode2021/data/day_14/day14.txt
diff --git a/src/adventofcode2021/solutions/data/day_14/day14_test.txt b/src/adventofcode2021/data/day_14/day14_test.txt
similarity index 100%
rename from src/adventofcode2021/solutions/data/day_14/day14_test.txt
rename to src/adventofcode2021/data/day_14/day14_test.txt
diff --git a/src/adventofcode2021/solutions/data/day_15/day15.txt b/src/adventofcode2021/data/day_15/day15.txt
similarity index 100%
rename from src/adventofcode2021/solutions/data/day_15/day15.txt
rename to src/adventofcode2021/data/day_15/day15.txt
diff --git a/src/adventofcode2021/solutions/data/day_16/day16.txt b/src/adventofcode2021/data/day_16/day16.txt
similarity index 100%
rename from src/adventofcode2021/solutions/data/day_16/day16.txt
rename to src/adventofcode2021/data/day_16/day16.txt
diff --git a/src/adventofcode2021/solutions/data/day_17/day17.txt b/src/adventofcode2021/data/day_17/day17.txt
similarity index 100%
rename from src/adventofcode2021/solutions/data/day_17/day17.txt
rename to src/adventofcode2021/data/day_17/day17.txt
diff --git a/src/adventofcode2021/solutions/data/day_18/day18.txt b/src/adventofcode2021/data/day_18/day18.txt
similarity index 100%
rename from src/adventofcode2021/solutions/data/day_18/day18.txt
rename to src/adventofcode2021/data/day_18/day18.txt
diff --git a/src/adventofcode2021/solutions/data/day_19/day19.txt b/src/adventofcode2021/data/day_19/day19.txt
similarity index 100%
rename from src/adventofcode2021/solutions/data/day_19/day19.txt
rename to src/adventofcode2021/data/day_19/day19.txt
diff --git a/src/adventofcode2021/solutions/data/day_19/day19_test.txt b/src/adventofcode2021/data/day_19/day19_test.txt
similarity index 100%
rename from src/adventofcode2021/solutions/data/day_19/day19_test.txt
rename to src/adventofcode2021/data/day_19/day19_test.txt
diff --git a/src/adventofcode2021/solutions/data/day_20/day20.txt b/src/adventofcode2021/data/day_20/day20.txt
similarity index 100%
rename from src/adventofcode2021/solutions/data/day_20/day20.txt
rename to src/adventofcode2021/data/day_20/day20.txt
diff --git a/src/adventofcode2021/solutions/data/day_20/day20_test.txt b/src/adventofcode2021/data/day_20/day20_test.txt
similarity index 100%
rename from src/adventofcode2021/solutions/data/day_20/day20_test.txt
rename to src/adventofcode2021/data/day_20/day20_test.txt
diff --git a/src/adventofcode2021/solutions/data/day_21/day21.txt b/src/adventofcode2021/data/day_21/day21.txt
similarity index 100%
rename from src/adventofcode2021/solutions/data/day_21/day21.txt
rename to src/adventofcode2021/data/day_21/day21.txt
diff --git a/src/adventofcode2021/solutions/data/day_22/day22.txt b/src/adventofcode2021/data/day_22/day22.txt
similarity index 100%
rename from src/adventofcode2021/solutions/data/day_22/day22.txt
rename to src/adventofcode2021/data/day_22/day22.txt
diff --git a/src/adventofcode2021/solutions/day01.py b/src/adventofcode2021/day01.py
similarity index 100%
rename from src/adventofcode2021/solutions/day01.py
rename to src/adventofcode2021/day01.py
diff --git a/src/adventofcode2021/solutions/day02.py b/src/adventofcode2021/day02.py
similarity index 100%
rename from src/adventofcode2021/solutions/day02.py
rename to src/adventofcode2021/day02.py
diff --git a/src/adventofcode2021/solutions/day03.py b/src/adventofcode2021/day03.py
similarity index 100%
rename from src/adventofcode2021/solutions/day03.py
rename to src/adventofcode2021/day03.py
diff --git a/src/adventofcode2021/solutions/day04.py b/src/adventofcode2021/day04.py
similarity index 100%
rename from src/adventofcode2021/solutions/day04.py
rename to src/adventofcode2021/day04.py
diff --git a/src/adventofcode2021/solutions/day05.py b/src/adventofcode2021/day05.py
similarity index 100%
rename from src/adventofcode2021/solutions/day05.py
rename to src/adventofcode2021/day05.py
diff --git a/src/adventofcode2021/solutions/day06.py b/src/adventofcode2021/day06.py
similarity index 100%
rename from src/adventofcode2021/solutions/day06.py
rename to src/adventofcode2021/day06.py
diff --git a/src/adventofcode2021/solutions/day07.py b/src/adventofcode2021/day07.py
similarity index 100%
rename from src/adventofcode2021/solutions/day07.py
rename to src/adventofcode2021/day07.py
diff --git a/src/adventofcode2021/solutions/day08.py b/src/adventofcode2021/day08.py
similarity index 100%
rename from src/adventofcode2021/solutions/day08.py
rename to src/adventofcode2021/day08.py
diff --git a/src/adventofcode2021/solutions/day09.py b/src/adventofcode2021/day09.py
similarity index 100%
rename from src/adventofcode2021/solutions/day09.py
rename to src/adventofcode2021/day09.py
diff --git a/src/adventofcode2021/solutions/day10.py b/src/adventofcode2021/day10.py
similarity index 100%
rename from src/adventofcode2021/solutions/day10.py
rename to src/adventofcode2021/day10.py
diff --git a/src/adventofcode2021/solutions/day11.py b/src/adventofcode2021/day11.py
similarity index 100%
rename from src/adventofcode2021/solutions/day11.py
rename to src/adventofcode2021/day11.py
diff --git a/src/adventofcode2021/solutions/day12.py b/src/adventofcode2021/day12.py
similarity index 100%
rename from src/adventofcode2021/solutions/day12.py
rename to src/adventofcode2021/day12.py
diff --git a/src/adventofcode2021/solutions/day13.py b/src/adventofcode2021/day13.py
similarity index 100%
rename from src/adventofcode2021/solutions/day13.py
rename to src/adventofcode2021/day13.py
diff --git a/src/adventofcode2021/solutions/day14.py b/src/adventofcode2021/day14.py
similarity index 100%
rename from src/adventofcode2021/solutions/day14.py
rename to src/adventofcode2021/day14.py
diff --git a/src/adventofcode2021/solutions/day15.py b/src/adventofcode2021/day15.py
similarity index 100%
rename from src/adventofcode2021/solutions/day15.py
rename to src/adventofcode2021/day15.py
diff --git a/src/adventofcode2021/solutions/day16.py b/src/adventofcode2021/day16.py
similarity index 100%
rename from src/adventofcode2021/solutions/day16.py
rename to src/adventofcode2021/day16.py
diff --git a/src/adventofcode2021/solutions/day17.py b/src/adventofcode2021/day17.py
similarity index 100%
rename from src/adventofcode2021/solutions/day17.py
rename to src/adventofcode2021/day17.py
diff --git a/src/adventofcode2021/solutions/day18.py b/src/adventofcode2021/day18.py
similarity index 100%
rename from src/adventofcode2021/solutions/day18.py
rename to src/adventofcode2021/day18.py
diff --git a/src/adventofcode2021/solutions/day19.py b/src/adventofcode2021/day19.py
similarity index 100%
rename from src/adventofcode2021/solutions/day19.py
rename to src/adventofcode2021/day19.py
diff --git a/src/adventofcode2021/solutions/day20.py b/src/adventofcode2021/day20.py
similarity index 100%
rename from src/adventofcode2021/solutions/day20.py
rename to src/adventofcode2021/day20.py
diff --git a/src/adventofcode2021/solutions/day21.py b/src/adventofcode2021/day21.py
similarity index 100%
rename from src/adventofcode2021/solutions/day21.py
rename to src/adventofcode2021/day21.py
diff --git a/src/adventofcode2021/solutions/day22.py b/src/adventofcode2021/day22.py
similarity index 100%
rename from src/adventofcode2021/solutions/day22.py
rename to src/adventofcode2021/day22.py
diff --git a/src/adventofcode2021/solutions/__init__.py b/src/adventofcode2021/solutions/__init__.py
deleted file mode 100644
index e69de29b..00000000
diff --git a/src/adventofcode2022/solutions/data/day_01/day01.txt b/src/adventofcode2022/data/day_01/day01.txt
similarity index 100%
rename from src/adventofcode2022/solutions/data/day_01/day01.txt
rename to src/adventofcode2022/data/day_01/day01.txt
diff --git a/src/adventofcode2022/solutions/data/day_02/day02.txt b/src/adventofcode2022/data/day_02/day02.txt
similarity index 100%
rename from src/adventofcode2022/solutions/data/day_02/day02.txt
rename to src/adventofcode2022/data/day_02/day02.txt
diff --git a/src/adventofcode2022/solutions/data/day_03/day03.txt b/src/adventofcode2022/data/day_03/day03.txt
similarity index 100%
rename from src/adventofcode2022/solutions/data/day_03/day03.txt
rename to src/adventofcode2022/data/day_03/day03.txt
diff --git a/src/adventofcode2022/solutions/data/day_04/day04.txt b/src/adventofcode2022/data/day_04/day04.txt
similarity index 100%
rename from src/adventofcode2022/solutions/data/day_04/day04.txt
rename to src/adventofcode2022/data/day_04/day04.txt
diff --git a/src/adventofcode2022/solutions/data/day_05/day05.txt b/src/adventofcode2022/data/day_05/day05.txt
similarity index 99%
rename from src/adventofcode2022/solutions/data/day_05/day05.txt
rename to src/adventofcode2022/data/day_05/day05.txt
index af73d20e..7dfa16c4 100644
--- a/src/adventofcode2022/solutions/data/day_05/day05.txt
+++ b/src/adventofcode2022/data/day_05/day05.txt
@@ -6,7 +6,7 @@
 [C] [H] [H] [T] [D] [L] [M] [B] [B]
 [T] [Q] [B] [S] [L] [C] [B] [J] [N]
 [F] [N] [F] [V] [Q] [Z] [Z] [T] [Q]
- 1   2   3   4   5   6   7   8   9 
+ 1   2   3   4   5   6   7   8   9
 
 move 1 from 8 to 1
 move 1 from 6 to 1
diff --git a/src/adventofcode2022/solutions/data/day_06/day06.txt b/src/adventofcode2022/data/day_06/day06.txt
similarity index 100%
rename from src/adventofcode2022/solutions/data/day_06/day06.txt
rename to src/adventofcode2022/data/day_06/day06.txt
diff --git a/src/adventofcode2022/solutions/data/day_07/day07.txt b/src/adventofcode2022/data/day_07/day07.txt
similarity index 100%
rename from src/adventofcode2022/solutions/data/day_07/day07.txt
rename to src/adventofcode2022/data/day_07/day07.txt
diff --git a/src/adventofcode2022/solutions/data/day_08/day08.txt b/src/adventofcode2022/data/day_08/day08.txt
similarity index 100%
rename from src/adventofcode2022/solutions/data/day_08/day08.txt
rename to src/adventofcode2022/data/day_08/day08.txt
diff --git a/src/adventofcode2022/solutions/data/day_09/day09.txt b/src/adventofcode2022/data/day_09/day09.txt
similarity index 100%
rename from src/adventofcode2022/solutions/data/day_09/day09.txt
rename to src/adventofcode2022/data/day_09/day09.txt
diff --git a/src/adventofcode2022/solutions/data/day_10/day10.txt b/src/adventofcode2022/data/day_10/day10.txt
similarity index 100%
rename from src/adventofcode2022/solutions/data/day_10/day10.txt
rename to src/adventofcode2022/data/day_10/day10.txt
diff --git a/src/adventofcode2022/solutions/data/day_10/day10_test.txt b/src/adventofcode2022/data/day_10/day10_test.txt
similarity index 100%
rename from src/adventofcode2022/solutions/data/day_10/day10_test.txt
rename to src/adventofcode2022/data/day_10/day10_test.txt
diff --git a/src/adventofcode2022/solutions/data/day_11/day11.txt b/src/adventofcode2022/data/day_11/day11.txt
similarity index 100%
rename from src/adventofcode2022/solutions/data/day_11/day11.txt
rename to src/adventofcode2022/data/day_11/day11.txt
diff --git a/src/adventofcode2022/solutions/data/day_11/day11_test.txt b/src/adventofcode2022/data/day_11/day11_test.txt
similarity index 100%
rename from src/adventofcode2022/solutions/data/day_11/day11_test.txt
rename to src/adventofcode2022/data/day_11/day11_test.txt
diff --git a/src/adventofcode2022/solutions/data/day_12/day12.txt b/src/adventofcode2022/data/day_12/day12.txt
similarity index 100%
rename from src/adventofcode2022/solutions/data/day_12/day12.txt
rename to src/adventofcode2022/data/day_12/day12.txt
diff --git a/src/adventofcode2022/solutions/data/day_12/day12_test.txt b/src/adventofcode2022/data/day_12/day12_test.txt
similarity index 100%
rename from src/adventofcode2022/solutions/data/day_12/day12_test.txt
rename to src/adventofcode2022/data/day_12/day12_test.txt
diff --git a/src/adventofcode2022/solutions/data/day_13/day13.txt b/src/adventofcode2022/data/day_13/day13.txt
similarity index 100%
rename from src/adventofcode2022/solutions/data/day_13/day13.txt
rename to src/adventofcode2022/data/day_13/day13.txt
diff --git a/src/adventofcode2022/solutions/data/day_13/day13_test.txt b/src/adventofcode2022/data/day_13/day13_test.txt
similarity index 100%
rename from src/adventofcode2022/solutions/data/day_13/day13_test.txt
rename to src/adventofcode2022/data/day_13/day13_test.txt
diff --git a/src/adventofcode2022/solutions/data/day_14/day14.txt b/src/adventofcode2022/data/day_14/day14.txt
similarity index 100%
rename from src/adventofcode2022/solutions/data/day_14/day14.txt
rename to src/adventofcode2022/data/day_14/day14.txt
diff --git a/src/adventofcode2022/solutions/data/day_14/day14_test.txt b/src/adventofcode2022/data/day_14/day14_test.txt
similarity index 100%
rename from src/adventofcode2022/solutions/data/day_14/day14_test.txt
rename to src/adventofcode2022/data/day_14/day14_test.txt
diff --git a/src/adventofcode2022/solutions/data/day_15/day15.txt b/src/adventofcode2022/data/day_15/day15.txt
similarity index 100%
rename from src/adventofcode2022/solutions/data/day_15/day15.txt
rename to src/adventofcode2022/data/day_15/day15.txt
diff --git a/src/adventofcode2022/solutions/data/day_15/day15_test.txt b/src/adventofcode2022/data/day_15/day15_test.txt
similarity index 100%
rename from src/adventofcode2022/solutions/data/day_15/day15_test.txt
rename to src/adventofcode2022/data/day_15/day15_test.txt
diff --git a/src/adventofcode2022/data/day_22/day22.txt b/src/adventofcode2022/data/day_22/day22.txt
new file mode 100644
index 00000000..2db80424
--- /dev/null
+++ b/src/adventofcode2022/data/day_22/day22.txt
@@ -0,0 +1,202 @@
+                                                  ..#......#.#..............................##.......#.................##.........#.#............#....
+                                                  ....#........................#......#.................#.#.......##......#........#..#.....#...#..#..
+                                                  ...#..............#..............#........#..#.........##......#..............#................#....
+                                                  .....#..#..............##..#..........#.........#...............................#...................
+                                                  ............#...................#.....................#.......#..........#.#......#.........##.##...
+                                                  ............................#..............................#..............#......#..#.#...........##
+                                                  ..........#......#.........#..........#..................................................#..........
+                                                  .......#...#....................#.........##...#...........#...............###......##....#.........
+                                                  ...#............#...............................###.....##.........................#................
+                                                  .#.................#...............#.........#......#.#.....................#......#................
+                                                  ........#...............................#.......#.....#.##...........#....................#.........
+                                                  ...............#...#.#....##.....#...........#....#........#......#......#......#..#......#.....#...
+                                                  ...##.#.#....#..................#..........#........................#.#............#......#...#..#..
+                                                  ...##....#.....#....#.#................#....#.....#...#.............................................
+                                                  ...#....#............#..#.....#.............#..............#......#..............#.............#....
+                                                  .......#.....#..#....#.........................#..............##...#.#........#.#........##........#
+                                                  .....#..#......#...................#....#.##....#.....##..........#.....#....#.........#............
+                                                  ...................#......#...##..#....................#..............#.#.......#.........#.#......#
+                                                  #..#.............#.....#.........#.............#..........#.##.....#...............#.........#......
+                                                  ............................#............#...............#.......#.#..#............#................
+                                                  .............#.#...#.....#...##...#.........#...#....#............#..........#.#.#............#.....
+                                                  ...................#.......#..........#.........#.............................#..........##.........
+                                                  ...........#.......#............#......#.....#..#.................#...............#.........#.......
+                                                  .#................................#..#.....##..#....#...........#....#...#.........#...........#....
+                                                  ........#...#............................#.#............###..#........#........#......##......#.....
+                                                  ........#.......#..........#.........#.#......................#.......##.......#........##..........
+                                                  #.......#...........#...........................#.......#...............#.#.......#..#..........#...
+                                                  ...............................................#.........................#.#.............###..#....#
+                                                  ........................#...#.....#......#...............................##.....#.......#..#........
+                                                  ..#.......#..#.#...#......................#.........................#........#......#...........#.#.
+                                                  ..#.........#.#....#........###.##..............#....#............#.......#...#...............#.##..
+                                                  .......#.....#................#....#...............#......##.........#...............#...#.#.#......
+                                                  ........#.......................#.....#..........#..........#..#..#................................#
+                                                  ..................#.#..........#....#.......................#....................#...#......#......#
+                                                  .....##......#.................#.............#...........#..#...#........#..........................
+                                                  ..................#.....#.......#.......#..........#...##......#...#.##.................#........#..
+                                                  .........#......#...#....................#..#.....................#...#...........#.........#..#....
+                                                  ....#...........#..................#..#....#................#................#....##................
+                                                  ...#.....#.........#......##...............##.##...#..##..........#.....#..................#........
+                                                  ..#..#.................#......#.......#.........................#.##..#..................#..........
+                                                  .#.......#......##.................#.#........#...#....................................##.........#.
+                                                  .#......#...............#........#.................#..#....#.#...#..#.......#.........#.............
+                                                  .#..#...................#.#..........#.........................#.#.............#..................#.
+                                                  .......####.#.............#..#..................#...#.............##......#..............#..........
+                                                  ............#............#.....#..#..#..........#....................#.#....#.....#.#......##.......
+                                                  .........#..........#.........#.#.....#...................#.....#..#...............#................
+                                                  ........##....................#..........#................................#...#......#..............
+                                                  .#.....#.#....##....#....#....#........#....#...#...............#..................#...........#....
+                                                  ...................#..#.....#.#........#.......#................................#..............#....
+                                                  ..#............#...........................................#.....#..#.........................#.....
+                                                  .#........................#.#..................#..
+                                                  .....#........#.....#...........#.................
+                                                  .........#........................................
+                                                  ..#.#.#.#.....#.............#.....................
+                                                  .......#.#....#.#..............#..................
+                                                  .......................#...#.........#.#..#....#..
+                                                  ...#........#...............#....................#
+                                                  ....................#............#......#.........
+                                                  ........................#........................#
+                                                  ........................................#...#.....
+                                                  ..........#.......................#.........#.....
+                                                  ...........#.......#............#..........#..#...
+                                                  .#............#.................#.#.........#.....
+                                                  ..............#.#.....................#.........#.
+                                                  .............#...#...................#..#.##......
+                                                  ...................#...#..#.......................
+                                                  ...#......#.#................#...................#
+                                                  .............#..#.................................
+                                                  ........#..............#...#.........#............
+                                                  ..##.....................#......##...#.....#......
+                                                  ...#.#.........#...................#.#..#.........
+                                                  .#.....#...................#.....#..........#.#...
+                                                  .............#.............#....#..#.#........#..#
+                                                  .....#.................#..........#...............
+                                                  ....#............#.....##..........#.........#.#..
+                                                  .........#..........#.....................#.......
+                                                  ...#..............................................
+                                                  .............#.#........#...#....#.......#........
+                                                  ..#...#........#.......#..........................
+                                                  ..#.#.............#...#........#...#....#....#....
+                                                  ....##...................#............#...........
+                                                  ..#.#....#.#.##.........##.....#..#.#.............
+                                                  ..#...........#..............#....................
+                                                  ....#.....................#..........#............
+                                                  #..#.##..#.....................................##.
+                                                  .................#...#.........##.................
+                                                  ##.......................#................#.#....#
+                                                  ...#...........#.....##.........................#.
+                                                  ...............#......#...##...............#......
+                                                  ....................#................#............
+                                                  ......##......#......................#.....#......
+                                                  .......#..#.....#............#.#...............#..
+                                                  .....................#....##...........##.........
+                                                  #...........#................#........#...........
+                                                  .....#............#.#.....#....#..................
+                                                  ........................................###.......
+                                                  ........#........................#................
+                                                  .......#.......#......#..........#.....#.#........
+                                                  ...#.....#.#....................##...............#
+                                                  .......#......#....#........#...........#.........
+.#.......#..................#......#..........#................#....#............#......#...........
+#.....#....#...#..............#..#...............#........#......#..................................
+........#.....................#.......#....#..................................#.#......#............
+...#...#.....#..........#.....#...............#.##.........................#..................#.....
+.......................#.##....#....#........#..........................#....#.##........#........#.
+......#...#..............#.....#.......#...............##.......##..................................
+.........................#.#......#................#..#.........#..#......#.#..#..#....#............
+......#...#..#....#...........#.......#.......#...#...#.................#.#.....................#...
+#.............#...#..#.#......#......#..##.#....#..#....#.....#......#..#.......#....#.#.....#......
+..#....#........#..........................#...#..#.#...............................#..........#....
+.#....#..........#...#.....................#.....#....................#..#..........#..........#....
+....#.........................................#.........#.#.#.........#............#..##............
+.....#...#...........#.............#......#....#.................................#.#.............#..
+.#.....#..#..#............#................#.#............................#....................#....
+..............#..........#........#....#...#..........#.#..................#.#........#.......#.....
+.............#..........................#..#..#...#.................#..#...........#............#...
+...................#.............#...#.....##..........#................#.#..#..........#...........
+..##..........#................................#.........................................#..........
+#.............#........................##.#...#....#.............#......#...........................
+.........#........#.......##...........................#...#.....#..................#........##..#..
+#......#..........#...................#......#..........#..................#........#..#............
+....#..................#...#...............#.......#.......#.......#....#..#....#...#............#..
+.....#.#..............#............................#..#......#.#.............#......................
+......#..#......#...........#........#..........##............#...........##........................
+.......#...#.....#.........#.............#..............#..#.......#....................#........##.
+.....#......#...........#.....#.............................#...................#........#..........
+................#..........................#.............#........#.#...........#......#..........#.
+.##.....#..................#.........#........#..#..................##..............#...............
+......#..#...................#.#.#...#..............................#.#..........#..................
+......#.....#........#...................#..............#.#.......................#.....##..........
+.#..#................#......#.#.....#.........................................#.....#..#...........#
+.#............................#.....#.....#...##....#..........#..#......#....#..............#......
+...#........#..#.......#.....................#..........#.....#..............#.......##......###....
+........#.#.#............#..............#..........#........#.....#........#......#.......##........
+........##...#.#.................#......#.........#.#........##.....................................
+#.......#........#.................#...................................#...#........#......#....#...
+.......#...#........#.............#........#.....................#................#..#.......#......
+................#....................................#.....#.....#............#......#....#.......#.
+...#........#...................#..#...#.....#.............#...#.....#.#..........#..............#..
+.....#.............#........#.#.................................#.#..........#......#...............
+.#......#..#..............#..................#..#.#....#.......#................#.........#.....#.#.
+.#.........#..................................................#.....................................
+..#.#..............##.............#...#.....................#..................#.##....#............
+....#.#..........#..................#.......................................#...#...................
+.........#........#.....#......#..#........#..#.#.......#............#..........#...................
+#...##..#.........................#..#......#..........#...........................................#
+#....................................#...#.........................#...#....#......#.#..............
+...#.#...........#..#..#......#..#..............#...........#..............#........................
+.....#.................#..##.........#....#.......#.....##..#....#...................#......#.......
+...........##...#.........................#...............###.......................................
+...........#.#.....#..........#..#......#......#..
+................##...#........#....#.#...#........
+..............................#............#...#..
+.......................#..........................
+.....##......#..................##...........#....
+...................#..........................#...
+.#...............#.........#...#................#.
+..##.....#.#......#......#..............#.........
+....................#........#.#.............#....
+.#......#........#......#.....................#...
+..........................................#.......
+..........#........#.................#............
+........#..........#..#...........#..#.#..........
+.##.............#....................#............
+..........................#.............#.......#.
+#.#...#............#...#.....#.....#........#.....
+#.##......................#..#....................
+.......#..#..#...........................#.......#
+..........#.......#..#.........#.........#.....#..
+.......#.......##..##...................#..#......
+.......................##.........#...............
+..#.....#.......#..................#..............
+........#...#............#....#...............#...
+#.........#...#.......#...............#.#.........
+....#.............#...........#.....#.............
+...................#......#......#....#....#......
+.............#.....#........#.....##...#..........
+.....................##..............#...#....#...
+................#.......#..###....................
+.............#....#..................#.#.....#....
+......#.......#...#.......#.#.....................
+....................##...............#.#.......##.
+.................#.....................#..........
+...........#......#...........#...................
+.........##......#................................
+................................#.........#.......
+..#..............#...#...........#.......#.#...##.
+...............#.....#.....#......#.#.......##..#.
+...........#...#.....##.......#....#..............
+#.............#.............#.....................
+....#........#...............#.#......#.#.........
+...............#....#.......#..............#......
+......................#.................#.........
+......................#.............##..##.....#..
+....#..#......................#.....#.............
+..........#.....#...##..#.........#..........#....
+....#................#........................#...
+....................#...#.#.......................
+....#......#........#.....#..#..#.............#...
+..............##.......#........................##
+
+23R40R49L35R17R7L43R8R11L6R28R8L30L40L28R9R22L2R5L6L6R26R27L37L17L29L9R29L42R29L27R4R26R47R11R6R18R43R15R32L13L39L46L7R30L23R46R40R44L40L28L25L33R28R3R1R43R43R39L15L6L16R26R17L31L39L41L29L16R41R25R48R17R12R35L9R14R47L22L20R24R45R8R35L23L46L39R18R34R25R33L38R15L49R24R22L40L11R3R43L18R2L9R10R13R2R15R16L34L34R43R15R4R40R16R19R16R39L40L37R16L32L13R11R20R25L19L10R29L48L28L38L4L14L12R14R47R18R15L6R20R28L28R8L29L13L7L19L33L48R26R32L34R34R40R8R2L6R20R45R33L36R25R27R27R42L34L17L32L5R13L1R9R34R6L13L36R39L38R13L31R32L40L23L23L26R7R34R2R12L24R39L44L30R2L21L15R15R39R10R23R24R34L50L34L11R6R9R10R50L42L39L20L21R15R10L41R6L50L13L17R23L17R38R18L37L4L14R4R45R36L15R1R37L14L16L19L42R8L35L47R24R20R2L41R35R3R22R6R20R12R38L4R2R29R24R45R8R3L42L14L41R5L35L24L49R25R35L50R1R8R47L28R41R46R20L9L10R17R27L7L15R25L31L7L22R1R31L36R2R14R42R4L48R5L19L39L28L9L36R44L46R42L35L16L41L31R5R14L34R35R3L18R5R7L19L30L13R24L13L15R49R14R31R27L40L27R45L8L19L34R13L43R18R29R4L1L3L2L41R41L7L20R25R33L3L15R15R36R15L33R39R33R36L27R47R6L32R24R8R40R34R3R25L12L49L19L23L21L35L41L32L48R2R46L8L3L10L17L25L8R47R10L40L33L4L21L49R16L48R42L23R45R3R29L50L50R41L9L28L36L22L41L7L4L42L45L21R49R19R18R2L9L42R11R24R38L50R17R30L37L11L22R43R43R27R22R50L22R2L20R40R17L42L19L45R47R45R6R8R22R37L10R24L23R31R43R48L45R2R10R48R8R31L8L36R39L8L44R1L40L44R33L1L2L42L45R5L1L20L47L23L39L6R23L29R45R11L14R10R36R47R6R15R3R22R22L29L10R32L12L40L21L48R47L14R9L26R35R23R1L38L43L26R26L4L48R13L39L3L38R47L45R30L16R43L18R19R3R6L5R16L35L15L45R35L35R2L11R6R50R22L36R8L18R44L19R42R16R45R9R38R8R47R47L10R19L18R14R13R49L29R6R19L40R7L34L7R28L27R31L17R14R28L5R16L48R44L38R33R43R36R28L1L25R28R49R31L31R19R30R50L33L16L49L19R31R5R37R45R47R22R40R43L43R9L33R28R33R17L12R25R33R30L35L34R46R23L2L49L39L10R6L35R24L30L19L41L46R5L35L20L13R32L23R4R34L16R46R9L23L23R26L37R3R47R44L5L43R31R21R36R1L46R18L7L26L34L41L14R35R9L1R18R2R25R9L8L19R44R17L46R10R7R24L18R8L2R7R43L20L30L19R31L1L31R25R25R23L5R44R22L46L46R28R31R30R9R6R18R30L3R19L39L35R13R30L11L38R23R2L24R48R5L3R10R27L48R30R8R40R16L40L37L26L3L15L50R36R15L9L23R29L48R40L6R4L26R25R34L24L38L27R34L10L29L31R23L50R1L49R1R21R26R4R47R32L15L21L34R36R39R9R29R46R29L13L48L17R16R41L21R9R28L4R35L10R23R38R34R22L12L5R43L9L30R27L8L8L21R26L28R38R1R27R10R34R47L6R25L12R48R18R27L22R34L2R42R41L11L12L31R37R39R15L50L50L31L28R1R23R32L6R6L16L12R46R25R34R23L30R48L19R5L23L43R30R31R15L22L19R50L47L48R4R3R8R14L49L15L26R12R17R11R24R17R3L7L23L39L3L35R49R30L26R23L24R29R41R19L12R48L29L14L1L41R28L24L45L12L48L39L30L9R19R16L30R48R37L40L43L12L6L12R16R3L9L36L43L1R22L15R39L17L32R50L10R41L8L29R4R26R8L43R33L46R18R4R22L1R32R39R7R7R18L42L8R45L29R38L3R41L31R21R42L30R36R35L32L4L47L11L26L28L10R8R31L22L1R2L26R27R49R26L13R45L40L42R35L20L28L7L49R8R11L42R47R37R28R6R35R37L27L7R31R24R16R40L40R4R6L30L30L25R37R49L14L37R26R45L5R32L4L36L30L21L45R29L5L42L20R46L11R26L35L41L33R19R41R6L40R11L32L2L38R9R35R25L33R19R25R39R50L38L36L32R41R2L30R21R2R22L7R32R42L36L20R22R32R31R39L43R17L15R13R25R33R27R37R47R35R9L36R32R21R30R30R26L26R25L49R11R23R9L37R5L38R11R46R10L7R33R4R19R29L50R10L20L49R4L16R7L23L12R18L20L42R20L19R45R2L38L23L17L39R29L44L37L33L2L15L45R28R41L29L18R30L35L4R2L17L34R15L20R37L4R24L20R24L46L36L48L32L42R15L22R48R14L43R25R39R44L2L32R30L31L29R22R7L10R17R18R6R50L49L24L19L16R40L14R45L36R37R22R25L28L46L18R36R15L38R39L24L4L4L47R46R5L27L23L28R35R30R11R45L45L17R37L43R40R37R12R43R39L1R40L35L37R30L23L42R37R44R33L39R36L44L50R5L26L4R36L3R48R25R27L45R8L30L23L2R37R35R19R16L8R28R38R35R25L17L49L45R30L17L27L18L2R49L11R44L18R11L24L10L39L32R4L37R26L2R24R11R15R37R18R44R12L8L47L45L39L45R42R3L45R1L37L38R7R31L3R29R21L38L45L33L40R43L11R22R45L48L8L23R22R15R20R15R45L5R39R22L16R17R33R17R4L35R31R35L40L34L48L40R15R4L3L8L16L39L2R39R45R48R20R5R42R12L15R13R4L43L39R22R29R24L42R42R30L26L38L42L33L45L38R21R1R4L13R37R29R22L35L35L27L30L7R31L9R13R2L30L33R15L47R12L11R44L10L29L39R29R29R34R31L15R9R38L3L19L30R10L13R22L3L9R12R49L45L28R38L19L13L24L23R48R24L3L30R48R30R9L48L41R48R36R26L42R28L50L20L43L43L46R7L4R25L5L5L50L35L48L9L38R16R4R28R34R34R45R32R15R48R9L44L14R17L43R49L20R1R1L4L15L23L39R3R46R2R36R18L20R11L41R18R40L18R20R40L22R11R28L45L18R24R18R11L22R47R8R29L50R31R9R40L18L44R18R7L24L34R48R8R26L7L47L46R22L39L14L37L22L27L4R48R14R6L16L27R42R17R35R15L6R50L33R43R44L10R27L14L18R2R20L25L45R40R47L29L35R45L41L26R23R26R16L48R3L17L26R19L5L7R35L4R25R6L42L20R13L45R5R41R15L6L5R28L23R3L29R49R25R41R44L16R23L26R39R22L45R2R13R32L47R49R2R41L3R16L2L37R9L48R43R28R42R27L50R5R33L24L13L39R39R35R47R41L20R25R41R22R44L42R10R9L36L45L47L21L2L30R22R6R34L7L38L42R2L39R17L14R5L33R46L40R36R50L10R2L17R22R45L42R37R24R45R32L50R37L38L14R24R7L17R33R11L32R22L11L22R40R26L28R15L44R48R32R17R17R46L22R41R6L12L47L5R32R41L34L25R47L14R44R43L7R28L21L14L41R47L49L14L49R1R4R35L49L32L21R20L12R45R7R22L1R36R14R39R43R16R13R10L28R6R37L7L40L7R50R50R16R36L10R6R4R39R50R50L28R29L40R15L22R22R27R32R27R47L40R24L39L11L11L43R25L18R26R42R35R18R2R10L17L41R47R25L37L29R20R29L12R28R14R27R10L15R3L45R20R27R3L29L31L14R15L27R3R24L21R27R11R44R15L29L17R24R35L48R47R47L7L22L19L28R35R10L50R9R16L50R19L46L46L17R45R11R3R29L34L28L43R26L21L10L38R8L33R36L8L14R49L2L7R4R50R6L2R39L24L4R15L34L12L3R17R10L22R40L22L38R45L35L18R38L3R21R4R5L38R21L5R1L25L2R46L45L40R40L19L13L29R19L49R21R47L27L23R24L28R9R12R36L36L31L35R5L43R5R13R25L24L27L31R11R44L29R16R34R31L1L15R21L47L36R6L30R3L2L49L12R27R32R2L27R50L36R15L32L4L29R29L40R30R28L30R22R38R25R24L15L4L6R13L21R31R20L17R38R27R42R34L18R22R22R17R37L15L6R45R25R13R17L41L7R32L17L24L50L3L49R2L47L21L32R23R27R49L1R19L16R28L38L17L48L47R45L43L19R42R7R21L35R18R35R31L4R1L46R6R24R43R33L37L8L32L43R42L17L41R9R36L15L40L12R36R50L37R45L12R25R38R49R7L19R46L45L10R32L15L45L3L24L48L14L5R30R46L31L20L45L41R36R17R23R43L32R1R10L41R22R43R37L35L32R6R12R35R5L14R23R37L45L50R28L17R17R18L33R13L18
diff --git a/src/adventofcode2016/solutions/__init__.py b/src/adventofcode2022/data/day_22/day22_test.txt
similarity index 100%
rename from src/adventofcode2016/solutions/__init__.py
rename to src/adventofcode2022/data/day_22/day22_test.txt
diff --git a/src/adventofcode2022/solutions/day01.py b/src/adventofcode2022/day01.py
similarity index 100%
rename from src/adventofcode2022/solutions/day01.py
rename to src/adventofcode2022/day01.py
diff --git a/src/adventofcode2022/solutions/day02.py b/src/adventofcode2022/day02.py
similarity index 100%
rename from src/adventofcode2022/solutions/day02.py
rename to src/adventofcode2022/day02.py
diff --git a/src/adventofcode2022/solutions/day03.py b/src/adventofcode2022/day03.py
similarity index 100%
rename from src/adventofcode2022/solutions/day03.py
rename to src/adventofcode2022/day03.py
diff --git a/src/adventofcode2022/solutions/day04.py b/src/adventofcode2022/day04.py
similarity index 100%
rename from src/adventofcode2022/solutions/day04.py
rename to src/adventofcode2022/day04.py
diff --git a/src/adventofcode2022/solutions/day05.py b/src/adventofcode2022/day05.py
similarity index 100%
rename from src/adventofcode2022/solutions/day05.py
rename to src/adventofcode2022/day05.py
diff --git a/src/adventofcode2022/solutions/day06.py b/src/adventofcode2022/day06.py
similarity index 100%
rename from src/adventofcode2022/solutions/day06.py
rename to src/adventofcode2022/day06.py
diff --git a/src/adventofcode2022/solutions/day07.py b/src/adventofcode2022/day07.py
similarity index 100%
rename from src/adventofcode2022/solutions/day07.py
rename to src/adventofcode2022/day07.py
diff --git a/src/adventofcode2022/solutions/day08.py b/src/adventofcode2022/day08.py
similarity index 100%
rename from src/adventofcode2022/solutions/day08.py
rename to src/adventofcode2022/day08.py
diff --git a/src/adventofcode2022/solutions/day09.py b/src/adventofcode2022/day09.py
similarity index 100%
rename from src/adventofcode2022/solutions/day09.py
rename to src/adventofcode2022/day09.py
diff --git a/src/adventofcode2022/solutions/day10.py b/src/adventofcode2022/day10.py
similarity index 100%
rename from src/adventofcode2022/solutions/day10.py
rename to src/adventofcode2022/day10.py
diff --git a/src/adventofcode2022/solutions/day11.py b/src/adventofcode2022/day11.py
similarity index 100%
rename from src/adventofcode2022/solutions/day11.py
rename to src/adventofcode2022/day11.py
diff --git a/src/adventofcode2022/solutions/day12.py b/src/adventofcode2022/day12.py
similarity index 100%
rename from src/adventofcode2022/solutions/day12.py
rename to src/adventofcode2022/day12.py
diff --git a/src/adventofcode2022/solutions/day13.py b/src/adventofcode2022/day13.py
similarity index 100%
rename from src/adventofcode2022/solutions/day13.py
rename to src/adventofcode2022/day13.py
diff --git a/src/adventofcode2022/solutions/day14.py b/src/adventofcode2022/day14.py
similarity index 100%
rename from src/adventofcode2022/solutions/day14.py
rename to src/adventofcode2022/day14.py
diff --git a/src/adventofcode2022/solutions/day15.py b/src/adventofcode2022/day15.py
similarity index 100%
rename from src/adventofcode2022/solutions/day15.py
rename to src/adventofcode2022/day15.py
diff --git a/src/adventofcode2022/day22.py b/src/adventofcode2022/day22.py
new file mode 100644
index 00000000..eae6080e
--- /dev/null
+++ b/src/adventofcode2022/day22.py
@@ -0,0 +1,17 @@
+from __future__ import annotations
+
+from adventofcode.utils.abstract import FileReaderSolution
+
+
+class Day22:
+    pass
+
+
+class Day22PartA(Day22, FileReaderSolution):
+    def solve(self, input_data: str) -> int:
+        raise NotImplementedError
+
+
+class Day22PartB(Day22, FileReaderSolution):
+    def solve(self, input_data: str) -> int:
+        raise NotImplementedError
diff --git a/src/adventofcode2022/solutions/__init__.py b/src/adventofcode2022/solutions/__init__.py
deleted file mode 100644
index e69de29b..00000000
diff --git a/template/{{cookiecutter.adventofcode}}/src/adventofcode{{cookiecutter.year}}/solutions/data/{{cookiecutter.directory_name}}/{{cookiecutter.file_name}}.txt b/template/{{cookiecutter.adventofcode}}/src/adventofcode{{cookiecutter.year}}/data/{{cookiecutter.directory_name}}/{{cookiecutter.file_name}}.txt
similarity index 100%
rename from template/{{cookiecutter.adventofcode}}/src/adventofcode{{cookiecutter.year}}/solutions/data/{{cookiecutter.directory_name}}/{{cookiecutter.file_name}}.txt
rename to template/{{cookiecutter.adventofcode}}/src/adventofcode{{cookiecutter.year}}/data/{{cookiecutter.directory_name}}/{{cookiecutter.file_name}}.txt
diff --git a/template/{{cookiecutter.adventofcode}}/src/adventofcode{{cookiecutter.year}}/solutions/data/{{cookiecutter.directory_name}}/{{cookiecutter.file_name}}_test.txt b/template/{{cookiecutter.adventofcode}}/src/adventofcode{{cookiecutter.year}}/data/{{cookiecutter.directory_name}}/{{cookiecutter.file_name}}_test.txt
similarity index 100%
rename from template/{{cookiecutter.adventofcode}}/src/adventofcode{{cookiecutter.year}}/solutions/data/{{cookiecutter.directory_name}}/{{cookiecutter.file_name}}_test.txt
rename to template/{{cookiecutter.adventofcode}}/src/adventofcode{{cookiecutter.year}}/data/{{cookiecutter.directory_name}}/{{cookiecutter.file_name}}_test.txt
diff --git a/template/{{cookiecutter.adventofcode}}/src/adventofcode{{cookiecutter.year}}/solutions/{{cookiecutter.file_name}}.py b/template/{{cookiecutter.adventofcode}}/src/adventofcode{{cookiecutter.year}}/{{cookiecutter.file_name}}.py
similarity index 100%
rename from template/{{cookiecutter.adventofcode}}/src/adventofcode{{cookiecutter.year}}/solutions/{{cookiecutter.file_name}}.py
rename to template/{{cookiecutter.adventofcode}}/src/adventofcode{{cookiecutter.year}}/{{cookiecutter.file_name}}.py
diff --git a/tests/adventofcode2016/test_day01_a.py b/tests/adventofcode2016/test_day01_a.py
index 6a0657e1..b5f8442f 100644
--- a/tests/adventofcode2016/test_day01_a.py
+++ b/tests/adventofcode2016/test_day01_a.py
@@ -1,6 +1,6 @@
 import pytest
 
-from adventofcode2016.solutions.day01 import Day01PartA, Instruction
+from adventofcode2016.day01 import Day01PartA, Instruction
 
 
 class TestDay01PartA:
diff --git a/tests/adventofcode2016/test_day01_b.py b/tests/adventofcode2016/test_day01_b.py
index 690d8d0f..54aa0642 100644
--- a/tests/adventofcode2016/test_day01_b.py
+++ b/tests/adventofcode2016/test_day01_b.py
@@ -1,6 +1,6 @@
 import pytest
 
-from adventofcode2016.solutions.day01 import Day01PartB
+from adventofcode2016.day01 import Day01PartB
 
 
 class TestDay01PartB:
diff --git a/tests/adventofcode2016/test_day02_a.py b/tests/adventofcode2016/test_day02_a.py
index 7555aaf4..7ac7a949 100644
--- a/tests/adventofcode2016/test_day02_a.py
+++ b/tests/adventofcode2016/test_day02_a.py
@@ -1,6 +1,6 @@
 import pytest
 
-from adventofcode2016.solutions.day02 import Day02PartA, XYPoint
+from adventofcode2016.day02 import Day02PartA, XYPoint
 
 
 class TestDay02PartA:
diff --git a/tests/adventofcode2016/test_day02_b.py b/tests/adventofcode2016/test_day02_b.py
index 73697406..f425515e 100644
--- a/tests/adventofcode2016/test_day02_b.py
+++ b/tests/adventofcode2016/test_day02_b.py
@@ -1,4 +1,4 @@
-from adventofcode2016.solutions.day02 import Day02PartB, XYPoint
+from adventofcode2016.day02 import Day02PartB, XYPoint
 
 
 class TestDay02PartB:
diff --git a/tests/adventofcode2016/test_day03_a.py b/tests/adventofcode2016/test_day03_a.py
index 2eafbcbb..dd81cd06 100644
--- a/tests/adventofcode2016/test_day03_a.py
+++ b/tests/adventofcode2016/test_day03_a.py
@@ -1,6 +1,6 @@
 import pytest
 
-from adventofcode2016.solutions.day03 import Day03PartA
+from adventofcode2016.day03 import Day03PartA
 
 
 class TestDay03PartA:
diff --git a/tests/adventofcode2016/test_day03_b.py b/tests/adventofcode2016/test_day03_b.py
index 439897e2..ce740677 100644
--- a/tests/adventofcode2016/test_day03_b.py
+++ b/tests/adventofcode2016/test_day03_b.py
@@ -1,4 +1,4 @@
-from adventofcode2016.solutions.day03 import Day03PartB
+from adventofcode2016.day03 import Day03PartB
 
 
 class TestDay03PartB:
diff --git a/tests/adventofcode2016/test_day04_a.py b/tests/adventofcode2016/test_day04_a.py
index 98935b39..8193ea39 100644
--- a/tests/adventofcode2016/test_day04_a.py
+++ b/tests/adventofcode2016/test_day04_a.py
@@ -1,6 +1,6 @@
 import pytest
 
-from adventofcode2016.solutions.day04 import Day04PartA, Room
+from adventofcode2016.day04 import Day04PartA, Room
 
 
 class TestDay04PartA:
diff --git a/tests/adventofcode2016/test_day04_b.py b/tests/adventofcode2016/test_day04_b.py
index deedb7a8..0b299ec0 100644
--- a/tests/adventofcode2016/test_day04_b.py
+++ b/tests/adventofcode2016/test_day04_b.py
@@ -1,4 +1,4 @@
-from adventofcode2016.solutions.day04 import Day04PartB, Room
+from adventofcode2016.day04 import Day04PartB, Room
 
 
 class TestDay04PartB:
diff --git a/tests/adventofcode2016/test_day05_a.py b/tests/adventofcode2016/test_day05_a.py
index 223208dd..7da1a048 100644
--- a/tests/adventofcode2016/test_day05_a.py
+++ b/tests/adventofcode2016/test_day05_a.py
@@ -1,6 +1,6 @@
 import pytest
 
-from adventofcode2016.solutions.day05 import Day05PartA
+from adventofcode2016.day05 import Day05PartA
 
 
 class TestDay05PartA:
diff --git a/tests/adventofcode2016/test_day05_b.py b/tests/adventofcode2016/test_day05_b.py
index 6e6d48ef..267ff310 100644
--- a/tests/adventofcode2016/test_day05_b.py
+++ b/tests/adventofcode2016/test_day05_b.py
@@ -1,4 +1,4 @@
-from adventofcode2016.solutions.day05 import Day05PartB
+from adventofcode2016.day05 import Day05PartB
 
 
 class TestDay05PartB:
diff --git a/tests/adventofcode2016/test_day06_a.py b/tests/adventofcode2016/test_day06_a.py
index a9d6515c..4fbf260c 100644
--- a/tests/adventofcode2016/test_day06_a.py
+++ b/tests/adventofcode2016/test_day06_a.py
@@ -1,4 +1,4 @@
-from adventofcode2016.solutions.day06 import Day06PartA
+from adventofcode2016.day06 import Day06PartA
 
 
 class TestDay06PartA:
diff --git a/tests/adventofcode2016/test_day06_b.py b/tests/adventofcode2016/test_day06_b.py
index 53289ffd..3448c926 100644
--- a/tests/adventofcode2016/test_day06_b.py
+++ b/tests/adventofcode2016/test_day06_b.py
@@ -1,4 +1,4 @@
-from adventofcode2016.solutions.day06 import Day06PartB
+from adventofcode2016.day06 import Day06PartB
 
 
 class TestDay06PartB:
diff --git a/tests/adventofcode2016/test_day07_a.py b/tests/adventofcode2016/test_day07_a.py
index 5c8b3a0b..3685dc61 100644
--- a/tests/adventofcode2016/test_day07_a.py
+++ b/tests/adventofcode2016/test_day07_a.py
@@ -1,6 +1,6 @@
 import pytest
 
-from adventofcode2016.solutions.day07 import Day07PartA, IPv7
+from adventofcode2016.day07 import Day07PartA, IPv7
 
 
 class TestDay07PartA:
diff --git a/tests/adventofcode2016/test_day07_b.py b/tests/adventofcode2016/test_day07_b.py
index 6ddf9f59..17a406a5 100644
--- a/tests/adventofcode2016/test_day07_b.py
+++ b/tests/adventofcode2016/test_day07_b.py
@@ -1,6 +1,6 @@
 import pytest
 
-from adventofcode2016.solutions.day07 import Day07PartB, IPv7
+from adventofcode2016.day07 import Day07PartB, IPv7
 
 
 class TestDay07PartB:
diff --git a/tests/adventofcode2016/test_day08_a.py b/tests/adventofcode2016/test_day08_a.py
index c4ce233d..a204141f 100644
--- a/tests/adventofcode2016/test_day08_a.py
+++ b/tests/adventofcode2016/test_day08_a.py
@@ -1,12 +1,7 @@
 import numpy as np
 import pytest
 
-from adventofcode2016.solutions.day08 import (
-    Day08PartA,
-    Direction,
-    Instruction,
-    Operation,
-)
+from adventofcode2016.day08 import Day08PartA, Direction, Instruction, Operation
 
 
 class TestDay08PartA:
diff --git a/tests/adventofcode2016/test_day08_b.py b/tests/adventofcode2016/test_day08_b.py
index dc291d2d..469e0e65 100644
--- a/tests/adventofcode2016/test_day08_b.py
+++ b/tests/adventofcode2016/test_day08_b.py
@@ -1,4 +1,4 @@
-from adventofcode2016.solutions.day08 import Day08PartB
+from adventofcode2016.day08 import Day08PartB
 
 
 class TestDay08PartB:
diff --git a/tests/adventofcode2016/test_day09_a.py b/tests/adventofcode2016/test_day09_a.py
index 110d8089..e7afbce6 100644
--- a/tests/adventofcode2016/test_day09_a.py
+++ b/tests/adventofcode2016/test_day09_a.py
@@ -1,6 +1,6 @@
 import pytest
 
-from adventofcode2016.solutions.day09 import Day09PartA
+from adventofcode2016.day09 import Day09PartA
 
 
 class TestDay09PartA:
diff --git a/tests/adventofcode2016/test_day09_b.py b/tests/adventofcode2016/test_day09_b.py
index 09ea1a12..38a683f6 100644
--- a/tests/adventofcode2016/test_day09_b.py
+++ b/tests/adventofcode2016/test_day09_b.py
@@ -1,6 +1,6 @@
 import pytest
 
-from adventofcode2016.solutions.day09 import Day09PartB
+from adventofcode2016.day09 import Day09PartB
 
 
 class TestDay09PartB:
diff --git a/tests/adventofcode2016/test_day10_a.py b/tests/adventofcode2016/test_day10_a.py
index 6719c0e7..a2cbe3bf 100644
--- a/tests/adventofcode2016/test_day10_a.py
+++ b/tests/adventofcode2016/test_day10_a.py
@@ -1,4 +1,4 @@
-from adventofcode2016.solutions.day10 import Day10PartA
+from adventofcode2016.day10 import Day10PartA
 
 
 class TestDay10PartA:
diff --git a/tests/adventofcode2016/test_day10_b.py b/tests/adventofcode2016/test_day10_b.py
index 93fae08c..b3e08eb5 100644
--- a/tests/adventofcode2016/test_day10_b.py
+++ b/tests/adventofcode2016/test_day10_b.py
@@ -1,4 +1,4 @@
-from adventofcode2016.solutions.day10 import Day10PartB
+from adventofcode2016.day10 import Day10PartB
 
 
 class TestDay10PartB:
diff --git a/tests/adventofcode2016/test_day11_a.py b/tests/adventofcode2016/test_day11_a.py
index d412866e..80dced8a 100644
--- a/tests/adventofcode2016/test_day11_a.py
+++ b/tests/adventofcode2016/test_day11_a.py
@@ -1,6 +1,6 @@
 import pytest
 
-from adventofcode2016.solutions.day11 import Day11PartA, FacilityState
+from adventofcode2016.day11 import Day11PartA, FacilityState
 
 
 class TestDay11PartA:
diff --git a/tests/adventofcode2016/test_day11_b.py b/tests/adventofcode2016/test_day11_b.py
index b6d934d9..62e6692c 100644
--- a/tests/adventofcode2016/test_day11_b.py
+++ b/tests/adventofcode2016/test_day11_b.py
@@ -1,6 +1,6 @@
 import pytest
 
-from adventofcode2016.solutions.day11 import Day11PartB
+from adventofcode2016.day11 import Day11PartB
 
 
 class TestDay11PartB:
diff --git a/tests/adventofcode2016/test_day12_a.py b/tests/adventofcode2016/test_day12_a.py
index f851a804..ae453c18 100644
--- a/tests/adventofcode2016/test_day12_a.py
+++ b/tests/adventofcode2016/test_day12_a.py
@@ -1,4 +1,4 @@
-from adventofcode2016.solutions.day12 import Day12PartA
+from adventofcode2016.day12 import Day12PartA
 
 
 class TestDay12PartA:
diff --git a/tests/adventofcode2016/test_day12_b.py b/tests/adventofcode2016/test_day12_b.py
index 856fc211..ad6b3278 100644
--- a/tests/adventofcode2016/test_day12_b.py
+++ b/tests/adventofcode2016/test_day12_b.py
@@ -1,4 +1,4 @@
-from adventofcode2016.solutions.day12 import Day12PartB
+from adventofcode2016.day12 import Day12PartB
 
 
 class TestDay12PartB:
diff --git a/tests/adventofcode2016/test_day13_a.py b/tests/adventofcode2016/test_day13_a.py
index 6f3ef8fa..c8d37301 100644
--- a/tests/adventofcode2016/test_day13_a.py
+++ b/tests/adventofcode2016/test_day13_a.py
@@ -1,6 +1,6 @@
 import pytest
 
-from adventofcode2016.solutions.day13 import Day13PartA, Maze, MazeLocation
+from adventofcode2016.day13 import Day13PartA, Maze, MazeLocation
 
 
 class TestDay13PartA:
diff --git a/tests/adventofcode2016/test_day13_b.py b/tests/adventofcode2016/test_day13_b.py
index 2c172d85..dbf6f497 100644
--- a/tests/adventofcode2016/test_day13_b.py
+++ b/tests/adventofcode2016/test_day13_b.py
@@ -1,4 +1,4 @@
-from adventofcode2016.solutions.day13 import Day13PartB
+from adventofcode2016.day13 import Day13PartB
 
 
 class TestDay13PartB:
diff --git a/tests/adventofcode2016/test_day14_a.py b/tests/adventofcode2016/test_day14_a.py
index 3c1b231f..082d2161 100644
--- a/tests/adventofcode2016/test_day14_a.py
+++ b/tests/adventofcode2016/test_day14_a.py
@@ -1,4 +1,4 @@
-from adventofcode2016.solutions.day14 import Day14PartA
+from adventofcode2016.day14 import Day14PartA
 
 
 class TestDay14PartA:
diff --git a/tests/adventofcode2016/test_day14_b.py b/tests/adventofcode2016/test_day14_b.py
index 118bb98c..88e609b1 100644
--- a/tests/adventofcode2016/test_day14_b.py
+++ b/tests/adventofcode2016/test_day14_b.py
@@ -1,4 +1,4 @@
-from adventofcode2016.solutions.day14 import Day14PartB
+from adventofcode2016.day14 import Day14PartB
 
 
 class TestDay14PartB:
diff --git a/tests/adventofcode2016/test_day15_a.py b/tests/adventofcode2016/test_day15_a.py
index 7697ad30..fe073bd0 100644
--- a/tests/adventofcode2016/test_day15_a.py
+++ b/tests/adventofcode2016/test_day15_a.py
@@ -1,6 +1,6 @@
 import pytest
 
-from adventofcode2016.solutions.day15 import Day15PartA, Disc
+from adventofcode2016.day15 import Day15PartA, Disc
 
 
 class TestDay15PartA:
diff --git a/tests/adventofcode2016/test_day15_b.py b/tests/adventofcode2016/test_day15_b.py
index cdb08d08..78a3f06f 100644
--- a/tests/adventofcode2016/test_day15_b.py
+++ b/tests/adventofcode2016/test_day15_b.py
@@ -1,4 +1,4 @@
-from adventofcode2016.solutions.day15 import Day15PartB
+from adventofcode2016.day15 import Day15PartB
 
 
 class TestDay15PartB:
diff --git a/tests/adventofcode2016/test_day16_a.py b/tests/adventofcode2016/test_day16_a.py
index 2578d89d..38e5c017 100644
--- a/tests/adventofcode2016/test_day16_a.py
+++ b/tests/adventofcode2016/test_day16_a.py
@@ -1,6 +1,6 @@
 import pytest
 
-from adventofcode2016.solutions.day16 import Day16PartA
+from adventofcode2016.day16 import Day16PartA
 
 
 class TestDay16PartA:
diff --git a/tests/adventofcode2016/test_day16_b.py b/tests/adventofcode2016/test_day16_b.py
index cb62443b..43a48c0b 100644
--- a/tests/adventofcode2016/test_day16_b.py
+++ b/tests/adventofcode2016/test_day16_b.py
@@ -1,4 +1,4 @@
-from adventofcode2016.solutions.day16 import Day16PartB
+from adventofcode2016.day16 import Day16PartB
 
 
 class TestDay16PartB:
diff --git a/tests/adventofcode2016/test_day17_a.py b/tests/adventofcode2016/test_day17_a.py
index 62c07a4c..b5106db2 100644
--- a/tests/adventofcode2016/test_day17_a.py
+++ b/tests/adventofcode2016/test_day17_a.py
@@ -1,6 +1,6 @@
 import pytest
 
-from adventofcode2016.solutions.day17 import Day17PartA, MazeLocation
+from adventofcode2016.day17 import Day17PartA, MazeLocation
 
 
 class TestDay17PartA:
diff --git a/tests/adventofcode2016/test_day17_b.py b/tests/adventofcode2016/test_day17_b.py
index e45e9799..25e37ee5 100644
--- a/tests/adventofcode2016/test_day17_b.py
+++ b/tests/adventofcode2016/test_day17_b.py
@@ -1,6 +1,6 @@
 import pytest
 
-from adventofcode2016.solutions.day17 import Day17PartB
+from adventofcode2016.day17 import Day17PartB
 
 
 class TestDay17PartB:
diff --git a/tests/adventofcode2016/test_day18_a.py b/tests/adventofcode2016/test_day18_a.py
index 0e54fd55..fd93e7ac 100644
--- a/tests/adventofcode2016/test_day18_a.py
+++ b/tests/adventofcode2016/test_day18_a.py
@@ -2,7 +2,7 @@
 
 import pytest
 
-from adventofcode2016.solutions.day18 import Day18PartA
+from adventofcode2016.day18 import Day18PartA
 
 
 class TestDay18PartA:
diff --git a/tests/adventofcode2016/test_day18_b.py b/tests/adventofcode2016/test_day18_b.py
index b55066a4..cf80ae04 100644
--- a/tests/adventofcode2016/test_day18_b.py
+++ b/tests/adventofcode2016/test_day18_b.py
@@ -1,4 +1,4 @@
-from adventofcode2016.solutions.day18 import Day18PartB
+from adventofcode2016.day18 import Day18PartB
 
 
 class TestDay18PartB:
diff --git a/tests/adventofcode2016/test_day19_a.py b/tests/adventofcode2016/test_day19_a.py
index 8631a65e..551a7549 100644
--- a/tests/adventofcode2016/test_day19_a.py
+++ b/tests/adventofcode2016/test_day19_a.py
@@ -1,4 +1,4 @@
-from adventofcode2016.solutions.day19 import Day19PartA
+from adventofcode2016.day19 import Day19PartA
 
 
 class TestDay19PartA:
diff --git a/tests/adventofcode2016/test_day19_b.py b/tests/adventofcode2016/test_day19_b.py
index fb95ec3a..ce8ea267 100644
--- a/tests/adventofcode2016/test_day19_b.py
+++ b/tests/adventofcode2016/test_day19_b.py
@@ -1,4 +1,4 @@
-from adventofcode2016.solutions.day19 import Day19PartB
+from adventofcode2016.day19 import Day19PartB
 
 
 class TestDay19PartB:
diff --git a/tests/adventofcode2016/test_day20_a.py b/tests/adventofcode2016/test_day20_a.py
index cadc2a5f..7f7229aa 100644
--- a/tests/adventofcode2016/test_day20_a.py
+++ b/tests/adventofcode2016/test_day20_a.py
@@ -1,6 +1,6 @@
 import pytest
 
-from adventofcode2016.solutions.day20 import Day20PartA
+from adventofcode2016.day20 import Day20PartA
 
 
 class TestDay20PartA:
diff --git a/tests/adventofcode2016/test_day20_b.py b/tests/adventofcode2016/test_day20_b.py
index 84ad9af9..10609b50 100644
--- a/tests/adventofcode2016/test_day20_b.py
+++ b/tests/adventofcode2016/test_day20_b.py
@@ -1,4 +1,4 @@
-from adventofcode2016.solutions.day20 import Day20PartB
+from adventofcode2016.day20 import Day20PartB
 
 
 class TestDay20PartB:
diff --git a/tests/adventofcode2016/test_day21_a.py b/tests/adventofcode2016/test_day21_a.py
index 649befb1..9ab3ed16 100644
--- a/tests/adventofcode2016/test_day21_a.py
+++ b/tests/adventofcode2016/test_day21_a.py
@@ -1,4 +1,4 @@
-from adventofcode2016.solutions.day21 import Day21PartA
+from adventofcode2016.day21 import Day21PartA
 
 
 class TestDay21PartA:
diff --git a/tests/adventofcode2016/test_day21_b.py b/tests/adventofcode2016/test_day21_b.py
index bf801d7b..d652412a 100644
--- a/tests/adventofcode2016/test_day21_b.py
+++ b/tests/adventofcode2016/test_day21_b.py
@@ -1,6 +1,6 @@
 import pytest
 
-from adventofcode2016.solutions.day21 import Day21PartB
+from adventofcode2016.day21 import Day21PartB
 
 
 class TestDay21PartB:
diff --git a/tests/adventofcode2016/test_day22_a.py b/tests/adventofcode2016/test_day22_a.py
index 24ca2628..06435936 100644
--- a/tests/adventofcode2016/test_day22_a.py
+++ b/tests/adventofcode2016/test_day22_a.py
@@ -1,4 +1,4 @@
-from adventofcode2016.solutions.day22 import Day22PartA, Node
+from adventofcode2016.day22 import Day22PartA, Node
 
 
 class TestDay22PartA:
diff --git a/tests/adventofcode2016/test_day22_b.py b/tests/adventofcode2016/test_day22_b.py
index 5fd7100d..d15f0807 100644
--- a/tests/adventofcode2016/test_day22_b.py
+++ b/tests/adventofcode2016/test_day22_b.py
@@ -1,6 +1,6 @@
 import pytest
 
-from adventofcode2016.solutions.day22 import Day22PartB
+from adventofcode2016.day22 import Day22PartB
 
 
 class TestDay22PartB:
diff --git a/tests/adventofcode2019/test_day01_a.py b/tests/adventofcode2019/test_day01_a.py
index aa5ae42b..8b4066d7 100644
--- a/tests/adventofcode2019/test_day01_a.py
+++ b/tests/adventofcode2019/test_day01_a.py
@@ -1,6 +1,6 @@
 import pytest
 
-from adventofcode2019.solutions.day01 import Day01PartA
+from adventofcode2019.day01 import Day01PartA
 
 
 class TestDay01PartA:
diff --git a/tests/adventofcode2019/test_day01_b.py b/tests/adventofcode2019/test_day01_b.py
index a0516323..da23c74b 100644
--- a/tests/adventofcode2019/test_day01_b.py
+++ b/tests/adventofcode2019/test_day01_b.py
@@ -1,6 +1,6 @@
 import pytest
 
-from adventofcode2019.solutions.day01 import Day01PartB
+from adventofcode2019.day01 import Day01PartB
 
 
 class TestDay01PartB:
diff --git a/tests/adventofcode2019/test_day02_a.py b/tests/adventofcode2019/test_day02_a.py
index 08d72a5e..54bc3290 100644
--- a/tests/adventofcode2019/test_day02_a.py
+++ b/tests/adventofcode2019/test_day02_a.py
@@ -1,6 +1,6 @@
 import pytest
 
-from adventofcode2019.solutions.day02 import Day02PartA
+from adventofcode2019.day02 import Day02PartA
 
 
 class TestDay02PartA:
diff --git a/tests/adventofcode2019/test_day02_b.py b/tests/adventofcode2019/test_day02_b.py
index d410f5c4..ad62ae1d 100644
--- a/tests/adventofcode2019/test_day02_b.py
+++ b/tests/adventofcode2019/test_day02_b.py
@@ -1,4 +1,4 @@
-from adventofcode2019.solutions.day02 import Day02PartB
+from adventofcode2019.day02 import Day02PartB
 
 
 class TestDay02PartB:
diff --git a/tests/adventofcode2019/test_day03_a.py b/tests/adventofcode2019/test_day03_a.py
index 2900fb9d..1e4d92a2 100644
--- a/tests/adventofcode2019/test_day03_a.py
+++ b/tests/adventofcode2019/test_day03_a.py
@@ -1,6 +1,6 @@
 import pytest
 
-from adventofcode2019.solutions.day03 import Day03PartA, Point
+from adventofcode2019.day03 import Day03PartA, Point
 
 
 class TestDay03PartA:
diff --git a/tests/adventofcode2019/test_day03_b.py b/tests/adventofcode2019/test_day03_b.py
index 3d66ec1a..3341885e 100644
--- a/tests/adventofcode2019/test_day03_b.py
+++ b/tests/adventofcode2019/test_day03_b.py
@@ -1,6 +1,6 @@
 import pytest
 
-from adventofcode2019.solutions.day03 import Day03PartB
+from adventofcode2019.day03 import Day03PartB
 
 
 class TestDay03PartB:
diff --git a/tests/adventofcode2019/test_day04_a.py b/tests/adventofcode2019/test_day04_a.py
index 0e289724..db9862d3 100644
--- a/tests/adventofcode2019/test_day04_a.py
+++ b/tests/adventofcode2019/test_day04_a.py
@@ -1,6 +1,6 @@
 import pytest
 
-from adventofcode2019.solutions.day04 import Day04PartA
+from adventofcode2019.day04 import Day04PartA
 
 
 class TestDay04PartA:
diff --git a/tests/adventofcode2019/test_day04_b.py b/tests/adventofcode2019/test_day04_b.py
index 271c52b1..f7111a30 100644
--- a/tests/adventofcode2019/test_day04_b.py
+++ b/tests/adventofcode2019/test_day04_b.py
@@ -1,6 +1,6 @@
 import pytest
 
-from adventofcode2019.solutions.day04 import Day04PartB
+from adventofcode2019.day04 import Day04PartB
 
 
 class TestDay04PartB:
diff --git a/tests/adventofcode2019/test_day05_a.py b/tests/adventofcode2019/test_day05_a.py
index fb2c422d..3ecfb3fa 100644
--- a/tests/adventofcode2019/test_day05_a.py
+++ b/tests/adventofcode2019/test_day05_a.py
@@ -1,6 +1,6 @@
 import pytest
 
-from adventofcode2019.solutions.day05 import Day05PartA
+from adventofcode2019.day05 import Day05PartA
 
 
 class TestDay05PartA:
diff --git a/tests/adventofcode2019/test_day05_b.py b/tests/adventofcode2019/test_day05_b.py
index 1c74d286..d3fe77dc 100644
--- a/tests/adventofcode2019/test_day05_b.py
+++ b/tests/adventofcode2019/test_day05_b.py
@@ -1,6 +1,6 @@
 import pytest
 
-from adventofcode2019.solutions.day05 import Day05PartB
+from adventofcode2019.day05 import Day05PartB
 
 
 class TestDay05PartB:
diff --git a/tests/adventofcode2019/test_day06_a.py b/tests/adventofcode2019/test_day06_a.py
index 46217f9e..e36e49da 100644
--- a/tests/adventofcode2019/test_day06_a.py
+++ b/tests/adventofcode2019/test_day06_a.py
@@ -1,6 +1,6 @@
 import pytest
 
-from adventofcode2019.solutions.day06 import Day06PartA
+from adventofcode2019.day06 import Day06PartA
 
 
 class TestDay06PartA:
diff --git a/tests/adventofcode2019/test_day06_b.py b/tests/adventofcode2019/test_day06_b.py
index 2bc674a5..1b647be2 100644
--- a/tests/adventofcode2019/test_day06_b.py
+++ b/tests/adventofcode2019/test_day06_b.py
@@ -1,6 +1,6 @@
 import pytest
 
-from adventofcode2019.solutions.day06 import Day06PartB
+from adventofcode2019.day06 import Day06PartB
 
 
 class TestDay06PartB:
diff --git a/tests/adventofcode2019/test_day07_a.py b/tests/adventofcode2019/test_day07_a.py
index 7b18d50a..e9be811f 100644
--- a/tests/adventofcode2019/test_day07_a.py
+++ b/tests/adventofcode2019/test_day07_a.py
@@ -1,6 +1,6 @@
 import pytest
 
-from adventofcode2019.solutions.day07 import Day07PartA
+from adventofcode2019.day07 import Day07PartA
 
 
 class TestDay07PartA:
diff --git a/tests/adventofcode2019/test_day07_b.py b/tests/adventofcode2019/test_day07_b.py
index 4e910e3d..8a502da0 100644
--- a/tests/adventofcode2019/test_day07_b.py
+++ b/tests/adventofcode2019/test_day07_b.py
@@ -1,6 +1,6 @@
 import pytest
 
-from adventofcode2019.solutions.day07 import Day07PartB
+from adventofcode2019.day07 import Day07PartB
 
 
 class TestDay07PartB:
diff --git a/tests/adventofcode2019/test_day08_a.py b/tests/adventofcode2019/test_day08_a.py
index 81e6f6de..bb5a52d0 100644
--- a/tests/adventofcode2019/test_day08_a.py
+++ b/tests/adventofcode2019/test_day08_a.py
@@ -1,4 +1,4 @@
-from adventofcode2019.solutions.day08 import Day08PartA
+from adventofcode2019.day08 import Day08PartA
 
 
 class TestDay08PartA:
diff --git a/tests/adventofcode2019/test_day08_b.py b/tests/adventofcode2019/test_day08_b.py
index 6e91b6c1..ef393ee4 100644
--- a/tests/adventofcode2019/test_day08_b.py
+++ b/tests/adventofcode2019/test_day08_b.py
@@ -1,6 +1,6 @@
 import pytest
 
-from adventofcode2019.solutions.day08 import Day08PartB
+from adventofcode2019.day08 import Day08PartB
 
 
 class TestDay08PartB:
diff --git a/tests/adventofcode2019/test_day09_a.py b/tests/adventofcode2019/test_day09_a.py
index 53d4c5b4..43dd20dd 100644
--- a/tests/adventofcode2019/test_day09_a.py
+++ b/tests/adventofcode2019/test_day09_a.py
@@ -1,5 +1,5 @@
-from adventofcode2019.solutions.day09 import Day09PartA
-from adventofcode2019.solutions.intcode import IntCode
+from adventofcode2019.day09 import Day09PartA
+from adventofcode2019.intcode import IntCode
 
 
 class TestDay09PartA:
diff --git a/tests/adventofcode2019/test_day09_b.py b/tests/adventofcode2019/test_day09_b.py
index 204566fb..9dd69fd7 100644
--- a/tests/adventofcode2019/test_day09_b.py
+++ b/tests/adventofcode2019/test_day09_b.py
@@ -1,4 +1,4 @@
-from adventofcode2019.solutions.day09 import Day09PartB
+from adventofcode2019.day09 import Day09PartB
 
 
 class TestDay09PartB:
diff --git a/tests/adventofcode2019/test_day10_a.py b/tests/adventofcode2019/test_day10_a.py
index 54e1d3f2..297188e9 100644
--- a/tests/adventofcode2019/test_day10_a.py
+++ b/tests/adventofcode2019/test_day10_a.py
@@ -1,6 +1,6 @@
 import pytest
 
-from adventofcode2019.solutions.day10 import Astroid, Day10PartA
+from adventofcode2019.day10 import Astroid, Day10PartA
 
 
 class TestDay10PartA:
diff --git a/tests/adventofcode2019/test_day10_b.py b/tests/adventofcode2019/test_day10_b.py
index 3bcdfa80..65b89371 100644
--- a/tests/adventofcode2019/test_day10_b.py
+++ b/tests/adventofcode2019/test_day10_b.py
@@ -1,4 +1,4 @@
-from adventofcode2019.solutions.day10 import Astroid, Day10PartB
+from adventofcode2019.day10 import Astroid, Day10PartB
 
 
 class TestDay10PartB:
diff --git a/tests/adventofcode2019/test_day11_a.py b/tests/adventofcode2019/test_day11_a.py
index 884a29da..0d3957fc 100644
--- a/tests/adventofcode2019/test_day11_a.py
+++ b/tests/adventofcode2019/test_day11_a.py
@@ -1,4 +1,4 @@
-from adventofcode2019.solutions.day11 import Day11PartA, Direction, RotateDirection
+from adventofcode2019.day11 import Day11PartA, Direction, RotateDirection
 
 
 class TestDay11PartA:
diff --git a/tests/adventofcode2019/test_day11_b.py b/tests/adventofcode2019/test_day11_b.py
index 5abe4cdc..cac69068 100644
--- a/tests/adventofcode2019/test_day11_b.py
+++ b/tests/adventofcode2019/test_day11_b.py
@@ -1,4 +1,4 @@
-from adventofcode2019.solutions.day11 import Day11PartB
+from adventofcode2019.day11 import Day11PartB
 
 
 class TestDay11PartB:
diff --git a/tests/adventofcode2019/test_day12_a.py b/tests/adventofcode2019/test_day12_a.py
index b81e00f6..0be4767b 100644
--- a/tests/adventofcode2019/test_day12_a.py
+++ b/tests/adventofcode2019/test_day12_a.py
@@ -1,4 +1,4 @@
-from adventofcode2019.solutions.day12 import Day12PartA, Galaxy, Moon
+from adventofcode2019.day12 import Day12PartA, Galaxy, Moon
 
 
 class TestDay12PartA:
diff --git a/tests/adventofcode2019/test_day12_b.py b/tests/adventofcode2019/test_day12_b.py
index c7b32789..4f59c59c 100644
--- a/tests/adventofcode2019/test_day12_b.py
+++ b/tests/adventofcode2019/test_day12_b.py
@@ -1,6 +1,6 @@
 import pytest
 
-from adventofcode2019.solutions.day12 import Day12PartB
+from adventofcode2019.day12 import Day12PartB
 
 
 class TestDay12PartB:
diff --git a/tests/adventofcode2019/test_day13_a.py b/tests/adventofcode2019/test_day13_a.py
index 174b6633..b7066ea4 100644
--- a/tests/adventofcode2019/test_day13_a.py
+++ b/tests/adventofcode2019/test_day13_a.py
@@ -1,4 +1,4 @@
-from adventofcode2019.solutions.day13 import Day13PartA
+from adventofcode2019.day13 import Day13PartA
 
 
 class TestDay13PartA:
diff --git a/tests/adventofcode2019/test_day13_b.py b/tests/adventofcode2019/test_day13_b.py
index 42f2bdfb..77703005 100644
--- a/tests/adventofcode2019/test_day13_b.py
+++ b/tests/adventofcode2019/test_day13_b.py
@@ -1,4 +1,4 @@
-from adventofcode2019.solutions.day13 import Day13PartB
+from adventofcode2019.day13 import Day13PartB
 
 
 class TestDay13PartB:
diff --git a/tests/adventofcode2019/test_day14_a.py b/tests/adventofcode2019/test_day14_a.py
index b058890e..6ea1597e 100644
--- a/tests/adventofcode2019/test_day14_a.py
+++ b/tests/adventofcode2019/test_day14_a.py
@@ -1,6 +1,6 @@
 import pytest
 
-from adventofcode2019.solutions.day14 import Day14PartA, NanoFactory, Recipe
+from adventofcode2019.day14 import Day14PartA, NanoFactory, Recipe
 
 
 class TestDay14PartA:
diff --git a/tests/adventofcode2019/test_day14_b.py b/tests/adventofcode2019/test_day14_b.py
index 7cc9117f..8948abb6 100644
--- a/tests/adventofcode2019/test_day14_b.py
+++ b/tests/adventofcode2019/test_day14_b.py
@@ -1,6 +1,6 @@
 import pytest
 
-from adventofcode2019.solutions.day14 import Day14PartB
+from adventofcode2019.day14 import Day14PartB
 
 
 class TestDay14PartB:
diff --git a/tests/adventofcode2019/test_day15_a.py b/tests/adventofcode2019/test_day15_a.py
index bf5df2c7..c5e39d5f 100644
--- a/tests/adventofcode2019/test_day15_a.py
+++ b/tests/adventofcode2019/test_day15_a.py
@@ -1,4 +1,4 @@
-from adventofcode2019.solutions.day15 import Day15PartA
+from adventofcode2019.day15 import Day15PartA
 
 
 class TestDay15PartA:
diff --git a/tests/adventofcode2019/test_day15_b.py b/tests/adventofcode2019/test_day15_b.py
index fd4bdb20..2dca7c24 100644
--- a/tests/adventofcode2019/test_day15_b.py
+++ b/tests/adventofcode2019/test_day15_b.py
@@ -1,4 +1,4 @@
-from adventofcode2019.solutions.day15 import Day15PartB, Location, Point, Tile
+from adventofcode2019.day15 import Day15PartB, Location, Point, Tile
 
 
 class TestDay15PartB:
diff --git a/tests/adventofcode2019/test_day16_a.py b/tests/adventofcode2019/test_day16_a.py
index 218b8027..02610d8f 100644
--- a/tests/adventofcode2019/test_day16_a.py
+++ b/tests/adventofcode2019/test_day16_a.py
@@ -1,6 +1,6 @@
 import pytest
 
-from adventofcode2019.solutions.day16 import Day16PartA
+from adventofcode2019.day16 import Day16PartA
 
 
 class TestDay16PartA:
diff --git a/tests/adventofcode2019/test_day16_b.py b/tests/adventofcode2019/test_day16_b.py
index bfee32a4..ba54ef13 100644
--- a/tests/adventofcode2019/test_day16_b.py
+++ b/tests/adventofcode2019/test_day16_b.py
@@ -1,6 +1,6 @@
 import pytest
 
-from adventofcode2019.solutions.day16 import Day16PartB
+from adventofcode2019.day16 import Day16PartB
 
 
 class TestDay16PartB:
diff --git a/tests/adventofcode2019/test_day17_a.py b/tests/adventofcode2019/test_day17_a.py
index e7754aeb..e5c533eb 100644
--- a/tests/adventofcode2019/test_day17_a.py
+++ b/tests/adventofcode2019/test_day17_a.py
@@ -1,6 +1,6 @@
 from collections import defaultdict
 
-from adventofcode2019.solutions.day17 import Day17PartA
+from adventofcode2019.day17 import Day17PartA
 
 
 class TestDay17PartA:
diff --git a/tests/adventofcode2019/test_infi.py b/tests/adventofcode2019/test_infi.py
index d58ca9e1..fa3af00e 100644
--- a/tests/adventofcode2019/test_infi.py
+++ b/tests/adventofcode2019/test_infi.py
@@ -1,4 +1,4 @@
-from adventofcode2019.solutions.infi import Infi
+from adventofcode2019.infi import Infi
 
 
 class TestInfi:
diff --git a/tests/adventofcode2019/test_intcode.py b/tests/adventofcode2019/test_intcode.py
index 2ca0c08a..b104bed0 100644
--- a/tests/adventofcode2019/test_intcode.py
+++ b/tests/adventofcode2019/test_intcode.py
@@ -1,6 +1,6 @@
 import pytest
 
-from adventofcode2019.solutions.intcode import IntCode
+from adventofcode2019.intcode import IntCode
 
 
 class TestIntcode:
diff --git a/tests/adventofcode2020/test_day01_a.py b/tests/adventofcode2020/test_day01_a.py
index 865d0852..17d43d04 100644
--- a/tests/adventofcode2020/test_day01_a.py
+++ b/tests/adventofcode2020/test_day01_a.py
@@ -1,4 +1,4 @@
-from adventofcode2020.solutions.day01 import Day01PartA
+from adventofcode2020.day01 import Day01PartA
 
 
 class TestDay01PartA:
diff --git a/tests/adventofcode2020/test_day01_b.py b/tests/adventofcode2020/test_day01_b.py
index 5668ad37..7484abdb 100644
--- a/tests/adventofcode2020/test_day01_b.py
+++ b/tests/adventofcode2020/test_day01_b.py
@@ -1,4 +1,4 @@
-from adventofcode2020.solutions.day01 import Day01PartB
+from adventofcode2020.day01 import Day01PartB
 
 
 class TestDay01PartB:
diff --git a/tests/adventofcode2020/test_day02_a.py b/tests/adventofcode2020/test_day02_a.py
index 43e4cc60..581a4154 100644
--- a/tests/adventofcode2020/test_day02_a.py
+++ b/tests/adventofcode2020/test_day02_a.py
@@ -1,6 +1,6 @@
 import pytest
 
-from adventofcode2020.solutions.day02 import Day02PartA, PassPol
+from adventofcode2020.day02 import Day02PartA, PassPol
 
 
 class TestDay02PartA:
diff --git a/tests/adventofcode2020/test_day02_b.py b/tests/adventofcode2020/test_day02_b.py
index cd0be46b..316fde78 100644
--- a/tests/adventofcode2020/test_day02_b.py
+++ b/tests/adventofcode2020/test_day02_b.py
@@ -1,6 +1,6 @@
 import pytest
 
-from adventofcode2020.solutions.day02 import Day02PartB
+from adventofcode2020.day02 import Day02PartB
 
 
 class TestDay02PartB:
diff --git a/tests/adventofcode2020/test_day03_a.py b/tests/adventofcode2020/test_day03_a.py
index 66339305..b109d300 100644
--- a/tests/adventofcode2020/test_day03_a.py
+++ b/tests/adventofcode2020/test_day03_a.py
@@ -1,4 +1,4 @@
-from adventofcode2020.solutions.day03 import Day03PartA
+from adventofcode2020.day03 import Day03PartA
 
 
 class TestDay03PartA:
diff --git a/tests/adventofcode2020/test_day03_b.py b/tests/adventofcode2020/test_day03_b.py
index b06aaec0..a512a956 100644
--- a/tests/adventofcode2020/test_day03_b.py
+++ b/tests/adventofcode2020/test_day03_b.py
@@ -1,4 +1,4 @@
-from adventofcode2020.solutions.day03 import Day03PartB
+from adventofcode2020.day03 import Day03PartB
 
 
 class TestDay03PartB:
diff --git a/tests/adventofcode2020/test_day04_a.py b/tests/adventofcode2020/test_day04_a.py
index e0aa116b..dd1e4d6e 100644
--- a/tests/adventofcode2020/test_day04_a.py
+++ b/tests/adventofcode2020/test_day04_a.py
@@ -1,4 +1,4 @@
-from adventofcode2020.solutions.day04 import Day04PartA
+from adventofcode2020.day04 import Day04PartA
 
 
 class Testday04PartA:
diff --git a/tests/adventofcode2020/test_day04_b.py b/tests/adventofcode2020/test_day04_b.py
index c538616a..f18e66ec 100644
--- a/tests/adventofcode2020/test_day04_b.py
+++ b/tests/adventofcode2020/test_day04_b.py
@@ -1,6 +1,6 @@
 import pytest
 
-from adventofcode2020.solutions.day04 import Day04PartB
+from adventofcode2020.day04 import Day04PartB
 
 
 class TestDay04PartB:
diff --git a/tests/adventofcode2020/test_day05_a.py b/tests/adventofcode2020/test_day05_a.py
index 74fcef5f..654a3958 100644
--- a/tests/adventofcode2020/test_day05_a.py
+++ b/tests/adventofcode2020/test_day05_a.py
@@ -1,6 +1,6 @@
 import pytest
 
-from adventofcode2020.solutions.day05 import Day05PartA
+from adventofcode2020.day05 import Day05PartA
 
 
 class TestDay05PartA:
diff --git a/tests/adventofcode2020/test_day05_b.py b/tests/adventofcode2020/test_day05_b.py
index 9cd58ccc..7ca631d9 100644
--- a/tests/adventofcode2020/test_day05_b.py
+++ b/tests/adventofcode2020/test_day05_b.py
@@ -1,4 +1,4 @@
-from adventofcode2020.solutions.day05 import Day05PartB
+from adventofcode2020.day05 import Day05PartB
 
 
 class TestDay05PartB:
diff --git a/tests/adventofcode2020/test_day06_a.py b/tests/adventofcode2020/test_day06_a.py
index 48d30905..4c3bbd4f 100644
--- a/tests/adventofcode2020/test_day06_a.py
+++ b/tests/adventofcode2020/test_day06_a.py
@@ -1,6 +1,6 @@
 import pytest
 
-from adventofcode2020.solutions.day06 import Day06PartA
+from adventofcode2020.day06 import Day06PartA
 
 
 class TestDay06PartA:
diff --git a/tests/adventofcode2020/test_day06_b.py b/tests/adventofcode2020/test_day06_b.py
index 324b1acb..b928611e 100644
--- a/tests/adventofcode2020/test_day06_b.py
+++ b/tests/adventofcode2020/test_day06_b.py
@@ -1,6 +1,6 @@
 import pytest
 
-from adventofcode2020.solutions.day06 import Day06PartB
+from adventofcode2020.day06 import Day06PartB
 
 
 class TestDay06PartB:
diff --git a/tests/adventofcode2020/test_day07_a.py b/tests/adventofcode2020/test_day07_a.py
index 4e73adfc..986612f4 100644
--- a/tests/adventofcode2020/test_day07_a.py
+++ b/tests/adventofcode2020/test_day07_a.py
@@ -1,6 +1,6 @@
 import pytest
 
-from adventofcode2020.solutions.day07 import Day07PartA
+from adventofcode2020.day07 import Day07PartA
 
 
 class TestDay07PartA:
diff --git a/tests/adventofcode2020/test_day07_b.py b/tests/adventofcode2020/test_day07_b.py
index 1031e014..649f72e1 100644
--- a/tests/adventofcode2020/test_day07_b.py
+++ b/tests/adventofcode2020/test_day07_b.py
@@ -1,4 +1,4 @@
-from adventofcode2020.solutions.day07 import Day07PartB
+from adventofcode2020.day07 import Day07PartB
 
 
 class TestDay07PartB:
diff --git a/tests/adventofcode2020/test_day08_a.py b/tests/adventofcode2020/test_day08_a.py
index 5b3546bb..0ea712fa 100644
--- a/tests/adventofcode2020/test_day08_a.py
+++ b/tests/adventofcode2020/test_day08_a.py
@@ -1,6 +1,6 @@
 import pytest
 
-from adventofcode2020.solutions.day08 import Day08PartA
+from adventofcode2020.day08 import Day08PartA
 
 
 class TestDay08PartA:
diff --git a/tests/adventofcode2020/test_day08_b.py b/tests/adventofcode2020/test_day08_b.py
index 04c52103..91d5b8ff 100644
--- a/tests/adventofcode2020/test_day08_b.py
+++ b/tests/adventofcode2020/test_day08_b.py
@@ -1,6 +1,6 @@
 import pytest
 
-from adventofcode2020.solutions.day08 import Day08PartB
+from adventofcode2020.day08 import Day08PartB
 
 
 class TestDay08PartB:
diff --git a/tests/adventofcode2020/test_day09_a.py b/tests/adventofcode2020/test_day09_a.py
index 9a2ee855..d7b77659 100644
--- a/tests/adventofcode2020/test_day09_a.py
+++ b/tests/adventofcode2020/test_day09_a.py
@@ -1,6 +1,6 @@
 import pytest
 
-from adventofcode2020.solutions.day09 import Day09PartA
+from adventofcode2020.day09 import Day09PartA
 
 
 class TestDay09PartA:
diff --git a/tests/adventofcode2020/test_day09_b.py b/tests/adventofcode2020/test_day09_b.py
index ece1921c..d9af2b1e 100644
--- a/tests/adventofcode2020/test_day09_b.py
+++ b/tests/adventofcode2020/test_day09_b.py
@@ -1,4 +1,4 @@
-from adventofcode2020.solutions.day09 import Day09PartB
+from adventofcode2020.day09 import Day09PartB
 
 
 class TestDay09PartB:
diff --git a/tests/adventofcode2020/test_day10_a.py b/tests/adventofcode2020/test_day10_a.py
index 61911076..55faabfb 100644
--- a/tests/adventofcode2020/test_day10_a.py
+++ b/tests/adventofcode2020/test_day10_a.py
@@ -1,6 +1,6 @@
 import pytest
 
-from adventofcode2020.solutions.day10 import Day10PartA
+from adventofcode2020.day10 import Day10PartA
 
 
 class TestDay10PartA:
diff --git a/tests/adventofcode2020/test_day10_b.py b/tests/adventofcode2020/test_day10_b.py
index 887e590f..150db26c 100644
--- a/tests/adventofcode2020/test_day10_b.py
+++ b/tests/adventofcode2020/test_day10_b.py
@@ -1,6 +1,6 @@
 import pytest
 
-from adventofcode2020.solutions.day10 import Day10PartB
+from adventofcode2020.day10 import Day10PartB
 
 
 class TestDay10PartB:
diff --git a/tests/adventofcode2020/test_day11_a.py b/tests/adventofcode2020/test_day11_a.py
index 6c681914..5e09ae48 100644
--- a/tests/adventofcode2020/test_day11_a.py
+++ b/tests/adventofcode2020/test_day11_a.py
@@ -1,6 +1,6 @@
 import pytest
 
-from adventofcode2020.solutions.day11 import Day11PartA
+from adventofcode2020.day11 import Day11PartA
 
 
 class TestDay11PartA:
diff --git a/tests/adventofcode2020/test_day11_b.py b/tests/adventofcode2020/test_day11_b.py
index 10e270fe..1c55b345 100644
--- a/tests/adventofcode2020/test_day11_b.py
+++ b/tests/adventofcode2020/test_day11_b.py
@@ -1,6 +1,6 @@
 import pytest
 
-from adventofcode2020.solutions.day11 import Day11PartB
+from adventofcode2020.day11 import Day11PartB
 
 
 class TestDay11PartB:
diff --git a/tests/adventofcode2020/test_day12_a.py b/tests/adventofcode2020/test_day12_a.py
index 9d5fb02d..cf3febd3 100644
--- a/tests/adventofcode2020/test_day12_a.py
+++ b/tests/adventofcode2020/test_day12_a.py
@@ -1,6 +1,6 @@
 import pytest
 
-from adventofcode2020.solutions.day12 import Day12PartA, Direction
+from adventofcode2020.day12 import Day12PartA, Direction
 
 
 class TestDay12PartA:
diff --git a/tests/adventofcode2020/test_day12_b.py b/tests/adventofcode2020/test_day12_b.py
index 6f3bd2b3..e74bdb9c 100644
--- a/tests/adventofcode2020/test_day12_b.py
+++ b/tests/adventofcode2020/test_day12_b.py
@@ -1,6 +1,6 @@
 import pytest
 
-from adventofcode2020.solutions.day12 import Day12PartB
+from adventofcode2020.day12 import Day12PartB
 
 
 class TestDay12PartB:
diff --git a/tests/adventofcode2020/test_day13_a.py b/tests/adventofcode2020/test_day13_a.py
index daa5dc6f..70a981d2 100644
--- a/tests/adventofcode2020/test_day13_a.py
+++ b/tests/adventofcode2020/test_day13_a.py
@@ -1,6 +1,6 @@
 import pytest
 
-from adventofcode2020.solutions.day13 import Day13PartA
+from adventofcode2020.day13 import Day13PartA
 
 
 class TestDay13PartA:
diff --git a/tests/adventofcode2020/test_day13_b.py b/tests/adventofcode2020/test_day13_b.py
index a81e812e..39932af5 100644
--- a/tests/adventofcode2020/test_day13_b.py
+++ b/tests/adventofcode2020/test_day13_b.py
@@ -1,6 +1,6 @@
 import pytest
 
-from adventofcode2020.solutions.day13 import Day13PartB
+from adventofcode2020.day13 import Day13PartB
 
 
 class TestDay13PartB:
diff --git a/tests/adventofcode2020/test_day14_a.py b/tests/adventofcode2020/test_day14_a.py
index 4723a79a..d1323b26 100644
--- a/tests/adventofcode2020/test_day14_a.py
+++ b/tests/adventofcode2020/test_day14_a.py
@@ -1,6 +1,6 @@
 import pytest
 
-from adventofcode2020.solutions.day14 import Day14PartA
+from adventofcode2020.day14 import Day14PartA
 
 
 class TestDay14PartA:
diff --git a/tests/adventofcode2020/test_day14_b.py b/tests/adventofcode2020/test_day14_b.py
index 05c67b3b..c053834c 100644
--- a/tests/adventofcode2020/test_day14_b.py
+++ b/tests/adventofcode2020/test_day14_b.py
@@ -1,6 +1,6 @@
 import pytest
 
-from adventofcode2020.solutions.day14 import Day14PartB
+from adventofcode2020.day14 import Day14PartB
 
 
 class TestDay14PartB:
diff --git a/tests/adventofcode2020/test_day15_a.py b/tests/adventofcode2020/test_day15_a.py
index 89429432..978ac9c1 100644
--- a/tests/adventofcode2020/test_day15_a.py
+++ b/tests/adventofcode2020/test_day15_a.py
@@ -1,6 +1,6 @@
 import pytest
 
-from adventofcode2020.solutions.day15 import Day15PartA
+from adventofcode2020.day15 import Day15PartA
 
 
 class TestDay15PartA:
diff --git a/tests/adventofcode2020/test_day16_a.py b/tests/adventofcode2020/test_day16_a.py
index 7158c9c6..2c9f94e3 100644
--- a/tests/adventofcode2020/test_day16_a.py
+++ b/tests/adventofcode2020/test_day16_a.py
@@ -1,6 +1,6 @@
 import pytest
 
-from adventofcode2020.solutions.day16 import Day16PartA, Ticket
+from adventofcode2020.day16 import Day16PartA, Ticket
 
 
 class TestDay16PartA:
diff --git a/tests/adventofcode2020/test_day16_b.py b/tests/adventofcode2020/test_day16_b.py
index 68714b33..1589fa86 100644
--- a/tests/adventofcode2020/test_day16_b.py
+++ b/tests/adventofcode2020/test_day16_b.py
@@ -1,4 +1,4 @@
-from adventofcode2020.solutions.day16 import Day16PartB
+from adventofcode2020.day16 import Day16PartB
 
 
 class TestDay16PartB:
diff --git a/tests/adventofcode2021/test_day01_a.py b/tests/adventofcode2021/test_day01_a.py
index f501de43..ae8a844e 100644
--- a/tests/adventofcode2021/test_day01_a.py
+++ b/tests/adventofcode2021/test_day01_a.py
@@ -1,4 +1,4 @@
-from adventofcode2021.solutions.day01 import Day01PartA
+from adventofcode2021.day01 import Day01PartA
 
 
 class TestDay01PartA:
diff --git a/tests/adventofcode2021/test_day01_b.py b/tests/adventofcode2021/test_day01_b.py
index c5786eeb..4c3275fd 100644
--- a/tests/adventofcode2021/test_day01_b.py
+++ b/tests/adventofcode2021/test_day01_b.py
@@ -1,4 +1,4 @@
-from adventofcode2021.solutions.day01 import Day01PartB
+from adventofcode2021.day01 import Day01PartB
 
 
 class TestDay01PartB:
diff --git a/tests/adventofcode2021/test_day02_a.py b/tests/adventofcode2021/test_day02_a.py
index c47e670e..3b8382d1 100644
--- a/tests/adventofcode2021/test_day02_a.py
+++ b/tests/adventofcode2021/test_day02_a.py
@@ -1,6 +1,6 @@
 import pytest
 
-from adventofcode2021.solutions.day02 import Day02PartA
+from adventofcode2021.day02 import Day02PartA
 
 
 class TestDay02PartA:
diff --git a/tests/adventofcode2021/test_day02_b.py b/tests/adventofcode2021/test_day02_b.py
index 828bc56e..2453b704 100644
--- a/tests/adventofcode2021/test_day02_b.py
+++ b/tests/adventofcode2021/test_day02_b.py
@@ -1,6 +1,6 @@
 import pytest
 
-from adventofcode2021.solutions.day02 import Day02PartB
+from adventofcode2021.day02 import Day02PartB
 
 
 class TestDay02PartB:
diff --git a/tests/adventofcode2021/test_day03_a.py b/tests/adventofcode2021/test_day03_a.py
index 71d8489b..d2cc6a88 100644
--- a/tests/adventofcode2021/test_day03_a.py
+++ b/tests/adventofcode2021/test_day03_a.py
@@ -1,4 +1,4 @@
-from adventofcode2021.solutions.day03 import Day03PartA
+from adventofcode2021.day03 import Day03PartA
 
 
 class TestDay03PartA:
diff --git a/tests/adventofcode2021/test_day03_b.py b/tests/adventofcode2021/test_day03_b.py
index b0ae66ab..8e96f29f 100644
--- a/tests/adventofcode2021/test_day03_b.py
+++ b/tests/adventofcode2021/test_day03_b.py
@@ -1,4 +1,4 @@
-from adventofcode2021.solutions.day03 import Day03PartB
+from adventofcode2021.day03 import Day03PartB
 
 
 class TestDay03PartB:
diff --git a/tests/adventofcode2021/test_day04_a.py b/tests/adventofcode2021/test_day04_a.py
index e42d437f..f7fb06d3 100644
--- a/tests/adventofcode2021/test_day04_a.py
+++ b/tests/adventofcode2021/test_day04_a.py
@@ -1,4 +1,4 @@
-from adventofcode2021.solutions.day04 import Day04PartA
+from adventofcode2021.day04 import Day04PartA
 
 test_data = """7,4,9,5,11,17,23,2,0,14,21,24,10,16,13,6,15,25,12,22,18,20,8,19,3,26,1
 
diff --git a/tests/adventofcode2021/test_day04_b.py b/tests/adventofcode2021/test_day04_b.py
index afcf1178..4e4b93da 100644
--- a/tests/adventofcode2021/test_day04_b.py
+++ b/tests/adventofcode2021/test_day04_b.py
@@ -1,4 +1,4 @@
-from adventofcode2021.solutions.day04 import Day04PartB
+from adventofcode2021.day04 import Day04PartB
 from tests.adventofcode2021.test_day04_a import test_data
 
 
diff --git a/tests/adventofcode2021/test_day05_a.py b/tests/adventofcode2021/test_day05_a.py
index c0cc9224..8093588e 100644
--- a/tests/adventofcode2021/test_day05_a.py
+++ b/tests/adventofcode2021/test_day05_a.py
@@ -1,4 +1,4 @@
-from adventofcode2021.solutions.day05 import Day05PartA
+from adventofcode2021.day05 import Day05PartA
 
 
 class TestDay05PartA:
diff --git a/tests/adventofcode2021/test_day05_b.py b/tests/adventofcode2021/test_day05_b.py
index 9fc13579..16cb5efc 100644
--- a/tests/adventofcode2021/test_day05_b.py
+++ b/tests/adventofcode2021/test_day05_b.py
@@ -1,4 +1,4 @@
-from adventofcode2021.solutions.day05 import Day05PartB, Point
+from adventofcode2021.day05 import Day05PartB, Point
 
 
 class TestDay05PartB:
diff --git a/tests/adventofcode2021/test_day06_a.py b/tests/adventofcode2021/test_day06_a.py
index 3fd2c253..77e277db 100644
--- a/tests/adventofcode2021/test_day06_a.py
+++ b/tests/adventofcode2021/test_day06_a.py
@@ -1,4 +1,4 @@
-from adventofcode2021.solutions.day06 import Day06PartA
+from adventofcode2021.day06 import Day06PartA
 
 
 class TestDay06PartA:
diff --git a/tests/adventofcode2021/test_day06_b.py b/tests/adventofcode2021/test_day06_b.py
index b96adf84..d29c72a3 100644
--- a/tests/adventofcode2021/test_day06_b.py
+++ b/tests/adventofcode2021/test_day06_b.py
@@ -1,4 +1,4 @@
-from adventofcode2021.solutions.day06 import Day06PartB
+from adventofcode2021.day06 import Day06PartB
 
 
 class TestDay06PartB:
diff --git a/tests/adventofcode2021/test_day07_a.py b/tests/adventofcode2021/test_day07_a.py
index 43c2e991..7f65b965 100644
--- a/tests/adventofcode2021/test_day07_a.py
+++ b/tests/adventofcode2021/test_day07_a.py
@@ -1,6 +1,6 @@
 import pytest
 
-from adventofcode2021.solutions.day07 import Day07PartA
+from adventofcode2021.day07 import Day07PartA
 
 
 class TestDay07PartA:
diff --git a/tests/adventofcode2021/test_day07_b.py b/tests/adventofcode2021/test_day07_b.py
index 724cfca5..07eb4ad7 100644
--- a/tests/adventofcode2021/test_day07_b.py
+++ b/tests/adventofcode2021/test_day07_b.py
@@ -1,6 +1,6 @@
 import pytest
 
-from adventofcode2021.solutions.day07 import Day07PartB
+from adventofcode2021.day07 import Day07PartB
 
 
 class TestDay07PartB:
diff --git a/tests/adventofcode2021/test_day08_a.py b/tests/adventofcode2021/test_day08_a.py
index a8d1a7dc..c8c8d118 100644
--- a/tests/adventofcode2021/test_day08_a.py
+++ b/tests/adventofcode2021/test_day08_a.py
@@ -1,4 +1,4 @@
-from adventofcode2021.solutions.day08 import Day08PartA
+from adventofcode2021.day08 import Day08PartA
 
 
 class TestDay08PartA:
diff --git a/tests/adventofcode2021/test_day08_b.py b/tests/adventofcode2021/test_day08_b.py
index f1121c79..b3be5a1c 100644
--- a/tests/adventofcode2021/test_day08_b.py
+++ b/tests/adventofcode2021/test_day08_b.py
@@ -1,4 +1,4 @@
-from adventofcode2021.solutions.day08 import Day08PartB
+from adventofcode2021.day08 import Day08PartB
 
 
 class TestDay08PartB:
diff --git a/tests/adventofcode2021/test_day09_a.py b/tests/adventofcode2021/test_day09_a.py
index d7eea713..310ee4ba 100644
--- a/tests/adventofcode2021/test_day09_a.py
+++ b/tests/adventofcode2021/test_day09_a.py
@@ -1,4 +1,4 @@
-from adventofcode2021.solutions.day09 import Day09PartA
+from adventofcode2021.day09 import Day09PartA
 
 test_input = """\
 2199943210
diff --git a/tests/adventofcode2021/test_day09_b.py b/tests/adventofcode2021/test_day09_b.py
index 9cc9a637..2c191f56 100644
--- a/tests/adventofcode2021/test_day09_b.py
+++ b/tests/adventofcode2021/test_day09_b.py
@@ -1,4 +1,4 @@
-from adventofcode2021.solutions.day09 import Day09PartB
+from adventofcode2021.day09 import Day09PartB
 from tests.adventofcode2021.test_day09_a import test_input
 
 
diff --git a/tests/adventofcode2021/test_day10_a.py b/tests/adventofcode2021/test_day10_a.py
index 7d40f663..09ce3ea6 100644
--- a/tests/adventofcode2021/test_day10_a.py
+++ b/tests/adventofcode2021/test_day10_a.py
@@ -1,6 +1,6 @@
 import pytest
 
-from adventofcode2021.solutions.day10 import Day10PartA
+from adventofcode2021.day10 import Day10PartA
 
 test_data = """[({(<(())[]>[[{[]{<()<>>
 [(()[<>])]({[<{<<[]>>(
diff --git a/tests/adventofcode2021/test_day10_b.py b/tests/adventofcode2021/test_day10_b.py
index a5531a23..79b8d767 100644
--- a/tests/adventofcode2021/test_day10_b.py
+++ b/tests/adventofcode2021/test_day10_b.py
@@ -1,6 +1,6 @@
 import pytest
 
-from adventofcode2021.solutions.day10 import Day10PartB
+from adventofcode2021.day10 import Day10PartB
 from tests.adventofcode2021.test_day10_a import test_data
 
 
diff --git a/tests/adventofcode2021/test_day11_a.py b/tests/adventofcode2021/test_day11_a.py
index c1e52e11..61472b47 100644
--- a/tests/adventofcode2021/test_day11_a.py
+++ b/tests/adventofcode2021/test_day11_a.py
@@ -1,4 +1,4 @@
-from adventofcode2021.solutions.day11 import Day11PartA, Octopus
+from adventofcode2021.day11 import Day11PartA, Octopus
 
 
 class TestDay11PartA:
diff --git a/tests/adventofcode2021/test_day11_b.py b/tests/adventofcode2021/test_day11_b.py
index dab13b37..da27f2a5 100644
--- a/tests/adventofcode2021/test_day11_b.py
+++ b/tests/adventofcode2021/test_day11_b.py
@@ -1,4 +1,4 @@
-from adventofcode2021.solutions.day11 import Day11PartB
+from adventofcode2021.day11 import Day11PartB
 
 
 class TestDay11PartB:
diff --git a/tests/adventofcode2021/test_day12_a.py b/tests/adventofcode2021/test_day12_a.py
index 8af4a8dc..d9544084 100644
--- a/tests/adventofcode2021/test_day12_a.py
+++ b/tests/adventofcode2021/test_day12_a.py
@@ -1,6 +1,6 @@
 import pytest
 
-from adventofcode2021.solutions.day12 import Day12PartA
+from adventofcode2021.day12 import Day12PartA
 
 test_data_short = """start-A
 start-b
diff --git a/tests/adventofcode2021/test_day12_b.py b/tests/adventofcode2021/test_day12_b.py
index e4c4cadd..2fc96fb7 100644
--- a/tests/adventofcode2021/test_day12_b.py
+++ b/tests/adventofcode2021/test_day12_b.py
@@ -1,6 +1,6 @@
 import pytest
 
-from adventofcode2021.solutions.day12 import Day12PartB
+from adventofcode2021.day12 import Day12PartB
 from tests.adventofcode2021.test_day12_a import (
     test_data,
     test_data_longer,
diff --git a/tests/adventofcode2021/test_day13_a.py b/tests/adventofcode2021/test_day13_a.py
index 07191120..e392f98d 100644
--- a/tests/adventofcode2021/test_day13_a.py
+++ b/tests/adventofcode2021/test_day13_a.py
@@ -1,6 +1,6 @@
 import pytest
 
-from adventofcode2021.solutions.day13 import Day13PartA
+from adventofcode2021.day13 import Day13PartA
 
 test_small_data = """0,0
 1,1
diff --git a/tests/adventofcode2021/test_day13_b.py b/tests/adventofcode2021/test_day13_b.py
index 2e5e963a..7eef6d87 100644
--- a/tests/adventofcode2021/test_day13_b.py
+++ b/tests/adventofcode2021/test_day13_b.py
@@ -1,6 +1,6 @@
 from textwrap import dedent
 
-from adventofcode2021.solutions.day13 import Day13PartB
+from adventofcode2021.day13 import Day13PartB
 
 
 class TestDay13PartB:
diff --git a/tests/adventofcode2021/test_day14_a.py b/tests/adventofcode2021/test_day14_a.py
index 3ab70ccc..69d5f8ef 100644
--- a/tests/adventofcode2021/test_day14_a.py
+++ b/tests/adventofcode2021/test_day14_a.py
@@ -1,4 +1,4 @@
-from adventofcode2021.solutions.day14 import Day14PartA
+from adventofcode2021.day14 import Day14PartA
 
 
 class TestDay14PartA:
diff --git a/tests/adventofcode2021/test_day14_b.py b/tests/adventofcode2021/test_day14_b.py
index 18ccdbd6..34b58bfc 100644
--- a/tests/adventofcode2021/test_day14_b.py
+++ b/tests/adventofcode2021/test_day14_b.py
@@ -1,4 +1,4 @@
-from adventofcode2021.solutions.day14 import Day14PartB
+from adventofcode2021.day14 import Day14PartB
 
 
 class TestDay14PartB:
diff --git a/tests/adventofcode2021/test_day15_a.py b/tests/adventofcode2021/test_day15_a.py
index 35e9423a..5cbc8039 100644
--- a/tests/adventofcode2021/test_day15_a.py
+++ b/tests/adventofcode2021/test_day15_a.py
@@ -1,6 +1,6 @@
 import pytest
 
-from adventofcode2021.solutions.day15 import Day15PartA
+from adventofcode2021.day15 import Day15PartA
 
 test_data = """\
 1163751742
diff --git a/tests/adventofcode2021/test_day15_b.py b/tests/adventofcode2021/test_day15_b.py
index 5bac46f4..b02352b1 100644
--- a/tests/adventofcode2021/test_day15_b.py
+++ b/tests/adventofcode2021/test_day15_b.py
@@ -1,6 +1,6 @@
 import pytest
 
-from adventofcode2021.solutions.day15 import Day15PartB
+from adventofcode2021.day15 import Day15PartB
 from tests.adventofcode2021.test_day15_a import test_data
 
 
diff --git a/tests/adventofcode2021/test_day16_a.py b/tests/adventofcode2021/test_day16_a.py
index ed7a4e2c..18e7fe1a 100644
--- a/tests/adventofcode2021/test_day16_a.py
+++ b/tests/adventofcode2021/test_day16_a.py
@@ -1,6 +1,6 @@
 import pytest
 
-from adventofcode2021.solutions.day16 import Day16PartA, Packet
+from adventofcode2021.day16 import Day16PartA, Packet
 
 
 class TestDay16PartA:
diff --git a/tests/adventofcode2021/test_day16_b.py b/tests/adventofcode2021/test_day16_b.py
index 820c8874..f299bdee 100644
--- a/tests/adventofcode2021/test_day16_b.py
+++ b/tests/adventofcode2021/test_day16_b.py
@@ -1,6 +1,6 @@
 import pytest
 
-from adventofcode2021.solutions.day16 import Day16PartB
+from adventofcode2021.day16 import Day16PartB
 
 
 class TestDay16PartB:
diff --git a/tests/adventofcode2021/test_day17_a.py b/tests/adventofcode2021/test_day17_a.py
index c48cd478..58495ed4 100644
--- a/tests/adventofcode2021/test_day17_a.py
+++ b/tests/adventofcode2021/test_day17_a.py
@@ -1,6 +1,6 @@
 import pytest
 
-from adventofcode2021.solutions.day17 import Day17PartA, Point, TargetArea
+from adventofcode2021.day17 import Day17PartA, Point, TargetArea
 
 
 class TestDay17PartA:
diff --git a/tests/adventofcode2021/test_day17_b.py b/tests/adventofcode2021/test_day17_b.py
index 7715110b..d0930b3a 100644
--- a/tests/adventofcode2021/test_day17_b.py
+++ b/tests/adventofcode2021/test_day17_b.py
@@ -1,6 +1,6 @@
 import pytest
 
-from adventofcode2021.solutions.day17 import Day17PartB
+from adventofcode2021.day17 import Day17PartB
 
 
 class TestDay17PartB:
diff --git a/tests/adventofcode2021/test_day18_a.py b/tests/adventofcode2021/test_day18_a.py
index 642c699e..782ab4c6 100644
--- a/tests/adventofcode2021/test_day18_a.py
+++ b/tests/adventofcode2021/test_day18_a.py
@@ -2,7 +2,7 @@
 
 import pytest
 
-from adventofcode2021.solutions.day18 import Day18PartA, Snail
+from adventofcode2021.day18 import Day18PartA, Snail
 
 
 class TestDay18PartA:
diff --git a/tests/adventofcode2021/test_day18_b.py b/tests/adventofcode2021/test_day18_b.py
index 5dedb551..518f1306 100644
--- a/tests/adventofcode2021/test_day18_b.py
+++ b/tests/adventofcode2021/test_day18_b.py
@@ -1,6 +1,6 @@
 from textwrap import dedent
 
-from adventofcode2021.solutions.day18 import Day18PartB
+from adventofcode2021.day18 import Day18PartB
 
 
 class TestDay18PartB:
diff --git a/tests/adventofcode2021/test_day19_a.py b/tests/adventofcode2021/test_day19_a.py
index 7896159b..4b7f8ceb 100644
--- a/tests/adventofcode2021/test_day19_a.py
+++ b/tests/adventofcode2021/test_day19_a.py
@@ -1,4 +1,4 @@
-from adventofcode2021.solutions.day19 import Day19PartA
+from adventofcode2021.day19 import Day19PartA
 
 
 class TestDay19PartA:
diff --git a/tests/adventofcode2021/test_day19_b.py b/tests/adventofcode2021/test_day19_b.py
index 791792b1..d50e575f 100644
--- a/tests/adventofcode2021/test_day19_b.py
+++ b/tests/adventofcode2021/test_day19_b.py
@@ -1,4 +1,4 @@
-from adventofcode2021.solutions.day19 import Day19PartB
+from adventofcode2021.day19 import Day19PartB
 
 
 class TestDay19PartB:
diff --git a/tests/adventofcode2021/test_day20_a.py b/tests/adventofcode2021/test_day20_a.py
index af1cb254..a560509e 100644
--- a/tests/adventofcode2021/test_day20_a.py
+++ b/tests/adventofcode2021/test_day20_a.py
@@ -1,6 +1,6 @@
 from adventofcodeutils.point import XYPoint as Point
 
-from adventofcode2021.solutions.day20 import Day20PartA
+from adventofcode2021.day20 import Day20PartA
 
 
 class TestDay20PartA:
diff --git a/tests/adventofcode2021/test_day20_b.py b/tests/adventofcode2021/test_day20_b.py
index 91d4c6e1..18136dd0 100644
--- a/tests/adventofcode2021/test_day20_b.py
+++ b/tests/adventofcode2021/test_day20_b.py
@@ -1,4 +1,4 @@
-from adventofcode2021.solutions.day20 import Day20PartB
+from adventofcode2021.day20 import Day20PartB
 
 
 class TestDay20PartB:
diff --git a/tests/adventofcode2021/test_day21_a.py b/tests/adventofcode2021/test_day21_a.py
index f163e561..ee679426 100644
--- a/tests/adventofcode2021/test_day21_a.py
+++ b/tests/adventofcode2021/test_day21_a.py
@@ -1,6 +1,6 @@
 import pytest
 
-from adventofcode2021.solutions.day21 import Day21PartA
+from adventofcode2021.day21 import Day21PartA
 
 
 class TestDay21PartA:
diff --git a/tests/adventofcode2021/test_day21_b.py b/tests/adventofcode2021/test_day21_b.py
index 53c9d1e2..9eb7c611 100644
--- a/tests/adventofcode2021/test_day21_b.py
+++ b/tests/adventofcode2021/test_day21_b.py
@@ -1,4 +1,4 @@
-from adventofcode2021.solutions.day21 import Day21PartB
+from adventofcode2021.day21 import Day21PartB
 
 
 class TestDay21PartA:
diff --git a/tests/adventofcode2021/test_day22_a.py b/tests/adventofcode2021/test_day22_a.py
index 4169e4d0..453d1d23 100644
--- a/tests/adventofcode2021/test_day22_a.py
+++ b/tests/adventofcode2021/test_day22_a.py
@@ -1,6 +1,6 @@
 from textwrap import dedent
 
-from adventofcode2021.solutions.day22 import Day22PartA, Step
+from adventofcode2021.day22 import Day22PartA, Step
 
 
 class TestDay22PartA:
diff --git a/tests/adventofcode2021/test_day22_b.py b/tests/adventofcode2021/test_day22_b.py
index 29921d7a..0013e19a 100644
--- a/tests/adventofcode2021/test_day22_b.py
+++ b/tests/adventofcode2021/test_day22_b.py
@@ -2,7 +2,7 @@
 
 import pytest
 
-from adventofcode2021.solutions.day22 import Day22PartB
+from adventofcode2021.day22 import Day22PartB
 
 
 class TestDay22PartB:
diff --git a/tests/adventofcode2022/test_day01_a.py b/tests/adventofcode2022/test_day01_a.py
index 0ea27a7d..3145d059 100644
--- a/tests/adventofcode2022/test_day01_a.py
+++ b/tests/adventofcode2022/test_day01_a.py
@@ -1,4 +1,4 @@
-from adventofcode2022.solutions.day01 import Day01PartA
+from adventofcode2022.day01 import Day01PartA
 
 
 class TestDay01PartA:
diff --git a/tests/adventofcode2022/test_day01_b.py b/tests/adventofcode2022/test_day01_b.py
index 94c7a656..7cf46314 100644
--- a/tests/adventofcode2022/test_day01_b.py
+++ b/tests/adventofcode2022/test_day01_b.py
@@ -1,4 +1,4 @@
-from adventofcode2022.solutions.day01 import Day01PartB
+from adventofcode2022.day01 import Day01PartB
 
 
 class TestDay01PartB:
diff --git a/tests/adventofcode2022/test_day02_a.py b/tests/adventofcode2022/test_day02_a.py
index e14e06ab..ed830be0 100644
--- a/tests/adventofcode2022/test_day02_a.py
+++ b/tests/adventofcode2022/test_day02_a.py
@@ -1,4 +1,4 @@
-from adventofcode2022.solutions.day02 import Day02PartA
+from adventofcode2022.day02 import Day02PartA
 
 
 class TestDay02PartA:
diff --git a/tests/adventofcode2022/test_day02_b.py b/tests/adventofcode2022/test_day02_b.py
index 0803cda6..f1b10a1a 100644
--- a/tests/adventofcode2022/test_day02_b.py
+++ b/tests/adventofcode2022/test_day02_b.py
@@ -1,4 +1,4 @@
-from adventofcode2022.solutions.day02 import Day02PartB
+from adventofcode2022.day02 import Day02PartB
 
 
 class TestDay02PartB:
diff --git a/tests/adventofcode2022/test_day03_a.py b/tests/adventofcode2022/test_day03_a.py
index 2cd358f0..270a78df 100644
--- a/tests/adventofcode2022/test_day03_a.py
+++ b/tests/adventofcode2022/test_day03_a.py
@@ -2,7 +2,7 @@
 
 import pytest
 
-from adventofcode2022.solutions.day03 import Day03PartA
+from adventofcode2022.day03 import Day03PartA
 
 
 class TestDay03PartA:
diff --git a/tests/adventofcode2022/test_day03_b.py b/tests/adventofcode2022/test_day03_b.py
index bab2df8b..326ee914 100644
--- a/tests/adventofcode2022/test_day03_b.py
+++ b/tests/adventofcode2022/test_day03_b.py
@@ -1,6 +1,6 @@
 from textwrap import dedent
 
-from adventofcode2022.solutions.day03 import Day03PartB
+from adventofcode2022.day03 import Day03PartB
 
 
 class TestDay03PartB:
diff --git a/tests/adventofcode2022/test_day04_a.py b/tests/adventofcode2022/test_day04_a.py
index d30b898c..eebb69c2 100644
--- a/tests/adventofcode2022/test_day04_a.py
+++ b/tests/adventofcode2022/test_day04_a.py
@@ -1,6 +1,6 @@
 from textwrap import dedent
 
-from adventofcode2022.solutions.day04 import Day04PartA
+from adventofcode2022.day04 import Day04PartA
 
 
 class TestDay04PartA:
diff --git a/tests/adventofcode2022/test_day04_b.py b/tests/adventofcode2022/test_day04_b.py
index 8bd7b95c..29031f17 100644
--- a/tests/adventofcode2022/test_day04_b.py
+++ b/tests/adventofcode2022/test_day04_b.py
@@ -1,6 +1,6 @@
 from textwrap import dedent
 
-from adventofcode2022.solutions.day04 import Day04PartB
+from adventofcode2022.day04 import Day04PartB
 
 
 class TestDay04PartB:
diff --git a/tests/adventofcode2022/test_day05_a.py b/tests/adventofcode2022/test_day05_a.py
index c21da224..cc916acb 100644
--- a/tests/adventofcode2022/test_day05_a.py
+++ b/tests/adventofcode2022/test_day05_a.py
@@ -1,15 +1,15 @@
 from textwrap import dedent
 
-from adventofcode2022.solutions.day05 import Day05PartA
+from adventofcode2022.day05 import Day05PartA
 
 
 class TestDay05PartA:
     def test_day05a_solve(self):
         test_data = """\
-            [D]    
-        [N] [C]    
+            [D]
+        [N] [C]
         [Z] [M] [P]
-         1   2   3 
+         1   2   3
 
         move 1 from 2 to 1
         move 3 from 1 to 3
diff --git a/tests/adventofcode2022/test_day05_b.py b/tests/adventofcode2022/test_day05_b.py
index 1bfd630c..4f109998 100644
--- a/tests/adventofcode2022/test_day05_b.py
+++ b/tests/adventofcode2022/test_day05_b.py
@@ -1,15 +1,15 @@
 from textwrap import dedent
 
-from adventofcode2022.solutions.day05 import Day05PartB
+from adventofcode2022.day05 import Day05PartB
 
 
 class TestDay05PartB:
     def test_day05b_solve(self):
         test_data = """\
-            [D]    
-        [N] [C]    
+            [D]
+        [N] [C]
         [Z] [M] [P]
-         1   2   3 
+         1   2   3
 
         move 1 from 2 to 1
         move 3 from 1 to 3
diff --git a/tests/adventofcode2022/test_day06_a.py b/tests/adventofcode2022/test_day06_a.py
index 69edcdd8..8371e219 100644
--- a/tests/adventofcode2022/test_day06_a.py
+++ b/tests/adventofcode2022/test_day06_a.py
@@ -1,6 +1,6 @@
 import pytest
 
-from adventofcode2022.solutions.day06 import Day06PartA
+from adventofcode2022.day06 import Day06PartA
 
 
 class TestDay06PartA:
diff --git a/tests/adventofcode2022/test_day06_b.py b/tests/adventofcode2022/test_day06_b.py
index 55b47929..698e68f9 100644
--- a/tests/adventofcode2022/test_day06_b.py
+++ b/tests/adventofcode2022/test_day06_b.py
@@ -1,6 +1,6 @@
 import pytest
 
-from adventofcode2022.solutions.day06 import Day06PartB
+from adventofcode2022.day06 import Day06PartB
 
 
 class TestDay06PartB:
diff --git a/tests/adventofcode2022/test_day07_a.py b/tests/adventofcode2022/test_day07_a.py
index 68f449f1..8db91856 100644
--- a/tests/adventofcode2022/test_day07_a.py
+++ b/tests/adventofcode2022/test_day07_a.py
@@ -1,6 +1,6 @@
 from textwrap import dedent
 
-from adventofcode2022.solutions.day07 import Day07PartA
+from adventofcode2022.day07 import Day07PartA
 
 
 class TestDay07PartA:
diff --git a/tests/adventofcode2022/test_day07_b.py b/tests/adventofcode2022/test_day07_b.py
index 06ee0e3c..e68023c7 100644
--- a/tests/adventofcode2022/test_day07_b.py
+++ b/tests/adventofcode2022/test_day07_b.py
@@ -1,6 +1,6 @@
 from textwrap import dedent
 
-from adventofcode2022.solutions.day07 import Day07PartB
+from adventofcode2022.day07 import Day07PartB
 
 
 class TestDay07PartB:
diff --git a/tests/adventofcode2022/test_day08_a.py b/tests/adventofcode2022/test_day08_a.py
index b2ca29f5..0a9a4118 100644
--- a/tests/adventofcode2022/test_day08_a.py
+++ b/tests/adventofcode2022/test_day08_a.py
@@ -3,7 +3,7 @@
 import pytest
 from adventofcodeutils.point import XYPoint as Point
 
-from adventofcode2022.solutions.day08 import Day08PartA
+from adventofcode2022.day08 import Day08PartA
 
 
 class TestDay08PartA:
diff --git a/tests/adventofcode2022/test_day08_b.py b/tests/adventofcode2022/test_day08_b.py
index 3a626790..ca4f732e 100644
--- a/tests/adventofcode2022/test_day08_b.py
+++ b/tests/adventofcode2022/test_day08_b.py
@@ -2,7 +2,7 @@
 
 from adventofcodeutils.point import XYPoint as Point
 
-from adventofcode2022.solutions.day08 import Day08PartB
+from adventofcode2022.day08 import Day08PartB
 
 
 class TestDay08PartB:
diff --git a/tests/adventofcode2022/test_day09_a.py b/tests/adventofcode2022/test_day09_a.py
index e30207e0..ec2cb9fb 100644
--- a/tests/adventofcode2022/test_day09_a.py
+++ b/tests/adventofcode2022/test_day09_a.py
@@ -1,6 +1,6 @@
 from textwrap import dedent
 
-from adventofcode2022.solutions.day09 import Day09PartA
+from adventofcode2022.day09 import Day09PartA
 
 
 class TestDay09PartA:
diff --git a/tests/adventofcode2022/test_day09_b.py b/tests/adventofcode2022/test_day09_b.py
index d738ef76..5afca1d3 100644
--- a/tests/adventofcode2022/test_day09_b.py
+++ b/tests/adventofcode2022/test_day09_b.py
@@ -1,6 +1,6 @@
 from textwrap import dedent
 
-from adventofcode2022.solutions.day09 import Day09PartB
+from adventofcode2022.day09 import Day09PartB
 
 
 class TestDay09PartB:
diff --git a/tests/adventofcode2022/test_day10_a.py b/tests/adventofcode2022/test_day10_a.py
index f4b3bddc..c395be00 100644
--- a/tests/adventofcode2022/test_day10_a.py
+++ b/tests/adventofcode2022/test_day10_a.py
@@ -1,4 +1,4 @@
-from adventofcode2022.solutions.day10 import CPU, Day10PartA
+from adventofcode2022.day10 import CPU, Day10PartA
 
 
 class TestDay10PartA:
diff --git a/tests/adventofcode2022/test_day10_b.py b/tests/adventofcode2022/test_day10_b.py
index d4ea6630..aa98cf0d 100644
--- a/tests/adventofcode2022/test_day10_b.py
+++ b/tests/adventofcode2022/test_day10_b.py
@@ -1,6 +1,6 @@
 from textwrap import dedent
 
-from adventofcode2022.solutions.day10 import Day10PartB
+from adventofcode2022.day10 import Day10PartB
 
 
 class TestDay10PartB:
diff --git a/tests/adventofcode2022/test_day11_a.py b/tests/adventofcode2022/test_day11_a.py
index ec98813b..8cacd849 100644
--- a/tests/adventofcode2022/test_day11_a.py
+++ b/tests/adventofcode2022/test_day11_a.py
@@ -1,6 +1,6 @@
 from textwrap import dedent
 
-from adventofcode2022.solutions.day11 import Day11PartA, Monkey
+from adventofcode2022.day11 import Day11PartA, Monkey
 
 
 class TestDay11PartA:
diff --git a/tests/adventofcode2022/test_day11_b.py b/tests/adventofcode2022/test_day11_b.py
index e2de2719..0a2e0cff 100644
--- a/tests/adventofcode2022/test_day11_b.py
+++ b/tests/adventofcode2022/test_day11_b.py
@@ -1,4 +1,4 @@
-from adventofcode2022.solutions.day11 import Day11PartB
+from adventofcode2022.day11 import Day11PartB
 
 
 class TestDay11PartB:
diff --git a/tests/adventofcode2022/test_day12_a.py b/tests/adventofcode2022/test_day12_a.py
index 5ef39aae..7482c98f 100644
--- a/tests/adventofcode2022/test_day12_a.py
+++ b/tests/adventofcode2022/test_day12_a.py
@@ -1,4 +1,4 @@
-from adventofcode2022.solutions.day12 import Day12PartA
+from adventofcode2022.day12 import Day12PartA
 
 
 class TestDay12PartA:
diff --git a/tests/adventofcode2022/test_day12_b.py b/tests/adventofcode2022/test_day12_b.py
index 56a09af4..9a933250 100644
--- a/tests/adventofcode2022/test_day12_b.py
+++ b/tests/adventofcode2022/test_day12_b.py
@@ -1,4 +1,4 @@
-from adventofcode2022.solutions.day12 import Day12PartB
+from adventofcode2022.day12 import Day12PartB
 
 
 class TestDay12PartB:
diff --git a/tests/adventofcode2022/test_day13_a.py b/tests/adventofcode2022/test_day13_a.py
index f766f7c0..5136dbaa 100644
--- a/tests/adventofcode2022/test_day13_a.py
+++ b/tests/adventofcode2022/test_day13_a.py
@@ -1,6 +1,6 @@
 import pytest
 
-from adventofcode2022.solutions.day13 import Day13PartA
+from adventofcode2022.day13 import Day13PartA
 
 
 class TestDay13PartA:
diff --git a/tests/adventofcode2022/test_day13_b.py b/tests/adventofcode2022/test_day13_b.py
index e47be3e3..ca22b2fb 100644
--- a/tests/adventofcode2022/test_day13_b.py
+++ b/tests/adventofcode2022/test_day13_b.py
@@ -1,4 +1,4 @@
-from adventofcode2022.solutions.day13 import Day13PartB
+from adventofcode2022.day13 import Day13PartB
 
 
 class TestDay13PartB:
diff --git a/tests/adventofcode2022/test_day14_a.py b/tests/adventofcode2022/test_day14_a.py
index c45220b0..8f54b14e 100644
--- a/tests/adventofcode2022/test_day14_a.py
+++ b/tests/adventofcode2022/test_day14_a.py
@@ -1,4 +1,4 @@
-from adventofcode2022.solutions.day14 import Day14PartA
+from adventofcode2022.day14 import Day14PartA
 
 
 class TestDay14PartA:
diff --git a/tests/adventofcode2022/test_day14_b.py b/tests/adventofcode2022/test_day14_b.py
index d3627f0b..b40b586e 100644
--- a/tests/adventofcode2022/test_day14_b.py
+++ b/tests/adventofcode2022/test_day14_b.py
@@ -1,4 +1,4 @@
-from adventofcode2022.solutions.day14 import Day14PartB
+from adventofcode2022.day14 import Day14PartB
 
 
 class TestDay14PartB:
diff --git a/tests/adventofcode2022/test_day15_a.py b/tests/adventofcode2022/test_day15_a.py
index 3787e995..6559231d 100644
--- a/tests/adventofcode2022/test_day15_a.py
+++ b/tests/adventofcode2022/test_day15_a.py
@@ -1,4 +1,4 @@
-from adventofcode2022.solutions.day15 import Day15PartA
+from adventofcode2022.day15 import Day15PartA
 
 
 class TestDay15PartA:
diff --git a/tests/adventofcode2022/test_day15_b.py b/tests/adventofcode2022/test_day15_b.py
index a1a84179..b90e8ab4 100644
--- a/tests/adventofcode2022/test_day15_b.py
+++ b/tests/adventofcode2022/test_day15_b.py
@@ -1,6 +1,6 @@
 import pytest
 
-from adventofcode2022.solutions.day15 import Day15PartB
+from adventofcode2022.day15 import Day15PartB
 
 
 class TestDay15PartB:
diff --git a/tests/adventofcode2022/test_day22_a.py b/tests/adventofcode2022/test_day22_a.py
new file mode 100644
index 00000000..ce69eff9
--- /dev/null
+++ b/tests/adventofcode2022/test_day22_a.py
@@ -0,0 +1,19 @@
+import pytest
+
+from adventofcode2022.day22 import Day22PartA
+
+
+class TestDay22PartA:
+    @pytest.mark.xfail(reason="Not yet implemented", raises=NotImplementedError)
+    @pytest.mark.parametrize(("input_data", "expected_result"), [("", ""), ("", "")])
+    def test_day22a_solve(self, input_data, expected_result):
+        solution = Day22PartA()
+        result = solution.solve(input_data)
+        assert result == expected_result
+
+    @pytest.mark.xfail(reason="Not yet implemented", raises=NotImplementedError)
+    def test_day22a_data(self):
+        """Result we got when we did the real solution"""
+        solution = Day22PartA()
+        res = solution("day_22/day22.txt")
+        assert res == 0
diff --git a/tests/adventofcode2022/test_day22_b.py b/tests/adventofcode2022/test_day22_b.py
new file mode 100644
index 00000000..34f0cbb4
--- /dev/null
+++ b/tests/adventofcode2022/test_day22_b.py
@@ -0,0 +1,19 @@
+import pytest
+
+from adventofcode2022.day22 import Day22PartB
+
+
+class TestDay22PartB:
+    @pytest.mark.xfail(reason="Not yet implemented", raises=NotImplementedError)
+    @pytest.mark.parametrize(("input_data", "expected_result"), [("", ""), ("", "")])
+    def test_day22b_solve(self, input_data, expected_result):
+        solution = Day22PartB()
+        result = solution.solve(input_data)
+        assert result == expected_result
+
+    @pytest.mark.xfail(reason="Not yet implemented", raises=NotImplementedError)
+    def test_day22b_data(self):
+        """Result we got when we did the real solution"""
+        solution = Day22PartB()
+        res = solution("day_22/day22.txt")
+        assert res == 0
diff --git a/tests/conftest.py b/tests/conftest.py
index 558d36c4..5490b49a 100644
--- a/tests/conftest.py
+++ b/tests/conftest.py
@@ -10,7 +10,6 @@ def read_file(year: int, day: int, filename: str) -> str:
         pathlib.Path(__file__).parent.parent
         / "src"
         / f"adventofcode{year}"
-        / "solutions"
         / "data"
         / f"day_{day:02}"
         / filename

From fb4f8a07db0512ee4b2109cb0bebaa4fd37c1c0e Mon Sep 17 00:00:00 2001
From: Roel Adriaans <roel.adriaans@asml.com>
Date: Tue, 28 Nov 2023 15:46:05 +0100
Subject: [PATCH 328/371] Strip some newlines

---
 src/adventofcode2019/day08.py          | 4 ++--
 src/adventofcode2019/day16.py          | 4 ++--
 src/adventofcode2019/infi.py           | 2 +-
 tests/adventofcode2022/test_day05_a.py | 8 +++++---
 4 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/src/adventofcode2019/day08.py b/src/adventofcode2019/day08.py
index f3a69c01..fb19f82c 100644
--- a/src/adventofcode2019/day08.py
+++ b/src/adventofcode2019/day08.py
@@ -57,7 +57,7 @@ def printable_image(self, image_data: list[int]):
 
 class Day08PartA(Day08, FileReaderSolution):
     def solve(self, input_data: str) -> int:
-        self.load_image(input_data, width=25, height=6)
+        self.load_image(input_data.strip(), width=25, height=6)
         # Find layer with the fewest 0 digits:
         layer = self.layer_with_fewest_digit(0)
         number_ones = self.count_number_per_frame(1, layer)
@@ -67,7 +67,7 @@ def solve(self, input_data: str) -> int:
 
 class Day08PartB(Day08, FileReaderSolution):
     def solve(self, input_data: str) -> str:
-        self.load_image(input_data, width=25, height=6)
+        self.load_image(input_data.strip(), width=25, height=6)
         image = self.get_computed_image()
         printable = self.printable_image(image)
         result = printable.replace("0", " ").replace("1", "■")
diff --git a/src/adventofcode2019/day16.py b/src/adventofcode2019/day16.py
index 65dd5636..6d045465 100644
--- a/src/adventofcode2019/day16.py
+++ b/src/adventofcode2019/day16.py
@@ -39,7 +39,7 @@ def run_phases(self, input_signal: list[int], num_phases) -> list[int]:
 
 class Day16PartA(Day16, FileReaderSolution):
     def solve(self, input_data: str) -> int:
-        input_signal = string_of_single_to_list_of_ints(input_data)
+        input_signal = string_of_single_to_list_of_ints(input_data.strip())
         result = self.run_phases(input_signal, 100)
 
         # Convert list of ints to single integer and take only the first 8
@@ -48,7 +48,7 @@ def solve(self, input_data: str) -> int:
 
 class Day16PartB(Day16, FileReaderSolution):
     def solve(self, input_data: str) -> int:
-        signal_str = input_data * 10_000
+        signal_str = input_data.strip() * 10_000
         offset = int(signal_str[0:7])
 
         signal_str = signal_str[offset:]
diff --git a/src/adventofcode2019/infi.py b/src/adventofcode2019/infi.py
index 762ee403..e1ce02e6 100644
--- a/src/adventofcode2019/infi.py
+++ b/src/adventofcode2019/infi.py
@@ -34,7 +34,7 @@ def __init__(self, filename: str = "info.json"):
 
     def _load_data(self):
         """Open the file and parse the json data inside the file"""
-        root_dir = Path(__file__).parent.parent
+        root_dir = Path(__file__).parent
 
         with open(root_dir / "data" / "infi" / self.filename) as f:
             data = json.load(f)
diff --git a/tests/adventofcode2022/test_day05_a.py b/tests/adventofcode2022/test_day05_a.py
index cc916acb..b906545b 100644
--- a/tests/adventofcode2022/test_day05_a.py
+++ b/tests/adventofcode2022/test_day05_a.py
@@ -6,8 +6,8 @@
 class TestDay05PartA:
     def test_day05a_solve(self):
         test_data = """\
-            [D]
-        [N] [C]
+            [D]....
+        [N] [C]....
         [Z] [M] [P]
          1   2   3
 
@@ -15,7 +15,9 @@ def test_day05a_solve(self):
         move 3 from 1 to 3
         move 2 from 2 to 1
         move 1 from 1 to 2
-        """  # noqa
+        """.replace(
+            ".", " "
+        )  # noqa
         solution = Day05PartA()
         result = solution.solve(dedent(test_data))
         assert result == "CMZ"

From 2fcd148010a6ea9e94abb441c8fa7665d2fe93ac Mon Sep 17 00:00:00 2001
From: Roel Adriaans <roel@adriaans.org>
Date: Tue, 28 Nov 2023 19:48:00 +0100
Subject: [PATCH 329/371] Fix last test

---
 tests/adventofcode2022/test_day05_b.py | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/tests/adventofcode2022/test_day05_b.py b/tests/adventofcode2022/test_day05_b.py
index 4f109998..6e3c02e2 100644
--- a/tests/adventofcode2022/test_day05_b.py
+++ b/tests/adventofcode2022/test_day05_b.py
@@ -6,8 +6,8 @@
 class TestDay05PartB:
     def test_day05b_solve(self):
         test_data = """\
-            [D]
-        [N] [C]
+            [D]....
+        [N] [C]....
         [Z] [M] [P]
          1   2   3
 
@@ -15,7 +15,9 @@ def test_day05b_solve(self):
         move 3 from 1 to 3
         move 2 from 2 to 1
         move 1 from 1 to 2
-        """  # noqa
+        """.replace(
+            ".", " "
+        )  # noqa
         solution = Day05PartB()
         result = solution.solve(dedent(test_data))
         assert result == "MCD"

From bd92236695832a49eea078397f4af29dd912cf71 Mon Sep 17 00:00:00 2001
From: Roel Adriaans <roel@adriaans.org>
Date: Tue, 28 Nov 2023 21:13:21 +0100
Subject: [PATCH 330/371] Fix template for tests after solution switch, add
 test case for testdata

---
 .../test_{{cookiecutter.file_name}}_a.py                  | 8 +++++++-
 .../test_{{cookiecutter.file_name}}_b.py                  | 8 +++++++-
 2 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/template/{{cookiecutter.adventofcode}}/tests/adventofcode{{cookiecutter.year}}/test_{{cookiecutter.file_name}}_a.py b/template/{{cookiecutter.adventofcode}}/tests/adventofcode{{cookiecutter.year}}/test_{{cookiecutter.file_name}}_a.py
index 515a3891..b2ab10ce 100644
--- a/template/{{cookiecutter.adventofcode}}/tests/adventofcode{{cookiecutter.year}}/test_{{cookiecutter.file_name}}_a.py
+++ b/template/{{cookiecutter.adventofcode}}/tests/adventofcode{{cookiecutter.year}}/test_{{cookiecutter.file_name}}_a.py
@@ -1,9 +1,15 @@
 import pytest
 
-from adventofcode{{cookiecutter.year}}.solutions.{{cookiecutter.file_name}} import {{cookiecutter.class_name}}PartA
+from adventofcode{{cookiecutter.year}}.{{cookiecutter.file_name}} import {{cookiecutter.class_name}}PartA
 
 
 class Test{{cookiecutter.class_name}}PartA:
+    @pytest.mark.xfail(reason="Not yet implemented", raises=NotImplementedError)
+    def test_{{cookiecutter.file_name}}a_solve(self, testdata):
+        solution = {{cookiecutter.class_name}}PartA()
+        result = solution.solve(testdata)
+        assert result == 0
+
     @pytest.mark.xfail(reason="Not yet implemented", raises=NotImplementedError)
     @pytest.mark.parametrize(("input_data", "expected_result"), [("", ""), ("", "")])
     def test_{{cookiecutter.file_name}}a_solve(self, input_data, expected_result):
diff --git a/template/{{cookiecutter.adventofcode}}/tests/adventofcode{{cookiecutter.year}}/test_{{cookiecutter.file_name}}_b.py b/template/{{cookiecutter.adventofcode}}/tests/adventofcode{{cookiecutter.year}}/test_{{cookiecutter.file_name}}_b.py
index cba644f0..62fda823 100644
--- a/template/{{cookiecutter.adventofcode}}/tests/adventofcode{{cookiecutter.year}}/test_{{cookiecutter.file_name}}_b.py
+++ b/template/{{cookiecutter.adventofcode}}/tests/adventofcode{{cookiecutter.year}}/test_{{cookiecutter.file_name}}_b.py
@@ -1,9 +1,15 @@
 import pytest
 
-from adventofcode{{cookiecutter.year}}.solutions.{{cookiecutter.file_name}} import {{cookiecutter.class_name}}PartB
+from adventofcode{{cookiecutter.year}}.{{cookiecutter.file_name}} import {{cookiecutter.class_name}}PartB
 
 
 class Test{{cookiecutter.class_name}}PartB:
+    @pytest.mark.xfail(reason="Not yet implemented", raises=NotImplementedError)
+    def test_{{cookiecutter.file_name}}b_solve(self, testdata):
+        solution = {{cookiecutter.class_name}}PartB()
+        result = solution.solve(testdata)
+        assert result == 0
+
     @pytest.mark.xfail(reason="Not yet implemented", raises=NotImplementedError)
     @pytest.mark.parametrize(("input_data", "expected_result"), [("", ""), ("", "")])
     def test_{{cookiecutter.file_name}}b_solve(self, input_data, expected_result):

From 7a628765b8084af357309f7c194b81b749a5930c Mon Sep 17 00:00:00 2001
From: Roel Adriaans <roel@adriaans.org>
Date: Wed, 29 Nov 2023 10:54:24 +0100
Subject: [PATCH 331/371] Update test_{{cookiecutter.file_name}}_a.py

---
 .../test_{{cookiecutter.file_name}}_a.py                        | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/template/{{cookiecutter.adventofcode}}/tests/adventofcode{{cookiecutter.year}}/test_{{cookiecutter.file_name}}_a.py b/template/{{cookiecutter.adventofcode}}/tests/adventofcode{{cookiecutter.year}}/test_{{cookiecutter.file_name}}_a.py
index b2ab10ce..9c275e46 100644
--- a/template/{{cookiecutter.adventofcode}}/tests/adventofcode{{cookiecutter.year}}/test_{{cookiecutter.file_name}}_a.py
+++ b/template/{{cookiecutter.adventofcode}}/tests/adventofcode{{cookiecutter.year}}/test_{{cookiecutter.file_name}}_a.py
@@ -5,7 +5,7 @@
 
 class Test{{cookiecutter.class_name}}PartA:
     @pytest.mark.xfail(reason="Not yet implemented", raises=NotImplementedError)
-    def test_{{cookiecutter.file_name}}a_solve(self, testdata):
+    def test_{{cookiecutter.file_name}}a_testdata(self, testdata):
         solution = {{cookiecutter.class_name}}PartA()
         result = solution.solve(testdata)
         assert result == 0

From 751949c596b05ed682c39c6d3b85482503958564 Mon Sep 17 00:00:00 2001
From: Roel Adriaans <roel@adriaans.org>
Date: Wed, 29 Nov 2023 10:55:02 +0100
Subject: [PATCH 332/371] Update test_{{cookiecutter.file_name}}_b.py

---
 .../test_{{cookiecutter.file_name}}_b.py                        | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/template/{{cookiecutter.adventofcode}}/tests/adventofcode{{cookiecutter.year}}/test_{{cookiecutter.file_name}}_b.py b/template/{{cookiecutter.adventofcode}}/tests/adventofcode{{cookiecutter.year}}/test_{{cookiecutter.file_name}}_b.py
index 62fda823..f8a813e8 100644
--- a/template/{{cookiecutter.adventofcode}}/tests/adventofcode{{cookiecutter.year}}/test_{{cookiecutter.file_name}}_b.py
+++ b/template/{{cookiecutter.adventofcode}}/tests/adventofcode{{cookiecutter.year}}/test_{{cookiecutter.file_name}}_b.py
@@ -5,7 +5,7 @@
 
 class Test{{cookiecutter.class_name}}PartB:
     @pytest.mark.xfail(reason="Not yet implemented", raises=NotImplementedError)
-    def test_{{cookiecutter.file_name}}b_solve(self, testdata):
+    def test_{{cookiecutter.file_name}}b_testdata(self, testdata):
         solution = {{cookiecutter.class_name}}PartB()
         result = solution.solve(testdata)
         assert result == 0

From 1a00c4c59d0c8f5c06bc494193531e48849c5809 Mon Sep 17 00:00:00 2001
From: Roel Adriaans <roel.adriaans@asml.com>
Date: Wed, 29 Nov 2023 14:05:12 +0100
Subject: [PATCH 333/371] Day 16, part 1

---
 src/adventofcode2022/data/day_16/day16.txt    | 50 +++++++++++
 .../data/day_16/day16_test.txt                | 10 +++
 src/adventofcode2022/day16.py                 | 89 +++++++++++++++++++
 tests/adventofcode2022/test_day16_a.py        | 25 ++++++
 tests/adventofcode2022/test_day16_b.py        | 25 ++++++
 5 files changed, 199 insertions(+)
 create mode 100644 src/adventofcode2022/data/day_16/day16.txt
 create mode 100644 src/adventofcode2022/data/day_16/day16_test.txt
 create mode 100644 src/adventofcode2022/day16.py
 create mode 100644 tests/adventofcode2022/test_day16_a.py
 create mode 100644 tests/adventofcode2022/test_day16_b.py

diff --git a/src/adventofcode2022/data/day_16/day16.txt b/src/adventofcode2022/data/day_16/day16.txt
new file mode 100644
index 00000000..f4f682a4
--- /dev/null
+++ b/src/adventofcode2022/data/day_16/day16.txt
@@ -0,0 +1,50 @@
+Valve EV has flow rate=0; tunnels lead to valves WG, IB
+Valve IB has flow rate=0; tunnels lead to valves EW, EV
+Valve KL has flow rate=0; tunnels lead to valves JH, OY
+Valve QJ has flow rate=0; tunnels lead to valves TX, JH
+Valve OA has flow rate=12; tunnels lead to valves SB, GI, ED
+Valve BQ has flow rate=0; tunnels lead to valves NK, JJ
+Valve PZ has flow rate=0; tunnels lead to valves JH, VA
+Valve QO has flow rate=8; tunnels lead to valves LN, LU, CU, SQ, YZ
+Valve MP has flow rate=0; tunnels lead to valves LN, GO
+Valve YZ has flow rate=0; tunnels lead to valves AA, QO
+Valve CU has flow rate=0; tunnels lead to valves RY, QO
+Valve UE has flow rate=16; tunnel leads to valve VP
+Valve HT has flow rate=0; tunnels lead to valves AA, JE
+Valve EF has flow rate=0; tunnels lead to valves ES, JE
+Valve JJ has flow rate=15; tunnel leads to valve BQ
+Valve JX has flow rate=0; tunnels lead to valves AA, GO
+Valve AA has flow rate=0; tunnels lead to valves JX, TX, HT, YZ
+Valve MI has flow rate=21; tunnels lead to valves PQ, QT
+Valve ES has flow rate=0; tunnels lead to valves EF, NK
+Valve VC has flow rate=0; tunnels lead to valves MC, IW
+Valve LN has flow rate=0; tunnels lead to valves MP, QO
+Valve ED has flow rate=0; tunnels lead to valves OA, RY
+Valve WG has flow rate=20; tunnels lead to valves EV, OY, KF
+Valve GI has flow rate=0; tunnels lead to valves WE, OA
+Valve UK has flow rate=0; tunnels lead to valves TO, JE
+Valve GY has flow rate=23; tunnels lead to valves EO, QT
+Valve TX has flow rate=0; tunnels lead to valves AA, QJ
+Valve OE has flow rate=0; tunnels lead to valves GO, NK
+Valve OQ has flow rate=9; tunnels lead to valves VP, SB
+Valve NK has flow rate=25; tunnels lead to valves OE, ES, BQ
+Valve LU has flow rate=0; tunnels lead to valves JH, QO
+Valve RY has flow rate=18; tunnels lead to valves ED, IW, CU
+Valve KF has flow rate=0; tunnels lead to valves JE, WG
+Valve IW has flow rate=0; tunnels lead to valves VC, RY
+Valve SQ has flow rate=0; tunnels lead to valves MC, QO
+Valve PQ has flow rate=0; tunnels lead to valves MC, MI
+Valve TO has flow rate=0; tunnels lead to valves UK, JH
+Valve OY has flow rate=0; tunnels lead to valves KL, WG
+Valve JE has flow rate=10; tunnels lead to valves EF, ND, HT, KF, UK
+Valve JH has flow rate=3; tunnels lead to valves QJ, KL, PZ, TO, LU
+Valve VP has flow rate=0; tunnels lead to valves OQ, UE
+Valve EW has flow rate=22; tunnel leads to valve IB
+Valve ND has flow rate=0; tunnels lead to valves JE, GO
+Valve VA has flow rate=0; tunnels lead to valves GO, PZ
+Valve QT has flow rate=0; tunnels lead to valves MI, GY
+Valve EO has flow rate=0; tunnels lead to valves GY, MC
+Valve MC has flow rate=11; tunnels lead to valves PQ, SQ, WE, EO, VC
+Valve GO has flow rate=4; tunnels lead to valves JX, VA, OE, MP, ND
+Valve SB has flow rate=0; tunnels lead to valves OQ, OA
+Valve WE has flow rate=0; tunnels lead to valves MC, GI
diff --git a/src/adventofcode2022/data/day_16/day16_test.txt b/src/adventofcode2022/data/day_16/day16_test.txt
new file mode 100644
index 00000000..9f30acc1
--- /dev/null
+++ b/src/adventofcode2022/data/day_16/day16_test.txt
@@ -0,0 +1,10 @@
+Valve AA has flow rate=0; tunnels lead to valves DD, II, BB
+Valve BB has flow rate=13; tunnels lead to valves CC, AA
+Valve CC has flow rate=2; tunnels lead to valves DD, BB
+Valve DD has flow rate=20; tunnels lead to valves CC, AA, EE
+Valve EE has flow rate=3; tunnels lead to valves FF, DD
+Valve FF has flow rate=0; tunnels lead to valves EE, GG
+Valve GG has flow rate=0; tunnels lead to valves FF, HH
+Valve HH has flow rate=22; tunnel leads to valve GG
+Valve II has flow rate=0; tunnels lead to valves AA, JJ
+Valve JJ has flow rate=21; tunnel leads to valve II
diff --git a/src/adventofcode2022/day16.py b/src/adventofcode2022/day16.py
new file mode 100644
index 00000000..aa3c3c12
--- /dev/null
+++ b/src/adventofcode2022/day16.py
@@ -0,0 +1,89 @@
+from __future__ import annotations
+
+import re
+from functools import cache
+from typing import NamedTuple
+
+from adventofcode.utils.abstract import FileReaderSolution
+
+
+class Valve(NamedTuple):
+    name: str
+    connections: list[str]
+    flow_rate: int
+
+
+class Day16:
+    valves: dict[str, Valve]
+
+    def parse(self, input_lines: str):
+        """Parse lines
+        Expected input:
+
+        Valve AA has flow rate=0; tunnels lead to valves DD, II, BB
+
+        """
+        self.valves = {}
+
+        parser = re.compile(
+            r"Valve (?P<valve>\w*) has flow rate=(?P<flow_rate>\d*); "
+            r"tunnel(s?) lead(s?) to valve(s?) (?P<connections>.*)"
+        )
+        for line in input_lines.splitlines():
+            if match := parser.search(line):
+                mdict = match.groupdict()
+                connections = tuple(c.strip() for c in mdict["connections"].split(","))
+
+                name = mdict["valve"]
+                valve = Valve(
+                    name, flow_rate=int(mdict["flow_rate"]), connections=connections
+                )
+                self.valves[name] = valve
+
+            else:
+                raise ValueError("Invalid Line", line)
+
+
+class Day16PartA(Day16, FileReaderSolution):
+    @cache
+    def find_path(self, current_valve: str, time: int, open_valves: tuple[str] | None):
+        if time == 0:
+            # Outatime, Base state, nothing else to compute
+            return 0
+        # We have 2 options:
+        # - Walk to another valve
+        # - Open current valve
+
+        # Walk to all the connected valved, this takes one minute.
+        max_walking_score = max(
+            self.find_path(valve, time - 1, open_valves)
+            for valve in self.valves[current_valve].connections
+        )
+
+        # Open the current valve, if there is a flowrate, and it's not yet open
+        if (
+            self.valves[current_valve].flow_rate > 0
+            and current_valve not in open_valves
+        ):
+            # Add current valve to the open valves
+            open_valves = open_valves + (current_valve,)
+            # Calculate what our flow will be when it's opened
+            # eg 24 minute left * flowrate
+            current_flow = (time - 1) * self.valves[current_valve].flow_rate
+            # Recurse and find a cheaper path
+            open_score = current_flow + self.find_path(
+                current_valve, time - 1, open_valves
+            )
+            return max(open_score, max_walking_score)
+        else:
+            return max_walking_score
+
+    def solve(self, input_data: str) -> int:
+        self.parse(input_data)
+
+        return self.find_path("AA", 30, ())
+
+
+class Day16PartB(Day16, FileReaderSolution):
+    def solve(self, input_data: str) -> int:
+        raise NotImplementedError
diff --git a/tests/adventofcode2022/test_day16_a.py b/tests/adventofcode2022/test_day16_a.py
new file mode 100644
index 00000000..bc7b6f5e
--- /dev/null
+++ b/tests/adventofcode2022/test_day16_a.py
@@ -0,0 +1,25 @@
+from adventofcode2022.day16 import Day16PartA
+
+
+class TestDay16PartA:
+    def test_day16a_parsing(self, testdata):
+        solution = Day16PartA()
+        solution.parse(testdata)
+        assert len(solution.valves) == 10
+        assert solution.valves["AA"].flow_rate == 0
+
+        assert solution.valves["JJ"].flow_rate == 21
+        assert solution.valves["DD"].connections == ("CC", "AA", "EE")
+        # Make sure the Valve is hashable
+        assert hash(solution.valves["DD"])
+
+    def test_day16a_testdata(self, testdata):
+        solution = Day16PartA()
+        result = solution.solve(testdata)
+        assert result == 1651
+
+    def test_day16a_data(self):
+        """Result we got when we did the real solution"""
+        solution = Day16PartA()
+        res = solution("day_16/day16.txt")
+        assert res == 1767
diff --git a/tests/adventofcode2022/test_day16_b.py b/tests/adventofcode2022/test_day16_b.py
new file mode 100644
index 00000000..13cba5e5
--- /dev/null
+++ b/tests/adventofcode2022/test_day16_b.py
@@ -0,0 +1,25 @@
+import pytest
+
+from adventofcode2022.day16 import Day16PartB
+
+
+class TestDay16PartB:
+    @pytest.mark.xfail(reason="Not yet implemented", raises=NotImplementedError)
+    def test_day16b_testdata(self, testdata):
+        solution = Day16PartB()
+        result = solution.solve(testdata)
+        assert result == 0
+
+    @pytest.mark.xfail(reason="Not yet implemented", raises=NotImplementedError)
+    @pytest.mark.parametrize(("input_data", "expected_result"), [("", ""), ("", "")])
+    def test_day16b_solve(self, input_data, expected_result):
+        solution = Day16PartB()
+        result = solution.solve(input_data)
+        assert result == expected_result
+
+    @pytest.mark.xfail(reason="Not yet implemented", raises=NotImplementedError)
+    def test_day16b_data(self):
+        """Result we got when we did the real solution"""
+        solution = Day16PartB()
+        res = solution("day_16/day16.txt")
+        assert res == 0

From 97307acc53a3eab887f6b464f05a2f6c97490753 Mon Sep 17 00:00:00 2001
From: Roel Adriaans <roel.adriaans@asml.com>
Date: Wed, 29 Nov 2023 14:31:37 +0100
Subject: [PATCH 334/371] Sort the open valves. Speeds up the calculation by
 10x

---
 src/adventofcode2022/day16.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/adventofcode2022/day16.py b/src/adventofcode2022/day16.py
index aa3c3c12..9e21c040 100644
--- a/src/adventofcode2022/day16.py
+++ b/src/adventofcode2022/day16.py
@@ -66,7 +66,9 @@ def find_path(self, current_valve: str, time: int, open_valves: tuple[str] | Non
             and current_valve not in open_valves
         ):
             # Add current valve to the open valves
-            open_valves = open_valves + (current_valve,)
+            # Sort the vales
+            open_valves = tuple(sorted([*open_valves, current_valve]))
+
             # Calculate what our flow will be when it's opened
             # eg 24 minute left * flowrate
             current_flow = (time - 1) * self.valves[current_valve].flow_rate

From 633d9b7e8b83f4edcc8969791808c045de086b29 Mon Sep 17 00:00:00 2001
From: Roel Adriaans <roel.adriaans@asml.com>
Date: Wed, 29 Nov 2023 14:54:47 +0100
Subject: [PATCH 335/371] Day 16, part 2

---
 src/adventofcode2022/day16.py          | 27 +++++++++++++++++---------
 tests/adventofcode2022/test_day16_b.py | 15 ++------------
 2 files changed, 20 insertions(+), 22 deletions(-)

diff --git a/src/adventofcode2022/day16.py b/src/adventofcode2022/day16.py
index 9e21c040..da9b4490 100644
--- a/src/adventofcode2022/day16.py
+++ b/src/adventofcode2022/day16.py
@@ -43,12 +43,19 @@ def parse(self, input_lines: str):
             else:
                 raise ValueError("Invalid Line", line)
 
-
-class Day16PartA(Day16, FileReaderSolution):
     @cache
-    def find_path(self, current_valve: str, time: int, open_valves: tuple[str] | None):
+    def find_path(
+        self,
+        current_valve: str,
+        time: int,
+        open_valves: tuple[str] | None,
+        elephant=False,
+    ):
         if time == 0:
             # Outatime, Base state, nothing else to compute
+            if elephant:
+                # Now have the elephant traverse another route
+                return self.find_path("AA", 26, open_valves)
             return 0
         # We have 2 options:
         # - Walk to another valve
@@ -56,7 +63,7 @@ def find_path(self, current_valve: str, time: int, open_valves: tuple[str] | Non
 
         # Walk to all the connected valved, this takes one minute.
         max_walking_score = max(
-            self.find_path(valve, time - 1, open_valves)
+            self.find_path(valve, time - 1, open_valves, elephant)
             for valve in self.valves[current_valve].connections
         )
 
@@ -70,22 +77,24 @@ def find_path(self, current_valve: str, time: int, open_valves: tuple[str] | Non
             open_valves = tuple(sorted([*open_valves, current_valve]))
 
             # Calculate what our flow will be when it's opened
-            # eg 24 minute left * flowrate
+            # e.g. 24 minute left * flow-rate
             current_flow = (time - 1) * self.valves[current_valve].flow_rate
             # Recurse and find a cheaper path
             open_score = current_flow + self.find_path(
-                current_valve, time - 1, open_valves
+                current_valve, time - 1, open_valves, elephant
             )
             return max(open_score, max_walking_score)
         else:
             return max_walking_score
 
+
+class Day16PartA(Day16, FileReaderSolution):
     def solve(self, input_data: str) -> int:
         self.parse(input_data)
-
-        return self.find_path("AA", 30, ())
+        return self.find_path("AA", 30, (), False)
 
 
 class Day16PartB(Day16, FileReaderSolution):
     def solve(self, input_data: str) -> int:
-        raise NotImplementedError
+        self.parse(input_data)
+        return self.find_path("AA", 26, (), True)
diff --git a/tests/adventofcode2022/test_day16_b.py b/tests/adventofcode2022/test_day16_b.py
index 13cba5e5..2fe6be13 100644
--- a/tests/adventofcode2022/test_day16_b.py
+++ b/tests/adventofcode2022/test_day16_b.py
@@ -1,25 +1,14 @@
-import pytest
-
 from adventofcode2022.day16 import Day16PartB
 
 
 class TestDay16PartB:
-    @pytest.mark.xfail(reason="Not yet implemented", raises=NotImplementedError)
     def test_day16b_testdata(self, testdata):
         solution = Day16PartB()
         result = solution.solve(testdata)
-        assert result == 0
-
-    @pytest.mark.xfail(reason="Not yet implemented", raises=NotImplementedError)
-    @pytest.mark.parametrize(("input_data", "expected_result"), [("", ""), ("", "")])
-    def test_day16b_solve(self, input_data, expected_result):
-        solution = Day16PartB()
-        result = solution.solve(input_data)
-        assert result == expected_result
+        assert result == 1707
 
-    @pytest.mark.xfail(reason="Not yet implemented", raises=NotImplementedError)
     def test_day16b_data(self):
         """Result we got when we did the real solution"""
         solution = Day16PartB()
         res = solution("day_16/day16.txt")
-        assert res == 0
+        assert res == 2528

From 1eb4a89960f943dc4e8e56d39b5b0d5ba016b2cc Mon Sep 17 00:00:00 2001
From: Roel Adriaans <roel@adriaans.org>
Date: Fri, 1 Dec 2023 06:55:08 +0100
Subject: [PATCH 336/371] Day 1 for 2023. Where part b is evil...

---
 src/adventofcode2023/data/day_01/day01.txt    | 1000 +++++++++++++++++
 .../data/day_01/day01_test_1.txt              |    4 +
 .../data/day_01/day01_test_2.txt              |    7 +
 src/adventofcode2023/day01.py                 |   41 +
 tests/adventofcode2023/test_day01_a.py        |   22 +
 tests/adventofcode2023/test_day01_b.py        |   25 +
 6 files changed, 1099 insertions(+)
 create mode 100644 src/adventofcode2023/data/day_01/day01.txt
 create mode 100644 src/adventofcode2023/data/day_01/day01_test_1.txt
 create mode 100644 src/adventofcode2023/data/day_01/day01_test_2.txt
 create mode 100644 src/adventofcode2023/day01.py
 create mode 100644 tests/adventofcode2023/test_day01_a.py
 create mode 100644 tests/adventofcode2023/test_day01_b.py

diff --git a/src/adventofcode2023/data/day_01/day01.txt b/src/adventofcode2023/data/day_01/day01.txt
new file mode 100644
index 00000000..5f52ba37
--- /dev/null
+++ b/src/adventofcode2023/data/day_01/day01.txt
@@ -0,0 +1,1000 @@
+heightseven4two5
+npskfdstpk2knsm
+djnrmpxjbsbpgzvtjkhq6pkkfshx
+kgsddxsevensevenlcmkdlcgtfbqxmlnkhbnvhshkckppn2
+8blvspztqjnine854fivefour
+ninesixthree8six8
+5tnzrrzmcsnfivefeightrjninexrhnnfbcb
+dcjcj2
+4fhcmhdtfourlzdphfxvlmvm6
+eighth33twobfr
+qnb2sdsfhgxmfqqzkkjmfbxzjeight
+seven4zzsmcqtwo
+fourthreeone1two
+kkncfbsrfdsix9rvfpjrdxbgcssmkztwo
+959eight3two
+sixpmvlkkdjf3frr91
+five3xhpsdfkg94two3six
+bgqqglhqqtwohhqpgqjvqj8
+23seven
+kkddrrtskfive75pcmhhxcxzfourthree8
+smtfgqg7foureight
+281
+eighttxqtfjrldgxdpgkblzt3three
+zjznfive4
+5hpxksxc
+dvrkfvgvtwosnlqqcfivesixstglhvgfhlrgczzgvkvfour3
+sixllkhdpdxfvhqcbgz24two
+drc79twotwofive
+2vccthreefive6sevenrzqprfflnlsjtb
+3four3fjqm7lntttphvs
+threerzshdfgs4seventwolpb
+9threehmbt5
+9plgm
+17bjhndv3one2
+jghtqonesix3
+1kzdfjeightonesixtwothree44
+jpzs23gvjvsztbcvthree
+v5hmkncqvtqxvtwotwofiveeighttqmbk
+oner9kmfrjdbxcffl
+bmnpn9n
+3dsrcnssfgn
+psstwonesevenfvctwo9vnbxflpntcdllpzpkgtwo9one
+rkmbh8
+two1twokmkr
+sixfour9xsmpzzseightvqn
+threemmbrfxlqjtjgx95r9six
+seveneightpthree91nine
+twoeightfive7rdqqs4
+5threesevenhdjnrseven6five
+45nineeightnvoneeight71
+hrprrsg6eightrmthree7xnkmdcdqm
+cgfrgmflvthree38grksbjnpfhqpnvctrmtshffivemkzqmlfn
+227
+79onethreervsjtpkkr
+229twoonedcvz
+8ltnnqmtn7threetdfxd3
+3358pvbtbonekpbcvbcrrz
+fourrpkmtvvqfgsmxktqhvhb1mnbjj
+91xmzmzfbt
+vseven9
+6four2
+32q2
+bneightwo6eightsevenxl3
+two8jhbchqncbmsvfhznbvqmpxr931lnt
+cvlbktjmsevensix9eightfsixthree
+fivethree8sevenone
+prqr1krjgkllqrdmjbdjnvvc
+six4hspnpbgfivefour9fourxlsf
+zhxsncl77321
+dlslthree1sevenkrrlnbzggtwofourtwo
+rqtjzv2lqt7dfxcvfshtwo
+31oneqrnnzbbjfthreesix9nhnpqmnbnx
+sfhlrqt5649eight
+sevenjzlxthree6kndrfvtwo8zjzfspgtr
+2f
+4bmzvbpkfmtwo946
+eight8qkpxm33ljprdctmghfrt
+three643sevensixfour82
+vkdcnhhlhltsn6
+2sixsix264oneightm
+6rbx9threetwothree
+hhvtjlxgjpqbzzdcfpnhvncbqf94
+nine98
+jknmeight9seventhreemhdxddhfive8
+qljrvrprxthree1fiveeightwoj
+bjtntqlhk3mhjqmd5twolqrjtsixfour
+fdqddhxvone1twogjpqclnpjqxjpk8
+4cffzxeightfmbzfourn5
+56947cthvktgff
+ztbhdtmxtrbr1ssxmzbvhfiveeightwox
+two1phrvdx
+16vvrs1szzk9
+67rhvtzvzvseventx7
+2kjnmseven8
+tonenine9nine
+threeeightseven93jttxgtdml2threeflclh
+2hxsdksfmdshxcdmxlb
+seven9threeqslknninelfgmrsfjjjpklbh
+3twosevensevenfourcgsmbn7hr
+threevjvldjvstn2sixonevcljlf
+17cninepqgjp
+rjrnlknfivelscqfhhfv75
+five7hzvvh
+31two3seveneighteightfour
+78seven
+threesixmzsldcxpjnvrkptwothreenine5f
+trrxdhp8cqmfivexx7
+tgppgp9
+7five7grcdhsz5seven
+31eight
+nptmpmghrhsktcjthtonek15
+xgghqkqqqsdxgjzz7
+vsix1sbthreeonesix4eightwox
+gqcvhpdvl5onejmlrlljrf
+pdgmnmcptwo4
+dnzfgpbjxkkshgrg9qk
+fourcrnntcxrhvnlsixbfhvvdncfdeight6
+84krfhzg1onesixhzgpxgmfivedkjqxnf
+threembvltrgmgpp795xdtzsixtwo
+nlcn8
+76ptqpzkllmvrpthreefour7
+nrfourxjqxkgqj6126gjrplj
+tx685
+1fivesixgtlnine29fourmjgjgg
+5vzx
+86five
+qjhgkzmplgql1jppdxmhx2zsbvnxlj9rbxvzsxnj
+7pkgpzmfqr
+two58eight9
+fcjnpsxthreef1pzgkxqhbfgvjzsix
+4s95czbmjsbgvcztqncdk
+72zczgsix2twomxpgxfour6
+nine7kfq
+nlqcsrdcbkxsrgktbxch5zdjjkkz4fvk
+34rhkrpfdpcrqmvrpltrssix
+seven6mgdjmk3htqjlqbpbbfftt
+3drdclclnsh1srjkshrc8fiveqtssmbdqbvtcbqzxx
+4mdzjqnrjdj
+gctoneight7fourbqhb3
+sixtjkrxjnj7threethreesixlbvpmf8
+9fourone4qzjzzzlhhljjqtfourhdjkqnt
+dpdpxgxndx7eightthree7eightfivexdllmmm
+nine6cnvftrddnnineqc1
+8thtdllhzv
+qjgoneightgcmltsqcxrninevqxtfgbrp6
+xbxcl3glqgj
+one7fivefour4
+fourlsfmgm7jr76
+5vszbtzdzhxmgrgjtt1qrczseven
+eight67
+1jk96three5
+54ftvrpgzz3
+four4gnine
+fbljngxt8threeqbttzsnnineninethreexdzggvjd
+rmsix29fsfbmjjptf32
+x49
+5eightsndntqhhgg
+pnlv9svhnskn1npbjxmsixtwo
+eightzdvrjf4six9
+1sevennnkcdzcrthree8mz
+eightrtgrfrnqninehbhllsdpqthreefourqk6eight
+onefxtkztwonineninecfnf4
+threegf3jx
+sphgjnpv51twoone
+four89rhng
+eightsix1threebfprrbzv
+9sixfourlmnvgmnmkeightwoc
+qrhsnjgndl7
+twoqqglxqbsix1nine1sgstftqjcmzp
+9fivemqbjznffxq
+lngzjghbbqmrsix5x
+89ksqrbdpxfive7
+slbhmrvsstwo1gqcxztgdktqqxzmkpqfqfffgnhzfc
+two4sixvtwo6x
+oneonefive4
+twofourtfcqzptworq2nine
+7pl71three3nclhsjcds
+nlptvmgqfourfive7
+nsnzlcktmpcddcpffour3
+dtoneight5gxqbzbbvxc6gpplfzgmkbvmdnlhmg
+zdcxqcnfive6gsqqvqfnine58
+fiveblnlvzkgjhbhfgqp6nine5kh
+5onegbcdv51fxggdgthreedbbrlkg3
+29twobjpnjddone
+seven9nvdndhdfourzhvqzctznqfour
+3ztwosixcmbbztbngnsix9ts
+8sixpxjcxv7zvf
+onedsxmrhflvlqkzjjls8pmtcpteightfoureightvx
+8fourfour
+dpkhhvkxmttlk33
+three7txlxkdgcxglcb
+5xzgxfgkqninecrkbzcfive3
+81fhfhpvxtnine2tfptjkthree
+two2twosixgjfour
+ncjdrcnptrtwovhzfive9threebmtttcznr
+3xgnklgnnhbqgt4fiveghgksglkhlxm1
+five335five
+threeninefourlqrgkcdlzfive5
+fiveseven89four8
+seven86spzkbt6mvq
+3sevenseven
+jm66b
+eightqbttxcfzx88cnqjjdrhvcjzvfbdnzmrmvqbvhrlcm
+ckmzsdhxqdrdntfivenqt36
+2hjb
+twoone5two22mfmf
+5rmfznvcjhhtccnkpmtwoone4
+478dckhsmpkmktgznjqfd
+5gdqbjvdxv1threefoureighttwo7
+one646sevenmdmzzks
+ndc1bxxdnqrnqntbvfxtqm6one
+3vcsrrcfknmrgone
+onexkxhbjkjn7eightfourqxtsixnine
+sevenfive2seven327bdspzbv
+fiveseven4xgpbb7four
+ztjzhgsrm2seven
+1twovslqxxvjxlprtbdjccscdtlngm4bxxhdhj
+8rcn
+ninelcqrtfbjxlvfourmeight54
+99466bbctwotwo
+4twosixhpbhckdsevensix
+4qmqrjsznine6
+189jninecxcmtpcx9
+rfbmtwo5gctcrqgthree
+mcmpthree3nvmfshmjbtkgqsnine
+np2
+four1fourjsghqgmfmrnzfxbh5fourfour7
+kvskplbpgfninesixvzkrv1fqnrjnrhvnpkpkhph27twonemvx
+lghhsz175583
+onefive15rvsms4
+22twothreeeight
+fkhsfjtqppgrckfiverfsrbggteight48eight
+onem1two
+nine2fourfour7mfourfourcpnvgcx
+1czphscxrfrhqnqgn8
+ghgphgjrfcthreevpjdsevenseven8
+2gzcsdr2four5
+5eight5
+rzgsfive9lgbsqhsbxr
+eightone5g
+7six5
+63nine
+7fivetwo9eighttbvmdb4jskprq7
+6pmgtckvz7
+nine49seven9gzppzm5
+7xqgxgxvqptwo81tlzzrchqxfq
+two393
+pznknine67
+onenine514threeeight
+mxbkksjfkrsevenc2dtzzfsnqhc1ctjthree
+ntgmnhtwofourtwovbgmdnthree2pxv
+sixnineonetwoone7rrqfive
+vbz95two5zdxgtvnvrtmklt
+vhdv7pcn4seven5one
+zjqrxmm1ninefiveeight3spghctcttwogcqtrln
+1fourthree8ntvlhmxvbbtwozlgjt19
+mg7csnjptsnzsix
+4eightthreenineqtwothree13
+782mjrfmdf22sfive
+bxfx7six4
+7three2dmmkz691
+sjc8ckjn
+dkdfrsgb87cpnkchtgjnkb5q6
+seven2fhtdone9xtpbq7
+four3jmlftfzcdmcrfhjfkcfninefivesix
+kdxrl7eightpsmlrkllmjdpslnine
+three7nzxl3k2nine6
+7five8two
+sv8mj87
+vqjzjjps45hdkcjbsl3eight174
+gfljtv7one2z
+dveightwo7zrhmxjvlxftbjrqjcxlfive9
+threefjsvftzqneightfourtbvxqhssgrntdzpx2eighteight
+fknxqdhdktmkcdfive1five
+gs6168
+8twotlg
+fivetwo7one14
+64tjxkdfxbvkthnnc
+2onefivenrsgzpdzgjztpzpmeighteightttdfkgtkvltl
+nineeight65three
+mkbjxsgnineninesevenng2four
+3xckzkhh88threepkj4five5
+ndxjxnvxbcfgdfz9fnphqrpvcheightpmxseven
+2twodckhmzjvdgthreesix
+rttwonecdl4
+qfvsd7kcqjphrqzmlvjffdscbeightfgmdpbfsdpseven3
+five68five
+24tpfour17sevenlpkngxps
+meightwokqnine1twojmsxxvbbrlqkprmxxlng
+skkxpheightseventwosevenbfbcmzrpl3
+jvxhdnldseven58twofiveflsdcrnslqmqfvx
+15ninexgmsvtpfnr
+five758ssrnh
+onezpkfv4vnhhslhgk91pfbtdgqqcmcdqnqxmk
+rjphmdlleight5six7
+863xthree
+cfghvcv5
+bmbfourfjtnxqppkf882k
+dqnrjlvhxdfivenine8xl786
+lqrqspsxtwo6
+oneone9dkvzhsvgtl
+9sixf
+2nj
+hsvrgtmkxcpxtjncmthreethreeone7one
+vphqfour4
+qbpxpfmcxbnineeight8eight
+26
+bbmspkz22onejeight1
+rljffive89phxltnine
+five3dhscqeight3six
+nine8msgnltpxf
+38jxrfhbnclzzqqkvkgfourcfnxt
+9fzlghgp
+vjxprkvhpg1sevensdeightshmrfmmrt
+95threethreeztmjkvqmgx
+sixsfgrkqsc6dsixnineq
+fivetwo267lgpttkflb6hcglpldzv
+6cnscfjnlhh8x8qjbslh4
+xcxbjg192
+29sixeight
+8xkpzfvhdnonemq67
+zxhbcmkbqpqkx1t97phfgdqfour
+sixfivefivesix6sixsixjjp
+5sevenfour1fourninefourfxsqhcpggone
+ldpmdf37six1hfsmjnngmbbsjtf4
+fourtwo3lfzphbl1
+seven8cndkoneznhmtqnpr
+9ztwoonegzpfjmgdjhhtglnsmjmqqssn1nine
+3jvptqkjhchg9
+qbtwoneeight1nine9txvdpdlhv111pfdnr
+3eightmkclrtz51zchkqh
+eightpkrvkqgplptwothree5
+88gmb4dffm
+fourghmpbfc3
+hcpllninenkcvjx1ghptwo36
+fourone8xdqmfnsdzgninerfbxbfourjshsvdksix
+hkljqv5nfkbvveight5
+c9bczrtpqzj2
+xgjskgzkfive3oneighttdt
+9one5psix5jcjlhz99
+8gpvvvhpfqb6sevenhjldkhsjskthhmzzgqxsflseven
+96xjbsjmkgxgbknqckcrq
+cdgjhklphq3chkgtwofour2
+nine9mqfbxdspvn17zkbl
+3flbbpjgfh
+two9gfn7three1
+zjcksix1dpkdbsxbrseven58
+oner9eight9mtspfsix
+1hhdz156qpfmmrb
+oneeight9
+crznkknhn716djrhfivetwo7
+thkoneight54nsix
+xkkprql688onesixtwonine
+791rvbxbcjzfqnine
+fiver34
+3onefivenine183four
+pkvdxfive6six
+6ninesixkstsggvvvsix3two
+onetwo6ctkntf
+76sixfivefourhspsntf
+five6seventkdstwoxdb
+9sixzgmrrzfzcfzhrsseight4cprlmkplfzflz6
+fourmmbnpneight516one6q
+rpp86sjvzxssbjtfive
+three2sblnqxxjntksxjnvonedlbmxrrpzpcjpnn
+lqcbbl2rxjhh17zxgjgtkvq2five
+svvjsxxlh8t
+6bhneight7ljjhjfvsbnsndvrc9six
+sevenstgxksfmzd1ktwothree1mfour
+527nine7
+295hkjbvf31
+bpzlfour1ninetwo5
+bh5seven3chjvfv
+7vggcnckrmgbkx
+msqpgd87
+ninekmnjsix9dd1
+three1two
+qnrlcck47sixnrdkqnrxmlz5
+1rxseven891
+24b
+4fdfrgzjpmltcqg36tpqqcvbznine
+ftbtsix3
+njvzhlbthreezml8
+j4nineseven
+4dpgmtgrn
+97rnhk8rlp
+3fivefivefoursevenflxvnbzlxhffgd
+ftlbqxslq2
+eightseven3
+6dhcthree171fivecdldskdsgj
+54nine
+87twovpmn
+28mzz
+seven7csqxqn
+crzrgqk66five5ngdh
+xzjlmmtqgrtqrpmchfdbjpdjkqppxhsvfnzrth7
+sixfourjqbgsix3
+5eightnine54
+26gnqghndfcpmcvngqvzmfjpr8
+eightninethreebjjjvsgnonetwogflphxkvmz9seven
+6qjqkmpstzc
+three97sevenvxone67four
+35ninetmdxqngxr7
+2sbrlnqz1
+pnv91
+5four744seven13rp
+8bsix
+8bcr
+3eightljdhfxlnsgxs49sfzhzlsgvbldskr
+835m7threefour
+x3t52two
+onelrzhp1one1seven9lcclzfkn
+7rjzxvzdfeightlhzrnqseveneighttwoseven6
+seven13
+zkkknsevenzqsthreenine9four4
+vsszkfqpqtpxhqzpx6rkngzksmeightonesevenvzkd
+fourbtkgjrglhxvccbjlnxlbhvsevenfourzjhcgmrr5
+two95
+73four5eightfive1
+8ninembxfprm28
+ninethree2twofive6
+18two
+xjtwone7lfdzdvpccjsixp7rvhmh
+six872jbhpgznrl8lkdbvfsgv
+pnsbvfqtmkjtxseven7hkjhhmncgx
+qljf6
+four3five321sixone
+xvt15qcqd22six
+1ndxz
+gxfeightwo1two
+22eighthxvrcmx8cqmfsix
+3vxxlvgdvd3five3
+6threenine1tscqllqbone8cpzsnrxc
+twoseven4snjpkmhnrb
+gl3sixgxtttsldsmzhl5jgtwonem
+seventtmxdmsjgtonebstmmskzsnsgthree2
+ctgrq17khfmdfbrl12txtsmtfndxmvcshxj
+7six9mkkl
+five1qxfeighttwo
+eightninehckmhftskt7sixgeight2
+fllbppftcshjmtdthree8hpxlf
+2one15two
+qrzzg8mhqjpcbbfk
+nnbnhlmgg3twotwosevenf
+9tqqddhpsbdhdnkrjlxnqmjf
+dtgfxfivefivefive6
+one5jgbcncmz4fpltcfcdg7
+12czktx
+344nine
+7zqd6
+sxgftzrr1pkffhkjtcv5mclnzsvdqktvkrgbnctgcnine
+slfztfq5nineqcbdpcn5tczz3eightwont
+9eight48kblmfc95
+4xmrglzxtsix
+qhrgkbnsq5three646qntnvxcvg
+vb3fiveseven9n
+vgcdgctthree1281onemsxqvgnsix
+bcstq5dghsfrcmftwo4lflbbrpztwo
+hpjtwoninetwo87four6
+m3kgqggsdjq
+26ninejzhmbp1
+nqtpvvsm4kjnkkz9
+5sevenfrqgpvqx
+twobqcr9threeone
+ninenine2qnnine
+fournine629sixfive9
+sevenlsmstsxbpfzmkxsdp6
+1946one3eight7hhlqqkb
+tjqmxhkhcsix6nineqdknshfiveflpcbxr
+8seven4seven
+8zjmndrdpgqsevencghkthree5
+bsrkpbhhsbpggn26
+11threethree89hqpvkqxzq
+vjlhmd182hzqmsbdpnz2
+eightsjzfonebdcmlkcp3xdssfckqffsrpjfbb
+krvssix8fmpfivezpljfpeightfdkzkgmm
+fournrdhfbstx5fivefoureightfive2
+fivedfivejbjdd4eight
+sevenfivetdf4one86vv1
+7eight7
+2fivedfsdxfplllfq
+qcknrkljqxone75nvg85eight
+vvrhxxvpvtsixrvskznine9
+sevengtcdtpgmfivexffgffst1eightjjmskvptrone
+86five21zflbtcnlm
+pfthree3oneninegzqpgxq2eight
+17onekfhpvhppj1hdthrmdggxkgzxhxzdvbf
+3sixzkml8eightfive78xv
+pseightwosixxqjkfj484three484
+7zdpcvdnllthreefqpcttxbrtqpkpklnxdfszkxsbxx
+2threeskpqphjffxnnvk6
+3nine66threeone46k
+seventhreezgtlg12gndthree
+8sqnqccmseven5
+sevendssdthreeseven2smpgpvdeightwob
+hzcrrlkm8three
+xtwone56pgzt5two
+one4ldxzbjxlmsevenstqlgz
+fourcxhqqlxfourtwo5mdjbzn
+4eightbrtvsbjgnc
+ninemfjghlonenp494jsjjnrhvdkthree
+8threekccsevenfive
+4bfvscrpfivetwospsvkvhmcptmxqseven
+jzcbsgvljn5vtcpgh
+8foursixseven8fivenine7
+sljtbrnsrcfourfivesevenzcdsqrseven95
+five8ninethreefive
+fivekgcxtkjdvjlr9
+two2onefourkvgnzbfhhqgpdrjxfrrxdmrx
+sixvb14sixkfjxrqskbq
+three71nzrdggvlsxxxcfzdsrvpvbqsjn
+vlrlvrqpvm98qphgsdkkmhdzfh
+cmnpnvnine2two
+fivexzdqfr4two5ninekgpzqfdgqlz
+eight92dd2cgbqone9five
+4eightfivevjfffd
+57nrnktqrqlv6
+mqlhcpeight9zmsmh485
+hthxcv9l5one
+nineeightlptl8fivefourmblrxbtcvlvjftcr5
+7fhgbqs
+2v
+jnhldbh7dkskeight9
+37fourlcsevenone5
+5jzntdrmfourhxrrfcxthree
+four722
+7onenine
+8sevenzfzmhkxjnr8four
+nine2z
+378bcbkrfsnfivesix2
+bdxrq6zsjkdcnfglc
+4nqsvxznine271five
+2fourthreethree6
+7twovkt6eightkmgzbd
+gdsqb12rpqlfourfive
+1gczfive4four8five2qbrsddkj
+rrkctrmffive99jsgrbg93
+onegxssfourthreeeight2fztpvcvvn
+fivesjmzppdlj57
+sixone35fourpj
+nkqbbztcc7
+551mhjcn6onesix
+49thkftkcsl
+jthcqlp7reighthgdjbjpkxeight2
+threecfcmvgmsq534hhmbchteight
+kjvdbsrbmxdjpjh7
+fivetfkphxzpkzpvrhfvbd4hfour6zhprttq
+ccjcvssevenninensnpxcklbxqlcdgmvddsseven3
+2119six3
+5fourlznsqtvdcz
+pfxfknrreight6twonine
+bqrscdjrldsix5
+zznkptknm7rqgctxdthreesrhqkrdmsx
+hmfjsqk6plqcjxcxmtwoninenine37
+meightthree65
+threenqqz7dhjsgzznhvm44six
+86rdjfptxhhv5eightqkfive
+91lfzcqshrfxssninejseven5tcqpdx
+2xqhs
+five6twognddnhfivesixxqkk1
+two85jrxgxcxbr
+xfrqjfhpztqfourthreefour3
+tlqzlcckj2xrvvnznrnx
+mltpqxbbrprvvlsfone8jbpjkjdqxtzlbnhhhhvshfnl
+two9smqghpzpc2
+cqpklmdvnldgsdnlpmdpcql3jmlfvgxbgeight67
+7hhlcbpffour68sevensevenonesix
+sixkvtclqcmlpjqvbbrn7ninevjrgxdhqx47
+975two
+xdjb57five65sgghqkltxjtwo
+8pnjssxdgbdmpbkxbdmhbr
+3tgnrsevenrggtxps8rlkck5sixcrdccvcqg
+xvvglr4
+fourdqtzrszxdvknq9dvxks
+3btdbfourthreexhnjqrtnnxttqcfsevenlvhqxrsbpgqxjfvp
+9onefzskrcpmpthreextjnlteighteight4
+hgvch3two
+7nrc
+5mnhgg
+4twonine
+7six6six
+vjeightwoseven83mjfdpzrnnp
+gfrgsixqmcbdjrtwo4tsxghf
+7mmvkgmq
+8qckbxdkqzsclqfive
+3four52eightdhmr66
+ftoneight3bdbqgtfmsrfive3seveneight
+scrkzrfive66
+9nb42xdrmbzpz
+threetnpkv276one4sshmxpdc
+2455zjh1one8
+6nc4seventhree
+zjf5rnpnrdffjsix751mqbpgfgfjn
+2crtmctwoseven
+45fourmxzqzmpsixr3
+91lxbnn1twoxrsjsppjtwoone4
+37four6
+rkqb4eightthreesix93kqkhfsvngljp
+ghhhksix38eight1qplkftstdnone
+6nlxxncvqv71fbv
+9169nine6kvcklgmn
+vlddrrvcbd87mctrcj5
+one6fxninesixshdrtvglzlfbzlkvpmtxsix
+threemkrzrthree234cnngnflmfdvkt
+onefdcdnss8xx1
+oneone8mh8eightzrstvstwo
+fivekdmdgdqpcpnineqzmnpsjktzxpvbzrsp1eighttwo
+fourxckchnmz2five2hcqrsxgj
+38five
+onefivethree4cone
+fourjrzqcjjvgm6five
+9lcjvlsixtfdktbkvv1gsncxfdhhttxlzb64
+7two4one9
+7nineznmdvrpl
+threesixthreelkvmhzhtd6
+mxdglbdzqlthreevbjlzmvf9mkbdrtxpsxpgpkdtfh
+rjkpvjtdbxsnhrrhseven2eight5six59
+five8sixhblpctxnvtwosevenfour
+9rvhtjcb
+3ninenjgftq439
+99oneseven61
+54sevenfive8
+foursevenfxsmzxccfnxxc94eight6seven
+3p4hnbfcxbzfhrnnhtbmprdhxbfivekqkhzbnkc
+fiveeightqpghr9kfdqdlqfour
+7five18qkqkzhs75rp
+fourtwo3fivetwo
+eightsix28klprqxzjfiveone7
+twofourthreethreethree4
+75six648
+rmpndcb797seven1
+five347dcqzmlbdxprzlkkds5ps
+mnkmhrlgs7
+tknjqmsfivesevenninefour1jrlrpkl4
+6three62
+eightjrrhxd7csevenvfive
+sixh3dvfjlxxkjj
+5251fourmtxrpxvvbp4fblrpgtnlgg
+948
+76fournine
+eightseven4six99threeseven7
+73nine7
+4pknine
+6eightmdmmdjone
+22nine9kbgfdvjqvnmfqglhpnfhfvzxd
+five6srlgmmvs19four9
+4nineone9sixs
+four9tgpzrhjzqlhlxgqfz7
+nine5onedxflzhgf9one96
+hpf55
+kreighttwo2
+eight2seven29three7
+three7two1
+dhtkvvtjgzvrrvcjnqlbjsseven6
+93twofourninekznthreeseven
+rzvll61
+f47ninexfqsbdrseventwo7twonep
+qxcnfoureight6fivetpxbmbtwooneightm
+xqkvmbth6onerzgvx
+ndmjbvgzkxbttwo5one399twonef
+88ncg
+twomfiveninetwoltcgqkdch9three
+bjgnmpfzninesxbxnlplk45
+jv5tcfkksdmtthreecvsgz6hp1
+78fivehssmgbkzlb
+ztchfjrmpgsevenzsjqzmsjj8ninehrsbgknine
+tksztsix9kqfbstltqdpdfqjgr1
+413ptmm23two98
+4gkzvsevenfivefive
+bxms6rcd
+k8two918hrnine
+threeone4crkrbm1dmdlqqd
+foursix5nine
+one4trvninevmqx6four
+threethree8five911
+6l4fstcmprm
+seventhree91
+onesptwoqknsbrhnine9
+9ninebkmzsixvqnb5
+seventhreepxtcrc3gkfdsfpsfgfzvlfndgb
+pcvfrsgthreeftsjvclfournine1kbbkhgrrvblvbkzgbpc
+bpjfive9kdlcxbgn9zmcch41
+hcbflhjtsfour7qdjvv5kzjrpl
+dbzd6mmsn55fivegkl
+5stcpjhscvlsix2qqcbtxnh48
+lxfztjckeight2jsvfs8fivethreetwonel
+jf3dbxqmngr
+tqzqffdgnstwonnleight4rseven
+18threeznntcqpxtlq
+fourrmzzjvz18
+9ppbgcnvhhq3ccmsndrc5nlp
+3pqlfpfltzh
+2qsx4npflpn6seven9
+one2fhhfdzn
+fbztdmqfgj91zskxxdcvbeightmbspgqmbggtnpg
+24nhzonefourfvjq
+7lfvgnpvbvjtworpvcfqqjbthreeone2
+csrcthreeeightsevenx9ninesixsix
+43bncszsgmljgndbgnqc6
+13onedrjnonenine7
+six1four
+sixeightone2two6four
+fds3sdhbonenjlllhqfc9threefour
+mbslpskb82four719
+6seven5
+sevenfour9vsixrn3
+755rbnrkmd7sevensevengshmzhmzrpzqhq
+eight7khxnvqpjd
+clfour5jppbonevgfj9llhfggbz
+zcskxrshvbhn4nineeightndhnxs
+ltzzbeight4onepnine
+fives8fivethree
+s5476vcslone
+lj9ninekbjzlgqfour
+four8gjvhkcvlml
+twoone9fivecgcqlqqn74rglfbqbf
+vczbllnkxkssmmtrz3ddpzg
+threenine9cdqjmsfgspfive
+dxtclhmkjxqsgcs938sjr4
+nrqlljlsixjhbfttptcchveightfour4fivesbhgpcnzg
+sixthreefourbrtstxbh32
+sixhgdsqj22
+phshjcs7
+fivesix9
+48cjfeight83
+617sevenonesevenqjprssznhmfzrtf
+two6three95eightfour
+99sixone25jfssmjsmxj
+fblfkzkrzqjdbvpmvvf197
+kghllmbfiveplhptxt71vjtcmdrql5
+fivenine6
+six7drddptwo3fivefour7
+57four66jxxjv57
+3blj9twotwofourfive7
+eighteight64nine
+nineb9four8
+27cztm
+18cgkcnxfgrlsj1chrpxqnnrcone
+47sixthreefivefour93xmfndrz
+gmhxpninehvfbqdkbbb74drcknctrthcvvbrllvfouroneightbbx
+8tccpt1seveneight5hsmxvvdffive
+1ninefivecqkchg
+seven6six4jjfive2
+twotwozvvkrml3nine4fouroneightxg
+482tlvrmdkzfour
+fivepeight2
+one3threerfdlnrq
+seven3onefivefive3
+tjnxfjrs5dfthkrxklhrnsix
+keightwohzzxgnvb2
+kseven7six3five2three
+sixvxbccbjmvrbpqxcrzfnsevencdfptrdeightfive2
+24vqldhgtpzpqmsnvcn4onekfvbhzrbrkqvh
+mdnl2
+9sevenlfkbtsixvspnnxbvkd
+cvhhcvhlgc3eight3
+8sch3one
+nine4xhfrppmffone2ninecnrdtrlzzmkrsqkkc6
+three81pfj
+frnrxhkhfkncxeight557one
+6gcvmmvmlss33
+3zkfmdrc9four23vqvpgd
+three71gqdcpzpxkffhpbnbhfjgrhlzckmcrdtrvpnckkvmsp
+2phtgvfsevenpcpcvkpqgvkddmzdtbzxjppppptr8
+tzp3ljzslxzldqqsgl99
+eight24five1
+ssfjsnxptwo192threelcdbeight
+eightnzdnxpgvzqh7eight76tcj
+8598fourhclmkrtzkjgkfr1four
+83qfzhmfnsixfourqfpjclprrv64nlxbqdbbst
+vdlsvfourcnnninetwokkctqtl2
+lfxoneight8grninesixtwo
+82onevhzhthree6
+qzjxbls1
+fivethree1three
+qgcqc6two3xcdgfsfournine
+6sixdtpdpxrjsixoneightbfm
+two4foursix
+ts2xkoneightr
+gtkhl73onesix1
+7xqmpssix
+sixsevenninejjtrh64
+6q2six6
+sixndmphqqpft3one7ninerksljn
+eight44c
+ppvsjhv32jzctbzceight
+ppgeightwoklgkdchccmxxsixbqtkheight56
+ninefourtwo5sixsrrv18
+fivegvhbvkggpcqvksn34fhcxrmhvvt
+nineone6eight29jhv
+3dvsfpt4two
+8257kbvkjjlhmr3
+9ccone
+pcmmcblfqfpgxpssnk2
+1twofqfour7two
+six96twonvrmnzzeightwoc
+kqgsdxjjksdnzjdcd1jqnkz
+threenine8698
+seventhreethree1251
+fournnkdvms6fjggsxlljshhmh9sevenfour
+2lzxtcvvchmhxhqlxrjspg3
+6jxlz1cqbcjbhfxb9321twoneqq
+fivefourfour4
+foureightbjjd7grgvxlm2three
+zcdgdslqkkzhmsbdtmvqbmgfqdg2twogd
+82onemfffnm
+48trdhznd1
+5sixeightsixsixcsjsrnmzbcdjn68
+lvtjmrpfouronethree84dcccm
+3sixfsrfour
+sixjsvlzzgxrxmnine1kzjrvxmghfour7
+nrqqgsmpkcone3one
+lmnzcqrrhvkckzdg5
+29fivebnnh4zv
+threefour9dz4mvhh2threesix
+six7two
+two5zx1threefourseveneight
+frb1threefour
+xgrrxdmpcc4lvnhpvgcdlone89
+five28qtnxqxshrmspdghsfvoneqzzpjlnvxnrctptlv
+eighttwo6eight88seven4
+fmxdtnxfrfivethree2jqqx
+cvxktgdvtbfqkvvds2
+vkhmjnlk99
+vvhphh2ttjrscppq
+sixjfxxqxxhdhjcthp3three
+3gvjntkzcmbninenj
+sdlpseven9pdcvonefiveone1
+23pcvcljhtgbthree1eight5one
+3kreight7k
+mlxvzqjsthreesix98
+6h94sevensevenldthree
+six86
+four1four15seven
+rvqbkndfqjeightseven84
+one5two672
+two7three87fmqgdmqvcvn8
+qxkkgsixbdrqz7pqsfms
+four2v1seven99five
+7ndxpm
+lrrqxnjtvzfdzplxppzonetwokrmv131
+fourgvjbhpxqcseven1four
+thrthbgthree7four
+jbnkcqqczzpkq357sixfrgsjhjmxt
+rvrjsdnfldcqnplsqfnine6three5
+jgkzn598fhqqxmsqjgpzonefour
+qkjl1vptpmsseven41oneone
+fiveh94two9five
+2lrxjflmvq9
+jtcdnjtcgffourkztkqfrfourtwojpqtq7qjdzkfour
+eight3dlkndonethreetwo9one
+2bqfprnkz
+ninesevenfive63gxgmjvqf3
+tkvoneightsixsevenfour8nine9gzn
+sevenninemlzdbttpp3qb31jmmtmbqnr
+hdslnxgdz48
+four6prrfbtqrqvdlx81
+2hgqtnbxnqtpfive66dpn
+jhkjstxzblfive6vvd
+ljxqtqrgm6bgfppeightseven9
+gcmlbqtnm4jqhdhsfour2ninefour
+threeeight1hrdqptwo6
+mlxvrhjqz4twolnkqd
+npgnsgkmxmeightsix4brmcjjlbl6
+jrtwosixvrtrfvvpnine8hhqcsj2
+5ckctkfour433qd
+9zczvzz
+one46ninenhjzfhqcbtwo
+26mvspqqkxntwomgsfvmfshvmndcbnfxzx
+zhponeightbslzggxnpjgt97xjvxqrrsgj6zclqbmsdb
+175
+fivetwofiveeight2five
+three9sixtwo34
+7foursixhjvpndkjtqzshxdczg3three9
+8six3hqbcnjsdxr922vplmp
+tmrbnzlrs822nineeightnine
+two36nine6zhvmfss
+qdkcfrmb7
+9dcbzzhhgnclcdchgcthree
+tmxkqqstzqmp5pf97
+four86fivekbpjggeightnine
+mmsvnnxeightjqpdsdmgjzssssjtwofive6none
+5bchshczsjdh
+39five8cflqglqhbsixmqnfpqhh
+8five89threevkvgbtjrhhkqdkllkqtdjrv
+ninelldnine4
+fourseven52threebstwo
+9zdkqprhfdnthreeddj
+threetwo5tzthreetwoslzdkf91
+eightone5twofourdhdjpsbj7
+2nine1ninesixlnine7
+threethree824six
+threecbcvvcdgnzthree8nine2ckcvvqvghhthree
+nineninefour9ddctwo38
+sixthreeghnblhbsk5
+8threephn
+tpvoneight1sixjzkrtjcbpkxgvnccxvxbglhhgsevenkchhvchz
+xcdsxxfivethreecdd77
+seven3twomrjfrxninefive2
+82twotwolsm
+njljffrkrgnineone5fourtwo34
+9fsrnjjfkeightstjffdpeight
+lz77jfdvgq
+8skninektrzgsonesbnszbzsbfxgczgt
+6lkmpnhjbsjeightvhfqnhtg
+jmkrn89onenine4
+84xznbtgmsrg
+twonineldsmg59five
+z8vgkntnsmntqdhnphjppx8hfvptkrpbmjkg
+1sixsixonemzjcbchdkeightsix6
+cnthtftdzhjxc9fivetwo
+four99
+tsfhcrqthreecnsf49tnpjtvfjm
+3vmrlbdone
+fourtwoseven8klx8cjqnlf
+5533
+96threesixbb8jcbtlhd
+93mjghj
+tpq7ninenine58
+twosxzrdncbhr5gnqv
+8tgmmjxntmbdrtoneone4five
+onehgnthree24
+4ninebrjplcxdthreekmzchvhpkm3zfkvbtp
+sixgjrgcvhphv5threekgqtszxllxhdldzbv
+krq9nine3fqhdvnrbmncseven6
+six85njxj3mmphzpv6dhqlkmptldvlflckgk
+44eightxjtvfbmt
+2fp9
+skjxglseven5nxfdgjlclv9
+zbmxptthreechlxvxszszztqqs4threefouroneone
+47633nine
+8584mrvjdspgmsevenfour8two
+five5nzcmgx
+4threenine19twonine
+kztfivessbtzfjbmjmsnjxkct7
+2onesix
+nine6kfpkqhkjzsknrldfcghcgkghnine
+9cbhmrchmqjrhqx7zsdxmtlbrzfive7
+87eight16dmgpfcfvbt
+three45sfourtwo3
+2xvmdthreeeightthree
+zblpmvk2fivefqdjqpdk2eightwods
+nvrngd1one642
+twoninesix8tvcm4
+sixjjrjrpjbdlsix5kscvgfour6
+oneninefjmblx25lgstzzkvnqcjl
+5fournhphcqqzngvcjphfnhgr
+fourninetwo226
+sqszqk8154five8eightnine
+5rcqxrbv
+3three7three118
+9dlgvvnpsjrhxjpjr
+cgttwo97qceight658
+3eight8threefourthree8jvld
+sixbctkcmzbtb4ntgtctgtr7three
+36three92
+9twonezv
+ddrhf7ninefiveonefivefive
+4dpc75eighttwonine
+27three
+837ninethreezdcdbmjtph
+two3jgj8pfptxbpjcfournine6
+r8mzqvthlnljthree2
+foursshmxt4qhsnxtwotwo3fpqhpd
+ntlfvnxkxxvtktmbqfourqjzjdcdthree76ninetwo
+7zfhfmqmbkzrknxcfgxmqh
+zfzfcsbkld9eightthree
+threethreebxqqsnfzvqfivefmnc71
+one3onesix63mxgmcpqfvnfiveq
+9four7twofourtwotjlpcqeight3
+1dcnsvzrstslsqvcvonetwofour7
+cg12five
+5twosxfsbmxrtl
+seveneightsix3gshhcnjsqb5
+9xkvfhcmrs87
+lpkcnjpsix1fivetwo
+9dsninefive6lhjpdkpcr
+838mjxsleightnine
+seven4ninefivefourhxplgzfvsevenbbdjqc
+1drcgshkfthree3nlkztjtrx9five
+7three4seveneightfxsz
+7onetjjkznvlb
+93two4foureight
+8fqddclzvlx
+tdpcspmg39ddqkdlpjxvkdtjpc21
+fivessmncpxsd3eight
+44hjrhqdqf19pxkb
+bmcgjkkkhfive5twonekc
+twomv4nine
+16rrksxjzjlt5plmvjtvhkfnineeight
+cmczrnjjsntptjffzrpqthreemjpfhsjbrmnlkzpvvvmj8
+one81six
+9jfivefive82rz
+one32fourfivelkrczztone
+seveneighteightfour1
+58twoxgklhpndxjrpb86
+five2sixfourcjfvnmhrxrtwovhrdrfrssphgtcqthhzxh
+lxtbmsevenbms3one8dsbsixnine
+sevenhcgr6ninefour
+trknlxnv43zxlrqjtwonect
diff --git a/src/adventofcode2023/data/day_01/day01_test_1.txt b/src/adventofcode2023/data/day_01/day01_test_1.txt
new file mode 100644
index 00000000..7bbc69a6
--- /dev/null
+++ b/src/adventofcode2023/data/day_01/day01_test_1.txt
@@ -0,0 +1,4 @@
+1abc2
+pqr3stu8vwx
+a1b2c3d4e5f
+treb7uchet
diff --git a/src/adventofcode2023/data/day_01/day01_test_2.txt b/src/adventofcode2023/data/day_01/day01_test_2.txt
new file mode 100644
index 00000000..41aa89cf
--- /dev/null
+++ b/src/adventofcode2023/data/day_01/day01_test_2.txt
@@ -0,0 +1,7 @@
+two1nine
+eightwothree
+abcone2threexyz
+xtwone3four
+4nineeightseven2
+zoneight234
+7pqrstsixteen
diff --git a/src/adventofcode2023/day01.py b/src/adventofcode2023/day01.py
new file mode 100644
index 00000000..30614c56
--- /dev/null
+++ b/src/adventofcode2023/day01.py
@@ -0,0 +1,41 @@
+from __future__ import annotations
+
+from adventofcode.utils.abstract import FileReaderSolution
+
+
+class Day01:
+    pass
+
+
+class Day01PartA(Day01, FileReaderSolution):
+    def solve(self, input_data: str) -> int:
+        total = 0
+        for line in input_data.splitlines():
+            digits = [i for i in line if i.isdigit()]
+            total += int("".join([digits[0], digits[-1]]))
+        return total
+
+
+class Day01PartB(Day01, FileReaderSolution):
+    # Replace, but keep the first and last letter in place. This could be part of
+    # the next word. Something that was *not* specified in the text..
+    digitmap = {
+        "one": "o1e",
+        "two": "t2o",
+        "three": "t3e",
+        "four": "f4r",
+        "five": "f5e",
+        "six": "s6x",
+        "seven": "s7n",
+        "eight": "e8t",
+        "nine": "n9e",
+    }
+
+    def solve(self, input_data: str) -> int:
+        total = 0
+        for line in input_data.splitlines():
+            for digit, replacement in self.digitmap.items():
+                line = line.replace(digit, replacement)
+            digits = [i for i in line if i.isdigit()]
+            total += int("".join([digits[0], digits[-1]]))
+        return total
diff --git a/tests/adventofcode2023/test_day01_a.py b/tests/adventofcode2023/test_day01_a.py
new file mode 100644
index 00000000..4b81f5a1
--- /dev/null
+++ b/tests/adventofcode2023/test_day01_a.py
@@ -0,0 +1,22 @@
+import pytest
+
+from adventofcode2023.day01 import Day01PartA
+
+
+class TestDay01PartA:
+    @pytest.mark.parametrize(
+        ("postfix", "expected_result"),
+        [
+            ("test_1", 142),
+        ],
+    )
+    def test_day01a_testdata(self, testdata_by_postfix, expected_result):
+        solution = Day01PartA()
+        result = solution.solve(testdata_by_postfix)
+        assert result == expected_result
+
+    def test_day01a_data(self):
+        """Result we got when we did the real solution"""
+        solution = Day01PartA()
+        res = solution("day_01/day01.txt")
+        assert res == 56049
diff --git a/tests/adventofcode2023/test_day01_b.py b/tests/adventofcode2023/test_day01_b.py
new file mode 100644
index 00000000..1f9f6ded
--- /dev/null
+++ b/tests/adventofcode2023/test_day01_b.py
@@ -0,0 +1,25 @@
+import pytest
+
+from adventofcode2023.day01 import Day01PartB
+
+
+class TestDay01PartB:
+    @pytest.mark.parametrize(
+        ("postfix", "expected_result"),
+        [
+            ("test_2", 281),
+        ],
+    )
+    def test_day01a_testdata(self, testdata_by_postfix, expected_result):
+        solution = Day01PartB()
+        result = solution.solve(testdata_by_postfix)
+        assert result == expected_result
+
+    def test_day01b_data(self):
+        """Result we got when we did the real solution"""
+        solution = Day01PartB()
+        res = solution("day_01/day01.txt")
+        assert res != 53951
+        assert res != 54539
+        assert res != 50018
+        assert res == 54530

From 00aa722609f01999dcfa5ee4ccea6cacc9a69e4d Mon Sep 17 00:00:00 2001
From: Roel Adriaans <roel.adriaans@asml.com>
Date: Fri, 1 Dec 2023 09:09:37 +0100
Subject: [PATCH 337/371] Add adventofcode2023 as package

---
 pyproject.toml | 3 ++-
 tox.ini        | 1 +
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/pyproject.toml b/pyproject.toml
index 2b76075c..e12f868d 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -11,7 +11,8 @@ packages = [
     { include = "adventofcode2019", from="src" },
     { include = "adventofcode2020", from="src" },
     { include = "adventofcode2021", from="src" },
-    { include = "adventofcode2022", from="src" }
+    { include = "adventofcode2022", from="src" },
+    { include = "adventofcode2023", from="src" }
 ]
 
 [tool.poetry.dependencies]
diff --git a/tox.ini b/tox.ini
index a113ba78..79eb5d7c 100644
--- a/tox.ini
+++ b/tox.ini
@@ -48,6 +48,7 @@ source =
     adventofcode2020
     adventofcode2021
     adventofcode2022
+    adventofcode2023
     tests
 
 [coverage:report]

From e0f4dc76d6446398a1425858db6a1b772917d745 Mon Sep 17 00:00:00 2001
From: Roel Adriaans <roel.adriaans@asml.com>
Date: Fri, 1 Dec 2023 09:41:14 +0100
Subject: [PATCH 338/371] Update depencencies

---
 .pre-commit-config.yaml |   2 +-
 poetry.lock             | 126 +++++++++++++++++++++++-----------------
 pyproject.toml          |   4 +-
 3 files changed, 76 insertions(+), 56 deletions(-)

diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index dc226630..71714969 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -5,7 +5,7 @@ repos:
     rev: 23.11.0
     hooks:
     - id: black
-      language_version: 'python3.10'
+      language_version: 'python3.12'
 
   - repo: https://github.com/pycqa/flake8
     rev: 6.1.0
diff --git a/poetry.lock b/poetry.lock
index 647d1551..9c06a1e8 100644
--- a/poetry.lock
+++ b/poetry.lock
@@ -515,53 +515,53 @@ typing = ["typing-extensions (>=4.8)"]
 
 [[package]]
 name = "fonttools"
-version = "4.45.0"
+version = "4.45.1"
 description = "Tools to manipulate font files"
 optional = false
 python-versions = ">=3.8"
 files = [
-    {file = "fonttools-4.45.0-cp310-cp310-macosx_10_9_universal2.whl", hash = "sha256:18138744540413eb2ebeff6ce8b9d617926f1ed08da5d1676f99f1966988264e"},
-    {file = "fonttools-4.45.0-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:0b3d240933045b9dbbe6e8c1e28ffe89be72c9be927b6e572e55be5e2b2604f7"},
-    {file = "fonttools-4.45.0-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:5853263505f407b69c0d1cbf3ed1c30f985b9505523989b20aa18a5231d4a08a"},
-    {file = "fonttools-4.45.0-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:4c21f306f1e71146cf7587916d6de5e9c4bf26057aad602a6c7fad4b6e05bf1f"},
-    {file = "fonttools-4.45.0-cp310-cp310-musllinux_1_1_aarch64.whl", hash = "sha256:1bb4f01018b9f4e2d7b07c2bf79e2ef498acb6f99321b72b5c44b1333481f569"},
-    {file = "fonttools-4.45.0-cp310-cp310-musllinux_1_1_x86_64.whl", hash = "sha256:d0e6603c3b00604574d84fabbcf9dee81efa7c89d38ed4dcbf4e6c654e1ebb99"},
-    {file = "fonttools-4.45.0-cp310-cp310-win32.whl", hash = "sha256:c3e676e50a0713c9a1e46185b806967d3c012643d1936ca814eb9ab62027c090"},
-    {file = "fonttools-4.45.0-cp310-cp310-win_amd64.whl", hash = "sha256:e819f14d315024750b1ad2842da605051444b944cd983ea987359ace5213bcb9"},
-    {file = "fonttools-4.45.0-cp311-cp311-macosx_10_9_universal2.whl", hash = "sha256:a6d68b97b967a3361e0ddf14425e4fe030c9f19462b445ce0b190c4a6834eb46"},
-    {file = "fonttools-4.45.0-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:619227c7b9088add4d4e5959bf0fa3c29a71c191baa8b989bf532645876b2168"},
-    {file = "fonttools-4.45.0-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:cafe001811ad1ac2a5d357fc99c490357d758569f69511d14da0311c02814e15"},
-    {file = "fonttools-4.45.0-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:756c6f4324fd4bb4d7517462d7237ff65e45da7a002f9e6e08a48c25a11bf073"},
-    {file = "fonttools-4.45.0-cp311-cp311-musllinux_1_1_aarch64.whl", hash = "sha256:ecc97628be1bf7fa93463e1e791915da66de51df8e655a5a6c846fd9b8ceaa98"},
-    {file = "fonttools-4.45.0-cp311-cp311-musllinux_1_1_x86_64.whl", hash = "sha256:636177ffc4479bc824a356c00a3c9a74a2ce591fa6057109321e0a0ffd126e40"},
-    {file = "fonttools-4.45.0-cp311-cp311-win32.whl", hash = "sha256:cac462dbd9058778c89bc608ac29ba93ab3fbc37f305d260aa2d771cfb0fa694"},
-    {file = "fonttools-4.45.0-cp311-cp311-win_amd64.whl", hash = "sha256:2bd3f33a5d5630cc20cf3f8631074cac6eafdb2aa3ac8745966c3b4bf93656b4"},
-    {file = "fonttools-4.45.0-cp312-cp312-macosx_10_9_universal2.whl", hash = "sha256:5b3da7791a58c97763d1704c2b76a9d654b8f2ef233e64248960bd2c6e669fe4"},
-    {file = "fonttools-4.45.0-cp312-cp312-macosx_10_9_x86_64.whl", hash = "sha256:4fbc3d8acb578ba0932fcabc01a962f23b0dd254ab103dd0606128fff0175095"},
-    {file = "fonttools-4.45.0-cp312-cp312-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:5f69e07ebfd89d96485349dc10bd81a027fc0e927f988fa31bd9cd06359e06ed"},
-    {file = "fonttools-4.45.0-cp312-cp312-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:b122fe802839bfc8f9603233e5fcbdc98b5e27876f7945b426adfea983918a7b"},
-    {file = "fonttools-4.45.0-cp312-cp312-musllinux_1_1_aarch64.whl", hash = "sha256:8f8736e885700ae22970519b8f5c7f4c2f29c6e9459d05c649c4e99012c20b23"},
-    {file = "fonttools-4.45.0-cp312-cp312-musllinux_1_1_x86_64.whl", hash = "sha256:70f047ba37c6aac3d331b71bb784373e251bd86678da72526edc8585e79418e1"},
-    {file = "fonttools-4.45.0-cp312-cp312-win32.whl", hash = "sha256:fdb43f68bce545f494fed1bfb60d2c32b53f410758919112923c2d600cb9a24c"},
-    {file = "fonttools-4.45.0-cp312-cp312-win_amd64.whl", hash = "sha256:102a7ca8700a078265c002c29d2ae498edeb14b636375ceec2425b561ce08037"},
-    {file = "fonttools-4.45.0-cp38-cp38-macosx_10_9_universal2.whl", hash = "sha256:4b154cbf93515e4eb477f5cf99de79b46c17229781f321907940bdbabbd64708"},
-    {file = "fonttools-4.45.0-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:f546a1b676622638a12c721d89cfb513ad7189548eadac885cdd555e35021557"},
-    {file = "fonttools-4.45.0-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:45c5a0612049e0d06b467c3a0837d9efe37934acab64ba922f00e1d07c1555a7"},
-    {file = "fonttools-4.45.0-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:f27166d00e0cd3ea49461b053f55e75676f1109e5483170a14d70c397d082a4c"},
-    {file = "fonttools-4.45.0-cp38-cp38-musllinux_1_1_aarch64.whl", hash = "sha256:980ba4e673439db22a00501fac087957ce0731351b042816f6c02df81cadc612"},
-    {file = "fonttools-4.45.0-cp38-cp38-musllinux_1_1_x86_64.whl", hash = "sha256:83b70b99f3f55b046cb51ca20fc15702567710233b2cd757a79e1916c25a25f8"},
-    {file = "fonttools-4.45.0-cp38-cp38-win32.whl", hash = "sha256:fe8ad943f62bf16273154ebcdf855c44a3b46eac36abea338c209209439b4eb6"},
-    {file = "fonttools-4.45.0-cp38-cp38-win_amd64.whl", hash = "sha256:6fb1fdcee2b36e012283805ef0380e4508dbb504950b1c94d0343f8dbbad7d7e"},
-    {file = "fonttools-4.45.0-cp39-cp39-macosx_10_9_universal2.whl", hash = "sha256:5bbcb75ffcea64543ab8203e132e2019b226f59a4a6958637e78c21f9ca560ff"},
-    {file = "fonttools-4.45.0-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:ade07953b35ebf66c445a5e02f28ecd038ea588dc7673c555afe319b6e3c5168"},
-    {file = "fonttools-4.45.0-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:54ac8be3f693062fc08550213edd40db8f4fe1dd095a1246ed18e887fc254d76"},
-    {file = "fonttools-4.45.0-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:dc991712aaea9d545b13ec480aaf2ebd12ccdea180fce864dd9863f5134f5a06"},
-    {file = "fonttools-4.45.0-cp39-cp39-musllinux_1_1_aarch64.whl", hash = "sha256:420139743e21d832de230757fb7b0c285d8024d602af8064d9506fa055bb62ae"},
-    {file = "fonttools-4.45.0-cp39-cp39-musllinux_1_1_x86_64.whl", hash = "sha256:58da830a52c05f18a7cc8a279a8bdddf2e45cdc685b360699653fb3405557459"},
-    {file = "fonttools-4.45.0-cp39-cp39-win32.whl", hash = "sha256:715e18f67f0587a16476c7f62b8ff9a165ddceb8c2a262fb08df9f71c7790f0e"},
-    {file = "fonttools-4.45.0-cp39-cp39-win_amd64.whl", hash = "sha256:dd26fda8c879558216458a801c1dba52f35dca0e96640fd9c75e86b6574cf1c3"},
-    {file = "fonttools-4.45.0-py3-none-any.whl", hash = "sha256:835cf5d0e1b37bbed1d64c286611cc4da9ff19df952400f191ba9142b3cb97f6"},
-    {file = "fonttools-4.45.0.tar.gz", hash = "sha256:c1c79d7d4093396892575115c214b24f09e68997cb5c0ab2d99bfdaff74c64b6"},
+    {file = "fonttools-4.45.1-cp310-cp310-macosx_10_9_universal2.whl", hash = "sha256:45fa321c458ea29224067700954ec44493ae869b47e7c5485a350a149a19fb53"},
+    {file = "fonttools-4.45.1-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:0dc7617d96b1e668eea9250e1c1fe62d0c78c3f69573ce7e3332cc40e6d84356"},
+    {file = "fonttools-4.45.1-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:03ed3bda541e86725f6b4e1b94213f13ed1ae51a5a1f167028534cedea38c010"},
+    {file = "fonttools-4.45.1-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:c4f4a5870e3b56788fb196da8cf30d0dfd51a76dc3b907861d018165f76ae4c2"},
+    {file = "fonttools-4.45.1-cp310-cp310-musllinux_1_1_aarch64.whl", hash = "sha256:a3c11d9687479f01eddef729aa737abcdea0a44fdaffb62a930a18892f186c9b"},
+    {file = "fonttools-4.45.1-cp310-cp310-musllinux_1_1_x86_64.whl", hash = "sha256:316cec50581e844c3ab69d7c82455b54c7cf18236b2f09e722faf665fbfcac58"},
+    {file = "fonttools-4.45.1-cp310-cp310-win32.whl", hash = "sha256:e2277cba9f0b525e30de2a9ad3cb4219aa4bc697230c1645666b0deee9f914f0"},
+    {file = "fonttools-4.45.1-cp310-cp310-win_amd64.whl", hash = "sha256:1b9e9ad2bcded9a1431afaa57c8d3c39143ac1f050862d66bddd863c515464a2"},
+    {file = "fonttools-4.45.1-cp311-cp311-macosx_10_9_universal2.whl", hash = "sha256:ff6a698bdd435d24c379f6e8a54908cd9bb7dda23719084d56bf8c87709bf3bd"},
+    {file = "fonttools-4.45.1-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:2c980d60cd6ec1376206fe55013d166e5627ad0b149b5c81e74eaa913ab6134f"},
+    {file = "fonttools-4.45.1-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:a12dee6523c02ca78aeedd0a5e12bfa9b7b29896350edd5241542897b072ae23"},
+    {file = "fonttools-4.45.1-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:37cd1ced6efb3dd6fe82e9f9bf92fd74ac58a5aefc284045f59ecd517a5fb9ab"},
+    {file = "fonttools-4.45.1-cp311-cp311-musllinux_1_1_aarch64.whl", hash = "sha256:e3d24248221bd7151dfff0d88b1b5da02dccd7134bd576ce8888199827bbaa19"},
+    {file = "fonttools-4.45.1-cp311-cp311-musllinux_1_1_x86_64.whl", hash = "sha256:ba6c23591427844dfb0a13658f1718489de75de6a46b64234584c0d17573162d"},
+    {file = "fonttools-4.45.1-cp311-cp311-win32.whl", hash = "sha256:cebcddbe9351b67166292b4f71ffdbfcce01ba4b07d4267824eb46b277aeb19a"},
+    {file = "fonttools-4.45.1-cp311-cp311-win_amd64.whl", hash = "sha256:f22eb69996a0bd49f76bdefb30be54ce8dbb89a0d1246874d610f05c2aa2e69e"},
+    {file = "fonttools-4.45.1-cp312-cp312-macosx_10_9_universal2.whl", hash = "sha256:794de93e83297db7b4943f2431e206d8b1ea69cb3ae14638a49cc50332bf0db8"},
+    {file = "fonttools-4.45.1-cp312-cp312-macosx_10_9_x86_64.whl", hash = "sha256:4ba17822a6681d06849078daaf6e03eccc9f467efe7c4c60280e28a78e8e5df9"},
+    {file = "fonttools-4.45.1-cp312-cp312-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:e50f794d09df0675da8d9dbd7c66bfcab2f74a708343aabcad41936d26556891"},
+    {file = "fonttools-4.45.1-cp312-cp312-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:8b07b857d4f9de3199a8c3d1b1bf2078c0f37447891ca1a8d9234106b9a27aff"},
+    {file = "fonttools-4.45.1-cp312-cp312-musllinux_1_1_aarch64.whl", hash = "sha256:777ba42b94a27bb7fb2b4082522fccfd345667c32a56011e1c3e105979af5b79"},
+    {file = "fonttools-4.45.1-cp312-cp312-musllinux_1_1_x86_64.whl", hash = "sha256:21e96b99878348c74aa58059b8578d7586f9519cbcdadacf56486737038aa043"},
+    {file = "fonttools-4.45.1-cp312-cp312-win32.whl", hash = "sha256:5cbf02cda8465b69769d07385f5d11e7bba19954e7787792f46fe679ec755ebb"},
+    {file = "fonttools-4.45.1-cp312-cp312-win_amd64.whl", hash = "sha256:800e354e0c3afaeb8d9552769773d02f228e98c37b8cb03041157c3d0687cffc"},
+    {file = "fonttools-4.45.1-cp38-cp38-macosx_10_9_universal2.whl", hash = "sha256:6eb2c54f7a07c92108daabcf02caf31df97825738db02a28270633946bcda4d0"},
+    {file = "fonttools-4.45.1-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:43a3d267334109ff849c37cf3629476b5feb392ef1d2e464a167b83de8cd599c"},
+    {file = "fonttools-4.45.1-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:8e1aefc2bf3c43e0f33f995f828a7bbeff4adc9393a7760b11456dbcf14388f6"},
+    {file = "fonttools-4.45.1-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:1f53a19dcdd5737440839b8394eeebb35da9ec8109f7926cb6456639b5b58e47"},
+    {file = "fonttools-4.45.1-cp38-cp38-musllinux_1_1_aarch64.whl", hash = "sha256:5a17706b9cc24b27721613fe5773d93331ab7f0ecaca9955aead89c6b843d3a7"},
+    {file = "fonttools-4.45.1-cp38-cp38-musllinux_1_1_x86_64.whl", hash = "sha256:fb36e5f40191274a95938b40c0a1fa7f895e36935aea8709e1d6deff0b2d0d4f"},
+    {file = "fonttools-4.45.1-cp38-cp38-win32.whl", hash = "sha256:46eabddec12066829b8a1efe45ae552ba2f1796981ecf538d5f68284c354c589"},
+    {file = "fonttools-4.45.1-cp38-cp38-win_amd64.whl", hash = "sha256:b6de2f0fcd3302fb82f94801002cb473959e998c14c24ec28234adb674aed345"},
+    {file = "fonttools-4.45.1-cp39-cp39-macosx_10_9_universal2.whl", hash = "sha256:392d0e3cc23daee910193625f7cf1b387aff9dd5b6f1a5f4a925680acb6dcbc2"},
+    {file = "fonttools-4.45.1-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:4b9544b1346d99848ac0e9b05b5d45ee703d7562fc4c9c48cf4b781de9632e57"},
+    {file = "fonttools-4.45.1-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:8717db3e4895e4820ade64ea379187738827ee60748223cb0438ef044ee208c6"},
+    {file = "fonttools-4.45.1-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:e29d5f298d616a93a4c5963682dc6cc8cc09f6d89cad2c29019fc5fb3b4d9472"},
+    {file = "fonttools-4.45.1-cp39-cp39-musllinux_1_1_aarch64.whl", hash = "sha256:cb472905da3049960e80fc1cf808231880d79727a8410e156bf3e5063a1c574f"},
+    {file = "fonttools-4.45.1-cp39-cp39-musllinux_1_1_x86_64.whl", hash = "sha256:ba299f1fbaa2a1e33210aaaf6fa816d4059e4d3cfe2ae9871368d4ab548c1c6a"},
+    {file = "fonttools-4.45.1-cp39-cp39-win32.whl", hash = "sha256:105099968b58a5b4cef6f3eb409db8ea8578b302a9d05e23fecba1b8b0177b5f"},
+    {file = "fonttools-4.45.1-cp39-cp39-win_amd64.whl", hash = "sha256:847f3f49dd3423e5a678c098e2ba92c7f4955d4aab3044f6a507b0bb0ecb07e0"},
+    {file = "fonttools-4.45.1-py3-none-any.whl", hash = "sha256:3bdd7dfca8f6c9f4779384064027e8477ad6a037d6a327b09381f43e0247c6f3"},
+    {file = "fonttools-4.45.1.tar.gz", hash = "sha256:6e441286d55fe7ec7c4fb36812bf914924813776ff514b744b510680fc2733f2"},
 ]
 
 [package.extras]
@@ -594,13 +594,13 @@ license = ["ukkonen"]
 
 [[package]]
 name = "idna"
-version = "3.4"
+version = "3.6"
 description = "Internationalized Domain Names in Applications (IDNA)"
 optional = false
 python-versions = ">=3.5"
 files = [
-    {file = "idna-3.4-py3-none-any.whl", hash = "sha256:90b77e79eaa3eba6de819a0c442c0b4ceefc341a7a2ab77d7562bf49f425c5c2"},
-    {file = "idna-3.4.tar.gz", hash = "sha256:814f528e8dead7d329833b91c5faa87d60bf71824cd12a7530b5526063d02cb4"},
+    {file = "idna-3.6-py3-none-any.whl", hash = "sha256:c05567e9c24a6b9faaa835c4821bad0590fbb9d5779e7caa6e1cc4978e7eb24f"},
+    {file = "idna-3.6.tar.gz", hash = "sha256:9ecdbbd083b06798ae1e86adcbfe8ab1479cf864e4ee30fe4e46a003d12491ca"},
 ]
 
 [[package]]
@@ -812,6 +812,16 @@ files = [
     {file = "MarkupSafe-2.1.3-cp311-cp311-musllinux_1_1_x86_64.whl", hash = "sha256:5bbe06f8eeafd38e5d0a4894ffec89378b6c6a625ff57e3028921f8ff59318ac"},
     {file = "MarkupSafe-2.1.3-cp311-cp311-win32.whl", hash = "sha256:dd15ff04ffd7e05ffcb7fe79f1b98041b8ea30ae9234aed2a9168b5797c3effb"},
     {file = "MarkupSafe-2.1.3-cp311-cp311-win_amd64.whl", hash = "sha256:134da1eca9ec0ae528110ccc9e48041e0828d79f24121a1a146161103c76e686"},
+    {file = "MarkupSafe-2.1.3-cp312-cp312-macosx_10_9_universal2.whl", hash = "sha256:f698de3fd0c4e6972b92290a45bd9b1536bffe8c6759c62471efaa8acb4c37bc"},
+    {file = "MarkupSafe-2.1.3-cp312-cp312-macosx_10_9_x86_64.whl", hash = "sha256:aa57bd9cf8ae831a362185ee444e15a93ecb2e344c8e52e4d721ea3ab6ef1823"},
+    {file = "MarkupSafe-2.1.3-cp312-cp312-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:ffcc3f7c66b5f5b7931a5aa68fc9cecc51e685ef90282f4a82f0f5e9b704ad11"},
+    {file = "MarkupSafe-2.1.3-cp312-cp312-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:47d4f1c5f80fc62fdd7777d0d40a2e9dda0a05883ab11374334f6c4de38adffd"},
+    {file = "MarkupSafe-2.1.3-cp312-cp312-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:1f67c7038d560d92149c060157d623c542173016c4babc0c1913cca0564b9939"},
+    {file = "MarkupSafe-2.1.3-cp312-cp312-musllinux_1_1_aarch64.whl", hash = "sha256:9aad3c1755095ce347e26488214ef77e0485a3c34a50c5a5e2471dff60b9dd9c"},
+    {file = "MarkupSafe-2.1.3-cp312-cp312-musllinux_1_1_i686.whl", hash = "sha256:14ff806850827afd6b07a5f32bd917fb7f45b046ba40c57abdb636674a8b559c"},
+    {file = "MarkupSafe-2.1.3-cp312-cp312-musllinux_1_1_x86_64.whl", hash = "sha256:8f9293864fe09b8149f0cc42ce56e3f0e54de883a9de90cd427f191c346eb2e1"},
+    {file = "MarkupSafe-2.1.3-cp312-cp312-win32.whl", hash = "sha256:715d3562f79d540f251b99ebd6d8baa547118974341db04f5ad06d5ea3eb8007"},
+    {file = "MarkupSafe-2.1.3-cp312-cp312-win_amd64.whl", hash = "sha256:1b8dd8c3fd14349433c79fa8abeb573a55fc0fdd769133baac1f5e07abf54aeb"},
     {file = "MarkupSafe-2.1.3-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:8e254ae696c88d98da6555f5ace2279cf7cd5b3f52be2b5cf97feafe883b58d2"},
     {file = "MarkupSafe-2.1.3-cp37-cp37m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:cb0932dc158471523c9637e807d9bfb93e06a95cbf010f1a38b98623b929ef2b"},
     {file = "MarkupSafe-2.1.3-cp37-cp37m-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:9402b03f1a1b4dc4c19845e5c749e3ab82d5078d16a2a4c2cd2df62d57bb0707"},
@@ -997,13 +1007,13 @@ files = [
 
 [[package]]
 name = "parse"
-version = "1.19.1"
+version = "1.20.0"
 description = "parse() is the opposite of format()"
 optional = false
 python-versions = "*"
 files = [
-    {file = "parse-1.19.1-py2.py3-none-any.whl", hash = "sha256:371ed3800dc63983832159cc9373156613947707bc448b5215473a219dbd4362"},
-    {file = "parse-1.19.1.tar.gz", hash = "sha256:cc3a47236ff05da377617ddefa867b7ba983819c664e1afe46249e5b469be464"},
+    {file = "parse-1.20.0-py2.py3-none-any.whl", hash = "sha256:5e171b001452fa9f004c5a58a93525175468daf69b493e9fa915347ed7ff6968"},
+    {file = "parse-1.20.0.tar.gz", hash = "sha256:bd28bae37714b45d5894d77160a16e2be36b64a3b618c81168b3684676aa498b"},
 ]
 
 [[package]]
@@ -1294,6 +1304,7 @@ files = [
     {file = "PyYAML-6.0.1-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:69b023b2b4daa7548bcfbd4aa3da05b3a74b772db9e23b982788168117739938"},
     {file = "PyYAML-6.0.1-cp310-cp310-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:81e0b275a9ecc9c0c0c07b4b90ba548307583c125f54d5b6946cfee6360c733d"},
     {file = "PyYAML-6.0.1-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:ba336e390cd8e4d1739f42dfe9bb83a3cc2e80f567d8805e11b46f4a943f5515"},
+    {file = "PyYAML-6.0.1-cp310-cp310-musllinux_1_1_x86_64.whl", hash = "sha256:326c013efe8048858a6d312ddd31d56e468118ad4cdeda36c719bf5bb6192290"},
     {file = "PyYAML-6.0.1-cp310-cp310-win32.whl", hash = "sha256:bd4af7373a854424dabd882decdc5579653d7868b8fb26dc7d0e99f823aa5924"},
     {file = "PyYAML-6.0.1-cp310-cp310-win_amd64.whl", hash = "sha256:fd1592b3fdf65fff2ad0004b5e363300ef59ced41c2e6b3a99d4089fa8c5435d"},
     {file = "PyYAML-6.0.1-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:6965a7bc3cf88e5a1c3bd2e0b5c22f8d677dc88a455344035f03399034eb3007"},
@@ -1301,8 +1312,15 @@ files = [
     {file = "PyYAML-6.0.1-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:42f8152b8dbc4fe7d96729ec2b99c7097d656dc1213a3229ca5383f973a5ed6d"},
     {file = "PyYAML-6.0.1-cp311-cp311-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:062582fca9fabdd2c8b54a3ef1c978d786e0f6b3a1510e0ac93ef59e0ddae2bc"},
     {file = "PyYAML-6.0.1-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:d2b04aac4d386b172d5b9692e2d2da8de7bfb6c387fa4f801fbf6fb2e6ba4673"},
+    {file = "PyYAML-6.0.1-cp311-cp311-musllinux_1_1_x86_64.whl", hash = "sha256:e7d73685e87afe9f3b36c799222440d6cf362062f78be1013661b00c5c6f678b"},
     {file = "PyYAML-6.0.1-cp311-cp311-win32.whl", hash = "sha256:1635fd110e8d85d55237ab316b5b011de701ea0f29d07611174a1b42f1444741"},
     {file = "PyYAML-6.0.1-cp311-cp311-win_amd64.whl", hash = "sha256:bf07ee2fef7014951eeb99f56f39c9bb4af143d8aa3c21b1677805985307da34"},
+    {file = "PyYAML-6.0.1-cp312-cp312-macosx_10_9_x86_64.whl", hash = "sha256:855fb52b0dc35af121542a76b9a84f8d1cd886ea97c84703eaa6d88e37a2ad28"},
+    {file = "PyYAML-6.0.1-cp312-cp312-macosx_11_0_arm64.whl", hash = "sha256:40df9b996c2b73138957fe23a16a4f0ba614f4c0efce1e9406a184b6d07fa3a9"},
+    {file = "PyYAML-6.0.1-cp312-cp312-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:6c22bec3fbe2524cde73d7ada88f6566758a8f7227bfbf93a408a9d86bcc12a0"},
+    {file = "PyYAML-6.0.1-cp312-cp312-musllinux_1_1_x86_64.whl", hash = "sha256:8d4e9c88387b0f5c7d5f281e55304de64cf7f9c0021a3525bd3b1c542da3b0e4"},
+    {file = "PyYAML-6.0.1-cp312-cp312-win32.whl", hash = "sha256:d483d2cdf104e7c9fa60c544d92981f12ad66a457afae824d146093b8c294c54"},
+    {file = "PyYAML-6.0.1-cp312-cp312-win_amd64.whl", hash = "sha256:0d3304d8c0adc42be59c5f8a4d9e3d7379e6955ad754aa9d6ab7a398b59dd1df"},
     {file = "PyYAML-6.0.1-cp36-cp36m-macosx_10_9_x86_64.whl", hash = "sha256:50550eb667afee136e9a77d6dc71ae76a44df8b3e51e41b77f6de2932bfe0f47"},
     {file = "PyYAML-6.0.1-cp36-cp36m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:1fe35611261b29bd1de0070f0b2f47cb6ff71fa6595c077e42bd0c419fa27b98"},
     {file = "PyYAML-6.0.1-cp36-cp36m-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:704219a11b772aea0d8ecd7058d0082713c3562b4e271b849ad7dc4a5c90c13c"},
@@ -1319,6 +1337,7 @@ files = [
     {file = "PyYAML-6.0.1-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:a0cd17c15d3bb3fa06978b4e8958dcdc6e0174ccea823003a106c7d4d7899ac5"},
     {file = "PyYAML-6.0.1-cp38-cp38-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:28c119d996beec18c05208a8bd78cbe4007878c6dd15091efb73a30e90539696"},
     {file = "PyYAML-6.0.1-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:7e07cbde391ba96ab58e532ff4803f79c4129397514e1413a7dc761ccd755735"},
+    {file = "PyYAML-6.0.1-cp38-cp38-musllinux_1_1_x86_64.whl", hash = "sha256:49a183be227561de579b4a36efbb21b3eab9651dd81b1858589f796549873dd6"},
     {file = "PyYAML-6.0.1-cp38-cp38-win32.whl", hash = "sha256:184c5108a2aca3c5b3d3bf9395d50893a7ab82a38004c8f61c258d4428e80206"},
     {file = "PyYAML-6.0.1-cp38-cp38-win_amd64.whl", hash = "sha256:1e2722cc9fbb45d9b87631ac70924c11d3a401b2d7f410cc0e3bbf249f2dca62"},
     {file = "PyYAML-6.0.1-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:9eb6caa9a297fc2c2fb8862bc5370d0303ddba53ba97e71f08023b6cd73d16a8"},
@@ -1326,6 +1345,7 @@ files = [
     {file = "PyYAML-6.0.1-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:5773183b6446b2c99bb77e77595dd486303b4faab2b086e7b17bc6bef28865f6"},
     {file = "PyYAML-6.0.1-cp39-cp39-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:b786eecbdf8499b9ca1d697215862083bd6d2a99965554781d0d8d1ad31e13a0"},
     {file = "PyYAML-6.0.1-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:bc1bf2925a1ecd43da378f4db9e4f799775d6367bdb94671027b73b393a7c42c"},
+    {file = "PyYAML-6.0.1-cp39-cp39-musllinux_1_1_x86_64.whl", hash = "sha256:04ac92ad1925b2cff1db0cfebffb6ffc43457495c9b3c39d3fcae417d7125dc5"},
     {file = "PyYAML-6.0.1-cp39-cp39-win32.whl", hash = "sha256:faca3bdcf85b2fc05d06ff3fbc1f83e1391b3e724afa3feba7d13eeab355484c"},
     {file = "PyYAML-6.0.1-cp39-cp39-win_amd64.whl", hash = "sha256:510c9deebc5c0225e8c96813043e62b680ba2f9c50a08d3724c7f28a747d1486"},
     {file = "PyYAML-6.0.1.tar.gz", hash = "sha256:bfdf460b1736c775f2ba9f6a92bca30bc2095067b8a9d77876d1fad6cc3b4a43"},
@@ -1432,13 +1452,13 @@ files = [
 
 [[package]]
 name = "tox"
-version = "4.11.3"
+version = "4.11.4"
 description = "tox is a generic virtualenv management and test command line tool"
 optional = false
 python-versions = ">=3.8"
 files = [
-    {file = "tox-4.11.3-py3-none-any.whl", hash = "sha256:599af5e5bb0cad0148ac1558a0b66f8fff219ef88363483b8d92a81e4246f28f"},
-    {file = "tox-4.11.3.tar.gz", hash = "sha256:5039f68276461fae6a9452a3b2c7295798f00a0e92edcd9a3b78ba1a73577951"},
+    {file = "tox-4.11.4-py3-none-any.whl", hash = "sha256:2adb83d68f27116812b69aa36676a8d6a52249cb0d173649de0e7d0c2e3e7229"},
+    {file = "tox-4.11.4.tar.gz", hash = "sha256:73a7240778fabf305aeb05ab8ea26e575e042ab5a18d71d0ed13e343a51d6ce1"},
 ]
 
 [package.dependencies]
@@ -1526,4 +1546,4 @@ test = ["covdefaults (>=2.3)", "coverage (>=7.2.7)", "coverage-enable-subprocess
 [metadata]
 lock-version = "2.0"
 python-versions = "^3.12"
-content-hash = "75ac694ef0318c8f222af9998b5f1b47137577acd2a5f04784ccf899a30f8304"
+content-hash = "ec699ae456775afafd4ae032239e662cf7650f927de196d46859606865194f61"
diff --git a/pyproject.toml b/pyproject.toml
index e12f868d..e423dde8 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -27,7 +27,7 @@ numpy = "^1.26.2"
 adventofcodeutils = {git = "https://github.com/RoelAdriaans/adventofcodeutils.git"}
 more-itertools = "^10.1.0"
 regex-spm = "^1.0.0"
-parse = "^1.19.1"
+parse = "^1.20.0"
 matplotlib = "^3.8.2"
 
 [tool.poetry.dev-dependencies]
@@ -37,7 +37,7 @@ pytest = "^7.4.3"
 pytest-cov = "^4.1.0"
 pytest-xdist = "^3.5.0"
 python-dotenv = "^1.0.0"
-tox = "^4.11.3"
+tox = "^4.11.4"
 pre-commit = "^3.5.0"
 isort = "^5.12.0"
 

From c04b4e2f68f7f6ab1e89e6887d584588e413fe38 Mon Sep 17 00:00:00 2001
From: Roel Adriaans <roel@adriaans.org>
Date: Sun, 3 Dec 2023 11:55:24 +0100
Subject: [PATCH 339/371] 2023, day 2. Not a clean solution, but it works

---
 src/adventofcode2023/data/day_02/day02.txt    | 100 ++++++++++++++++++
 .../data/day_02/day02_test.txt                |   5 +
 src/adventofcode2023/day02.py                 |  66 ++++++++++++
 tests/adventofcode2023/test_day02_a.py        |  14 +++
 tests/adventofcode2023/test_day02_b.py        |  14 +++
 5 files changed, 199 insertions(+)
 create mode 100644 src/adventofcode2023/data/day_02/day02.txt
 create mode 100644 src/adventofcode2023/data/day_02/day02_test.txt
 create mode 100644 src/adventofcode2023/day02.py
 create mode 100644 tests/adventofcode2023/test_day02_a.py
 create mode 100644 tests/adventofcode2023/test_day02_b.py

diff --git a/src/adventofcode2023/data/day_02/day02.txt b/src/adventofcode2023/data/day_02/day02.txt
new file mode 100644
index 00000000..0bb1d4b6
--- /dev/null
+++ b/src/adventofcode2023/data/day_02/day02.txt
@@ -0,0 +1,100 @@
+Game 1: 8 green, 4 red, 4 blue; 1 green, 6 red, 4 blue; 7 red, 4 green, 1 blue; 2 blue, 8 red, 8 green
+Game 2: 11 green, 7 blue, 15 red; 13 red, 6 green, 2 blue; 7 green, 9 red, 10 blue; 5 blue, 1 red, 11 green; 4 blue, 18 green; 4 red, 8 blue, 18 green
+Game 3: 7 red, 10 green, 4 blue; 2 blue, 3 green, 5 red; 9 red, 7 green, 3 blue; 3 blue, 6 green, 18 red
+Game 4: 1 blue, 2 green, 5 red; 10 red, 1 blue, 3 green; 14 red
+Game 5: 16 red, 4 green, 19 blue; 13 blue, 9 red; 7 green, 14 red, 2 blue; 5 green, 18 blue, 4 red; 7 red, 2 blue, 3 green; 8 blue, 12 green
+Game 6: 3 blue, 8 green; 4 red, 5 green; 5 red, 8 blue, 5 green; 8 blue, 4 green; 3 red, 7 green, 2 blue
+Game 7: 7 red, 2 blue; 5 red, 6 green; 10 red; 2 blue, 12 red, 2 green; 4 red, 1 blue, 1 green; 9 green, 2 blue, 10 red
+Game 8: 3 red, 7 green, 3 blue; 2 green, 3 blue, 3 red; 3 blue, 4 green, 1 red; 3 blue, 3 red; 2 blue, 6 green; 2 red, 7 green, 1 blue
+Game 9: 5 red, 6 green; 6 red; 2 blue, 3 green, 9 red; 6 green, 2 blue
+Game 10: 5 red, 8 blue, 5 green; 15 red, 6 green, 7 blue; 8 blue, 6 red, 5 green; 5 green, 2 blue; 12 red, 6 blue; 6 green, 16 red, 6 blue
+Game 11: 3 red, 7 blue; 2 red, 3 blue, 6 green; 4 red, 5 green, 2 blue
+Game 12: 15 green, 6 red, 2 blue; 3 red, 8 green, 9 blue; 8 blue, 2 red, 7 green; 5 red, 11 green, 6 blue
+Game 13: 1 blue; 1 green, 6 red; 8 red, 3 blue; 5 blue, 8 red, 2 green
+Game 14: 4 green, 1 blue; 8 blue, 5 green, 1 red; 2 green, 8 blue, 3 red
+Game 15: 7 blue, 9 red, 8 green; 9 green, 12 blue, 5 red; 8 green, 10 blue, 2 red
+Game 16: 1 blue, 1 red, 14 green; 6 green, 4 blue, 1 red; 16 blue, 14 green; 6 green, 2 red, 9 blue; 1 red, 1 blue; 2 red, 13 green, 7 blue
+Game 17: 1 red, 9 green; 9 red, 5 blue, 2 green; 2 red, 8 green, 5 blue; 5 blue, 1 green, 3 red; 3 green, 5 blue; 3 red, 5 blue, 9 green
+Game 18: 3 blue, 5 red, 3 green; 8 blue, 14 green; 3 blue, 11 red; 2 blue, 10 red, 9 green
+Game 19: 7 green, 8 blue, 10 red; 1 green, 10 red, 2 blue; 6 blue, 4 red, 11 green; 7 red, 4 green; 6 blue, 4 red; 4 green, 2 red, 3 blue
+Game 20: 5 red; 16 blue, 4 green, 7 red; 1 red, 1 green, 4 blue; 3 blue, 4 green, 7 red; 5 blue, 2 red, 3 green; 17 blue, 5 red
+Game 21: 11 red, 4 green, 4 blue; 11 red, 5 blue, 2 green; 11 red, 13 green, 2 blue; 13 green, 6 red, 5 blue; 7 green, 4 blue, 8 red; 6 red, 8 blue, 14 green
+Game 22: 2 green, 1 red, 6 blue; 3 blue, 2 green; 7 green, 10 red; 10 red, 7 blue, 5 green
+Game 23: 14 green, 8 blue; 2 red, 5 green; 8 red, 16 green, 10 blue; 1 green, 7 red, 8 blue; 15 green, 5 red; 15 green, 2 red, 5 blue
+Game 24: 4 blue, 1 green, 1 red; 1 blue, 8 green, 3 red; 4 red, 9 blue, 4 green
+Game 25: 2 blue, 1 green, 3 red; 2 green, 4 red; 2 green, 1 blue
+Game 26: 3 red, 5 green, 4 blue; 5 green, 8 blue; 1 blue, 3 green, 3 red; 7 blue, 2 red
+Game 27: 13 red, 9 green, 6 blue; 19 blue, 9 red, 4 green; 14 red, 4 green, 11 blue; 5 green, 12 blue, 7 red
+Game 28: 9 green, 4 blue, 15 red; 18 blue, 14 red, 12 green; 14 red, 12 blue, 3 green; 6 blue, 7 green, 15 red; 17 blue, 6 green, 9 red; 7 red, 12 green
+Game 29: 17 red, 2 blue, 9 green; 5 blue, 15 red, 11 green; 13 red, 3 green, 5 blue; 4 green, 11 red, 1 blue; 5 green, 1 blue
+Game 30: 3 green, 12 blue; 15 red, 2 blue, 6 green; 12 red, 11 blue, 10 green; 9 blue, 7 green, 14 red; 1 green, 7 red, 5 blue
+Game 31: 6 green, 7 red, 18 blue; 2 green, 3 blue, 10 red; 9 blue, 8 red; 18 blue, 10 green, 4 red; 14 blue, 11 red, 10 green
+Game 32: 7 green, 1 red, 5 blue; 5 green, 3 blue; 6 blue, 5 green; 5 red, 11 green, 6 blue
+Game 33: 9 blue, 5 red; 2 blue; 6 red, 8 blue; 10 blue, 4 green, 6 red; 2 red, 4 green; 1 red, 6 blue, 2 green
+Game 34: 1 red, 6 green; 3 green, 6 red, 2 blue; 2 red, 2 blue, 1 green; 5 green, 1 red, 2 blue
+Game 35: 7 red, 2 green, 4 blue; 4 red, 2 green, 3 blue; 14 green, 2 blue, 5 red; 14 green, 2 red, 3 blue; 5 green, 2 red, 1 blue; 2 green, 8 red, 3 blue
+Game 36: 7 green, 1 red, 1 blue; 3 blue, 6 green, 9 red; 2 blue, 17 red; 18 red, 2 green
+Game 37: 6 red, 14 blue; 3 green, 2 blue; 18 blue, 6 red; 3 red, 18 blue, 3 green
+Game 38: 6 blue, 8 red; 9 blue, 1 green, 1 red; 2 green, 10 blue, 1 red
+Game 39: 9 red, 2 green; 7 red, 2 blue, 2 green; 2 blue, 1 red, 8 green
+Game 40: 15 green, 1 blue, 1 red; 3 blue, 1 red, 6 green; 2 blue, 11 green; 2 blue, 11 green; 3 green, 4 blue, 1 red; 2 blue, 6 green
+Game 41: 4 blue, 9 green; 11 green, 1 blue, 7 red; 1 red, 3 blue, 17 green; 17 green, 2 red; 2 blue, 16 green, 8 red; 1 blue, 8 green, 3 red
+Game 42: 7 green, 15 blue, 2 red; 1 green, 5 blue, 5 red; 4 green, 6 red; 4 red, 4 blue, 1 green; 1 blue, 4 red
+Game 43: 10 green, 6 blue, 8 red; 9 green, 9 red, 4 blue; 6 blue, 3 green, 6 red; 8 blue, 16 green, 7 red
+Game 44: 14 red, 14 blue; 11 red, 1 blue; 1 green, 9 red, 15 blue; 1 green, 10 red
+Game 45: 10 blue, 5 red; 1 green, 2 red, 11 blue; 2 blue, 10 red, 1 green
+Game 46: 10 red, 9 green, 5 blue; 9 green, 2 red, 5 blue; 3 blue, 14 red, 4 green; 2 red, 1 green, 6 blue; 2 red, 9 blue, 4 green; 5 green, 2 blue, 11 red
+Game 47: 9 red, 5 green, 1 blue; 3 red, 1 green; 8 red, 2 blue, 10 green; 9 green, 9 red, 2 blue; 13 green, 3 blue, 6 red
+Game 48: 15 blue, 3 red, 8 green; 2 blue; 12 green, 7 blue, 1 red
+Game 49: 9 blue, 3 red, 2 green; 12 green, 17 blue, 2 red; 3 green, 1 red, 8 blue; 16 blue, 3 green, 3 red
+Game 50: 17 blue, 2 red, 14 green; 18 blue, 12 green; 13 blue, 6 red, 8 green; 4 blue, 6 red, 4 green
+Game 51: 3 blue, 8 green, 4 red; 5 blue, 5 green, 4 red; 2 red, 8 blue, 2 green; 8 green, 3 blue; 9 green, 5 blue, 1 red
+Game 52: 9 red, 5 green, 6 blue; 3 red, 8 green; 2 red, 3 blue, 6 green; 8 red, 4 blue, 2 green
+Game 53: 6 green, 13 blue; 4 red, 7 green; 2 green, 7 red; 11 red, 2 blue; 12 blue, 9 green, 8 red
+Game 54: 3 red, 3 blue, 3 green; 3 green, 2 red, 1 blue; 13 blue, 3 green; 5 red, 4 green, 13 blue; 4 green, 7 blue, 9 red
+Game 55: 15 blue, 3 green, 2 red; 1 red, 8 green; 19 blue, 7 green; 4 green, 19 blue; 9 blue, 7 green, 2 red
+Game 56: 1 blue, 9 green, 11 red; 3 blue, 12 green, 2 red; 1 blue, 12 green, 4 red; 16 green, 3 blue, 3 red; 18 red, 9 green
+Game 57: 7 blue, 6 red, 3 green; 11 red, 5 blue, 4 green; 9 blue, 1 green, 5 red
+Game 58: 17 green, 17 red, 6 blue; 10 red, 13 blue, 1 green; 7 red, 14 green; 6 red, 2 blue, 8 green; 13 red, 13 blue, 4 green
+Game 59: 1 green, 4 red, 1 blue; 1 red, 1 green; 1 red; 4 blue; 6 red, 6 blue, 1 green
+Game 60: 7 blue, 17 red, 8 green; 12 green, 6 red, 8 blue; 1 red, 9 blue, 12 green
+Game 61: 2 green, 15 blue, 2 red; 1 green, 9 blue, 12 red; 12 red, 3 green, 19 blue
+Game 62: 17 red, 1 blue; 5 green, 16 blue, 14 red; 3 red, 7 blue; 8 blue, 3 red, 1 green
+Game 63: 9 red, 9 blue; 10 blue, 6 red, 9 green; 11 green, 1 blue, 13 red; 6 green, 13 blue, 9 red
+Game 64: 16 blue, 2 red; 9 blue; 10 red, 1 blue, 4 green
+Game 65: 1 blue, 18 green; 19 green, 1 red; 10 green, 1 blue, 1 red
+Game 66: 12 blue, 5 green, 13 red; 3 green, 3 blue; 1 green, 1 blue, 11 red
+Game 67: 5 red, 2 green; 7 red, 3 blue; 1 green, 8 red, 6 blue; 2 red, 5 blue; 8 red, 6 blue
+Game 68: 8 green, 6 red, 18 blue; 8 green, 6 red, 3 blue; 4 red, 14 blue, 11 green
+Game 69: 6 blue, 3 red, 1 green; 4 green, 6 red, 6 blue; 2 green, 13 red; 9 red, 5 blue, 6 green; 2 green, 11 red; 6 green, 2 red, 1 blue
+Game 70: 7 blue, 18 green, 12 red; 17 green, 2 red, 8 blue; 17 red, 13 green, 2 blue; 1 red, 2 green, 7 blue
+Game 71: 3 blue, 1 red, 15 green; 13 green, 2 red, 8 blue; 7 green, 12 blue; 7 blue, 12 green; 7 blue, 5 green
+Game 72: 6 blue, 18 red; 1 blue, 4 green, 3 red; 11 red, 3 green; 6 blue, 5 red, 13 green; 11 green, 16 red, 5 blue; 3 green, 5 blue
+Game 73: 18 red, 1 blue, 3 green; 4 blue, 4 red, 4 green; 1 blue, 3 red; 2 red, 1 green
+Game 74: 5 red; 12 red, 4 green; 4 green, 5 red; 2 red, 1 blue, 4 green
+Game 75: 2 red, 2 blue, 6 green; 2 blue, 6 green; 3 green, 1 red
+Game 76: 6 green, 1 blue, 12 red; 2 green, 2 red, 3 blue; 3 green, 10 red, 3 blue; 3 blue, 16 red, 11 green; 15 red, 5 blue, 7 green; 4 green, 4 red, 3 blue
+Game 77: 14 green, 4 blue, 11 red; 12 blue, 9 red, 19 green; 10 green, 4 blue
+Game 78: 1 blue, 11 red; 1 blue, 14 green, 4 red; 7 green, 3 blue, 5 red
+Game 79: 3 red, 13 blue; 14 blue, 5 red, 5 green; 1 green, 7 blue, 2 red; 5 green, 13 blue, 3 red; 7 blue, 5 red, 2 green
+Game 80: 2 green, 11 blue; 2 red, 12 blue, 1 green; 11 blue, 11 green; 2 green, 12 blue, 1 red
+Game 81: 8 blue, 5 green, 1 red; 1 red, 6 blue, 4 green; 6 green, 10 blue; 2 red, 9 blue, 2 green; 6 blue, 2 green; 6 green, 9 blue, 2 red
+Game 82: 13 red, 12 green, 3 blue; 4 blue, 4 red, 1 green; 4 green, 8 red, 2 blue; 7 red, 13 green
+Game 83: 2 green, 8 red, 1 blue; 2 blue, 6 red, 8 green; 5 green, 1 blue
+Game 84: 6 red, 18 blue, 5 green; 3 green, 15 blue, 2 red; 6 red, 6 blue, 8 green; 1 red, 4 blue, 2 green; 2 blue, 5 green
+Game 85: 3 red, 11 green, 2 blue; 3 blue, 6 green; 2 red, 4 green, 4 blue; 1 blue, 3 red, 10 green; 4 blue, 7 green, 4 red
+Game 86: 7 green, 16 blue; 4 blue, 1 green, 7 red; 6 red, 15 green, 9 blue; 7 green, 9 red, 2 blue; 14 green, 2 blue
+Game 87: 8 red, 3 blue, 8 green; 3 red, 1 blue, 8 green; 6 red, 5 green; 2 red, 6 green, 2 blue; 6 green, 2 red
+Game 88: 1 blue, 4 red, 12 green; 4 red, 1 blue, 14 green; 1 blue, 10 green, 4 red; 1 blue, 10 red, 9 green
+Game 89: 7 green, 6 red, 10 blue; 4 red, 5 green; 2 green, 13 blue, 2 red
+Game 90: 16 blue, 2 green, 10 red; 4 green, 7 red, 14 blue; 4 blue, 11 green, 3 red; 3 red, 10 blue, 3 green
+Game 91: 7 green, 7 red, 4 blue; 14 red, 11 blue; 16 red, 8 green, 15 blue
+Game 92: 5 blue, 12 red, 3 green; 2 blue, 8 green, 5 red; 5 blue, 10 green; 11 green, 6 red, 4 blue; 5 red, 4 green, 4 blue
+Game 93: 4 blue, 3 green, 5 red; 7 red, 17 blue; 8 blue, 7 green; 17 blue, 1 green; 2 red, 6 blue, 2 green; 15 blue, 3 red, 4 green
+Game 94: 9 green, 3 red, 2 blue; 3 green, 6 red; 13 green, 4 red, 2 blue; 7 green; 4 green, 7 red; 2 red, 9 green, 2 blue
+Game 95: 3 green, 11 red, 5 blue; 6 blue, 8 green; 9 green, 6 blue; 6 red, 1 green
+Game 96: 3 blue, 3 green, 10 red; 2 blue, 12 red; 4 red, 3 blue; 2 green, 3 red, 1 blue; 2 green, 6 blue
+Game 97: 5 blue, 3 green, 2 red; 2 blue, 3 green, 5 red; 12 red, 3 blue
+Game 98: 2 blue, 2 red, 9 green; 4 green, 5 blue, 1 red; 15 green, 3 red, 9 blue
+Game 99: 15 red, 7 green, 11 blue; 2 blue, 12 green, 17 red; 6 red, 3 blue, 11 green; 14 red, 13 green, 5 blue
+Game 100: 5 green, 17 blue, 5 red; 15 blue; 13 green, 8 red, 3 blue; 16 blue, 15 green, 8 red; 16 green, 2 blue, 3 red
diff --git a/src/adventofcode2023/data/day_02/day02_test.txt b/src/adventofcode2023/data/day_02/day02_test.txt
new file mode 100644
index 00000000..295c36dd
--- /dev/null
+++ b/src/adventofcode2023/data/day_02/day02_test.txt
@@ -0,0 +1,5 @@
+Game 1: 3 blue, 4 red; 1 red, 2 green, 6 blue; 2 green
+Game 2: 1 blue, 2 green; 3 green, 4 blue, 1 red; 1 green, 1 blue
+Game 3: 8 green, 6 blue, 20 red; 5 blue, 4 red, 13 green; 5 green, 1 red
+Game 4: 1 green, 3 red, 6 blue; 3 green, 6 red; 3 green, 15 blue, 14 red
+Game 5: 6 red, 1 blue, 3 green; 2 blue, 1 red, 2 green
diff --git a/src/adventofcode2023/day02.py b/src/adventofcode2023/day02.py
new file mode 100644
index 00000000..8a7cd692
--- /dev/null
+++ b/src/adventofcode2023/day02.py
@@ -0,0 +1,66 @@
+from __future__ import annotations
+
+from collections import Counter
+
+from adventofcode.utils.abstract import FileReaderSolution
+
+
+class Day02:
+    pass
+
+
+class Day02PartA(Day02, FileReaderSolution):
+    def solve(self, input_data: str) -> int:
+        valid_games = 0
+
+        for line in input_data.splitlines():
+            line = line.replace(":", "").replace(";", "").replace(",", "")
+
+            parts = line.split()
+            game_id = int(parts[1])
+            is_valid = True
+            for number_idx in range(2, len(parts), 2):
+                colors = Counter()
+                color_idx = number_idx + 1
+                colors[parts[color_idx]] += int(parts[number_idx])
+
+                if (
+                    colors["red"] <= 12
+                    and colors["green"] <= 13
+                    and colors["blue"] <= 14
+                ):
+                    pass
+                else:
+                    is_valid = False
+            if is_valid:
+                valid_games += game_id
+        return valid_games
+
+
+class Day02PartB(Day02, FileReaderSolution):
+    def solve(self, input_data: str) -> int:
+        total = 0
+
+        for line in input_data.splitlines():
+            line = line.replace(":", "").replace(";", "").replace(",", "")
+
+            parts = line.split()
+            max_colors = {
+                "red": False,
+                "green": False,
+                "blue": False,
+            }
+
+            for number_idx in range(2, len(parts), 2):
+                color_idx = number_idx + 1
+                color = parts[color_idx]
+                number = int(parts[number_idx])
+
+                # Check if the number is the lowest
+                if not max_colors[color]:
+                    max_colors[color] = number
+                else:
+                    max_colors[color] = max(max_colors[color], number)
+            res = max_colors["red"] * max_colors["green"] * max_colors["blue"]
+            total += res
+        return total
diff --git a/tests/adventofcode2023/test_day02_a.py b/tests/adventofcode2023/test_day02_a.py
new file mode 100644
index 00000000..6abac6d3
--- /dev/null
+++ b/tests/adventofcode2023/test_day02_a.py
@@ -0,0 +1,14 @@
+from adventofcode2023.day02 import Day02PartA
+
+
+class TestDay02PartA:
+    def test_day02a_testdata(self, testdata):
+        solution = Day02PartA()
+        result = solution.solve(testdata)
+        assert result == 8
+
+    def test_day02a_data(self):
+        """Result we got when we did the real solution"""
+        solution = Day02PartA()
+        res = solution("day_02/day02.txt")
+        assert res == 2085
diff --git a/tests/adventofcode2023/test_day02_b.py b/tests/adventofcode2023/test_day02_b.py
new file mode 100644
index 00000000..c53b3a34
--- /dev/null
+++ b/tests/adventofcode2023/test_day02_b.py
@@ -0,0 +1,14 @@
+from adventofcode2023.day02 import Day02PartB
+
+
+class TestDay02PartB:
+    def test_day02b_testdata(self, testdata):
+        solution = Day02PartB()
+        result = solution.solve(testdata)
+        assert result == 2286
+
+    def test_day02b_data(self):
+        """Result we got when we did the real solution"""
+        solution = Day02PartB()
+        res = solution("day_02/day02.txt")
+        assert res == 79315

From ba32242f44600783f294b16e28cb130df4b37a28 Mon Sep 17 00:00:00 2001
From: Roel Adriaans <roel@adriaans.org>
Date: Sun, 3 Dec 2023 19:29:52 +0100
Subject: [PATCH 340/371] 2023, part 3.

Off-by-one errors galore...
---
 src/adventofcode2023/data/day_03/day03.txt    | 140 ++++++++++++++++++
 .../data/day_03/day03_test.txt                |  10 ++
 src/adventofcode2023/day03.py                 |  71 +++++++++
 tests/adventofcode2023/test_day03_a.py        |  17 +++
 tests/adventofcode2023/test_day03_b.py        |  25 ++++
 5 files changed, 263 insertions(+)
 create mode 100644 src/adventofcode2023/data/day_03/day03.txt
 create mode 100644 src/adventofcode2023/data/day_03/day03_test.txt
 create mode 100644 src/adventofcode2023/day03.py
 create mode 100644 tests/adventofcode2023/test_day03_a.py
 create mode 100644 tests/adventofcode2023/test_day03_b.py

diff --git a/src/adventofcode2023/data/day_03/day03.txt b/src/adventofcode2023/data/day_03/day03.txt
new file mode 100644
index 00000000..73e32db8
--- /dev/null
+++ b/src/adventofcode2023/data/day_03/day03.txt
@@ -0,0 +1,140 @@
+.........874.772...........787..........556.....292......141................910............54...............................................
+.......*..*.......314............308.......*....*..............156.759.....*................*.......408*954.84..55.......................515
+......927.49...........734...............115...738..=....723..........*...599.......+........573.....................324..../508............
+........................*.....222..................298....+........313.............504...../.....375.................................114....
+.962...262............988..........*170.....................543...........61............827..244.&..................610......310....#.......
+...*..........129...............243...................809....&...+.........*...742............%....*96..100.....766...*..308....*......37...
+..2...295....../........*336..*......#..185...........*.........502......301...*.......................*...........-.770..-...599...........
+.......-.............343......750..661....%........+..323.....1..............480.........+..............198.......................533.../764
+..................................................799.....832.......640.................413...392............597.................=..........
+......$795...678....954.....*96...........671.%..........*.......23....@.536..................*...450..........*.....427..............413...
+..314...........*.....+.827.......757.550*.....475.148.614.........@......$.......*429.....849....*...%584....706....*..........248...*.....
+.......246.......830....*..........................*.......52..................663...............55...............606........%.......72.....
+......&.....378.........342....10.849............394.....&...*.....697*............................./629...700........=.......217...........
+........208*......*783.........*...*.......496.........108...757..............564..............................904....448...................
+..../..........716............428..28..879*..........................*506.823....*690......53...................*.............291......357..
+..920.@172.........869..................................185.......809......../.............*......*821.......296..............*.......*.....
+...........965........*...................669.793........................*................238..609......465.........504.....574..970=.575...
+...................520.....................*.....&......................2.44..*......*..............@...*.......254*.....17.................
+............574../.......*..............894...........939....236...875........92..873....555.825*.543..344..483......677*......123..........
+...257..../.*....301.....83......*929........+.......&.............*...=...#..............#...................................*.............
+.......218...648...../.....................533.683*....419........76.461.268......915...............523.....482.............788........845..
+..................846......405.807.................693....%...................668*....193$....*......*.....@.......368.67..........703*.....
+................&.............*.........752.988......................967*..................652.746.772...6........*.........................
+....638.....769.829....*...97......536.#..........................&......786......@......................*......440.........................
+....*........*..........55...*......*...............598*387.......744..........141....254*......157.....977..32...................606.392...
+...682........268............134...187.........25.........................................561.....*............*.................*......*...
+.......718........773............................*.....781...380......856....445......601.......71..........884........949*13..888.......277
+.......*......487*.......$....$........8..@613....868.....*.....&....*............899*....*994........116............................806....
+....807.............441..848.692.-13...*...................723........646.....525...........................*............289...........*.957
+........-......891.....@.............185........672............................*.....626..937............838............@...........698.....
+....634..418.....@.......75.430................*.......588-....815..56*685....714...@....*........+................385*.....................
+620..*.......720....580........*521.772...222..763.888...........*........../..........537.818..534....................370..942.384...991...
+.....462.......*...&.......118......*....................915.....797......255.....734........*.................*.............=.....-....*...
+...............529..........+..701#..56.......@447..@......%..........-..............=.....197..../..........37....223.................186..
+............#......................................702.846...........791..85..698..............755......458........#........847.............
+.........993......916...@669.....493.........&...........*.....*..........*..-...........921...........$...............100...*..717.....489.
+..................-................*.456..634.........202....=.815.......769................*...................300.....#..649...*......*...
+....................762................*........211.......164.........27............817.286.....@493..............*............@..422.837...
+......470.............*...............160...........560.......962.....*.....431.909..*..*...712.........852....838.........64.614...........
+........*........404...406.=561....98........@........-.195.....*...320..........*..922.777..*.............%.&.........530..................
+.71.....680.-79.....*..............*..859....625...............300..............465....................515...795...111.....646@.............
+...................13...545.....386....*...............................865..........537.815........731.*.............*..........=.572*......
+...........173.......................324...............................*...../.......*.....*157......*.480........175...662$..471.....136...
+.....443*6...*...........*165....481............211/...373*297........470.....982..402............895........54.............................
+...........11...&.....848...........@..........................@769.......................120...................555*........%........734....
+..............827..........723...........178.............308........659............#492......*.............10.......80.......966.....*......
+.....438-........................$.........................$./......*....%196..............299...393......*..............78.........629.....
+.......................743....200...............243..702......447....775.........328.......................274.......360*.......459.........
+....723..........514..../...........479......76*......*.........../......&....../......861...........$807......................*......+.....
+.......*.....987................226....*.........#..867..........481......165......415*...................212...%649.....923-...685....346..
+...+....914...*...........336.....@.278..622....204......269.976........................487.....%...727-.*..................................
+..937.........38..-......$.................-........992.......*................628..740*.....%.445........360..............429.......917....
+..........$.......592........481*285.....=.................126.............................269.......702........................823.#.......
+..........593..52........546.............282..*226..............108..412.............=............#..................869....@....&..........
+628............*..768......=.655...................*............*.....*...../..909....855....$....400.......238.........*11..545............
+.............577....................../......147....945.31......979.846....403../.............742............*.......=.............#........
+505+................485.............411......-..........-...........................536...-.........144......885....42...218.147...329......
+......................&.849*714..........94*...856..........89..457.......*.....%...&...180........*......@..............*......*...........
+....................-.......................68........651../...........264...&..252...............359...256..669*.......766..668...193......
+.........992....743.860..174....&303............883.....*.....732..........433..........609...125................308.................*......
+..592....#...64..*..........*........656..505..*......546.....&........422.........#............*.613.382..123............%....721...572....
+...*.........*..........839.364.........*....*.549..............336...*...........129.......632....*....*.....#..647..122..25...............
+.612...-..%............$..............628..489......................-.850..633.........=......*...972.660........*....*.....................
+.....410..765.........................................../102.652..529.....*.............533..788............449&..8..875...846..392..649....
+....................&.......581.....352............107+..................251.....130........................................./.......$......
+.....807.........722...........*....*..........#...............+.116...............+..122.................184*491..&142.....................
+.....&....755............894..227.315.........648..968......515....&.................*.....+..62............................................
+............*.............-...........523............*....-...........165......434...106.427....#............241...........461......451.....
+...#246...905.297..#668......=.....=....$...........712..778..968........*........*...............592........*.......703#..............*....
+..............*............837....396........898..............+.....232.110....785...............*.........644...803...................178..
+.......&190....69...*665....................*...................161.&.................618.../.........660..........*............850.........
+.............$.............896.896.........884.............287...#........568................588.........@.........236....369$.....&........
+.....@........464.........$....*............................*......958....*.......816.......................................................
+..385.................877............160........263...&763..634...-........556.....*....658......953.......276........634+..&...........861.
+......................*.....914.208.*..............*................472....................@........*937.#....*745..........841..910...-....
+.......851........259..339.....*.....756.........285................*.........-................66+.......111........................@.......
+.409....@........*.........................474.........+...197......180.@.....567.......................................850.................
+....*......972.739.....*.....831*.............=......489.................611............*246.....................27.......*..631#......+....
+.....314...*........334.968......739......505...............844.......................................732..............322...........33.....
+............49...&..........*...............*........791..........152.....................247....166.............243.........826............
+529&..544........275.....140.322..........73......+......435...................942...273....*.......#........749....*.......*...............
+........*.......................................665.....*..................562....@........114.170-............/..92.........443..........51
+......534.............212..........385................306.....863.....357....&........717...............570#................................
+..............783.......*...........*..........................@...@.*............593*....*249....*338.............804..#...496.............
+...=..........*......373....../570.65................../...836.....1..685....*39.......584................938........&.642....*..865..40#...
+.715...909..142...........................136....892..192...@.............121...............629..........$.................651..............
+................147........-....758..........=...*.............+...89.........678...815.997....*.....................990....................
+...........*90.*....777.....868...*.............909.........361.....&..354....*...........+..200.....438.......62...*........521............
+...............840...&..144.....861.....................479.............*...+...........................&.....*.....682......#........950...
+....456.237................*................................146.......927..917..858....601..................834........................$....
+.......*.....794...661.....618................369...#.......&....&................*.....*.....753.................381/.....*397..........524
+.415................*.............490+.......*......533...........766..=.......657.......511...=........................766.................
+...............539@.50..164...............583...574......409............126........34...................%652........44........%......886....
+...907...................*..................................*346.............359.....*.........&.887...............*........115.837.=.......
+......*...............3.666.............................736.........208.226..-......616.....250.......859..628....829.............*....+600.
+......153..262.........................947......260......*.........*......*............................*...*..../...............93.../......
+..........*..........421.................$.........%..500..107......402.264...407.....703..49..........54..424..372..684...........147.249..
+......363..942...137*.....197..............*83............*...................*......*....*...158.......................-....73........*....
+.........+...............*..........116..32............*...900..............360....479....54.........435*192.@850...........*...........325.
+..390*..............=..431...518......*......436.......892.......787.517................%.......18.....................625.95....582........
+......600...-176..415.......=.........780.......*...........*702..*..*.....699..........914.........186.......49*897..............*..558....
+......................312........................40......481.........872.#....$./198..........764...+............................352........
+.............800.........*.248.............571..................14........845............627.....*.......*...............336.664............
+.........910.......395.506....*.........@..&.............567...*..............573..913....*......334..*..759......29.%.....&....+...........
+..328.......*399.....*...........180...936....97$..376...*......251.....#447...............304.......450.....226.=...408..............*.....
+......479............259........*...................*....78.........848......568......305..................=.*.............917..542.667.....
+......#......332.............785.........422......624.63...........@.....896.@.........+..=770...530.....630..641.............*.........292.
+............*..............................-.@..........*...$.............*......&..%..........%............................832..534...#....
+.....560...400......................246*......411.....377...645.........62......620..465....146................#.986..185........*..........
+......*.........761*......323@..........466...........................................................-111..382....*.....*.......408...164..
+.......247.....................575*..........................836.496*380..125...321...............841...........648.....976............@....
+.254.......74-.....+.......926.......-....844*.........224................*......*......562..811../...226...................................
+...*..............162.*261.....287....758.....638........+.....479........834...80............=...........................188........287....
+...734....396...................*.............................*.....406.*.............244#..............&....320.............*.*165.$.......
+..........*..........31......221.......$384............*115.308.87..../..306....88#....................230...@............768...............
+........694......441*............53..............35.814.........-.......................77......379.....................&..........-........
+..................................*............-.+.......527......975...........594*......*........*857.#37..........302...........947..716.
+.......104*561......978.226....925...........244.....107.........*..................336...749.............................691...........*...
+..654..........561+...*....&.......54....924........=.........385..238........661*...............49......=.......456.859+...$.........479...
+...*......392.........587....-....*.........*.965.....863.........&.....801.......19..$......*.....*529.881..670*.................790.......
+.615.....-........570.....11.547.166.....347...*..190*.....................=...........302...236...........................&................
+.....................*686.....................43..........79...........475......396.......................................610..#856.........
+..................+...............$......................*...592.........*.....*.........804.......@30......629...23........................
+...............202..954..%..958..894....503..579........904..*.....573..603.....450......*...734.........56....&..&.....415......408.511&...
+.........750.........*..454....*......%..../..$..747#.......493......=......455.......252...*.....999.....................*........*........
+...239...*........180.........594......280............412*.............255.....*..........17..338...........950..228.......840..809.........
+........572.............326......................518.........................700.............*........263......*....@.675*............22....
+...182....................*......................*......85...731...@.........................130.........*........*.......408....727@.+.....
+...*....110....$899..+...755...568.=309........192.......*...*...259.847...557*42.......*........304/.....608....351........................
+...823.+.............765......../........-508.........516...412.......*..............704...............................275.........210......
+...........356........................#..........439......*........564....372*...846.............=........+62....-........*..298......*964..
+.......%......*...308.....-4.........420......./..*....905.551..........$..........#.452*........417.195..........276...956.....*...$.......
+....996.......413.....569.....#.810..........889..328..........*.........595.............359..........+..%.......................35.416.....
+551......$...............*..357....*....627.............94..784.719..........697*76..........135..735....690.........944*177................
+.......711............770...........664...=.......#...../...............730*..........58....*.......*...........182............848..........
+...*........800................#..............#....929......=843............216.........*...412....473...735....*.....610*.....*...505......
+348.5.......*......317......920................224...............503..-158.............463..............*.......865.......674.750.....@.....
+.......367.723......*...................42.........636............+............$599..........948.......882..............................173.
+.........&........873........=...........*...........*....292..-..............................*......................597*923................
+..............................871.......497..........159........452.................900...116..450...878...........................302...574
diff --git a/src/adventofcode2023/data/day_03/day03_test.txt b/src/adventofcode2023/data/day_03/day03_test.txt
new file mode 100644
index 00000000..b20187f3
--- /dev/null
+++ b/src/adventofcode2023/data/day_03/day03_test.txt
@@ -0,0 +1,10 @@
+467..114..
+...*......
+..35..633.
+......#...
+617*......
+.....+.58.
+..592.....
+......755.
+...$.*....
+.664.598..
diff --git a/src/adventofcode2023/day03.py b/src/adventofcode2023/day03.py
new file mode 100644
index 00000000..f1bf7385
--- /dev/null
+++ b/src/adventofcode2023/day03.py
@@ -0,0 +1,71 @@
+from __future__ import annotations
+
+from adventofcode.utils.abstract import FileReaderSolution
+
+
+class Day03:
+    grid: list[list[str]]
+
+    def parse_into_parts(self, input_data: str) -> list[int]:
+        """Parse into a list of integers with symbols connected"""
+        # Create a row/col grid from the input data
+        self.grid = [list(line) for line in input_data.splitlines()]
+        part_numbers = []
+        for row in range(0, len(self.grid)):
+            is_digit = False
+            current_digits = []
+            for col in range(0, len(self.grid[0])):
+                if self.grid[row][col].isdigit():
+                    is_digit = True
+                    # If we're working on a digit, add it to the running total
+                    current_digits.append(self.grid[row][col])
+                else:
+                    # Not a digit anymore, validate
+                    if current_digits and self.validate(current_digits, row, col - 1):
+                        part_numbers.append(int("".join(current_digits)))
+                    is_digit = False
+                    current_digits = []
+            # We have reached the edge, check if we have a valid digit in the bugger
+            if is_digit:
+                if self.validate(current_digits, row, col):
+                    part_numbers.append(int("".join(current_digits)))
+
+        return part_numbers
+
+    @staticmethod
+    def check_symbol(input_value: str):
+        if input_value.isdigit():
+            return False
+        if input_value == ".":
+            return False
+        return True
+
+    def validate(self, digits, row, col) -> bool:
+        """Validate if the digits in are real"""
+        # If we end at column 5 with 3 digits, we need to check
+        # (eg, col - len(digits) ...  col+1)
+        # 23456
+        min_col = col - len(digits)
+        max_col = col + 1
+        # Check above and below the current row
+        for check_row in (row - 1, row, row + 1):
+            for check_col in range(min_col, max_col + 1):
+                try:
+                    if self.check_symbol(self.grid[check_row][check_col]):
+                        return True
+                except IndexError:
+                    # Index out of bounds, ignoring
+                    pass
+        return False
+
+
+class Day03PartA(Day03, FileReaderSolution):
+    def solve(self, input_data: str) -> int:
+        part_numbers = self.parse_into_parts(input_data)
+        res = sum(part_numbers)
+        return res
+
+
+class Day03PartB(Day03, FileReaderSolution):
+    def solve(self, input_data: str) -> int:
+        raise NotImplementedError
diff --git a/tests/adventofcode2023/test_day03_a.py b/tests/adventofcode2023/test_day03_a.py
new file mode 100644
index 00000000..1d75fc3a
--- /dev/null
+++ b/tests/adventofcode2023/test_day03_a.py
@@ -0,0 +1,17 @@
+from adventofcode2023.day03 import Day03PartA
+
+
+class TestDay03PartA:
+    def test_day03a_testdata(self, testdata):
+        solution = Day03PartA()
+        result = solution.solve(testdata)
+        assert result == 4361
+
+    def test_day03a_data(self):
+        """Result we got when we did the real solution"""
+        solution = Day03PartA()
+        res = solution("day_03/day03.txt")
+        assert res <= 552_575
+        assert res >= 339_949
+        assert res != 414_148
+        assert res == 551094
diff --git a/tests/adventofcode2023/test_day03_b.py b/tests/adventofcode2023/test_day03_b.py
new file mode 100644
index 00000000..b78fca58
--- /dev/null
+++ b/tests/adventofcode2023/test_day03_b.py
@@ -0,0 +1,25 @@
+import pytest
+
+from adventofcode2023.day03 import Day03PartB
+
+
+class TestDay03PartB:
+    @pytest.mark.xfail(reason="Not yet implemented", raises=NotImplementedError)
+    def test_day03b_testdata(self, testdata):
+        solution = Day03PartB()
+        result = solution.solve(testdata)
+        assert result == 0
+
+    @pytest.mark.xfail(reason="Not yet implemented", raises=NotImplementedError)
+    @pytest.mark.parametrize(("input_data", "expected_result"), [("", ""), ("", "")])
+    def test_day03b_solve(self, input_data, expected_result):
+        solution = Day03PartB()
+        result = solution.solve(input_data)
+        assert result == expected_result
+
+    @pytest.mark.xfail(reason="Not yet implemented", raises=NotImplementedError)
+    def test_day03b_data(self):
+        """Result we got when we did the real solution"""
+        solution = Day03PartB()
+        res = solution("day_03/day03.txt")
+        assert res == 0

From da921a532709110f4f1d73b52dded05d8af1a9da Mon Sep 17 00:00:00 2001
From: Roel Adriaans <roel@adriaans.org>
Date: Sun, 3 Dec 2023 21:55:13 +0100
Subject: [PATCH 341/371] 2023, day 3,

---
 src/adventofcode2023/day03.py          | 54 ++++++++++++++++++++------
 tests/adventofcode2023/test_day03_b.py | 15 +------
 2 files changed, 44 insertions(+), 25 deletions(-)

diff --git a/src/adventofcode2023/day03.py b/src/adventofcode2023/day03.py
index f1bf7385..df767ecd 100644
--- a/src/adventofcode2023/day03.py
+++ b/src/adventofcode2023/day03.py
@@ -1,12 +1,24 @@
 from __future__ import annotations
 
+from collections import defaultdict
+from math import prod
+
+import attrs
+
 from adventofcode.utils.abstract import FileReaderSolution
 
 
+@attrs.define(frozen=True)
+class Symbol:
+    symbol: str
+    row: int
+    col: int
+
+
 class Day03:
     grid: list[list[str]]
 
-    def parse_into_parts(self, input_data: str) -> list[int]:
+    def parse_into_parts(self, input_data: str) -> list[tuple[int, Symbol]]:
         """Parse into a list of integers with symbols connected"""
         # Create a row/col grid from the input data
         self.grid = [list(line) for line in input_data.splitlines()]
@@ -21,27 +33,28 @@ def parse_into_parts(self, input_data: str) -> list[int]:
                     current_digits.append(self.grid[row][col])
                 else:
                     # Not a digit anymore, validate
-                    if current_digits and self.validate(current_digits, row, col - 1):
-                        part_numbers.append(int("".join(current_digits)))
+                    if current_digits and (
+                        symbol := self.validate(current_digits, row, col - 1)
+                    ):
+                        part_numbers.append((int("".join(current_digits)), symbol))
                     is_digit = False
                     current_digits = []
             # We have reached the edge, check if we have a valid digit in the bugger
-            if is_digit:
-                if self.validate(current_digits, row, col):
-                    part_numbers.append(int("".join(current_digits)))
+            if is_digit and (symbol := self.validate(current_digits, row, col)):
+                part_numbers.append((int("".join(current_digits)), symbol))
 
         return part_numbers
 
     @staticmethod
-    def check_symbol(input_value: str):
+    def check_symbol(input_value: str) -> bool:
         if input_value.isdigit():
             return False
         if input_value == ".":
             return False
         return True
 
-    def validate(self, digits, row, col) -> bool:
-        """Validate if the digits in are real"""
+    def validate(self, digits, row, col) -> bool | Symbol:
+        """Validate if the digits in are real. If they are real, return a Symbol"""
         # If we end at column 5 with 3 digits, we need to check
         # (eg, col - len(digits) ...  col+1)
         # 23456
@@ -52,7 +65,9 @@ def validate(self, digits, row, col) -> bool:
             for check_col in range(min_col, max_col + 1):
                 try:
                     if self.check_symbol(self.grid[check_row][check_col]):
-                        return True
+                        return Symbol(
+                            self.grid[check_row][check_col], check_row, check_col
+                        )
                 except IndexError:
                     # Index out of bounds, ignoring
                     pass
@@ -62,10 +77,25 @@ def validate(self, digits, row, col) -> bool:
 class Day03PartA(Day03, FileReaderSolution):
     def solve(self, input_data: str) -> int:
         part_numbers = self.parse_into_parts(input_data)
-        res = sum(part_numbers)
+        res = sum([number for number, _ in part_numbers])
         return res
 
 
 class Day03PartB(Day03, FileReaderSolution):
     def solve(self, input_data: str) -> int:
-        raise NotImplementedError
+        part_numbers = self.parse_into_parts(input_data)
+        # Find the symbols with a *
+        valid_parts = [
+            (value, symbol) for value, symbol in part_numbers if symbol.symbol == "*"
+        ]
+        # Convert the row/col locations to see if we have duplicates
+        locations: defaultdict[Symbol, list] = defaultdict(list)
+        for amount, symbol in valid_parts:
+            locations[symbol].append(amount)
+
+        # Add the total if we have 2 (or more?!?) amounts on one location
+        total = 0
+        for value in locations.values():
+            if len(value) >= 2:
+                total += prod(value)
+        return total
diff --git a/tests/adventofcode2023/test_day03_b.py b/tests/adventofcode2023/test_day03_b.py
index b78fca58..8010de1b 100644
--- a/tests/adventofcode2023/test_day03_b.py
+++ b/tests/adventofcode2023/test_day03_b.py
@@ -1,25 +1,14 @@
-import pytest
-
 from adventofcode2023.day03 import Day03PartB
 
 
 class TestDay03PartB:
-    @pytest.mark.xfail(reason="Not yet implemented", raises=NotImplementedError)
     def test_day03b_testdata(self, testdata):
         solution = Day03PartB()
         result = solution.solve(testdata)
-        assert result == 0
-
-    @pytest.mark.xfail(reason="Not yet implemented", raises=NotImplementedError)
-    @pytest.mark.parametrize(("input_data", "expected_result"), [("", ""), ("", "")])
-    def test_day03b_solve(self, input_data, expected_result):
-        solution = Day03PartB()
-        result = solution.solve(input_data)
-        assert result == expected_result
+        assert result == 467835
 
-    @pytest.mark.xfail(reason="Not yet implemented", raises=NotImplementedError)
     def test_day03b_data(self):
         """Result we got when we did the real solution"""
         solution = Day03PartB()
         res = solution("day_03/day03.txt")
-        assert res == 0
+        assert res == 80179647

From 2a8aa357d81cf5595e4b6f2a37ca21624958be3a Mon Sep 17 00:00:00 2001
From: Roel Adriaans <roel@adriaans.org>
Date: Mon, 4 Dec 2023 06:47:26 +0100
Subject: [PATCH 342/371] 2023, day 4

---
 src/adventofcode2023/data/day_04/day04.txt    | 203 ++++++++++++++++++
 .../data/day_04/day04_test.txt                |   6 +
 src/adventofcode2023/day04.py                 |  67 ++++++
 tests/adventofcode2023/test_day04_a.py        |  19 ++
 tests/adventofcode2023/test_day04_b.py        |  14 ++
 5 files changed, 309 insertions(+)
 create mode 100644 src/adventofcode2023/data/day_04/day04.txt
 create mode 100644 src/adventofcode2023/data/day_04/day04_test.txt
 create mode 100644 src/adventofcode2023/day04.py
 create mode 100644 tests/adventofcode2023/test_day04_a.py
 create mode 100644 tests/adventofcode2023/test_day04_b.py

diff --git a/src/adventofcode2023/data/day_04/day04.txt b/src/adventofcode2023/data/day_04/day04.txt
new file mode 100644
index 00000000..93f8c7bb
--- /dev/null
+++ b/src/adventofcode2023/data/day_04/day04.txt
@@ -0,0 +1,203 @@
+Card   1: 87 75 80 68 71 57 58 59 70 48 | 56 67 75 76 31 49 48 22 43 68 98 86 70 91 27 46  4 87 72 37 71 58 29 79 80
+Card   2: 95 97 90 91 79 71 60 87 46 80 | 28 90 55 87 82 34 44 96 77 15 22 63 31 33  5 99 36 91 17 10 64 59 68 37 13
+Card   3: 23 73 50 78 93 30 56 10  8 64 | 61 48 87 46 12 75 92 37 62 45 24 81 79 55 76 82  9  1 16 72 13 27 41 86 19
+Card   4: 16 50 13 24 94 27 74 58 15 53 | 58 53 20 57 69 28 47  2 41  4 66 61 15 44 24 68 50 74 86 45 36 73 43 27 91
+Card   5: 39 53 29 10 84 22 83  4  5 32 | 50 28 45  5  6 65 18  7 92 83  3 55 81 26 80 39 44 60 90 37 91 36 54 14 74
+Card   6: 84 12 96 93 72 97 91 76  7 82 | 85 15 29 33 37 60 14 30 63 73 38 62 77 44 86 39 51  2 99 75 70 36 32 98 78
+Card   7: 78 12  1 50 48 62 33  8 83 99 | 12 50 79 48 59 81 26 14  5 11 37  8 36 91 95 20 46 44 21 32 58 93 53 90 54
+Card   8: 55 58  8 36 16 23 88 73 45 65 | 19 10 34 64 52 27 75 22 33 58 74 45 16 11 63 56 12 14  8 25 59  4 95 47 78
+Card   9: 95 14 83 17  7 69 44 31 45 37 |  2 69 81 39 76 86 29 73 72 32 67  5  9 16 95 90 36 27 88 55 61  6 37 79  1
+Card  10: 24 83 98 76 87  6 32 59  4 96 | 54  5 68 85 76 50 60 33 58 32 88 61 27 55 90 65 93 13 53 29 44 15  6 45 24
+Card  11: 55 92 57 65 44 21 49  8 13 48 | 17 44 79 11 65 50 46 14 40 69 31 62 55 86 36 60 30 52 25 93 41 56 48 99 51
+Card  12: 14 93 52 89 35 42 13 22 76 26 | 14  5 46 80 22 39  1 67 43 31 78 87 68 95 90 83 96 71 74 29 15 88 36 11 76
+Card  13: 55 78 95 85 43 53 80 12  1 59 | 42 60 32 70 10 91 94 88 68 99 45 71 54 93 76 52 44 30  2 18 72 90  9  7 63
+Card  14:  6 44 46 59 91 60 47 26 12 17 | 35 52 36  5 18 30 63 79 75 55 45 99 84 81 71 34 48 24 14 70 11 69  1  4 77
+Card  15: 29 17 94 87 84  3 96 33  5 48 | 65 25 20 45 85  1 43 37 14 11 69 81  6 92 93 46  8 23 31  2 30 61 22 79 71
+Card  16: 73 81 13 23 61 35 49 48 99  5 | 10 69 22 40 73 29 61 23 13 99 26  7 39 70  5 56 88 46 49 81 68 25 35 48 14
+Card  17: 64 47  6 10 16 74 26 95 28 73 | 86 27 47  6 68 49 64 48 74 26 16 28 20 99 61 10 12 25 73 88 70 95 67  3 76
+Card  18:  1 29 86 72 65 52 67 64 68 79 |  5 88 77 52 18 31 67 41 37 55 68 65 39 22 72 97 23 64 34 29 48  1 79 49 86
+Card  19: 71 33 43 91 59 35 69 18 78  9 | 86 55 54 59 91 36 45  9 94 43 39 11 44  1 93 23 66 97  4 62 71 98 18 31 28
+Card  20: 72 86 59  6 85  1 74 25 87 20 | 21 14  6 39  4 54 37  2 61 83 82 59 10 67 19 50 12 16 51 55  1  5 45 98 73
+Card  21: 35 39 40 21 19 87 58 49 78 32 | 28 91 27 45 44 25 11 35 84 26 98 87 14 97 93 70 55 19 34 16  8  7 67 54  5
+Card  22: 87 30  6  9 73 47 29  7 33 63 | 87 80 21  3 63 38 14  7 20  9 73 31 33 29 11 30 22 68 57 54 43 42 47 34  6
+Card  23: 51 61 36 99 86 88 21  6 30 74 | 30 42 99 86 20 44 74 64 72 67 81 93 79 51  5 48 21 75 36 23  6 60  4 66 88
+Card  24: 96 21 44 42 57 34 59 45 58  2 |  6 81 92 13 66 98 47 73 26 10 84 62 93 49 57 35 90 27 75 19 52  1 37 32 85
+Card  25: 17 55 53 49 25 59 71 33 35 11 | 55 82 92 74 29 17 46 40  2 26 25 32 96 49 11 35 53  3 87 59 71 33 73 36 38
+Card  26: 33 85 26 21 13 51 73 76 20  7 | 85 53 42 21 31 76 33 97 71 73 20 90 13 52 95 98 93 99 11 32 26 51 24 37  7
+Card  27: 62 39 22 67 69  5 89  1 36 34 | 10 52 68 95 32 82 22 94 21 29  5 45 87 51 18  4 15 19 59 55 11 78 60 63 84
+Card  28: 65 31 58 70  2 49 46 14 72 11 | 24 95 11 14 27 22 38 65 15 35 36 18 59 49  6 70 69 62 46 58 60 34 92 72  2
+Card  29: 78  6 94 55 65 17 97 30 66 33 | 80 32 56 48 49 16 88 61 57 20 37 75 51 58 86 29 42 39 41 60 62 69 10 81 24
+Card  30: 72 33 93  5 58 92 10 90 29 20 | 77 73 41 42 67 17 24 28 23 69 27 43 80 49 75 74  2  3 21 26 76 32 48 30  4
+Card  31:  9 93 77 42 49 71 36 98 46  1 | 68 39 10 32 36  7 47 55 95 33 48 56 31 61 98 40 50 81 94 77 45 12 16  6 35
+Card  32: 35 54 65 19 62 37 63 68 17 47 | 14 20 65 27 84 48 85 56 64 37 51 81 11 52 63 40 93 15 92 90 19 35 43 68  7
+Card  33: 21 80 78 56 29 65  6 12 57 22 | 51 61  7  1 19 22 77 62 78 54 58 29 89 97 34 83 56 57 11 98 73  6 17 16 70
+Card  34: 57 83 56 87 58 68 46 86 78 77 | 98 58 46 51 14  1 17 60 11 13  5 49 56 96 19 15 99 28 62 38  9 40 57 92 22
+Card  35: 34 29 33 85 95  9 47 11 39 25 | 49 91 61 13 99 84 80 96 77 82 97 59 20 30  4 65 70 74  5 37 41 81 75 93 48
+Card  36: 42 30 69 88 84 90 58 26  2 47 | 98 14  3 30 56 20 49 83 29 48 46 34 99 51 12 61 92  1 55 60 70 53 75 52 27
+Card  37:  7 70 87 71 25 85 50 86 77 72 | 94 23 90 73 52 79 31 30 49 71  8 26 88 38 42  5 81 82 69 51 63 35 80 22 19
+Card  38: 37  4 98 58  7 95 19 22 17 86 | 60 38 13 79 62 49 85 77  8 52 63 20 16 81 21 59 43 36 80 70 87 35 51 10 12
+Card  39: 68 79 63 42 17 92 99 95  2 29 | 85 24 88 25 52 81 61  1 27 50 84 98 31 49 19 51 38 93 33 15 22 28 14 70 67
+Card  40:  7 15 73 55 87 18 52 17 34 12 | 87 73 42 77 21 33 44 69 24 52 94 17  7 16 78 12 34 97 67 41 15 47 55 91 18
+Card  41: 70  1 14 88 52 46 32 59 67 75 | 17  1 75 13 46 87 64 32 48 52 53 80 30 21  3 88 94 14 38 70 73 67 28 41 86
+Card  42: 65 18 51 72 76  7 93 64 21 92 | 51 64 94 77 45 98 28 67 11 42 41 72 93 22 21 56 65 76 54  7 26 92 74 18 55
+Card  43: 35 82  2 99 52 68 81 38 14 94 | 51 46 27 10 21  7 56 71 77  6 38 44 25 79 94 33 76 15 22 99 68 84  5 14 81
+Card  44:  7 47  1 61 51 46 36 87 43 34 | 14 43 91 86 47 51 29 95 76 61 39 85 84  7 87 69 46 56 88 36 27  1 10 67 34
+Card  45: 17 83 85 90 65 18 67 75 68 25 | 89 67 31 51 99 46 85 42 84 75 59 96 17 68 26 79 65 81 32 83 25 90 37  4 18
+Card  46:  2 56 38 47  9 11 61 68 51 49 | 53 56 60 47 49 61 82  5 38  2 97  9 51 80 86 22 68 31 11 59 24  4 35 13  8
+Card  47: 39  2 68 61 28  8 23 62 46 89 | 23 15 46 78 62  1 60 36 52 35 10 65 90 67  4 18 16 72 44 61  6 59 14 45 91
+Card  48: 60 49 62 14 88 84 80 18  7 20 | 88 91 77 10  2 59 94 25 67  9 16 72 80 20 32 78 14 69 56 70 73 96 15  6 92
+Card  49: 14 67 94 15 12 40  7 68 22 88 | 91 15 67 61  7 95 85 72 94 78 12 68 14 35 41 89 60 22 88 81 93 86 40 84 92
+Card  50: 65 75 63 30 38 28 27 51 58 54 | 30 99 21 28  2 81 77 85 25 38 27 63 70 62 87 58 16  9 75 54 65 69 51 78  8
+Card  51: 30 18 35 67 45 87 27 13 82 51 |  9 51 95 45  2 67 61 82 81 30 52 35  5 43 27 87 83 49 13 44 21 22 48 78 18
+Card  52: 23 21 13 53  5 78 43 94 98 59 | 72 57 18 34 11 39 95 26 56 68 22 10 21 98 96 87  4 43 74  7 46 40 88 97 58
+Card  53: 39 55 57 87  6 68 78 14 36  7 | 74 76 20 58 87  6 67 26 57  1 41 44 17 14 42  7 43 81 35 39 55 36 59 66 96
+Card  54: 26 62 39 28 76 32 98 19  2 61 |  9 62 61 75 28 42 40 39 64 32 98 37 58 16 15 19 35  2 80 76 10 26 70 18 47
+Card  55: 31 47 13 40  5 80 94 45 54 43 | 61 17 52 78 60  2 37 58 19 85 89 14 20 10  3 13 80 41 25 79  4 70 36 75 11
+Card  56: 59 68 42 47 97 53 32 46 17 76 | 64 94 32 46 68  5 49 14 91 19 59 53 26 80 33 39  6 99 18 73 45 87 69 54 66
+Card  57: 70 23 37 94  4 46 26 33 71 72 | 64 38 71 53 37 96 29 80 41 90 60 94 18 45 27 62 72 33 79 32 26 92 49 12  4
+Card  58: 47 44 65 83 91 78 17 60  7 35 | 95 65 26 52 68  9 69 61 19 87 93 27 90 57 49 23 24 17 86 16 28 62 11 63 85
+Card  59:  3 92 67 72 64  2 74 14 49 73 | 41 57 98 95 91 78 20 42 25 60 54 36 56 34 86 37  9 10 52 79 80 53 88 18 46
+Card  60: 38  5 63 77 69  9 79 50 58 51 | 20 72 80 52 68 64 33 61 47 84 65 90 29 48 16 82  4 98 83 89 17 94 81 41 85
+Card  61: 13 65 75 26 39 63 88 92 72 87 | 98 43 81 95 26 69 27  7 57 37 82 41 71 18 55 53 10 36 64 47 84  4 20 77 67
+Card  62: 19 70  5 25 23 76 90 29 61 97 | 17 20 38 58  1 29 74 13 94 47 86 56 60 14 82 83 87 91 52 39 33 37 77 62 45
+Card  63: 22 24 17 19 55 48 23  3  8 11 |  4 67 90 50 99 54 49 78 94 20 96  2 86 74 83 79 76 15 70 52 34 98  5 82 88
+Card  64: 15 92 72 63 95 34 58 85 18 57 | 64 40 67 81 89 27 84 54 75 43 70 77 13 52 19 35 46 30 12 61 78 10 82 55 45
+Card  65: 66 35 28 50 30 80 15 85  4 23 |  3 30 99 96 70 47  4 64 35 66 78 41 65 63 23 28 44 67 85 80 61 50 17 15 92
+Card  66: 71 67 68 20 93  6 76 30 15 89 | 12 69 80 11 91 34  2 65 95  8 37 86 38 10 79  3 43 90 87 45 92 50 88 39 56
+Card  67: 94 46 12  2 53 27 57 45 33  1 | 33 72 74 64 25 97 17  2 73 48  3 56 63 40 31 24 45 83 85 79  6 75 38 55 49
+Card  68: 82 68 40  3 73 81 61  1 60 50 | 15 29 82 51 73 28 43 94 85 50 96 11 98  9 86 20  6 14  5 95 10 23 61 12 62
+Card  69: 25 94 17 29  2 34 48 87 51 49 | 95 17 84 91 14 34  3 89 87 71  2 51 35 93  7 29 74 55 48 25 49 56 94 20 68
+Card  70: 37 51 36 79 15 29 88 69  6 97 | 27 66 88 90 41 29 25 36 82 56 69 37 18 40 33 97 42 91 62  6 65 79 15 28 51
+Card  71: 77 28 31 19 40 35 80 11 76 26 | 10 74 63 70 11 67 76 31 40 75 96 77 60 80 35 28 68 53 19 64 51 43 26  9 25
+Card  72: 18 96  9 79 87 37 94 69  8 74 | 69 18  9 41 21 80 72 96 71 20 15 12 36 87 99 37 44 79 46 54 94 19  8 74 39
+Card  73: 11 60 75 68 66 57 51 70 20 30 |  6 12 35 45 56 38 46 65 54 59 19 68 64 11 57 22 74 30 90 13 37 93  5 20 51
+Card  74:  6 20 99 75 87  1 70 52  4 61 | 97 98 99 34 75 11  8 92 49 81 19 12 87 20 70  6 27  4 44 61 52 67 82  1 55
+Card  75: 95 80 34 33 66 55 63 19  7 46 | 19 83 58  4 46 57 72 99 98 63 36 80 34 30 11 64 24 52 93 55 22 76 78 32 89
+Card  76: 55 56 58 16 50 24 27 75 35 44 | 75 42 35 87  7 13 55 44  8 27 56 14 24 78 61  4 19 38 18 58 50  1 16 51 22
+Card  77: 99  2 77 33 48 47 44 87 32 23 | 46 71 47 54 23 55 18 28 56 48 69 14 26 44 24 32 77 60 81  2 40 33 83 11 87
+Card  78: 67 46 27 29 44  1 22  4 13 52 | 80 98 63 29 97 67 58 86 25 52 95 23 92 76 27 74 13 93 78 22 81 96  1 46 64
+Card  79: 60 94  4 59 76 64 34 69 35 62 | 10  8 82 43 76 44 69 20 41 29  1 35 34 59 42 22 13 32  4 40 65 28 16 84 99
+Card  80: 88 60 47 76 82  5 14 63 58 16 | 83 62 57 21 89 79 53 60 87 22 76 20 78 96 63 68 56 91  5  7 47 16 94 98 45
+Card  81: 46 67 14 43 39 44 48 35  6 94 |  2 31 12 42 78 76 61 62 40 37 29 36 16 75  4 41 21 19 85 49 84 73 89 96  3
+Card  82: 61 73 72 47 71 96  4  2 41 20 | 76 78 94 65 51 85 92 60 31 80 81 34 46 69 90 70 17 74 89 40 27 35 14 15 10
+Card  83: 82 60 62 23 81 27 61 26 75 28 | 29 78 79  9 13 39 30 97 31 96 86 84 42 28 14 55 81 44 17  8 25 12 35 34 82
+Card  84: 91 61 73 55 98 28 11 40 33 50 | 21 55 27  2 54 44 94 59 58 67 79 66 82 87 92 25  9  7 65 80 38 30 10 97 16
+Card  85: 39 81 47  2  8 95 35 63 36 10 | 75 58  6 19 20 55 18 99 88 25 78 77 65 93 59 57 12 13 66 91  3 67 34 41 29
+Card  86: 15 33  8 84 57 35 50 76 43 17 | 34 20 55 59 97 51 44 46 53  5 10 79 58 89 39 82 16 42 71 81 22 40 85 63 56
+Card  87: 44  7 57 42 53 85 62  9 56 63 | 95 60 69 56 24 43  7  4 91 44 63 76 30 39 62  9 85 57 16 34 53 99 50 66 42
+Card  88: 47 85 12  1 98 86 94 84 33 51 | 27 54 45 55 38 12 96 51  1 83 36 65 13 85 32 94 29 52 47 59 33 48 86 82 98
+Card  89: 45 15 77 41 57 43 54  2 32 24 | 44 79 10 28 23 97 99 40 95 25 22  9 35 59 53 74 14 37 34 61 39 30 71 12 94
+Card  90: 76 75 36 82 28  2 87 81 31 14 | 38 67 87 90  6  9 19  2 13 37 24 15 65 84 32 85 44 18 98 79 23 35 80 60 47
+Card  91: 21 19 37 97  7 29 34 79 45 13 | 17 42 12 71 21  4 51 37  7 81 34 65 36 19 13 59 96 97 31 16 79 87 29 86 45
+Card  92: 16 14 67 60 39 25 26 34 12 96 | 79 66 11 93 38 29 37 12 50 32  7 82 39 59 84 54 42 83 43 92 19  1 34 26 77
+Card  93: 70 37 71 28 22 62 85  9 65 27 | 78 91 28 65 42 22 70 30 92 54  9 72 38 24 62 51 10 49 89 13 14 66 84 61 93
+Card  94: 80 48 40 83 87 19 53 66 69 33 | 80 79 66 76 58 94 60 70 20 42 72 87 19 30 75 40 67 12 36 96 11 29 59 63 33
+Card  95: 68 91 48 52 79 40 83 97 16 63 | 77 73 52 88 97 91 48 22 35 64 31 40 63 68 60 28 57 30 51 54 36 16 92 19 79
+Card  96: 78 81 13 87 20  8 80 63  2  3 | 20 29 62 72 44 90 54 22  3 35 55 16 96 80 37 93 73 23 50 33  6 63 78  8 13
+Card  97: 32 39 59 73  8 34 36 46 85 47 | 14 22 15 87 46 34 67 77 44 91 47  5 73 68 59  7 40 94 98 36 21 76 64 86 39
+Card  98: 19 75 37 82 94  6 57 15 78 58 |  9 79  6 71 91 39 38 61 59 89 90  1 80 17 86 35 98 63 27 74  5 49 25 70 73
+Card  99: 44 22 48 23 31 78 15 89 49 24 | 36 89 27 81 67 56 22 28 74 47 25 18 44  3 15 23 58 73 69 39 75 17 85  1  7
+Card 100: 56 15 30 64 37 89 51 96 63 90 | 56 23 24 57 44  9 41 65  6 26 69 36 21 66 94 67  7 10 34 59 14 40 99 93 98
+Card 101: 42 95 60 30 25 87 82 98 40 54 | 22 85 24 84 19 34  3 43 97  8 18 57 58 26 91 44 56 11 16 66 78 73 62 50 68
+Card 102: 14 64 72 79 55 78 44 12 76 36 | 69 74 13 78 59 82 15 46 49 11 81 83 97  9 58  4 98 60 43 34 30 67  2 47 37
+Card 103: 64 82 36 57 33  8 80 91 95 32 | 84 45 12 44 59 94 86 53 48 96 26 66 70 65 39 37 21 72 49 60 56 35 82 98 92
+Card 104: 76 18 88 52 69 44 57 99 20 12 | 60 74 21 35 77 39 40 29 46 37 95 65 93 36 43 86 48 59  6 11 16 72 28 55 97
+Card 105: 91 30  6 25  7 64 41 28 72 53 | 93 63 59 31  4 87 45 97 70 29 39 80 98 66 44 51 54 62 57 46 56 18 13 81 27
+Card 106: 15 59 45 36 74 86 35 62 87 14 | 29 35 81 53 60 69 47 25 61 43 13 62 84 96 79 75 68 23 32 18 37 72 63  4 36
+Card 107: 62 41 56 15 66 50 63 20 43 84 | 43 66 99  3 49 20 80 50 36 38 52 22 23 24 41 62 84 83 15 68 63 56 94 35 97
+Card 108: 67 51 97 26 11 61 91 55  7 23 | 47 96 26 78 22 87 33 51 34 59 53  3 97 91 86 11 21 89 13 61 23 67 55  7 24
+Card 109: 72 23 61  6  1 65 83 47 10 41 | 27 16 98 74 55 61  5  1 88 68 41 47 99 48 76 31 85 83 38 72 91 93 36 90 80
+Card 110: 34 22 81 62 40 25 43 60 12 69 | 69 81 71 66 54 15 17 79 25 93 34 51 43 62 40 12 30 56 27 47 60 33 22 94 65
+Card 111: 48 24 75 46 37 65 33 74 64 92 | 75 46 25 65 92 33 64 83 39 16 45 48 97 56 11 78 94 62  4 24 37 96 74 31 40
+Card 112: 94 92 39 58 34 78 61  7 50 88 | 83  6 52 39 92 17 40 63 54 34  7 85 89 64 25 50 99 77 33 13 11 81 35 78 41
+Card 113: 23 25 75 44 18  8 29 79 48 60 |  7 70 80 63 60 42 88 25 44 23 21 11 51 93 47 82 16 86 73 62 96 75  2 29 19
+Card 114: 52 42 66 15 57 29 21 47 89 22 | 77 81 52  8 66 21 98 61 71  2 85 34 42 95 93 25 67 60 82 47 78 56 63 87 84
+Card 115: 63 81 53 30  8 94 75 76 45 71 | 53 93 40 18 45 71 76 67 75 92 15 72 35 94 65 30 88 22 81  8 63 50 80  5 82
+Card 116:  8 33 23 82 63 25 65  4 97 28 | 79 75 71 46 41 74  6 86 64 33 24 70 82 87  9 76 36  3  5 97 92  4  1 12 62
+Card 117:  9 97  4 59 31 78 73 99 84 11 | 93 65 12 39 29 76 80 82 43 37 26 57 79 27 46 90 98 54 31 34 17 62 95 51  9
+Card 118: 11 42 73 23 28 62 68 15 31 48 | 17 81 29 15 10 86 25 68 28 80 33 78 89 11 82 96 12 34 19 99 67 13 64 59 91
+Card 119: 22 16 61 76 19 92  5 89 86  1 | 37 35 77 44  7 42 86 92 41 81 16 95 12  1 85 60 63 79  5 25 62 46 73 45 19
+Card 120: 97 11 71 31 44 24 12 49 15 17 | 97 44 78 49 64 61 42 55 31 38 12 87 53 32 41  6 68 62 19 94 13 79 29 56 71
+Card 121:  5 50 95  7 14  6 35 64 99 94 | 30 54 80 90 68 98  6 71 61 81 23 24 64 37 40 15 53 63 31 35  7 49 14 99 42
+Card 122:  5 72 29 22 71 35 41 82 15 56 |  3 45 61 68 70 41 56 26 82 62 29 36 84 80 95 81 96 83 20 35 28 54 21 76 47
+Card 123: 80  4 93 25 97 10 20 84  3 67 | 14 18 12 20 86 96 63 67 60 54 13 85 23 37 10 16 71 65 33  5 98  1 74 53 51
+Card 124: 43 64 62 31 86  1 30 23 15 28 | 77  1 99 27 48 35  2 40 57 61 23  9 37 74 91 46 92 83 24 90 96 32 80 45 31
+Card 125: 53 47 45 50 82 37 26 41 22 57 | 43 25 37 29 89 20 17  8  1 46  2 55 53 44 61 78 65 72 69 85 12 93 28 34 80
+Card 126: 36 27 94 41 56 21 18 13 59 96 | 73 91  2 14 29 98 79  8 11  3 38 16 69 71 77 92 66 60 18  9  1 57 12 22 43
+Card 127: 19 12 69 97 81 26 73 83 34 51 | 91 47 89 62 94  8 66 43 35 93 48 24 71 40 42 75 13 14 65 28 61 95 32 25  9
+Card 128: 99 78 81  4 44 58 10 83 67  5 |  5 83 95 17 34 68 91 10  4 88 56 38 49 44 66 11 78  7 50 67 45 21 98 99 58
+Card 129: 94 35  8 59 72 56 51 98 47 63 | 98 71 61 72 51 54 35 34 95  9 82 88 47  8 66 57 90 55 81 33 59 56 64 63 94
+Card 130: 81 25 85 84 88 26 87 14 40 77 | 25 74 20 13 30 11 72 77 88 40 70 67 47 14 80 86 81 26 45 87 79 33 85 84 39
+Card 131: 28 83  7 69 87 48 46 67 33 10 | 37 10 48 96 38 99 14 60 28 42 26 94 46 24 84 68 87 72 85 67  4 83 31  7 47
+Card 132: 33 65 47 66 48  9 69 68 76 73 | 21 18 70 64 55 19 31 81 20 77 12 94 59 15 98 44 57 52 92 54 93 40 89 16 78
+Card 133: 67 54 21 71 43 56 68 65 55 99 | 16 83 20 45 85 92 34 61 88 33 51 65 24 68 58 55 91 81 54 43  5  1 77 49 25
+Card 134: 73 82 41 78 91 72 13  7 46 88 | 78 88 32 57 12 56 44 73 41 79 27 99 49 13 82 91 87 97 62 46 83  7 23 60 71
+Card 135: 19 30 91 16 15 88  5  4 72 38 | 38 41 23 87  3 78 75 11 88 53  5 72  4 56 54 65 19 76 15 27 82 39 70 69 17
+Card 136: 39 66 64 79 90 51 69  6 44 23 | 51  1 21 44 23 78 27 66 69 42  6 50 74 48 39 79 57 29 53  3 10 13 30 90 64
+Card 137: 82 75 28 96 13 25 30 59 76  5 | 25 45 59 79 96 44 88 75 82 30 13 18 20 97 21  5 70 31 76 95 17 37 27 28 53
+Card 138: 23 21 53 59 82 11 99 30 68  1 | 51 11 21 53  8 43 24 71 33 63 75 66 23 82  1 20 92 50 86 59 99 45 84 30 68
+Card 139: 43 44 12 68 14 70 83 84 39 40 | 72 18 54 48 43 91 56  1 11 49 83 59 29 73 87 40 37  6 50 14 74 61 70  2 36
+Card 140: 64  4 86 61 11 72 66 73 83 14 | 74 86 84  8 36  5 76 73 83 88 10 28 38 64  4 12 72 23 53 42 33 91 61 45 55
+Card 141: 46 33 44 21 99 64 29  4 28 30 |  1 95 13 97  9 59 15 41 89 35 43 98 81 27 94  3 65 88 91 12 17 10 23 61 48
+Card 142:  2 85  8 98 74 62 76  7 79 60 | 59 42  2 49 24 34 25 76  8 71 98 86  6  7 16 33 74 62 89 13 39 31 85 79 87
+Card 143: 50 10 55 73 71  3 20 57 15  9 | 42 20 71 54 11  9 55 37 15  3 53 41 13 99 63 57  7 73 28 84 18 35  5 32 10
+Card 144: 26 38 75 71 89 40 96 81 83 48 | 42 77 11 76 78 15 19 86 10 34 61 58 29 14 64 94 63 33 70 13 88 82 59 28 93
+Card 145: 72 35 67 80 78 20 57 48 64 28 | 44 70 79 37  5 96 31 13 10 83 93 29 46 94 66 47  6 34 14 18 33  8 69 49 20
+Card 146: 42 10 61 56  2 22 38 15 67  6 | 72 83 53 80 52 31 74 73 20 12 87 71 78 95 25 45 75 43 32 85 82  7 13 90 19
+Card 147: 30  2 48  5 16 25 70 89 35 85 |  3  5 55 90 16 86 70 87 17 29 74 14 22 78 39 37 71 45 79 42  2 60 21 62 89
+Card 148: 61 50 41 22 75 80 46 93 55  6 | 62 68 95 45 74 21 13 52 66  2 17 53 97 83 90 40 44 28 25 86 14 82 15 30 84
+Card 149: 49 54 61 92 19 16 78 83 15 71 |  7 33 40 69  2 34 70  9 91 79 74 42 67 38 82 60 28 43 23 80 39 56 30 66  1
+Card 150: 47 85 71 36  9 98 45 28  7 58 | 94 88 20 62 13 77 85 27 43 92 18 41 31  3  2 45 74 99 30 40 26 93 19 23 65
+Card 151: 65 90 39 91 53 76 79 51  9 36 |  5 84 49 13 70 64 15 33 92 67 41 57 19 21 22 87 54 50 46 66 52 24 71 29 16
+Card 152: 61 62 51 11 14 44 10 29 31 35 | 95 47 96 16  5 32 88 90 52 65 70 94  9 80 81 56 50 43 15 34 45 68 67 42 18
+Card 153: 91 86 12 23 53 39 96 79 14 76 | 68 66 83 69 73 42 59 67  4 38 11 46 16 95 71 52 88 13 19 48  9 99 30 62 43
+Card 154: 47 44 72  6 95  7 21 64 59 29 | 72  7 12 33 21 14 91  3 99 71 64 44 70 63  6 22 88 16 43 57 73 59 76 60 47
+Card 155: 38 36 24 69 59 58 96 45 39 30 | 17 64 59 31 80 36 25 89 96  4 27 12 30 74 11 29 57 63 45 19 42 38 69 58 39
+Card 156: 60 93 14 54 53 40 34 26  1 28 | 46 62 40 69 48 39 35 68 86 22 19 10 42 25 88 67 58 96 54 44 56 85 31 90 99
+Card 157: 82 93  7 76 69  1 36  5  4  3 | 66 96 92 52 29  5 91 62 45 27 25 31 28 78 99 95 73 14 37 26  9 98 42 55 11
+Card 158: 34 52 78 67 96 62 54 85 86 31 | 21 42 63 51 12 70 15 83 34 35 62 69 52 54 36 85 31 86 67 41 53  7  1 96 82
+Card 159: 67 49 58 35 82 57 29  6 20 25 | 30 46  2 75 38 57 99  7 29 69 94 40 12 45 97 49 66  6 35 76 32 37 71 60 68
+Card 160: 17 49 10  5 34  2 23 91  3 19 | 29 39 67 53 14 61 41 85 18 65 56 77 54 55 13 27 28 45 60  7 62  6 96 38 35
+Card 161:  4 42 38 50 85 92 27 25 82  7 | 82  5 83 71 52 43 12 75 73 92 96  1 61 59 25 85  7 22 23 80 35 15 97 88 30
+Card 162: 42 69 75 64 40 12 29 56 33 62 | 57  5 83 79 26 55 84 60 70 16 47  2 19 30  7 62 89 76 20 90 66 78 21  9 87
+Card 163: 52 10 27 86  7 72 95 88 13 75 | 94 76 43 33 31 69 35 68 39 78 48 83 28 66 67 15 72 34 32 25 85 53 40 46  1
+Card 164: 14 95 31 43 91 56 22 68 17 33 | 74 98 24 59  4 93 67 23 64 35 51 42 92 88 63 20 29 70 16 82 89 45 39 27 12
+Card 165: 29  5 49 25 67 79 56 44 43 93 | 20 54 10 52  8 50 98  9 73 92 78 24 86 69 77 82 80 41 94 36 35 22 32 38  3
+Card 166: 63 92 68 93 58 16 90  6 13 46 | 31 45 39  8 65 49 23 81 62 72  7 15 82 35 53  4 80 83 48 13 10 11 71 40 61
+Card 167: 58 70  1  3  7 81 65 83 79 77 | 87  8 59 29 18  6 14 48 35  9 60 94 80 92 51  2 73 36 47 27 86 89 41 42  4
+Card 168: 69 93 96 77 76 90 17 88 11 26 | 31 13 77  9 86 82 51 67 53 99 76 35 81  6 28 92 24 14 87 59 41 37 88 18 96
+Card 169: 99 40 11 87 24 55  4 46 66 49 | 60 67 72 31 94 69 42 46 86 17 47 70 95 90  6  4  3 59 61 24 93 73 28 58 96
+Card 170: 29 84  4 80 72 94  9  7 55 68 | 24 62  7 35 21 55 85 94 29  4 84 38 42 33  2 77 58  9 11 80 41 72 76 13 68
+Card 171: 93  7  9 11 12 13 79 51 99 62 | 99 28 51 12 82 11 35 18 93 34  7 17  2 13 63 54  9 69 62 84 68 79 58 36 70
+Card 172: 16 79 33 10 58 22 67 98 46 43 | 75 24 96 64  4 50 38 10  5 31 45 21 98  7 17 34 60 72 97 92  6  3 99 86  9
+Card 173: 98 73 26 29 85 75 13 22 27 35 | 87 76 25 43 82 17 79 74 16 91 37 97 46 15 14 40 52 70 31 68 81  5 36 72 57
+Card 174:  4 29 72 26 46 89 61 15 16 11 |  4 68 89 24 58 94 46 26 55 15 67 61 72 98 75 84 29 11 47  2 54 13  9 28 16
+Card 175: 40 49 71 63 25 47 44 26 98 31 | 26 20 18 96 64 92 88 63 62 95 47 33 86 35 70 75 90 27  1 59 54 74 80 41 77
+Card 176: 92 17 34 39 64 49 70 69 44 91 | 49 24  4 81 74 31 28 36 69 39 68 16 98  2  3 26 96 76 57 19 44 95 93 29 34
+Card 177: 60 32 48 84  3 86 62 55 22 58 | 17 91 95 50 64 89 32 60 82 62 49 58 25 12 86  3 40 16 84 87 66 61 77 55  9
+Card 178: 92  4 66 65 13 87 57 16 78  3 | 92 16 81  7 78 42 25 44 43 24 66 29 50 40 19 71 89 53 59 77 67 76 39 84  1
+Card 179:  6 67 72 98 79 45 12 87 77 60 | 19 12 57 66 14 26 28 31 18 24 45  6 15 29 99 27 90 87 10 59 92 36 58 72 79
+Card 180:  6  9 43 74 48 87 52 56 76 30 | 97  8 88 19  2 54  9 29  3 39 23 71 93 41 95 87 98 68 36 42 94 40 45 84 85
+Card 181: 26  5 23 14 59  6 33 89 97 96 | 16  7 41  8 45 71 47 98 67 88 58 13 79 66 85 81 32 17 60 91 51 49 27 69  3
+Card 182: 53  5 83 87  3 44 25 98 48 24 | 14 77 95 98 40 81 97 85 80 15 33 38 75 17  5 56 71 43 65 28 87 10 66 22 70
+Card 183: 67 20 49 89 38 55 16 79 27 45 | 43 57 35 34 26 93 13 63  5 87 72 69 28 96 78  3 48 47 61 94 59  7 37 95  1
+Card 184:  1 73 35 99 24 74 64 21 14 81 | 48 81 57 15 28 49 31 82 91  8 62 79 54 20 95 13 21 97 98 19 51  6 83 70 61
+Card 185: 31  6 98  7 17 45 42 37 67 56 | 53 73  7 91 20 63 57 96 28 72 15 44 55 29 23 77 58 32  1 11 62 65 95 83 25
+Card 186: 93 81 16 50  3 40 87 46 90 58 | 89 70 62 28  4 19  2 63 21 53 14  9 55 25 54 38 94 82 47 86 36 96 49  8 80
+Card 187: 45 71 74 81 84 18 23 35 86 25 | 34 90 45 74 63 35  1  3 88 12 84 71 97 29 32 26 40 18 76 89  9 80 86 94 64
+Card 188:  3 21 56 32  1 26 54 60 13 28 | 40 24 26 28 78 12 11 92 17 98 30 27  1 87 25 97 57 49 52 38 51 32 42 47  7
+Card 189: 41 82 69 64 35 71 79 61 44 36 | 35 69 22 37 44 29 79 39 14  3 56 66 36 62 82 26 72 61 88 33 97 64 41 98 34
+Card 190: 96 84 47 27 31 17 59 40 64 67 | 16 32 82 27 21 75 93 74 60 80 29 48 23 31 54 98 79 58 17 67 18 43 12 25 96
+Card 191: 35 60 71 44 21 62 81 14 67 85 | 36 37 69  9 34 35 62 40 54 41  1 13 23 58 85 86 24 55 14  7 92 96 50 11 81
+Card 192: 82 95  6 69 48 56 42 96 94 93 | 98 92 96 63 42 76 16 50 95 48 28  8 39  6 94 47 69 97 56 82 44 93 21 26  7
+Card 193: 22 86 12 38  3  6 44 77 27 59 | 53 80 89 25 92 38 63 86 65 34 99 46 27 75  8  1  7 47 66 29  2 77 61 12 54
+Card 194: 15 20 33 91 80 61 37 99 58 92 | 10 76 99 58 97 91 71 64 33 36 29 30 42 37 87 66 90  6 49 22 68 40 92  2 73
+Card 195: 10 59 86 92  5 55 25 48 36 45 | 27  5 48 84 25 57 35 78 56 63 82 28 87 92 88 10 19 42 36 53 86 60 81 39 55
+Card 196: 69 95 34  9 80 55 11 30 49 88 | 15 89 44 26 48 49 74 54 35 77 47 11  9 21 25 95 31 88 53 56 42 69 18 10 60
+Card 197: 62 23 83 63 24 58 57 72  8 68 | 41 25 26 58 80 45 99 55 63 96 46 60 84 33 98 42 50 62 44 52 47  7 57 75 12
+Card 198: 86 22 73 29 41 40 11 76 69 83 | 78 20 14 67 51 93  8 47 43 44 82 16  2 55 96 98 61 48 31 49 91 24  3 27 87
+Card 199: 27 59 83 12 76 82 74 98 47 73 | 30 20 63 53 67 68 16  4 66 10 93 61 89 80 36 75 62 99  1  5 70 31 17 82 22
+Card 200: 49 66 64 92 36 61 44 96 68 67 | 57 55 19 18 78 64 90 85 72 84  5 10 38 71 74 34 68 30 46 83 86 25 89 50 49
+Card 201: 83 53 58 64 84 72 70 19 41 17 | 22 55 50 90 65 88  6 76 43 70 26 63 41 91 82 79 89 98 71 54 80 67 59 36 49
+Card 202: 70 55 83 56 42 25 11  1 41 49 | 32 54 80 59 53 23 75  8 68  6 94 45 86  3 61 98 36 14 44 18 89 39 81 51 88
+Card 203: 12 10 29 80 87 71 65 37 55  9 | 11  5 75 46  3 81  6 54 64 32 95 33 49 34 74 48 92 20 21 56 53 50 41 61 36
diff --git a/src/adventofcode2023/data/day_04/day04_test.txt b/src/adventofcode2023/data/day_04/day04_test.txt
new file mode 100644
index 00000000..9bdb8745
--- /dev/null
+++ b/src/adventofcode2023/data/day_04/day04_test.txt
@@ -0,0 +1,6 @@
+Card 1: 41 48 83 86 17 | 83 86  6 31 17  9 48 53
+Card 2: 13 32 20 16 61 | 61 30 68 82 17 32 24 19
+Card 3:  1 21 53 59 44 | 69 82 63 72 16 21 14  1
+Card 4: 41 92 73 84 69 | 59 84 76 51 58  5 54 83
+Card 5: 87 83 26 28 32 | 88 30 70 12 93 22 82 36
+Card 6: 31 18 13 56 72 | 74 77 10 23 35 67 36 11
diff --git a/src/adventofcode2023/day04.py b/src/adventofcode2023/day04.py
new file mode 100644
index 00000000..1ebd2a95
--- /dev/null
+++ b/src/adventofcode2023/day04.py
@@ -0,0 +1,67 @@
+from __future__ import annotations
+
+from collections import Counter
+
+import attrs
+from adventofcodeutils.parsing import extract_digits_from_string
+
+from adventofcode.utils.abstract import FileReaderSolution
+
+
+@attrs.define
+class Card:
+    cardnr: int
+    winning_numbers: set[int]
+    numbers_have: set[int]
+
+    @classmethod
+    def from_string(cls, input_string: str) -> Card:
+        # Split on |
+        winning_part, have_part = input_string.split("|")
+        cardnr = extract_digits_from_string(winning_part)[0]
+        winning = extract_digits_from_string(winning_part)[1:]
+        have = extract_digits_from_string(have_part)
+
+        return cls(cardnr, set(winning), set(have))
+
+    def matches(self) -> int:
+        return len(self.numbers_have & self.winning_numbers)
+
+    def score(self) -> int:
+        matches = self.matches()
+        if matches <= 1:
+            return matches
+        # 1 for the first match, then doubled three times for each of the three
+        # matches after the first).
+        score = 1
+        for _ in range(matches - 1):
+            score += score
+        return score
+
+
+class Day04:
+    pass
+
+
+class Day04PartA(Day04, FileReaderSolution):
+    def solve(self, input_data: str) -> int:
+        cards = [Card.from_string(line) for line in input_data.splitlines()]
+        return sum([card.score() for card in cards])
+
+
+class Day04PartB(Day04, FileReaderSolution):
+    def solve(self, input_data: str) -> int:
+        cards = [Card.from_string(line) for line in input_data.splitlines()]
+        card_matches = [(card.cardnr, card.matches()) for card in cards]
+        card_counter = Counter()
+
+        # Prime the counter, we need at least 1 of every card
+        for n in range(len(cards)):
+            card_counter[n + 1] = 1
+
+        for cardnr, matches in card_matches:
+            for n in range(matches):
+                multiplier = card_counter[cardnr]
+                card_counter[n + cardnr + 1] += multiplier
+
+        return sum(card_counter.values())
diff --git a/tests/adventofcode2023/test_day04_a.py b/tests/adventofcode2023/test_day04_a.py
new file mode 100644
index 00000000..e390664e
--- /dev/null
+++ b/tests/adventofcode2023/test_day04_a.py
@@ -0,0 +1,19 @@
+import pytest
+
+from adventofcode2023.day04 import Day04PartA
+
+
+class TestDay04PartA:
+    def test_day04a_testdata(self, testdata):
+        solution = Day04PartA()
+        result = solution.solve(testdata)
+        assert result == 13
+
+    @pytest.mark.xfail(reason="Not yet implemented", raises=NotImplementedError)
+    def test_day04a_data(self):
+        """Result we got when we did the real solution"""
+        solution = Day04PartA()
+        res = solution("day_04/day04.txt")
+        assert res != 820
+        assert res != 1050
+        assert res == 25174
diff --git a/tests/adventofcode2023/test_day04_b.py b/tests/adventofcode2023/test_day04_b.py
new file mode 100644
index 00000000..7b7d49ca
--- /dev/null
+++ b/tests/adventofcode2023/test_day04_b.py
@@ -0,0 +1,14 @@
+from adventofcode2023.day04 import Day04PartB
+
+
+class TestDay04PartB:
+    def test_day04b_testdata(self, testdata):
+        solution = Day04PartB()
+        result = solution.solve(testdata)
+        assert result == 30
+
+    def test_day04b_data(self):
+        """Result we got when we did the real solution"""
+        solution = Day04PartB()
+        res = solution("day_04/day04.txt")
+        assert res == 6420979

From c07061b2089f63ef56bcaded21f16a033816dfa1 Mon Sep 17 00:00:00 2001
From: Roel Adriaans <roel@adriaans.org>
Date: Wed, 6 Dec 2023 06:32:01 +0100
Subject: [PATCH 343/371] 2023, day 6. quick and dirty bruteforce..

---
 src/adventofcode2023/data/day_06/day06.txt    |  2 +
 .../data/day_06/day06_test.txt                |  2 +
 src/adventofcode2023/day06.py                 | 53 +++++++++++++++++++
 tests/adventofcode2023/test_day06_a.py        | 14 +++++
 tests/adventofcode2023/test_day06_b.py        | 14 +++++
 5 files changed, 85 insertions(+)
 create mode 100644 src/adventofcode2023/data/day_06/day06.txt
 create mode 100644 src/adventofcode2023/data/day_06/day06_test.txt
 create mode 100644 src/adventofcode2023/day06.py
 create mode 100644 tests/adventofcode2023/test_day06_a.py
 create mode 100644 tests/adventofcode2023/test_day06_b.py

diff --git a/src/adventofcode2023/data/day_06/day06.txt b/src/adventofcode2023/data/day_06/day06.txt
new file mode 100644
index 00000000..45e74fa2
--- /dev/null
+++ b/src/adventofcode2023/data/day_06/day06.txt
@@ -0,0 +1,2 @@
+Time:        40     92     97     90
+Distance:   215   1064   1505   1100
diff --git a/src/adventofcode2023/data/day_06/day06_test.txt b/src/adventofcode2023/data/day_06/day06_test.txt
new file mode 100644
index 00000000..28f5ae95
--- /dev/null
+++ b/src/adventofcode2023/data/day_06/day06_test.txt
@@ -0,0 +1,2 @@
+Time:      7  15   30
+Distance:  9  40  200
diff --git a/src/adventofcode2023/day06.py b/src/adventofcode2023/day06.py
new file mode 100644
index 00000000..7b61606e
--- /dev/null
+++ b/src/adventofcode2023/day06.py
@@ -0,0 +1,53 @@
+from __future__ import annotations
+
+import math
+
+import attrs
+from adventofcodeutils.parsing import extract_digits_from_string
+
+from adventofcode.utils.abstract import FileReaderSolution
+
+
+@attrs.define(frozen=True)
+class Result:
+    time: int
+    distance: int
+
+
+class Day06:
+    @staticmethod
+    def parse(input_data: str, strip_spaces=False) -> list[Result]:
+        lines = input_data.splitlines()
+        if strip_spaces:
+            lines[0] = lines[0].replace(" ", "")
+            lines[1] = lines[1].replace(" ", "")
+        times = extract_digits_from_string(lines[0])
+        distances = extract_digits_from_string(lines[1])
+        results = []
+        for time, distance in zip(times, distances):
+            results.append(Result(time=time, distance=distance))
+        return results
+
+    @staticmethod
+    def compute_options(result: Result) -> int:
+        options = 0
+        for charge in range(result.time):
+            # charge the boat for charge seconds
+            distance = charge * (result.time - charge)
+            if distance > result.distance:
+                options += 1
+        return options
+
+    def find_options(self, input_data: str, bad_kerning: bool) -> int:
+        times = self.parse(input_data, bad_kerning)
+        return math.prod([self.compute_options(result) for result in times])
+
+
+class Day06PartA(Day06, FileReaderSolution):
+    def solve(self, input_data: str) -> int:
+        return self.find_options(input_data, False)
+
+
+class Day06PartB(Day06, FileReaderSolution):
+    def solve(self, input_data: str) -> int:
+        return self.find_options(input_data, True)
diff --git a/tests/adventofcode2023/test_day06_a.py b/tests/adventofcode2023/test_day06_a.py
new file mode 100644
index 00000000..e1256449
--- /dev/null
+++ b/tests/adventofcode2023/test_day06_a.py
@@ -0,0 +1,14 @@
+from adventofcode2023.day06 import Day06PartA
+
+
+class TestDay06PartA:
+    def test_day06a_testdata(self, testdata):
+        solution = Day06PartA()
+        result = solution.solve(testdata)
+        assert result == 288
+
+    def test_day06a_data(self):
+        """Result we got when we did the real solution"""
+        solution = Day06PartA()
+        res = solution("day_06/day06.txt")
+        assert res == 6209190
diff --git a/tests/adventofcode2023/test_day06_b.py b/tests/adventofcode2023/test_day06_b.py
new file mode 100644
index 00000000..38e3bcbb
--- /dev/null
+++ b/tests/adventofcode2023/test_day06_b.py
@@ -0,0 +1,14 @@
+from adventofcode2023.day06 import Day06PartB
+
+
+class TestDay06PartB:
+    def test_day06b_testdata(self, testdata):
+        solution = Day06PartB()
+        result = solution.solve(testdata)
+        assert result == 71503
+
+    def test_day06b_data(self):
+        """Result we got when we did the real solution"""
+        solution = Day06PartB()
+        res = solution("day_06/day06.txt")
+        assert res == 28545089

From c8ffb4c2cecb4dd1082d4631ed8a796193c258e9 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 6 Dec 2023 20:47:58 +0000
Subject: [PATCH 344/371] Bump actions/setup-python from 4 to 5

Bumps [actions/setup-python](https://github.com/actions/setup-python) from 4 to 5.
- [Release notes](https://github.com/actions/setup-python/releases)
- [Commits](https://github.com/actions/setup-python/compare/v4...v5)

---
updated-dependencies:
- dependency-name: actions/setup-python
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 .github/workflows/tox.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/tox.yml b/.github/workflows/tox.yml
index 62f0c552..5ca327a9 100644
--- a/.github/workflows/tox.yml
+++ b/.github/workflows/tox.yml
@@ -15,7 +15,7 @@ jobs:
     - uses: actions/checkout@v4
 
     - name: Set up Python ${{ matrix.python-version }}
-      uses: actions/setup-python@v4
+      uses: actions/setup-python@v5
       with:
         python-version: ${{ matrix.python-version }}
 

From 000c0e0ddc0659146dedda167c032c34a1cc9eff Mon Sep 17 00:00:00 2001
From: Roel Adriaans <roel@adriaans.org>
Date: Thu, 7 Dec 2023 23:09:35 +0100
Subject: [PATCH 345/371] wip day 7

---
 src/adventofcode2023/data/day_07/day07.txt    | 1000 +++++++++++++++++
 .../data/day_07/day07_test.txt                |    0
 src/adventofcode2023/day07.py                 |  122 ++
 tests/adventofcode2023/test_day07_a.py        |   33 +
 tests/adventofcode2023/test_day07_b.py        |   25 +
 5 files changed, 1180 insertions(+)
 create mode 100644 src/adventofcode2023/data/day_07/day07.txt
 create mode 100644 src/adventofcode2023/data/day_07/day07_test.txt
 create mode 100644 src/adventofcode2023/day07.py
 create mode 100644 tests/adventofcode2023/test_day07_a.py
 create mode 100644 tests/adventofcode2023/test_day07_b.py

diff --git a/src/adventofcode2023/data/day_07/day07.txt b/src/adventofcode2023/data/day_07/day07.txt
new file mode 100644
index 00000000..fbb248a7
--- /dev/null
+++ b/src/adventofcode2023/data/day_07/day07.txt
@@ -0,0 +1,1000 @@
+8A7J7 301
+QAAT7 677
+J3K4K 622
+KJJ62 577
+49AAA 298
+45585 855
+33KKK 115
+4Q777 438
+7KK77 836
+5T55T 397
+85855 56
+Q6Q38 157
+AA8AA 85
+32J33 293
+KKQQA 247
+888J4 944
+2AJ2K 482
+33777 338
+KT434 696
+K3K63 648
+86866 136
+93983 584
+57857 489
+5JJ2Q 76
+82335 133
+J25T4 559
+9TQ2A 211
+596J6 926
+ATAAA 513
+6KKKQ 277
+AAA22 554
+J2265 332
+8Q3QQ 486
+6735A 28
+Q5555 595
+J9888 262
+5QQQ2 626
+J7777 953
+643TA 572
+8579Q 99
+23294 683
+55J54 501
+9JK93 567
+64388 941
+3J8T5 40
+29K29 422
+JQ4K2 401
+AA6A3 78
+2KK44 821
+9AA2A 884
+43434 386
+J7A67 177
+4JKKT 956
+AA999 296
+2A2T9 519
+9T9KT 342
+Q5J5A 19
+QJK7A 925
+AA9AA 337
+4T2QT 751
+77888 324
+343QT 914
+33229 576
+J5Q5Q 169
+22952 620
+J4444 17
+T9JTT 172
+48888 729
+28522 138
+66363 302
+68TTJ 778
+5Q885 66
+24KJ3 229
+5A68K 731
+A79A7 906
+QQQAQ 698
+J34AJ 109
+TTTTJ 503
+3J528 183
+5A5AA 598
+5AAAA 782
+TT77J 968
+24Q62 178
+T6K7A 811
+99788 53
+494K6 560
+7JQ87 327
+Q9QQQ 597
+496Q2 392
+2252K 995
+Q85TA 2
+KT66Q 165
+383T6 509
+9997Q 724
+4TT4T 368
+35TQA 707
+33534 24
+KKKJ4 469
+A9TAA 830
+A445A 481
+3Q63Q 192
+AATAT 680
+2225J 436
+Q4869 471
+A4JA4 330
+5K35T 545
+TK3A4 877
+8K62J 596
+9Q7T8 582
+898KK 813
+5AJJA 504
+T5TKQ 289
+6T88Q 359
+A8AAJ 526
+393J3 817
+Q2Q22 212
+Q8Q22 89
+265T8 757
+Q2584 807
+T33TT 853
+T22TA 391
+46999 61
+9AA9J 57
+6T538 674
+3T253 271
+63TAJ 395
+34943 323
+6QQQQ 497
+TA75K 938
+4T467 141
+36AQK 197
+884A4 228
+77277 453
+AQ854 50
+Q56QJ 456
+T4TKT 319
+K63Q4 30
+79793 110
+AJKQ6 421
+22278 996
+222TT 357
+42J74 647
+Q4QAT 634
+66574 951
+2KK22 446
+Q65Q3 533
+77887 267
+58533 719
+287K9 51
+Q5656 199
+564AQ 106
+QJ579 77
+9732T 46
+JAK23 808
+688K8 364
+A993A 651
+Q9QQ9 93
+74777 929
+QT722 723
+76QAQ 621
+8K836 573
+77557 783
+A5555 65
+TTT6T 643
+83595 933
+J3J97 734
+JTTA3 87
+TTAQA 282
+A555A 765
+4TQTT 538
+T777Q 763
+T82J9 63
+83359 213
+AQQAQ 363
+47AT9 311
+96A9T 310
+K5TK5 450
+ATKK8 429
+7K777 541
+5TJAK 987
+KAQ73 687
+TTATA 874
+J4TJ2 857
+666KK 204
+AA777 990
+J98A8 946
+7A95A 288
+3K2K3 820
+79K42 112
+A65KT 300
+596T8 266
+J5664 585
+75585 964
+73AT2 491
+2J2KT 375
+6888T 480
+A5765 992
+KK555 224
+AT2TA 514
+TTTTQ 753
+Q4348 273
+KK66K 887
+44JQ9 67
+Q339Q 341
+833Q8 574
+K456T 766
+J98KK 209
+K4644 328
+43935 79
+8848K 380
+K22A2 834
+8654Q 703
+4K2AT 96
+K276J 863
+8K64J 320
+AAA7A 571
+72747 950
+4A4Q9 120
+66636 814
+33637 881
+KK2AK 895
+J8677 851
+A48A8 430
+56656 866
+55355 976
+66J77 370
+3353J 896
+56556 237
+3KJ5Q 270
+J22J2 261
+AJ2AA 163
+JJJJJ 517
+48A28 819
+K4443 799
+TJTJ5 345
+T3K9J 868
+49AJ9 605
+45455 741
+KJJKK 754
+63333 789
+76677 989
+AJ774 264
+JKJ2A 531
+TQQQT 809
+Q6KJ6 411
+KQK7Q 704
+2A4Q5 410
+68KK8 652
+8K938 194
+72J22 242
+9J672 43
+7Q6Q5 903
+64666 95
+J2372 798
+A263T 781
+JK598 909
+55J92 625
+A2567 343
+4A7A7 174
+8KA3J 68
+JQTQ3 528
+74444 127
+QA5AT 306
+T9K7T 254
+75TT7 166
+83388 325
+888Q8 982
+8Q7A6 84
+2K7JA 663
+T9959 937
+3KA87 921
+4KJ92 786
+28A83 442
+99T8J 699
+TKKKK 457
+25552 431
+TTATK 862
+QJQKK 664
+QJQQ9 552
+T4J77 206
+Q7777 352
+QJ747 534
+9K9KK 656
+44646 479
+5T64Q 455
+QQQQK 475
+73478 827
+Q3J33 975
+Q655Q 930
+7T7T7 231
+53A72 409
+3333A 833
+29928 787
+97J58 307
+T2555 673
+Q44A5 382
+J5A57 144
+7J447 131
+8KK99 600
+99555 349
+43682 205
+63259 518
+AA3A8 591
+J444J 58
+52J23 772
+5KK3K 660
+5KT2K 329
+54K6K 252
+49J24 864
+673Q5 780
+TT848 333
+227A5 424
+JT9J5 675
+7K9QJ 825
+732Q7 461
+24343 859
+TJ333 604
+T33AJ 149
+KJ5KK 129
+54555 249
+25222 3
+TQJA3 38
+7Q7Q7 460
+999J4 557
+J6766 831
+K4KKK 185
+363K3 566
+K888J 885
+55855 488
+97979 565
+2597T 493
+77456 233
+Q9Q5Q 202
+99K23 98
+63763 7
+TQ498 849
+74626 590
+K44KK 73
+9AA97 498
+Q6696 706
+95555 697
+69969 670
+JQ294 203
+24246 425
+6QJ6A 16
+AQAAA 916
+6K6JK 313
+9AK99 41
+4T6J5 219
+6Q6T6 549
+96999 983
+79977 522
+57Q8A 732
+AQ6AQ 156
+284Q6 351
+K88KJ 123
+57A8A 606
+4J97Q 592
+5JTQ3 369
+A467T 742
+2878J 669
+KKAJ6 668
+T5TTT 570
+8AA88 665
+3238A 428
+67286 979
+88585 997
+T6866 132
+88T83 912
+68888 832
+A95TK 371
+T8Q33 167
+333K8 286
+KK888 722
+7TAK7 281
+A7J77 216
+9T85Q 969
+54444 918
+77822 151
+9KJ2T 759
+Q8483 536
+9JJA9 788
+J8Q8T 272
+27KJQ 958
+76666 671
+5T932 182
+887T4 628
+6499T 607
+447Q4 718
+9736J 716
+AQJAQ 611
+T4933 690
+3TJAJ 923
+K7722 412
+77737 22
+775AQ 812
+5QKQ5 362
+448T8 114
+A7A7A 502
+4Q466 583
+74744 749
+7363J 939
+88388 59
+Q3KQT 861
+42222 794
+96669 294
+54959 378
+TTTTA 544
+796JA 867
+92KK9 238
+9TJT9 848
+8A2A2 309
+687K3 515
+KTKKT 610
+J8659 210
+22K4K 423
+586Q9 55
+AAA7K 599
+33J73 198
+K74KJ 936
+55JJ5 943
+Q6QJQ 801
+5435J 137
+QJ5QQ 553
+AAA78 485
+67676 404
+34K33 376
+8Q32J 326
+A66KA 649
+52K8Q 179
+A32A2 561
+JTQJQ 645
+59KK7 11
+6763Q 189
+KKK88 426
+8KTJ8 681
+2222T 767
+KK5J7 372
+QQQ57 942
+7A72J 904
+2222J 467
+7KQQQ 186
+J3993 629
+73437 952
+8A37T 771
+966J9 752
+4KT29 710
+82378 840
+4QT72 785
+3629T 934
+JTK77 977
+KKQ33 915
+4242A 744
+TQA9A 215
+A6666 854
+23333 170
+TTT9T 587
+J3377 34
+6JJ66 835
+A3AAA 897
+96936 427
+8JJJ4 686
+32332 173
+QJ868 640
+67388 111
+88988 613
+4TJTT 435
+T988T 702
+K59K5 894
+Q8Q88 688
+5Q847 347
+9J599 154
+958K6 462
+AAQQA 959
+JKJKQ 846
+7992T 72
+9899A 510
+22Q22 389
+939J7 971
+J4K4A 367
+TT7TQ 816
+KKKT3 297
+97KK6 793
+7QQQ7 824
+ATQQA 102
+J597K 797
+78J88 473
+87A87 42
+828A7 527
+K8777 107
+8963J 949
+29399 998
+3TKA8 190
+3TQ66 889
+JJ5T5 985
+J566T 568
+T38K2 815
+2J5KA 646
+A8J32 184
+622Q6 777
+TK7QT 26
+47766 790
+2J5Q6 932
+9K969 878
+82235 64
+3A3JK 152
+49494 540
+7JJJ7 350
+39233 437
+5466Q 239
+Q3QQQ 961
+A8J5Q 623
+Q3333 739
+4T396 90
+25T2J 284
+TK7T3 9
+5555K 993
+J2666 383
+22292 250
+J5T95 478
+22T29 226
+24242 126
+99939 121
+73373 414
+78Q92 738
+A5362 826
+3KK2J 756
+77877 291
+T9TT9 879
+3JJTT 145
+3T363 524
+6Q6QQ 619
+Q2QQQ 8
+8J58J 967
+65KJK 398
+KTA2T 464
+T7JJJ 922
+44888 948
+2KJ2K 755
+63858 353
+49K4T 483
+5833J 180
+62822 105
+99JK9 635
+QAJAA 962
+977T5 691
+655KK 274
+9966A 393
+55J5T 303
+284K5 589
+27636 872
+K29KK 774
+K9JJ4 792
+6JKTT 108
+TK8TJ 745
+T3A7K 400
+9J3TQ 901
+ATJKK 917
+666A5 448
+A5AT6 588
+6T4J6 822
+Q9A9A 260
+594J3 241
+Q3A34 279
+A9999 220
+7AQQ9 49
+737Q3 999
+JQQ8Q 882
+78977 399
+53333 689
+2K2JQ 25
+34848 800
+2585T 334
+5T799 908
+69864 644
+659TK 278
+J4363 633
+T9J97 101
+QJ94T 615
+363J6 373
+J777J 379
+99J93 966
+TT26T 312
+TA8T8 870
+3J535 245
+86A63 283
+2KTK2 508
+Q9Q2Q 162
+59QJT 667
+6JJKQ 71
+55J25 200
+89993 980
+45474 581
+Q4394 159
+45697 346
+KK99Q 496
+J3J53 466
+3QQ3Q 348
+7843J 612
+T733K 164
+42589 818
+Q9K36 232
+QQ22Q 762
+5AA3J 287
+48KKK 449
+7QQQJ 248
+K5KJA 616
+KQ387 965
+Q4898 12
+A3T9Q 227
+K7KTT 269
+JTJ22 768
+85K88 875
+6T666 624
+97K7Q 586
+7854J 804
+T4TTT 609
+8T44T 415
+3T3KK 601
+5AAAJ 258
+8555K 828
+4Q8JQ 593
+JT823 396
+J9K96 838
+55565 632
+7J77T 713
+36353 578
+5Q962 529
+5KQ9T 181
+82697 627
+66654 88
+7747J 919
+A3AAJ 441
+569KJ 805
+TTQJ5 445
+444T4 661
+29959 37
+62J26 955
+Q4JT5 214
+KQA4T 44
+24424 758
+2Q4AK 222
+729A4 195
+4Q35T 928
+329T8 551
+6T5T5 33
+T25Q9 978
+9Q9J9 407
+A4KT7 911
+27397 603
+4244Q 490
+JA255 384
+2AAJ2 876
+6222K 125
+AA46A 360
+J4343 672
+JAJQ9 880
+888J2 468
+Q5K9J 268
+A85Q9 387
+J4A35 705
+66A64 97
+QAQQ8 700
+55TJ4 31
+88J58 650
+693AK 679
+259K2 806
+9998J 176
+6822T 235
+9J699 913
+7QQQQ 602
+T7T4T 317
+6226T 725
+JJ9J9 316
+55575 761
+A6A66 796
+K9T29 764
+33334 608
+KKK7K 893
+99988 579
+J8JJJ 259
+4AJ89 390
+9QQ84 14
+9KJ3K 580
+77736 433
+KK22K 555
+755J2 940
+4JA9A 492
+9Q555 484
+6J687 542
+99K53 910
+6236J 36
+9J999 54
+6663J 454
+85JJK 122
+966J3 171
+QJ2KK 747
+KJA2A 676
+788J5 858
+78833 218
+6KJ6J 308
+T75AT 318
+7JQ36 728
+AJ8TA 354
+96KTQ 899
+52993 402
+9K5AJ 898
+Q7JQJ 748
+5Q5QQ 48
+A5858 148
+85888 988
+2TJ82 556
+9AJK4 843
+TJ26Q 406
+2296K 356
+22K22 18
+KJ6KQ 253
+T444T 117
+6T257 715
+AA444 113
+39737 693
+877QQ 521
+TK454 735
+38QA8 562
+KT4A4 984
+JKKKK 920
+666J6 452
+8JAJT 280
+A62QJ 945
+868TT 243
+KQ66K 511
+J3J33 512
+T9K9K 160
+66TT3 537
+J3T48 234
+44999 158
+9876A 666
+JJ73Q 546
+85A3Q 20
+3333K 750
+6AJ73 381
+Q3Q58 637
+69644 654
+J6669 641
+8K2KK 733
+33535 447
+32K56 153
+TA94Q 994
+7979A 543
+Q663Q 432
+KQJ7Q 516
+66K65 6
+484T4 991
+88387 15
+96229 21
+7AK62 499
+88KK7 618
+3K344 69
+6A6KK 569
+22J24 784
+QKT53 837
+7K2KK 1
+87T95 810
+2228Q 82
+Q66AQ 548
+J6Q66 366
+5J42Q 465
+8QQJ8 246
+JAAKJ 630
+5TT99 408
+5T7Q6 779
+768A7 631
+22262 201
+664AA 104
+A96A6 128
+T666K 5
+3984K 684
+3335K 208
+79A77 891
+K7K76 285
+AQ8A6 678
+36535 130
+JT443 760
+477T9 547
+48A33 532
+AA66A 321
+56666 776
+3AQKJ 888
+K6Q68 83
+2J727 902
+3TT33 339
+85Q6T 714
+QT333 717
+7T74T 335
+J3A85 974
+8J888 617
+K974K 802
+8777Q 947
+A9Q6K 175
+77757 75
+7JA22 458
+3K499 791
+98TTJ 256
+5555J 505
+QTQQJ 70
+T232T 506
+Q9999 907
+J4A88 74
+A4K58 191
+K3888 263
+2QJ22 23
+3368Q 155
+QKKKQ 743
+JK222 139
+KQ84Q 905
+T25T2 91
+Q9TJJ 844
+QQ8Q8 720
+335KK 355
+29T76 963
+39AQ6 292
+27222 276
+88JJ8 388
+52A22 134
+7A95Q 86
+7TTTA 314
+9642K 187
+A33A3 416
+6Q66Q 92
+93A23 403
+77722 523
+33J34 196
+J8333 639
+K8TJ5 736
+222AA 116
+JT3TT 970
+87A65 225
+82555 459
+22JT2 255
+Q2223 972
+K63JA 143
+8AQ86 653
+JJ3J9 614
+3A77A 365
+KK9KT 47
+5T959 385
+7JKQ4 477
+497T3 711
+34A33 770
+57557 869
+777KJ 193
+KKK5Q 892
+9Q299 230
+34J83 795
+3KTTQ 692
+66696 695
+57472 960
+77J26 841
+TAT2T 685
+33969 662
+9Q393 295
+QKQ88 142
+TTT98 32
+25555 374
+265QK 924
+JAAJA 440
+9999K 257
+346KT 500
+JJ299 535
+QJ4KA 135
+7A422 305
+A2T85 773
+4T69J 52
+73Q8A 463
+KK6KK 420
+8Q7QJ 251
+QQK3K 168
+66644 150
+44424 444
+84T53 299
+AKAAK 240
+6A952 35
+Q5875 217
+22888 829
+38589 642
+94848 417
+32222 727
+966Q9 27
+JQ9QT 336
+52K2T 886
+J7787 721
+AAQ3A 147
+6K823 957
+6668Q 839
+AAA88 39
+KJ33K 4
+J5J5J 419
+2A7T9 275
+4A777 470
+7KK7K 377
+99992 418
+93TA8 865
+95T34 709
+K34JA 322
+94674 658
+AJAA7 45
+JQ22A 304
+K83Q2 13
+A6923 439
+98977 331
+689J6 769
+99953 931
+QQQJQ 94
+J5AA5 871
+TJTJT 413
+ATA28 530
+6T66T 564
+KAKKK 873
+T43QQ 657
+TTTT2 563
+9898J 118
+QQQQ8 659
+99997 236
+88826 188
+6KKK5 394
+2QQJ2 495
+8T864 900
+888K8 655
+28KQ4 361
+33732 472
+AA2A7 845
+TTT7T 726
+68A84 852
+3KKKK 161
+343Q2 358
+75792 476
+AAAJA 550
+KK9A9 558
+72569 737
+4AT33 708
+KKKQ9 119
+8JJJ6 315
+78A77 850
+JJQJ7 140
+3A5A5 740
+78278 344
+Q4Q44 103
+44JA4 146
+74T95 636
+2A2AT 507
+TK5Q5 474
+7T982 712
+AJ378 1000
+75858 494
+AAA99 746
+72T94 981
+TT77T 803
+393K3 124
+T8T95 265
+AJA66 244
+AA4TA 207
+44777 638
+68QT2 973
+9K628 340
+7595K 443
+9A949 682
+KJKTT 954
+23T26 100
+5KJ5T 434
+66626 81
+K33K3 856
+J7555 525
+JQJJ5 60
+868J6 935
+22299 823
+J4445 539
+9KKK7 890
+JAA48 80
+755Q5 520
+4JQQJ 223
+997T9 405
+8A888 575
+K369T 730
+A5565 847
+39JQ4 29
+QQQJJ 694
+86789 860
+333J3 10
+9A94A 221
+J99JT 62
+87888 701
+AA6A2 290
+T5QK4 775
+35354 927
+323Q3 451
+25TA5 883
+2954J 487
+376J6 594
+2K975 842
+AAAA6 986
diff --git a/src/adventofcode2023/data/day_07/day07_test.txt b/src/adventofcode2023/data/day_07/day07_test.txt
new file mode 100644
index 00000000..e69de29b
diff --git a/src/adventofcode2023/day07.py b/src/adventofcode2023/day07.py
new file mode 100644
index 00000000..98eefa87
--- /dev/null
+++ b/src/adventofcode2023/day07.py
@@ -0,0 +1,122 @@
+from __future__ import annotations
+
+from collections import Counter
+from enum import Enum
+
+import attr
+import attrs
+
+from adventofcode.utils.abstract import FileReaderSolution
+
+
+@attr.define(frozen=True, order=True)
+class Bid:
+    hand: Hand
+    bid: int
+
+
+class Score(Enum):
+    FIVE_OF_A_KIND = 7
+    FOUR_OF_A_KIND = 6
+    FULL_HOUSE = 5
+    THREE_OF_A_KIND = 4
+    TWO_PAIR = 3
+    ONE_PAIR = 2
+    HIGH_CARD = 1
+
+
+@attrs.frozen
+class Hand:
+    # Comparing documentation:
+    # https://www.attrs.org/en/stable/comparison.html#custom-comparison
+    cards: str
+
+    def score(self) -> Score:
+        """Compute the sore for this hand.
+        This score can then be used for comparing cards against each other.
+
+        In the order:
+        - Five of a kind -> 7 points
+        - Four of a kind -> 6 points
+        - Full house -> 5
+        - Three of a kind -> 4
+        - Two Pair -> 3
+        - One pair -> 2
+        - High card -> 1
+        """
+        counter = Counter(self.cards)
+        most_common = counter.most_common()
+        unique_cards = len(counter)
+
+        # Five of a kind, where all five cards have the same label
+        if len(counter) == 1:
+            return Score.FIVE_OF_A_KIND
+
+        # Four of a kind, where four cards have the same label and one card has a
+        # different label
+        if unique_cards == 2 and most_common[0][1] == 4 and most_common[1][1] == 1:
+            return Score.FOUR_OF_A_KIND
+
+        # Full house, where three cards have the same label,
+        # and the remaining two cards share a different label
+        if unique_cards == 2 and most_common[0][1] == 3 and most_common[1][1] == 2:
+            return Score.FULL_HOUSE
+
+        # Three of a kind, where three cards have the same label,
+        # and the remaining two cards are each different from any other card in the hand
+        if (
+            unique_cards == 3
+            and most_common[0][1] == 3
+            and most_common[1][1] == 1
+            and most_common[2][1] == 1
+        ):
+            return Score.THREE_OF_A_KIND
+
+        # Two pair, where two cards share one label,
+        # two other cards share a second label, and the remaining card has a third label
+        if (
+            unique_cards == 3
+            and most_common[0][1] == 2
+            and most_common[1][1] == 2
+            and most_common[2][1] == 1
+        ):
+            return Score.TWO_PAIR
+
+        # One pair, where two cards share one label,
+        # and the other three cards have a different label from the pair and each other
+        if (
+            unique_cards == 4
+            and most_common[0][1] == 2
+            and most_common[1][1] == 1
+            and most_common[2][1] == 1
+            and most_common[3][1] == 1
+        ):
+            return Score.ONE_PAIR
+        # High card, where all cards' labels are distinct: 23456
+        if len(counter) == 5:
+            return Score.HIGH_CARD
+
+        raise ValueError(f"Unknown Score for cards: {self.cards}")
+
+
+class Day07:
+    pass
+
+
+class Day07PartA(Day07, FileReaderSolution):
+    def solve(self, input_data: str) -> int:
+        bids = [
+            Bid(Hand(line.split()[0]), int(line.split()[1]))
+            for line in input_data.splitlines()
+        ]
+        total = 0
+        for idx, bid in enumerate(sorted(bids), start=1):
+            score = bid.bid * idx
+            total += score
+
+        return score
+
+
+class Day07PartB(Day07, FileReaderSolution):
+    def solve(self, input_data: str) -> int:
+        raise NotImplementedError
diff --git a/tests/adventofcode2023/test_day07_a.py b/tests/adventofcode2023/test_day07_a.py
new file mode 100644
index 00000000..1f5a57b0
--- /dev/null
+++ b/tests/adventofcode2023/test_day07_a.py
@@ -0,0 +1,33 @@
+import pytest
+
+from adventofcode2023.day07 import Day07PartA, Score, Hand
+
+
+class TestDay07PartA:
+    def test_day07a_testdata(self, testdata):
+        solution = Day07PartA()
+        result = solution.solve(testdata)
+        assert result == 6440
+
+    @pytest.mark.parametrize(
+        ("input_data", "expected_result"),
+        [
+            ("AAAAA", Score.FIVE_OF_A_KIND),
+            ("AA8AA", Score.FOUR_OF_A_KIND),
+            ("23332", Score.FULL_HOUSE),
+            ("TTT98", Score.THREE_OF_A_KIND),
+            ("23432", Score.TWO_PAIR),
+            ("A23A4", Score.ONE_PAIR),
+            ("23456", Score.HIGH_CARD),
+        ],
+    )
+    def test_day07a_test_hand_score(self, input_data, expected_result):
+        hand = Hand(input_data)
+        assert hand.score() == expected_result
+
+    @pytest.mark.xfail(reason="Not yet implemented", raises=NotImplementedError)
+    def test_day07a_data(self):
+        """Result we got when we did the real solution"""
+        solution = Day07PartA()
+        res = solution("day_07/day07.txt")
+        assert res == 0
diff --git a/tests/adventofcode2023/test_day07_b.py b/tests/adventofcode2023/test_day07_b.py
new file mode 100644
index 00000000..e03f156e
--- /dev/null
+++ b/tests/adventofcode2023/test_day07_b.py
@@ -0,0 +1,25 @@
+import pytest
+
+from adventofcode2023.day07 import Day07PartB
+
+
+class TestDay07PartB:
+    @pytest.mark.xfail(reason="Not yet implemented", raises=NotImplementedError)
+    def test_day07b_testdata(self, testdata):
+        solution = Day07PartB()
+        result = solution.solve(testdata)
+        assert result == 0
+
+    @pytest.mark.xfail(reason="Not yet implemented", raises=NotImplementedError)
+    @pytest.mark.parametrize(("input_data", "expected_result"), [("", ""), ("", "")])
+    def test_day07b_solve(self, input_data, expected_result):
+        solution = Day07PartB()
+        result = solution.solve(input_data)
+        assert result == expected_result
+
+    @pytest.mark.xfail(reason="Not yet implemented", raises=NotImplementedError)
+    def test_day07b_data(self):
+        """Result we got when we did the real solution"""
+        solution = Day07PartB()
+        res = solution("day_07/day07.txt")
+        assert res == 0

From 0da8d16e92ae44272a44e402456c8058c39fc3ef Mon Sep 17 00:00:00 2001
From: Roel Adriaans <roel@adriaans.org>
Date: Fri, 8 Dec 2023 15:37:57 +0100
Subject: [PATCH 346/371] 2023, day 7. Cards for days

---
 .../data/day_07/day07_test.txt                |  5 ++
 src/adventofcode2023/day07.py                 | 73 ++++++++++++++-----
 tests/adventofcode2023/test_day07_a.py        | 28 ++++++-
 3 files changed, 84 insertions(+), 22 deletions(-)

diff --git a/src/adventofcode2023/data/day_07/day07_test.txt b/src/adventofcode2023/data/day_07/day07_test.txt
index e69de29b..e3500c3b 100644
--- a/src/adventofcode2023/data/day_07/day07_test.txt
+++ b/src/adventofcode2023/data/day_07/day07_test.txt
@@ -0,0 +1,5 @@
+32T3K 765
+T55J5 684
+KK677 28
+KTJJT 220
+QQQJA 483
diff --git a/src/adventofcode2023/day07.py b/src/adventofcode2023/day07.py
index 98eefa87..3ad1297b 100644
--- a/src/adventofcode2023/day07.py
+++ b/src/adventofcode2023/day07.py
@@ -1,20 +1,12 @@
 from __future__ import annotations
 
+import functools
 from collections import Counter
 from enum import Enum
 
-import attr
-import attrs
-
 from adventofcode.utils.abstract import FileReaderSolution
 
 
-@attr.define(frozen=True, order=True)
-class Bid:
-    hand: Hand
-    bid: int
-
-
 class Score(Enum):
     FIVE_OF_A_KIND = 7
     FOUR_OF_A_KIND = 6
@@ -25,12 +17,16 @@ class Score(Enum):
     HIGH_CARD = 1
 
 
-@attrs.frozen
+@functools.total_ordering
 class Hand:
-    # Comparing documentation:
-    # https://www.attrs.org/en/stable/comparison.html#custom-comparison
     cards: str
+    bid: int
+
+    def __init__(self, cards: str, bid: int):
+        self.cards = cards
+        self.bid = bid
 
+    @property
     def score(self) -> Score:
         """Compute the sore for this hand.
         This score can then be used for comparing cards against each other.
@@ -98,6 +94,42 @@ def score(self) -> Score:
 
         raise ValueError(f"Unknown Score for cards: {self.cards}")
 
+    @staticmethod
+    def letter_to_score(letter: str) -> int:
+        scores = {
+            "A": 14,
+            "K": 13,
+            "Q": 12,
+            "J": 11,
+            "T": 10,
+        }
+        try:
+            return scores[letter]
+        except KeyError:
+            return int(letter)
+
+    def __repr__(self):
+        return f"<Hand {self.cards} (Score: {self.score}, bid: {self.bid})>"
+
+    def __eq__(self, other):
+        if not isinstance(other, Hand):
+            raise ValueError("Can't compare, must be a Hand")
+        if self.cards == other.cards and self.score == other.score:
+            return True
+        else:
+            return False
+
+    def __lt__(self, other) -> bool:
+        if self.score != other.score:
+            return self.score.value < other.score.value
+        else:
+            for c, r in zip(self.cards, other.cards):
+                if c == r:
+                    continue
+                else:
+                    return self.letter_to_score(c) < self.letter_to_score(r)
+            return False
+
 
 class Day07:
     pass
@@ -105,16 +137,21 @@ class Day07:
 
 class Day07PartA(Day07, FileReaderSolution):
     def solve(self, input_data: str) -> int:
-        bids = [
-            Bid(Hand(line.split()[0]), int(line.split()[1]))
-            for line in input_data.splitlines()
-        ]
+        hands = sorted(
+            [
+                Hand(line.split()[0], int(line.split()[1]))
+                for line in input_data.splitlines()
+            ]
+        )
         total = 0
-        for idx, bid in enumerate(sorted(bids), start=1):
+        ranks = []
+        for idx, bid in enumerate(hands, start=1):
             score = bid.bid * idx
             total += score
+            ranks.append([bid.cards, idx])
 
-        return score
+        print(ranks)
+        return total
 
 
 class Day07PartB(Day07, FileReaderSolution):
diff --git a/tests/adventofcode2023/test_day07_a.py b/tests/adventofcode2023/test_day07_a.py
index 1f5a57b0..e966b171 100644
--- a/tests/adventofcode2023/test_day07_a.py
+++ b/tests/adventofcode2023/test_day07_a.py
@@ -1,9 +1,29 @@
 import pytest
 
-from adventofcode2023.day07 import Day07PartA, Score, Hand
+from adventofcode2023.day07 import Day07PartA, Hand, Score
 
 
 class TestDay07PartA:
+    @pytest.mark.parametrize(
+        ("card1", "card2", "lt", "eq"),
+        [
+            ("AAAAA", "AAAAA", False, True),
+            ("33333", "22222", False, False),
+            ("33332", "2AAAA", False, False),
+            ("77888", "77788", False, False),
+            ("22222", "33333", True, False),
+            ("KK677", "KTJJT", False, False),
+        ],
+    )
+    def test_day07a_cards(self, card1, card2, lt, eq):
+        hand1 = Hand(card1, 100)
+        hand2 = Hand(card2, 100)
+        ltcompare = hand1 < hand2
+        assert ltcompare == lt
+
+        eqcompare = hand1 == hand2
+        assert eqcompare == eq
+
     def test_day07a_testdata(self, testdata):
         solution = Day07PartA()
         result = solution.solve(testdata)
@@ -22,12 +42,12 @@ def test_day07a_testdata(self, testdata):
         ],
     )
     def test_day07a_test_hand_score(self, input_data, expected_result):
-        hand = Hand(input_data)
-        assert hand.score() == expected_result
+        hand = Hand(input_data, 0)
+        assert hand.score == expected_result
 
     @pytest.mark.xfail(reason="Not yet implemented", raises=NotImplementedError)
     def test_day07a_data(self):
         """Result we got when we did the real solution"""
         solution = Day07PartA()
         res = solution("day_07/day07.txt")
-        assert res == 0
+        assert res == 250946742

From 1a9773d0290c45da17a258a790b24c1906a878e7 Mon Sep 17 00:00:00 2001
From: Roel Adriaans <roel@adriaans.org>
Date: Fri, 8 Dec 2023 21:05:33 +0100
Subject: [PATCH 347/371] Remove debugging

---
 src/adventofcode2023/day07.py | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/src/adventofcode2023/day07.py b/src/adventofcode2023/day07.py
index 3ad1297b..0766e0f3 100644
--- a/src/adventofcode2023/day07.py
+++ b/src/adventofcode2023/day07.py
@@ -144,13 +144,9 @@ def solve(self, input_data: str) -> int:
             ]
         )
         total = 0
-        ranks = []
         for idx, bid in enumerate(hands, start=1):
             score = bid.bid * idx
             total += score
-            ranks.append([bid.cards, idx])
-
-        print(ranks)
         return total
 
 

From b605cc7ef521af913b43ebadfb6d28d9071c2ba4 Mon Sep 17 00:00:00 2001
From: Roel Adriaans <roel@adriaans.org>
Date: Fri, 8 Dec 2023 21:12:49 +0100
Subject: [PATCH 348/371] Add 2018 package

---
 pyproject.toml | 1 +
 tox.ini        | 1 +
 2 files changed, 2 insertions(+)

diff --git a/pyproject.toml b/pyproject.toml
index e423dde8..1d24be2a 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -8,6 +8,7 @@ license = "MIT"
 packages = [
     { include = "adventofcode", from="src" },
     { include = "adventofcode2016", from="src" },
+    { include = "adventofcode2018", from="src" },
     { include = "adventofcode2019", from="src" },
     { include = "adventofcode2020", from="src" },
     { include = "adventofcode2021", from="src" },
diff --git a/tox.ini b/tox.ini
index 79eb5d7c..1de75722 100644
--- a/tox.ini
+++ b/tox.ini
@@ -44,6 +44,7 @@ omit =
 source =
     adventofcode
     adventofcode2016
+    adventofcode2018
     adventofcode2019
     adventofcode2020
     adventofcode2021

From 6c8368b2dbcc34cdb1a15a0c5953f9f623c39015 Mon Sep 17 00:00:00 2001
From: Roel Adriaans <roel@adriaans.org>
Date: Fri, 8 Dec 2023 21:27:53 +0100
Subject: [PATCH 349/371] Make 2018 package work in new structure, silence some
 errors

---
 src/adventofcode2018/day01.py          |  6 +++---
 src/adventofcode2018/day02.py          |  3 +--
 src/adventofcode2018/day03.py          |  3 +--
 src/adventofcode2018/day04.py          |  2 +-
 src/adventofcode2018/day05.py          |  2 +-
 src/adventofcode2018/day06.py          |  2 +-
 src/adventofcode2018/day07.py          |  2 +-
 src/adventofcode2018/day08.py          |  4 +---
 src/adventofcode2018/day09.py          |  2 +-
 src/adventofcode2018/day10.py          |  2 +-
 src/adventofcode2018/day11.py          |  2 +-
 src/adventofcode2018/day12.py          |  2 +-
 src/adventofcode2018/day13.py          |  3 +--
 src/adventofcode2018/day14.py          |  4 +---
 src/adventofcode2018/day16.py          | 13 +++++++------
 tests/adventofcode2018/test_day01_a.py |  3 ++-
 tests/adventofcode2018/test_day01_b.py |  3 ++-
 tests/adventofcode2018/test_day02_a.py |  3 ++-
 tests/adventofcode2018/test_day02_b.py |  3 ++-
 tests/adventofcode2018/test_day03_a.py |  3 ++-
 tests/adventofcode2018/test_day03_b.py |  3 ++-
 tests/adventofcode2018/test_day04_a.py |  3 ++-
 tests/adventofcode2018/test_day04_b.py |  2 +-
 tests/adventofcode2018/test_day05_a.py |  3 ++-
 tests/adventofcode2018/test_day05_b.py |  3 ++-
 tests/adventofcode2018/test_day06_a.py |  3 ++-
 tests/adventofcode2018/test_day06_b.py |  3 ++-
 tests/adventofcode2018/test_day07_a.py |  3 ++-
 tests/adventofcode2018/test_day07_b.py |  3 ++-
 tests/adventofcode2018/test_day08_a.py |  3 ++-
 tests/adventofcode2018/test_day08_b.py |  3 ++-
 tests/adventofcode2018/test_day09_a.py |  3 ++-
 tests/adventofcode2018/test_day09_b.py |  2 +-
 tests/adventofcode2018/test_day10_a.py |  3 ++-
 tests/adventofcode2018/test_day10_b.py |  2 +-
 tests/adventofcode2018/test_day11_a.py |  3 ++-
 tests/adventofcode2018/test_day11_b.py |  3 ++-
 tests/adventofcode2018/test_day12_a.py |  2 +-
 tests/adventofcode2018/test_day12_b.py |  2 +-
 tests/adventofcode2018/test_day13_a.py |  3 ++-
 tests/adventofcode2018/test_day13_b.py |  2 +-
 tests/adventofcode2018/test_day14_a.py |  3 ++-
 tests/adventofcode2018/test_day14_b.py |  3 ++-
 tests/adventofcode2018/test_day16_a.py |  3 +--
 tests/adventofcode2018/test_day16_b.py |  3 ++-
 45 files changed, 76 insertions(+), 60 deletions(-)

diff --git a/src/adventofcode2018/day01.py b/src/adventofcode2018/day01.py
index 18a4e80d..08e927a7 100644
--- a/src/adventofcode2018/day01.py
+++ b/src/adventofcode2018/day01.py
@@ -1,6 +1,6 @@
 from collections import Counter
 
-from utils.abstract import FileReaderSolution
+from adventofcode.utils.abstract import FileReaderSolution
 
 
 class Day1PartA(FileReaderSolution):
@@ -8,7 +8,7 @@ def solve(self, input_data: str) -> int:
         parts = input_data.split()
         total = 0
         for part in parts:
-            total += eval(part)
+            total += eval(part)  # nosec B307
         return total
 
 
@@ -23,7 +23,7 @@ def solve(self, input_data: str) -> int:
         total = 0
         while True:
             for part in parts:
-                total += eval(part)
+                total += eval(part)  # nosec B307
                 visited_frequencies[total] += 1
                 if visited_frequencies[total] == frequency_to_reach:
                     return total
diff --git a/src/adventofcode2018/day02.py b/src/adventofcode2018/day02.py
index e37ca242..7d8b93ed 100644
--- a/src/adventofcode2018/day02.py
+++ b/src/adventofcode2018/day02.py
@@ -2,9 +2,8 @@
 from collections.abc import Iterable
 from functools import lru_cache
 from itertools import combinations
-from typing import List, Tuple
 
-from utils.abstract import FileReaderSolution
+from adventofcode.utils.abstract import FileReaderSolution
 
 
 class Day2:
diff --git a/src/adventofcode2018/day03.py b/src/adventofcode2018/day03.py
index 7ce884fc..ee973608 100644
--- a/src/adventofcode2018/day03.py
+++ b/src/adventofcode2018/day03.py
@@ -1,8 +1,7 @@
 import re
 from collections import namedtuple
-from typing import Dict, List
 
-from utils.abstract import FileReaderSolution
+from adventofcode.utils.abstract import FileReaderSolution
 
 
 class Day3:
diff --git a/src/adventofcode2018/day04.py b/src/adventofcode2018/day04.py
index c8c91082..811bfa11 100644
--- a/src/adventofcode2018/day04.py
+++ b/src/adventofcode2018/day04.py
@@ -1,7 +1,7 @@
 import re
 from collections import Counter
 
-from utils.abstract import FileReaderSolution
+from adventofcode.utils.abstract import FileReaderSolution
 
 
 class Day4:
diff --git a/src/adventofcode2018/day05.py b/src/adventofcode2018/day05.py
index 43d4d349..39df145f 100644
--- a/src/adventofcode2018/day05.py
+++ b/src/adventofcode2018/day05.py
@@ -3,7 +3,7 @@
 from collections import Counter
 from string import ascii_lowercase
 
-from utils.abstract import FileReaderSolution
+from adventofcode.utils.abstract import FileReaderSolution
 
 
 class Day5:
diff --git a/src/adventofcode2018/day06.py b/src/adventofcode2018/day06.py
index fd5069a9..de144616 100644
--- a/src/adventofcode2018/day06.py
+++ b/src/adventofcode2018/day06.py
@@ -1,6 +1,6 @@
 from collections import Counter, namedtuple
 
-from utils.abstract import FileReaderSolution
+from adventofcode.utils.abstract import FileReaderSolution
 
 Point = namedtuple("Point", "x y id")
 
diff --git a/src/adventofcode2018/day07.py b/src/adventofcode2018/day07.py
index a7de873c..cdbc52ca 100644
--- a/src/adventofcode2018/day07.py
+++ b/src/adventofcode2018/day07.py
@@ -1,6 +1,6 @@
 import re
 
-from utils.abstract import FileReaderSolution
+from adventofcode.utils.abstract import FileReaderSolution
 
 
 class TimedNode:
diff --git a/src/adventofcode2018/day08.py b/src/adventofcode2018/day08.py
index ed22c609..6b4bb364 100644
--- a/src/adventofcode2018/day08.py
+++ b/src/adventofcode2018/day08.py
@@ -1,6 +1,4 @@
-from typing import List
-
-from utils.abstract import FileReaderSolution
+from adventofcode.utils.abstract import FileReaderSolution
 
 
 class Node:
diff --git a/src/adventofcode2018/day09.py b/src/adventofcode2018/day09.py
index 7ca7d3db..b0c8715d 100644
--- a/src/adventofcode2018/day09.py
+++ b/src/adventofcode2018/day09.py
@@ -1,6 +1,6 @@
 from collections import Counter, deque
 
-from utils.abstract import FileReaderSolution
+from adventofcode.utils.abstract import FileReaderSolution
 
 
 class Day09:
diff --git a/src/adventofcode2018/day10.py b/src/adventofcode2018/day10.py
index be5c0e34..c32132f2 100644
--- a/src/adventofcode2018/day10.py
+++ b/src/adventofcode2018/day10.py
@@ -3,7 +3,7 @@
 
 import matplotlib.pyplot as plt
 
-from utils.abstract import FileReaderSolution
+from adventofcode.utils.abstract import FileReaderSolution
 
 
 class Point:
diff --git a/src/adventofcode2018/day11.py b/src/adventofcode2018/day11.py
index d2b2c254..88dc2e57 100644
--- a/src/adventofcode2018/day11.py
+++ b/src/adventofcode2018/day11.py
@@ -1,4 +1,4 @@
-from utils.abstract import FileReaderSolution
+from adventofcode.utils.abstract import FileReaderSolution
 
 
 class Day11:
diff --git a/src/adventofcode2018/day12.py b/src/adventofcode2018/day12.py
index 54799d59..e16775a8 100644
--- a/src/adventofcode2018/day12.py
+++ b/src/adventofcode2018/day12.py
@@ -1,6 +1,6 @@
 import itertools
 
-from utils.abstract import FileReaderSolution
+from adventofcode.utils.abstract import FileReaderSolution
 
 """
 Game of live. Do we model the plants, or do we model the list?
diff --git a/src/adventofcode2018/day13.py b/src/adventofcode2018/day13.py
index 9eb89464..406d8489 100644
--- a/src/adventofcode2018/day13.py
+++ b/src/adventofcode2018/day13.py
@@ -1,7 +1,6 @@
 from enum import Enum
-from typing import List, Tuple, Union
 
-from utils.abstract import FileReaderSolution
+from adventofcode.utils.abstract import FileReaderSolution
 
 
 class GridPosition:
diff --git a/src/adventofcode2018/day14.py b/src/adventofcode2018/day14.py
index c96cc6eb..d16e63f1 100644
--- a/src/adventofcode2018/day14.py
+++ b/src/adventofcode2018/day14.py
@@ -1,8 +1,6 @@
-from typing import List
-
 import tqdm
 
-from utils.abstract import FileReaderSolution
+from adventofcode.utils.abstract import FileReaderSolution
 
 
 class Elve:
diff --git a/src/adventofcode2018/day16.py b/src/adventofcode2018/day16.py
index 46942438..e4376a64 100644
--- a/src/adventofcode2018/day16.py
+++ b/src/adventofcode2018/day16.py
@@ -1,10 +1,8 @@
 import copy
 import re
 from abc import ABC, abstractmethod
-from collections import Counter
-from typing import Dict, List
 
-from utils.abstract import FileReaderSolution
+from adventofcode.utils.abstract import FileReaderSolution
 
 
 class Device:
@@ -344,10 +342,14 @@ def solve(self, input_data: str) -> int:
 
 
 class Day16PartB(Day16, FileReaderSolution):
-    def resolve_opcode_no_to_instruction(self, input_data: str) -> list[str]:
+    def resolve_opcode_no_to_instruction(  # noqa: C901
+        self, input_data: str
+    ) -> list[str]:
         """
         Resolve the opcode with the instruction
 
+        @TODO Refactor! Way to complex...
+
         :param input_data: Sample input data
         :return: List with opcode number as values and instruction as key.
         """
@@ -409,8 +411,7 @@ def resolve_opcode_no_to_instruction(self, input_data: str) -> list[str]:
                 return result
 
     def solve(self, input_data: str) -> int:
-        opcode_list = self.resolve_opcode_no_to_instruction(input_data)
+        # opcode_list = self.resolve_opcode_no_to_instruction(input_data)
         # Run the computer
         # @TODO.
-
         raise NotImplementedError
diff --git a/tests/adventofcode2018/test_day01_a.py b/tests/adventofcode2018/test_day01_a.py
index 0c934d48..1d56f33d 100644
--- a/tests/adventofcode2018/test_day01_a.py
+++ b/tests/adventofcode2018/test_day01_a.py
@@ -1,5 +1,6 @@
 import pytest
-from solutions.day01 import Day1PartA
+
+from adventofcode2018.day01 import Day1PartA
 
 
 class TestDay01PartA:
diff --git a/tests/adventofcode2018/test_day01_b.py b/tests/adventofcode2018/test_day01_b.py
index f6185b1b..08d1c058 100644
--- a/tests/adventofcode2018/test_day01_b.py
+++ b/tests/adventofcode2018/test_day01_b.py
@@ -1,5 +1,6 @@
 import pytest
-from solutions.day01 import Day1PartB
+
+from adventofcode2018.day01 import Day1PartB
 
 
 class TestDay01PartB:
diff --git a/tests/adventofcode2018/test_day02_a.py b/tests/adventofcode2018/test_day02_a.py
index b858440b..d6a66f46 100644
--- a/tests/adventofcode2018/test_day02_a.py
+++ b/tests/adventofcode2018/test_day02_a.py
@@ -1,5 +1,6 @@
 import pytest
-from solutions.day02 import Day2PartA
+
+from adventofcode2018.day02 import Day2PartA
 
 
 class TestDay02PartA:
diff --git a/tests/adventofcode2018/test_day02_b.py b/tests/adventofcode2018/test_day02_b.py
index fe397017..52305a9b 100644
--- a/tests/adventofcode2018/test_day02_b.py
+++ b/tests/adventofcode2018/test_day02_b.py
@@ -1,5 +1,6 @@
 import pytest
-from solutions.day02 import Day2PartB
+
+from adventofcode2018.day02 import Day2PartB
 
 
 class TestDay02PartB:
diff --git a/tests/adventofcode2018/test_day03_a.py b/tests/adventofcode2018/test_day03_a.py
index 8d675d54..014d1806 100644
--- a/tests/adventofcode2018/test_day03_a.py
+++ b/tests/adventofcode2018/test_day03_a.py
@@ -1,5 +1,6 @@
 import pytest
-from solutions.day03 import Day3PartA
+
+from adventofcode2018.day03 import Day3PartA
 
 
 class TestDay03PartA:
diff --git a/tests/adventofcode2018/test_day03_b.py b/tests/adventofcode2018/test_day03_b.py
index 13ef07c8..f168177f 100644
--- a/tests/adventofcode2018/test_day03_b.py
+++ b/tests/adventofcode2018/test_day03_b.py
@@ -1,5 +1,6 @@
 import pytest
-from solutions.day03 import Day3PartB
+
+from adventofcode2018.day03 import Day3PartB
 
 
 class TestDay03PartB:
diff --git a/tests/adventofcode2018/test_day04_a.py b/tests/adventofcode2018/test_day04_a.py
index 918cc33d..0cb55272 100644
--- a/tests/adventofcode2018/test_day04_a.py
+++ b/tests/adventofcode2018/test_day04_a.py
@@ -1,7 +1,8 @@
 import random
 
 import pytest
-from solutions.day04 import Day4PartA
+
+from adventofcode2018.day04 import Day4PartA
 
 
 class TestDay04PartA:
diff --git a/tests/adventofcode2018/test_day04_b.py b/tests/adventofcode2018/test_day04_b.py
index 7a16408d..a4b60304 100644
--- a/tests/adventofcode2018/test_day04_b.py
+++ b/tests/adventofcode2018/test_day04_b.py
@@ -1,6 +1,6 @@
 import random
 
-from solutions.day04 import Day4PartB
+from adventofcode2018.day04 import Day4PartB
 
 
 class TestDay04PartA:
diff --git a/tests/adventofcode2018/test_day05_a.py b/tests/adventofcode2018/test_day05_a.py
index 275c4c72..15b937b6 100644
--- a/tests/adventofcode2018/test_day05_a.py
+++ b/tests/adventofcode2018/test_day05_a.py
@@ -1,5 +1,6 @@
 import pytest
-from solutions.day05 import Day5PartA
+
+from adventofcode2018.day05 import Day5PartA
 
 
 class TestDay05PartA:
diff --git a/tests/adventofcode2018/test_day05_b.py b/tests/adventofcode2018/test_day05_b.py
index 5651c0f3..daadd65f 100644
--- a/tests/adventofcode2018/test_day05_b.py
+++ b/tests/adventofcode2018/test_day05_b.py
@@ -1,5 +1,6 @@
 import pytest
-from solutions.day05 import Day5PartB
+
+from adventofcode2018.day05 import Day5PartB
 
 
 class TestDay05PartB:
diff --git a/tests/adventofcode2018/test_day06_a.py b/tests/adventofcode2018/test_day06_a.py
index 90aca50f..1a9e5e2b 100644
--- a/tests/adventofcode2018/test_day06_a.py
+++ b/tests/adventofcode2018/test_day06_a.py
@@ -1,5 +1,6 @@
 import pytest
-from solutions.day06 import Day06PartA
+
+from adventofcode2018.day06 import Day06PartA
 
 
 class TestDay06PartA:
diff --git a/tests/adventofcode2018/test_day06_b.py b/tests/adventofcode2018/test_day06_b.py
index 31a41687..1ad4dba8 100644
--- a/tests/adventofcode2018/test_day06_b.py
+++ b/tests/adventofcode2018/test_day06_b.py
@@ -1,5 +1,6 @@
 import pytest
-from solutions.day06 import Day06PartB
+
+from adventofcode2018.day06 import Day06PartB
 
 
 class TestDay06PartB:
diff --git a/tests/adventofcode2018/test_day07_a.py b/tests/adventofcode2018/test_day07_a.py
index 13fdd2d8..e757dc00 100644
--- a/tests/adventofcode2018/test_day07_a.py
+++ b/tests/adventofcode2018/test_day07_a.py
@@ -1,5 +1,6 @@
 import pytest
-from solutions.day07 import Day07PartA
+
+from adventofcode2018.day07 import Day07PartA
 
 
 class TestDay07PartA:
diff --git a/tests/adventofcode2018/test_day07_b.py b/tests/adventofcode2018/test_day07_b.py
index 5b179af3..d1ef0d36 100644
--- a/tests/adventofcode2018/test_day07_b.py
+++ b/tests/adventofcode2018/test_day07_b.py
@@ -1,5 +1,6 @@
 import pytest
-from solutions.day07 import Day07PartB, TimedNode
+
+from adventofcode2018.day07 import Day07PartB, TimedNode
 
 
 class TestDay07PartB:
diff --git a/tests/adventofcode2018/test_day08_a.py b/tests/adventofcode2018/test_day08_a.py
index 407b953a..43e9acf4 100644
--- a/tests/adventofcode2018/test_day08_a.py
+++ b/tests/adventofcode2018/test_day08_a.py
@@ -1,5 +1,6 @@
 import pytest
-from solutions.day08 import Day08PartA
+
+from adventofcode2018.day08 import Day08PartA
 
 
 class TestDay08PartA:
diff --git a/tests/adventofcode2018/test_day08_b.py b/tests/adventofcode2018/test_day08_b.py
index 7902c2eb..48cb7fcd 100644
--- a/tests/adventofcode2018/test_day08_b.py
+++ b/tests/adventofcode2018/test_day08_b.py
@@ -1,5 +1,6 @@
 import pytest
-from solutions.day08 import Day08PartB, Node
+
+from adventofcode2018.day08 import Day08PartB, Node
 
 
 class TestDay08PartB:
diff --git a/tests/adventofcode2018/test_day09_a.py b/tests/adventofcode2018/test_day09_a.py
index 9fdbce50..b2514f00 100644
--- a/tests/adventofcode2018/test_day09_a.py
+++ b/tests/adventofcode2018/test_day09_a.py
@@ -1,5 +1,6 @@
 import pytest
-from solutions.day09 import Day09PartA
+
+from adventofcode2018.day09 import Day09PartA
 
 
 class TestDay09PartA:
diff --git a/tests/adventofcode2018/test_day09_b.py b/tests/adventofcode2018/test_day09_b.py
index bcc26471..b021465c 100644
--- a/tests/adventofcode2018/test_day09_b.py
+++ b/tests/adventofcode2018/test_day09_b.py
@@ -1,4 +1,4 @@
-from solutions.day09 import Day09PartB
+from adventofcode2018.day09 import Day09PartB
 
 
 class TestDay09PartB:
diff --git a/tests/adventofcode2018/test_day10_a.py b/tests/adventofcode2018/test_day10_a.py
index 12247eb2..00bf8aa8 100644
--- a/tests/adventofcode2018/test_day10_a.py
+++ b/tests/adventofcode2018/test_day10_a.py
@@ -1,5 +1,6 @@
 import pytest
-from solutions.day10 import Day10PartA, Point
+
+from adventofcode2018.day10 import Day10PartA, Point
 
 
 class TestDay10PartA:
diff --git a/tests/adventofcode2018/test_day10_b.py b/tests/adventofcode2018/test_day10_b.py
index 4e6694fd..f5829daa 100644
--- a/tests/adventofcode2018/test_day10_b.py
+++ b/tests/adventofcode2018/test_day10_b.py
@@ -1,4 +1,4 @@
-from solutions.day10 import Day10PartB
+from adventofcode2018.day10 import Day10PartB
 
 
 class TestDay10PartB:
diff --git a/tests/adventofcode2018/test_day11_a.py b/tests/adventofcode2018/test_day11_a.py
index d887b33d..ed189cac 100644
--- a/tests/adventofcode2018/test_day11_a.py
+++ b/tests/adventofcode2018/test_day11_a.py
@@ -1,5 +1,6 @@
 import pytest
-from solutions.day11 import Day11PartA
+
+from adventofcode2018.day11 import Day11PartA
 
 
 class TestDay11PartA:
diff --git a/tests/adventofcode2018/test_day11_b.py b/tests/adventofcode2018/test_day11_b.py
index 566b2c92..8426ec9d 100644
--- a/tests/adventofcode2018/test_day11_b.py
+++ b/tests/adventofcode2018/test_day11_b.py
@@ -1,5 +1,6 @@
 import pytest
-from solutions.day11 import Day11PartB
+
+from adventofcode2018.day11 import Day11PartB
 
 
 class TestDay11PartB:
diff --git a/tests/adventofcode2018/test_day12_a.py b/tests/adventofcode2018/test_day12_a.py
index 6075756e..516175aa 100644
--- a/tests/adventofcode2018/test_day12_a.py
+++ b/tests/adventofcode2018/test_day12_a.py
@@ -1,4 +1,4 @@
-from solutions.day12 import Day12PartA, Garden
+from adventofcode2018.day12 import Day12PartA, Garden
 
 
 class TestDay12PartA:
diff --git a/tests/adventofcode2018/test_day12_b.py b/tests/adventofcode2018/test_day12_b.py
index 8299dd44..5a9fa99f 100644
--- a/tests/adventofcode2018/test_day12_b.py
+++ b/tests/adventofcode2018/test_day12_b.py
@@ -1,4 +1,4 @@
-from solutions.day12 import Day12PartB
+from adventofcode2018.day12 import Day12PartB
 
 
 class TestDay12PartB:
diff --git a/tests/adventofcode2018/test_day13_a.py b/tests/adventofcode2018/test_day13_a.py
index 80d2ffdf..d4542a2b 100644
--- a/tests/adventofcode2018/test_day13_a.py
+++ b/tests/adventofcode2018/test_day13_a.py
@@ -1,5 +1,6 @@
 import pytest
-from solutions.day13 import Day13PartA, Direction, GridPosition, MineCart
+
+from adventofcode2018.day13 import Day13PartA, Direction, GridPosition, MineCart
 
 
 class TestDay13PartA:
diff --git a/tests/adventofcode2018/test_day13_b.py b/tests/adventofcode2018/test_day13_b.py
index 6236da7f..0d7524e0 100644
--- a/tests/adventofcode2018/test_day13_b.py
+++ b/tests/adventofcode2018/test_day13_b.py
@@ -1,4 +1,4 @@
-from solutions.day13 import Day13PartB
+from adventofcode2018.day13 import Day13PartB
 
 
 class TestDay13PartB:
diff --git a/tests/adventofcode2018/test_day14_a.py b/tests/adventofcode2018/test_day14_a.py
index 2268cc5a..beaba160 100644
--- a/tests/adventofcode2018/test_day14_a.py
+++ b/tests/adventofcode2018/test_day14_a.py
@@ -1,5 +1,6 @@
 import pytest
-from solutions.day14 import Day14PartA
+
+from adventofcode2018.day14 import Day14PartA
 
 
 class TestDay14PartA:
diff --git a/tests/adventofcode2018/test_day14_b.py b/tests/adventofcode2018/test_day14_b.py
index e5760580..c3b1b543 100644
--- a/tests/adventofcode2018/test_day14_b.py
+++ b/tests/adventofcode2018/test_day14_b.py
@@ -1,5 +1,6 @@
 import pytest
-from solutions.day14 import Day14PartB
+
+from adventofcode2018.day14 import Day14PartB
 
 
 class TestDay14PartB:
diff --git a/tests/adventofcode2018/test_day16_a.py b/tests/adventofcode2018/test_day16_a.py
index 45ab26b0..49e40c39 100644
--- a/tests/adventofcode2018/test_day16_a.py
+++ b/tests/adventofcode2018/test_day16_a.py
@@ -1,5 +1,4 @@
-import pytest
-from solutions.day16 import Addi, Banr, Bori, Day16PartA, Device, Seti
+from adventofcode2018.day16 import Addi, Banr, Bori, Day16PartA, Device, Seti
 
 
 class TestDay16PartA:
diff --git a/tests/adventofcode2018/test_day16_b.py b/tests/adventofcode2018/test_day16_b.py
index 3c65dc41..cab9dac0 100644
--- a/tests/adventofcode2018/test_day16_b.py
+++ b/tests/adventofcode2018/test_day16_b.py
@@ -1,5 +1,6 @@
 import pytest
-from solutions.day16 import Day16PartB
+
+from adventofcode2018.day16 import Day16PartB
 
 
 class TestDay16PartB:

From 2a1907988a3f69ba804d978c7705f5c9d3160bbb Mon Sep 17 00:00:00 2001
From: Roel Adriaans <roel@adriaans.org>
Date: Fri, 8 Dec 2023 21:42:25 +0100
Subject: [PATCH 350/371] Fix some errors after pre-commit `fixed` our line
 endings

---
 src/adventofcode2018/day05.py          | 4 ++--
 src/adventofcode2018/day06.py          | 4 ++--
 src/adventofcode2018/day14.py          | 2 +-
 tests/adventofcode2018/test_day16_b.py | 2 ++
 4 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/src/adventofcode2018/day05.py b/src/adventofcode2018/day05.py
index 39df145f..db6fb4d6 100644
--- a/src/adventofcode2018/day05.py
+++ b/src/adventofcode2018/day05.py
@@ -35,7 +35,7 @@ def recude_input(input_string: str) -> str:
 
 class Day5PartA(Day5, FileReaderSolution):
     def solve(self, input_data: str) -> int:
-        reduced_string = Day5.recude_input(input_data)
+        reduced_string = Day5.recude_input(input_data.strip())
         return len(reduced_string)
 
 
@@ -59,7 +59,7 @@ def solve(self, input_data: str) -> int:
         # Count the numbers
         number_counts = Counter()
         for letter in ascii_lowercase:
-            reduced_string = Day5PartB.remove_and_react(input_data, letter)
+            reduced_string = Day5PartB.remove_and_react(input_data.strip(), letter)
             string_length = len(reduced_string)
             number_counts[letter] = string_length
         lowest = number_counts.most_common()[-1]
diff --git a/src/adventofcode2018/day06.py b/src/adventofcode2018/day06.py
index de144616..6f408bbb 100644
--- a/src/adventofcode2018/day06.py
+++ b/src/adventofcode2018/day06.py
@@ -137,7 +137,7 @@ def compute_distance(a: int, b: int, x: int, y: int) -> int:
 
 class Day06PartA(Day06, FileReaderSolution):
     def solve(self, input_data: str) -> int:
-        input_lines = input_data.split("\n")
+        input_lines = input_data.splitlines()
         self.generate_points(input_lines)
         self.generate_grid()
         self.generate_distance()
@@ -171,7 +171,7 @@ def compute_area(self, max_score: int = 32) -> int:
         return points
 
     def solve(self, input_data: str, max_score: int = 10_000) -> int:
-        input_lines = input_data.split("\n")
+        input_lines = input_data.splitlines()
         self.generate_points(input_lines)
         self.generate_grid()
         result = self.compute_area(max_score)
diff --git a/src/adventofcode2018/day14.py b/src/adventofcode2018/day14.py
index d16e63f1..a310525d 100644
--- a/src/adventofcode2018/day14.py
+++ b/src/adventofcode2018/day14.py
@@ -164,5 +164,5 @@ def solve(self, input_data: str) -> int:
         # We hardcode the puzzle input, since it's not in the input we're given
         self.initalise(input_data="37", num_elves=2)
 
-        result = self.search_for_recipe(input_data)
+        result = self.search_for_recipe(input_data.strip())
         return result
diff --git a/tests/adventofcode2018/test_day16_b.py b/tests/adventofcode2018/test_day16_b.py
index cab9dac0..ab03bd53 100644
--- a/tests/adventofcode2018/test_day16_b.py
+++ b/tests/adventofcode2018/test_day16_b.py
@@ -26,12 +26,14 @@ def test_day16b_fetch_register(self):
         expected_seccond = {"opcode": 9, "A": 0, "B": 1, "C": 1}
         assert seccond == expected_seccond
 
+    @pytest.mark.skip(reason="Not implemented yet")
     @pytest.mark.parametrize(("input_data", "expected_result"), [("", ""), ("", "")])
     def test_day16b_solve(self, input_data, expected_result):
         solution = Day16PartB()
         result = solution.solve(input_data)
         assert result == expected_result
 
+    @pytest.mark.skip(reason="Not implemented yet")
     def test_day16b_data(self):
         """Result we got when we did the real solution"""
         solution = Day16PartB()

From 89d17b92ca7e19bbf416741021b272977330e149 Mon Sep 17 00:00:00 2001
From: Roel Adriaans <roel@adriaans.org>
Date: Sat, 9 Dec 2023 15:37:35 +0100
Subject: [PATCH 351/371] Day 7, part b. Replace all the jokers!

---
 src/adventofcode2023/day07.py          | 65 ++++++++++++++++++++++----
 tests/adventofcode2023/test_day07_b.py | 31 +++++++-----
 2 files changed, 76 insertions(+), 20 deletions(-)

diff --git a/src/adventofcode2023/day07.py b/src/adventofcode2023/day07.py
index 0766e0f3..177328b4 100644
--- a/src/adventofcode2023/day07.py
+++ b/src/adventofcode2023/day07.py
@@ -1,11 +1,15 @@
 from __future__ import annotations
 
 import functools
+import logging
 from collections import Counter
+from collections.abc import Callable
 from enum import Enum
 
 from adventofcode.utils.abstract import FileReaderSolution
 
+logger = logging.getLogger(__name__)
+
 
 class Score(Enum):
     FIVE_OF_A_KIND = 7
@@ -28,6 +32,10 @@ def __init__(self, cards: str, bid: int):
 
     @property
     def score(self) -> Score:
+        return self._calculate_score(self.cards)
+
+    @staticmethod
+    def _calculate_score(cards: str) -> Score:
         """Compute the sore for this hand.
         This score can then be used for comparing cards against each other.
 
@@ -40,7 +48,7 @@ def score(self) -> Score:
         - One pair -> 2
         - High card -> 1
         """
-        counter = Counter(self.cards)
+        counter = Counter(cards)
         most_common = counter.most_common()
         unique_cards = len(counter)
 
@@ -92,7 +100,7 @@ def score(self) -> Score:
         if len(counter) == 5:
             return Score.HIGH_CARD
 
-        raise ValueError(f"Unknown Score for cards: {self.cards}")
+        raise ValueError(f"Unknown Score for cards: {cards}")
 
     @staticmethod
     def letter_to_score(letter: str) -> int:
@@ -131,15 +139,51 @@ def __lt__(self, other) -> bool:
             return False
 
 
-class Day07:
-    pass
+class JokerHand(Hand):
+    """New rule with Jokers!"""
 
+    @staticmethod
+    def letter_to_score(letter: str) -> int:
+        if letter == "J":
+            return 1
+        else:
+            return Hand.letter_to_score(letter)
 
-class Day07PartA(Day07, FileReaderSolution):
-    def solve(self, input_data: str) -> int:
+    @staticmethod
+    def find_indexes(string, search):
+        return [i for i, ltr in enumerate(string) if ltr == search]
+
+    def _calculate_score(self, cards: str) -> Score:
+        """Calculate the score, but then with a joker in it!"""
+        # What to to:
+        # I want to replace the Jokers to create the strongest card
+        # What if: I just replace the jokers with A, K Q, T, ... 2
+        # and calculate the highest score?
+        jokers = self.find_indexes(self.cards, "J")
+
+        if len(jokers) == 0:
+            # If there are no jokers, don't replace
+            return Hand._calculate_score(cards)
+
+        if len(jokers) == 5:
+            # JJJJJ Lucky hand!
+            return Score(7)
+
+        max_score = 0
+        for replacement in ("A", "K", "Q", "T", "9", "8", "7", "6", "5", "4", "3", "2"):
+            test_card = cards.replace("J", replacement)
+            score = Hand._calculate_score(test_card)
+            if score.value > max_score:
+                max_score = score.value
+        logger.debug("For cards %s, score %s", cards, max_score)
+        return Score(max_score)
+
+
+class Day07:
+    def generic_solve(self, input_data: str, hand: Callable) -> int:
         hands = sorted(
             [
-                Hand(line.split()[0], int(line.split()[1]))
+                hand(line.split()[0], int(line.split()[1]))
                 for line in input_data.splitlines()
             ]
         )
@@ -150,6 +194,11 @@ def solve(self, input_data: str) -> int:
         return total
 
 
+class Day07PartA(Day07, FileReaderSolution):
+    def solve(self, input_data: str) -> int:
+        return self.generic_solve(input_data, Hand)
+
+
 class Day07PartB(Day07, FileReaderSolution):
     def solve(self, input_data: str) -> int:
-        raise NotImplementedError
+        return self.generic_solve(input_data, JokerHand)
diff --git a/tests/adventofcode2023/test_day07_b.py b/tests/adventofcode2023/test_day07_b.py
index e03f156e..acc266ef 100644
--- a/tests/adventofcode2023/test_day07_b.py
+++ b/tests/adventofcode2023/test_day07_b.py
@@ -1,25 +1,32 @@
 import pytest
 
-from adventofcode2023.day07 import Day07PartB
+from adventofcode2023.day07 import Day07PartB, JokerHand, Score
 
 
 class TestDay07PartB:
-    @pytest.mark.xfail(reason="Not yet implemented", raises=NotImplementedError)
+    @pytest.mark.parametrize(
+        ("input_data", "expected_result"),
+        [
+            ("32T3K", Score.ONE_PAIR),
+            ("KK677", Score.TWO_PAIR),
+            ("T55J5", Score.FOUR_OF_A_KIND),
+            ("KTJJT", Score.FOUR_OF_A_KIND),
+            ("QQQJA", Score.FOUR_OF_A_KIND),
+            ("QJJQ2", Score.FOUR_OF_A_KIND),
+            ("8JJJ4", Score.FOUR_OF_A_KIND),
+        ],
+    )
+    def test_day07a_test_hand_score(self, input_data, expected_result):
+        hand = JokerHand(input_data, 0)
+        assert hand.score == expected_result
+
     def test_day07b_testdata(self, testdata):
         solution = Day07PartB()
         result = solution.solve(testdata)
-        assert result == 0
-
-    @pytest.mark.xfail(reason="Not yet implemented", raises=NotImplementedError)
-    @pytest.mark.parametrize(("input_data", "expected_result"), [("", ""), ("", "")])
-    def test_day07b_solve(self, input_data, expected_result):
-        solution = Day07PartB()
-        result = solution.solve(input_data)
-        assert result == expected_result
+        assert result == 5905
 
-    @pytest.mark.xfail(reason="Not yet implemented", raises=NotImplementedError)
     def test_day07b_data(self):
         """Result we got when we did the real solution"""
         solution = Day07PartB()
         res = solution("day_07/day07.txt")
-        assert res == 0
+        assert res == 251824095

From 7bd1dbdffd7385cbc952507efca69a144cb23e35 Mon Sep 17 00:00:00 2001
From: Roel Adriaans <roel@adriaans.org>
Date: Sat, 9 Dec 2023 15:43:22 +0100
Subject: [PATCH 352/371] Add test data for day 8

---
 src/adventofcode2023/data/day_08/day08.txt    | 716 ++++++++++++++++++
 .../data/day_08/day08_test_1.txt              |   9 +
 .../data/day_08/day08_test_2.txt              |   5 +
 src/adventofcode2023/day08.py                 |  17 +
 tests/adventofcode2023/test_day08_a.py        |  31 +
 tests/adventofcode2023/test_day08_b.py        |  25 +
 6 files changed, 803 insertions(+)
 create mode 100644 src/adventofcode2023/data/day_08/day08.txt
 create mode 100644 src/adventofcode2023/data/day_08/day08_test_1.txt
 create mode 100644 src/adventofcode2023/data/day_08/day08_test_2.txt
 create mode 100644 src/adventofcode2023/day08.py
 create mode 100644 tests/adventofcode2023/test_day08_a.py
 create mode 100644 tests/adventofcode2023/test_day08_b.py

diff --git a/src/adventofcode2023/data/day_08/day08.txt b/src/adventofcode2023/data/day_08/day08.txt
new file mode 100644
index 00000000..d95e19ba
--- /dev/null
+++ b/src/adventofcode2023/data/day_08/day08.txt
@@ -0,0 +1,716 @@
+LRRLRRLLRRRLRRLRLRRRLRRLRRRLRLLRRRLRRRLRLRRRLRRLRRLRLRLLLRRRLRRRLRRLRRLRLRRRLRRLLRRLRRLRLLRLRLRRLRLLRLRLRRRLRRLRLLRLRLLRRLRLRRLLLRLRRLRRRLLLRRLRLRRRLLRRLLLRRRLRRRLLLRRLLRLRRLRLRRLLLRLRRLLLLRRLLRRRLRRLRRLRLRLLRLRRRLLRRLLRRLRRLRRLRRLRLLRRLRRRLRLRLLLRRRLLRRRLRRLRRLLLLRRRR
+
+VRN = (CSM, GPD)
+XDT = (QBK, PJR)
+HVC = (MKM, TJS)
+KRH = (BHN, PXB)
+GTX = (VFD, TXR)
+BQB = (MQV, PFQ)
+TDV = (VSG, MJX)
+VJM = (QHP, XMB)
+KLG = (QLJ, HCV)
+TSM = (JPG, DNP)
+KHS = (QNR, DXJ)
+FXM = (PHF, PHF)
+RMV = (BMM, KHS)
+QXL = (BKG, TLP)
+MHS = (QXL, CFQ)
+TBT = (TVT, BRD)
+QXS = (GPP, RND)
+XLL = (JHQ, LDV)
+PBQ = (VXK, RJR)
+FXB = (HMN, THX)
+DPF = (GLX, GNC)
+HVG = (HJF, SCH)
+QMN = (DQJ, GMN)
+MBS = (PFX, JHG)
+VGL = (FHX, CCK)
+QLV = (BLT, FDR)
+MNS = (BDB, BMJ)
+MMT = (TSM, SFR)
+NRP = (FKB, QPH)
+XFQ = (GTS, CCQ)
+XFF = (HKG, NVL)
+TXR = (VHQ, CKP)
+VPL = (GHC, VMT)
+SGC = (BGM, MJV)
+SMS = (GJV, LSC)
+BVC = (PRH, FJJ)
+JHQ = (VJQ, XTX)
+RJF = (GKK, NKX)
+RJR = (JJQ, JTK)
+VHQ = (JPS, JPS)
+SFR = (JPG, DNP)
+RDP = (GPD, CSM)
+GGQ = (MVX, XBP)
+XGK = (GBB, VPH)
+XBH = (PTH, GSL)
+MKG = (RBP, MGG)
+FSG = (KFC, RMB)
+NHC = (RQG, CVF)
+SSV = (MVF, QFP)
+RLP = (FXC, HCP)
+FBZ = (FJF, CRJ)
+HFL = (FKB, QPH)
+NBM = (QBD, XGK)
+NSP = (QKG, NDN)
+TQF = (RMH, TDB)
+RBB = (QTC, HPT)
+CVF = (BSV, VTR)
+XQG = (LFJ, JXD)
+KXF = (CRJ, FJF)
+MQC = (MQL, BSL)
+RCC = (NHC, QLC)
+TNT = (VKQ, NSX)
+TVN = (NDN, QKG)
+SCH = (FXB, NTM)
+CVD = (XLJ, XDT)
+QVF = (MQR, RDB)
+GXS = (HCK, SHD)
+KBD = (JHG, PFX)
+KXV = (HVQ, QCJ)
+MQR = (RNQ, SVC)
+CBC = (SXB, BVC)
+GKK = (HDR, LTF)
+FRT = (CFQ, QXL)
+VMT = (SQQ, DBB)
+QPV = (NVQ, VVV)
+XGD = (MPL, PMQ)
+MNT = (JDD, NQC)
+RGT = (QHD, SQP)
+HXV = (RQD, RRX)
+LGR = (FHX, CCK)
+PHF = (CBV, TMC)
+BTP = (JSC, QMN)
+CXS = (SCH, HJF)
+MQV = (FGJ, QPD)
+HRZ = (CCX, BCF)
+DDB = (DJK, CVD)
+XNL = (QLJ, HCV)
+GLX = (MGN, CFV)
+QCJ = (NDK, XBR)
+XBX = (CQM, VKD)
+QPH = (XBH, CFG)
+NSL = (LFJ, JXD)
+DJQ = (VMN, STS)
+RNV = (XFF, KSR)
+JTR = (QLG, XRD)
+VVV = (MDH, KHK)
+TLR = (DMH, NXC)
+GBH = (GLS, XLK)
+LRN = (QRM, FMC)
+BRM = (DCK, DSK)
+GQS = (FXV, QPV)
+XMT = (NHF, RXG)
+KLR = (HFN, KDR)
+SVH = (RMR, JLC)
+QSG = (KQC, CMH)
+VVX = (XGM, FNX)
+BCF = (LNR, MTS)
+RPJ = (RCC, CKG)
+JJD = (NRP, HFL)
+FGP = (MFS, RBB)
+BJX = (BTD, KSC)
+PQC = (VMN, STS)
+JPG = (RQL, CSQ)
+SLK = (JJC, BPJ)
+JTK = (XHN, BFH)
+HCV = (BRF, VPT)
+VPH = (BVS, RRT)
+MSH = (JQF, XFJ)
+JHL = (QPF, QPF)
+FGD = (MPC, TVB)
+DCB = (JBC, XFB)
+RKN = (TSL, VQG)
+QBQ = (QLV, NRT)
+MQX = (JSX, MCV)
+XHX = (FNX, XGM)
+DTL = (JDM, BDX)
+LST = (JHL, CQN)
+VGR = (HQV, HRZ)
+CTQ = (XCF, TJK)
+SQP = (HHB, NBM)
+RRL = (TSL, VQG)
+NNM = (DDS, XSF)
+KHK = (HSG, NDF)
+MGN = (VXT, VGV)
+TLB = (DPK, MLV)
+NMM = (TRR, XJH)
+SJG = (XRJ, XBX)
+GSC = (RRL, RKN)
+KDR = (PSJ, TBM)
+LRP = (SQP, QHD)
+DKF = (MVR, QQB)
+FHC = (BPT, BKC)
+PLT = (JGG, GGQ)
+XRD = (HMH, PBQ)
+RHP = (JPD, XVL)
+MXF = (MQR, RDB)
+DML = (BRD, TVT)
+CKP = (JPS, RBS)
+BFK = (BCL, TLK)
+KSR = (NVL, HKG)
+XQF = (BMM, KHS)
+BVJ = (CBL, PLC)
+BCS = (RQF, GTB)
+JCC = (VTT, VPQ)
+BCL = (BNV, PDB)
+HCK = (DDB, CBX)
+SVG = (FGD, VQL)
+BLT = (XNK, LHM)
+MVQ = (LRG, NPB)
+RND = (QCK, QRN)
+HFR = (FBT, CLS)
+KNK = (XDS, BCK)
+XBB = (BRM, FDC)
+XGM = (FFC, GJX)
+PTN = (TQF, QKP)
+RNQ = (GSC, XKH)
+TPT = (CMK, KXT)
+HPL = (CKB, QLR)
+MVX = (QSG, TKJ)
+QFP = (RLP, RSF)
+GXF = (LNB, VNJ)
+QHD = (NBM, HHB)
+KSS = (LLH, PFK)
+MFD = (XGJ, GGS)
+JJQ = (XHN, BFH)
+JDD = (HXV, FVH)
+CFR = (FXM, FXM)
+FDR = (XNK, LHM)
+DHG = (BRS, TLR)
+TDB = (SBS, XBB)
+BVS = (GQH, BFS)
+DGZ = (TMC, CBV)
+HQD = (JSC, QMN)
+TMZ = (XFB, JBC)
+BRF = (MBF, KGJ)
+RQG = (VTR, BSV)
+CSQ = (FTS, RHR)
+FFJ = (QCL, CTQ)
+XKH = (RRL, RKN)
+VJQ = (BTL, GQS)
+NGK = (JGG, GGQ)
+RQN = (GVG, SJN)
+GRR = (RNV, FHF)
+LSR = (VBL, SLK)
+VQG = (QBV, NJV)
+BHK = (BVJ, LJR)
+BRS = (DMH, NXC)
+NKX = (LTF, HDR)
+QBD = (GBB, VPH)
+RGQ = (CLM, FHK)
+VXX = (KRH, VGN)
+KRF = (VFQ, SMN)
+XFR = (XGD, RMM)
+JGC = (JGM, PFR)
+SHD = (DDB, CBX)
+QKG = (QTS, GXP)
+CDL = (GLX, GNC)
+RBP = (HKK, CMN)
+CLN = (HDG, BHM)
+XFX = (RNV, FHF)
+AAA = (DXX, SVG)
+FXC = (MMT, KLS)
+PTF = (SKF, SDF)
+QPF = (RQF, RQF)
+DTB = (HQV, HQV)
+RRF = (FNV, MKG)
+MGG = (HKK, CMN)
+NDF = (KMD, FFH)
+DVL = (RKL, CLC)
+JRQ = (BXV, BRB)
+HVM = (DRT, SSV)
+BHM = (KNK, BPP)
+TDT = (DPS, VCP)
+JPC = (DCH, FHD)
+RSF = (FXC, HCP)
+KSX = (BVJ, LJR)
+NLT = (LTB, QBQ)
+SBD = (NKX, GKK)
+VQL = (MPC, TVB)
+JXD = (MLK, LHN)
+XNN = (TNT, LPQ)
+HMH = (RJR, VXK)
+JGG = (MVX, XBP)
+PTP = (MVQ, NPS)
+FQC = (XQF, RMV)
+FXT = (TDH, JGD)
+RGP = (CPN, KGF)
+BTD = (NKN, NTQ)
+BGM = (NRJ, CJN)
+RMM = (PMQ, MPL)
+DQJ = (DPF, CDL)
+TVT = (TFJ, VJM)
+TGL = (CGS, SJG)
+NHF = (HVC, LVM)
+NMK = (GRR, XFX)
+QRN = (MMP, XSL)
+FFH = (DJQ, PQC)
+PDJ = (NQC, JDD)
+CGS = (XBX, XRJ)
+NTQ = (RXX, FLX)
+CFB = (TVC, PTP)
+GXK = (FLC, GXS)
+RBS = (DCB, TMZ)
+CFQ = (TLP, BKG)
+QHP = (KVX, GSG)
+HDJ = (RPH, QPK)
+VXT = (GXF, JKM)
+NCM = (NJL, TGL)
+HFN = (TBM, PSJ)
+JGF = (CFB, NMC)
+JDM = (CLN, PHJ)
+DJS = (RMR, JLC)
+RDB = (RNQ, SVC)
+RRX = (HQD, BTP)
+HHS = (MXF, QVF)
+MMP = (GTX, HKC)
+JRK = (KKP, PTN)
+TRR = (VGD, HGC)
+JKM = (LNB, VNJ)
+BRD = (TFJ, VJM)
+TLK = (BNV, PDB)
+QTS = (CHL, LSR)
+BPP = (XDS, BCK)
+RXX = (BKP, TLS)
+VFD = (VHQ, VHQ)
+BQF = (DHG, DQC)
+XDL = (QVF, MXF)
+ZZZ = (SVG, DXX)
+GGB = (LTB, QBQ)
+QTN = (JHL, CQN)
+BVK = (BHQ, SSG)
+VGB = (BXV, BRB)
+QLR = (XFR, KNM)
+QBK = (KNC, VJX)
+BMJ = (JLK, TDV)
+FDC = (DSK, DCK)
+XDS = (SMS, TVR)
+GBC = (NGK, PLT)
+HPT = (XHQ, SXT)
+FHK = (JCC, FJS)
+KNM = (RMM, XGD)
+GTB = (KLR, JVZ)
+VCT = (PTN, KKP)
+LDV = (XTX, VJQ)
+KTK = (MQV, PFQ)
+TVC = (MVQ, NPS)
+BXV = (XLL, KDL)
+BFA = (BCF, CCX)
+CCF = (CLM, FHK)
+JGS = (VCP, DPS)
+RVK = (MKJ, QLH)
+FNX = (FFC, GJX)
+XBP = (QSG, TKJ)
+LMJ = (FPH, JVL)
+HKG = (VXX, RNX)
+KMD = (DJQ, PQC)
+BRB = (XLL, KDL)
+NDK = (DJS, SVH)
+BSV = (XVC, QXS)
+TLS = (FSJ, MNS)
+CRJ = (SGC, RNH)
+BNV = (QSF, FSG)
+SMN = (MNK, QGN)
+JVV = (TRN, DVL)
+JJC = (HBT, RPJ)
+KSB = (XVL, JPD)
+JJT = (TLB, DTJ)
+TSL = (QBV, NJV)
+GNV = (GCS, JLR)
+HJF = (FXB, NTM)
+VMN = (CFR, CFR)
+GVG = (XDL, HHS)
+LNB = (HMP, XMP)
+RTL = (FXT, RCT)
+XVC = (RND, GPP)
+GNS = (MFS, RBB)
+XTG = (LRM, DKQ)
+JVZ = (KDR, HFN)
+QQB = (XTG, GFG)
+HMN = (FHC, FMN)
+XLC = (FXT, RCT)
+CKG = (QLC, NHC)
+NJB = (DVL, TRN)
+VCP = (LRF, HPL)
+KQJ = (MXH, MXH)
+GJV = (TPT, QNJ)
+CCX = (LNR, MTS)
+DTJ = (MLV, DPK)
+HDX = (JSX, MCV)
+XRJ = (VKD, CQM)
+DMH = (RGP, KPR)
+QGN = (VRF, QDL)
+JSC = (DQJ, GMN)
+BPT = (LLB, XNN)
+CJN = (JJT, PGM)
+XDV = (XVD, HJH)
+JHG = (LLF, MLJ)
+NKN = (FLX, RXX)
+TGP = (XJH, TRR)
+TLP = (XLC, RTL)
+HQT = (SSN, BPS)
+BKP = (MNS, FSJ)
+VPT = (KGJ, MBF)
+JSJ = (PFK, LLH)
+CBX = (DJK, CVD)
+TJK = (VGL, LGR)
+THP = (TGL, NJL)
+NSX = (SQL, GNV)
+JQF = (VDM, JJD)
+SDF = (JPC, KRV)
+XNK = (HDJ, MQJ)
+DSD = (SJN, GVG)
+SBS = (FDC, BRM)
+FPH = (NCM, THP)
+LMR = (KQJ, BGV)
+VKQ = (SQL, GNV)
+FMC = (CPV, GBC)
+HHB = (QBD, XGK)
+HVQ = (NDK, XBR)
+KXT = (JKG, NLS)
+GJX = (TVP, JTR)
+JLT = (MHM, MSH)
+VNJ = (HMP, XMP)
+TDH = (JGF, GGD)
+VPQ = (HDX, MQX)
+SKF = (JPC, KRV)
+NXT = (RXG, NHF)
+TRN = (CLC, RKL)
+RRT = (BFS, GQH)
+JFJ = (SXB, BVC)
+KBR = (CGD, JGC)
+PGG = (HFR, TJJ)
+CMK = (JKG, NLS)
+CBV = (FCX, KBR)
+GMN = (DPF, CDL)
+BTL = (QPV, FXV)
+PFX = (MLJ, LLF)
+DCT = (XLK, GLS)
+PGM = (DTJ, TLB)
+NVL = (VXX, RNX)
+RPD = (TLK, BCL)
+QDL = (FFJ, SFH)
+JVL = (THP, NCM)
+NVQ = (MDH, KHK)
+TMC = (FCX, KBR)
+LPQ = (NSX, VKQ)
+RHR = (PPL, LCD)
+JSX = (DHM, PMS)
+DPK = (KBD, MBS)
+LTF = (PGG, QPN)
+BPS = (GXK, HCM)
+HKC = (VFD, TXR)
+PXB = (RPN, BQF)
+FLX = (TLS, BKP)
+PJR = (VJX, KNC)
+PDB = (QSF, FSG)
+NMC = (TVC, PTP)
+MLP = (MSH, MHM)
+PMQ = (KXV, QFJ)
+FKB = (XBH, CFG)
+JRV = (SMN, VFQ)
+SQL = (GCS, JLR)
+DXX = (FGD, VQL)
+XMM = (GMG, LRN)
+PFK = (HDL, XFQ)
+XSL = (GTX, HKC)
+CLC = (JRQ, VGB)
+LMH = (KXF, FBZ)
+NMX = (KSC, BTD)
+GTJ = (KLG, XNL)
+THX = (FMN, FHC)
+RMH = (XBB, SBS)
+SSG = (MFD, KFP)
+QNR = (RBG, HNG)
+DSK = (LMJ, FRP)
+GQP = (FXM, XVT)
+MFS = (QTC, HPT)
+VHX = (VBD, RDD)
+SQS = (GTJ, MSR)
+LJR = (CBL, PLC)
+QSF = (KFC, KFC)
+DHM = (VFJ, DTL)
+MDH = (NDF, HSG)
+SSN = (HCM, GXK)
+HCM = (FLC, GXS)
+PQX = (FGG, BXR)
+DQC = (BRS, TLR)
+KRV = (DCH, FHD)
+FNH = (SKF, SDF)
+LFJ = (LHN, MLK)
+MVR = (GFG, XTG)
+HBT = (RCC, CKG)
+VKD = (NMK, PFV)
+TKJ = (KQC, CMH)
+MRH = (RHV, ZZZ)
+CKB = (XFR, KNM)
+BMM = (DXJ, QNR)
+KDL = (JHQ, LDV)
+VFJ = (BDX, JDM)
+PLC = (PND, GNP)
+MNK = (QDL, VRF)
+MXT = (RMV, XQF)
+TJS = (PTF, FNH)
+PHJ = (BHM, HDG)
+FSJ = (BDB, BMJ)
+CFV = (VGV, VXT)
+XVD = (CBF, SQS)
+TFJ = (QHP, XMB)
+CPV = (PLT, NGK)
+VTR = (XVC, QXS)
+BKC = (XNN, LLB)
+NPS = (NPB, LRG)
+FXV = (NVQ, VVV)
+FTS = (PPL, LCD)
+HMP = (QMD, SNX)
+VBD = (DTB, DTB)
+VFQ = (QGN, MNK)
+KFP = (GGS, XGJ)
+BHN = (RPN, BQF)
+PFV = (GRR, XFX)
+QMD = (MGK, XDV)
+MLK = (RPD, BFK)
+GFG = (DKQ, LRM)
+NLS = (BQB, KTK)
+XLK = (HVG, CXS)
+LSC = (QNJ, TPT)
+FNV = (RBP, MGG)
+HKK = (RCX, MQC)
+GPD = (NSL, XQG)
+RQL = (RHR, FTS)
+HDB = (GHC, VMT)
+HJH = (SQS, CBF)
+QTC = (SXT, XHQ)
+TRS = (BXR, FGG)
+MTS = (DML, TBT)
+RHV = (DXX, SVG)
+XVL = (FGP, GNS)
+GSG = (RRF, CSP)
+VBL = (JJC, BPJ)
+CCK = (RJF, SBD)
+QPN = (TJJ, HFR)
+PRH = (TGP, NMM)
+PQT = (TRS, PQX)
+QKP = (RMH, TDB)
+XMP = (SNX, QMD)
+QPD = (KRF, JRV)
+RQD = (HQD, BTP)
+XVT = (PHF, DGZ)
+GXP = (CHL, LSR)
+LHM = (MQJ, HDJ)
+STS = (CFR, GQP)
+FJJ = (NMM, TGP)
+MPC = (CCF, RGQ)
+MKM = (PTF, FNH)
+QVH = (VBD, VBD)
+XMB = (KVX, GSG)
+CHL = (VBL, SLK)
+XBR = (DJS, SVH)
+KPR = (CPN, KGF)
+MQL = (KSB, RHP)
+CQM = (PFV, NMK)
+XHQ = (HCR, HVM)
+FFC = (JTR, TVP)
+FMN = (BPT, BKC)
+SNX = (MGK, XDV)
+KNC = (QVJ, NNM)
+DPS = (LRF, HPL)
+GBB = (BVS, RRT)
+BFH = (XMM, XQL)
+GLS = (HVG, CXS)
+RXG = (LVM, HVC)
+MPL = (QFJ, KXV)
+NXC = (KPR, RGP)
+NJV = (TVN, NSP)
+LLB = (LPQ, TNT)
+SXT = (HVM, HCR)
+LLH = (HDL, XFQ)
+MLV = (KBD, MBS)
+CBF = (GTJ, MSR)
+JBC = (KTX, QQG)
+FLC = (SHD, HCK)
+FRP = (FPH, JVL)
+BHQ = (MFD, KFP)
+LNR = (DML, TBT)
+CSP = (MKG, FNV)
+GHC = (SQQ, DBB)
+NRT = (BLT, FDR)
+VTT = (HDX, MQX)
+HSG = (FFH, KMD)
+VGA = (CBV, TMC)
+KLS = (TSM, SFR)
+PFQ = (FGJ, QPD)
+MKJ = (JLT, MLP)
+MFX = (RVK, NSF)
+QNJ = (KXT, CMK)
+QBV = (NSP, TVN)
+MSR = (KLG, XNL)
+NSF = (QLH, MKJ)
+DKQ = (JDR, DQQ)
+PLH = (RVK, NSF)
+JKG = (BQB, KTK)
+LVM = (MKM, TJS)
+QLJ = (VPT, BRF)
+FVH = (RRX, RQD)
+MJX = (DCT, GBH)
+QLH = (MLP, JLT)
+NPB = (XMT, NXT)
+HDL = (CCQ, GTS)
+JPS = (DCB, DCB)
+CQN = (QPF, BCS)
+GNP = (DSD, RQN)
+JLK = (MJX, VSG)
+PMS = (DTL, VFJ)
+BFS = (JGS, TDT)
+XJH = (VGD, HGC)
+VRF = (SFH, FFJ)
+BCK = (SMS, TVR)
+DRT = (QFP, MVF)
+PND = (DSD, RQN)
+VSG = (GBH, DCT)
+VGV = (JKM, GXF)
+FHD = (MXT, FQC)
+GPP = (QRN, QCK)
+BDX = (CLN, PHJ)
+LLF = (HQT, DCL)
+DXA = (HFN, KDR)
+MCV = (DHM, PMS)
+NTM = (HMN, THX)
+JLC = (RDP, VRN)
+HQV = (BCF, CCX)
+NDN = (QTS, GXP)
+QVJ = (DDS, XSF)
+MQJ = (RPH, QPK)
+FGJ = (KRF, JRV)
+LHN = (BFK, RPD)
+MXH = (RHV, RHV)
+HGC = (DNN, PQT)
+MHM = (XFJ, JQF)
+JGD = (JGF, GGD)
+FCX = (JGC, CGD)
+GCS = (LST, QTN)
+RCX = (BSL, MQL)
+XGJ = (VCT, JRK)
+SXB = (FJJ, PRH)
+LRG = (XMT, NXT)
+XSF = (LRP, RGT)
+DNP = (CSQ, RQL)
+RKL = (VGB, JRQ)
+KVX = (CSP, RRF)
+JPD = (FGP, GNS)
+GNC = (MGN, CFV)
+PFR = (MHS, FRT)
+DCK = (LMJ, FRP)
+KKP = (TQF, QKP)
+XQL = (GMG, LRN)
+QCL = (TJK, XCF)
+TVP = (XRD, QLG)
+HDR = (QPN, PGG)
+HLN = (BHQ, SSG)
+GGS = (VCT, JRK)
+SJN = (HHS, XDL)
+DBB = (BHK, KSX)
+QPK = (MFX, PLH)
+MBF = (NLT, GGB)
+BDB = (TDV, JLK)
+KSC = (NKN, NTQ)
+CPN = (HDB, VPL)
+TVB = (RGQ, CCF)
+VJX = (NNM, QVJ)
+FBT = (JLL, LMR)
+TVR = (GJV, LSC)
+RNX = (KRH, VGN)
+RPH = (MFX, PLH)
+VJA = (JBC, XFB)
+CLS = (JLL, LMR)
+PSJ = (DKF, MSL)
+QLG = (PBQ, HMH)
+DXJ = (HNG, RBG)
+XFB = (KTX, QQG)
+TJJ = (FBT, CLS)
+KFC = (JRF, JRF)
+XFJ = (JJD, VDM)
+RCT = (TDH, JGD)
+RNH = (BGM, MJV)
+VGD = (PQT, DNN)
+KQC = (JFJ, CBC)
+PPL = (JSJ, KSS)
+HCR = (DRT, SSV)
+XLJ = (PJR, QBK)
+PTH = (QVH, VHX)
+RQF = (KLR, KLR)
+MSL = (MVR, QQB)
+NRJ = (PGM, JJT)
+JLL = (KQJ, KQJ)
+DCL = (BPS, SSN)
+GTS = (MNT, PDJ)
+BXR = (NMX, BJX)
+CBL = (PND, GNP)
+VXK = (JJQ, JTK)
+BSL = (RHP, KSB)
+NJL = (SJG, CGS)
+DQQ = (XHX, VVX)
+SQQ = (BHK, KSX)
+KTX = (BVK, HLN)
+QCK = (XSL, MMP)
+SVC = (GSC, XKH)
+BGV = (MXH, MRH)
+GMG = (QRM, FMC)
+KGJ = (NLT, GGB)
+LRF = (QLR, CKB)
+CMN = (RCX, MQC)
+CGD = (JGM, PFR)
+LCD = (JSJ, KSS)
+HDG = (BPP, KNK)
+DDS = (LRP, RGT)
+LRM = (DQQ, JDR)
+CMH = (CBC, JFJ)
+GQH = (TDT, JGS)
+BKG = (RTL, XLC)
+RMR = (VRN, RDP)
+MGK = (XVD, HJH)
+FJS = (VTT, VPQ)
+SFH = (CTQ, QCL)
+XHN = (XQL, XMM)
+BPA = (CRJ, FJF)
+XCF = (VGL, LGR)
+TBM = (MSL, DKF)
+JLR = (LST, QTN)
+QFJ = (HVQ, QCJ)
+CCQ = (MNT, PDJ)
+VGN = (PXB, BHN)
+LTB = (QLV, NRT)
+DCH = (MXT, FQC)
+CFG = (PTH, GSL)
+JRF = (KXF, KXF)
+QRM = (CPV, GBC)
+XTX = (BTL, GQS)
+FHX = (SBD, RJF)
+FHF = (KSR, XFF)
+CSM = (NSL, XQG)
+HCP = (MMT, KLS)
+DJK = (XDT, XLJ)
+QLC = (CVF, RQG)
+MLJ = (HQT, DCL)
+CLM = (JCC, FJS)
+NQC = (HXV, FVH)
+RDD = (DTB, VGR)
+RPN = (DQC, DHG)
+GSL = (QVH, VHX)
+FGG = (NMX, BJX)
+BPJ = (RPJ, HBT)
+RBG = (NJB, JVV)
+FJF = (SGC, RNH)
+GGD = (CFB, NMC)
+QQG = (HLN, BVK)
+MVF = (RLP, RSF)
+JGM = (MHS, FRT)
+RMB = (JRF, LMH)
+VDM = (HFL, NRP)
+HNG = (NJB, JVV)
+MJV = (CJN, NRJ)
+DNN = (PQX, TRS)
+JDR = (XHX, VVX)
+KGF = (HDB, VPL)
diff --git a/src/adventofcode2023/data/day_08/day08_test_1.txt b/src/adventofcode2023/data/day_08/day08_test_1.txt
new file mode 100644
index 00000000..9029a1b2
--- /dev/null
+++ b/src/adventofcode2023/data/day_08/day08_test_1.txt
@@ -0,0 +1,9 @@
+RL
+
+AAA = (BBB, CCC)
+BBB = (DDD, EEE)
+CCC = (ZZZ, GGG)
+DDD = (DDD, DDD)
+EEE = (EEE, EEE)
+GGG = (GGG, GGG)
+ZZZ = (ZZZ, ZZZ)
diff --git a/src/adventofcode2023/data/day_08/day08_test_2.txt b/src/adventofcode2023/data/day_08/day08_test_2.txt
new file mode 100644
index 00000000..7d1b58d4
--- /dev/null
+++ b/src/adventofcode2023/data/day_08/day08_test_2.txt
@@ -0,0 +1,5 @@
+LLR
+
+AAA = (BBB, BBB)
+BBB = (AAA, ZZZ)
+ZZZ = (ZZZ, ZZZ)
diff --git a/src/adventofcode2023/day08.py b/src/adventofcode2023/day08.py
new file mode 100644
index 00000000..97d128e5
--- /dev/null
+++ b/src/adventofcode2023/day08.py
@@ -0,0 +1,17 @@
+from __future__ import annotations
+
+from adventofcode.utils.abstract import FileReaderSolution
+
+
+class Day08:
+    pass
+
+
+class Day08PartA(Day08, FileReaderSolution):
+    def solve(self, input_data: str) -> int:
+        raise NotImplementedError
+
+
+class Day08PartB(Day08, FileReaderSolution):
+    def solve(self, input_data: str) -> int:
+        raise NotImplementedError
diff --git a/tests/adventofcode2023/test_day08_a.py b/tests/adventofcode2023/test_day08_a.py
new file mode 100644
index 00000000..e984e64c
--- /dev/null
+++ b/tests/adventofcode2023/test_day08_a.py
@@ -0,0 +1,31 @@
+import pytest
+
+from adventofcode2023.day08 import Day08PartA
+
+
+class TestDay08PartA:
+    @pytest.mark.parametrize(
+        ("postfix", "expected_result"),
+        [
+            ("test", 2),
+            ("test2", 6),
+        ],
+    )
+    def test_extended(self, testdata_by_postfix, expected_result):
+        solution = Day08PartA()
+        result = solution.solve(testdata_by_postfix)
+        assert result == expected_result
+
+    @pytest.mark.xfail(reason="Not yet implemented", raises=NotImplementedError)
+    @pytest.mark.parametrize(("input_data", "expected_result"), [("", ""), ("", "")])
+    def test_day08a_solve(self, input_data, expected_result):
+        solution = Day08PartA()
+        result = solution.solve(input_data)
+        assert result == expected_result
+
+    @pytest.mark.xfail(reason="Not yet implemented", raises=NotImplementedError)
+    def test_day08a_data(self):
+        """Result we got when we did the real solution"""
+        solution = Day08PartA()
+        res = solution("day_08/day08.txt")
+        assert res == 0
diff --git a/tests/adventofcode2023/test_day08_b.py b/tests/adventofcode2023/test_day08_b.py
new file mode 100644
index 00000000..bd3f1f0c
--- /dev/null
+++ b/tests/adventofcode2023/test_day08_b.py
@@ -0,0 +1,25 @@
+import pytest
+
+from adventofcode2023.day08 import Day08PartB
+
+
+class TestDay08PartB:
+    @pytest.mark.xfail(reason="Not yet implemented", raises=NotImplementedError)
+    def test_day08b_testdata(self, testdata):
+        solution = Day08PartB()
+        result = solution.solve(testdata)
+        assert result == 0
+
+    @pytest.mark.xfail(reason="Not yet implemented", raises=NotImplementedError)
+    @pytest.mark.parametrize(("input_data", "expected_result"), [("", ""), ("", "")])
+    def test_day08b_solve(self, input_data, expected_result):
+        solution = Day08PartB()
+        result = solution.solve(input_data)
+        assert result == expected_result
+
+    @pytest.mark.xfail(reason="Not yet implemented", raises=NotImplementedError)
+    def test_day08b_data(self):
+        """Result we got when we did the real solution"""
+        solution = Day08PartB()
+        res = solution("day_08/day08.txt")
+        assert res == 0

From 57ca3dabe7a323ff2a2c7d4068695d1976cfb241 Mon Sep 17 00:00:00 2001
From: Roel Adriaans <roel@adriaans.org>
Date: Sat, 9 Dec 2023 19:15:55 +0100
Subject: [PATCH 353/371] Day 8, part 1

---
 src/adventofcode2023/day08.py          | 37 ++++++++++++++++++++++++--
 tests/adventofcode2023/test_day08_a.py | 14 +++-------
 2 files changed, 38 insertions(+), 13 deletions(-)

diff --git a/src/adventofcode2023/day08.py b/src/adventofcode2023/day08.py
index 97d128e5..f5021549 100644
--- a/src/adventofcode2023/day08.py
+++ b/src/adventofcode2023/day08.py
@@ -1,15 +1,48 @@
 from __future__ import annotations
 
+import re
+from itertools import cycle
+
 from adventofcode.utils.abstract import FileReaderSolution
 
 
 class Day08:
-    pass
+    instructions: str
+    nodes: dict[str, list[str]]
+
+    def parse(self, input_data: str):
+        instructions, nodes = input_data.split("\n\n")
+        self.instructions = instructions
+
+        self.parse_nodes(nodes)
+
+    def parse_nodes(self, input_data: str):
+        """Parse a line with into parts, and add to the nodes dict
+        Format must be: VRN = (CSM, GPD)"""
+        match = re.compile(r"[A-Z]{3}")
+        self.nodes = {}
+
+        for line in input_data.splitlines():
+            parts = re.findall(match, line)
+            self.nodes[parts[0]] = parts[1:]
 
 
 class Day08PartA(Day08, FileReaderSolution):
     def solve(self, input_data: str) -> int:
-        raise NotImplementedError
+        self.parse(input_data)
+        steps = 0
+        current_node = "AAA"
+        instructions = cycle(self.instructions)
+
+        while current_node != "ZZZ":
+            instruction = next(instructions)
+            if instruction == "L":
+                current_node = self.nodes[current_node][0]
+            else:
+                current_node = self.nodes[current_node][1]
+            steps += 1
+
+        return steps
 
 
 class Day08PartB(Day08, FileReaderSolution):
diff --git a/tests/adventofcode2023/test_day08_a.py b/tests/adventofcode2023/test_day08_a.py
index e984e64c..299ca3a6 100644
--- a/tests/adventofcode2023/test_day08_a.py
+++ b/tests/adventofcode2023/test_day08_a.py
@@ -7,8 +7,8 @@ class TestDay08PartA:
     @pytest.mark.parametrize(
         ("postfix", "expected_result"),
         [
-            ("test", 2),
-            ("test2", 6),
+            ("test_1", 2),
+            ("test_2", 6),
         ],
     )
     def test_extended(self, testdata_by_postfix, expected_result):
@@ -16,16 +16,8 @@ def test_extended(self, testdata_by_postfix, expected_result):
         result = solution.solve(testdata_by_postfix)
         assert result == expected_result
 
-    @pytest.mark.xfail(reason="Not yet implemented", raises=NotImplementedError)
-    @pytest.mark.parametrize(("input_data", "expected_result"), [("", ""), ("", "")])
-    def test_day08a_solve(self, input_data, expected_result):
-        solution = Day08PartA()
-        result = solution.solve(input_data)
-        assert result == expected_result
-
-    @pytest.mark.xfail(reason="Not yet implemented", raises=NotImplementedError)
     def test_day08a_data(self):
         """Result we got when we did the real solution"""
         solution = Day08PartA()
         res = solution("day_08/day08.txt")
-        assert res == 0
+        assert res == 11567

From a9a2bf22db5a5f9c8b4b9c57799ff9dec09bb733 Mon Sep 17 00:00:00 2001
From: Roel Adriaans <roel@adriaans.org>
Date: Sat, 9 Dec 2023 19:46:56 +0100
Subject: [PATCH 354/371] Day 8, part b.

Not as bad as expected, lcm to the rescue!
---
 .../data/day_08/day08_test_3.txt              | 10 ++++++
 src/adventofcode2023/day08.py                 | 35 ++++++++++++-------
 tests/adventofcode2023/test_day08_b.py        | 16 +++------
 3 files changed, 36 insertions(+), 25 deletions(-)
 create mode 100644 src/adventofcode2023/data/day_08/day08_test_3.txt

diff --git a/src/adventofcode2023/data/day_08/day08_test_3.txt b/src/adventofcode2023/data/day_08/day08_test_3.txt
new file mode 100644
index 00000000..5b3fa585
--- /dev/null
+++ b/src/adventofcode2023/data/day_08/day08_test_3.txt
@@ -0,0 +1,10 @@
+LR
+
+11A = (11B, XXX)
+11B = (XXX, 11Z)
+11Z = (11B, XXX)
+22A = (22B, XXX)
+22B = (22C, 22C)
+22C = (22Z, 22Z)
+22Z = (22B, 22B)
+XXX = (XXX, XXX)
diff --git a/src/adventofcode2023/day08.py b/src/adventofcode2023/day08.py
index f5021549..ab21b9d8 100644
--- a/src/adventofcode2023/day08.py
+++ b/src/adventofcode2023/day08.py
@@ -1,10 +1,14 @@
 from __future__ import annotations
 
+import logging
+import math
 import re
 from itertools import cycle
 
 from adventofcode.utils.abstract import FileReaderSolution
 
+logger = logging.getLogger(__name__)
+
 
 class Day08:
     instructions: str
@@ -19,7 +23,7 @@ def parse(self, input_data: str):
     def parse_nodes(self, input_data: str):
         """Parse a line with into parts, and add to the nodes dict
         Format must be: VRN = (CSM, GPD)"""
-        match = re.compile(r"[A-Z]{3}")
+        match = re.compile(r"[A-Z\d]{3}")
         self.nodes = {}
 
         for line in input_data.splitlines():
@@ -27,24 +31,29 @@ def parse_nodes(self, input_data: str):
             self.nodes[parts[0]] = parts[1:]
 
 
-class Day08PartA(Day08, FileReaderSolution):
-    def solve(self, input_data: str) -> int:
-        self.parse(input_data)
+class Day08PartB(Day08, FileReaderSolution):
+    def find_cycle(self, start_node: str) -> int:
         steps = 0
-        current_node = "AAA"
-        instructions = cycle(self.instructions)
+        current_node = start_node
 
-        while current_node != "ZZZ":
-            instruction = next(instructions)
+        for instruction in cycle(self.instructions):
+            steps += 1
             if instruction == "L":
                 current_node = self.nodes[current_node][0]
             else:
                 current_node = self.nodes[current_node][1]
-            steps += 1
+            if current_node.endswith("Z"):
+                return steps
 
-        return steps
+    def solve(self, input_data: str) -> int:
+        self.parse(input_data)
 
+        starts = [node for node in self.nodes.keys() if node[2] == "A"]
+        logger.info("We have %s starts", len(starts))
 
-class Day08PartB(Day08, FileReaderSolution):
-    def solve(self, input_data: str) -> int:
-        raise NotImplementedError
+        cycles = {}
+        for start in starts:
+            logger.info("Finding %s", start)
+
+            cycles[start] = self.find_cycle(start)
+        return math.lcm(*list(cycles.values()))
diff --git a/tests/adventofcode2023/test_day08_b.py b/tests/adventofcode2023/test_day08_b.py
index bd3f1f0c..36e5ce5a 100644
--- a/tests/adventofcode2023/test_day08_b.py
+++ b/tests/adventofcode2023/test_day08_b.py
@@ -4,22 +4,14 @@
 
 
 class TestDay08PartB:
-    @pytest.mark.xfail(reason="Not yet implemented", raises=NotImplementedError)
-    def test_day08b_testdata(self, testdata):
+    @pytest.mark.parametrize(("postfix", "expected_result"), [("test_3", 6)])
+    def test_day08b_extended(self, testdata_by_postfix, expected_result):
         solution = Day08PartB()
-        result = solution.solve(testdata)
-        assert result == 0
-
-    @pytest.mark.xfail(reason="Not yet implemented", raises=NotImplementedError)
-    @pytest.mark.parametrize(("input_data", "expected_result"), [("", ""), ("", "")])
-    def test_day08b_solve(self, input_data, expected_result):
-        solution = Day08PartB()
-        result = solution.solve(input_data)
+        result = solution.solve(testdata_by_postfix)
         assert result == expected_result
 
-    @pytest.mark.xfail(reason="Not yet implemented", raises=NotImplementedError)
     def test_day08b_data(self):
         """Result we got when we did the real solution"""
         solution = Day08PartB()
         res = solution("day_08/day08.txt")
-        assert res == 0
+        assert res == 9858474970153

From 656755143319784548cdd2e547ab3064b6169c47 Mon Sep 17 00:00:00 2001
From: Roel Adriaans <roel@adriaans.org>
Date: Sat, 9 Dec 2023 20:03:38 +0100
Subject: [PATCH 355/371] Don't remove part 1 when developing..

---
 src/adventofcode2023/day08.py | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/src/adventofcode2023/day08.py b/src/adventofcode2023/day08.py
index ab21b9d8..2b779936 100644
--- a/src/adventofcode2023/day08.py
+++ b/src/adventofcode2023/day08.py
@@ -31,6 +31,24 @@ def parse_nodes(self, input_data: str):
             self.nodes[parts[0]] = parts[1:]
 
 
+class Day08PartA(Day08, FileReaderSolution):
+    def solve(self, input_data: str) -> int:
+        self.parse(input_data)
+        steps = 0
+        current_node = "AAA"
+        instructions = cycle(self.instructions)
+
+        while current_node != "ZZZ":
+            instruction = next(instructions)
+            if instruction == "L":
+                current_node = self.nodes[current_node][0]
+            else:
+                current_node = self.nodes[current_node][1]
+            steps += 1
+
+        return steps
+
+
 class Day08PartB(Day08, FileReaderSolution):
     def find_cycle(self, start_node: str) -> int:
         steps = 0

From 60ec9dc8665e4ea5cac01745ba0114faa0dbe18f Mon Sep 17 00:00:00 2001
From: Roel Adriaans <roel@adriaans.org>
Date: Sat, 9 Dec 2023 20:17:08 +0100
Subject: [PATCH 356/371] Cleanup day 8.

For part 1, it will always and up at ZZZ, so we can share the find_cycle method
---
 src/adventofcode2023/day08.py | 35 +++++++++--------------------------
 1 file changed, 9 insertions(+), 26 deletions(-)

diff --git a/src/adventofcode2023/day08.py b/src/adventofcode2023/day08.py
index 2b779936..419f3202 100644
--- a/src/adventofcode2023/day08.py
+++ b/src/adventofcode2023/day08.py
@@ -30,26 +30,6 @@ def parse_nodes(self, input_data: str):
             parts = re.findall(match, line)
             self.nodes[parts[0]] = parts[1:]
 
-
-class Day08PartA(Day08, FileReaderSolution):
-    def solve(self, input_data: str) -> int:
-        self.parse(input_data)
-        steps = 0
-        current_node = "AAA"
-        instructions = cycle(self.instructions)
-
-        while current_node != "ZZZ":
-            instruction = next(instructions)
-            if instruction == "L":
-                current_node = self.nodes[current_node][0]
-            else:
-                current_node = self.nodes[current_node][1]
-            steps += 1
-
-        return steps
-
-
-class Day08PartB(Day08, FileReaderSolution):
     def find_cycle(self, start_node: str) -> int:
         steps = 0
         current_node = start_node
@@ -63,15 +43,18 @@ def find_cycle(self, start_node: str) -> int:
             if current_node.endswith("Z"):
                 return steps
 
+
+class Day08PartA(Day08, FileReaderSolution):
+    def solve(self, input_data: str) -> int:
+        self.parse(input_data)
+        return self.find_cycle("AAA")
+
+
+class Day08PartB(Day08, FileReaderSolution):
     def solve(self, input_data: str) -> int:
         self.parse(input_data)
 
         starts = [node for node in self.nodes.keys() if node[2] == "A"]
         logger.info("We have %s starts", len(starts))
 
-        cycles = {}
-        for start in starts:
-            logger.info("Finding %s", start)
-
-            cycles[start] = self.find_cycle(start)
-        return math.lcm(*list(cycles.values()))
+        return math.lcm(*(self.find_cycle(start) for start in starts))

From 988f20f2db20ef793324d75eea6745221e5e1539 Mon Sep 17 00:00:00 2001
From: Roel Adriaans <roel@adriaans.org>
Date: Sat, 9 Dec 2023 21:37:39 +0100
Subject: [PATCH 357/371] Day 9, part one.

---
 src/adventofcode2023/data/day_09/day09.txt    | 200 ++++++++++++++++++
 .../data/day_09/day09_test.txt                |   3 +
 src/adventofcode2023/day09.py                 |  34 +++
 tests/adventofcode2023/test_day09_a.py        |  29 +++
 tests/adventofcode2023/test_day09_b.py        |  25 +++
 5 files changed, 291 insertions(+)
 create mode 100644 src/adventofcode2023/data/day_09/day09.txt
 create mode 100644 src/adventofcode2023/data/day_09/day09_test.txt
 create mode 100644 src/adventofcode2023/day09.py
 create mode 100644 tests/adventofcode2023/test_day09_a.py
 create mode 100644 tests/adventofcode2023/test_day09_b.py

diff --git a/src/adventofcode2023/data/day_09/day09.txt b/src/adventofcode2023/data/day_09/day09.txt
new file mode 100644
index 00000000..3a91709c
--- /dev/null
+++ b/src/adventofcode2023/data/day_09/day09.txt
@@ -0,0 +1,200 @@
+14 28 56 121 263 554 1131 2270 4549 9201 18855 39034 81081 167714 343319 692592 1373532 2674454 5110126 9579947 17622015
+-3 1 11 21 24 22 39 132 395 951 1927 3407 5358 7524 9283 9462 6105 -3811 -24717 -62855 -126748
+19 33 58 112 229 464 911 1744 3295 6199 11669 22016 41599 78474 147102 272564 496803 887453 1549804 2642368 4396329
+9 14 20 26 31 40 83 250 745 1962 4586 9722 19055 35044 61153 102122 164281 255910 387648 572954 828623
+3 -2 -10 -22 -42 -79 -137 -181 -56 698 3260 10419 28423 70739 165664 371788 809539 1725541 3623323 7526796 15506848
+-1 -7 -15 -19 5 111 398 1033 2286 4580 8558 15168 25766 42236 67125 103790 156553 230859 333431 472415 657507
+14 23 56 138 310 639 1231 2241 3872 6352 9875 14499 20039 26137 33053 44522 75675 172337 454665 1211606 3100405
+12 21 39 74 141 262 466 789 1274 1971 2937 4236 5939 8124 10876 14287 18456 23489 29499 36606 44937
+19 29 48 92 202 465 1054 2295 4779 9575 18693 36148 70395 139749 284055 589010 1235351 2595681 5420598 11189176 22757108
+12 24 49 105 234 529 1186 2594 5491 11242 22336 43253 81919 152047 276755 493958 864150 1481324 2487923 4094873 6607920
+8 17 32 60 131 322 790 1822 3922 7967 15476 29048 53037 94544 164818 281170 469516 767677 1229576 1930484 2973479
+21 39 80 160 312 605 1168 2216 4067 7127 11804 18292 26142 33509 35932 24468 -17039 -115817 -315464 -683048 -1318428
+12 32 56 77 81 45 -58 -246 -501 -706 -490 1140 6616 21501 57778 139897 315366 672532 1369348 2678423 5055571
+2 0 4 23 72 182 414 874 1730 3257 5990 11154 21677 44312 93775 200496 424830 882778 1792004 3553021 6889970
+27 56 106 186 321 579 1126 2320 4859 10010 19966 38406 71369 128597 225554 386388 648171 1066828 1725250 2744178 4296545
+3 21 58 118 205 323 476 668 903 1185 1518 1906 2353 2863 3440 4088 4811 5613 6498 7470 8533
+18 33 50 63 69 73 95 194 538 1563 4278 10787 25113 54423 110767 213458 392234 691357 1174818 1932831 3089813
+7 -1 -11 -22 -33 -43 -51 -56 -57 -53 -43 -26 -1 33 77 132 199 279 373 482 607
+13 20 39 92 216 463 900 1609 2687 4246 6413 9330 13154 18057 24226 31863 41185 52424 65827 81656 100188
+23 46 90 174 325 593 1077 1967 3613 6643 12187 22368 41474 78745 154662 314266 653811 1371804 2863764 5894602 11908011
+20 33 51 78 119 185 304 540 1022 1995 3941 7903 16309 34873 76590 169493 370760 791013 1634311 3261484 6287171
+29 46 72 118 201 341 565 933 1616 3082 6483 14384 32034 69449 144658 288555 551903 1015150 1801842 3096554 5168407
+-3 -8 -13 -18 -23 -28 -33 -38 -43 -48 -53 -58 -63 -68 -73 -78 -83 -88 -93 -98 -103
+24 49 94 175 315 555 990 1859 3731 7848 16715 35063 71341 139891 263884 478884 836478 1406655 2276400 3540123 5274867
+10 23 39 67 134 294 650 1398 2901 5797 11150 20707 37510 67571 124264 238823 483264 1016695 2172997 4618055 9619058
+9 29 57 98 163 272 465 822 1498 2804 5421 10932 23008 49799 108371 232406 484855 977815 1902601 3573814 6492177
+7 -2 -5 17 99 309 790 1855 4176 9121 19306 39442 77570 146790 267603 470998 802429 1326840 2134909 3350695 5140885
+5 25 54 97 161 251 366 495 613 677 622 357 -239 -1321 -3082 -5757 -9627 -15023 -22330 -31991 -44511
+2 7 17 45 131 360 880 1920 3818 7093 12650 22317 40111 74970 146279 294605 602193 1232162 2504430 5044920 10081198
+25 49 87 140 209 295 399 522 665 829 1015 1224 1457 1715 1999 2310 2649 3017 3415 3844 4305
+14 24 43 86 181 368 711 1346 2613 5375 11735 26556 60512 135901 297189 629280 1287864 2547906 4878395 9053818 16315343
+8 16 17 7 -18 -62 -129 -223 -348 -508 -707 -949 -1238 -1578 -1973 -2427 -2944 -3528 -4183 -4913 -5722
+16 34 58 101 186 346 624 1073 1756 2746 4126 5989 8438 11586 15556 20481 26504 33778 42466 52741 64786
+27 43 67 103 162 275 521 1087 2388 5301 11626 25012 52845 110125 227416 466980 954921 1943671 3930069 7871917 15573412
+8 11 23 53 103 180 320 632 1392 3245 7597 17284 37571 77436 150902 277859 483328 793415 1225235 1766799 2341191
+-8 -8 0 32 122 333 779 1674 3438 6911 13758 27204 53351 103562 198851 378040 712850 1335454 2488122 4612280 8509902
+0 -1 -5 -5 23 130 408 1017 2253 4729 9824 20691 44318 95420 203319 423457 855798 1673123 3163121 5789243 10276529
+11 15 19 23 27 31 35 39 43 47 51 55 59 63 67 71 75 79 83 87 91
+15 14 20 54 147 336 660 1162 1909 3055 5012 8898 17671 38877 91013 217640 517478 1206335 2740499 6055505 13016002
+2 -4 -8 3 44 127 256 422 598 734 752 541 -48 -1207 -3176 -6248 -10774 -17168 -25912 -37561 -52748
+23 31 41 74 173 408 878 1710 3055 5081 7963 11870 16949 23306 30984 39938 50007 60883 72077 82882 92333
+7 8 11 18 34 77 197 499 1159 2416 4517 7581 11317 14447 13488 142 -44205 -159640 -429293 -1019020 -2247008
+4 10 16 38 118 343 879 2042 4436 9186 18277 34973 64228 112909 189524 302981 459692 658074 879182 1071832 1130130
+1 13 39 99 237 533 1112 2142 3812 6282 9604 13640 18084 22910 30111 48933 110020 301296 854730 2347394 6148964
+0 -9 -24 -33 4 170 612 1583 3531 7284 14428 28063 54267 104819 202050 387129 733674 1369333 2508936 4504007 7914878
+9 18 33 70 151 311 620 1239 2544 5367 11418 23967 48880 96118 181823 331130 581859 989256 1631967 2619444 4100997
+9 14 23 36 53 74 99 128 161 198 239 284 333 386 443 504 569 638 711 788 869
+13 25 40 66 121 246 529 1140 2377 4723 8914 16018 27525 45448 72435 111892 168117 246445 353404 496882 686305
+14 29 44 61 89 158 351 870 2163 5158 11698 25389 53327 109659 222816 449832 904062 1808185 3595410 7103715 13950703
+14 26 54 98 153 206 227 152 -137 -808 -1966 -3221 -2494 6774 41457 139973 382532 925766 2059406 4295648 8505623
+2 11 23 38 64 123 266 607 1400 3212 7304 16450 36645 80537 174042 368560 762618 1538757 3024209 5787554 10788306
+6 7 25 87 235 526 1032 1840 3052 4785 7171 10357 14505 19792 26410 34566 44482 56395 70557 87235 106711
+10 25 53 116 259 559 1148 2260 4314 8054 14783 26751 47787 84302 146834 252357 427634 713959 1173705 1899174 3024331
+24 36 50 77 148 333 777 1758 3773 7666 14837 27646 50332 91269 168480 322548 645294 1340369 2845850 6073450 12861288
+12 15 30 80 197 426 832 1522 2710 4871 9065 17592 35299 72139 148031 301779 606960 1199651 2326312 4426252 8273793
+-2 9 40 101 205 381 700 1323 2596 5241 10727 21960 44523 88856 174043 334351 630474 1168765 2133866 3843451 6838793
+6 10 10 11 36 141 433 1107 2530 5410 11103 22140 43105 82062 152799 278197 494986 859934 1457012 2404133 3856478
+8 15 23 35 51 73 113 211 494 1357 3950 11353 31179 80964 198740 462887 1028108 2188775 4487913 8901223 17143107
+11 15 34 94 233 497 938 1623 2673 4380 7520 14120 29183 64270 144432 320835 692591 1442869 2896390 5607994 10495197
+14 21 31 44 60 79 101 126 154 185 219 256 296 339 385 434 486 541 599 660 724
+26 45 80 156 313 614 1171 2201 4138 7862 15171 29726 58851 116779 230210 447397 852410 1586755 2881154 5101032 8810117
+5 22 64 142 265 438 651 851 889 437 -1121 -4798 -12040 -24526 -43411 -67432 -88895 -85964 -8818 243946 863895
+6 1 -4 -9 -14 -19 -24 -29 -34 -39 -44 -49 -54 -59 -64 -69 -74 -79 -84 -89 -94
+20 26 33 46 69 114 217 462 1032 2346 5427 12820 30700 73352 172059 391723 860467 1820397 3712384 7315609 13976426
+4 15 39 76 126 189 265 354 456 571 699 840 994 1161 1341 1534 1740 1959 2191 2436 2694
+-6 1 16 35 54 69 76 71 50 9 -56 -149 -274 -435 -636 -881 -1174 -1519 -1920 -2381 -2906
+14 24 37 64 131 291 650 1405 2899 5716 10865 20131 36696 66145 117960 207556 358812 606880 1000797 1605058 2498809
+0 12 45 125 301 652 1308 2513 4769 9115 17633 34380 67219 131660 259205 515543 1039634 2125851 4392779 9122926 18933417
+11 28 56 98 159 238 330 466 833 2030 5545 14617 35841 82291 179753 379184 781311 1584428 3175934 6305560 12409707
+12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32
+0 12 46 115 241 475 938 1891 3842 7698 14970 28039 50491 87529 146470 237335 373540 572696 857526 1256907 1807045
+21 32 62 133 287 597 1173 2168 3798 6414 10727 18424 33672 66451 139366 300661 647715 1367484 2803332 5561663 10676949
+30 45 67 118 231 460 908 1785 3524 7003 13944 27585 53747 102447 190251 343647 603906 1034293 1731257 2842620 4598159
+14 14 16 25 44 69 84 56 -70 -376 -976 -2021 -3704 -6265 -9996 -15246 -22426 -32014 -44560 -60691 -81116
+22 32 43 50 43 7 -78 -237 -500 -902 -1483 -2288 -3367 -4775 -6572 -8823 -11598 -14972 -19025 -23842 -29513
+16 19 21 30 66 171 421 940 1916 3619 6421 10818 17454 27147 40917 60016 85960 120563 165973 224710 299706
+19 37 74 139 242 405 685 1208 2222 4192 7972 15095 28244 52077 94928 172751 318390 602318 1175903 2355506 4775763
+-2 4 30 96 231 485 964 1894 3716 7208 13636 24979 44385 77231 133514 232821 413834 751228 1383906 2559754 4703435
+6 24 54 101 184 348 678 1318 2519 4778 9199 18334 37993 80936 174177 373301 790724 1652238 3411282 6979903 14190706
+18 30 50 78 114 158 210 270 338 414 498 590 690 798 914 1038 1170 1310 1458 1614 1778
+-1 9 37 102 230 464 893 1714 3360 6761 13869 28692 59269 121305 244607 484069 937821 1776397 3288557 5951958 10540544
+19 42 74 123 209 379 747 1586 3507 7778 16875 35424 71791 140705 267452 494347 890363 1564954 2687232 4511721 7411885
+24 35 48 67 108 223 534 1271 2819 5804 11284 21161 39028 71919 134086 255471 500884 1012731 2103598 4450869 9494278
+19 32 58 110 217 431 847 1654 3240 6379 12533 24307 46100 85000 151976 263425 443137 724746 1154740 1796108 2732707
+-7 -2 10 35 101 279 708 1620 3361 6404 11350 18913 29885 45077 65232 90906 122313 159130 200258 243535 285397
+15 31 51 71 86 90 76 36 -39 -159 -335 -579 -904 -1324 -1854 -2510 -3309 -4269 -5409 -6749 -8310
+5 11 34 86 184 367 726 1443 2833 5388 9838 17275 29436 49314 82366 138718 236933 410113 715354 1247868 2161432
+12 33 60 93 132 177 228 285 348 417 492 573 660 753 852 957 1068 1185 1308 1437 1572
+13 11 9 7 5 3 1 -1 -3 -5 -7 -9 -11 -13 -15 -17 -19 -21 -23 -25 -27
+23 47 92 177 331 607 1112 2057 3833 7137 13216 24387 45168 84690 161676 314408 620255 1233543 2458876 4893321 9701941
+7 7 3 -12 -51 -140 -320 -622 -966 -887 1087 8694 30271 82765 198179 433293 883429 1700687 3116311 5465452 9210333
+18 30 54 104 197 357 630 1121 2064 3936 7626 14670 27563 50159 88170 149775 246350 393330 611214 926724 1374129
+4 13 40 106 253 562 1175 2321 4346 7747 13210 21652 34267 52576 78481 114323 162944 227753 312796 422830 563401
+2 16 40 71 111 185 383 936 2336 5511 12077 24733 47983 89624 163920 298208 546006 1011706 1894870 3566283 6693583
+26 38 50 62 74 86 98 110 122 134 146 158 170 182 194 206 218 230 242 254 266
+4 21 45 75 122 216 417 839 1699 3406 6708 12918 24243 44243 78450 135180 226574 369907 589207 917229 1397832
+-8 -18 -28 -19 48 236 644 1443 2957 5816 11217 21343 40011 73650 132751 233985 403254 680026 1123410 1820553 2898090
+25 37 64 116 202 337 552 919 1631 3222 7083 16554 39103 90537 202996 439959 924174 1889257 3774365 7396820 14265161
+14 15 23 53 133 320 720 1511 2968 5481 9550 15766 24902 38530 61169 106032 208307 453348 1034086 2366996 5329344
+30 46 73 117 186 303 526 975 1866 3552 6571 11701 20022 32985 52488 80959 121446 177714 254349 356869 491842
+7 2 12 55 167 412 891 1754 3226 5687 9926 17861 34341 71217 155842 347784 770197 1666568 3500268 7124627 14066671
+11 16 33 72 150 308 651 1430 3190 7020 14976 30832 61488 119689 229271 435065 821009 1542132 2879119 5328428 9746750
+5 16 39 82 153 260 411 614 877 1208 1615 2106 2689 3372 4163 5070 6101 7264 8567 10018 11625
+5 11 31 79 169 315 531 831 1229 1739 2375 3151 4081 5179 6459 7935 9621 11531 13679 16079 18745
+11 25 46 83 156 309 628 1264 2461 4589 8182 13981 22982 36489 56172 84130 122959 175825 246542 339655 460528
+7 17 37 84 196 451 987 2032 3962 7409 13440 23822 41377 70415 117212 190474 301697 465297 698343 1019680 1448178
+-7 -12 -10 8 63 205 531 1203 2472 4736 8705 15821 29209 55687 109905 222838 459183 952588 1975388 4072510 8309999
+-3 -5 -7 -13 -22 -10 102 505 1603 4185 9703 20699 41432 78764 143372 251361 426361 702199 1126245 1763539 2701814
+11 15 20 30 70 208 588 1490 3452 7527 15830 32692 67028 137005 278839 562647 1119837 2188659 4187404 7828486 14291454
+-3 -6 -10 -5 27 110 270 529 897 1362 1878 2351 2623 2454 1502 -699 -4763 -11478 -21834 -37053 -58621
+6 28 62 108 166 236 318 412 518 636 766 908 1062 1228 1406 1596 1798 2012 2238 2476 2726
+11 27 62 128 243 438 770 1345 2361 4187 7500 13508 24293 43314 76116 131297 221791 366531 592562 937680 1453679
+9 5 -7 -21 -23 7 93 261 537 945 1505 2231 3129 4195 5413 6753 8169 9597 10953 12131 13001
+8 18 31 65 164 408 930 1951 3844 7238 13173 23317 40256 67868 111792 180003 283504 437146 660587 979401 1426348
+9 17 46 110 238 490 982 1933 3767 7338 14409 28639 57570 116539 236173 476286 950733 1870247 3613656 6842308 12678166
+19 46 93 168 277 424 629 975 1690 3262 6574 13032 24642 43972 73912 117119 175005 246094 323539 391552 420459
+6 5 14 57 173 416 855 1574 2672 4263 6476 9455 13359 18362 24653 32436 41930 53369 67002 83093 101921
+6 22 52 117 248 495 952 1814 3503 6941 14122 29255 60929 126002 256252 509262 985556 1854672 3393664 6042481 10481790
+25 42 74 145 291 563 1034 1806 3009 4780 7206 10211 13363 15573 14654 6704 -14727 -59730 -143438 -287787 -523693
+20 38 83 179 371 744 1462 2840 5462 10358 19253 34901 61517 105320 175200 283522 447080 688214 1036103 1528247 2212151
+9 14 28 57 119 268 642 1549 3610 7985 16717 33240 63110 115033 202281 344606 570783 921936 1455826 2252307 3420185
+6 4 1 9 61 230 656 1594 3521 7391 15228 31435 65523 137497 287977 596446 1213093 2413074 4687570 8895407 16515070
+3 2 11 44 121 268 517 906 1479 2286 3383 4832 6701 9064 12001 15598 19947 25146 31299 38516 46913
+19 38 72 123 193 284 398 537 703 898 1124 1383 1677 2008 2378 2789 3243 3742 4288 4883 5529
+16 21 27 34 42 51 61 72 84 97 111 126 142 159 177 196 216 237 259 282 306
+-6 -6 1 28 102 286 716 1653 3550 7134 13503 24238 41530 68322 108466 166895 249810 364882 521469 730848 1006462
+8 3 8 29 74 154 292 566 1238 3067 7976 20352 49440 113652 248414 521011 1059980 2115267 4182768 8260087 16360846
+3 10 36 98 225 469 931 1806 3457 6550 12336 23281 44463 86522 171490 343511 687182 1356910 2621513 4930598 9016916
+24 44 72 113 188 350 705 1436 2842 5429 10133 18849 35662 69680 141457 297259 640012 1394806 3044098 6599693 14135664
+5 23 46 78 141 292 658 1507 3392 7442 15945 33512 69400 142119 288415 580329 1156575 2278345 4425344 8456050 15867759
+19 31 52 91 163 295 542 1029 2058 4356 9601 21479 47778 104593 224933 476452 997557 2069089 4251986 8642359 17327613
+4 2 -3 -11 -22 -36 -53 -73 -96 -122 -151 -183 -218 -256 -297 -341 -388 -438 -491 -547 -606
+1 5 12 26 58 141 367 960 2399 5605 12206 24894 47888 87517 152937 256996 417261 657221 1007680 1508354 2209686
+17 29 58 112 208 382 694 1224 2053 3222 4662 6102 7035 7065 7605 17388 67347 246313 779428 2188570 5601476
+1 21 53 109 230 501 1077 2228 4420 8467 15819 29101 53101 96539 175157 316980 571043 1021497 1809841 3169125 5475384
+6 21 40 63 90 121 156 195 238 285 336 391 450 513 580 651 726 805 888 975 1066
+7 9 18 42 92 195 412 861 1761 3546 7162 14781 31389 68112 148903 323701 694248 1465287 3047717 6268886 12802095
+5 20 44 81 151 296 585 1118 2029 3488 5702 8915 13407 19492 27515 37848 50885 67036 86720 110357 138359
+12 25 48 83 132 197 280 383 508 657 832 1035 1268 1533 1832 2167 2540 2953 3408 3907 4452
+9 18 27 36 45 54 63 72 81 90 99 108 117 126 135 144 153 162 171 180 189
+12 23 45 102 243 557 1202 2475 4967 9867 19502 38226 73800 139437 256721 459647 800070 1354895 2235387 3599030 5664417
+3 17 44 89 158 248 336 379 350 358 952 3825 13369 39967 106658 262035 604149 1323079 2774060 5599113 10923592
+11 23 52 107 213 422 827 1595 3059 5953 11953 24829 52768 112877 239639 500344 1022479 2041031 3978006 7572651 14089435
+12 14 16 19 27 62 192 572 1498 3474 7292 14125 25633 44082 72476 114702 175688 261574 379896 539783 752167
+28 48 74 105 145 217 399 897 2167 5090 11196 22932 43980 79652 137403 227465 363422 562048 840630 1207839 1640299
+16 35 63 113 218 437 868 1681 3189 5980 11135 20566 37573 67968 122808 225380 428334 852889 1772455 3780047 8105492
+1 14 31 52 91 183 397 865 1833 3743 7376 14140 26700 50375 96197 187510 374013 761176 1570593 3260648 6760765
+16 36 75 141 237 369 561 882 1499 2791 5603 11801 25433 55042 118055 248718 511768 1024907 1994131 3767032 6910279
+25 36 52 74 96 98 46 -91 -289 -338 465 3999 14786 43076 111239 266808 608598 1337857 2856019 5946873 12107729
+4 16 35 56 74 84 81 60 16 -56 -161 -304 -490 -724 -1011 -1356 -1764 -2240 -2789 -3416 -4126
+14 24 48 106 223 431 780 1365 2384 4273 8048 16163 34532 76973 174400 392907 867870 1865866 3893160 7879276 15477025
+12 27 58 128 271 536 991 1727 2876 4689 7779 13743 26594 55885 123345 276760 618632 1364483 2959404 6306378 13203773
+21 31 50 96 212 477 1014 1995 3643 6231 10078 15542 23010 32885 45570 61449 80865 104095 131322 162604 197840
+8 19 34 61 115 220 411 736 1258 2057 3232 4903 7213 10330 14449 19794 26620 35215 45902 59041 75031
+2 12 36 82 173 352 698 1374 2748 5657 11931 25388 53717 112108 230379 467029 936622 1861910 3670142 7165434 13827661
+7 31 77 155 276 461 764 1321 2445 4804 9758 20010 40874 82732 165735 328658 645299 1254301 2412331 4586949 8615296
+24 41 66 106 179 327 645 1339 2828 5907 11990 23454 44107 79805 139245 234963 384568 612245 950562 1442618 2144571
+14 17 19 26 55 143 366 890 2091 4810 10865 24038 51904 109084 222798 441980 851708 1595311 2907255 5160794 8935413
+5 16 32 63 132 279 569 1104 2039 3602 6118 10037 15966 24705 37287 55022 79545 112868 157436 216187 292616
+18 32 53 81 120 198 401 921 2118 4596 9293 17585 31404 53370 86937 136553 207834 307752 444837 629393 873728
+16 28 45 64 92 167 391 975 2296 4966 9913 18474 32500 54473 87635 136129 205152 301120 431845 606724 836940
+8 4 -7 -24 -39 -36 10 134 382 812 1495 2516 3975 5988 8688 12226 16772 22516 29669 38464 49157
+10 15 29 73 187 432 885 1625 2720 4258 6537 10673 20162 44465 106733 259895 619607 1431209 3205097 6988666 14907396
+15 24 40 64 113 230 501 1094 2350 4987 10534 22215 46697 97476 201316 410242 823341 1625334 3152912 6005630 11226269
+0 5 11 31 94 258 631 1405 2924 5837 11436 22352 43884 86372 169200 327234 620768 1150373 2078425 3659533 6282602
+-1 9 40 102 205 359 574 860 1227 1685 2244 2914 3705 4627 5690 6904 8279 9825 11552 13470 15589
+0 3 14 33 60 95 138 189 248 315 390 473 564 663 770 885 1008 1139 1278 1425 1580
+3 17 38 81 176 380 802 1643 3253 6207 11402 20177 34458 56930 91238 142219 216167 321133 467262 667169 936356
+14 20 30 44 62 84 110 140 174 212 254 300 350 404 462 524 590 660 734 812 894
+17 31 64 121 211 349 556 867 1374 2370 4737 10865 26662 65748 157985 366599 822270 1790440 3802693 7909280 16155408
+15 36 84 186 389 774 1490 2822 5321 10057 19112 36507 69844 133018 250377 462624 834487 1463630 2489312 4097764 6518955
+13 26 40 57 79 108 146 195 257 334 428 541 675 832 1014 1223 1461 1730 2032 2369 2743
+6 11 20 33 50 71 96 125 158 195 236 281 330 383 440 501 566 635 708 785 866
+-3 -2 8 37 95 192 338 543 817 1170 1612 2153 2803 3572 4470 5507 6693 8038 9552 11245 13127
+10 7 1 -9 -28 -57 -71 22 445 1647 4458 10395 22371 46454 96245 203494 442940 988347 2234695 5056651 11340670
+12 25 41 69 133 288 656 1489 3269 6859 13719 26195 47893 84220 143433 239205 397142 670373 1173977 2155505 4130321
+-6 -9 -1 41 156 405 877 1695 3022 5067 8091 12413 18416 26553 37353 51427 69474 92287 120759 155889 198788
+10 27 63 135 272 524 984 1825 3348 6031 10571 17947 29674 48841 83611 157378 335212 787365 1932553 4745545 11391002
+15 25 43 69 103 145 195 253 319 393 475 565 663 769 883 1005 1135 1273 1419 1573 1735
+26 43 79 142 244 415 734 1402 2895 6248 13534 28615 58255 113698 212827 383033 664936 1117113 1822001 2893156 4484062
+19 31 41 57 109 262 642 1485 3217 6575 12787 23852 43034 75899 132773 234729 427691 813843 1617513 3315823 6885023
+11 38 88 177 326 561 913 1418 2117 3056 4286 5863 7848 10307 13311 16936 21263 26378 32372 39341 47386
+14 25 50 106 231 497 1030 2036 3827 6844 11699 19336 31610 53040 95472 189401 409732 931699 2148060 4908018 10992969
+2 10 29 66 130 228 359 501 592 521 166 -458 -840 769 8798 33101 94134 232596 527027 1125106 2297718
+10 16 24 34 55 128 377 1110 3015 7538 17609 39032 83124 171641 345765 682118 1320736 2513256 4705242 8676246 15777445
+-1 0 16 62 165 371 752 1413 2499 4202 6768 10504 15785 23061 32864 45815 62631 84132 111248 145026 186637
+4 13 45 119 276 588 1169 2198 3969 6991 12172 21141 36826 64615 114998 209912 397708 786612 1614895 3388996 7139814
+5 21 44 84 159 301 579 1152 2369 4937 10182 20432 39555 73689 132205 228948 383805 624653 989744 1530588 2315399
+11 19 36 73 161 362 774 1536 2861 5159 9363 17649 34861 71134 146477 298464 594719 1152611 2169542 3968465 7064865
+20 46 96 190 372 723 1368 2468 4196 6726 10325 15739 25214 44701 88069 184501 390684 809934 1621030 3120276 5781176
+1 5 21 65 173 422 972 2139 4513 9138 17782 33365 60715 108031 189805 332561 585689 1040979 1866299 3361329 6046489
+16 42 87 160 272 436 667 982 1400 1942 2631 3492 4552 5840 7387 9226 11392 13922 16855 20232 24096
+15 26 57 134 309 681 1425 2829 5339 9612 16577 27504 44081 68499 103545 152703 220263 311438 432489 590858 795309
+7 17 37 79 165 343 715 1480 2993 5839 10919 19543 33523 55257 87793 134860 200851 290741 409921 563927 758041
+8 18 45 98 186 318 503 750 1068 1466 1953 2538 3230 4038 4971 6038 7248 8610 10133 11826 13698
+22 41 74 129 229 436 893 1897 4024 8347 16841 33195 64519 124952 243102 476797 941082 1859125 3651148 7084229 13516489
+7 17 42 99 225 488 1004 1985 3868 7619 15373 31669 65692 135206 273401 540985 1048083 1994786 3746952 6977130 12921917
+8 15 38 96 232 520 1072 2056 3755 6726 12167 22697 43966 87990 180160 374080 782726 1642429 3440152 7157650 14722640
+9 30 64 108 169 286 561 1193 2519 5090 9842 18456 34031 62212 112905 202639 357449 615843 1031246 1674479 2642949
+7 14 32 61 101 152 214 287 371 466 572 689 817 956 1106 1267 1439 1622 1816 2021 2237
diff --git a/src/adventofcode2023/data/day_09/day09_test.txt b/src/adventofcode2023/data/day_09/day09_test.txt
new file mode 100644
index 00000000..539a763f
--- /dev/null
+++ b/src/adventofcode2023/data/day_09/day09_test.txt
@@ -0,0 +1,3 @@
+0 3 6 9 12 15
+1 3 6 10 15 21
+10 13 16 21 30 45
diff --git a/src/adventofcode2023/day09.py b/src/adventofcode2023/day09.py
new file mode 100644
index 00000000..136636a3
--- /dev/null
+++ b/src/adventofcode2023/day09.py
@@ -0,0 +1,34 @@
+from __future__ import annotations
+
+from adventofcode.utils.abstract import FileReaderSolution
+
+
+class Day09:
+    @staticmethod
+    def calculate_line(line: str) -> int:
+        numbers = [int(digit) for digit in line.split()]
+        differences = [numbers]
+        while set(numbers) != {0}:
+            numbers = [
+                numbers[idx + 1] - number for idx, number in enumerate(numbers[:-1])
+            ]
+            differences.append(numbers)
+        # Adding numbers:
+        # I need to add current last one + previous last one and add that to previous
+        differences.reverse()
+        previous_add = 0
+        for idx, line in enumerate(differences[:-1]):
+            line.append(previous_add)
+            previous_add = differences[idx + 1][-1] + previous_add
+
+        return previous_add
+
+
+class Day09PartA(Day09, FileReaderSolution):
+    def solve(self, input_data: str) -> int:
+        return sum([self.calculate_line(line) for line in input_data.splitlines()])
+
+
+class Day09PartB(Day09, FileReaderSolution):
+    def solve(self, input_data: str) -> int:
+        raise NotImplementedError
diff --git a/tests/adventofcode2023/test_day09_a.py b/tests/adventofcode2023/test_day09_a.py
new file mode 100644
index 00000000..bdc0077c
--- /dev/null
+++ b/tests/adventofcode2023/test_day09_a.py
@@ -0,0 +1,29 @@
+import pytest
+
+from adventofcode2023.day09 import Day09PartA
+
+
+class TestDay09PartA:
+    @pytest.mark.parametrize(
+        ("line_nr", "expected_result"),
+        [
+            (0, 18),
+            (1, 28),
+            (2, 68),
+        ],
+    )
+    def test_daya09_lines(self, testdata, line_nr, expected_result):
+        line = testdata.splitlines()[line_nr]
+        result = Day09PartA().calculate_line(line)
+        assert result == expected_result
+
+    def test_day09a_testdata(self, testdata):
+        solution = Day09PartA()
+        result = solution.solve(testdata)
+        assert result == 114
+
+    def test_day09a_data(self):
+        """Result we got when we did the real solution"""
+        solution = Day09PartA()
+        res = solution("day_09/day09.txt")
+        assert res == 1955513104
diff --git a/tests/adventofcode2023/test_day09_b.py b/tests/adventofcode2023/test_day09_b.py
new file mode 100644
index 00000000..06b19777
--- /dev/null
+++ b/tests/adventofcode2023/test_day09_b.py
@@ -0,0 +1,25 @@
+import pytest
+
+from adventofcode2023.day09 import Day09PartB
+
+
+class TestDay09PartB:
+    @pytest.mark.xfail(reason="Not yet implemented", raises=NotImplementedError)
+    def test_day09b_testdata(self, testdata):
+        solution = Day09PartB()
+        result = solution.solve(testdata)
+        assert result == 0
+
+    @pytest.mark.xfail(reason="Not yet implemented", raises=NotImplementedError)
+    @pytest.mark.parametrize(("input_data", "expected_result"), [("", ""), ("", "")])
+    def test_day09b_solve(self, input_data, expected_result):
+        solution = Day09PartB()
+        result = solution.solve(input_data)
+        assert result == expected_result
+
+    @pytest.mark.xfail(reason="Not yet implemented", raises=NotImplementedError)
+    def test_day09b_data(self):
+        """Result we got when we did the real solution"""
+        solution = Day09PartB()
+        res = solution("day_09/day09.txt")
+        assert res == 0

From 856dd48668c2e29385acb1d03fc49492edf0abc6 Mon Sep 17 00:00:00 2001
From: Roel Adriaans <roel@adriaans.org>
Date: Sat, 9 Dec 2023 21:54:19 +0100
Subject: [PATCH 358/371] Day 9, part two is the same but reversed.. :)

---
 src/adventofcode2023/day09.py          | 25 +++++++++++++++++++++++--
 tests/adventofcode2023/test_day09_b.py | 19 ++++---------------
 2 files changed, 27 insertions(+), 17 deletions(-)

diff --git a/src/adventofcode2023/day09.py b/src/adventofcode2023/day09.py
index 136636a3..bfa3182f 100644
--- a/src/adventofcode2023/day09.py
+++ b/src/adventofcode2023/day09.py
@@ -5,7 +5,7 @@
 
 class Day09:
     @staticmethod
-    def calculate_line(line: str) -> int:
+    def create_differences(line: str) -> list[list[int]]:
         numbers = [int(digit) for digit in line.split()]
         differences = [numbers]
         while set(numbers) != {0}:
@@ -13,6 +13,10 @@ def calculate_line(line: str) -> int:
                 numbers[idx + 1] - number for idx, number in enumerate(numbers[:-1])
             ]
             differences.append(numbers)
+        return differences
+
+    def calculate_line(self, line: str) -> int:
+        differences = self.create_differences(line)
         # Adding numbers:
         # I need to add current last one + previous last one and add that to previous
         differences.reverse()
@@ -23,6 +27,21 @@ def calculate_line(line: str) -> int:
 
         return previous_add
 
+    def calculate_backwards_line(self, line: str) -> int:
+        """Do the same as calculate_line but backwards..."""
+        differences = self.create_differences(line)
+        differences.reverse()
+        reversed_differences = []
+        for line in differences:
+            reversed_differences.append(list(reversed(line)))
+
+        previous_add = 0
+        for idx, line in enumerate(reversed_differences[:-1]):
+            line.append(previous_add)
+            previous_add = reversed_differences[idx + 1][-1] - previous_add
+
+        return previous_add
+
 
 class Day09PartA(Day09, FileReaderSolution):
     def solve(self, input_data: str) -> int:
@@ -31,4 +50,6 @@ def solve(self, input_data: str) -> int:
 
 class Day09PartB(Day09, FileReaderSolution):
     def solve(self, input_data: str) -> int:
-        raise NotImplementedError
+        return sum(
+            [self.calculate_backwards_line(line) for line in input_data.splitlines()]
+        )
diff --git a/tests/adventofcode2023/test_day09_b.py b/tests/adventofcode2023/test_day09_b.py
index 06b19777..9ddd6ec5 100644
--- a/tests/adventofcode2023/test_day09_b.py
+++ b/tests/adventofcode2023/test_day09_b.py
@@ -1,25 +1,14 @@
-import pytest
-
 from adventofcode2023.day09 import Day09PartB
 
 
 class TestDay09PartB:
-    @pytest.mark.xfail(reason="Not yet implemented", raises=NotImplementedError)
-    def test_day09b_testdata(self, testdata):
-        solution = Day09PartB()
-        result = solution.solve(testdata)
-        assert result == 0
-
-    @pytest.mark.xfail(reason="Not yet implemented", raises=NotImplementedError)
-    @pytest.mark.parametrize(("input_data", "expected_result"), [("", ""), ("", "")])
-    def test_day09b_solve(self, input_data, expected_result):
+    def test_day09b_testdata(self):
         solution = Day09PartB()
-        result = solution.solve(input_data)
-        assert result == expected_result
+        result = solution.solve("10  13  16  21  30  45")
+        assert result == 5
 
-    @pytest.mark.xfail(reason="Not yet implemented", raises=NotImplementedError)
     def test_day09b_data(self):
         """Result we got when we did the real solution"""
         solution = Day09PartB()
         res = solution("day_09/day09.txt")
-        assert res == 0
+        assert res == 1131

From 53281df00aa33f1b706dd6d37ae529dc6abd1b19 Mon Sep 17 00:00:00 2001
From: Roel Adriaans <roel@adriaans.org>
Date: Mon, 11 Dec 2023 08:00:32 +0100
Subject: [PATCH 359/371] [WIP] Day 10

---
 src/adventofcode2023/data/day_10/day10.txt    | 140 ++++++++++++++++++
 .../data/day_10/day10_test_4.txt              |   5 +
 .../data/day_10/day10_test_8.txt              |   5 +
 src/adventofcode2023/day10.py                 |  83 +++++++++++
 tests/adventofcode2023/test_day10_a.py        |  38 +++++
 tests/adventofcode2023/test_day10_b.py        |  25 ++++
 6 files changed, 296 insertions(+)
 create mode 100644 src/adventofcode2023/data/day_10/day10.txt
 create mode 100644 src/adventofcode2023/data/day_10/day10_test_4.txt
 create mode 100644 src/adventofcode2023/data/day_10/day10_test_8.txt
 create mode 100644 src/adventofcode2023/day10.py
 create mode 100644 tests/adventofcode2023/test_day10_a.py
 create mode 100644 tests/adventofcode2023/test_day10_b.py

diff --git a/src/adventofcode2023/data/day_10/day10.txt b/src/adventofcode2023/data/day_10/day10.txt
new file mode 100644
index 00000000..c349300d
--- /dev/null
+++ b/src/adventofcode2023/data/day_10/day10.txt
@@ -0,0 +1,140 @@
+L77FF.FJF|FL-7F7FF-F7F7FL.|.F-77.F--|.J7.FFLL--|7-7.7-L77F7-7.F-7F7-FF7F|77.|-JF7-FFF.L-7FFF7---|F7.|.FLF-JF-|-7---|F77FF-F-77FL77|-77.|-J.F
+L7F-|7LLFJFL-FJ7L|.FL.LJJF7.|.|L-FJFJJ7L.777L-7.F7F-|7.F-7L7-F7LF-7.|L-JJF7-J-L7|F-JJFJLJ-L||.|LL|JF7-7FJ-FJ.J.J.|FLLJ7-F-L-L|7LJ-7-JL7F7|FJ
+FF7|.-7F|J-|.|LFJJL-J7|.7FJ7L-77JLJJJ7F77JLJ77|-F--FJ.-JLL-J.LJJ.L|--7.J-JJ.|-F----LL-7FJJF||F--7F-7.F-7.L7-|.-LL-77JFJ.J7F-JL|.||L.FF||JLJ|
+-JL-|--JF-7FFJFJ7FL7F-J7.L7L77L-7|JLF7-J|.7||J|L7.LF-J|.FJ.--7L|F|J|L|.|J.LF7--7J|F.|FF-7FF|||F-J|FJFJJFFJL-FJLF-J|7F7J..FF.|..|-LL---777J|7
+||.||L|7||-JJFF|.|.F-J.7-FLJL77-L--.|.|LJFL-L|FFL||L|F-7L77.FJ7|F7L-.F-7.|F7L|.-JFFF7-|FJF7||||7.||F7L-.L-7.|..|7.|L7J..L-7L-77|.|J.FLLJ77|.
+FF7-7|F7LJ7|F-LF-7.LFLL|-|L|LLL.LL-FJ-J-LL-7-LL-|J7FJL7|JFJ|-JFL||LJ--.FJ7LF-77LF7FJL7||.|LJ|||-FJLJ|J-L7|LJJJ-L-7LLJ|FL7|J.L||F-..7JJ|7F-J-
+|||LJ---.---77.JF|-.|LFF7|F|..|7.|JJ|.||.FF-7|LF-F7F7L|J-|..|7FJJ-7-7JF77|.L7|F-J|L-7LJL7L7FJ|L7|F--J.FF7-7J..JJF|J|.JJ7-|-F7J7J7F7L|.FFL--|
+L-L-7.7F-.7JLL-|7|.J.--.LLFJ--7--F.L7J777|.L|J.||.FJ|.L-JFF-FJ.F|L|-F-|L7L7L||L-7|F7L-7FJFJL7L7LJL-7LFL7.F77-|LLFFF7-LJF---FJJL|7||-L7J|||FF
+F-JF--JLJFJ7FL.|LF7-7.L7-|LJJFJ.|.J.|L-|-F--|L-7JF7.F|J7-L|7L|7-J|F7F7|FJF-7||F7|LJ|F7|L7L-7|7L7F--J-|J.F||F-7F-77LJ-J7J|LFJL-7FF|-7.F.7JFJ7
+||.|JL7F-7|||.L-77.7.--|-|FL|7LF-7|L--7|.|7...|JFF7.J|LF.F|.7.77LF|||||L7L7LJLJLJF-J|||FJFFJL7L||F7F77-F-J||FJ|FJ--L7-|7F7.L.LFJ.FJF7JLL7|7J
+F-F..FL--L7LJ..LJJ7.F|-J..L7.JL7.F7JLLLF-JF-7-7-F||-|F77F-77J-|J.FJLJLJFJ|L-----7|F7|LJL7FJF7L-JLJLJL7.L-7||L-J|JJ.FLFJ-J-7-FF7..|LJ|.FF--77
+|.L77F7J7|JF|--||LFF-J.7-F7F|F-J7LFJFF|JJ7L7|F7F7|L7FJ|FJFJ|F7-7-L----7L-7LF----JLJ|L-7FJ|FJL--------J7F-JLJF7FJJF7.-JJF|J7FF-JL|-FJ--LFL-LJ
+77.LJF|-7-..||L---.|J..-7-L.LJ7.L7L7J-F7.F7|||||||FJL7||FJF7F7JLL|F--7|F-JL|F-----7|F7|L-JL7F7F7F--7F|FL-7F-JLJ..FL|J||L.||F|..FJFLJJ|7F.LL-
+JJ7FF-JLJ.F7-J7LL|-L7.|.||FF-LF7JF7LFFJL7|||||LJ||||FJ|||||LJ||LF7L-7LJL7LFLJFF7F-J|||L7F--J|||LJF-JF-7-FJL7FF77|7LF-FJ|FF--77-J.|J|F-JL|7J|
+LL7-|J77FLF.L-|FL7-|7-|7FF-7.F77F|L7-L7FJ|||LJF7||L7|FJ|L-JF-J-7||7||F-7L-7|F7|||F7LJL-JL7F7||L-7L7FJFJFJF7L7||-|J-JLJLF-|7-|J|JLJF7-J|FLF.|
+F--JLF-77|L7FF|F7|.L7L-JF|FJF|L-7L7|F7||.||L-7|LJ|FJ||7L-7FJ7||FJL7FJ|FJF7L7||||LJL7F--7FJ|LJL7FJFJ|FJFJFJL7LJL7JL7|J|L|-FF-L7L7JFL||F-7JF-J
+JL|7LL7F-J-|-LF-JF77JF7F7|L-7L-7|FJLJLJ|FJ|F7|L-7||FJL-7FJ|F7F7|F-JL-JL-JL7LJLJL7F7LJ7FJL7|F--J|FJFJ|FJFJ7LL---J77F|.F.L7.L7.L7|.|J|LJL|.|L7
+J.|JL|7.|.F-.|.|7L7JF.F|||F-JF-J|L----7LJFJ||L7FJ||L--7||FJ|||LJ|FFF--77F7L----7||L7F7L-7|||F7FJL7L7LJFJF7F7F-7F7F7JFJ-LL--|-7FF7F7|LF-7-J-|
+.7JL.7-7F.L7F|JJ7-|FLF7|||L7JL-7L7F-7FJF-JFJL7|L7|L--7|LJL7||L-7|F7L-7L7||F-7F-J|L7||L-7|LJ|||L7FJ|L7FJ|||||L7||||L77..L|JFL-LJL||F----J7-||
+.|7.-J|FJ.LLF.|-FF-7L|||LJFJF-7|FJL7LJFJF7L7FJL7LJF--J|F--J||.FJLJL7LL7|||L7||F7L-J||F7|L7FJ||7||-F-J|F-J|||J|LJLJFJ7.L-7|L.J|..JFF-7-7J|-FJ
+F-|FJ.7JF-F-L-F7-L7|FJ|L-7L7L7||L-7L-7|7|L7|L7|L-7L-7FJL--7|L7L7F--JF7||||FJ|LJL--7|LJ||J|L-JL7|L-JF7LJF-J||FJF---JF77FFF|LJ-FLF.JL-F.|J|F.|
+-J.JJ.|.|..FF--||L|LJFJ|L|FJFJ|L7FJF-JL-JFJ|FJF7FJF-JL7F--JL7|FJL7F7|||LJ|L7L7F7F-JL7FJ|FJF--7|L---J|F-JF7||L7L---7||F-77L7JFJ|L.|FLL-|77J.|
+|.|.L7J---F|L-LL|JL-7|7FFJL7L7|J|L7L-7F--JFJ|FJ|L7L7F7|L-7F7||L-7|||||L-7|-|FJ||L-7FJL7||FJF7LJF7F77||F7|LJ|-|F---J|||FJJ.|.L-77FL|.|.L|.F7J
+-F7-.J.|.F77LF7|FF7FJL-7L-7|FJL7L7L-7||F-7L7|L7L-JFJ|||F-J|||||FJ||||L7FJL7|L-J|F7|L7FJ|||J||F7||||FJLJLJF-JFJL7F7-||||F-7J7-|.FJJLLJ7JL-L77
+|L|.7LL7F||F7||F7||L--7L-7|||F-J-L-7||||FJF|L7L--7L7|||L7FJLJL7L7|||L7|L-7|L--7||||FJL7LJ|FJLJ||||LJF-7F7|F7|F-J|L-JLJLJFJ-|-L-L.J-7FJFLF-J|
+FJ..L7FL-|||LJLJ|||7F7L-7LJ||L7|F7FJ||||L7FJFJF7|L7LJ||FJL7F--J-||||FJ|F7||JF-JLJ|||F7L-7LJF--J||L-7L7LJLJ|||L-7|F------JJ7J..|L77F7-7FJJL7J
+L--77-L7|||L-7F-J||FJ|F7L-7||FJFJ|L7LJ||FJ|FJ7||F7L7FJ|L-7||F7JFJ||LJFJ|||L7L---7||LJ|F7L7FJF7FJ|F7|FJF7F7|||F-J|L------7.---.--L-L7F||F77L7
+||FL7FF7-|L--J|7|||L7LJL-7|||L7L7|LL7FJ||FJ|F7|||L7|L7|F-J|||L7L7|L7FJFJLJFJF---JLJF-J|L-JL7||L7||||L7|||LJ||L7FJF------J7J7LJL|FL-L7.|-7FFJ
+LFL||FFLJL---7L7FJ|LL---7||||FJFJ|F7|L7|||FJ|LJ|L7|L7|||F7||L7L-J|FJL-JF--JLL----7FJF7L--7FJ||FJLJ||FJ||L7FJ|FJL7L7LF-7F--77.J.-7L-L|7|FF-|.
+|||F7-|.F7F-7L7|L7L-7.F7|||||L7L7||||FJ||||FJF-JFJL7|||LJLJL7L-7FJL7F-7L---7F7F7FJL7||F--JL7||L--7LJL-JL7|L-JL--JFJFJFJL7FJ-||F|-7|||7FF..J-
+JF7||||FJLJFJFJL7L-7|FJLJ||||FJ7|||LJ|FJLJ||FJF7L7FJ|||F----JF-J|JLLJJL7F--J|LJLJF7LJ|L---7|||F7FJF7F7F-J|F--7F--JFJFJF-JL7.F7F7-J|-F-FF|.|.
+LFLFLF7L--7|7L-7|F7||L--7LJLJ|F7||L7FJL--7LJL7|L7||FJ||L-7F-7L-7L7FF7F7||F7JL--7FJL--JF-7FJLJ||||FJLJLJF7||F7LJFF7L7|FJF-7L-J|||JF7FJFLL|7-L
+F-7-JF7LF-JL---JLJ|||F--JF--7LJLJL7||||F7L-7FJL7||||FJ|F7LJFJF7L7L7|||LJLJL7FF-J|FF--7L7LJF--J||||LF7.FJLJLJL7F7||FJLJFJJ|F--J||FJ|7FFLJJ|FJ
+.LJ|-|L7L-7F---7F7LJLJF-7|F7L---7FJ|L7FJL-7||F-J|||||FJ|L--JL||FJFJ|||F---7L7L-7L7L-7L7L-7L7F7|LJL7||FJF-----J|||||F--JF7LJF77||L7L-7-7J.7JJ
+J.---L7L-7||F--J|L----JFJ||L----JL7L7|L7F-J||L-7||||||FJF7FF7||L7|F||||F77L-JF7|FJF7|FJF7|FJ||L-7FJ||L7|F-----JLJ||L-7FJL7FJL7||-|F-J.FF7LJ|
+L7J.--L-7LJ|L--7|F-----JFJL------7|FJL7||F7|L7FJ||||||L7|L7||||FJ|FJ||LJL7F7FJ|||FJ||L7||||FJ|F7||FJ|FJ||F-------J|F-J|F-JL7FJ||FJL----JL7.|
+L--JJ||LL--J|F7LJL7F7F7FJF-------JLJF7|||||L7|L7LJLJ|L7|L7||LJ||L||FJL--7|||L7|||L7||FJ|||LJJ||||||FJL7||L------7FJL--JL7F-JL-JLJF-7F7F7FJ-|
+FLF.FF7.F----JL-7.LJLJ|L7L7F-------7||LJ|||FJL7L7F--JFJL-JLJF-JL7|||F7F7|||L7|LJ|FJ||L7||L--7||||LJL7FJLJF------J|F7F---J|F----7FJ.||||LJJ.|
+|LF-F77FL------7|F7F--JFJLLJF7F77F7LJL-7||LJ7FJFJ|F-7|7F--7FJF7FJLJLJ||LJLJL|L7FJL7||FJ||F--JLJ|||F7|L-7FJF------J|LJ|F--J|F--7|L-7||LJJJ7-|
+|7J-L||7F7F7-F7|LJLJF-7L7F--JLJL-J|F7F7|||FF7L7|FJ|FJL-JF7|L7||L-7F--JL----7|FJL7FJ||L-J|L-7F7FJ|FJLJF7|L7L7F-----JF-7|F-7LJF-J|F7|LJ7|77L.J
+J-F-7LLF||||FJLJF-7FJ.L-JL-------7||LJLJ||FJL-J||FJ|F7F7|LJFJ||F7||F--7F-7FJLJ7FJ|FLJF--JF7LJ|L7|L7F-JLJ-L-JL-----7|FJ|L7|F7L-7|||L7F-LJJL-.
+|.|F-7F-JLJLJF7FJJ|L-7F-7LF--7JF7||L---7LJ|F--7|LJFJ||||L-7L7|||LJLJF-J|F|L---7L7|F--JF-7||F-JFJL7LJF7F7|F7F7F7F--J|L-JFJ||L--JLJ|FJJ-FJ--||
+7-||LLL7F7F7FJ|L-7L--JL7|FJF7L-JLJ|F---JF-JL-7|L-7L7|||L7FJFJ|||F-7FJF7L7|F--7L7LJL7F7|FJ||L-7L7FJF-JLJL7|LJLJLJJF-JF-7L7|L-----7||JJ-|--.|J
+F7F-77LLJLJ|L7L--JF----J|L-JL----7|L-7F7L-7F7||F-J|LJ|L7|L7L7|LJL7LJFJ|FJ|L-7|FJF--J|||L7||F7L7LJ|L--7F7LJF77F7LFJF7L7|FJL----7FJLJ7J.L-J-|F
+LJFJLJ|FF--JFJF--7L----7L77F-----JL--J||F7LJ|||L----7L7||FJFJ|LF7L7FJJ|L7L7FJLJFJF-7||L7||LJ|FJ|F-7F7LJ|F-JL-JL-JFJL7|LJF----7||7LJJL77J|.JJ
+LFL7.L-FJF7FJJL-7||F7F7|FJFJF7F-7F-7F7|||L7.||L7F7F7|J|||L7|FJFJL-JL-7L7L7|L--7L7|-||L7|LJF7LJF7L7LJ|F7LJF-7F--7FJ7FJL--JF7F7|||7.FFFJ-.FF|.
+FL.-F7LL7|||F--7||FJ||LJL7L-JLJF||FJ|LJLJFJFJL7LJ|||L7|||FJLJ|L7F7F7FJFJFJ|F-7|FJL7||7|L7L|L7FJL7L-7LJL--JJLJF7LJF7L--7F7|LJ||LJ-.LL|7.-J.|7
+J7LLJF7L||||L-7|||L7|L--7L7F7F-7LJL-JF-7FJ7L-7L-7LJ|FJLJ||F----J|||||7L7|FJL7||L7FJ|L7L7L-JFJ|F7L--JF7F7F7JF7|L--JL--7|||L-7|L7JL7-|L-|-L7.J
+L77J.LF7LJLJF-JLJL-JL-7FJFJ||L7|7F---JFLJF7F7L--JF-JL7FFJ|L7F-7FJ|||L-7|||F-JLJFJ|JL-JFJF7FJFLJL7F7FJLJLJL-JLJF--7F7FJLJ|F-JL-J|LF.F|7.F.F-|
+|L-77|JF-F-7L---7F--7FJL7L-J|FJL-JF7F7F--JLJL-7F7L-7FJFJFJFJL7|L7|||F-JLJ|L---7L7|F---JFJ|L7F7FFJ|LJF-7F---7F7L-7LJ||FF7LJF-77|F7||.FJJJ.|.|
+|-7J-FF7JL7L----JL7FJL--JF-7LJF---JLJLJF------J|L-7|L7|FJ7L7FJ|FJLJ|L7F--JF7F-J-LJL7F-7||L7LJL7L-JF7L7|L--7|||F7L-7|L-JL--JFJ-FF7-|-LJJF-|-|
+|.LJ.FJ|F7L-------JL-7F-7L7L7FJF-------JF7F--7FJF7|L-JLJJF7|L7||F--JFJ|F7FJ|L--77F-J|FJL-7|F--JF--J|FJL7F-JLJ|||F-JL-7F----JJF7||7J.|.F-JF7|
+F-J77L7||L7F--7F----7LJFL7|FJL7L--------J||F-J|FJLJF7F7JFJLJFJLJ|F7FJFJ||L7L7F-JFJF7||F7FJ||F-7L--7|L7FJL7F-7|||L-7F7LJ-F7F7-|||L7LL--J.|LL7
+.--|7F|||FJL-7||F--7L----J|L-7|F------7F7LJL--JL---JLJL7L--7L--7||||LL7||FJ7|L-7L7|||LJ||LLJL7L7F-J|J||7FJ|FJLJL--J||F7FJLJL-JLJFJ7.L7|-LL|J
+.F-F--JLJL7F-JLS|F-JF--7F-JF-J|L-----7LJ|F----7F--7F7F-JF--JF--J||||F-J||L-7|F7|LLJ||F-JL--7.L7|L-7L-JL7L-JL-7F7F7J|||LJF-7F7F--JJLL7-L.|F77
+.-.L--7F-7LJF7F-JL-7|F-J|F7L7FJF-----JFFJ|F--7|L7FJ||L-7L--7L--7LJLJ|F7||F-JLJ||FF-J||F7F7FJF-JL-7L-7F7L-----J||||FJLJF-J.LJ||.|-||-L.L-J|J|
+F.FFLJ||FJF7|||F---J|L-7||L7LJJL------7L-J|F-JL-JL-J|F-JF7FJF-7L-7F7|||||L--7FJ|7L-7||||||L7|F7F7L--J|L---7F--JLJLJF7FJ7F7F7LJ7F--7|L--|.J-7
+L|FL7FJ||FJ|||||F-7FJF7LJL7|F7FF-----7L---JL-------7LJF7|LJFJFJF-J|LJ|LJL7F-JL-JF--J|||LJL-J||LJL----JLF--J|F------JLJ-FJLJL--7|F-J7J.FL-LL7
+FLL7-|FJ||JLJLJ||FJ|FJL---JLJL-JF--7FJF7F7F7F------JF7|LJF7L7L7L-7L-7L7LL||7|77.L---JLJF7F7|LJF-7F----7L-7FJL--7F7F--7FJF--7F7LJL--7--FJ.FF7
+FJLLFJL7|L7JLLFJ|L7|L--7F------7|F-JL-JLJ|||L-------J||F7||FJ.|F-JLFJFJ.L||7L-77F7F----JLJL7F7L7|L---7|F7LJF7F-J|LJF-JL7L7.LJL7F-7FJ7LJ-FL-J
+|J.FL--JL-J7|.|FJ-LJF7FJ|F---7LLJL------7|||F-7F-----JLJLJ||F-J|.L7L7|.L7LJL|JF-JLJF7F---7FJ||FJ|F---JLJL-7||L--JF-JFF-JFJF7F7LJ|LJ.F-|-|JJ|
+.7-|J7|LLL|F7FJ|JFF7||L-JL7F7L7F7F7F---7|LJ|L7LJF------7F7LJL--JFLLJLJ-F7LJ.7-|F7F7|||F--JL-JLJFJL7F-----7LJL----JFF7L7FJFJ|||F-77.LLJLFF7-J
+.|JL--JJFF7||L-JF-JLJL7F-7LJL7LJLJLJF-7LJF7L7L--JF--7F7LJL--7L|L7|7FJ|FJLL|7J.||LJ||LJL-----7F7L7FJ|F----JJF7|F7F7FJL-JL-JFJ|||FJJ7L|7FF|L-J
+FFF.FLJ-L||||F77L----7||FJF77L------JFJF-JL7|F---JF7LJ|F7F7FJ7JF-7-L7LJJ.|F7F-LJ|FLJJF7F7F7FLJL7|L-JL------JL-JLJLJF-----7|FJLJL7L|-J7FJJ7.|
+FF7F7JF-J|||||L7F7F-7|LJL-JL---------JFJF-7|||F7F-JL-7||LJLJ--7FJ.FLL-JJFF|LF-|-FLJF-JLJLJ|F--7||F7LF------7F7F7F-7|F7F7|LJ|F---J.F7FL-J.|-F
+L|LJJ|F|-||||L7|||L7||F---7F----------JFJ.LJLJ|LJF---JLJLJ|L|-|FFF7FL|LF--JF-F-F-.-L7F-7F7|L-7LJLJL7L-----7||||LJFJLJLJL-7FJL---7F-7J7|FFJL-
+L7J.LF-7J|LJ|FJLJL-J|LJF7||L7F---------JF7F7F7|F-JF7JF7J-LFJ|J||JJL77F7|J.FF-L7|7-|7LJ7|||L7-L7F7F7L------JLJLJF7|F7F----JL7F--7LJFJ.JFFJ7-|
+FL|-7.|J7L-7|L-----7|FFJL-JFJL-7F-------JLJLJLJL-7|L-JL-7-J7F7F7.7-7-LJ7L-J|LL|JL7-F---J|L7L--J|||L7F----------J||||L----7FJL7-L--JJF.L-LJ-|
+FF|JF7L-L7FJL---7F-JL7L-7F7|F--J|F---7F7F--7F---7LJF7F7FJFF-JLJ|JJ.L.|LL7.F|LLF-7|7L----J7L7F7FJLJ7LJF7F--------JLJ|F----J|F-J7F7F-7|LJ|-LJ|
+F-JFJ-7FLLL7F--7LJF-7L7FJ|LJL---J|F-7|||L-7|L-7JL--JLJLJF7L7F-7|J7FL-|F|FF7J7.LLLF7F---7F--J|LJF7F7F-JLJF-------7F7LJFF---JL---JLJFJ-LF-7L7J
+.LF.|.L7|FFLJF-JF7|FJFJL7|F---7F7LJFJLJL--J|F7L-----7F-7||FJL7LJF-7FLJ-JJ|L|F7J.F|LJF7FJL---JF7|LJ|L----JF7F----J||F-7|F-7F7F7F7F-JF7.J.|-77
+J7LJ|..|FL|.FJF7|LJL7|7FJ|L--7LJL7LL-7F7F7FLJ|F7F7F-J|FJ|LJF7|JJ7F||J|7|-FJFJL-LFL7FJ||F77F7FJ|L-7L------JLJF7JF7||L7LJL7LJLJ|||L-7F|7|7|.|7
+F77LJ.LJ-JF-JFJLJ.F7|L7L-J7F7L-7FJF-7LJLJL--7||||||F7|L-JF-JLJJ|L-7J7L7F.|F77|.LF|LJFJLJL-J|L7L-7L-------7F-J|FJLJL7|F-7L7F7.LJ|F7|F7F7-F-|7
+||F.|7FLJ.L7FJF---JLJFJF7FFJL7FJL7L7|F------JLJLJ|||LJF-7L-7J|.|-LLJF7|.FF.L-|--FF--JF7F--7|.L-7L----7JF7LJF-J|F---J|L7L7LJL--7|||LJLJ|J..JJ
+F|7J|F-7LFFJ|.L-----7L7||FJF7LJF7L-JLJF7F7F7F7F7-LJ|F-JJ|F7L--7J..|7.FJFF--|JJFFJL---JLJF-J|F7JL----7L-JL-7L--JL----JFJ|L-----JLJ|F-7FJ.F--7
+L||F7|L7JFL7|-F-----JFJ||L7||F7|L-----JLJLJLJ||L-7L|L-7FJ||F7FJ-J7FFF7.F7.FJ|.FLF7F-----JF7LJ|F7F7F-JF7F-7L----7F-7F-JF7F7F----7-LJL||.F|.F|
+LFJ7F7L|-L|LJ-|F----7L-JL7LJLJLJF------------J|F-JFJF-JL7|LJLJL|7F7F|L7|L7||LFF-J||F-----J|F7LJ||LJF7|||FJF---7|L7LJF7|LJLJF7F7L7FF7LJF-77FF
+-LJF-7-7FLF7F7LJF7F7L--7FJF-----JF------7F----JL--JFJF-7LJF---7-L|L7L7||FJ-L-FJF-JLJF7F---J||F7LJF-J||LJL-JF--JL-JF-JLJF7F-JLJL-JFJL7FJFJ-L7
+..FLFJF7F7||||F-JLJL77FJL-JF7F-7FJFF---7LJF7F7F7F--J-|FJF7|F--JJFL7L-J||L7J|FL7L7F7FJ|L----JLJL7FJF-J|.F7F7L---7F7L7F7FJLJF-7F--7L-7LJFJ|L|F
+F--7|F|LJLJLJ|L----7L-JF-7FJLJFJ|F7L-7-|F7|||LJ|L-7F7||FJ|||F--77-|F7FJ|FJF7F7L7||||FJJF7F7F7F-J|.L7FJFJLJL----J||.||LJ7F7|FJ|F-JF7|F-JF-7-J
+|J|.F7L-----7|F----JF-7|.LJF77L-J|L-7L7LJLJ|L-7|F-J|LJLJFJ|||F-JJFJ||L-JL7||||FJLJLJ|F7|||LJLJF-JF7LJ-L------7F-JL-JL7F7|LJL7||F7|||L--JFJF|
+FF-FJ7JFF---J|L----7L7LJF--JL----JF7L-JF7F7L--JLJF7|F7F7L-JLJL7F7L-JL---7LJLJ|L---7FJ|LJ|L-7F7|-FJL---7F---7FJ|F-7F7FJ|LJF-7LJLJ||||F--7|J-7
+|J-J||F-JF--7L-----JFJF-JF7F7F7F--JL---JLJL--7F7-||||LJL-7F7F7LJL7FF77F7|F-7FJF7F-JL7L-7|F7LJ|L7|F-7F7LJF7L|L-JL7||LJJ|F-JJL-7F7LJLJL7FLJJJF
+7|J|LLL-7|JFJF7F--7FJFJF-J||LJ||F-7F-----7F--J|L7|LJL---7||||L7F-JFJL7|||L7LJFJ|L-7FJF-JLJL--JFJ|L7LJL--JL7|F-7FJ|L---JL---7FJ||F-7F7L-7|.FJ
+.7L|7|7LLJLL-JLJF-J|||FJF-JL7.LJL7LJF---7|L-7FL7LJF7F-7FJLJ|L7LJF7L-7||LJFJF7L7L7FJ|FL-7F-7F--JJL-JF------J|L7LJ||F--7F---7|L-J|L7|||F-J-J7J
+F.F77LFF|F---7F7|F7L7||FJF7FJF--7L--JF--JL--JF-JF-JLJLLJ|F7L7|F7|L7FJLJF-JFJ||L7||FJF7|||FLJ7F7|F7JL-7F--7JL-JF-7|L-7LJ.F7LJF--JFJ||||F-7|JJ
+.FL|JF-F7L--7LJLJ||FJLJL-JLJFL-7L-7F-JF7F7F7FJF7L----7F--JL7LJ||L7|L-7FJF7L7|F-JLJ|FJL7LJF7F-JL-JL-7|LJF-JF7F-JFJ|F7|F7FJL-7L--7L7|||LJFJ-JJ
+F.L|L||||7F7L7F7FJLJF7F-7F--7F7L-7LJ|FJLJLJLJFJL7F7F7|L-7F7L7FJ|FJ|F7||F||FJ|L--7FJ|F-JF7||L7F----7|F7FJF7|LJF-JL|||LJLJF--JF77L7|LJ|F-JJL.F
+L|.|LLFJL-JL-J|LJF-7||L7|L-7||L--JF-7|F------JF7LJLJLJF7LJL7LJFJL7||LJL7||L7|7F-JL7|L-7||||||L7F--JLJ|L-JLJF7L--7|||F7F7L---JL-7LJF7LJJ||F-J
+||-J|LL----7F7|F7L7LJL-JL-7||L----JFJ||F------JL----7FJ|F7FJF-JF7|LJF--J||FJL7L7F-J|F-J|||L7L-JL7F7F7L--7F7|L7F7|||||LJL7F-----JF-JL-77F77|F
+LLJL7JLF---J||||L-JF--7F7FJ||F7F---JFJLJF-----------J|FJ||L7|F7|LJF-JF--J||F7L7|L--J|F-J||FJF7F-J|LJ|F-7LJLJ7LJLJLJ|L--7|L-7F7F7|F--7L7FLJ7J
+L|F7.LFL7F-7||||F--J7FJ||L-JLJLJF7F-JF7FJF7F7F-7F7F7FJ|FJL-J|||L-7L-7L-7FJLJL7|L7F7FJL-7|||FJ|L-7|F-J|JL----7F-7F-7L7F-J|F7LJLJLJL-7L7|7|.|L
+FFL-|-FFJL7LJ||||F--7L7|L7F7F---JLJF-J|L-JLJLJFJ|||||FJL---7LJ|F-JF7|F-JL7LF7|L7||LJ-F7|||||FJF7LJL-7|F-----JL7|L7|FJL7-LJL-7F-7F7FJF|L7J.J.
+F|7F-7LL--JF7LJLJ|F7L7||.LJLJ7F7-F7L-7|F-7F7F7L7|||||L7F--7|F-JL-7|LJL7F7L-JLJFJ|L7F7||||||||L||LF7|LJL---7F--JL-J|L--JF---7|L7LJLJFLL-J-7F7
+JJJ.|-7||F7||F7F7LJL7|LJF--7F-JL-JL--JLJ-LJ|||FJ|LJ||FJL-7LJL-7F-J|F7FLJL----7L7|FJ||||||||||FJ|FJ|F7F----J|F-----J.F-7|F--JL-JF-7-F-|J|.LLF
+LL|F|L7-FJ||LJLJL7F-JL-7L-7|L--7F---------7LJ||FJF-J|L--7L--7FJL-7|||F7F7F7F7|FJ||FJ||LJ|||||L7LJFJ||L-----JL------7L7LJL7F7F--JFJ7|7J.|FFLJ
+|L-F-7F7L7|L----7|L--7FJF7|L--7||F--------JF7LJ|FJF7|F--JF--J||F7|||||||||LJ|||FJ||FJL-7|||||JL7FJFJL7F77F--------7L-JF-7LJLJF7FJ7L|7FF|-7J.
+7-LFJL||FJL7LF-7|L---J|FJ||F-7LJ||F--7F---7|L7FJ|FJ|||F-7L--7|FJ|||||||||L-7||LJFJ|L---J||LJ|F7|L7L-7LJL-JF------7L--7L7|F7F7||L-7--7-|LJLLL
+J7.F7.||L-7L7L7|L---7FJL7|LJJL-7|||F7LJF--J|FJ|FJL7|||L7|F7J||L7LJ|||||||F7||L7FJ-L7F---JL7FJ|||FJF7L7F7F7|F--7F7L--7|FJLJLJLJ|F7L7|F-L7JFFJ
+||-||FJL7.L7L7||F7F-JL7FJL-----J|LJ|L--JFF7||FJL-7|||L7||||FJ|FJF-J|||||LJ|||FJL--7|L---7FJL7|||L-JL7LJLJLJL-7LJL7F-J|L-7F7F-7||L7|7|..|.FJF
+|L-.FL-7|F7L7LJLJLJF-7LJF7F7F-7FJF-JF---7||||L7F7||||FJ|LJ|L7|L7|F7||||L7FJ|||F---JL7F--JL-7||LJF---JF--7F7F-JF7L|L7.L-7LJLJFJLJ-LJ77J---7.7
+JJ..F--J|||JL7F-7F7|FJF7|||||.LJ.L-7L7F-J|||||||LJ|||L7L-7L7|L7||||||||FJL7|LJL--7F-J|F7F7FJLJF-JF--7L-7LJ|L--JL7L7L-7-L7F7FJ7.L-|JJFJ||-L-F
+|||7L7F7LJL--JL7|||||FJ||||||F----7|L||F-J||L7|L7|||L7L7FJFJ|FJ|||||||||F7||F----JL-7|||||L--7|F7L7FJF7L-7L---7FJ.|F7|F7LJLJF7F7L|-F|--J-7|.
+FLF-LLJ|F7F7F7FJ||LJLJFJ|||LJ|F--7LJFJ||F-J|FJL7|FJL7|FJL7|FJ|FJ||||LJ|LJ|||L7F--7F-JLJ|||F7FJLJL7|L7|L-7L-7F7LJF7LJLJ|L----J|7|.|F||LJ7-7LJ
+F-J-JFFJ|||LJLJ|LJF--7|FJLJF-J|F-JF7L7|||F7||F7||L7FJ||F7|||FJL7||||F-JF7|||FJ|F-JL--7FJ||||L7F--J|FJL7FJF7LJL7FJL7-F-JF-----JJF7|7LLJL-77|J
+LF|LJLL-J|L7|F--7-L-7|LJF7|L--J|F7|L7|||||||||LJL7||FJ||||LJ|F-J||||L7FJ||||L7|L7F7F-JL7||||FJ|F7FJ|F7||FJL7F7LJF7L7|F7L-----7F|J-7FJJ|L|-7|
+FLLJFL|J|L-J-L-7L---JL--JL-----J|||F||||||LJ|L-7FJ|||FJ|LJF-JL-7|||||||FJ||L7||FJ||L-7|||||||FJ||L7||||LJF-J||F7|L7LJ||F7F7F-J-7J.77.FL.F7L7
+7-J-J.7.-F7|JF7L---7F7F7F-7F----J|L7||LJLJF-JF7|L7|LJL7L-7L7F--J|||L7||L7||FJLJ|FJL7FJFJ|||||L-J|FJ|||L-7L7FJ||||.L7FJLJLJLJL|7.F7.F-|...FJL
+J|LJ7F7--|L--JL----J|LJLJFJ|F----JFJ||F---JF7||L7||F--JF7|FJL-7FJ||FJ||7||||F7FJL7FJL7L7|||||F--JL7|||F7|FJL7||LJF-JL7F7F--7.F7.F7F|LJFFLFJJ
+FFJ|LJJJJL7F7F--7F7FJF---JFJ|F7F7FJFJ||F7F7|||L7|LJ|F-7||||F7FJL7||L7LJFJ|LJ|LJF7||F7L7|||||||F-7FJ||LJLJ|F7||L-7|F-7LJLJF-JFJ|FJ|7FFJFL7||J
+|JL-7L|..LLJLJF7||LJFL-7F-JFJ||||L7L7|LJ||LJ||FJL-7||FJ||||||L-7||L7|-FJFJF-JF7||||||FJ||LJ||||-|L7||F--7|||||F7||||L-7F-JF7L7||FJ7.LJ|F7-J.
+7.FLF-|--J|LJFJLJ|F-7F7LJF-JFJ||L7|FJL-7LJ|FJ|L7F7|LJL-J||||L7FJ||FJL7|FJLL-7||||||||L7|L7.LJLJFJFJ|LJF-JLJ||||||||F--JL--JL-JLJL-77F-77|F|7
+LJ|LF--7J.|JFL7F7|L7||L-7L-7L7||.||L7F-J7F7L7L7|||L-7FF-J|||FJ|FJ|L7FJ||F7F-J|||||||L7|L7L7F---JFJFL7FJF--7||LJ||||L7F7F---7F-7F--J77FL7J7J.
+|F-7|J.L|-L.77||||FJLJF7L--JFJLJFJ|FLJF7FJL7|FJ|||F7L7L7FJLJL7|L7L7||FJLJ|L7FJ||||LJFJL7|FJL7F-7L-7FJL-JF7||L-7|||L7|||L--7|L7|L7J|.J7.FJ7F|
+7-F7J|FFFJ.FF-J||||F7FJL7F-7L--7L-JF--J|L-7LJL7||||L7L7||F7F7LJFJFJ|||F7FJJLJFJ|LJ|FJF7||L7FJ|JL7FJL--7FJLJL--JLJ|FJ||L7F-JL-J|FJ7L7FJ7..LJL
+L-7..FFL|F7-L7FJ||||||F-J|FJF-7L7F7L--7|F7L7F-J|||L7L7||LJLJL7FL7L7||||||F7F7L7|7F7|FJLJL7||FJF-JL--7F|L-7FF7F-7FLJ-||FJL7F7F7LJ7F7LJ.-F|F||
+F|L|7F77LL.|FJL7LJLJ|||F7|L7L7|FJ|L---JLJL-JL-7LJ|FJFJ||F7F-7|F-JFJ|||||||LJL-JL-J||L-7F-J|LJ.|F7F-7L7|F7L7|LJFJF--7||L-7LJLJL---J|-7J.-FFJJ
+FLFJ-F|JJ7|-L--JJLF7||LJLJJL7|||FJF7F7F7F-7F7FJFFJL7L7||||L7||L-7L7LJ||||L7F7F7F7FJ|F-J|F7L-7FJ||L7L7|||L7LJF7L-JF7|LJF7|F7F-7F-7FJ7|F-|LL7J
+||.L-FJ.FLJLL7|F77||||F7F7F-J|LJL7|||||||||||L-7L7FJ7LJ|||FJLJF-JFJF7LJLJFJ|LJ||||-LJF7|||F-JL7|L7|L|||L7L-7|L---J||F-JLJ||L7|L7|L7-77.JFLL.
+|7-.F|-F|-L|JF-JL-JLJ||LJLJF7L-7FJ|||LJ|L7LJL-7L7|L7F--J|||F--JF7L-JL--7L|FJF-J||L---J|LJ|L7|FJ|FJ|FJ||FJLFJL----7LJL-7F-JL-JL7|L-JJFL-|7LL.
+|J|--7-|J7.J7L-7F---7|L7F7FJL-7|L7||L7FL7L7F--JFJL-JL7F7|LJ|F7FJ|F-7F-7|FJ|FJF7||F-7F7L-7L7L7L7|L7|L7||L-7L--7F-7L7F7FJL--7.LLLJ7LL-JJF|77-7
+77L-J77F--77|.L||F--J|7||||F--J|FJ|L7|F-JFJL7F7L----7|||L-7LJ||FJL7LJ-LJL7|L-JLJ||FJ|L7FJFJFJFJ||LJ.LJL7FJF-7||FL7LJ||F7F-J7JL|L-|L7LL|JJFF7
+L-LFJ|L|--F7L-JLJ|F-7L7LJLJL-7FJL7L7|||F7L-7||L7F7F7|LJ|F-JJFLJL-7L---7LFJL7F---J|L7L7|||L7L7L7|F-7F7F-JL7|FJLJF-JF7|LJ|L7JJ.FJ-|L.|.LLJFLJJ
+L|LJ.-.|--LJ7FF|LLJ-L7|LF--7FJ|F-JFJ|||||F7|||FJ||||L-7|L7|FF----JF---JFJF-JL7F7FJFJFJ|L-7|FJFLJ|FJ||L7F7LJL--7L-7||L7.L-J-F-LJJL-J-7.|7FJ|.
+-77-L7FL.FJJJL7J-JJ||||FJF7LJFJL7FJFJ|||||||LJL7||||F7|L7L7FJF---7L--7|L-JJF-J||L7|FJFJF7|||J|.FJL-JL-J|L7F7F7L7FJ||FJ-|||-JJ|77F-|FL7.7|L-F
+|.L-JJ--FJJ7.JJFFJ-77LJL7|L7FJFFJL7L-JLJLJ|L--7||||LJ||FJFJL7|F7FJF7FJF7F--JF7||FJ|L7|FJ||LJFF7L7F-7F7FJFJ|||L7|L7|LJL|JL|7L7-L|J.LLL-.JF|F7
+L7.L.L|J|7JF7--7--7L-LFFJ|FJ|F-JF7L----7||L7F-JLJ||F7||L7|J-LJ|LJFJ|L-J|L---J||LJFJFJ||JLJJF-JL-J|F||LJ-L7|LJ|||F|L----7.|F7|.FJJ-7|FL-J-L7|
+|7--F-77JLF7.F7|J.FL-LFL-JL-J|F7||F-7F7L-7LLJ.F--JLJ|LJ.LJLF|7L-7L7|F-7L----7LJ7FJFJFJL7J|FL7F--7|FJL--7FJL-7FJL7|F----J-77|J-FJJ.J7J7-FFL|7
+.J.F7..FJ|LF7J77.J.F|.LL|L|7LLJLJLJL|||F7|.LJF|F7F-7L---7-FFF--7|FJ|L7L7F-7FJLF-JFJJL7FJ-|-7LJF-J|L-7F-JL7F7|L7FJLJ.|.||FL-LJ.-.|7-7-7.L7J.7
+L7.77.F77|F|||F.|.|7.FFFJ.LJ7-|JLL|LLJ||LJ.L-J||||7L7F--J-F7L-7LJL7|FJF|L7LJ|||F7L7|||L7.|LFF-JF7|F-JL--7||||L||.LJJ-77F|JLJ|F7FFJ.|FJ.||FFL
+F77|77J|JL-L7FJ-7-F77FFJ.FF.7-L7FF|7-LLJJFFF|JLJLJF-J|JL|7|L--JF7FJLJ7FJFJJLLFJ||FJ7FL7L7J|FL7FJLJ|F-7F7|||LJ-LJ77.L||7JJFF7F|--7-7F7|-FJ7L|
+LJ|JF-JLL7|JLJFLLFJ-7-|J.F|7|LLF7L|L77|7LLJJ|FF|.FL-7L--7-|F7F7||L-7JLL7L7J7LL-JLJ.F--JFJFJ|||L-7FJ|L||LJLJJ.|J..LL-7.L7|LL|-J-||LF7LJLF-7.|
+F-.-JL-JL-JFF|7-|.-7JJ|JFFJF-7F|JFJ-L|7J7L|.|FLJ-FL-|F--J|LJ||||L7FJJLLL7||LFJ..LJFL---JJ7.FFL7FJ|FJFJ|7|LLJ|J.|J-|L7.|FJ7.-JJFL7.FJ|LF-7.F7
+FJ7|L-F--J.-FF.F7-7...J7J|F|LJ-7.LL7|.|-|.|-|L|J|J.FLJL|7|7LLJ||FJL7JF-LLJ7FJ.L.FFJLLJLLL.F-77LJJLJ-L7L-7J|-L77|||F-L-J7..J||F7L|F|-|7JFL--7
+F7|7J7F|-FJF|J-LJJL-7.LJ-JFF.J|.|7L||F|..-.LL-77F7LJFL-L--7||FLJ|F7|F||LLL|-LF--L7F-J|LLLFF7|LL7JJ-FL|F7|7|F7--J-FJJFFL77FFFJL--J7JJL|-7J7L7
+|LJL7LLJ-LJ-|.F7L-LL-F.L|7JL7FF-L77F|7.F|L7.L-J-L77-JJFL7|FL|-|J||LJ7F7..L|FFL7JL--|LFF-|.L-JJ-JJ|JJLLJ||-F7.|LJFL.FJJLLF7-J|.LLLL7F77-JJL-J
+L7FL|J||7|FF7FF|L-.J-JJ|J|L-F-7.|.|L|-7-|-J7.|FL|-J.|F|7FL|J||L-LJ.|-JJFJ-JJ-JLF.|.F-F.LJ7|.LF7J.|..FFFLJJLJ77L7||7L7|.|L||7|L77FLLJLJLF-J.|
+|7|FJ7F-J77.F7JJ.LFJ..L-F--F|L.FFL.7J.LLLJFJ-7J.L7JFJ7|FL7-.F|F7JJ7L|7F7-77.F-FF--7|FJ7|LF|7-F|7-|7.F7-LJ|.L--7JL|JJF7F7.|L-J.F-|J.L-J|L7|F|
+FJ-7.J|-FF7FLJ|LL-|7-F7.FJF-J.F|.LFJF77-JF-|L|.L.JF-.LLJ7J.-J.J.|-F7L-JFJL-|J|LL-FJL-7F7|.L-7LJ|.LJL-|J|L|7-|F|7J|.LJL-F7JL--F|-FF7JJF7|L-7.
+L.L--.J.L7-7JJL.|-JL-LL-7L|J-L.FJ-JLLLJ.L7J|JJF-7JJ.LJ.L--FJLLJ.J-J-JJ.L--|L-L.L-F.JLFLF-J-|-.L|---LL7JJ.L...|LL.-LF-FLFJJ7---JJJ|JL-J.L-L--
diff --git a/src/adventofcode2023/data/day_10/day10_test_4.txt b/src/adventofcode2023/data/day_10/day10_test_4.txt
new file mode 100644
index 00000000..689fff6a
--- /dev/null
+++ b/src/adventofcode2023/data/day_10/day10_test_4.txt
@@ -0,0 +1,5 @@
+-L|F7
+7S-7|
+L|7||
+-L-J|
+L|-JF
diff --git a/src/adventofcode2023/data/day_10/day10_test_8.txt b/src/adventofcode2023/data/day_10/day10_test_8.txt
new file mode 100644
index 00000000..682499d9
--- /dev/null
+++ b/src/adventofcode2023/data/day_10/day10_test_8.txt
@@ -0,0 +1,5 @@
+..F7.
+.FJ|.
+SJ.L7
+|F--J
+LJ...
diff --git a/src/adventofcode2023/day10.py b/src/adventofcode2023/day10.py
new file mode 100644
index 00000000..5d9a0251
--- /dev/null
+++ b/src/adventofcode2023/day10.py
@@ -0,0 +1,83 @@
+from __future__ import annotations
+from enum import Enum
+
+from adventofcode.utils.abstract import FileReaderSolution
+from adventofcodeutils.point import XYPoint as Point
+
+class Tile(Enum):
+    NS = "|"  # is a vertical pipe connecting north and south.
+    EW = "-"  # is a horizontal pipe connecting east and west.
+    NE = "L"  # is a 90-degree bend connecting north and east.
+    NW = "J"  # is a 90-degree bend connecting north and west.
+    SW = "7"  # is a 90-degree bend connecting south and west.
+    SE = "F"  # is a 90-degree bend connecting south and east.
+    GG = "."  # is ground; there is no pipe in this tile.
+    SS = "S"  # is the starting position of the animal.
+
+    @property
+    def has_north(self) -> bool:
+        return "N" in self.name
+
+    @property
+    def has_east(self) -> bool:
+        return "E" in self.name
+
+    @property
+    def has_south(self) -> bool:
+        return "S" in self.name
+
+    @property
+    def has_west(self) -> bool:
+        return "W" in self.name
+
+
+class Node:
+    tile: Tile
+    north: Node | None
+    south: Node | None
+    east: Node | None
+    west: Node | None
+
+    def __init__(self, tile: Tile):
+        self.tile = tile
+        self.north = None
+        self.south = None
+        self.east = None
+        self.west = None
+
+    def __str__(self) -> str:
+        return (
+            f"<Node {self.tile} (^ {self.north}, > {self.east}, "
+            f"V {self.south}, < {self.west})>"
+        )
+
+
+class Day10:
+    grid: dict[tuple[int, int], str]
+
+    def parse(self, input_data: str):
+        self.grid = {}
+        for row_idx, row in enumerate(input_data.splitlines()):
+            for col_idx, char in enumerate(row):
+                self.grid[(row_idx, col_idx)] = char
+                if char == "S":
+                    start_point = (col_idx, row_idx)
+
+        # We know our startpoint, which nodes connect?
+
+
+
+        print(start_point)
+
+        pass
+
+
+class Day10PartA(Day10, FileReaderSolution):
+    def solve(self, input_data: str) -> int:
+        self.parse(input_data)
+        return -1
+
+
+class Day10PartB(Day10, FileReaderSolution):
+    def solve(self, input_data: str) -> int:
+        raise NotImplementedError
diff --git a/tests/adventofcode2023/test_day10_a.py b/tests/adventofcode2023/test_day10_a.py
new file mode 100644
index 00000000..9bd9b478
--- /dev/null
+++ b/tests/adventofcode2023/test_day10_a.py
@@ -0,0 +1,38 @@
+import pytest
+
+from adventofcode2023.day10 import Day10PartA, Tile
+
+
+class TestDay10PartA:
+    @pytest.mark.parametrize(
+        ("tile", "north", "east", "south", "west"),
+        [
+            (Tile.GG, False, False, False, False),
+            (Tile.NS, True, False, True, False),
+            (Tile.EW, False, True, False, True),
+            (Tile.SW, False, False, True, True),
+        ],
+    )
+    def test_tiles(self, tile, north, east, south, west):
+        assert tile.has_north == north
+        assert tile.has_east == east
+        assert tile.has_south == south
+        assert tile.has_west == west
+
+    @pytest.mark.parametrize(
+        ("postfix", "expected_result"),
+        [
+            ("test_4", 4),
+            # ("test_8", 8),
+        ],
+    )
+    def test_day10a_testdata(self, testdata_by_postfix, expected_result):
+        solution = Day10PartA()
+        result = solution.solve(testdata_by_postfix)
+        assert result == 0
+
+    def test_day10a_data(self):
+        """Result we got when we did the real solution"""
+        solution = Day10PartA()
+        res = solution("day_10/day10.txt")
+        assert res == 0
diff --git a/tests/adventofcode2023/test_day10_b.py b/tests/adventofcode2023/test_day10_b.py
new file mode 100644
index 00000000..2531baac
--- /dev/null
+++ b/tests/adventofcode2023/test_day10_b.py
@@ -0,0 +1,25 @@
+import pytest
+
+from adventofcode2023.day10 import Day10PartB
+
+
+class TestDay10PartB:
+    @pytest.mark.xfail(reason="Not yet implemented", raises=NotImplementedError)
+    def test_day10b_testdata(self, testdata):
+        solution = Day10PartB()
+        result = solution.solve(testdata)
+        assert result == 0
+
+    @pytest.mark.xfail(reason="Not yet implemented", raises=NotImplementedError)
+    @pytest.mark.parametrize(("input_data", "expected_result"), [("", ""), ("", "")])
+    def test_day10b_solve(self, input_data, expected_result):
+        solution = Day10PartB()
+        result = solution.solve(input_data)
+        assert result == expected_result
+
+    @pytest.mark.xfail(reason="Not yet implemented", raises=NotImplementedError)
+    def test_day10b_data(self):
+        """Result we got when we did the real solution"""
+        solution = Day10PartB()
+        res = solution("day_10/day10.txt")
+        assert res == 0

From cc394ec18c2a4ddfe7ebd3c2feb0dbf185b87475 Mon Sep 17 00:00:00 2001
From: Roel Adriaans <roel.adriaans@asml.com>
Date: Mon, 11 Dec 2023 16:58:02 +0100
Subject: [PATCH 360/371] Day 10, part 1

---
 src/adventofcode2023/day10.py          | 76 +++++++++++++++++++++++---
 tests/adventofcode2023/test_day10_a.py |  6 +-
 2 files changed, 70 insertions(+), 12 deletions(-)

diff --git a/src/adventofcode2023/day10.py b/src/adventofcode2023/day10.py
index 5d9a0251..41cd4ff2 100644
--- a/src/adventofcode2023/day10.py
+++ b/src/adventofcode2023/day10.py
@@ -1,8 +1,9 @@
 from __future__ import annotations
+
 from enum import Enum
 
 from adventofcode.utils.abstract import FileReaderSolution
-from adventofcodeutils.point import XYPoint as Point
+
 
 class Tile(Enum):
     NS = "|"  # is a vertical pipe connecting north and south.
@@ -30,6 +31,20 @@ def has_south(self) -> bool:
     def has_west(self) -> bool:
         return "W" in self.name
 
+    @property
+    def connections(self) -> list[tuple[int, int]]:
+        """Return the connections from this Tile as direction tuples as (row, col)"""
+        options = []
+        if self.has_north:
+            options.append((-1, 0))
+        if self.has_east:
+            options.append((0, 1))
+        if self.has_south:
+            options.append((1, 0))
+        if self.has_west:
+            options.append((0, -1))
+        return options
+
 
 class Node:
     tile: Tile
@@ -54,6 +69,7 @@ def __str__(self) -> str:
 
 class Day10:
     grid: dict[tuple[int, int], str]
+    start_point = tuple[int, int]
 
     def parse(self, input_data: str):
         self.grid = {}
@@ -61,21 +77,63 @@ def parse(self, input_data: str):
             for col_idx, char in enumerate(row):
                 self.grid[(row_idx, col_idx)] = char
                 if char == "S":
-                    start_point = (col_idx, row_idx)
+                    self.start_point = (row_idx, col_idx)
 
+    def find_path(self) -> list[tuple[int, int]]:
         # We know our startpoint, which nodes connect?
-
-
-
-        print(start_point)
-
-        pass
+        # This is the opposite to the connections on a Tile
+        connections = []
+        for direction in [(1, 0, "N"), (0, 1, "W"), (-1, 0, "S"), (0, -1, "E")]:
+            nb_rc = (
+                self.start_point[0] + direction[0],
+                self.start_point[1] + direction[1],
+            )
+            try:
+                neighbour = self.grid[nb_rc]
+                if direction[2] in Tile(neighbour).name:
+                    connections.append(nb_rc)
+            except KeyError:
+                pass
+        if len(connections) != 2:
+            raise ValueError(
+                f"Starting point does not have 2 connections, but : {connections}"
+            )
+
+        # Let's follow the path
+
+        cur_point = connections[0]
+        path = [cur_point]
+        visited = {cur_point}
+
+        while cur_point != self.start_point:
+            tile = Tile(self.grid[cur_point])
+            connections = [
+                (cur_point[0] + delta[0], cur_point[1] + delta[1])
+                for delta in tile.connections
+            ]
+            next_step = [
+                connection
+                for connection in connections
+                if connection not in visited and connection != self.start_point
+            ]
+            try:
+                next_step = next_step[0]
+            except IndexError:
+                return path
+
+            path.append(next_step)
+            visited.add(next_step)
+            cur_point = next_step
+
+        return path
 
 
 class Day10PartA(Day10, FileReaderSolution):
     def solve(self, input_data: str) -> int:
         self.parse(input_data)
-        return -1
+        path = self.find_path()
+        steps = (len(path) + 1) // 2
+        return steps
 
 
 class Day10PartB(Day10, FileReaderSolution):
diff --git a/tests/adventofcode2023/test_day10_a.py b/tests/adventofcode2023/test_day10_a.py
index 9bd9b478..42f16194 100644
--- a/tests/adventofcode2023/test_day10_a.py
+++ b/tests/adventofcode2023/test_day10_a.py
@@ -23,16 +23,16 @@ def test_tiles(self, tile, north, east, south, west):
         ("postfix", "expected_result"),
         [
             ("test_4", 4),
-            # ("test_8", 8),
+            ("test_8", 8),
         ],
     )
     def test_day10a_testdata(self, testdata_by_postfix, expected_result):
         solution = Day10PartA()
         result = solution.solve(testdata_by_postfix)
-        assert result == 0
+        assert result == expected_result
 
     def test_day10a_data(self):
         """Result we got when we did the real solution"""
         solution = Day10PartA()
         res = solution("day_10/day10.txt")
-        assert res == 0
+        assert res == 6806

From 0d839985829551ebe4fe643c43b59c7b63b32283 Mon Sep 17 00:00:00 2001
From: Roel Adriaans <roel.adriaans@asml.com>
Date: Mon, 11 Dec 2023 18:19:48 +0100
Subject: [PATCH 361/371] Add day 10 part 2 testdata

---
 src/adventofcode2023/data/day_10/day10_loop_10.txt | 10 ++++++++++
 src/adventofcode2023/data/day_10/day10_loop_4.txt  |  9 +++++++++
 src/adventofcode2023/data/day_10/day10_loop_8.txt  | 10 ++++++++++
 tests/adventofcode2023/test_day10_b.py             | 14 ++++++++++----
 4 files changed, 39 insertions(+), 4 deletions(-)
 create mode 100644 src/adventofcode2023/data/day_10/day10_loop_10.txt
 create mode 100644 src/adventofcode2023/data/day_10/day10_loop_4.txt
 create mode 100644 src/adventofcode2023/data/day_10/day10_loop_8.txt

diff --git a/src/adventofcode2023/data/day_10/day10_loop_10.txt b/src/adventofcode2023/data/day_10/day10_loop_10.txt
new file mode 100644
index 00000000..8f950ae8
--- /dev/null
+++ b/src/adventofcode2023/data/day_10/day10_loop_10.txt
@@ -0,0 +1,10 @@
+FF7FSF7F7F7F7F7F---7
+L|LJ||||||||||||F--J
+FL-7LJLJ||||||LJL-77
+F--JF--7||LJLJ7F7FJ-
+L---JF-JLJ.||-FJLJJ7
+|F|F-JF---7F7-L7L|7|
+|FFJF7L7F-JF7|JL---7
+7-L-JL7||F7|L7F-7F7|
+L.L7LFJ|||||FJL7||LJ
+L7JLJL-JLJLJL--JLJ.L
diff --git a/src/adventofcode2023/data/day_10/day10_loop_4.txt b/src/adventofcode2023/data/day_10/day10_loop_4.txt
new file mode 100644
index 00000000..bd9cdf53
--- /dev/null
+++ b/src/adventofcode2023/data/day_10/day10_loop_4.txt
@@ -0,0 +1,9 @@
+...........
+.S-------7.
+.|F-----7|.
+.||.....||.
+.||.....||.
+.|L-7.F-J|.
+.|..|.|..|.
+.L--J.L--J.
+...........
diff --git a/src/adventofcode2023/data/day_10/day10_loop_8.txt b/src/adventofcode2023/data/day_10/day10_loop_8.txt
new file mode 100644
index 00000000..adaae963
--- /dev/null
+++ b/src/adventofcode2023/data/day_10/day10_loop_8.txt
@@ -0,0 +1,10 @@
+.F----7F7F7F7F-7....
+.|F--7||||||||FJ....
+.||.FJ||||||||L7....
+FJL7L7LJLJ||LJ.L-7..
+L--J.L7...LJS7F-7L7.
+....F-J..F7FJ|L7L7L7
+....L7.F7||L7|.L7L7|
+.....|FJLJ|FJ|F7|.LJ
+....FJL-7.||.||||...
+....L---J.LJ.LJLJ...
diff --git a/tests/adventofcode2023/test_day10_b.py b/tests/adventofcode2023/test_day10_b.py
index 2531baac..cb351d74 100644
--- a/tests/adventofcode2023/test_day10_b.py
+++ b/tests/adventofcode2023/test_day10_b.py
@@ -4,11 +4,17 @@
 
 
 class TestDay10PartB:
-    @pytest.mark.xfail(reason="Not yet implemented", raises=NotImplementedError)
-    def test_day10b_testdata(self, testdata):
+    @pytest.mark.parametrize(
+        ("postfix", "expected_result"),
+        [
+            ("loop_4", 4),
+            # ("loop_8", 8),
+        ],
+    )
+    def test_day10b_testdata(self, testdata_by_postfix, expected_result):
         solution = Day10PartB()
-        result = solution.solve(testdata)
-        assert result == 0
+        result = solution.solve(testdata_by_postfix)
+        assert result == expected_result
 
     @pytest.mark.xfail(reason="Not yet implemented", raises=NotImplementedError)
     @pytest.mark.parametrize(("input_data", "expected_result"), [("", ""), ("", "")])

From 4c0300eaf07894f88534915aa472bc187df4b95f Mon Sep 17 00:00:00 2001
From: Roel Adriaans <roel@adriaans.org>
Date: Mon, 11 Dec 2023 20:42:16 +0100
Subject: [PATCH 362/371] Nice ray tracing that does not yet work

---
 .../data/day_10/day10_test_4.txt              |  14 +-
 src/adventofcode2023/day10.py                 | 120 ++++++++++++++----
 tests/adventofcode2023/test_day10_b.py        |   6 +-
 3 files changed, 111 insertions(+), 29 deletions(-)

diff --git a/src/adventofcode2023/data/day_10/day10_test_4.txt b/src/adventofcode2023/data/day_10/day10_test_4.txt
index 689fff6a..bd9cdf53 100644
--- a/src/adventofcode2023/data/day_10/day10_test_4.txt
+++ b/src/adventofcode2023/data/day_10/day10_test_4.txt
@@ -1,5 +1,9 @@
--L|F7
-7S-7|
-L|7||
--L-J|
-L|-JF
+...........
+.S-------7.
+.|F-----7|.
+.||.....||.
+.||.....||.
+.|L-7.F-J|.
+.|..|.|..|.
+.L--J.L--J.
+...........
diff --git a/src/adventofcode2023/day10.py b/src/adventofcode2023/day10.py
index 41cd4ff2..e3cb4778 100644
--- a/src/adventofcode2023/day10.py
+++ b/src/adventofcode2023/day10.py
@@ -1,9 +1,12 @@
 from __future__ import annotations
 
+import logging
 from enum import Enum
 
 from adventofcode.utils.abstract import FileReaderSolution
 
+logger = logging.getLogger(__name__)
+
 
 class Tile(Enum):
     NS = "|"  # is a vertical pipe connecting north and south.
@@ -46,29 +49,10 @@ def connections(self) -> list[tuple[int, int]]:
         return options
 
 
-class Node:
-    tile: Tile
-    north: Node | None
-    south: Node | None
-    east: Node | None
-    west: Node | None
-
-    def __init__(self, tile: Tile):
-        self.tile = tile
-        self.north = None
-        self.south = None
-        self.east = None
-        self.west = None
-
-    def __str__(self) -> str:
-        return (
-            f"<Node {self.tile} (^ {self.north}, > {self.east}, "
-            f"V {self.south}, < {self.west})>"
-        )
-
-
 class Day10:
     grid: dict[tuple[int, int], str]
+    max_row: int
+    max_col: int
     start_point = tuple[int, int]
 
     def parse(self, input_data: str):
@@ -78,6 +62,8 @@ def parse(self, input_data: str):
                 self.grid[(row_idx, col_idx)] = char
                 if char == "S":
                     self.start_point = (row_idx, col_idx)
+                self.max_row = row_idx
+                self.max_col = col_idx
 
     def find_path(self) -> list[tuple[int, int]]:
         # We know our startpoint, which nodes connect?
@@ -137,5 +123,95 @@ def solve(self, input_data: str) -> int:
 
 
 class Day10PartB(Day10, FileReaderSolution):
+    def raytracing(self, path: list[tuple[int, int]], row: int, col: int) -> bool:
+        # If it's at the edge, it's never enclosed:
+        right = {self.grid[(row, n)] for n in range(col, self.max_col + 1)}
+        if right == {"."}:
+            return False
+
+        down = {self.grid[(n, col)] for n in range(row, self.max_row + 1)}
+        if down == {"."}:
+            return False
+
+        enclosed = False
+        for n in range(col):
+            if (row, n) in path:
+                enclosed = not enclosed
+        return enclosed
+
+    def convert_to_box_chars(self, path, inside, outside):
+        thin_box_chars = {
+            "F": "┌",
+            "7": "┐",
+            "L": "└",
+            "J": "┘",
+            "-": "─",
+            "|": "│",
+            "S": "@",
+            ".": " ",
+            "I": "│",
+        }
+        thick_box_chars = {
+            "F": "╔",
+            "7": "╗",
+            "L": "╚",
+            "J": "╝",
+            "-": "═",
+            "|": "║",
+            "S": "@",
+            ".": " ",
+            "I": "║",
+        }
+        grid = {}
+        for row_idx in range(self.max_row + 1):
+            for col_idx in range(self.max_col + 1):
+                loc = (row_idx, col_idx)
+                if loc in inside:
+                    grid[loc] = "I"
+                elif loc in outside:
+                    grid[loc] = "O"
+                elif loc in path:
+                    grid[loc] = thick_box_chars[self.grid[loc]]
+                else:
+                    grid[loc] = thin_box_chars[self.grid[loc]]
+
+        return grid
+
+    def print_grid(self, grid):
+        print()
+        lines = []
+        for row in range(self.max_row + 1):
+            lines.append("".join([grid[(row, col)] for col in range(self.max_col + 1)]))
+        print("\n".join(lines))
+        print()
+
     def solve(self, input_data: str) -> int:
-        raise NotImplementedError
+        self.parse(input_data)
+        path = self.find_path()
+        valid_points = 0
+
+        # self.print_grid(self.convert_to_box_chars(path))
+        # self.print_grid(self.grid)
+        inside = []
+        outside = []
+        for row in range(0, self.max_row + 1):
+            for col in range(0, self.max_col + 1):
+                if self.grid[(row, col)] == ".":
+                    if self.raytracing(path, row, col):
+                        logger.info(
+                            f"Valid location: {row}, {col}, {self.grid[(row, col)]}"
+                        )
+                        valid_points += 1
+                        inside.append((row, col))
+                    else:
+                        outside.append((row, col))
+
+        # for erin in inside:
+        #     self.grid[erin] = "I"
+        # for eruit in outside:
+        #     self.grid[eruit] = "O"
+        # for p in path:
+        #     self.grid[p] = "*"
+        print(self.print_grid(self.convert_to_box_chars(path, inside, outside)))
+
+        return valid_points
diff --git a/tests/adventofcode2023/test_day10_b.py b/tests/adventofcode2023/test_day10_b.py
index cb351d74..6922d611 100644
--- a/tests/adventofcode2023/test_day10_b.py
+++ b/tests/adventofcode2023/test_day10_b.py
@@ -7,8 +7,9 @@ class TestDay10PartB:
     @pytest.mark.parametrize(
         ("postfix", "expected_result"),
         [
-            ("loop_4", 4),
-            # ("loop_8", 8),
+            # ("loop_4", 4),
+            ("loop_8", 8),
+            # ("loop_10", 10),
         ],
     )
     def test_day10b_testdata(self, testdata_by_postfix, expected_result):
@@ -28,4 +29,5 @@ def test_day10b_data(self):
         """Result we got when we did the real solution"""
         solution = Day10PartB()
         res = solution("day_10/day10.txt")
+        assert res > 132
         assert res == 0

From a8a8642a2dd6d4bfe82924684f263418b6843185 Mon Sep 17 00:00:00 2001
From: Roel Adriaans <roel@adriaans.org>
Date: Tue, 12 Dec 2023 21:02:55 +0100
Subject: [PATCH 363/371] Revert testdata that has been overwritten, clean
 path.

---
 src/adventofcode2023/data/day_10/day10_test_4.txt | 14 +++++---------
 src/adventofcode2023/day10.py                     | 10 +++++-----
 2 files changed, 10 insertions(+), 14 deletions(-)

diff --git a/src/adventofcode2023/data/day_10/day10_test_4.txt b/src/adventofcode2023/data/day_10/day10_test_4.txt
index bd9cdf53..7650925b 100644
--- a/src/adventofcode2023/data/day_10/day10_test_4.txt
+++ b/src/adventofcode2023/data/day_10/day10_test_4.txt
@@ -1,9 +1,5 @@
-...........
-.S-------7.
-.|F-----7|.
-.||.....||.
-.||.....||.
-.|L-7.F-J|.
-.|..|.|..|.
-.L--J.L--J.
-...........
+.....
+.S-7.
+.|.|.
+.L-J.
+.....
diff --git a/src/adventofcode2023/day10.py b/src/adventofcode2023/day10.py
index e3cb4778..8a3c7945 100644
--- a/src/adventofcode2023/day10.py
+++ b/src/adventofcode2023/day10.py
@@ -28,7 +28,8 @@ def has_east(self) -> bool:
 
     @property
     def has_south(self) -> bool:
-        return "S" in self.name
+        # If the name is "SS", it is the starting position, and might now have south.
+        return "S" in self.name and self.name != "SS"
 
     @property
     def has_west(self) -> bool:
@@ -86,7 +87,6 @@ def find_path(self) -> list[tuple[int, int]]:
             )
 
         # Let's follow the path
-
         cur_point = connections[0]
         path = [cur_point]
         visited = {cur_point}
@@ -102,11 +102,11 @@ def find_path(self) -> list[tuple[int, int]]:
                 for connection in connections
                 if connection not in visited and connection != self.start_point
             ]
-            try:
-                next_step = next_step[0]
-            except IndexError:
+            if len(next_step) == 0:
+                # We have found the loop, nowhere to go
                 return path
 
+            next_step = next_step[0]
             path.append(next_step)
             visited.add(next_step)
             cur_point = next_step

From 8076c92b74756105d8b1f9e7f72ff68361ba5191 Mon Sep 17 00:00:00 2001
From: Roel Adriaans <roel@adriaans.org>
Date: Tue, 12 Dec 2023 21:16:48 +0100
Subject: [PATCH 364/371] Cleanup grid, remove not used pipes

---
 src/adventofcode2023/day10.py | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/src/adventofcode2023/day10.py b/src/adventofcode2023/day10.py
index 8a3c7945..9c536afa 100644
--- a/src/adventofcode2023/day10.py
+++ b/src/adventofcode2023/day10.py
@@ -188,6 +188,12 @@ def print_grid(self, grid):
     def solve(self, input_data: str) -> int:
         self.parse(input_data)
         path = self.find_path()
+
+        # First cleanup the grid. Everything that is not in path, will become a "."
+        for location, tile in self.grid.items():
+            if tile != "." and location not in path:
+                self.grid[location] = "."
+
         valid_points = 0
 
         # self.print_grid(self.convert_to_box_chars(path))

From 05cb776b19031bd86ed890a85f89d0311b174f3d Mon Sep 17 00:00:00 2001
From: Roel Adriaans <roel@adriaans.org>
Date: Tue, 12 Dec 2023 22:16:21 +0100
Subject: [PATCH 365/371] Day 10, part b. With some help

---
 src/adventofcode2023/day10.py          | 120 +++++++++++++++----------
 tests/adventofcode2023/test_day10_b.py |  13 +--
 2 files changed, 76 insertions(+), 57 deletions(-)

diff --git a/src/adventofcode2023/day10.py b/src/adventofcode2023/day10.py
index 9c536afa..59c01226 100644
--- a/src/adventofcode2023/day10.py
+++ b/src/adventofcode2023/day10.py
@@ -1,12 +1,9 @@
 from __future__ import annotations
 
-import logging
 from enum import Enum
 
 from adventofcode.utils.abstract import FileReaderSolution
 
-logger = logging.getLogger(__name__)
-
 
 class Tile(Enum):
     NS = "|"  # is a vertical pipe connecting north and south.
@@ -85,10 +82,26 @@ def find_path(self) -> list[tuple[int, int]]:
             raise ValueError(
                 f"Starting point does not have 2 connections, but : {connections}"
             )
+        # Also, get the start type and update it in the grid
+        valid_directions = []
+        for direction in [(1, 0, "S"), (0, 1, "E"), (-1, 0, "N"), (0, -1, "W")]:
+            if (
+                self.start_point[0] + direction[0],
+                self.start_point[1] + direction[1],
+            ) in connections:
+                valid_directions.append(direction[2])
+        direction = "".join(valid_directions)
+
+        try:
+            replacement = Tile[direction]
+        except KeyError:
+            replacement = Tile[direction[::-1]]
+
+        self.grid[self.start_point] = replacement.value
 
         # Let's follow the path
         cur_point = connections[0]
-        path = [cur_point]
+        path = [self.start_point, cur_point]
         visited = {cur_point}
 
         while cur_point != self.start_point:
@@ -123,23 +136,54 @@ def solve(self, input_data: str) -> int:
 
 
 class Day10PartB(Day10, FileReaderSolution):
-    def raytracing(self, path: list[tuple[int, int]], row: int, col: int) -> bool:
-        # If it's at the edge, it's never enclosed:
-        right = {self.grid[(row, n)] for n in range(col, self.max_col + 1)}
-        if right == {"."}:
-            return False
-
-        down = {self.grid[(n, col)] for n in range(row, self.max_row + 1)}
-        if down == {"."}:
-            return False
-
-        enclosed = False
-        for n in range(col):
-            if (row, n) in path:
-                enclosed = not enclosed
-        return enclosed
-
-    def convert_to_box_chars(self, path, inside, outside):
+    def raytracing(
+        self, path: list[tuple[int, int]], row: int
+    ) -> list[tuple[int, int]]:
+        """Return a list if points that are inside the path"""
+        outside_points = []
+        outside = True
+        start_f = None
+        for col in range(self.max_col + 1):
+            char = self.grid[(row, col)]
+            if char == "." and not outside:
+                # We are outside, and hit an empty spot!
+                outside_points.append((row, col))
+
+            elif char == "|":
+                outside = not outside
+
+            elif char == "F":
+                start_f = True
+
+            elif char == "L":
+                start_f = False
+
+            elif char == "-":
+                # Alongside a wall, can only happen if not with bend
+                if start_f is None:
+                    raise ValueError("Horizontal line but outside?!")
+
+            elif char == "7":
+                # End of a pipe
+                if start_f is None:
+                    raise ValueError("Horizontal end `7`, but not started!?")
+                if not start_f:
+                    outside = not outside
+                start_f = None
+
+            elif char == "J":
+                if start_f is None:
+                    raise ValueError("Horizontal end `J`, but not started!?")
+                if start_f:
+                    outside = not outside
+                start_f = None
+        return outside_points
+
+    def convert_to_box_chars(self, path=None, inside=None):
+        if path is None:
+            path = []
+        if inside is None:
+            inside = []
         thin_box_chars = {
             "F": "┌",
             "7": "┐",
@@ -168,8 +212,6 @@ def convert_to_box_chars(self, path, inside, outside):
                 loc = (row_idx, col_idx)
                 if loc in inside:
                     grid[loc] = "I"
-                elif loc in outside:
-                    grid[loc] = "O"
                 elif loc in path:
                     grid[loc] = thick_box_chars[self.grid[loc]]
                 else:
@@ -189,35 +231,19 @@ def solve(self, input_data: str) -> int:
         self.parse(input_data)
         path = self.find_path()
 
-        # First cleanup the grid. Everything that is not in path, will become a "."
+        # First cleanup the grid. Everything that is not in path, or Start!
+        # will become a "."
         for location, tile in self.grid.items():
-            if tile != "." and location not in path:
+            if tile != "." and tile != "S" and location not in path:
                 self.grid[location] = "."
 
         valid_points = 0
-
-        # self.print_grid(self.convert_to_box_chars(path))
-        # self.print_grid(self.grid)
         inside = []
-        outside = []
         for row in range(0, self.max_row + 1):
-            for col in range(0, self.max_col + 1):
-                if self.grid[(row, col)] == ".":
-                    if self.raytracing(path, row, col):
-                        logger.info(
-                            f"Valid location: {row}, {col}, {self.grid[(row, col)]}"
-                        )
-                        valid_points += 1
-                        inside.append((row, col))
-                    else:
-                        outside.append((row, col))
-
-        # for erin in inside:
-        #     self.grid[erin] = "I"
-        # for eruit in outside:
-        #     self.grid[eruit] = "O"
-        # for p in path:
-        #     self.grid[p] = "*"
-        print(self.print_grid(self.convert_to_box_chars(path, inside, outside)))
+            inside_points = self.raytracing(path, row)
+            valid_points += len(inside_points)
+            inside.extend(inside_points)
+
+        print(self.print_grid(self.convert_to_box_chars(path, inside)))
 
         return valid_points
diff --git a/tests/adventofcode2023/test_day10_b.py b/tests/adventofcode2023/test_day10_b.py
index 6922d611..52be1886 100644
--- a/tests/adventofcode2023/test_day10_b.py
+++ b/tests/adventofcode2023/test_day10_b.py
@@ -7,9 +7,9 @@ class TestDay10PartB:
     @pytest.mark.parametrize(
         ("postfix", "expected_result"),
         [
-            # ("loop_4", 4),
+            ("loop_4", 4),
             ("loop_8", 8),
-            # ("loop_10", 10),
+            ("loop_10", 10),
         ],
     )
     def test_day10b_testdata(self, testdata_by_postfix, expected_result):
@@ -17,17 +17,10 @@ def test_day10b_testdata(self, testdata_by_postfix, expected_result):
         result = solution.solve(testdata_by_postfix)
         assert result == expected_result
 
-    @pytest.mark.xfail(reason="Not yet implemented", raises=NotImplementedError)
-    @pytest.mark.parametrize(("input_data", "expected_result"), [("", ""), ("", "")])
-    def test_day10b_solve(self, input_data, expected_result):
-        solution = Day10PartB()
-        result = solution.solve(input_data)
-        assert result == expected_result
-
     @pytest.mark.xfail(reason="Not yet implemented", raises=NotImplementedError)
     def test_day10b_data(self):
         """Result we got when we did the real solution"""
         solution = Day10PartB()
         res = solution("day_10/day10.txt")
         assert res > 132
-        assert res == 0
+        assert res == 449

From 4e386d9e9972d2a7e6934b24ff84950e349b7013 Mon Sep 17 00:00:00 2001
From: Roel Adriaans <roel@adriaans.org>
Date: Tue, 12 Dec 2023 23:09:54 +0100
Subject: [PATCH 366/371] Add day 11 parsing + expanding

---
 src/adventofcode2023/data/day_11/day11.txt    | 140 ++++++++++++++++++
 .../data/day_11/day11_test.txt                |  10 ++
 src/adventofcode2023/day11.py                 |  83 +++++++++++
 tests/adventofcode2023/test_day11_a.py        |  43 ++++++
 tests/adventofcode2023/test_day11_b.py        |  25 ++++
 5 files changed, 301 insertions(+)
 create mode 100644 src/adventofcode2023/data/day_11/day11.txt
 create mode 100644 src/adventofcode2023/data/day_11/day11_test.txt
 create mode 100644 src/adventofcode2023/day11.py
 create mode 100644 tests/adventofcode2023/test_day11_a.py
 create mode 100644 tests/adventofcode2023/test_day11_b.py

diff --git a/src/adventofcode2023/data/day_11/day11.txt b/src/adventofcode2023/data/day_11/day11.txt
new file mode 100644
index 00000000..0723e735
--- /dev/null
+++ b/src/adventofcode2023/data/day_11/day11.txt
@@ -0,0 +1,140 @@
+.......#.....#.....................#.............#.................#.........................#..............................................
+#.....................#.......#.................................................................................#.......#...................
+.......................................................................#.........................#..................................#.......
+................................................................#..............#..............................................#.............
+.........................................#............................................................#....................................#
+.................#..................................................#.......................................................................
+...........................#...............................................................................#................................
+....#.......#...........................................#..........................#.............................#..........................
+....................#.............#........#................................................................................................
+...................................................#...................................................#...................#................
+.........................#........................................#..................................................#......................
+......#..........#...........................................#...........#............#.....................................................
+......................................#..........................................#.........................#.....................#..........
+.#...................#..................................#.......................................#...........................................
+............#.................................#.....................#.......................................................................
+............................................................................................................................................
+..............................#.....................................................................................#..................#....
+....................................................................................#........#......#.......................................
+.........................#.........................#............#...........................................#...............................
+.#......#.....#.......................#.................#........................................................#.....#....................
+...........................................................................#.................................................#..............
+...............................................#.......................................#...............#..........................#.........
+......................#..................#..................................................................................................
+..........................................................................................................................#.................
+......#...........................#.........................................................#........................#......................
+..............................................................................................................................#.............
+..#.......................#.................#............................................................................................#..
+..................#....................................................#................#...................................................
+....................................................#.....#....................#............................................................
+...............................#............................................................................................................
+..............................................#...............#..........................................................#...........#......
+.#.........#........................#..................................................................#....................................
+..........................................................................#.......................#........................................#
+...................#......................................................................#.................................................
+.............................................................................................................................#..............
+.....#......................................................................................................................................
+........................................................#........................#..........................................................
+.............................#...............#.....................#.....#............#..................#..............................#...
+............................................................................................#......#...........#............................
+.........................#........#...................................................................................#.....................
+...........................................................................................................................................#
+.....................................................#.....#.................................................................#..............
+#.........................................................................................................#.......................#.........
+................#...........................................................#.....................#.........................................
+..............................#..............#...................................#.......#...........................#......................
+........#................#.........#............................#............................................#.............#.........#......
+............................................................................................................................................
+.......................................................#...............#.............................#...........................#..........
+.............#.................................#............................................................................................
+............................................................................................................................................
+..#.............................................................................#...........................................#...........#...
+............................................................................................................................................
+......................................#..........................................................#................#.........................
+............................#................#......#......................#...........#....................................................
+............................................................................................................................................
+....................................................................................................#................#..........#...........
+.#............#...................#...............................#........................................#.............................#..
+.........#...............................................................#..................................................................
+.......................#....................#........#...........................................#..........................................
+............................................................#.....................................................#.........................
+..............................#.......................................................................#...................#.......#.........
+............#.......................#...................#............................#......................................................
+...................................................#......................................#..............................................#..
+.#................#...................................................#........................#............................................
+......#....................................................................#................................#...............................
+...............................#....................................................................................#.......................
+.........................#.....................#......#.............................................#.................................#.....
+............................................................................................................................................
+...............#.....................#....................................................#.................................................
+..................................................................................................................#.........................
+....#......#.....................................#..............................#............................#............#.....#...........
+....................#.............................................#....................#.........#.......................................#..
+.........................................................#..............#.............................#.....................................
+............................#...........#...........................................................................#.......................
+............................................................................................................................................
+#..................................#...............................................................#..........#.............................
+.......#......................................................................................#.................................#.......#...
+.....................#....................#...............................#.....#......................................#....................
+................................#..........................#......#....................#..........................#.........................
+..............#...................................#........................................................................#...............#
+....#....................................................................................................#..................................
+.......................#....................................................................................................................
+......................................#................................#..................#.................................................
+.....................................................#............................................#...............................#.........
+............................................................................................................................................
+............................................................................................................................................
+....#.................#..................................#.........................#..........................#.............................
+.............#........................................................................................#..................#..................
+......................................#............................................................................#........................
+.........#....................................................#.........#............................................................#......
+.............................................................................................#..............................................
+.............................#...........#............................................................................#.....................
+#..................#................................................#....................#.......................................#.........#
+...................................................................................................#......#.................................
+...........#.............................................#...........................#......................................................
+....................................#.......................................................................................................
+..................................................#..........#.........#......................#.....................#.......................
+.#......#....................................#..............................................................#...............................
+.............................#.............................................#................................................................
+.......................#...............................................................................#....................#...............
+....................................................#.....................................#...........................................#.....
+................#.....................#..................#.................................................................................#
+...#.....#..........................................................#................#......................................................
+.............................................#...............#................................#......#......................................
+...............................#...............................................#............................................................
+.............................................................................................................................#.........#....
+.....................#................................................#.................................................#...................
+...............#.........................#.......................#..................#.......................................................
+.....#......................................................................................................#.......................#.......
+....................................#.................#.........................#..................#........................................
+........................................................................................................................................#...
+.........#..............#.....................................#........................................#.....................#..............
+...............................................#...................#........................................................................
+......................................#.............#..................................#.....#.......................#......................
+............#.....#...............................................................................#.........................................
+...#...................................................................................................................................#....
+.......................#.........................#..........................................................................................
+.........................................................#...........#.........................#........#..........#.............#..........
+............................#..............#....................#........................................................#..................
+.......#.................................................................#................#.................................................
+.................#..................................................................................#........................#...........#..
+...................................................#.......#................................................................................
+.........................................#......................................#......................................#....................
+....................................#...........................................................................#...........................
+..............................#.............................................................#...........#.......................#......#....
+.........#...............................................#..............#...................................................................
+........................#....................#.....................................#........................................................
+#...........................................................................................................................................
+............................#......................................................................#.......#................................
+......................................#.....................................................................................................
+.....#............#.........................................#..........................#..........................................#.........
+...........................................#......................#..............................................#..........................
+..............#..............................................................................#............................#.............#...
+..#......#...........................................#..............................#..................#.....#..............................
+....................#..........#.....#...............................#......................................................................
+............................................................................................................................................
+.................................................#..........................................................................................
+.............#..........#...............................#...............#.............#..........#.........#........#.......................
+............................................#................#.................#............................................................
+....................................#....................................................................................#.............#....
diff --git a/src/adventofcode2023/data/day_11/day11_test.txt b/src/adventofcode2023/data/day_11/day11_test.txt
new file mode 100644
index 00000000..986aad4a
--- /dev/null
+++ b/src/adventofcode2023/data/day_11/day11_test.txt
@@ -0,0 +1,10 @@
+...#......
+.......#..
+#.........
+..........
+......#...
+.#........
+.........#
+..........
+.......#..
+#...#.....
diff --git a/src/adventofcode2023/day11.py b/src/adventofcode2023/day11.py
new file mode 100644
index 00000000..80df8c45
--- /dev/null
+++ b/src/adventofcode2023/day11.py
@@ -0,0 +1,83 @@
+from __future__ import annotations
+
+from adventofcodeutils.point import XYPoint as Point
+
+from adventofcode.utils.abstract import FileReaderSolution
+
+
+class Day11:
+    galaxy_points: list[Point]
+    max_x: int
+    max_y: int
+    used_x: set
+    used_y: set
+
+    def parse(self, input_data: str):
+        self.galaxy_points = []
+        self.used_x = set()
+        self.used_y = set()
+
+        for x, line in enumerate(input_data.splitlines()):
+            for y, char in enumerate(line):
+                if char == "#":
+                    self.galaxy_points.append(Point(x, y))
+                    self.used_x.add(x)
+                    self.used_y.add(y)
+
+                self.max_y = y
+            self.max_x = x
+
+    @staticmethod
+    def missing_elements(elements):
+        start, end = elements[0], elements[-1]
+        return sorted(set(range(start, end + 1)).difference(elements))
+
+    def expand_universe(self):
+        """Expand the universe, if a line is empty"""
+        offset_x = 0
+        offset_y = 0
+        # Mind the gaps
+        missing_x = self.missing_elements(list(self.used_x))
+        missing_y = self.missing_elements(list(self.used_y))
+        # Loop over every planet there offset is x + offset_x and add x
+        for x in missing_x:
+            points_do_delete = []
+            points_to_add = []
+            for point in self.galaxy_points:
+                if point.x > x + offset_x:
+                    points_to_add.append(Point(point.x + offset_x + 1, point.y))
+                    points_do_delete.append(point)
+            for point in points_do_delete:
+                del self.galaxy_points[self.galaxy_points.index(point)]
+            self.galaxy_points.extend(points_to_add)
+            offset_x += 1
+        for y in missing_y:
+            points_do_delete = []
+            points_to_add = []
+            for point in self.galaxy_points:
+                if point.y > y + offset_y:
+                    points_to_add.append(Point(point.x, point.y + offset_y + 1))
+                    points_do_delete.append(point)
+            for point in points_do_delete:
+                del self.galaxy_points[self.galaxy_points.index(point)]
+            self.galaxy_points.extend(points_to_add)
+            offset_y += 1
+
+    def compute_shortest_paths(self) -> list[list[int]]:
+        """Compute the shortest paths between pairs"""
+        # Return a list of distances, or a dict between galaxy points with the
+        # distance? I don't know...
+        return []
+
+
+class Day11PartA(Day11, FileReaderSolution):
+    def solve(self, input_data: str) -> int:
+        self.parse(input_data)
+        self.expand_universe()
+        shortest_paths = self.compute_shortest_paths()
+        return sum(len(path) for path in shortest_paths)
+
+
+class Day11PartB(Day11, FileReaderSolution):
+    def solve(self, input_data: str) -> int:
+        raise NotImplementedError
diff --git a/tests/adventofcode2023/test_day11_a.py b/tests/adventofcode2023/test_day11_a.py
new file mode 100644
index 00000000..d74e5fb0
--- /dev/null
+++ b/tests/adventofcode2023/test_day11_a.py
@@ -0,0 +1,43 @@
+import pytest
+from adventofcodeutils.point import XYPoint as Point
+
+from adventofcode2023.day11 import Day11PartA
+
+
+class TestDay11PartA:
+    def test_day11a_parse(self, testdata):
+        solution = Day11PartA()
+        solution.parse(testdata)
+        assert len(solution.galaxy_points) == 9
+        assert solution.galaxy_points[0] == Point(0, 3)
+        assert solution.galaxy_points[-1] == Point(9, 4)
+
+    def test_day11a_expand(self, testdata):
+        solution = Day11PartA()
+        solution.parse(testdata)
+        solution.expand_universe()
+        # No extra galaxies created
+        assert len(solution.galaxy_points) == 9
+        # First one moved on to the right
+        # Check if they are int the list, ordering may have been shuffled
+        assert Point(0, 4) in solution.galaxy_points
+        assert Point(12, 5) in solution.galaxy_points
+
+    def test_day11a_testdata(self, testdata):
+        solution = Day11PartA()
+        result = solution.solve(testdata)
+        assert result == 374
+
+    @pytest.mark.xfail(reason="Not yet implemented", raises=NotImplementedError)
+    @pytest.mark.parametrize(("input_data", "expected_result"), [("", ""), ("", "")])
+    def test_day11a_solve(self, input_data, expected_result):
+        solution = Day11PartA()
+        result = solution.solve(input_data)
+        assert result == expected_result
+
+    @pytest.mark.xfail(reason="Not yet implemented", raises=NotImplementedError)
+    def test_day11a_data(self):
+        """Result we got when we did the real solution"""
+        solution = Day11PartA()
+        res = solution("day_11/day11.txt")
+        assert res == 0
diff --git a/tests/adventofcode2023/test_day11_b.py b/tests/adventofcode2023/test_day11_b.py
new file mode 100644
index 00000000..3d7aa221
--- /dev/null
+++ b/tests/adventofcode2023/test_day11_b.py
@@ -0,0 +1,25 @@
+import pytest
+
+from adventofcode2023.day11 import Day11PartB
+
+
+class TestDay11PartB:
+    @pytest.mark.xfail(reason="Not yet implemented", raises=NotImplementedError)
+    def test_day11b_testdata(self, testdata):
+        solution = Day11PartB()
+        result = solution.solve(testdata)
+        assert result == 0
+
+    @pytest.mark.xfail(reason="Not yet implemented", raises=NotImplementedError)
+    @pytest.mark.parametrize(("input_data", "expected_result"), [("", ""), ("", "")])
+    def test_day11b_solve(self, input_data, expected_result):
+        solution = Day11PartB()
+        result = solution.solve(input_data)
+        assert result == expected_result
+
+    @pytest.mark.xfail(reason="Not yet implemented", raises=NotImplementedError)
+    def test_day11b_data(self):
+        """Result we got when we did the real solution"""
+        solution = Day11PartB()
+        res = solution("day_11/day11.txt")
+        assert res == 0

From 9bb240334dd3c9d38402d4c43c5ae208b3ec6f11 Mon Sep 17 00:00:00 2001
From: Roel Adriaans <roel@adriaans.org>
Date: Tue, 12 Dec 2023 23:17:23 +0100
Subject: [PATCH 367/371] Move code to adventogcode.utils folder

---
 poetry.lock                                   | 40 +------------------
 pyproject.toml                                |  1 -
 .../utils}/generic_search.py                  |  8 ++--
 .../utils}/graph.py                           |  0
 .../utils}/node.py                            |  0
 .../utils}/parsing.py                         |  0
 .../utils}/point.py                           |  0
 .../utils}/priority_queue.py                  |  0
 .../utils}/queue.py                           |  0
 .../utils}/stack.py                           |  0
 src/adventofcode2016/day01.py                 |  2 +-
 src/adventofcode2016/day02.py                 |  3 +-
 src/adventofcode2016/day08.py                 |  2 +-
 src/adventofcode2016/day10.py                 |  2 +-
 src/adventofcode2016/day11.py                 |  3 +-
 src/adventofcode2016/day13.py                 |  2 +-
 src/adventofcode2016/day15.py                 |  2 +-
 src/adventofcode2016/day17.py                 |  2 +-
 src/adventofcode2016/day20.py                 |  3 +-
 src/adventofcode2016/day22.py                 |  2 +-
 src/adventofcode2019/day04.py                 |  3 +-
 src/adventofcode2019/day05.py                 |  3 +-
 src/adventofcode2019/day07.py                 |  3 +-
 src/adventofcode2019/day09.py                 |  3 +-
 src/adventofcode2019/day11.py                 |  2 +-
 src/adventofcode2019/day13.py                 |  3 +-
 src/adventofcode2019/day15.py                 |  3 +-
 src/adventofcode2019/day16.py                 |  3 +-
 src/adventofcode2019/day17.py                 |  3 +-
 src/adventofcode2021/day10.py                 |  3 +-
 src/adventofcode2021/day12.py                 |  7 ++--
 src/adventofcode2021/day13.py                 |  3 +-
 src/adventofcode2021/day15.py                 |  5 +--
 src/adventofcode2021/day18.py                 |  3 +-
 src/adventofcode2021/day19.py                 |  3 +-
 src/adventofcode2021/day20.py                 |  3 +-
 src/adventofcode2021/day22.py                 |  3 +-
 src/adventofcode2022/day05.py                 |  2 +-
 src/adventofcode2022/day08.py                 |  3 +-
 src/adventofcode2022/day09.py                 |  2 +-
 src/adventofcode2022/day11.py                 |  2 +-
 src/adventofcode2022/day12.py                 |  7 ++--
 src/adventofcode2022/day14.py                 |  3 +-
 src/adventofcode2022/day15.py                 |  2 +-
 src/adventofcode2023/day04.py                 |  2 +-
 src/adventofcode2023/day06.py                 |  2 +-
 tests/adventofcode2021/test_day20_a.py        |  3 +-
 tests/adventofcode2022/test_day08_a.py        |  2 +-
 tests/adventofcode2022/test_day08_b.py        |  3 +-
 tests/test_advent_utils.py                    |  2 +-
 tests/test_graph.py                           |  2 +-
 tests/test_node.py                            |  2 +-
 tests/test_point.py                           |  2 +-
 tests/test_priority_queue.py                  |  2 +-
 tests/test_queue.py                           |  2 +-
 tests/test_stack.py                           |  2 +-
 56 files changed, 56 insertions(+), 119 deletions(-)
 rename src/{adventofcodeutils => adventofcode/utils}/generic_search.py (95%)
 rename src/{adventofcodeutils => adventofcode/utils}/graph.py (100%)
 rename src/{adventofcodeutils => adventofcode/utils}/node.py (100%)
 rename src/{adventofcodeutils => adventofcode/utils}/parsing.py (100%)
 rename src/{adventofcodeutils => adventofcode/utils}/point.py (100%)
 rename src/{adventofcodeutils => adventofcode/utils}/priority_queue.py (100%)
 rename src/{adventofcodeutils => adventofcode/utils}/queue.py (100%)
 rename src/{adventofcodeutils => adventofcode/utils}/stack.py (100%)

diff --git a/poetry.lock b/poetry.lock
index 9c06a1e8..cba9c7eb 100644
--- a/poetry.lock
+++ b/poetry.lock
@@ -1,23 +1,5 @@
 # This file is automatically @generated by Poetry 1.5.1 and should not be changed by hand.
 
-[[package]]
-name = "adventofcodeutils"
-version = "0.3.0"
-description = "This repository contains some utils used by my advent of code projects. "
-optional = false
-python-versions = "^3.11"
-files = []
-develop = false
-
-[package.dependencies]
-attrs = "^23.1.0"
-
-[package.source]
-type = "git"
-url = "https://github.com/RoelAdriaans/adventofcodeutils.git"
-reference = "HEAD"
-resolved_reference = "865f86a58af3daadf75678b0ff29bb53b62df17a"
-
 [[package]]
 name = "anytree"
 version = "2.12.1"
@@ -812,16 +794,6 @@ files = [
     {file = "MarkupSafe-2.1.3-cp311-cp311-musllinux_1_1_x86_64.whl", hash = "sha256:5bbe06f8eeafd38e5d0a4894ffec89378b6c6a625ff57e3028921f8ff59318ac"},
     {file = "MarkupSafe-2.1.3-cp311-cp311-win32.whl", hash = "sha256:dd15ff04ffd7e05ffcb7fe79f1b98041b8ea30ae9234aed2a9168b5797c3effb"},
     {file = "MarkupSafe-2.1.3-cp311-cp311-win_amd64.whl", hash = "sha256:134da1eca9ec0ae528110ccc9e48041e0828d79f24121a1a146161103c76e686"},
-    {file = "MarkupSafe-2.1.3-cp312-cp312-macosx_10_9_universal2.whl", hash = "sha256:f698de3fd0c4e6972b92290a45bd9b1536bffe8c6759c62471efaa8acb4c37bc"},
-    {file = "MarkupSafe-2.1.3-cp312-cp312-macosx_10_9_x86_64.whl", hash = "sha256:aa57bd9cf8ae831a362185ee444e15a93ecb2e344c8e52e4d721ea3ab6ef1823"},
-    {file = "MarkupSafe-2.1.3-cp312-cp312-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:ffcc3f7c66b5f5b7931a5aa68fc9cecc51e685ef90282f4a82f0f5e9b704ad11"},
-    {file = "MarkupSafe-2.1.3-cp312-cp312-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:47d4f1c5f80fc62fdd7777d0d40a2e9dda0a05883ab11374334f6c4de38adffd"},
-    {file = "MarkupSafe-2.1.3-cp312-cp312-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:1f67c7038d560d92149c060157d623c542173016c4babc0c1913cca0564b9939"},
-    {file = "MarkupSafe-2.1.3-cp312-cp312-musllinux_1_1_aarch64.whl", hash = "sha256:9aad3c1755095ce347e26488214ef77e0485a3c34a50c5a5e2471dff60b9dd9c"},
-    {file = "MarkupSafe-2.1.3-cp312-cp312-musllinux_1_1_i686.whl", hash = "sha256:14ff806850827afd6b07a5f32bd917fb7f45b046ba40c57abdb636674a8b559c"},
-    {file = "MarkupSafe-2.1.3-cp312-cp312-musllinux_1_1_x86_64.whl", hash = "sha256:8f9293864fe09b8149f0cc42ce56e3f0e54de883a9de90cd427f191c346eb2e1"},
-    {file = "MarkupSafe-2.1.3-cp312-cp312-win32.whl", hash = "sha256:715d3562f79d540f251b99ebd6d8baa547118974341db04f5ad06d5ea3eb8007"},
-    {file = "MarkupSafe-2.1.3-cp312-cp312-win_amd64.whl", hash = "sha256:1b8dd8c3fd14349433c79fa8abeb573a55fc0fdd769133baac1f5e07abf54aeb"},
     {file = "MarkupSafe-2.1.3-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:8e254ae696c88d98da6555f5ace2279cf7cd5b3f52be2b5cf97feafe883b58d2"},
     {file = "MarkupSafe-2.1.3-cp37-cp37m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:cb0932dc158471523c9637e807d9bfb93e06a95cbf010f1a38b98623b929ef2b"},
     {file = "MarkupSafe-2.1.3-cp37-cp37m-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:9402b03f1a1b4dc4c19845e5c749e3ab82d5078d16a2a4c2cd2df62d57bb0707"},
@@ -1304,7 +1276,6 @@ files = [
     {file = "PyYAML-6.0.1-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:69b023b2b4daa7548bcfbd4aa3da05b3a74b772db9e23b982788168117739938"},
     {file = "PyYAML-6.0.1-cp310-cp310-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:81e0b275a9ecc9c0c0c07b4b90ba548307583c125f54d5b6946cfee6360c733d"},
     {file = "PyYAML-6.0.1-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:ba336e390cd8e4d1739f42dfe9bb83a3cc2e80f567d8805e11b46f4a943f5515"},
-    {file = "PyYAML-6.0.1-cp310-cp310-musllinux_1_1_x86_64.whl", hash = "sha256:326c013efe8048858a6d312ddd31d56e468118ad4cdeda36c719bf5bb6192290"},
     {file = "PyYAML-6.0.1-cp310-cp310-win32.whl", hash = "sha256:bd4af7373a854424dabd882decdc5579653d7868b8fb26dc7d0e99f823aa5924"},
     {file = "PyYAML-6.0.1-cp310-cp310-win_amd64.whl", hash = "sha256:fd1592b3fdf65fff2ad0004b5e363300ef59ced41c2e6b3a99d4089fa8c5435d"},
     {file = "PyYAML-6.0.1-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:6965a7bc3cf88e5a1c3bd2e0b5c22f8d677dc88a455344035f03399034eb3007"},
@@ -1312,15 +1283,8 @@ files = [
     {file = "PyYAML-6.0.1-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:42f8152b8dbc4fe7d96729ec2b99c7097d656dc1213a3229ca5383f973a5ed6d"},
     {file = "PyYAML-6.0.1-cp311-cp311-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:062582fca9fabdd2c8b54a3ef1c978d786e0f6b3a1510e0ac93ef59e0ddae2bc"},
     {file = "PyYAML-6.0.1-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:d2b04aac4d386b172d5b9692e2d2da8de7bfb6c387fa4f801fbf6fb2e6ba4673"},
-    {file = "PyYAML-6.0.1-cp311-cp311-musllinux_1_1_x86_64.whl", hash = "sha256:e7d73685e87afe9f3b36c799222440d6cf362062f78be1013661b00c5c6f678b"},
     {file = "PyYAML-6.0.1-cp311-cp311-win32.whl", hash = "sha256:1635fd110e8d85d55237ab316b5b011de701ea0f29d07611174a1b42f1444741"},
     {file = "PyYAML-6.0.1-cp311-cp311-win_amd64.whl", hash = "sha256:bf07ee2fef7014951eeb99f56f39c9bb4af143d8aa3c21b1677805985307da34"},
-    {file = "PyYAML-6.0.1-cp312-cp312-macosx_10_9_x86_64.whl", hash = "sha256:855fb52b0dc35af121542a76b9a84f8d1cd886ea97c84703eaa6d88e37a2ad28"},
-    {file = "PyYAML-6.0.1-cp312-cp312-macosx_11_0_arm64.whl", hash = "sha256:40df9b996c2b73138957fe23a16a4f0ba614f4c0efce1e9406a184b6d07fa3a9"},
-    {file = "PyYAML-6.0.1-cp312-cp312-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:6c22bec3fbe2524cde73d7ada88f6566758a8f7227bfbf93a408a9d86bcc12a0"},
-    {file = "PyYAML-6.0.1-cp312-cp312-musllinux_1_1_x86_64.whl", hash = "sha256:8d4e9c88387b0f5c7d5f281e55304de64cf7f9c0021a3525bd3b1c542da3b0e4"},
-    {file = "PyYAML-6.0.1-cp312-cp312-win32.whl", hash = "sha256:d483d2cdf104e7c9fa60c544d92981f12ad66a457afae824d146093b8c294c54"},
-    {file = "PyYAML-6.0.1-cp312-cp312-win_amd64.whl", hash = "sha256:0d3304d8c0adc42be59c5f8a4d9e3d7379e6955ad754aa9d6ab7a398b59dd1df"},
     {file = "PyYAML-6.0.1-cp36-cp36m-macosx_10_9_x86_64.whl", hash = "sha256:50550eb667afee136e9a77d6dc71ae76a44df8b3e51e41b77f6de2932bfe0f47"},
     {file = "PyYAML-6.0.1-cp36-cp36m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:1fe35611261b29bd1de0070f0b2f47cb6ff71fa6595c077e42bd0c419fa27b98"},
     {file = "PyYAML-6.0.1-cp36-cp36m-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:704219a11b772aea0d8ecd7058d0082713c3562b4e271b849ad7dc4a5c90c13c"},
@@ -1337,7 +1301,6 @@ files = [
     {file = "PyYAML-6.0.1-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:a0cd17c15d3bb3fa06978b4e8958dcdc6e0174ccea823003a106c7d4d7899ac5"},
     {file = "PyYAML-6.0.1-cp38-cp38-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:28c119d996beec18c05208a8bd78cbe4007878c6dd15091efb73a30e90539696"},
     {file = "PyYAML-6.0.1-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:7e07cbde391ba96ab58e532ff4803f79c4129397514e1413a7dc761ccd755735"},
-    {file = "PyYAML-6.0.1-cp38-cp38-musllinux_1_1_x86_64.whl", hash = "sha256:49a183be227561de579b4a36efbb21b3eab9651dd81b1858589f796549873dd6"},
     {file = "PyYAML-6.0.1-cp38-cp38-win32.whl", hash = "sha256:184c5108a2aca3c5b3d3bf9395d50893a7ab82a38004c8f61c258d4428e80206"},
     {file = "PyYAML-6.0.1-cp38-cp38-win_amd64.whl", hash = "sha256:1e2722cc9fbb45d9b87631ac70924c11d3a401b2d7f410cc0e3bbf249f2dca62"},
     {file = "PyYAML-6.0.1-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:9eb6caa9a297fc2c2fb8862bc5370d0303ddba53ba97e71f08023b6cd73d16a8"},
@@ -1345,7 +1308,6 @@ files = [
     {file = "PyYAML-6.0.1-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:5773183b6446b2c99bb77e77595dd486303b4faab2b086e7b17bc6bef28865f6"},
     {file = "PyYAML-6.0.1-cp39-cp39-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:b786eecbdf8499b9ca1d697215862083bd6d2a99965554781d0d8d1ad31e13a0"},
     {file = "PyYAML-6.0.1-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:bc1bf2925a1ecd43da378f4db9e4f799775d6367bdb94671027b73b393a7c42c"},
-    {file = "PyYAML-6.0.1-cp39-cp39-musllinux_1_1_x86_64.whl", hash = "sha256:04ac92ad1925b2cff1db0cfebffb6ffc43457495c9b3c39d3fcae417d7125dc5"},
     {file = "PyYAML-6.0.1-cp39-cp39-win32.whl", hash = "sha256:faca3bdcf85b2fc05d06ff3fbc1f83e1391b3e724afa3feba7d13eeab355484c"},
     {file = "PyYAML-6.0.1-cp39-cp39-win_amd64.whl", hash = "sha256:510c9deebc5c0225e8c96813043e62b680ba2f9c50a08d3724c7f28a747d1486"},
     {file = "PyYAML-6.0.1.tar.gz", hash = "sha256:bfdf460b1736c775f2ba9f6a92bca30bc2095067b8a9d77876d1fad6cc3b4a43"},
@@ -1546,4 +1508,4 @@ test = ["covdefaults (>=2.3)", "coverage (>=7.2.7)", "coverage-enable-subprocess
 [metadata]
 lock-version = "2.0"
 python-versions = "^3.12"
-content-hash = "ec699ae456775afafd4ae032239e662cf7650f927de196d46859606865194f61"
+content-hash = "5c546763d9594d8b050ac29eee0c40b8e920d98eab0cbc13f00ddab5714f50c6"
diff --git a/pyproject.toml b/pyproject.toml
index 1d24be2a..71b79553 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -25,7 +25,6 @@ beautifulsoup4 = "^4.12.2"
 tqdm = "^4.66.1"
 attrs = "^23.1.0"
 numpy = "^1.26.2"
-adventofcodeutils = {git = "https://github.com/RoelAdriaans/adventofcodeutils.git"}
 more-itertools = "^10.1.0"
 regex-spm = "^1.0.0"
 parse = "^1.20.0"
diff --git a/src/adventofcodeutils/generic_search.py b/src/adventofcode/utils/generic_search.py
similarity index 95%
rename from src/adventofcodeutils/generic_search.py
rename to src/adventofcode/utils/generic_search.py
index 95dddc38..ef49984e 100644
--- a/src/adventofcodeutils/generic_search.py
+++ b/src/adventofcode/utils/generic_search.py
@@ -4,10 +4,10 @@
 from collections.abc import Callable
 from typing import TypeVar
 
-from adventofcodeutils.node import Node
-from adventofcodeutils.priority_queue import PriorityQueue
-from adventofcodeutils.queue import Queue
-from adventofcodeutils.stack import Stack
+from adventofcode.utils.node import Node
+from adventofcode.utils.priority_queue import PriorityQueue
+from adventofcode.utils.queue import Queue
+from adventofcode.utils.stack import Stack
 
 T = TypeVar("T")
 
diff --git a/src/adventofcodeutils/graph.py b/src/adventofcode/utils/graph.py
similarity index 100%
rename from src/adventofcodeutils/graph.py
rename to src/adventofcode/utils/graph.py
diff --git a/src/adventofcodeutils/node.py b/src/adventofcode/utils/node.py
similarity index 100%
rename from src/adventofcodeutils/node.py
rename to src/adventofcode/utils/node.py
diff --git a/src/adventofcodeutils/parsing.py b/src/adventofcode/utils/parsing.py
similarity index 100%
rename from src/adventofcodeutils/parsing.py
rename to src/adventofcode/utils/parsing.py
diff --git a/src/adventofcodeutils/point.py b/src/adventofcode/utils/point.py
similarity index 100%
rename from src/adventofcodeutils/point.py
rename to src/adventofcode/utils/point.py
diff --git a/src/adventofcodeutils/priority_queue.py b/src/adventofcode/utils/priority_queue.py
similarity index 100%
rename from src/adventofcodeutils/priority_queue.py
rename to src/adventofcode/utils/priority_queue.py
diff --git a/src/adventofcodeutils/queue.py b/src/adventofcode/utils/queue.py
similarity index 100%
rename from src/adventofcodeutils/queue.py
rename to src/adventofcode/utils/queue.py
diff --git a/src/adventofcodeutils/stack.py b/src/adventofcode/utils/stack.py
similarity index 100%
rename from src/adventofcodeutils/stack.py
rename to src/adventofcode/utils/stack.py
diff --git a/src/adventofcode2016/day01.py b/src/adventofcode2016/day01.py
index 834a367e..dd7a32f0 100644
--- a/src/adventofcode2016/day01.py
+++ b/src/adventofcode2016/day01.py
@@ -1,9 +1,9 @@
 from __future__ import annotations
 
 import attrs
-from adventofcodeutils.point import XYPoint
 
 from adventofcode.utils.abstract import FileReaderSolution
+from adventofcode.utils.point import XYPoint
 
 
 @attrs.define(kw_only=True)
diff --git a/src/adventofcode2016/day02.py b/src/adventofcode2016/day02.py
index 548b031b..753bef9b 100644
--- a/src/adventofcode2016/day02.py
+++ b/src/adventofcode2016/day02.py
@@ -1,8 +1,7 @@
 from collections import defaultdict
 
-from adventofcodeutils.point import XYPoint
-
 from adventofcode.utils.abstract import FileReaderSolution
+from adventofcode.utils.point import XYPoint
 
 
 class Day02:
diff --git a/src/adventofcode2016/day08.py b/src/adventofcode2016/day08.py
index f31e83a2..c8b7cf48 100644
--- a/src/adventofcode2016/day08.py
+++ b/src/adventofcode2016/day08.py
@@ -4,9 +4,9 @@
 
 import attrs
 import numpy as np
-from adventofcodeutils.parsing import extract_digits_from_string
 
 from adventofcode.utils.abstract import FileReaderSolution
+from adventofcode.utils.parsing import extract_digits_from_string
 
 
 class Operation(Enum):
diff --git a/src/adventofcode2016/day10.py b/src/adventofcode2016/day10.py
index 9292d125..2170f104 100644
--- a/src/adventofcode2016/day10.py
+++ b/src/adventofcode2016/day10.py
@@ -5,9 +5,9 @@
 from collections import defaultdict
 
 import attrs
-from adventofcodeutils.parsing import extract_digits_from_string
 
 from adventofcode.utils.abstract import FileReaderSolution
+from adventofcode.utils.parsing import extract_digits_from_string
 
 
 @attrs.define
diff --git a/src/adventofcode2016/day11.py b/src/adventofcode2016/day11.py
index c55d1d25..6d811d55 100644
--- a/src/adventofcode2016/day11.py
+++ b/src/adventofcode2016/day11.py
@@ -2,9 +2,8 @@
 
 import itertools
 
-from adventofcodeutils.generic_search import BFS
-
 from adventofcode.utils.abstract import FileReaderSolution
+from adventofcode.utils.generic_search import BFS
 
 
 class FacilityState:
diff --git a/src/adventofcode2016/day13.py b/src/adventofcode2016/day13.py
index 541782c7..549d850b 100644
--- a/src/adventofcode2016/day13.py
+++ b/src/adventofcode2016/day13.py
@@ -5,9 +5,9 @@
 from functools import cache
 
 import attrs
-from adventofcodeutils.generic_search import Astar
 
 from adventofcode.utils.abstract import FileReaderSolution
+from adventofcode.utils.generic_search import Astar
 
 
 @attrs.define(frozen=True)
diff --git a/src/adventofcode2016/day15.py b/src/adventofcode2016/day15.py
index d78a6f24..496671f7 100644
--- a/src/adventofcode2016/day15.py
+++ b/src/adventofcode2016/day15.py
@@ -1,9 +1,9 @@
 from __future__ import annotations
 
 import attrs
-from adventofcodeutils.parsing import extract_digits_from_string
 
 from adventofcode.utils.abstract import FileReaderSolution
+from adventofcode.utils.parsing import extract_digits_from_string
 
 
 @attrs.define
diff --git a/src/adventofcode2016/day17.py b/src/adventofcode2016/day17.py
index b08fba48..5b3029ac 100644
--- a/src/adventofcode2016/day17.py
+++ b/src/adventofcode2016/day17.py
@@ -6,9 +6,9 @@
 from functools import cache
 
 import attrs
-from adventofcodeutils.generic_search import DFS, Astar
 
 from adventofcode.utils.abstract import FileReaderSolution
+from adventofcode.utils.generic_search import DFS, Astar
 
 
 @cache
diff --git a/src/adventofcode2016/day20.py b/src/adventofcode2016/day20.py
index 4cb43982..d89c2d53 100644
--- a/src/adventofcode2016/day20.py
+++ b/src/adventofcode2016/day20.py
@@ -2,9 +2,8 @@
 
 import logging
 
-from adventofcodeutils.parsing import extract_digits_from_string
-
 from adventofcode.utils.abstract import FileReaderSolution
+from adventofcode.utils.parsing import extract_digits_from_string
 
 
 class Day20:
diff --git a/src/adventofcode2016/day22.py b/src/adventofcode2016/day22.py
index de9f90b3..fd7de96d 100644
--- a/src/adventofcode2016/day22.py
+++ b/src/adventofcode2016/day22.py
@@ -1,9 +1,9 @@
 from __future__ import annotations
 
 import attrs
-from adventofcodeutils.parsing import extract_digits_from_string
 
 from adventofcode.utils.abstract import FileReaderSolution
+from adventofcode.utils.parsing import extract_digits_from_string
 
 
 @attrs.define
diff --git a/src/adventofcode2019/day04.py b/src/adventofcode2019/day04.py
index c8cafe6f..adcd2c70 100644
--- a/src/adventofcode2019/day04.py
+++ b/src/adventofcode2019/day04.py
@@ -1,6 +1,5 @@
-from adventofcodeutils.parsing import string_to_list_of_ints
-
 from adventofcode.utils.abstract import FileReaderSolution
+from adventofcode.utils.parsing import string_to_list_of_ints
 
 
 class Day04:
diff --git a/src/adventofcode2019/day05.py b/src/adventofcode2019/day05.py
index 3075fe62..6abdd563 100644
--- a/src/adventofcode2019/day05.py
+++ b/src/adventofcode2019/day05.py
@@ -1,7 +1,6 @@
-from adventofcodeutils.parsing import string_to_list_of_ints
-
 from adventofcode2019.intcode import IntCode
 from adventofcode.utils.abstract import FileReaderSolution
+from adventofcode.utils.parsing import string_to_list_of_ints
 
 
 class Day05:
diff --git a/src/adventofcode2019/day07.py b/src/adventofcode2019/day07.py
index 1a053514..f49a89e1 100644
--- a/src/adventofcode2019/day07.py
+++ b/src/adventofcode2019/day07.py
@@ -1,9 +1,8 @@
 import itertools
 
-from adventofcodeutils.parsing import string_to_list_of_ints
-
 from adventofcode2019.intcode import IntCode, ProgramFinished
 from adventofcode.utils.abstract import FileReaderSolution
+from adventofcode.utils.parsing import string_to_list_of_ints
 
 
 class Day07:
diff --git a/src/adventofcode2019/day09.py b/src/adventofcode2019/day09.py
index b4f138aa..11c024f6 100644
--- a/src/adventofcode2019/day09.py
+++ b/src/adventofcode2019/day09.py
@@ -1,7 +1,6 @@
-from adventofcodeutils.parsing import string_to_list_of_ints
-
 from adventofcode2019.intcode import IntCode
 from adventofcode.utils.abstract import FileReaderSolution
+from adventofcode.utils.parsing import string_to_list_of_ints
 
 
 class Day09:
diff --git a/src/adventofcode2019/day11.py b/src/adventofcode2019/day11.py
index aeb89761..67247e6d 100644
--- a/src/adventofcode2019/day11.py
+++ b/src/adventofcode2019/day11.py
@@ -3,10 +3,10 @@
 from typing import NamedTuple
 
 import matplotlib.pyplot as plt  # type: ignore
-from adventofcodeutils.parsing import string_to_list_of_ints
 
 from adventofcode2019.intcode import IntCode, ProgramFinished
 from adventofcode.utils.abstract import FileReaderSolution
+from adventofcode.utils.parsing import string_to_list_of_ints
 
 
 class Location(NamedTuple):
diff --git a/src/adventofcode2019/day13.py b/src/adventofcode2019/day13.py
index 84e0b038..01acdb6e 100644
--- a/src/adventofcode2019/day13.py
+++ b/src/adventofcode2019/day13.py
@@ -1,10 +1,9 @@
 from collections import defaultdict
 from enum import IntEnum
 
-from adventofcodeutils.parsing import string_to_list_of_ints
-
 from adventofcode2019.intcode import IntCode, ProgramFinished
 from adventofcode.utils.abstract import FileReaderSolution
+from adventofcode.utils.parsing import string_to_list_of_ints
 
 
 class Tile(IntEnum):
diff --git a/src/adventofcode2019/day15.py b/src/adventofcode2019/day15.py
index 0a674986..6e4ac722 100644
--- a/src/adventofcode2019/day15.py
+++ b/src/adventofcode2019/day15.py
@@ -2,10 +2,9 @@
 from enum import IntEnum
 from typing import NamedTuple
 
-from adventofcodeutils.parsing import string_to_list_of_ints
-
 from adventofcode2019.intcode import IntCode
 from adventofcode.utils.abstract import FileReaderSolution
+from adventofcode.utils.parsing import string_to_list_of_ints
 
 
 class Point(NamedTuple):
diff --git a/src/adventofcode2019/day16.py b/src/adventofcode2019/day16.py
index 6d045465..73b8735f 100644
--- a/src/adventofcode2019/day16.py
+++ b/src/adventofcode2019/day16.py
@@ -1,6 +1,5 @@
-from adventofcodeutils.parsing import string_of_single_to_list_of_ints
-
 from adventofcode.utils.abstract import FileReaderSolution
+from adventofcode.utils.parsing import string_of_single_to_list_of_ints
 
 
 class Day16:
diff --git a/src/adventofcode2019/day17.py b/src/adventofcode2019/day17.py
index 27f69268..32553d1c 100644
--- a/src/adventofcode2019/day17.py
+++ b/src/adventofcode2019/day17.py
@@ -1,9 +1,8 @@
 from collections import defaultdict
 
-from adventofcodeutils.parsing import string_to_list_of_ints
-
 from adventofcode2019.intcode import IntCode, ProgramFinished
 from adventofcode.utils.abstract import FileReaderSolution
+from adventofcode.utils.parsing import string_to_list_of_ints
 
 
 class Day17:
diff --git a/src/adventofcode2021/day10.py b/src/adventofcode2021/day10.py
index 51702366..783dbcf9 100644
--- a/src/adventofcode2021/day10.py
+++ b/src/adventofcode2021/day10.py
@@ -1,6 +1,5 @@
-from adventofcodeutils.stack import Stack
-
 from adventofcode.utils.abstract import FileReaderSolution
+from adventofcode.utils.stack import Stack
 
 
 class Day10:
diff --git a/src/adventofcode2021/day12.py b/src/adventofcode2021/day12.py
index f5bebfdd..e8735be7 100644
--- a/src/adventofcode2021/day12.py
+++ b/src/adventofcode2021/day12.py
@@ -1,10 +1,9 @@
 from __future__ import annotations
 
-from adventofcodeutils.graph import Graph
-from adventofcodeutils.node import Node
-from adventofcodeutils.stack import Stack
-
 from adventofcode.utils.abstract import FileReaderSolution
+from adventofcode.utils.graph import Graph
+from adventofcode.utils.node import Node
+from adventofcode.utils.stack import Stack
 
 
 class Day12:
diff --git a/src/adventofcode2021/day13.py b/src/adventofcode2021/day13.py
index b2f1d954..c6fa4e8e 100644
--- a/src/adventofcode2021/day13.py
+++ b/src/adventofcode2021/day13.py
@@ -1,9 +1,8 @@
 import re
 from collections import defaultdict
 
-from adventofcodeutils.queue import Queue
-
 from adventofcode.utils.abstract import FileReaderSolution
+from adventofcode.utils.queue import Queue
 
 
 class Day13:
diff --git a/src/adventofcode2021/day15.py b/src/adventofcode2021/day15.py
index b41e447c..c3467b1e 100644
--- a/src/adventofcode2021/day15.py
+++ b/src/adventofcode2021/day15.py
@@ -4,10 +4,9 @@
 from collections.abc import Iterator
 from functools import cache
 
-from adventofcodeutils.node import Node
-from adventofcodeutils.priority_queue import PriorityQueue
-
 from adventofcode.utils.abstract import FileReaderSolution
+from adventofcode.utils.node import Node
+from adventofcode.utils.priority_queue import PriorityQueue
 
 Point = tuple[int, int]
 
diff --git a/src/adventofcode2021/day18.py b/src/adventofcode2021/day18.py
index 93b8b7ea..395ddf3e 100644
--- a/src/adventofcode2021/day18.py
+++ b/src/adventofcode2021/day18.py
@@ -4,9 +4,8 @@
 import math
 from collections import deque
 
-from adventofcodeutils.priority_queue import PriorityQueue
-
 from adventofcode.utils.abstract import FileReaderSolution
+from adventofcode.utils.priority_queue import PriorityQueue
 
 
 class Snail:
diff --git a/src/adventofcode2021/day19.py b/src/adventofcode2021/day19.py
index cb6c07fa..e0a021cb 100644
--- a/src/adventofcode2021/day19.py
+++ b/src/adventofcode2021/day19.py
@@ -2,9 +2,8 @@
 import itertools
 from typing import NamedTuple
 
-from adventofcodeutils.point import XYZPoint as Point
-
 from adventofcode.utils.abstract import FileReaderSolution
+from adventofcode.utils.point import XYZPoint as Point
 
 
 class Scanner(NamedTuple):
diff --git a/src/adventofcode2021/day20.py b/src/adventofcode2021/day20.py
index 13c7f59d..abd2e5c3 100644
--- a/src/adventofcode2021/day20.py
+++ b/src/adventofcode2021/day20.py
@@ -1,8 +1,7 @@
 from collections import defaultdict
 
-from adventofcodeutils.point import XYPoint as Point
-
 from adventofcode.utils.abstract import FileReaderSolution
+from adventofcode.utils.point import XYPoint as Point
 
 
 class Day20:
diff --git a/src/adventofcode2021/day22.py b/src/adventofcode2021/day22.py
index 9aa702fe..794ab013 100644
--- a/src/adventofcode2021/day22.py
+++ b/src/adventofcode2021/day22.py
@@ -5,9 +5,8 @@
 from itertools import filterfalse
 from typing import NamedTuple
 
-from adventofcodeutils.point import XYZPoint as Point
-
 from adventofcode.utils.abstract import FileReaderSolution
+from adventofcode.utils.point import XYZPoint as Point
 
 
 class Step(NamedTuple):
diff --git a/src/adventofcode2022/day05.py b/src/adventofcode2022/day05.py
index 4836e6f8..628d37a9 100644
--- a/src/adventofcode2022/day05.py
+++ b/src/adventofcode2022/day05.py
@@ -1,10 +1,10 @@
 from abc import abstractmethod
 from typing import NamedTuple
 
-from adventofcodeutils.stack import Stack
 from parse import parse
 
 from adventofcode.utils.abstract import FileReaderSolution
+from adventofcode.utils.stack import Stack
 
 
 class Instruction(NamedTuple):
diff --git a/src/adventofcode2022/day08.py b/src/adventofcode2022/day08.py
index 884be7c4..25b1b238 100644
--- a/src/adventofcode2022/day08.py
+++ b/src/adventofcode2022/day08.py
@@ -1,8 +1,7 @@
 import math
 
-from adventofcodeutils.point import XYPoint as Point
-
 from adventofcode.utils.abstract import FileReaderSolution
+from adventofcode.utils.point import XYPoint as Point
 
 
 class Day08:
diff --git a/src/adventofcode2022/day09.py b/src/adventofcode2022/day09.py
index 1f5b7f5b..52c3a434 100644
--- a/src/adventofcode2022/day09.py
+++ b/src/adventofcode2022/day09.py
@@ -1,7 +1,7 @@
 import more_itertools
-from adventofcodeutils.point import XYPoint as Point
 
 from adventofcode.utils.abstract import FileReaderSolution
+from adventofcode.utils.point import XYPoint as Point
 
 
 class Day09:
diff --git a/src/adventofcode2022/day11.py b/src/adventofcode2022/day11.py
index 36b644f9..4772a0d2 100644
--- a/src/adventofcode2022/day11.py
+++ b/src/adventofcode2022/day11.py
@@ -4,9 +4,9 @@
 from typing import NamedTuple
 
 import parse
-from adventofcodeutils.queue import Queue
 
 from adventofcode.utils.abstract import FileReaderSolution
+from adventofcode.utils.queue import Queue
 
 
 class Throw(NamedTuple):
diff --git a/src/adventofcode2022/day12.py b/src/adventofcode2022/day12.py
index a550bbbb..c1463a48 100644
--- a/src/adventofcode2022/day12.py
+++ b/src/adventofcode2022/day12.py
@@ -1,8 +1,7 @@
-from adventofcodeutils.generic_search import BFS
-from adventofcodeutils.node import Node
-from adventofcodeutils.point import XYPoint as Point
-
 from adventofcode.utils.abstract import FileReaderSolution
+from adventofcode.utils.generic_search import BFS
+from adventofcode.utils.node import Node
+from adventofcode.utils.point import XYPoint as Point
 
 
 class Day12:
diff --git a/src/adventofcode2022/day14.py b/src/adventofcode2022/day14.py
index b06245df..4442e016 100644
--- a/src/adventofcode2022/day14.py
+++ b/src/adventofcode2022/day14.py
@@ -1,9 +1,8 @@
 from collections import defaultdict
 from enum import StrEnum
 
-from adventofcodeutils.point import XYPoint as Point
-
 from adventofcode.utils.abstract import FileReaderSolution
+from adventofcode.utils.point import XYPoint as Point
 
 
 class Pixel(StrEnum):
diff --git a/src/adventofcode2022/day15.py b/src/adventofcode2022/day15.py
index 46521d42..3e1239c9 100644
--- a/src/adventofcode2022/day15.py
+++ b/src/adventofcode2022/day15.py
@@ -1,9 +1,9 @@
 from typing import NamedTuple
 
-from adventofcodeutils.point import XYPoint as Point
 from parse import parse
 
 from adventofcode.utils.abstract import FileReaderSolution
+from adventofcode.utils.point import XYPoint as Point
 
 
 class Line(NamedTuple):
diff --git a/src/adventofcode2023/day04.py b/src/adventofcode2023/day04.py
index 1ebd2a95..5dbb3df9 100644
--- a/src/adventofcode2023/day04.py
+++ b/src/adventofcode2023/day04.py
@@ -3,9 +3,9 @@
 from collections import Counter
 
 import attrs
-from adventofcodeutils.parsing import extract_digits_from_string
 
 from adventofcode.utils.abstract import FileReaderSolution
+from adventofcode.utils.parsing import extract_digits_from_string
 
 
 @attrs.define
diff --git a/src/adventofcode2023/day06.py b/src/adventofcode2023/day06.py
index 7b61606e..2e111093 100644
--- a/src/adventofcode2023/day06.py
+++ b/src/adventofcode2023/day06.py
@@ -3,9 +3,9 @@
 import math
 
 import attrs
-from adventofcodeutils.parsing import extract_digits_from_string
 
 from adventofcode.utils.abstract import FileReaderSolution
+from adventofcode.utils.parsing import extract_digits_from_string
 
 
 @attrs.define(frozen=True)
diff --git a/tests/adventofcode2021/test_day20_a.py b/tests/adventofcode2021/test_day20_a.py
index a560509e..a7cccc0d 100644
--- a/tests/adventofcode2021/test_day20_a.py
+++ b/tests/adventofcode2021/test_day20_a.py
@@ -1,6 +1,5 @@
-from adventofcodeutils.point import XYPoint as Point
-
 from adventofcode2021.day20 import Day20PartA
+from adventofcode.utils.point import XYPoint as Point
 
 
 class TestDay20PartA:
diff --git a/tests/adventofcode2022/test_day08_a.py b/tests/adventofcode2022/test_day08_a.py
index 0a9a4118..6312fdcb 100644
--- a/tests/adventofcode2022/test_day08_a.py
+++ b/tests/adventofcode2022/test_day08_a.py
@@ -1,9 +1,9 @@
 from textwrap import dedent
 
 import pytest
-from adventofcodeutils.point import XYPoint as Point
 
 from adventofcode2022.day08 import Day08PartA
+from adventofcode.utils.point import XYPoint as Point
 
 
 class TestDay08PartA:
diff --git a/tests/adventofcode2022/test_day08_b.py b/tests/adventofcode2022/test_day08_b.py
index ca4f732e..0eeb2dd3 100644
--- a/tests/adventofcode2022/test_day08_b.py
+++ b/tests/adventofcode2022/test_day08_b.py
@@ -1,8 +1,7 @@
 from textwrap import dedent
 
-from adventofcodeutils.point import XYPoint as Point
-
 from adventofcode2022.day08 import Day08PartB
+from adventofcode.utils.point import XYPoint as Point
 
 
 class TestDay08PartB:
diff --git a/tests/test_advent_utils.py b/tests/test_advent_utils.py
index 24463c86..eb14991f 100644
--- a/tests/test_advent_utils.py
+++ b/tests/test_advent_utils.py
@@ -1,6 +1,6 @@
 import pytest
 
-from adventofcodeutils import parsing
+from adventofcode.utils import parsing
 
 
 def test_string_to_list_of_ints():
diff --git a/tests/test_graph.py b/tests/test_graph.py
index a57ffd9f..58f306a4 100644
--- a/tests/test_graph.py
+++ b/tests/test_graph.py
@@ -1,4 +1,4 @@
-from adventofcodeutils.graph import Edge, Graph
+from adventofcode.utils.graph import Edge, Graph
 
 
 def test_graph():
diff --git a/tests/test_node.py b/tests/test_node.py
index a599d7ac..3ab08264 100644
--- a/tests/test_node.py
+++ b/tests/test_node.py
@@ -1,4 +1,4 @@
-from adventofcodeutils.node import Node
+from adventofcode.utils.node import Node
 
 
 def test_node():
diff --git a/tests/test_point.py b/tests/test_point.py
index 49fd719d..a7e32a28 100644
--- a/tests/test_point.py
+++ b/tests/test_point.py
@@ -1,6 +1,6 @@
 import pytest
 
-from adventofcodeutils import point
+from adventofcode.utils import point
 
 
 def test_xyzpoint():
diff --git a/tests/test_priority_queue.py b/tests/test_priority_queue.py
index 0842e808..56e8e664 100644
--- a/tests/test_priority_queue.py
+++ b/tests/test_priority_queue.py
@@ -1,6 +1,6 @@
 import pytest
 
-from adventofcodeutils.priority_queue import PriorityQueue
+from adventofcode.utils.priority_queue import PriorityQueue
 
 
 def test_priorityqueue():
diff --git a/tests/test_queue.py b/tests/test_queue.py
index 87dbcace..59f26373 100644
--- a/tests/test_queue.py
+++ b/tests/test_queue.py
@@ -1,6 +1,6 @@
 import pytest
 
-from adventofcodeutils.queue import Queue
+from adventofcode.utils.queue import Queue
 
 
 def test_queue():
diff --git a/tests/test_stack.py b/tests/test_stack.py
index 90ad706a..9271992c 100644
--- a/tests/test_stack.py
+++ b/tests/test_stack.py
@@ -1,6 +1,6 @@
 import pytest
 
-from adventofcodeutils.stack import Stack
+from adventofcode.utils.stack import Stack
 
 
 def test_stack():

From 45dc1d1e4975e6b50712e162a91029e0ade38fca Mon Sep 17 00:00:00 2001
From: Roel Adriaans <roel@adriaans.org>
Date: Wed, 13 Dec 2023 21:42:30 +0100
Subject: [PATCH 368/371] Expant now works

---
 src/adventofcode2023/day11.py          | 33 ++++++++++++++++++++++----
 tests/adventofcode2023/test_day11_a.py | 15 ++++++++++--
 2 files changed, 41 insertions(+), 7 deletions(-)

diff --git a/src/adventofcode2023/day11.py b/src/adventofcode2023/day11.py
index 80df8c45..1514c5ca 100644
--- a/src/adventofcode2023/day11.py
+++ b/src/adventofcode2023/day11.py
@@ -16,16 +16,18 @@ def parse(self, input_data: str):
         self.galaxy_points = []
         self.used_x = set()
         self.used_y = set()
+        number = 1
 
         for x, line in enumerate(input_data.splitlines()):
             for y, char in enumerate(line):
                 if char == "#":
-                    self.galaxy_points.append(Point(x, y))
+                    self.galaxy_points.append(Point(x, y, number))
                     self.used_x.add(x)
                     self.used_y.add(y)
+                    number += 1
 
-                self.max_y = y
-            self.max_x = x
+                self.max_y = y + 1
+            self.max_x = x + 1
 
     @staticmethod
     def missing_elements(elements):
@@ -45,7 +47,7 @@ def expand_universe(self):
             points_to_add = []
             for point in self.galaxy_points:
                 if point.x > x + offset_x:
-                    points_to_add.append(Point(point.x + offset_x + 1, point.y))
+                    points_to_add.append(Point(point.x + 1, point.y, point.nr))
                     points_do_delete.append(point)
             for point in points_do_delete:
                 del self.galaxy_points[self.galaxy_points.index(point)]
@@ -56,12 +58,15 @@ def expand_universe(self):
             points_to_add = []
             for point in self.galaxy_points:
                 if point.y > y + offset_y:
-                    points_to_add.append(Point(point.x, point.y + offset_y + 1))
+                    points_to_add.append(Point(point.x, point.y + 1, point.nr))
                     points_do_delete.append(point)
+
             for point in points_do_delete:
                 del self.galaxy_points[self.galaxy_points.index(point)]
             self.galaxy_points.extend(points_to_add)
             offset_y += 1
+        self.max_x = max(point.x for point in self.galaxy_points) + 1
+        self.max_y = max(point.y for point in self.galaxy_points) + 1
 
     def compute_shortest_paths(self) -> list[list[int]]:
         """Compute the shortest paths between pairs"""
@@ -69,11 +74,29 @@ def compute_shortest_paths(self) -> list[list[int]]:
         # distance? I don't know...
         return []
 
+    def print_solution(self):
+        print()
+        for x in range(self.max_x):
+            line = []
+            for y in range(self.max_y):
+                point = next(
+                    (pp for pp in self.galaxy_points if pp == Point(x, y, 0)), None
+                )
+                if point:
+                    line.append(str(point.nr))
+                else:
+                    line.append(".")
+            print("".join(line))
+        print()
+
 
 class Day11PartA(Day11, FileReaderSolution):
     def solve(self, input_data: str) -> int:
         self.parse(input_data)
+        self.print_solution()
+
         self.expand_universe()
+        self.print_solution()
         shortest_paths = self.compute_shortest_paths()
         return sum(len(path) for path in shortest_paths)
 
diff --git a/tests/adventofcode2023/test_day11_a.py b/tests/adventofcode2023/test_day11_a.py
index d74e5fb0..3f2e215c 100644
--- a/tests/adventofcode2023/test_day11_a.py
+++ b/tests/adventofcode2023/test_day11_a.py
@@ -20,8 +20,19 @@ def test_day11a_expand(self, testdata):
         assert len(solution.galaxy_points) == 9
         # First one moved on to the right
         # Check if they are int the list, ordering may have been shuffled
-        assert Point(0, 4) in solution.galaxy_points
-        assert Point(12, 5) in solution.galaxy_points
+        point_1 = [p for p in solution.galaxy_points if p.nr == 1][0]
+        assert point_1.x == 0
+        assert point_1.y == 4
+
+        # Find point should be on location (1, 9)
+        point_2 = [p for p in solution.galaxy_points if p.nr == 2][0]
+        assert point_2.x == 1
+        assert point_2.y == 9
+
+        # Find point 9
+        point_9 = [p for p in solution.galaxy_points if p.nr == 9][0]
+        assert point_9.x == 11
+        assert point_9.y == 5
 
     def test_day11a_testdata(self, testdata):
         solution = Day11PartA()

From 6cea998287849730d6dc08b6f287d6b3b150b81b Mon Sep 17 00:00:00 2001
From: Roel Adriaans <roel@adriaans.org>
Date: Wed, 13 Dec 2023 22:07:46 +0100
Subject: [PATCH 369/371] Update deps

---
 .pre-commit-config.yaml |   4 +-
 poetry.lock             | 209 ++++++++++++++++++----------------------
 pyproject.toml          |   6 +-
 3 files changed, 100 insertions(+), 119 deletions(-)

diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index 71714969..7ca489e8 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -2,7 +2,7 @@
 
 repos:
   - repo: https://github.com/ambv/black
-    rev: 23.11.0
+    rev: 23.12.0
     hooks:
     - id: black
       language_version: 'python3.12'
@@ -14,7 +14,7 @@ repos:
       args: ["--ignore", "E203,W503"]
 
   - repo: https://github.com/PyCQA/isort
-    rev: 5.12.0
+    rev: 5.13.2
     hooks:
     - id: isort
 
diff --git a/poetry.lock b/poetry.lock
index 9c06a1e8..6ecd1a55 100644
--- a/poetry.lock
+++ b/poetry.lock
@@ -2,7 +2,7 @@
 
 [[package]]
 name = "adventofcodeutils"
-version = "0.3.0"
+version = "0.4.0"
 description = "This repository contains some utils used by my advent of code projects. "
 optional = false
 python-versions = "^3.11"
@@ -16,7 +16,7 @@ attrs = "^23.1.0"
 type = "git"
 url = "https://github.com/RoelAdriaans/adventofcodeutils.git"
 reference = "HEAD"
-resolved_reference = "865f86a58af3daadf75678b0ff29bb53b62df17a"
+resolved_reference = "bf30c54ec5c2f58d89e65ad0f16022ddaa680851"
 
 [[package]]
 name = "anytree"
@@ -103,29 +103,33 @@ chardet = ">=3.0.2"
 
 [[package]]
 name = "black"
-version = "23.11.0"
+version = "23.12.0"
 description = "The uncompromising code formatter."
 optional = false
 python-versions = ">=3.8"
 files = [
-    {file = "black-23.11.0-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:dbea0bb8575c6b6303cc65017b46351dc5953eea5c0a59d7b7e3a2d2f433a911"},
-    {file = "black-23.11.0-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:412f56bab20ac85927f3a959230331de5614aecda1ede14b373083f62ec24e6f"},
-    {file = "black-23.11.0-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:d136ef5b418c81660ad847efe0e55c58c8208b77a57a28a503a5f345ccf01394"},
-    {file = "black-23.11.0-cp310-cp310-win_amd64.whl", hash = "sha256:6c1cac07e64433f646a9a838cdc00c9768b3c362805afc3fce341af0e6a9ae9f"},
-    {file = "black-23.11.0-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:cf57719e581cfd48c4efe28543fea3d139c6b6f1238b3f0102a9c73992cbb479"},
-    {file = "black-23.11.0-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:698c1e0d5c43354ec5d6f4d914d0d553a9ada56c85415700b81dc90125aac244"},
-    {file = "black-23.11.0-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:760415ccc20f9e8747084169110ef75d545f3b0932ee21368f63ac0fee86b221"},
-    {file = "black-23.11.0-cp311-cp311-win_amd64.whl", hash = "sha256:58e5f4d08a205b11800332920e285bd25e1a75c54953e05502052738fe16b3b5"},
-    {file = "black-23.11.0-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:45aa1d4675964946e53ab81aeec7a37613c1cb71647b5394779e6efb79d6d187"},
-    {file = "black-23.11.0-cp38-cp38-macosx_11_0_arm64.whl", hash = "sha256:4c44b7211a3a0570cc097e81135faa5f261264f4dfaa22bd5ee2875a4e773bd6"},
-    {file = "black-23.11.0-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:2a9acad1451632021ee0d146c8765782a0c3846e0e0ea46659d7c4f89d9b212b"},
-    {file = "black-23.11.0-cp38-cp38-win_amd64.whl", hash = "sha256:fc7f6a44d52747e65a02558e1d807c82df1d66ffa80a601862040a43ec2e3142"},
-    {file = "black-23.11.0-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:7f622b6822f02bfaf2a5cd31fdb7cd86fcf33dab6ced5185c35f5db98260b055"},
-    {file = "black-23.11.0-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:250d7e60f323fcfc8ea6c800d5eba12f7967400eb6c2d21ae85ad31c204fb1f4"},
-    {file = "black-23.11.0-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:5133f5507007ba08d8b7b263c7aa0f931af5ba88a29beacc4b2dc23fcefe9c06"},
-    {file = "black-23.11.0-cp39-cp39-win_amd64.whl", hash = "sha256:421f3e44aa67138ab1b9bfbc22ee3780b22fa5b291e4db8ab7eee95200726b07"},
-    {file = "black-23.11.0-py3-none-any.whl", hash = "sha256:54caaa703227c6e0c87b76326d0862184729a69b73d3b7305b6288e1d830067e"},
-    {file = "black-23.11.0.tar.gz", hash = "sha256:4c68855825ff432d197229846f971bc4d6666ce90492e5b02013bcaca4d9ab05"},
+    {file = "black-23.12.0-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:67f19562d367468ab59bd6c36a72b2c84bc2f16b59788690e02bbcb140a77175"},
+    {file = "black-23.12.0-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:bbd75d9f28a7283b7426160ca21c5bd640ca7cd8ef6630b4754b6df9e2da8462"},
+    {file = "black-23.12.0-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:593596f699ca2dcbbbdfa59fcda7d8ad6604370c10228223cd6cf6ce1ce7ed7e"},
+    {file = "black-23.12.0-cp310-cp310-win_amd64.whl", hash = "sha256:12d5f10cce8dc27202e9a252acd1c9a426c83f95496c959406c96b785a92bb7d"},
+    {file = "black-23.12.0-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:e73c5e3d37e5a3513d16b33305713237a234396ae56769b839d7c40759b8a41c"},
+    {file = "black-23.12.0-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:ba09cae1657c4f8a8c9ff6cfd4a6baaf915bb4ef7d03acffe6a2f6585fa1bd01"},
+    {file = "black-23.12.0-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:ace64c1a349c162d6da3cef91e3b0e78c4fc596ffde9413efa0525456148873d"},
+    {file = "black-23.12.0-cp311-cp311-win_amd64.whl", hash = "sha256:72db37a2266b16d256b3ea88b9affcdd5c41a74db551ec3dd4609a59c17d25bf"},
+    {file = "black-23.12.0-cp312-cp312-macosx_10_9_x86_64.whl", hash = "sha256:fdf6f23c83078a6c8da2442f4d4eeb19c28ac2a6416da7671b72f0295c4a697b"},
+    {file = "black-23.12.0-cp312-cp312-macosx_11_0_arm64.whl", hash = "sha256:39dda060b9b395a6b7bf9c5db28ac87b3c3f48d4fdff470fa8a94ab8271da47e"},
+    {file = "black-23.12.0-cp312-cp312-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:7231670266ca5191a76cb838185d9be59cfa4f5dd401b7c1c70b993c58f6b1b5"},
+    {file = "black-23.12.0-cp312-cp312-win_amd64.whl", hash = "sha256:193946e634e80bfb3aec41830f5d7431f8dd5b20d11d89be14b84a97c6b8bc75"},
+    {file = "black-23.12.0-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:bcf91b01ddd91a2fed9a8006d7baa94ccefe7e518556470cf40213bd3d44bbbc"},
+    {file = "black-23.12.0-cp38-cp38-macosx_11_0_arm64.whl", hash = "sha256:996650a89fe5892714ea4ea87bc45e41a59a1e01675c42c433a35b490e5aa3f0"},
+    {file = "black-23.12.0-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:bdbff34c487239a63d86db0c9385b27cdd68b1bfa4e706aa74bb94a435403672"},
+    {file = "black-23.12.0-cp38-cp38-win_amd64.whl", hash = "sha256:97af22278043a6a1272daca10a6f4d36c04dfa77e61cbaaf4482e08f3640e9f0"},
+    {file = "black-23.12.0-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:ead25c273adfad1095a8ad32afdb8304933efba56e3c1d31b0fee4143a1e424a"},
+    {file = "black-23.12.0-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:c71048345bdbced456cddf1622832276d98a710196b842407840ae8055ade6ee"},
+    {file = "black-23.12.0-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:81a832b6e00eef2c13b3239d514ea3b7d5cc3eaa03d0474eedcbbda59441ba5d"},
+    {file = "black-23.12.0-cp39-cp39-win_amd64.whl", hash = "sha256:6a82a711d13e61840fb11a6dfecc7287f2424f1ca34765e70c909a35ffa7fb95"},
+    {file = "black-23.12.0-py3-none-any.whl", hash = "sha256:a7c07db8200b5315dc07e331dda4d889a56f6bf4db6a9c2a526fa3166a81614f"},
+    {file = "black-23.12.0.tar.gz", hash = "sha256:330a327b422aca0634ecd115985c1c7fd7bdb5b5a2ef8aa9888a82e2ebe9437a"},
 ]
 
 [package.dependencies]
@@ -137,7 +141,7 @@ platformdirs = ">=2"
 
 [package.extras]
 colorama = ["colorama (>=0.4.3)"]
-d = ["aiohttp (>=3.7.4)"]
+d = ["aiohttp (>=3.7.4)", "aiohttp (>=3.7.4,!=3.9.0)"]
 jupyter = ["ipython (>=7.8.0)", "tokenize-rt (>=3.2.0)"]
 uvloop = ["uvloop (>=0.15.2)"]
 
@@ -474,13 +478,13 @@ tests = ["pytest", "pytest-cov", "pytest-xdist"]
 
 [[package]]
 name = "distlib"
-version = "0.3.7"
+version = "0.3.8"
 description = "Distribution utilities"
 optional = false
 python-versions = "*"
 files = [
-    {file = "distlib-0.3.7-py2.py3-none-any.whl", hash = "sha256:2e24928bc811348f0feb63014e97aaae3037f2cf48712d51ae61df7fd6075057"},
-    {file = "distlib-0.3.7.tar.gz", hash = "sha256:9dafe54b34a028eafd95039d5e5d4851a13734540f1331060d31c9916e7147a8"},
+    {file = "distlib-0.3.8-py2.py3-none-any.whl", hash = "sha256:034db59a0b96f8ca18035f36290806a9a6e6bd9d1ff91e45a7f172eb17e51784"},
+    {file = "distlib-0.3.8.tar.gz", hash = "sha256:1530ea13e350031b6312d8580ddb6b27a104275a31106523b8f123787f494f64"},
 ]
 
 [[package]]
@@ -515,53 +519,53 @@ typing = ["typing-extensions (>=4.8)"]
 
 [[package]]
 name = "fonttools"
-version = "4.45.1"
+version = "4.46.0"
 description = "Tools to manipulate font files"
 optional = false
 python-versions = ">=3.8"
 files = [
-    {file = "fonttools-4.45.1-cp310-cp310-macosx_10_9_universal2.whl", hash = "sha256:45fa321c458ea29224067700954ec44493ae869b47e7c5485a350a149a19fb53"},
-    {file = "fonttools-4.45.1-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:0dc7617d96b1e668eea9250e1c1fe62d0c78c3f69573ce7e3332cc40e6d84356"},
-    {file = "fonttools-4.45.1-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:03ed3bda541e86725f6b4e1b94213f13ed1ae51a5a1f167028534cedea38c010"},
-    {file = "fonttools-4.45.1-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:c4f4a5870e3b56788fb196da8cf30d0dfd51a76dc3b907861d018165f76ae4c2"},
-    {file = "fonttools-4.45.1-cp310-cp310-musllinux_1_1_aarch64.whl", hash = "sha256:a3c11d9687479f01eddef729aa737abcdea0a44fdaffb62a930a18892f186c9b"},
-    {file = "fonttools-4.45.1-cp310-cp310-musllinux_1_1_x86_64.whl", hash = "sha256:316cec50581e844c3ab69d7c82455b54c7cf18236b2f09e722faf665fbfcac58"},
-    {file = "fonttools-4.45.1-cp310-cp310-win32.whl", hash = "sha256:e2277cba9f0b525e30de2a9ad3cb4219aa4bc697230c1645666b0deee9f914f0"},
-    {file = "fonttools-4.45.1-cp310-cp310-win_amd64.whl", hash = "sha256:1b9e9ad2bcded9a1431afaa57c8d3c39143ac1f050862d66bddd863c515464a2"},
-    {file = "fonttools-4.45.1-cp311-cp311-macosx_10_9_universal2.whl", hash = "sha256:ff6a698bdd435d24c379f6e8a54908cd9bb7dda23719084d56bf8c87709bf3bd"},
-    {file = "fonttools-4.45.1-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:2c980d60cd6ec1376206fe55013d166e5627ad0b149b5c81e74eaa913ab6134f"},
-    {file = "fonttools-4.45.1-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:a12dee6523c02ca78aeedd0a5e12bfa9b7b29896350edd5241542897b072ae23"},
-    {file = "fonttools-4.45.1-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:37cd1ced6efb3dd6fe82e9f9bf92fd74ac58a5aefc284045f59ecd517a5fb9ab"},
-    {file = "fonttools-4.45.1-cp311-cp311-musllinux_1_1_aarch64.whl", hash = "sha256:e3d24248221bd7151dfff0d88b1b5da02dccd7134bd576ce8888199827bbaa19"},
-    {file = "fonttools-4.45.1-cp311-cp311-musllinux_1_1_x86_64.whl", hash = "sha256:ba6c23591427844dfb0a13658f1718489de75de6a46b64234584c0d17573162d"},
-    {file = "fonttools-4.45.1-cp311-cp311-win32.whl", hash = "sha256:cebcddbe9351b67166292b4f71ffdbfcce01ba4b07d4267824eb46b277aeb19a"},
-    {file = "fonttools-4.45.1-cp311-cp311-win_amd64.whl", hash = "sha256:f22eb69996a0bd49f76bdefb30be54ce8dbb89a0d1246874d610f05c2aa2e69e"},
-    {file = "fonttools-4.45.1-cp312-cp312-macosx_10_9_universal2.whl", hash = "sha256:794de93e83297db7b4943f2431e206d8b1ea69cb3ae14638a49cc50332bf0db8"},
-    {file = "fonttools-4.45.1-cp312-cp312-macosx_10_9_x86_64.whl", hash = "sha256:4ba17822a6681d06849078daaf6e03eccc9f467efe7c4c60280e28a78e8e5df9"},
-    {file = "fonttools-4.45.1-cp312-cp312-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:e50f794d09df0675da8d9dbd7c66bfcab2f74a708343aabcad41936d26556891"},
-    {file = "fonttools-4.45.1-cp312-cp312-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:8b07b857d4f9de3199a8c3d1b1bf2078c0f37447891ca1a8d9234106b9a27aff"},
-    {file = "fonttools-4.45.1-cp312-cp312-musllinux_1_1_aarch64.whl", hash = "sha256:777ba42b94a27bb7fb2b4082522fccfd345667c32a56011e1c3e105979af5b79"},
-    {file = "fonttools-4.45.1-cp312-cp312-musllinux_1_1_x86_64.whl", hash = "sha256:21e96b99878348c74aa58059b8578d7586f9519cbcdadacf56486737038aa043"},
-    {file = "fonttools-4.45.1-cp312-cp312-win32.whl", hash = "sha256:5cbf02cda8465b69769d07385f5d11e7bba19954e7787792f46fe679ec755ebb"},
-    {file = "fonttools-4.45.1-cp312-cp312-win_amd64.whl", hash = "sha256:800e354e0c3afaeb8d9552769773d02f228e98c37b8cb03041157c3d0687cffc"},
-    {file = "fonttools-4.45.1-cp38-cp38-macosx_10_9_universal2.whl", hash = "sha256:6eb2c54f7a07c92108daabcf02caf31df97825738db02a28270633946bcda4d0"},
-    {file = "fonttools-4.45.1-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:43a3d267334109ff849c37cf3629476b5feb392ef1d2e464a167b83de8cd599c"},
-    {file = "fonttools-4.45.1-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:8e1aefc2bf3c43e0f33f995f828a7bbeff4adc9393a7760b11456dbcf14388f6"},
-    {file = "fonttools-4.45.1-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:1f53a19dcdd5737440839b8394eeebb35da9ec8109f7926cb6456639b5b58e47"},
-    {file = "fonttools-4.45.1-cp38-cp38-musllinux_1_1_aarch64.whl", hash = "sha256:5a17706b9cc24b27721613fe5773d93331ab7f0ecaca9955aead89c6b843d3a7"},
-    {file = "fonttools-4.45.1-cp38-cp38-musllinux_1_1_x86_64.whl", hash = "sha256:fb36e5f40191274a95938b40c0a1fa7f895e36935aea8709e1d6deff0b2d0d4f"},
-    {file = "fonttools-4.45.1-cp38-cp38-win32.whl", hash = "sha256:46eabddec12066829b8a1efe45ae552ba2f1796981ecf538d5f68284c354c589"},
-    {file = "fonttools-4.45.1-cp38-cp38-win_amd64.whl", hash = "sha256:b6de2f0fcd3302fb82f94801002cb473959e998c14c24ec28234adb674aed345"},
-    {file = "fonttools-4.45.1-cp39-cp39-macosx_10_9_universal2.whl", hash = "sha256:392d0e3cc23daee910193625f7cf1b387aff9dd5b6f1a5f4a925680acb6dcbc2"},
-    {file = "fonttools-4.45.1-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:4b9544b1346d99848ac0e9b05b5d45ee703d7562fc4c9c48cf4b781de9632e57"},
-    {file = "fonttools-4.45.1-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:8717db3e4895e4820ade64ea379187738827ee60748223cb0438ef044ee208c6"},
-    {file = "fonttools-4.45.1-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:e29d5f298d616a93a4c5963682dc6cc8cc09f6d89cad2c29019fc5fb3b4d9472"},
-    {file = "fonttools-4.45.1-cp39-cp39-musllinux_1_1_aarch64.whl", hash = "sha256:cb472905da3049960e80fc1cf808231880d79727a8410e156bf3e5063a1c574f"},
-    {file = "fonttools-4.45.1-cp39-cp39-musllinux_1_1_x86_64.whl", hash = "sha256:ba299f1fbaa2a1e33210aaaf6fa816d4059e4d3cfe2ae9871368d4ab548c1c6a"},
-    {file = "fonttools-4.45.1-cp39-cp39-win32.whl", hash = "sha256:105099968b58a5b4cef6f3eb409db8ea8578b302a9d05e23fecba1b8b0177b5f"},
-    {file = "fonttools-4.45.1-cp39-cp39-win_amd64.whl", hash = "sha256:847f3f49dd3423e5a678c098e2ba92c7f4955d4aab3044f6a507b0bb0ecb07e0"},
-    {file = "fonttools-4.45.1-py3-none-any.whl", hash = "sha256:3bdd7dfca8f6c9f4779384064027e8477ad6a037d6a327b09381f43e0247c6f3"},
-    {file = "fonttools-4.45.1.tar.gz", hash = "sha256:6e441286d55fe7ec7c4fb36812bf914924813776ff514b744b510680fc2733f2"},
+    {file = "fonttools-4.46.0-cp310-cp310-macosx_10_9_universal2.whl", hash = "sha256:d4e69e2c7f93b695d2e6f18f709d501d945f65c1d237dafaabdd23cd935a5276"},
+    {file = "fonttools-4.46.0-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:25852f0c63df0af022f698464a4a80f7d1d5bd974bcd22f995f6b4ad198e32dd"},
+    {file = "fonttools-4.46.0-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:adab73618d0a328b203a0e242b3eba60a2b5662d9cb2bd16ed9c52af8a7d86af"},
+    {file = "fonttools-4.46.0-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:2cf923a4a556ab4cc4c52f69a4a2db624cf5a2cf360394368b40c5152fe3321e"},
+    {file = "fonttools-4.46.0-cp310-cp310-musllinux_1_1_aarch64.whl", hash = "sha256:87c214197712cc14fd2a4621efce2a9c501a77041232b789568149a8a3161517"},
+    {file = "fonttools-4.46.0-cp310-cp310-musllinux_1_1_x86_64.whl", hash = "sha256:156ae342a1ed1fe38e180de471e98fbf5b2b6ae280fa3323138569c4ca215844"},
+    {file = "fonttools-4.46.0-cp310-cp310-win32.whl", hash = "sha256:c506e3d3a9e898caee4dc094f34b49c5566870d5a2d1ca2125f0a9f35ecc2205"},
+    {file = "fonttools-4.46.0-cp310-cp310-win_amd64.whl", hash = "sha256:f8bc3973ed58893c4107993e0a7ae34901cb572b5e798249cbef35d30801ffd4"},
+    {file = "fonttools-4.46.0-cp311-cp311-macosx_10_9_universal2.whl", hash = "sha256:982f69855ac258260f51048d9e0c53c5f19881138cc7ca06deb38dc4b97404b6"},
+    {file = "fonttools-4.46.0-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:2c23c59d321d62588620f2255cf951270bf637d88070f38ed8b5e5558775b86c"},
+    {file = "fonttools-4.46.0-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:a0e94244ec24a940ecfbe5b31c975c8a575d5ed2d80f9a280ce3b21fa5dc9c34"},
+    {file = "fonttools-4.46.0-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:1a9f9cdd7ef63d1b8ac90db335762451452426b3207abd79f60da510cea62da5"},
+    {file = "fonttools-4.46.0-cp311-cp311-musllinux_1_1_aarch64.whl", hash = "sha256:ca9eceebe70035b057ce549e2054cad73e95cac3fe91a9d827253d1c14618204"},
+    {file = "fonttools-4.46.0-cp311-cp311-musllinux_1_1_x86_64.whl", hash = "sha256:8be6adfa4e15977075278dd0a0bae74dec59be7b969b5ceed93fb86af52aa5be"},
+    {file = "fonttools-4.46.0-cp311-cp311-win32.whl", hash = "sha256:7b5636f5706d49f13b6d610fe54ee662336cdf56b5a6f6683c0b803e23d826d2"},
+    {file = "fonttools-4.46.0-cp311-cp311-win_amd64.whl", hash = "sha256:49ea0983e55fd7586a809787cd4644a7ae471e53ab8ddc016f9093b400e32646"},
+    {file = "fonttools-4.46.0-cp312-cp312-macosx_10_9_universal2.whl", hash = "sha256:7b460720ce81773da1a3e7cc964c48e1e11942b280619582a897fa0117b56a62"},
+    {file = "fonttools-4.46.0-cp312-cp312-macosx_10_9_x86_64.whl", hash = "sha256:8bee9f4fc8c99824a424ae45c789ee8c67cb84f8e747afa7f83b7d3cef439c3b"},
+    {file = "fonttools-4.46.0-cp312-cp312-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:d3d7b96aba96e05e8c911ce2dfc5acc6a178b8f44f6aa69371ab91aa587563da"},
+    {file = "fonttools-4.46.0-cp312-cp312-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:9e6aeb5c340416d11a3209d75c48d13e72deea9e1517837dd1522c1fd1f17c11"},
+    {file = "fonttools-4.46.0-cp312-cp312-musllinux_1_1_aarch64.whl", hash = "sha256:c779f8701deedf41908f287aeb775b8a6f59875ad1002b98ac6034ae4ddc1b7b"},
+    {file = "fonttools-4.46.0-cp312-cp312-musllinux_1_1_x86_64.whl", hash = "sha256:ce199227ce7921eaafdd4f96536f16b232d6b580ce74ce337de544bf06cb2752"},
+    {file = "fonttools-4.46.0-cp312-cp312-win32.whl", hash = "sha256:1c9937c4dd1061afd22643389445fabda858af5e805860ec3082a4bc07c7a720"},
+    {file = "fonttools-4.46.0-cp312-cp312-win_amd64.whl", hash = "sha256:a9fa52ef8fd14d7eb3d813e1451e7ace3e1eebfa9b7237d3f81fee8f3de6a114"},
+    {file = "fonttools-4.46.0-cp38-cp38-macosx_10_9_universal2.whl", hash = "sha256:c94564b1f3b5dd87e73577610d85115b1936edcc596deaf84a31bbe70e17456b"},
+    {file = "fonttools-4.46.0-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:a4a50a1dfad7f7ba5ca3f99cc73bf5cdac67ceade8e4b355a877521f20ad1b63"},
+    {file = "fonttools-4.46.0-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:89c2c520f9492844ecd6316d20c6c7a157b5c0cb73a1411b3db28ee304f30122"},
+    {file = "fonttools-4.46.0-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:e5b7905fd68eacb7cc56a13139da5c312c45baae6950dd00b02563c54508a041"},
+    {file = "fonttools-4.46.0-cp38-cp38-musllinux_1_1_aarch64.whl", hash = "sha256:8485cc468288e213f31afdaf1fdda3c79010f542559fbba936a54f4644df2570"},
+    {file = "fonttools-4.46.0-cp38-cp38-musllinux_1_1_x86_64.whl", hash = "sha256:87c3299da7da55394fb324349db0ede38114a46aafd0e7dfcabfecd28cdd94c3"},
+    {file = "fonttools-4.46.0-cp38-cp38-win32.whl", hash = "sha256:f5f1423a504ccc329efb5aa79738de83d38c072be5308788dde6bd419969d7f5"},
+    {file = "fonttools-4.46.0-cp38-cp38-win_amd64.whl", hash = "sha256:6d4a4ebcc76e30898ff3296ea786491c70e183f738319ae2629e0d44f17ece42"},
+    {file = "fonttools-4.46.0-cp39-cp39-macosx_10_9_universal2.whl", hash = "sha256:c9a0e422ab79e5cb2b47913be6a4b5fd20c4c7ac34a24f3691a4e099e965e0b8"},
+    {file = "fonttools-4.46.0-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:13ac0cba2fc63fa4b232f2a7971f35f35c6eaf10bd1271fa96d4ce6253a8acfd"},
+    {file = "fonttools-4.46.0-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:795150d5edc595e1a2cfb3d65e8f4f3d027704fc2579f8990d381bef6b188eb6"},
+    {file = "fonttools-4.46.0-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:d00fc63131dcac6b25f50a5a129758438317e54e3ce5587163f7058de4b0e933"},
+    {file = "fonttools-4.46.0-cp39-cp39-musllinux_1_1_aarch64.whl", hash = "sha256:3033b55f401a622de2630b3982234d97219d89b058607b87927eccb0f922313c"},
+    {file = "fonttools-4.46.0-cp39-cp39-musllinux_1_1_x86_64.whl", hash = "sha256:e26e7fb908ae4f622813e7cb32cd2db6c24e3122bb3b98f25e832a2fe0e7e228"},
+    {file = "fonttools-4.46.0-cp39-cp39-win32.whl", hash = "sha256:2d0eba685938c603f2f648dfc0aadbf8c6a4fe1c7ca608c2970a6ef39e00f254"},
+    {file = "fonttools-4.46.0-cp39-cp39-win_amd64.whl", hash = "sha256:5200b01f463d97cc2b7ff8a1e3584151f4413e98cb8419da5f17d1dbb84cc214"},
+    {file = "fonttools-4.46.0-py3-none-any.whl", hash = "sha256:5b627ed142398ea9202bd752c04311592558964d1a765fb2f78dc441a05633f4"},
+    {file = "fonttools-4.46.0.tar.gz", hash = "sha256:2ae45716c27a41807d58a9f3f59983bdc8c0a46cb259e4450ab7e196253a9853"},
 ]
 
 [package.extras]
@@ -580,13 +584,13 @@ woff = ["brotli (>=1.0.1)", "brotlicffi (>=0.8.0)", "zopfli (>=0.1.4)"]
 
 [[package]]
 name = "identify"
-version = "2.5.32"
+version = "2.5.33"
 description = "File identification library for Python"
 optional = false
 python-versions = ">=3.8"
 files = [
-    {file = "identify-2.5.32-py2.py3-none-any.whl", hash = "sha256:0b7656ef6cba81664b783352c73f8c24b39cf82f926f78f4550eda928e5e0545"},
-    {file = "identify-2.5.32.tar.gz", hash = "sha256:5d9979348ec1a21c768ae07e0a652924538e8bce67313a73cb0f681cf08ba407"},
+    {file = "identify-2.5.33-py2.py3-none-any.whl", hash = "sha256:d40ce5fcd762817627670da8a7d8d8e65f24342d14539c59488dc603bf662e34"},
+    {file = "identify-2.5.33.tar.gz", hash = "sha256:161558f9fe4559e1557e1bff323e8631f6a0e4837f7497767c1782832f16b62d"},
 ]
 
 [package.extras]
@@ -616,20 +620,17 @@ files = [
 
 [[package]]
 name = "isort"
-version = "5.12.0"
+version = "5.13.2"
 description = "A Python utility / library to sort Python imports."
 optional = false
 python-versions = ">=3.8.0"
 files = [
-    {file = "isort-5.12.0-py3-none-any.whl", hash = "sha256:f84c2818376e66cf843d497486ea8fed8700b340f308f076c6fb1229dff318b6"},
-    {file = "isort-5.12.0.tar.gz", hash = "sha256:8bef7dde241278824a6d83f44a544709b065191b95b6e50894bdc722fcba0504"},
+    {file = "isort-5.13.2-py3-none-any.whl", hash = "sha256:8ca5e72a8d85860d5a3fa69b8745237f2939afe12dbf656afbcb47fe72d947a6"},
+    {file = "isort-5.13.2.tar.gz", hash = "sha256:48fdfcb9face5d58a4f6dde2e72a1fb8dcaf8ab26f95ab49fab84c2ddefb0109"},
 ]
 
 [package.extras]
-colors = ["colorama (>=0.4.3)"]
-pipfile-deprecated-finder = ["pip-shims (>=0.5.2)", "pipreqs", "requirementslib"]
-plugins = ["setuptools"]
-requirements-deprecated-finder = ["pip-api", "pipreqs"]
+colors = ["colorama (>=0.4.6)"]
 
 [[package]]
 name = "jinja2"
@@ -812,16 +813,6 @@ files = [
     {file = "MarkupSafe-2.1.3-cp311-cp311-musllinux_1_1_x86_64.whl", hash = "sha256:5bbe06f8eeafd38e5d0a4894ffec89378b6c6a625ff57e3028921f8ff59318ac"},
     {file = "MarkupSafe-2.1.3-cp311-cp311-win32.whl", hash = "sha256:dd15ff04ffd7e05ffcb7fe79f1b98041b8ea30ae9234aed2a9168b5797c3effb"},
     {file = "MarkupSafe-2.1.3-cp311-cp311-win_amd64.whl", hash = "sha256:134da1eca9ec0ae528110ccc9e48041e0828d79f24121a1a146161103c76e686"},
-    {file = "MarkupSafe-2.1.3-cp312-cp312-macosx_10_9_universal2.whl", hash = "sha256:f698de3fd0c4e6972b92290a45bd9b1536bffe8c6759c62471efaa8acb4c37bc"},
-    {file = "MarkupSafe-2.1.3-cp312-cp312-macosx_10_9_x86_64.whl", hash = "sha256:aa57bd9cf8ae831a362185ee444e15a93ecb2e344c8e52e4d721ea3ab6ef1823"},
-    {file = "MarkupSafe-2.1.3-cp312-cp312-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:ffcc3f7c66b5f5b7931a5aa68fc9cecc51e685ef90282f4a82f0f5e9b704ad11"},
-    {file = "MarkupSafe-2.1.3-cp312-cp312-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:47d4f1c5f80fc62fdd7777d0d40a2e9dda0a05883ab11374334f6c4de38adffd"},
-    {file = "MarkupSafe-2.1.3-cp312-cp312-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:1f67c7038d560d92149c060157d623c542173016c4babc0c1913cca0564b9939"},
-    {file = "MarkupSafe-2.1.3-cp312-cp312-musllinux_1_1_aarch64.whl", hash = "sha256:9aad3c1755095ce347e26488214ef77e0485a3c34a50c5a5e2471dff60b9dd9c"},
-    {file = "MarkupSafe-2.1.3-cp312-cp312-musllinux_1_1_i686.whl", hash = "sha256:14ff806850827afd6b07a5f32bd917fb7f45b046ba40c57abdb636674a8b559c"},
-    {file = "MarkupSafe-2.1.3-cp312-cp312-musllinux_1_1_x86_64.whl", hash = "sha256:8f9293864fe09b8149f0cc42ce56e3f0e54de883a9de90cd427f191c346eb2e1"},
-    {file = "MarkupSafe-2.1.3-cp312-cp312-win32.whl", hash = "sha256:715d3562f79d540f251b99ebd6d8baa547118974341db04f5ad06d5ea3eb8007"},
-    {file = "MarkupSafe-2.1.3-cp312-cp312-win_amd64.whl", hash = "sha256:1b8dd8c3fd14349433c79fa8abeb573a55fc0fdd769133baac1f5e07abf54aeb"},
     {file = "MarkupSafe-2.1.3-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:8e254ae696c88d98da6555f5ace2279cf7cd5b3f52be2b5cf97feafe883b58d2"},
     {file = "MarkupSafe-2.1.3-cp37-cp37m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:cb0932dc158471523c9637e807d9bfb93e06a95cbf010f1a38b98623b929ef2b"},
     {file = "MarkupSafe-2.1.3-cp37-cp37m-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:9402b03f1a1b4dc4c19845e5c749e3ab82d5078d16a2a4c2cd2df62d57bb0707"},
@@ -1018,13 +1009,13 @@ files = [
 
 [[package]]
 name = "pathspec"
-version = "0.11.2"
+version = "0.12.1"
 description = "Utility library for gitignore style pattern matching of file paths."
 optional = false
-python-versions = ">=3.7"
+python-versions = ">=3.8"
 files = [
-    {file = "pathspec-0.11.2-py3-none-any.whl", hash = "sha256:1d6ed233af05e679efb96b1851550ea95bbb64b7c490b0f5aa52996c11e92a20"},
-    {file = "pathspec-0.11.2.tar.gz", hash = "sha256:e0d8d0ac2f12da61956eb2306b69f9469b42f4deb0f3cb6ed47b9cce9996ced3"},
+    {file = "pathspec-0.12.1-py3-none-any.whl", hash = "sha256:a0d503e138a4c123b27490a4f7beda6a01c6f288df0e4a8b79c7eb0dc7b4cc08"},
+    {file = "pathspec-0.12.1.tar.gz", hash = "sha256:a482d51503a1ab33b1c67a6c3813a26953dbdc71c31dacaef9a838c4e29f5712"},
 ]
 
 [[package]]
@@ -1096,13 +1087,13 @@ tests = ["check-manifest", "coverage", "defusedxml", "markdown2", "olefile", "pa
 
 [[package]]
 name = "platformdirs"
-version = "4.0.0"
+version = "4.1.0"
 description = "A small Python package for determining appropriate platform-specific dirs, e.g. a \"user data dir\"."
 optional = false
-python-versions = ">=3.7"
+python-versions = ">=3.8"
 files = [
-    {file = "platformdirs-4.0.0-py3-none-any.whl", hash = "sha256:118c954d7e949b35437270383a3f2531e99dd93cf7ce4dc8340d3356d30f173b"},
-    {file = "platformdirs-4.0.0.tar.gz", hash = "sha256:cb633b2bcf10c51af60beb0ab06d2f1d69064b43abf4c185ca6b28865f3f9731"},
+    {file = "platformdirs-4.1.0-py3-none-any.whl", hash = "sha256:11c8f37bcca40db96d8144522d925583bdb7a31f7b0e37e3ed4318400a8e2380"},
+    {file = "platformdirs-4.1.0.tar.gz", hash = "sha256:906d548203468492d432bcb294d4bc2fff751bf84971fbb2c10918cc206ee420"},
 ]
 
 [package.extras]
@@ -1126,13 +1117,13 @@ testing = ["pytest", "pytest-benchmark"]
 
 [[package]]
 name = "pre-commit"
-version = "3.5.0"
+version = "3.6.0"
 description = "A framework for managing and maintaining multi-language pre-commit hooks."
 optional = false
-python-versions = ">=3.8"
+python-versions = ">=3.9"
 files = [
-    {file = "pre_commit-3.5.0-py2.py3-none-any.whl", hash = "sha256:841dc9aef25daba9a0238cd27984041fa0467b4199fc4852e27950664919f660"},
-    {file = "pre_commit-3.5.0.tar.gz", hash = "sha256:5804465c675b659b0862f07907f96295d490822a450c4c40e747d0b1c6ebcb32"},
+    {file = "pre_commit-3.6.0-py2.py3-none-any.whl", hash = "sha256:c255039ef399049a5544b6ce13d135caba8f2c28c3b4033277a788f434308376"},
+    {file = "pre_commit-3.6.0.tar.gz", hash = "sha256:d30bad9abf165f7785c15a21a1f46da7d0677cb00ee7ff4c579fd38922efe15d"},
 ]
 
 [package.dependencies]
@@ -1304,7 +1295,6 @@ files = [
     {file = "PyYAML-6.0.1-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:69b023b2b4daa7548bcfbd4aa3da05b3a74b772db9e23b982788168117739938"},
     {file = "PyYAML-6.0.1-cp310-cp310-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:81e0b275a9ecc9c0c0c07b4b90ba548307583c125f54d5b6946cfee6360c733d"},
     {file = "PyYAML-6.0.1-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:ba336e390cd8e4d1739f42dfe9bb83a3cc2e80f567d8805e11b46f4a943f5515"},
-    {file = "PyYAML-6.0.1-cp310-cp310-musllinux_1_1_x86_64.whl", hash = "sha256:326c013efe8048858a6d312ddd31d56e468118ad4cdeda36c719bf5bb6192290"},
     {file = "PyYAML-6.0.1-cp310-cp310-win32.whl", hash = "sha256:bd4af7373a854424dabd882decdc5579653d7868b8fb26dc7d0e99f823aa5924"},
     {file = "PyYAML-6.0.1-cp310-cp310-win_amd64.whl", hash = "sha256:fd1592b3fdf65fff2ad0004b5e363300ef59ced41c2e6b3a99d4089fa8c5435d"},
     {file = "PyYAML-6.0.1-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:6965a7bc3cf88e5a1c3bd2e0b5c22f8d677dc88a455344035f03399034eb3007"},
@@ -1312,15 +1302,8 @@ files = [
     {file = "PyYAML-6.0.1-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:42f8152b8dbc4fe7d96729ec2b99c7097d656dc1213a3229ca5383f973a5ed6d"},
     {file = "PyYAML-6.0.1-cp311-cp311-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:062582fca9fabdd2c8b54a3ef1c978d786e0f6b3a1510e0ac93ef59e0ddae2bc"},
     {file = "PyYAML-6.0.1-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:d2b04aac4d386b172d5b9692e2d2da8de7bfb6c387fa4f801fbf6fb2e6ba4673"},
-    {file = "PyYAML-6.0.1-cp311-cp311-musllinux_1_1_x86_64.whl", hash = "sha256:e7d73685e87afe9f3b36c799222440d6cf362062f78be1013661b00c5c6f678b"},
     {file = "PyYAML-6.0.1-cp311-cp311-win32.whl", hash = "sha256:1635fd110e8d85d55237ab316b5b011de701ea0f29d07611174a1b42f1444741"},
     {file = "PyYAML-6.0.1-cp311-cp311-win_amd64.whl", hash = "sha256:bf07ee2fef7014951eeb99f56f39c9bb4af143d8aa3c21b1677805985307da34"},
-    {file = "PyYAML-6.0.1-cp312-cp312-macosx_10_9_x86_64.whl", hash = "sha256:855fb52b0dc35af121542a76b9a84f8d1cd886ea97c84703eaa6d88e37a2ad28"},
-    {file = "PyYAML-6.0.1-cp312-cp312-macosx_11_0_arm64.whl", hash = "sha256:40df9b996c2b73138957fe23a16a4f0ba614f4c0efce1e9406a184b6d07fa3a9"},
-    {file = "PyYAML-6.0.1-cp312-cp312-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:6c22bec3fbe2524cde73d7ada88f6566758a8f7227bfbf93a408a9d86bcc12a0"},
-    {file = "PyYAML-6.0.1-cp312-cp312-musllinux_1_1_x86_64.whl", hash = "sha256:8d4e9c88387b0f5c7d5f281e55304de64cf7f9c0021a3525bd3b1c542da3b0e4"},
-    {file = "PyYAML-6.0.1-cp312-cp312-win32.whl", hash = "sha256:d483d2cdf104e7c9fa60c544d92981f12ad66a457afae824d146093b8c294c54"},
-    {file = "PyYAML-6.0.1-cp312-cp312-win_amd64.whl", hash = "sha256:0d3304d8c0adc42be59c5f8a4d9e3d7379e6955ad754aa9d6ab7a398b59dd1df"},
     {file = "PyYAML-6.0.1-cp36-cp36m-macosx_10_9_x86_64.whl", hash = "sha256:50550eb667afee136e9a77d6dc71ae76a44df8b3e51e41b77f6de2932bfe0f47"},
     {file = "PyYAML-6.0.1-cp36-cp36m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:1fe35611261b29bd1de0070f0b2f47cb6ff71fa6595c077e42bd0c419fa27b98"},
     {file = "PyYAML-6.0.1-cp36-cp36m-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:704219a11b772aea0d8ecd7058d0082713c3562b4e271b849ad7dc4a5c90c13c"},
@@ -1337,7 +1320,6 @@ files = [
     {file = "PyYAML-6.0.1-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:a0cd17c15d3bb3fa06978b4e8958dcdc6e0174ccea823003a106c7d4d7899ac5"},
     {file = "PyYAML-6.0.1-cp38-cp38-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:28c119d996beec18c05208a8bd78cbe4007878c6dd15091efb73a30e90539696"},
     {file = "PyYAML-6.0.1-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:7e07cbde391ba96ab58e532ff4803f79c4129397514e1413a7dc761ccd755735"},
-    {file = "PyYAML-6.0.1-cp38-cp38-musllinux_1_1_x86_64.whl", hash = "sha256:49a183be227561de579b4a36efbb21b3eab9651dd81b1858589f796549873dd6"},
     {file = "PyYAML-6.0.1-cp38-cp38-win32.whl", hash = "sha256:184c5108a2aca3c5b3d3bf9395d50893a7ab82a38004c8f61c258d4428e80206"},
     {file = "PyYAML-6.0.1-cp38-cp38-win_amd64.whl", hash = "sha256:1e2722cc9fbb45d9b87631ac70924c11d3a401b2d7f410cc0e3bbf249f2dca62"},
     {file = "PyYAML-6.0.1-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:9eb6caa9a297fc2c2fb8862bc5370d0303ddba53ba97e71f08023b6cd73d16a8"},
@@ -1345,7 +1327,6 @@ files = [
     {file = "PyYAML-6.0.1-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:5773183b6446b2c99bb77e77595dd486303b4faab2b086e7b17bc6bef28865f6"},
     {file = "PyYAML-6.0.1-cp39-cp39-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:b786eecbdf8499b9ca1d697215862083bd6d2a99965554781d0d8d1ad31e13a0"},
     {file = "PyYAML-6.0.1-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:bc1bf2925a1ecd43da378f4db9e4f799775d6367bdb94671027b73b393a7c42c"},
-    {file = "PyYAML-6.0.1-cp39-cp39-musllinux_1_1_x86_64.whl", hash = "sha256:04ac92ad1925b2cff1db0cfebffb6ffc43457495c9b3c39d3fcae417d7125dc5"},
     {file = "PyYAML-6.0.1-cp39-cp39-win32.whl", hash = "sha256:faca3bdcf85b2fc05d06ff3fbc1f83e1391b3e724afa3feba7d13eeab355484c"},
     {file = "PyYAML-6.0.1-cp39-cp39-win_amd64.whl", hash = "sha256:510c9deebc5c0225e8c96813043e62b680ba2f9c50a08d3724c7f28a747d1486"},
     {file = "PyYAML-6.0.1.tar.gz", hash = "sha256:bfdf460b1736c775f2ba9f6a92bca30bc2095067b8a9d77876d1fad6cc3b4a43"},
@@ -1525,13 +1506,13 @@ zstd = ["zstandard (>=0.18.0)"]
 
 [[package]]
 name = "virtualenv"
-version = "20.24.7"
+version = "20.25.0"
 description = "Virtual Python Environment builder"
 optional = false
 python-versions = ">=3.7"
 files = [
-    {file = "virtualenv-20.24.7-py3-none-any.whl", hash = "sha256:a18b3fd0314ca59a2e9f4b556819ed07183b3e9a3702ecfe213f593d44f7b3fd"},
-    {file = "virtualenv-20.24.7.tar.gz", hash = "sha256:69050ffb42419c91f6c1284a7b24e0475d793447e35929b488bf6a0aade39353"},
+    {file = "virtualenv-20.25.0-py3-none-any.whl", hash = "sha256:4238949c5ffe6876362d9c0180fc6c3a824a7b12b80604eeb8085f2ed7460de3"},
+    {file = "virtualenv-20.25.0.tar.gz", hash = "sha256:bf51c0d9c7dd63ea8e44086fa1e4fb1093a31e963b86959257378aef020e1f1b"},
 ]
 
 [package.dependencies]
@@ -1546,4 +1527,4 @@ test = ["covdefaults (>=2.3)", "coverage (>=7.2.7)", "coverage-enable-subprocess
 [metadata]
 lock-version = "2.0"
 python-versions = "^3.12"
-content-hash = "ec699ae456775afafd4ae032239e662cf7650f927de196d46859606865194f61"
+content-hash = "2b98e032334ea83224169fb7614efa20637723d82f89ff8596d5a53e08d6d5c1"
diff --git a/pyproject.toml b/pyproject.toml
index 1d24be2a..51c08008 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -32,15 +32,15 @@ parse = "^1.20.0"
 matplotlib = "^3.8.2"
 
 [tool.poetry.dev-dependencies]
-black = "^23.11.0"
+black = "^23.12.0"
 cookiecutter = "^2.5.0"
 pytest = "^7.4.3"
 pytest-cov = "^4.1.0"
 pytest-xdist = "^3.5.0"
 python-dotenv = "^1.0.0"
 tox = "^4.11.4"
-pre-commit = "^3.5.0"
-isort = "^5.12.0"
+pre-commit = "^3.6.0"
+isort = "^5.13.2"
 
 [tool.poetry.scripts]
 adventofcode = "adventofcode.main:main"

From 486ea4c38b638180fe6042866a1d63fef34c4a2e Mon Sep 17 00:00:00 2001
From: Roel Adriaans <roel@adriaans.org>
Date: Wed, 13 Dec 2023 22:08:43 +0100
Subject: [PATCH 370/371] Day 11, part 1 with solution

---
 src/adventofcode2023/day11.py          | 20 +++++++++++---------
 tests/adventofcode2023/test_day11_a.py | 26 +++++++++++++++++---------
 2 files changed, 28 insertions(+), 18 deletions(-)

diff --git a/src/adventofcode2023/day11.py b/src/adventofcode2023/day11.py
index 1514c5ca..b899982c 100644
--- a/src/adventofcode2023/day11.py
+++ b/src/adventofcode2023/day11.py
@@ -1,6 +1,8 @@
 from __future__ import annotations
 
-from adventofcodeutils.point import XYPoint as Point
+import itertools
+
+from adventofcodeutils.point import XYNRPoint as Point
 
 from adventofcode.utils.abstract import FileReaderSolution
 
@@ -68,11 +70,12 @@ def expand_universe(self):
         self.max_x = max(point.x for point in self.galaxy_points) + 1
         self.max_y = max(point.y for point in self.galaxy_points) + 1
 
-    def compute_shortest_paths(self) -> list[list[int]]:
+    def compute_shortest_paths(self) -> int:
         """Compute the shortest paths between pairs"""
-        # Return a list of distances, or a dict between galaxy points with the
-        # distance? I don't know...
-        return []
+        return sum(
+            pair1.distance(pair2)
+            for pair1, pair2 in itertools.combinations(self.galaxy_points, 2)
+        )
 
     def print_solution(self):
         print()
@@ -93,12 +96,11 @@ def print_solution(self):
 class Day11PartA(Day11, FileReaderSolution):
     def solve(self, input_data: str) -> int:
         self.parse(input_data)
-        self.print_solution()
+        # self.print_solution()
 
         self.expand_universe()
-        self.print_solution()
-        shortest_paths = self.compute_shortest_paths()
-        return sum(len(path) for path in shortest_paths)
+        # self.print_solution()
+        return self.compute_shortest_paths()
 
 
 class Day11PartB(Day11, FileReaderSolution):
diff --git a/tests/adventofcode2023/test_day11_a.py b/tests/adventofcode2023/test_day11_a.py
index 3f2e215c..0a74e963 100644
--- a/tests/adventofcode2023/test_day11_a.py
+++ b/tests/adventofcode2023/test_day11_a.py
@@ -1,5 +1,5 @@
 import pytest
-from adventofcodeutils.point import XYPoint as Point
+from adventofcodeutils.point import XYNRPoint as Point
 
 from adventofcode2023.day11 import Day11PartA
 
@@ -34,21 +34,29 @@ def test_day11a_expand(self, testdata):
         assert point_9.x == 11
         assert point_9.y == 5
 
+        # After the expansion, the distance between 1 and 7 must be 15
+        point_1 = [p for p in solution.galaxy_points if p.nr == 1][0]
+        point_7 = [p for p in solution.galaxy_points if p.nr == 7][0]
+        assert point_7.distance(point_1) == 15
+
+        # After the expansion, the distance between 3 and 6 must be 17
+        point_3 = [p for p in solution.galaxy_points if p.nr == 3][0]
+        point_6 = [p for p in solution.galaxy_points if p.nr == 6][0]
+        assert point_3.distance(point_6) == 17
+
+        # After the expansion, the distance between 8 and 9 must be 5
+        point_8 = [p for p in solution.galaxy_points if p.nr == 8][0]
+        point_9 = [p for p in solution.galaxy_points if p.nr == 9][0]
+        assert point_8.distance(point_9) == 5
+
     def test_day11a_testdata(self, testdata):
         solution = Day11PartA()
         result = solution.solve(testdata)
         assert result == 374
 
-    @pytest.mark.xfail(reason="Not yet implemented", raises=NotImplementedError)
-    @pytest.mark.parametrize(("input_data", "expected_result"), [("", ""), ("", "")])
-    def test_day11a_solve(self, input_data, expected_result):
-        solution = Day11PartA()
-        result = solution.solve(input_data)
-        assert result == expected_result
-
     @pytest.mark.xfail(reason="Not yet implemented", raises=NotImplementedError)
     def test_day11a_data(self):
         """Result we got when we did the real solution"""
         solution = Day11PartA()
         res = solution("day_11/day11.txt")
-        assert res == 0
+        assert res == 9805264

From a1a169a29354ec7c1b4f2fffe0a54c9bf4664e28 Mon Sep 17 00:00:00 2001
From: Roel Adriaans <roel@adriaans.org>
Date: Wed, 13 Dec 2023 22:22:19 +0100
Subject: [PATCH 371/371] 11, part b. Off-By-One galaxy.

---
 src/adventofcode2023/day11.py          | 17 +++++++++++------
 tests/adventofcode2023/test_day11_a.py |  6 ++----
 tests/adventofcode2023/test_day11_b.py | 26 +++++++++++++-------------
 3 files changed, 26 insertions(+), 23 deletions(-)

diff --git a/src/adventofcode2023/day11.py b/src/adventofcode2023/day11.py
index b899982c..6270531c 100644
--- a/src/adventofcode2023/day11.py
+++ b/src/adventofcode2023/day11.py
@@ -36,37 +36,38 @@ def missing_elements(elements):
         start, end = elements[0], elements[-1]
         return sorted(set(range(start, end + 1)).difference(elements))
 
-    def expand_universe(self):
+    def expand_universe(self, expansion=1):
         """Expand the universe, if a line is empty"""
         offset_x = 0
         offset_y = 0
         # Mind the gaps
         missing_x = self.missing_elements(list(self.used_x))
         missing_y = self.missing_elements(list(self.used_y))
+
         # Loop over every planet there offset is x + offset_x and add x
         for x in missing_x:
             points_do_delete = []
             points_to_add = []
             for point in self.galaxy_points:
                 if point.x > x + offset_x:
-                    points_to_add.append(Point(point.x + 1, point.y, point.nr))
+                    points_to_add.append(Point(point.x + expansion, point.y, point.nr))
                     points_do_delete.append(point)
             for point in points_do_delete:
                 del self.galaxy_points[self.galaxy_points.index(point)]
             self.galaxy_points.extend(points_to_add)
-            offset_x += 1
+            offset_x += expansion
         for y in missing_y:
             points_do_delete = []
             points_to_add = []
             for point in self.galaxy_points:
                 if point.y > y + offset_y:
-                    points_to_add.append(Point(point.x, point.y + 1, point.nr))
+                    points_to_add.append(Point(point.x, point.y + expansion, point.nr))
                     points_do_delete.append(point)
 
             for point in points_do_delete:
                 del self.galaxy_points[self.galaxy_points.index(point)]
             self.galaxy_points.extend(points_to_add)
-            offset_y += 1
+            offset_y += expansion
         self.max_x = max(point.x for point in self.galaxy_points) + 1
         self.max_y = max(point.y for point in self.galaxy_points) + 1
 
@@ -105,4 +106,8 @@ def solve(self, input_data: str) -> int:
 
 class Day11PartB(Day11, FileReaderSolution):
     def solve(self, input_data: str) -> int:
-        raise NotImplementedError
+        self.parse(input_data)
+        # Each empty column or row must be replaced by 1 million rows.
+        # Add 999.999 rows.
+        self.expand_universe(1_000_000 - 1)
+        return self.compute_shortest_paths()
diff --git a/tests/adventofcode2023/test_day11_a.py b/tests/adventofcode2023/test_day11_a.py
index 0a74e963..5432b942 100644
--- a/tests/adventofcode2023/test_day11_a.py
+++ b/tests/adventofcode2023/test_day11_a.py
@@ -1,4 +1,3 @@
-import pytest
 from adventofcodeutils.point import XYNRPoint as Point
 
 from adventofcode2023.day11 import Day11PartA
@@ -9,8 +8,8 @@ def test_day11a_parse(self, testdata):
         solution = Day11PartA()
         solution.parse(testdata)
         assert len(solution.galaxy_points) == 9
-        assert solution.galaxy_points[0] == Point(0, 3)
-        assert solution.galaxy_points[-1] == Point(9, 4)
+        assert solution.galaxy_points[0] == Point(0, 3, 0)
+        assert solution.galaxy_points[-1] == Point(9, 4, 0)
 
     def test_day11a_expand(self, testdata):
         solution = Day11PartA()
@@ -54,7 +53,6 @@ def test_day11a_testdata(self, testdata):
         result = solution.solve(testdata)
         assert result == 374
 
-    @pytest.mark.xfail(reason="Not yet implemented", raises=NotImplementedError)
     def test_day11a_data(self):
         """Result we got when we did the real solution"""
         solution = Day11PartA()
diff --git a/tests/adventofcode2023/test_day11_b.py b/tests/adventofcode2023/test_day11_b.py
index 3d7aa221..c4728bea 100644
--- a/tests/adventofcode2023/test_day11_b.py
+++ b/tests/adventofcode2023/test_day11_b.py
@@ -4,22 +4,22 @@
 
 
 class TestDay11PartB:
-    @pytest.mark.xfail(reason="Not yet implemented", raises=NotImplementedError)
-    def test_day11b_testdata(self, testdata):
+    @pytest.mark.parametrize(
+        ("factor", "expected_result"),
+        [
+            (10, 1030),
+            (100, 8410),
+        ],
+    )
+    def test_day11b_testdata(self, testdata, factor, expected_result):
         solution = Day11PartB()
-        result = solution.solve(testdata)
-        assert result == 0
+        solution.parse(testdata)
+        solution.expand_universe(factor - 1)
+        solution.print_solution()
+        assert solution.compute_shortest_paths() == expected_result
 
-    @pytest.mark.xfail(reason="Not yet implemented", raises=NotImplementedError)
-    @pytest.mark.parametrize(("input_data", "expected_result"), [("", ""), ("", "")])
-    def test_day11b_solve(self, input_data, expected_result):
-        solution = Day11PartB()
-        result = solution.solve(input_data)
-        assert result == expected_result
-
-    @pytest.mark.xfail(reason="Not yet implemented", raises=NotImplementedError)
     def test_day11b_data(self):
         """Result we got when we did the real solution"""
         solution = Day11PartB()
         res = solution("day_11/day11.txt")
-        assert res == 0
+        assert res == 779032247216