Merge pull request #165 from GriceTurrble/feat/2024-scaffold-day8

GriceTurrble · web-flow · commit 0db090761913 · 2024-12-07T04:30:18.000-05:00
Feat/2024-scaffold-day8
diff --git a/2024/2024.just b/2024/2024.just
@@ -6,3 +6,8 @@ mod py 'python/py.just'
 # Show these help docs
 help:
     @just --list --unsorted --justfile {{ source_file() }}
+
+
+# Add new day for solutions in all configured languages
+new-day DAY:
+    @just y2024::py::new-day {{DAY}}
diff --git a/2024/inputs/day08.txt b/2024/inputs/day08.txt
diff --git a/2024/inputs/tests/test_day08.txt b/2024/inputs/tests/test_day08.txt
diff --git a/2024/python/py.just b/2024/python/py.just
@@ -4,6 +4,7 @@
 help:
     @just --list --unsorted --justfile {{ source_file() }}
 
-# Generate files for a new day
+
+# Add new day for Python solutions
 new-day DAY:
     uv run cli create-day {{DAY}}
diff --git a/2024/python/pyproject.toml b/2024/python/pyproject.toml
@@ -4,21 +4,16 @@ version = "2024.12.1"
 description = "Add your description here"
 readme = "README.md"
 requires-python = ">=3.13"
-dependencies = [
-    "click>=8.1.7",
-    "httpx>=0.28.1",
-    "polars>=1.16.0",
-    "toml>=0.10.2",
-]
+dependencies = [ "click>=8.1.7", "httpx>=0.28.1", "polars>=1.16.0", "toml>=0.10.2",]
 [[project.authors]]
 name = "Galen Rice"
 email = "griceturrble@protonmail.com"
 
 [dependency-groups]
-dev = ["pytest>=8.3.4"]
+dev = [ "pytest>=8.3.4",]
 
 [build-system]
-requires = ["hatchling"]
+requires = [ "hatchling",]
 build-backend = "hatchling.build"
 
 [project.scripts]
@@ -30,6 +25,7 @@ day04 = "grice_py_aoc_2024.day04.main:main"
 day05 = "grice_py_aoc_2024.day05.main:main"
 day06 = "grice_py_aoc_2024.day06.main:main"
 day07 = "grice_py_aoc_2024.day07.main:main"
+day08 = "grice_py_aoc_2024.day08.main:main"
 
 [tool.pytest.ini_options]
-addopts = "--verbose"
+addopts = "-ra -q"
diff --git a/2024/python/src/grice_py_aoc_2024/day06/test_day06.py b/2024/python/src/grice_py_aoc_2024/day06/test_day06.py
@@ -8,18 +8,17 @@
 
 DIR = Path(__file__).parent
 TEST_FILE = DIR.parents[3] / "inputs/tests" / f"test_{DIR.stem}.txt"
-EXPECTED_PART_1 = "Now it's done!"
-EXPECTED_PART_2 = "Now it's done!"
+EXPECTED_PART_1 = "REPLACE ME!"
+EXPECTED_PART_2 = "REPLACE ME!"
 
 
-@pytest.mark.skip("Skipped day 6")
 def test_part1():
     contents = TEST_FILE.read_text()
     result = part1(contents)
     assert result == EXPECTED_PART_1
 
 
-@pytest.mark.skip("Skipped day 6")
+@pytest.mark.xfail(reason=f"{DIR.stem} P1 incomplete")
 def test_part2():
     contents = TEST_FILE.read_text()
     result = part2(contents)
