ci: add test for 3.12 and remove 3.7 support

Signed-off-by: Saurav Sharma <[email protected]>

Author: iamsauravsharma

.github/workflows/deploy_pypi.yml

@@ -17,7 +17,7 @@ jobs:
       - name: Install Poetry
         uses: snok/install-poetry@v1
         with:
-          version: 1.4.0
+          version: 1.7.1
           virtualenvs-create: true
           virtualenvs-in-project: true
       - name: Publish

.github/workflows/python_app.yml

@@ -13,6 +13,9 @@ jobs:
 
     steps:
       - uses: actions/checkout@v3
+      - uses: actions/setup-python@v4
+        with:
+          python-version: "3.12"
       - uses: actions/setup-python@v4
         with:
           python-version: "3.11"
@@ -25,13 +28,10 @@ jobs:
       - uses: actions/setup-python@v4
         with:
           python-version: "3.8"
-      - uses: actions/setup-python@v4
-        with:
-          python-version: "3.7"
       - name: Install Poetry
         uses: snok/install-poetry@v1
         with:
-          version: 1.4.0
+          version: 1.7.1
           virtualenvs-create: true
           virtualenvs-in-project: true
       - name: Install dependencies

advent_of_code_py/cache_file.py

@@ -3,40 +3,44 @@
 import os
 import time
 from pathlib import Path
-from typing import Optional
 
 from platformdirs import user_cache_dir
 
+from enum import Enum
+
+
+class FileType(Enum):
+    INPUT_FILE = "input.txt"
+    SUBMISSION_FILE = "submission.txt"
+    TIME_FILE = "time.txt"
+
 
 def input_data_is_downloaded(year: int, day: int, session: str) -> bool:
     """Check if an input is downloaded and cached"""
-    cache_file = _join_path(year, day, session, file_type="input_file")
-    cache_file = Path(cache_file)
+    cache_file = cache_file_path(year, day, session, file_type="input_file")
     return cache_file.exists()
 
 
 def save_input_to_cache(year: int, day: int, session: str, input_data: str):
     """Save a input to its cache location for future reference and use"""
-    cache_folder = _join_path(year, day, session)
-    Path(cache_folder).mkdir(parents=True, exist_ok=True)
-    cache_file = os.path.join(cache_folder, "input.txt")
-    with open(cache_file, "w+") as opened_file:
+    cache_file = cache_file_path(year, day, session, FileType.INPUT_FILE)
+    cache_file.parent.mkdir(parents=True, exist_ok=True)
+    with cache_file.open("w") as opened_file:
         opened_file.write(input_data)
 
 
 def delete_input(year: int, day: int, session: str):
     """Delete input from a cache folder"""
-    cache_file = _join_path(year, day, session, file_type="input_file")
-    if Path(cache_file).exists():
-        os.remove(cache_file)
+    cache_file = cache_file_path(year, day, session, FileType.INPUT_FILE)
+    cache_file.unlink(missing_ok=True)
 
 
 def get_cache_file_data(year: int, day: int, session: str) -> str:
     """Return cache file input data from cache folder for certain problem"""
     server_action = importlib.import_module(".server_action")
     server_action.download_input(year, day, session)
-    cache_file = _join_path(year, day, session, file_type="input_file")
-    with open(cache_file) as opened_file:
+    cache_file = cache_file_path(year, day, session, FileType.INPUT_FILE)
+    with cache_file.open() as opened_file:
         input_data = opened_file.read()
     return input_data
 
@@ -45,8 +49,8 @@ def save_submitted_answer(
     year: int, day: int, part: int, session: str, answer: str, message: str
 ):
     """Save submitted input to file of problem"""
-    submitted_file = _join_path(year, day, session, file_type="submission_file")
-    with open(submitted_file, "a") as opened_file:
+    submitted_file = cache_file_path(year, day, session, FileType.SUBMISSION_FILE)
+    with submitted_file.open("a") as opened_file:
         opened_file.write("{}!{}:{}\n".format(part, answer, message))
 
 
