♻️ Start using uv project support

Author: nikolaik

.github/workflows/build.yaml

@@ -20,14 +20,12 @@ jobs:
       - uses: actions/setup-python@v5
         with:
           python-version-file: '.python-version'
-      - name: Install dependencies
-        run: |
-          pip install uv
-          uv pip install -r pyproject.toml --system
+      - name: Install uv
+        run: pip install -U uv
       - name: Generate build matrix
         run: |
           FORCE=$(if git log --pretty=format:"%s" HEAD^..HEAD | grep -q '\[force\]'; then echo "--force"; else echo ""; fi)
-          python -m build_versions.main --ci-matrix $FORCE --ci-event ${{ github.event_name }}
+          uv run dpn --ci-matrix $FORCE --ci-event ${{ github.event_name }}
         id: set-matrix
 
   deploy:
@@ -42,11 +40,10 @@ jobs:
       - uses: actions/setup-python@v5
         with:
           python-version-file: '.python-version'
-      - run: |
-          pip install uv
-          uv pip install -r pyproject.toml --system
+      - name: Install uv
+        run: pip install -U uv
       - name: Generate Dockerfile from config
-        run: python -m build_versions.main --dockerfile-with-context '${{ toJSON(matrix) }}'
+        run: uv run dpn --dockerfile-with-context '${{ toJSON(matrix) }}'
       - name: Set up QEMU
         uses: docker/setup-qemu-action@v3
       - name: Set up Docker Buildx
@@ -84,12 +81,11 @@ jobs:
       - uses: actions/setup-python@v5
         with:
           python-version-file: '.python-version'
-      - run: |
-          pip install uv
-          uv pip install -r pyproject.toml --system
+      - name: Install uv
+        run: pip install -U uv
       - name: Update versions.json and README.md, then commit and push changes (if any)
         run: |
-          python -m build_versions.main --verbose --release
+          uv run dpn --verbose --release
           clean_checkout=$(git status --porcelain)
           if [[ -n "${clean_checkout}" ]]; then
               git config --global user.name "Nikolai Kristiansen" > /dev/null 2>&1

.github/workflows/tests.yaml

@@ -12,11 +12,9 @@ jobs:
       - uses: actions/setup-python@v5
         with:
           python-version-file: '.python-version'
-      - run: |
-          pip install uv
-          uv pip install -r pyproject.toml --system --all-extras
-      - run: ./bin/lint
-      - run: ./bin/test
+      - run: pip install -U uv
+      - run: uv run ./bin/lint
+      - run: uv run ./bin/test
       - name: Upload coverage reports to Codecov
         uses: codecov/codecov-action@v4
         env:

.pre-commit-config.yaml

@@ -1,17 +1,15 @@
-# See https://pre-commit.com for more information
-# See https://pre-commit.com/hooks.html for more hooks
 repos:
   - repo: https://github.com/astral-sh/ruff-pre-commit
     rev: v0.1.0
     hooks:
       - id: ruff
-        args: [--fix, --exit-non-zero-on-fix]
+        args: [--fix]
       - id: ruff-format
   - repo: local
     hooks:
       - id: mypy
         name: mypy
-        entry: mypy
+        entry: uv run mypy
         language: python
         require_serial: true
         types: [python]

README.md

@@ -87,7 +87,7 @@ Tag | Python version | Node.js version | Distro
 
 <!-- TAGS_END -->
 