diff --git a/2024/python/src/grice_py_aoc_2024/day08/__init__.py b/2024/python/src/grice_py_aoc_2024/day08/__init__.py
diff --git a/2024/python/src/grice_py_aoc_2024/day08/main.py b/2024/python/src/grice_py_aoc_2024/day08/main.py
@@ -0,0 +1,33 @@
+from __future__ import annotations
+
+import time
+from pathlib import Path
+
+DIR = Path(__file__).parent
+FILE = DIR.parents[3] / "inputs" / f"{DIR.stem}.txt"
+
+
+def part1(contents: str):
+    return "Not done yet!"
+
+
+def part2(contents: str):
+    return "Not done yet!"
+
+
+def main():
+    contents = FILE.read_text()
+
+    _start1 = time.perf_counter()
+    result1 = part1(contents)
+    _delta1 = time.perf_counter() - _start1
+    print(f">> Part 1: {result1} ({_delta1:.6f}s)")
+
+    _start2 = time.perf_counter()
+    result2 = part2(contents)
+    _delta2 = time.perf_counter() - _start2
+    print(f">> Part 2: {result2} ({_delta2:.6f}s)")
+
+
+if __name__ == "__main__":
+    main()
diff --git a/2024/python/src/grice_py_aoc_2024/day08/test_day08.py b/2024/python/src/grice_py_aoc_2024/day08/test_day08.py
@@ -0,0 +1,25 @@
+from __future__ import annotations
+
+from pathlib import Path
+
+import pytest
+
+from .main import part1, part2
+
+DIR = Path(__file__).parent
+TEST_FILE = DIR.parents[3] / "inputs/tests" / f"test_{DIR.stem}.txt"
+EXPECTED_PART_1 = "REPLACE ME!"
+EXPECTED_PART_2 = "REPLACE ME!"
+
+
+def test_part1():
+    contents = TEST_FILE.read_text()
+    result = part1(contents)
+    assert result == EXPECTED_PART_1
+
+
+@pytest.mark.xfail(reason=f"{DIR.stem} P1 incomplete")
+def test_part2():
+    contents = TEST_FILE.read_text()
+    result = part2(contents)
+    assert result == EXPECTED_PART_2
diff --git a/2024/python/src/grice_py_aoc_2024/templates/test_day.py-tpl b/2024/python/src/grice_py_aoc_2024/templates/test_day.py-tpl
@@ -2,12 +2,14 @@ from __future__ import annotations
 
 from pathlib import Path
 
+import pytest
+
 from .main import part1, part2
 
 DIR = Path(__file__).parent
 TEST_FILE = DIR.parents[3] / "inputs/tests" / f"test_{DIR.stem}.txt"
-EXPECTED_PART_1 = "Now it's done!"
-EXPECTED_PART_2 = "Now it's done!"
+EXPECTED_PART_1 = "REPLACE ME!"
+EXPECTED_PART_2 = "REPLACE ME!"
 
 
 def test_part1():
@@ -16,6 +18,7 @@ def test_part1():
     assert result == EXPECTED_PART_1
 
 
+@pytest.mark.xfail(reason=f"{DIR.stem} P1 incomplete")
 def test_part2():
     contents = TEST_FILE.read_text()
     result = part2(contents)
diff --git a/Justfile b/Justfile
@@ -0,0 +1,30 @@
+# Root justfile for all AoC stuff
+
+mod y2024 '2024/2024.just'
+
+CURRENT_YEAR := "2024"
+
+# Aliases for ANSI color sequences. Makes our output easier to read!
+COLOR_GREEN := "\\033[0;32m"
+COLOR_STOP := "\\033[0m"
+
+# The result should be `\\[ \\]`, but we need to escape those slashes again here to make it work:
+GREP_TARGET := "\\\\[gone\\\\]"
+
+
+# Show these help docs
+help:
+    @just --list --unsorted --justfile {{ source_file() }}
+
+
+# Switches to `main` branch, then prunes local branches deleted from remote.
+prune_dead_branches:
+    @echo "{{ COLOR_GREEN }}>> 'Removing dead branches...{{ COLOR_STOP }}"
+    @git switch main
+    @git fetch --prune
+    @git branch -v | grep "{{ GREP_TARGET }}" | awk '{print $1}' | xargs -I{} git branch -D {}
+
+
+# Add new day for solutions in the current year
+new-day DAY:
+    @just y{{CURRENT_YEAR}}::new-day {{DAY}}
