Feature/merge aoc utils, Maybe?

.github/dependabot.yml

@@ -0,0 +1,21 @@
+version: 2
+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"

.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.15.6"
+        env:
+          GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN }}"
+          MERGE_LABELS: automerge
+          MERGE_REMOVE_LABELS: automerge
+          MERGE_RETRIES: "60"
+          MERGE_RETRY_SLEEP: "15000"

.github/workflows/tox.yml

@@ -0,0 +1,40 @@
+name: Python Run Tox
+
+on: [pull_request]
+
+jobs:
+  build:
+    name: Python Tests
+    runs-on: ubuntu-22.04
+    strategy:
+      max-parallel: 4
+      matrix:
+        python-version: ['3.12']
+
+    steps:
+    - uses: actions/checkout@v4
+
+    - name: Set up Python ${{ matrix.python-version }}
+      uses: actions/setup-python@v5
+      with:
+        python-version: ${{ matrix.python-version }}
+
+    - name: Install dependencies
+      run: |
+        python -m pip install --upgrade pip
+        pip install tox
+        # Following step is required for python 3.9: Build depenencies are missing
+        sudo apt-get update && sudo apt-get install libxml2-dev libxslt-dev python3-dev -y
+
+    - name: Run linters in tox
+      run: tox -e linters
+
+    - name: Test with tox
+      # Run tox using the version of Python in `PATH`
+      run: tox -e py
+
+    - name: Upload coverage to Codecov
+      uses: codecov/codecov-action@v3
+      with:
+        file: ./coverage.xml
+        fail_ci_if_error: true

.pre-commit-config.yaml

@@ -2,10 +2,10 @@
 
 repos:
   - repo: https://github.com/ambv/black
-    rev: 23.7.0
+    rev: 23.12.0
     hooks:
     - id: black
-      language_version: 'python3.10'
+      language_version: 'python3.12'
 
   - repo: https://github.com/pycqa/flake8
     rev: 6.1.0
@@ -14,12 +14,12 @@ repos:
       args: ["--ignore", "E203,W503"]
 
   - repo: https://github.com/PyCQA/isort
-    rev: 5.12.0
+    rev: 5.13.2
     hooks:
     - 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" ]

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

README.md

@@ -1,7 +1,7 @@
-# Advent of Code 2016
+# Advent of Code 2016, 2019, 2020, 2021, 2022 and ...
 
-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
 
@@ -10,11 +10,12 @@ Created as part of Python Discords Revival of Code
 ## 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
 
@@ -23,6 +24,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
@@ -31,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: