update

Author: jameslawlor

pyproject.toml

@@ -6,12 +6,19 @@ authors = [
 ]
 description = "Code for Advent of Code 2023"
 readme = "README.md"
-requires-python = ">=3.8"
+requires-python = ">=3.12,<4"
 classifiers = [
     "Programming Language :: Python :: 3",
     "License :: OSI Approved :: MIT License",
     "Operating System :: OS Independent",
 ]
+dependencies = [
+    "numpy==1.26.2",
+    "pytest==7.4.3",
+    "ruff>=0.14.8",
+    "setuptools==68.2.2",
+    "uv>=0.9.16",
+]
 
 [project.urls]
 Homepage = "https://github.com/jameslawlor/advent-of-code-python"
@@ -31,8 +38,14 @@ addopts = [
 
 [tool.black]
 line-length = 88
-target-version = ['py39']
+target-version = ['py312']
+
+[tool.ruff]
+line-length = 88
+target-version = "py312"
+exclude = ["__pycache__", ".venv", "build", "dist"]
+lint.select = ["E", "F", "W", "C", "B", "I"]
 
 [project.scripts]
 # Console script for running day solutions: after `pip install -e .` you can run `aoc --year 2025 --day 1`
-aoc = "advent_of_code.cli:main"
+aoc = "advent_of_code.cli:main"

requirements.txt

@@ -1,4 +1,6 @@
-ruff==0.1.9
 numpy==1.26.2
 pytest==7.4.3
+ruff==0.14.8
 setuptools==68.2.2
+uv==0.9.16
+black

scripts/generate_new_day_skeleton_files_from_templates.py

@@ -1,6 +1,5 @@
-import os
 import argparse
-
+import os
 
 TEMPLATES_PATH = os.path.join("scripts", "templates")
 

scripts/run_all_solutions.py

@@ -7,10 +7,11 @@
 RUN_DAY_SCRIPT = "scripts/run_day.py"
 INPUTS_DIR = "inputs"
 
+
 def discover_and_run_solutions():
     # Regex to match "day_<number>.py"
     day_pattern = re.compile(r"day_(\d{2})\.py")
-    
+
     for year in sorted(os.listdir(BASE_DIR)):
         if year.startswith("year_"):
             year_path = os.path.join(BASE_DIR, year)
@@ -24,25 +25,33 @@ def discover_and_run_solutions():
                     day_number = match.group(1)
 
                     # Build input file path
-                    input_file = os.path.join(INPUTS_DIR, f"year_{year_number}", f"{day_number}.dat")
+                    input_file = os.path.join(
+                        INPUTS_DIR, f"year_{year_number}", f"{day_number}.dat"
+                    )
                     if not os.path.exists(input_file):
-                        print(f"Input file for {year_number} Day {day_number} not found, skipping.")
+                        print(f"Input for {year_number} {day_number} missing, skipping")
                         continue
 
                     # Run the solution using run_day.py
                     try:
                         print(f"Running {year_number} Day {day_number}...")
                         subprocess.run(
                             [
-                                "python3", RUN_DAY_SCRIPT,
-                                "--year", year_number,
-                                "--day", str(int(day_number)),  # Remove leading zero for argument
+                                "python3",
+                                RUN_DAY_SCRIPT,
+                                "--year",
+                                year_number,
+                                "--day",
+                                str(
+                                    int(day_number)
+                                ),  # Remove leading zero for argument
                             ],
-                            check=True
+                            check=True,
                         )
                         print("\n")
                     except subprocess.CalledProcessError as e:
                         print(f"Error running {year_number} Day {day_number}: {e}")
 
+
 if __name__ == "__main__":
     discover_and_run_solutions()

scripts/run_day.py

@@ -1,24 +1,27 @@
+import argparse
 import importlib
 import sys
-import argparse
+
 
 def main():
-    parser = argparse.ArgumentParser(description="Run a specific Advent of Code solution.")
+    parser = argparse.ArgumentParser(
+        description="Run a specific Advent of Code solution."
+    )
     # parser.add_argument(
-    #     "--input_file", 
-    #     required=True, 
-    #     type=str, 
+    #     "--input_file",
+    #     required=True,
+    #     type=str,
     #     help="Path to the input file for the day's solution."
     # )
     parser.add_argument(
-        "--year", 
-        required=True, 
-        type=int, 
+        "--year",
+        required=True,
+        type=int,
     )
     parser.add_argument(
-        "--day", 
-        required=True, 
-        type=str, 
+        "--day",
+        required=True,
+        type=str,
     )
 
     args = parser.parse_args()
@@ -35,10 +38,13 @@ def main():
             module.main(input_file)
         else:
             print("man")
-            print(f"The module {day_module} does not have a 'main(input_file)' function.")
+            print(
+                f"The module {day_module} does not have a 'main(input_file)' function."
+            )
     except ModuleNotFoundError:
         print(f"Could not find module: {day_module}")
         sys.exit(1)
 
+
 if __name__ == "__main__":
     main()

setup.py

@@ -1,3 +1,9 @@
 from setuptools import setup
 
-setup(name="advent-of-code-python", version="0.1", description="advent-of-code-python", packages=["src/advent_of_code"])
+setup(
+    name="advent-of-code-python",
+    version="0.1",
+    description="advent-of-code-python",
+    packages=["src/advent_of_code"],
+    python_requires=">=3.12,<4",
+)

src/advent_of_code/__main__.py

@@ -5,8 +5,8 @@
 
 This file delegates to `advent_of_code.cli:main`.
 """
-from .cli import main
 
+from .cli import main
 
 if __name__ == "__main__":
     raise SystemExit(main())

src/advent_of_code/cli.py

@@ -7,12 +7,12 @@
 
 This duplicates the behavior of `scripts/run_day.py` but lives inside the package.
 """
+
 from __future__ import annotations
 
 import argparse
 import importlib
-import sys
-from typing import Sequence, Optional
+from typing import Optional, Sequence
 
 
 def main(argv: Optional[Sequence[str]] = None) -> int:
@@ -24,8 +24,12 @@ def main(argv: Optional[Sequence[str]] = None) -> int:
     Returns:
         exit code (0 on success).
     """
-    parser = argparse.ArgumentParser(prog="aoc", description="Run an Advent of Code solution module")
-    parser.add_argument("--year", required=True, type=int, help="Year directory (e.g. 2025)")
+    parser = argparse.ArgumentParser(
+        prog="aoc", description="Run an Advent of Code solution module"
+    )
+    parser.add_argument(
+        "--year", required=True, type=int, help="Year directory (e.g. 2025)"
+    )
     parser.add_argument("--day", required=True, type=str, help="Day number (1 or 01)")
 
     args = parser.parse_args(argv)
@@ -39,8 +43,12 @@ def main(argv: Optional[Sequence[str]] = None) -> int:
         module = importlib.import_module(day_module)
     except ModuleNotFoundError as exc:
         print(f"Could not find module: {day_module}")
-        # Helpful hint: if running from the repository root, make sure `src` is on PYTHONPATH or install the package editable
-        print("Hint: run with `PYTHONPATH=src python -m advent_of_code ...` or `pip install -e .` to make the package importable")
+        # Helpful hint: if running from the repository root,
+        # make sure `src` is on PYTHONPATH or install the package editable.
+        print(
+            "Hint: run with `PYTHONPATH=src python -m advent_of_code ...` "
+            "or `pip install -e .` to make the package importable"
+        )
         if isinstance(exc, ModuleNotFoundError):
             # show original message
             print(str(exc))

src/advent_of_code/year_2023/day_01.py

@@ -1,9 +1,9 @@
+import re
+
 from advent_of_code.utils.input_handling import (
     read_input,
 )
 
-import re
-
 SPELLED_NUMBERS_MAPPING = {
     "one": 1,
     "two": 2,
@@ -95,26 +95,26 @@ def find_indices_of_patterns(line, patterns_to_find):
 
     return patterns_and_indices
 
-def run_part(input_data, accept_written_digits):
 
+def run_part(input_data, accept_written_digits):
     patterns_to_find = get_patterns(accept_written_digits)
     calibration_value_sum = solve_all_calibration_values(input_data, patterns_to_find)
     return calibration_value_sum
 
+
 def main(input_file):
     # args = parse_args()
     # input = read_input(args.input_file)
     input_data = read_input(input_file)
 
-    calibration_value_sum = run_part(input_data, accept_written_digits = False) 
-    
+    calibration_value_sum = run_part(input_data, accept_written_digits=False)
+
     print(f"Part 1: Solution is {calibration_value_sum}.")
 
-    calibration_value_sum = run_part(input_data, accept_written_digits = True) 
+    calibration_value_sum = run_part(input_data, accept_written_digits=True)
 
     print(f"Part 2: Solution is {calibration_value_sum}.")
 
 
-
 if __name__ == "__main__":
     main()

src/advent_of_code/year_2023/day_02.py

@@ -1,7 +1,7 @@
-from advent_of_code.utils.input_handling import read_input
-
 import re
 
+from advent_of_code.utils.input_handling import read_input
+
 BAG_CONSTRAINTS = {"red": 12, "green": 13, "blue": 14}