lange-python 0.3.21__tar.gz → 0.3.22__tar.gz

{lange_python-0.3.21 → lange_python-0.3.22}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: lange-python
-Version: 0.3.21
+Version: 0.3.22
 Summary: A bundeld set of tools, clients for the lange-suite of tools and more.
 Author: contact@robertlange.me
 Requires-Python: >=3.10

{lange_python-0.3.21 → lange_python-0.3.22}/lange/cli/build/_command.py

@@ -13,7 +13,12 @@ from ._discovery import (
     prompt_for_build_system_selection,
     resolve_build_folder,
 )
-from ._docker import ensure_docker_is_available, parse_image_reference, run_docker_build
+from ._docker import (
+    discover_dockerfiles,
+    ensure_docker_is_available,
+    parse_image_reference,
+    run_docker_build,
+)
 from ._poetry import run_poetry_build, run_poetry_publish, run_poetry_version_patch
 from ._types import DOCKER_BUILD_SYSTEM, POETRY_BUILD_SYSTEM, BuildSystem
 
@@ -130,10 +135,9 @@ def resolve_build_system(
     :returns: Resolved build system value.
     """
     if force_docker:
-        dockerfile = folder / "Dockerfile"
-        if not dockerfile.is_file():
+        if not discover_dockerfiles(folder):
             raise click.ClickException(
-                f"Dockerfile was not found at '{dockerfile}'."
+                f"Dockerfile was not found at '{folder / 'Dockerfile'}'."
             )
         return DOCKER_BUILD_SYSTEM
 
@@ -166,14 +170,30 @@ def _run_docker_flow(folder: Path, publish: bool) -> None:
     :param publish: Whether publish was requested via flag.
     :returns: ``None``.
     """
-    dockerfile = folder / "Dockerfile"
-    image_reference = parse_image_reference(dockerfile)
+    dockerfiles = discover_dockerfiles(folder)
+    if not dockerfiles:
+        raise click.ClickException(
+            f"Dockerfile was not found at '{folder / 'Dockerfile'}'."
+        )
+
     ensure_docker_is_available()
 
     try:
-        run_docker_build(folder=folder, image_reference=image_reference, publish=publish)
-        if not publish and _confirm_publish():
-            run_docker_build(folder=folder, image_reference=image_reference, publish=True)
+        for dockerfile in dockerfiles:
+            image_reference = parse_image_reference(dockerfile)
+            run_docker_build(
+                folder=folder,
+                dockerfile=dockerfile,
+                image_reference=image_reference,
+                publish=publish,
+            )
+            if not publish and _confirm_publish():
+                run_docker_build(
+                    folder=folder,
+                    dockerfile=dockerfile,
+                    image_reference=image_reference,
+                    publish=True,
+                )
     except subprocess.CalledProcessError as error:
         raise click.ClickException(
             f"Docker command failed with exit code {error.returncode}."

{lange_python-0.3.21 → lange_python-0.3.22}/lange/cli/build/_discovery.py

@@ -6,6 +6,7 @@ from pathlib import Path
 
 import click
 
+from ._docker import discover_dockerfiles
 from ._types import DOCKER_BUILD_SYSTEM, POETRY_BUILD_SYSTEM, BuildSystem
 
 
@@ -82,7 +83,7 @@ def list_buildable_folders(
     """
     candidates = list_candidate_folders(root)
     if force_docker:
-        return [folder for folder in candidates if (folder / "Dockerfile").is_file()]
+        return [folder for folder in candidates if discover_dockerfiles(folder)]
     if force_poetry:
         return [folder for folder in candidates if (folder / "pyproject.toml").is_file()]
     return [
@@ -98,7 +99,7 @@ def detect_available_build_systems(folder: Path) -> list[BuildSystem]:
     :returns: Ordered list of detected build systems.
     """
     available: list[BuildSystem] = []
-    if (folder / "Dockerfile").is_file():
+    if discover_dockerfiles(folder):
         available.append(DOCKER_BUILD_SYSTEM)
     if (folder / "pyproject.toml").is_file():
         available.append(POETRY_BUILD_SYSTEM)

{lange_python-0.3.21 → lange_python-0.3.22}/lange/cli/build/_docker.py

@@ -14,6 +14,25 @@ PLATFORMS = "linux/amd64,linux/arm64"
 IMAGE_LINE_PATTERN = re.compile(r"^#\s*image:\s*(?P<image>\S+)\s*$", re.IGNORECASE)
 
 
+def discover_dockerfiles(folder: Path) -> list[Path]:
+    """
+    Discover Dockerfiles that should be built for a folder.
+
+    :param folder: Folder that should be inspected.
+    :returns: Default Dockerfile when present, otherwise sorted named Dockerfiles.
+    """
+    default_dockerfile = folder / "Dockerfile"
+    if default_dockerfile.is_file():
+        return [default_dockerfile]
+
+    named_dockerfiles = [
+        path
+        for path in folder.glob("*.Dockerfile")
+        if path.is_file()
+    ]
+    return sorted(named_dockerfiles, key=lambda item: item.name.lower())
+
+
 def ensure_docker_is_available() -> None:
     """
     Validate that docker is installed and available in ``PATH``.
@@ -98,16 +117,22 @@ def ensure_buildx_builder() -> None:
     )
 
 
-def run_docker_build(folder: Path, image_reference: str, publish: bool) -> None:
+def run_docker_build(
+    folder: Path,
+    dockerfile: Path,
+    image_reference: str,
+    publish: bool,
+) -> None:
     """
     Execute docker buildx build for the given folder.
 
     :param folder: Build context folder.
+    :param dockerfile: Dockerfile to build.
     :param image_reference: Docker image name including tag.
     :param publish: Whether ``--push`` should be included.
     :returns: ``None``.
     """
-    dockerfile = (folder / "Dockerfile").resolve()
+    resolved_dockerfile = dockerfile.resolve()
     ensure_buildx_builder()
 
     command: list[str] = [
@@ -117,7 +142,7 @@ def run_docker_build(folder: Path, image_reference: str, publish: bool) -> None:
         "--platform",
         PLATFORMS,
         "--file",
-        str(dockerfile),
+        str(resolved_dockerfile),
         "--tag",
         image_reference,
     ]

{lange_python-0.3.21 → lange_python-0.3.22}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "lange-python"
-version = "0.3.21"
+version = "0.3.22"
 description = "A bundeld set of tools, clients for the lange-suite of tools and more."
 authors = [
     {name = "contact@robertlange.me"}