-Lovely! These tags are kept updated automatically when new minor or patch version are released by [`build_versions/main.py`](./build_versions/main.py), which is run twice a day on [CircleCI](https://circleci.com/gh/nikolaik/docker-python-nodejs).
+Lovely! These tags are kept updated automatically when new minor or patch version are released. The python script in [`src/docker_python_nodejs`](./src/docker_python_nodejs/) handling this is run twice a day on [GitHub actions](https://github.com/nikolaik/docker-python-nodejs/actions).
 
 Image tags are built for linux/amd64 and linux/arm64 platforms, except for alpine which is only linux/amd64. See [issue #70](https://github.com/nikolaik/docker-python-nodejs/issues/70) for details.
 

bin/test

@@ -1,3 +1,3 @@
 #!/usr/bin/env bash
 
-pytest -v --cov=build_versions --cov-report=xml
+pytest -v --cov=docker_python_nodejs --cov-report=xml

build_versions/__init__.py

@@ -7,10 +7,19 @@ dependencies = [
   "beautifulsoup4",
   "jinja2",
 ]
-requires-python = "== 3.12"
+description = "Build docker images with Python and Node.js"
+readme = "README.md"
+requires-python = "~= 3.12"
 
-[project.optional-dependencies]
-dev = [
+[build-system]
+requires = ["hatchling"]
+build-backend = "hatchling.build"
+
+[project.scripts]
+dpn = "docker_python_nodejs:dpn"
+
+[tool.uv]
+dev-dependencies = [
   "pytest",
   "pre-commit",
   "ruff==0.6.0",

pyproject.toml

@@ -0,0 +1,8 @@
+from .cli import main, parse_args
+from .logger import init_logging
+
+
+def dpn() -> None:
+    args = parse_args()
+    init_logging(args.verbose)
+    main(args)

src/docker_python_nodejs/__init__.py

@@ -6,7 +6,7 @@
 from typing import TYPE_CHECKING
 
 if TYPE_CHECKING:
-    from build_versions.versions import BuildVersion
+    from .versions import BuildVersion
 
 CI_EVENT_SCHEDULED = "scheduled"
 

build_versions/ci_matrix.py src/docker_python_nodejs/ci_matrix.py

@@ -2,12 +2,11 @@
 import logging
 from typing import cast
 
-from build_versions.ci_matrix import generate_matrix
-from build_versions.dockerfiles import render_dockerfile_with_context
-from build_versions.logger import init_logging
-from build_versions.readme import format_supported_versions, update_dynamic_readme
-from build_versions.settings import DISTROS
-from build_versions.versions import (
+from .ci_matrix import generate_matrix
+from .dockerfiles import render_dockerfile_with_context
+from .readme import format_supported_versions, update_dynamic_readme
+from .settings import DISTROS
+from .versions import (
     decide_version_combinations,
     fetch_supported_nodejs_versions,
     find_new_or_updated,
@@ -89,9 +88,3 @@ def parse_args() -> CLIArgs:
     parser.add_argument("--verbose", action="store_true", help="Enable debug logging")
 
     return cast(CLIArgs, parser.parse_args())
-
-
-if __name__ == "__main__":
-    args = parse_args()
-    init_logging(args.verbose)
-    main(args)

build_versions/main.py src/docker_python_nodejs/cli.py

@@ -7,8 +7,8 @@
 
 from jinja2 import Environment, FileSystemLoader, select_autoescape
 
-from build_versions.settings import DOCKERFILES_PATH
-from build_versions.versions import BuildVersion
+from .settings import DOCKERFILES_PATH
+from .versions import BuildVersion
 
 logger = logging.getLogger("dpn")
 

build_versions/docker_hub.py src/docker_python_nodejs/docker_hub.py

@@ -4,7 +4,7 @@
 from typing import TYPE_CHECKING
 
 if TYPE_CHECKING:
-    from build_versions.versions import BuildVersion, SupportedVersion
+    from .versions import BuildVersion, SupportedVersion
 
 logger = logging.getLogger("dpn")
 

build_versions/dockerfiles.py src/docker_python_nodejs/dockerfiles.py

@@ -1,11 +1,9 @@
 from pathlib import Path
 
 # Paths
-BASE_PATH = Path(__file__).parent.parent
+BASE_PATH = Path(__file__).parent.parent.parent
 VERSIONS_PATH = BASE_PATH / "versions.json"
 DOCKERFILES_PATH = BASE_PATH / "dockerfiles"
-CONFIG_TEMPLATE_PATH = BASE_PATH / ".circleci/config_template.yml"
-CONFIG_GENERATED_PATH = BASE_PATH / ".circleci/config_generated.yml"
 
 DEFAULT_PLATFORMS = ["linux/amd64", "linux/arm64"]
 DEFAULT_DISTRO = "bookworm"

build_versions/logger.py src/docker_python_nodejs/logger.py

@@ -9,13 +9,13 @@
 from bs4 import BeautifulSoup
 from semver.version import Version
 
-from build_versions.docker_hub import DockerImageDict, DockerTagDict, fetch_tags
-from build_versions.nodejs_versions import (
+from .docker_hub import DockerImageDict, DockerTagDict, fetch_tags
+from .nodejs_versions import (
     fetch_node_releases,
     fetch_node_unofficial_releases,
     fetch_nodejs_release_schedule,
 )
-from build_versions.settings import DEFAULT_DISTRO, DEFAULT_PLATFORMS, DISTROS, VERSIONS_PATH
+from .settings import DEFAULT_DISTRO, DEFAULT_PLATFORMS, DISTROS, VERSIONS_PATH
 
 todays_date = datetime.datetime.now(datetime.UTC).date().isoformat()
 

build_versions/nodejs_versions.py src/docker_python_nodejs/nodejs_versions.py

@@ -6,11 +6,10 @@
 
 import pytest
 import responses
-
-from build_versions.dockerfiles import render_dockerfile_with_context
-from build_versions.readme import update_dynamic_readme
-from build_versions.settings import BASE_PATH, DOCKERFILES_PATH
-from build_versions.versions import (
+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
+from docker_python_nodejs.versions import (
     BuildVersion,
     SupportedVersion,
     decide_nodejs_versions,