🎨 Updates and misc improvements

Author: nikolaik

.pre-commit-config.yaml

@@ -1,6 +1,6 @@
 repos:
   - repo: https://github.com/astral-sh/ruff-pre-commit
-    rev: v0.1.0
+    rev: v0.14.5
     hooks:
       - id: ruff
         args: [--fix]

pyproject.toml

@@ -33,6 +33,9 @@ dev = [
 
 [tool.ruff]
 line-length = 120
+target-version = "py314"
+
+[tool.ruff.lint]
 select = ["ALL"]
 ignore = [
   "T201",  # This is a cli
@@ -44,9 +47,8 @@ ignore = [
   "FBT001", # Allow boolean function args
   "FIX001" # Allow fixme's
 ]
-target-version = "py312"
 
-[tool.ruff.per-file-ignores]
+[tool.ruff.lint.per-file-ignores]
 "**/test*.py" = ["S101"]
 
 [tool.mypy]

renovate.json

@@ -42,5 +42,8 @@
       "automerge": true
     }
   ],
-  "platformAutomerge": true
+  "platformAutomerge": true,
+  "pre-commit": {
+    "enabled": true
+  }
 }

src/docker_python_nodejs/build_matrix.py

@@ -28,7 +28,7 @@ def _github_action_set_output(key: str, value: str) -> None:
         fp.write(f"{key}={value}")
 
 
-def build_matrix(new_or_updated: "list[BuildVersion]", ci_event: str) -> None:
+def build_matrix(new_or_updated: list[BuildVersion], ci_event: str) -> None:
     if not new_or_updated and ci_event == CI_EVENT_SCHEDULED:
         logger.info("\n# Scheduled run with no new or updated versions. Doing nothing.")
         return

src/docker_python_nodejs/dockerfiles.py

@@ -2,7 +2,6 @@
 import datetime
 import json
 import logging
-from collections.abc import Mapping
 from typing import Any
 
 from jinja2 import Environment, FileSystemLoader, select_autoescape
@@ -15,7 +14,7 @@
 env = Environment(loader=FileSystemLoader("./templates"), autoescape=select_autoescape())
 
 
-def _render_template(template_name: str, context: Mapping[str, Any]) -> str:
+def _render_template(template_name: str, context: dict[str, Any]) -> str:
     template = env.get_template(template_name)
     return template.render(context)
 

src/docker_python_nodejs/nodejs_versions.py

@@ -1,5 +1,4 @@
 import datetime
-from collections.abc import Mapping
 from typing import TypedDict
 
 import requests
@@ -38,9 +37,9 @@ class ReleaseScheduleItem(TypedDict):
     codename: str
 
 
-def fetch_nodejs_release_schedule() -> Mapping[str, ReleaseScheduleItem]:
+def fetch_nodejs_release_schedule() -> dict[str, ReleaseScheduleItem]:
     """Download list of official releases, skipping unreleased and unsupported versions"""
     res = requests.get("https://raw.githubusercontent.com/nodejs/Release/master/schedule.json", timeout=10.0)
     res.raise_for_status()
-    release_schedule: Mapping[str, ReleaseScheduleItem] = res.json()
+    release_schedule: dict[str, ReleaseScheduleItem] = res.json()
     return release_schedule

src/docker_python_nodejs/readme.py

@@ -23,9 +23,9 @@ def _replace(name: str, replacement: str, document: str) -> str:
 
 
 def update_dynamic_readme(
-    versions: "list[BuildVersion]",
-    python_versions: "list[SupportedVersion]",
-    node_versions: "list[SupportedVersion]",
+    versions: list[BuildVersion],
+    python_versions: list[SupportedVersion],
+    node_versions: list[SupportedVersion],
     dry_run: bool = False,
 ) -> None:
     """Read out current README, format fresh README, write back possible changes"""
@@ -44,9 +44,9 @@ def update_dynamic_readme(
 
 
 def format_readme(
-    versions: "list[BuildVersion]",
-    python_versions: "list[SupportedVersion]",
-    node_versions: "list[SupportedVersion]",
+    versions: list[BuildVersion],
+    python_versions: list[SupportedVersion],
+    node_versions: list[SupportedVersion],
     readme: str,
 ) -> str:
     """Format fresh README based on passed in version. Replaces the whole table with new versions."""
@@ -57,17 +57,17 @@ def format_readme(
     return _replace("SUPPORTED_VERSIONS", supported_versions_table, readme_fresh)
 
 
-def format_tags(versions: "list[BuildVersion]") -> str:
+def format_tags(versions: list[BuildVersion]) -> str:
     headings = ["Tag", "Python version", "Node.js version", "Distro"]
     rows = [[f"`{v.key}`", v.python_canonical, v.nodejs_canonical, v.distro] for v in versions]
     return _format_md_table(headings, rows)
 
 
 def format_supported_versions(
-    python_versions: "list[SupportedVersion]",
-    node_versions: "list[SupportedVersion]",
+    python_versions: list[SupportedVersion],
+    node_versions: list[SupportedVersion],
 ) -> str:
-    def _as_rows(versions: "list[SupportedVersion]") -> list[list[str]]:
+    def _as_rows(versions: list[SupportedVersion]) -> list[list[str]]:
         return [[ver.version, ver.start, ver.end] for ver in sorted(versions, key=lambda x: x.start, reverse=True)]
 
     python_table = _format_md_table(["Python version", "Start", "End"], _as_rows(python_versions))

src/docker_python_nodejs/versions.py

@@ -4,7 +4,7 @@
 import logging
 import re
 from dataclasses import dataclass
-from pathlib import Path
+from typing import TYPE_CHECKING
 
 import requests
 from bs4 import BeautifulSoup
@@ -20,6 +20,9 @@
 )
 from .settings import DEFAULT_DISTRO, DEFAULT_PLATFORMS, DISTROS, VERSIONS_PATH
 
+if TYPE_CHECKING:
+    from pathlib import Path
+
 todays_date = datetime.datetime.now(datetime.UTC).date().isoformat()
 
 

tests/test_all.py

@@ -7,6 +7,7 @@
 
 import pytest
 import responses
+
 from docker_python_nodejs.dockerfiles import render_dockerfile_with_context
 from docker_python_nodejs.readme import update_dynamic_readme
 from docker_python_nodejs.settings import BASE_PATH, DOCKERFILES_PATH
@@ -39,7 +40,7 @@ def build_version_fixture() -> BuildVersion:
     )
 
 
-@pytest.mark.enable_socket()
+@pytest.mark.enable_socket
 def test_scrape_supported_python_versions() -> None:
     versions = scrape_supported_python_versions()
     assert len(versions) > 0
@@ -71,13 +72,13 @@ def test_render_dockerfile_with_context(build_version: BuildVersion) -> None:
 class MockPath:
     content: str = ""
 
-    def __init__(self: "MockPath", content: str) -> None:
+    def __init__(self: MockPath, content: str) -> None:
         self.content = content
 
-    def write_text(self: "MockPath", text: str) -> None:
+    def write_text(self: MockPath, text: str) -> None:
         self.content = text
 
-    def read_text(self: "MockPath") -> str:
+    def read_text(self: MockPath) -> str:
         return self.content