@@ -57,9 +61,9 @@ def last_submitted_answer_message(
     Check if answer is already submitted by user if submitted return message of last
     submission
     """
-    submission_file = _join_path(year, day, session, file_type="submission_file")
+    submission_file = cache_file_path(year, day, session, FileType.SUBMISSION_FILE)
     last_answer_message = ""
-    with open(submission_file, "r") as opened_file:
+    with submission_file.open() as opened_file:
         lines = opened_file.read()
         for line in lines:
             separate_part = line.split("!", 1)
@@ -72,33 +76,27 @@ def last_submitted_answer_message(
 
 def save_last_submission_time(year: int, day: int, session: str):
     """Save a time where a request is performed for last submission"""
-    last_time_file = _join_path(year, day, session, file_type="last_time_file")
-    with open(last_time_file, "w") as opened_file:
+    last_time_file = cache_file_path(year, day, session, FileType.TIME_FILE)
+    with last_time_file.open("w") as opened_file:
         opened_file.write(str(time.time()))
 
 
 def check_less_than_one_min_submission(year: int, day: int, session: str) -> bool:
     """
     Check last submission time for solution return true if time is less than 60 second
     """
-    last_time_file = _join_path(year, day, session, file_type="last_time_file")
-    with open(last_time_file, "r") as opened_file:
+    last_time_file = cache_file_path(year, day, session, FileType.TIME_FILE)
+    with last_time_file.open() as opened_file:
         last_time = float(opened_file.read())
         current_time = time.time()
         early_submission = current_time - last_time < 60.0
     return early_submission
 
 
-def _join_path(
-    year: int, day: int, session: str, file_type: Optional[str] = None
-) -> str:
+def cache_file_path(year: int, day: int, session: str, file_type: FileType) -> Path:
     """Return desire path for a cache folders or files"""
     cache_location = user_cache_dir(appname="advent-of-code")
-    cache_file = os.path.join(cache_location, str(session), str(year), str(day))
-    if file_type == "input_file":
-        cache_file = os.path.join(cache_file, "input.txt")
-    if file_type == "submission_file":
-        cache_file = os.path.join(cache_file, "submission.txt")
-    if file_type == "last_time_file":
-        cache_file = os.path.join(cache_file, "time.txt")
-    return cache_file
+    cache_file = os.path.join(
+        cache_location, str(session), str(year), str(day), file_type.value
+    )
+    return Path(cache_file)

advent_of_code_py/cli.py

@@ -4,7 +4,12 @@
 import click
 
 from .cache_file import delete_input
-from .config_file import add_to_json, delete_from_json, get_all_session, list_from_json
+from .config_file import (
+    add_to_json,
+    delete_from_json,
+    get_all_session,
+    print_all_session,
+)
 from .server_action import download_input
 from .utils import get_current_year, get_day
 
@@ -29,7 +34,7 @@ def add(name: str, session_value: str):
 
 @config.command("list", help="list all session present in config")
 def list_config_session():
-    list_from_json()
+    print_all_session()
 
 
 @config.command("remove", help="remove session from config")

advent_of_code_py/config_file.py

@@ -19,7 +19,7 @@ def to_json(self) -> str:
         return json.dumps(self.__dict__, indent=4, sort_keys=True)
 
     @classmethod
-    def from_json(cls, json_str):
+    def from_json(cls, json_str: str):
         """Create Data type from JSON"""
         json_dict = json.loads(json_str)
         json_data = json_dict.get("session_list")
@@ -37,48 +37,43 @@ def delete_session(self, session: str):
             raise Exception("Value with name {} not found over config".format(session))
 
 
-def _read_json_file(config_file: str) -> Data:
+def read_json_file(config_file: Path) -> Data:
     """Read JSON file to return Data type"""
-    if not config_file.exists():
-        with open(config_file, "a+") as opened_file:
-            val = Data()
-            opened_file.write(val.to_json())
-    with open(config_file) as opened_file:
-        val = opened_file.read()
-        data = Data.from_json(val)
+    with config_file.open("a+") as opened_file:
+        opened_file.seek(0)
+        data = Data.from_json(opened_file.read())
     return data
 
 
-def _config_file_data() -> str:
+def config_file_path() -> Path:
     """Get Config file location"""
     config_location = user_config_dir()
     config_file = os.path.join(config_location, "aoc-config.json")
-    config_file = Path(config_file)
-    return config_file
+    return Path(config_file)
 
 
 def add_to_json(**kwargs: str):
     """Add new session to json config file"""
-    config_file = _config_file_data()
-    data = _read_json_file(config_file)
+    config_file = config_file_path()
+    data = read_json_file(config_file)
     data.add_session(**kwargs)
-    with open(config_file, "w") as opened_file:
+    with config_file.open("w") as opened_file:
         opened_file.write(data.to_json())
 
 
 def delete_from_json(session: str):
     """Delete session from JSON config file"""
-    config_file = _config_file_data()
-    data = _read_json_file(config_file)
+    config_file = config_file_path()
+    data = read_json_file(config_file)
     data.delete_session(session)
     with open(config_file, "w") as opened_file:
         opened_file.write(data.to_json())
 
 
-def list_from_json():
+def print_all_session():
     """List all session from a JSON file along with value"""
-    config_file = _config_file_data()
-    data = _read_json_file(config_file)
+    config_file = config_file_path()
+    data = read_json_file(config_file)
     json_dict = json.loads(data.to_json())
     json_data = json_dict.get("session_list")
     for key, val in json_data.items():
@@ -87,8 +82,8 @@ def list_from_json():
 
 def get_session_value(session_name: str) -> str:
     """Return session name value from JSON config file"""
-    config_file = _config_file_data()
-    data = _read_json_file(config_file)
+    config_file = config_file_path()
+    data = read_json_file(config_file)
     json_dict = json.loads(data.to_json())
     json_data = json_dict.get("session_list")
     session_value = json_data.get(session_name)
@@ -99,8 +94,8 @@ def get_session_value(session_name: str) -> str:
 
 def get_all_session() -> List[str]:
     """Return all session name"""
-    config_file = _config_file_data()
-    data = _read_json_file(config_file)
+    config_file = config_file_path()
+    data = read_json_file(config_file)
     json_dict = json.loads(data.to_json())
     json_data = json_dict.get("session_list")
     session_list = list(json_data.keys())

noxfile.py

@@ -1,10 +1,10 @@
-import nox_poetry
+from nox_poetry import session
 from nox_poetry.sessions import Session
 
-python_versions = ["3.7", "3.8", "3.9", "3.10", "3.11"]
+python_versions = ["3.8", "3.9", "3.10", "3.11", "3.12"]
 
 
-@nox_poetry.session(python=python_versions)
+@session(python=python_versions)
 def lint(session: Session):
     session.install("black", "isort", "safety", "pytest", ".")
     session.run("black", ".", "--check")