common-python-tasks 0.9.0__tar.gz → 0.10.1__tar.gz

{common_python_tasks-0.9.0 → common_python_tasks-0.10.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.5
 Name: common-python-tasks
-Version: 0.9.0
+Version: 0.10.1
 Summary: Opinionated Poe the Poet tasks for Python package development.
 Project-URL: Homepage, http://github.com/ci-sourcerer/common-python-tasks
 Project-URL: Source, http://github.com/ci-sourcerer/common-python-tasks.git
@@ -43,7 +43,7 @@ It supplies sensible defaults for formatting, linting, testing, packaging, relea
 Add `common-python-tasks` as a development dependency from your project root.
 
 ```shell
-uv add --dev common-python-tasks==0.9.0
+uv add --dev common-python-tasks==0.10.1
 ```
 
 Configure Poe the Poet to expose the default `common` task set.
@@ -68,7 +68,7 @@ The helper script performs the same development-dependency installation and Poe
 ```shell
 curl --fail --silent --show-error --location \
   --output /tmp/add_common_python_tasks.py \
-  https://raw.githubusercontent.com/ci-sourcerer/common-python-tasks/v0.9.0/scripts/add_common_python_tasks.py
+  https://raw.githubusercontent.com/ci-sourcerer/common-python-tasks/v0.10.1/scripts/add_common_python_tasks.py
 ```
 
 Review the downloaded script before executing it.
@@ -80,10 +80,10 @@ less /tmp/add_common_python_tasks.py
 Run the reviewed script with the same pinned package version.
 
 ```shell
-COMMON_PYTHON_TASKS_VERSION=0.9.0 python3 /tmp/add_common_python_tasks.py
+COMMON_PYTHON_TASKS_VERSION=0.10.1 python3 /tmp/add_common_python_tasks.py
 ```
 
-To install another release, replace both occurrences of `0.9.0` with that release's version.
+To install another release, replace both occurrences of `0.10.1` with that release's version.
 
 ## Available tasks
 
@@ -203,7 +203,7 @@ After installing the package, a minimal project configuration looks like this.
 ```toml
 [project]
 name = "simple-cli-tool"
-version = "0.9.0"
+version = "0.10.1"
 
 [tool.poe]
 include_script = "common_python_tasks:tasks()"
@@ -248,6 +248,7 @@ addopts = "-ra"
 
 - `CONTAINER_REGISTRY_USERNAME`: Container-registry username for image tagging; the default is the current local user
 - `CONTAINER_REGISTRY_URL`: Registry URL with a default of `docker.io/{username}`
+- `CONTAINER_PYTHON_VARIANT`: Python base-image variant such as `slim`, `alpine`, etc. See <https://hub.docker.com/_/python> for available options. Defaults to `slim`; set to empty string for no variant (e.g., `FROM python:3.11`). The value is passed as the `PYTHON_VARIANT` Docker build argument and recorded in the `org.opencontainers.image.python.variant` image label.
 - `CONTAINER_DOCKER_BUILD_ARGS`: Additional arguments passed directly to `docker build`, parsed using shell quoting rules. Free arguments provided to the task after `--` take precedence.
 - `CONTAINER_DOCKERFILE_HOOK_PATH`: Optional host path to an executable hook script that receives the generated Dockerfile path and can modify the file before `docker build` runs.
 - `CONTAINER_APT_PACKAGES`: Space-delimited system packages installed in the generated image
@@ -263,6 +264,7 @@ addopts = "-ra"
 - `CONTAINER_DEPS_MAPPINGS`: Space-delimited `name:/target/path` entries for copying items from `/tmp/deps`. It is used only when no dependency move script is set.
 - `CONTAINER_DEPS_MOVE_SCRIPT`: Raw executable script to run after `/tmp/deps` is copied into the image
 - `CONTAINER_DEPS_MOVE_SCRIPT_PATH`: Host path to a dependency move script. This takes precedence over `CONTAINER_DEPS_MOVE_SCRIPT`.
+- `UV_INDEX_{name}_USERNAME` and `UV_INDEX_{name}_PASSWORD`: Private Python index credentials consumed by uv during the Docker build. When any of these are set, the task automatically passes them as BuildKit secrets (`--secret id=uv_index_{name}_username,env=...`) and renders matching `--mount=type=secret` directives in the builder stage so uv can authenticate without baking credentials into the image. Multiple indices are supported; replace `{name}` with the uppercase index name (hyphens as underscores). These can be set in `tool.poe.env` for CI/CD or in the local environment for development.
 
 #### Release settings
 

{common_python_tasks-0.9.0 → common_python_tasks-0.10.1}/README.md

@@ -11,7 +11,7 @@ It supplies sensible defaults for formatting, linting, testing, packaging, relea
 Add `common-python-tasks` as a development dependency from your project root.
 
 ```shell
-uv add --dev common-python-tasks==0.9.0
+uv add --dev common-python-tasks==0.10.1
 ```
 
 Configure Poe the Poet to expose the default `common` task set.
@@ -36,7 +36,7 @@ The helper script performs the same development-dependency installation and Poe
 ```shell
 curl --fail --silent --show-error --location \
   --output /tmp/add_common_python_tasks.py \
-  https://raw.githubusercontent.com/ci-sourcerer/common-python-tasks/v0.9.0/scripts/add_common_python_tasks.py
+  https://raw.githubusercontent.com/ci-sourcerer/common-python-tasks/v0.10.1/scripts/add_common_python_tasks.py
 ```
 
 Review the downloaded script before executing it.
@@ -48,10 +48,10 @@ less /tmp/add_common_python_tasks.py
 Run the reviewed script with the same pinned package version.
 
 ```shell
-COMMON_PYTHON_TASKS_VERSION=0.9.0 python3 /tmp/add_common_python_tasks.py
+COMMON_PYTHON_TASKS_VERSION=0.10.1 python3 /tmp/add_common_python_tasks.py
 ```
 
-To install another release, replace both occurrences of `0.9.0` with that release's version.
+To install another release, replace both occurrences of `0.10.1` with that release's version.
 
 ## Available tasks
 
@@ -171,7 +171,7 @@ After installing the package, a minimal project configuration looks like this.
 ```toml
 [project]
 name = "simple-cli-tool"
-version = "0.9.0"
+version = "0.10.1"
 
 [tool.poe]
 include_script = "common_python_tasks:tasks()"
@@ -216,6 +216,7 @@ addopts = "-ra"
 
 - `CONTAINER_REGISTRY_USERNAME`: Container-registry username for image tagging; the default is the current local user
 - `CONTAINER_REGISTRY_URL`: Registry URL with a default of `docker.io/{username}`
+- `CONTAINER_PYTHON_VARIANT`: Python base-image variant such as `slim`, `alpine`, etc. See <https://hub.docker.com/_/python> for available options. Defaults to `slim`; set to empty string for no variant (e.g., `FROM python:3.11`). The value is passed as the `PYTHON_VARIANT` Docker build argument and recorded in the `org.opencontainers.image.python.variant` image label.
 - `CONTAINER_DOCKER_BUILD_ARGS`: Additional arguments passed directly to `docker build`, parsed using shell quoting rules. Free arguments provided to the task after `--` take precedence.
 - `CONTAINER_DOCKERFILE_HOOK_PATH`: Optional host path to an executable hook script that receives the generated Dockerfile path and can modify the file before `docker build` runs.
 - `CONTAINER_APT_PACKAGES`: Space-delimited system packages installed in the generated image
@@ -231,6 +232,7 @@ addopts = "-ra"
 - `CONTAINER_DEPS_MAPPINGS`: Space-delimited `name:/target/path` entries for copying items from `/tmp/deps`. It is used only when no dependency move script is set.
 - `CONTAINER_DEPS_MOVE_SCRIPT`: Raw executable script to run after `/tmp/deps` is copied into the image
 - `CONTAINER_DEPS_MOVE_SCRIPT_PATH`: Host path to a dependency move script. This takes precedence over `CONTAINER_DEPS_MOVE_SCRIPT`.
+- `UV_INDEX_{name}_USERNAME` and `UV_INDEX_{name}_PASSWORD`: Private Python index credentials consumed by uv during the Docker build. When any of these are set, the task automatically passes them as BuildKit secrets (`--secret id=uv_index_{name}_username,env=...`) and renders matching `--mount=type=secret` directives in the builder stage so uv can authenticate without baking credentials into the image. Multiple indices are supported; replace `{name}` with the uppercase index name (hyphens as underscores). These can be set in `tool.poe.env` for CI/CD or in the local environment for development.
 
 #### Release settings
 

{common_python_tasks-0.9.0 → common_python_tasks-0.10.1}/pyproject.toml

@@ -70,11 +70,3 @@ dirty = true
 
 [tool.uv]
 package = true
-
-[tool.ruff]
-line-length = 88
-extend-exclude = [".dist", "build"]
-
-[tool.ruff.lint]
-select = ["E4", "E7", "E9", "F", "I", "W"]
-ignore = ["W191"]

{common_python_tasks-0.9.0 → common_python_tasks-0.10.1}/scripts/update_readme_tasks_table.py

@@ -1,5 +1,3 @@
-#!/usr/bin/env python3
-
 import os
 import sys
 from pathlib import Path

{common_python_tasks-0.9.0 → common_python_tasks-0.10.1}/scripts/utils.py

@@ -1,11 +1,12 @@
 import logging
 import subprocess
+from typing import ClassVar
 
 
 class ColoredFormatter(logging.Formatter):
     """Format warning and error log levels with ANSI color codes."""
 
-    COLORS = {
+    COLORS: ClassVar = {
         "WARNING": "\033[93m",
         "ERROR": "\033[91m",
         "CRITICAL": "\033[91m",

{common_python_tasks-0.9.0 → common_python_tasks-0.10.1}/src/common_python_tasks/__init__.py

@@ -1,7 +1,7 @@
 from typing import TYPE_CHECKING
 
 if TYPE_CHECKING:
-    from typing import Sequence
+    from collections.abc import Sequence
 
 from poethepoet_tasks import TaskCollection
 
@@ -9,7 +9,8 @@ __all__ = ["TaskCollection"]
 
 
 def tasks(
-    include_tags: "Sequence[str] | None" = None, exclude_tags: "Sequence[str]" = tuple()
+    include_tags: "Sequence[str] | None" = None,
+    exclude_tags: "Sequence[str] | None" = None,
 ) -> dict:
     """Return the task collection filtered by the requested tags.
 
@@ -25,6 +26,9 @@ def tasks(
     if include_tags is None and not exclude_tags:
         include_tags = ("common",)
     elif include_tags is None:
-        include_tags = tuple()
+        include_tags = ()
+
+    if exclude_tags is None:
+        exclude_tags = ()
 
     return task_collection(include_tags=include_tags, exclude_tags=exclude_tags)

{common_python_tasks-0.9.0 → common_python_tasks-0.10.1}/src/common_python_tasks/data/generic/.dockerignore

@@ -1,5 +1,4 @@
 *
-!dist/*.whl
 !pyproject.toml
 !uv.lock
 !README.md

{common_python_tasks-0.9.0 → common_python_tasks-0.10.1}/src/common_python_tasks/data/generic/Dockerfile.deps.j2

@@ -5,7 +5,12 @@
 ARG PYTHON_VERSION=3
 ARG PYTHON_VARIANT=slim
 
-FROM python:${PYTHON_VERSION}-${PYTHON_VARIANT} AS deps
+FROM python:${PYTHON_VERSION}${PYTHON_VARIANT:+-${PYTHON_VARIANT}} AS deps
+ARG PYTHON_VERSION
+ARG PYTHON_VARIANT
+
+LABEL org.opencontainers.image.base.name="python:${PYTHON_VERSION}${PYTHON_VARIANT:+-${PYTHON_VARIANT}}" \
+      org.opencontainers.image.python.variant="${PYTHON_VARIANT}"
 
 ARG CACHE_ID_SUFFIX
 RUN printf '%s' "$CACHE_ID_SUFFIX" >/tmp/.cache_id_suffix

{common_python_tasks-0.9.0 → common_python_tasks-0.10.1}/src/common_python_tasks/data/generic/Dockerfile.j2

@@ -4,9 +4,8 @@
 # the latest. The `build-image` task passes the version properly here
 ARG PYTHON_VERSION=3
 # Variant for the runtime image, e.g. slim, alpine, etc.
-# See https://hub.docker.com/_/python for available variants
+# See https://hub.docker.com/_/python for available variants. Leave empty for no variant.
 ARG PYTHON_VARIANT=slim
-ARG WORKDIR_PATH=/workspace
 
 FROM python:${PYTHON_VERSION} AS builder
 
@@ -32,7 +31,8 @@ COPY . /tmp/build/
 
 {% if HAS_DEBUG_DEPS %}
 # Export debug requirements when the project defines a debug dependency group
-RUN --mount=type=cache,target=/root/.cache/uv,id=uv-cache{{ CACHE_ID_SUFFIX }} \
+RUN --mount=type=cache,target=/root/.cache/uv,id=uv-cache{{ CACHE_ID_SUFFIX }}{% for mount in UV_INDEX_SECRET_MOUNTS %} \
+    --mount={{ mount }}{% endfor %} \
     uv export --group debug --no-hashes --format requirements-txt --output-file requirements-debug.txt
 {% endif %}
 
@@ -40,11 +40,18 @@ RUN --mount=type=cache,target=/root/.cache/uv,id=uv-cache{{ CACHE_ID_SUFFIX }} \
 # If running this in a CI system, you must be using a persistent builder to take
 # advantage of the cache mount, and you should configure your CI to persist the
 # cache directory between builds
-RUN --mount=type=cache,target=/root/.cache/uv,id=uv-cache{{ CACHE_ID_SUFFIX }} uv build --wheel
+RUN --mount=type=cache,target=/root/.cache/uv,id=uv-cache{{ CACHE_ID_SUFFIX }}{% for mount in UV_INDEX_SECRET_MOUNTS %} \
+    --mount={{ mount }}{% endfor %} \
+    uv build --wheel
 
-FROM python:${PYTHON_VERSION}-${PYTHON_VARIANT} AS runtime
+FROM python:${PYTHON_VERSION}${PYTHON_VARIANT:+-${PYTHON_VARIANT}} AS runtime
+ARG PYTHON_VERSION
+ARG PYTHON_VARIANT
 ARG WORKDIR_PATH=/workspace
 
+LABEL org.opencontainers.image.base.name="python:${PYTHON_VERSION}${PYTHON_VARIANT:+-${PYTHON_VARIANT}}" \
+      org.opencontainers.image.python.variant="${PYTHON_VARIANT}"
+
 ENV PYTHONUNBUFFERED=1
 ENV PYTHONDONTWRITEBYTECODE=1
 

{common_python_tasks-0.9.0 → common_python_tasks-0.10.1}/src/common_python_tasks/docker.py

@@ -3,14 +3,14 @@ import logging
 import platform
 import re
 import tempfile
+from collections.abc import Sequence
 from dataclasses import dataclass
 from enum import IntEnum, StrEnum
 from pathlib import Path
 from shlex import quote
-from typing import Sequence
 
 from . import git, project, utils
-from .env import get_cache_id_suffix, get_workdir_path
+from .env import get_cache_id_suffix, get_python_variant, get_workdir_path
 
 LOGGER = logging.getLogger(__name__)
 
@@ -205,10 +205,6 @@ def render_build_image(
     Returns:
         The rendered build plan that contains the command and generated artifacts.
     """
-    dist_path = Path("dist")
-    if utils.directory_has_contents(dist_path):
-        utils.remove_path(dist_path)
-
     context_path = _resolve_context_path(context_path)
 
     temp_file_path = None
@@ -560,7 +556,10 @@ def build_deps_image(
     archs = _resolve_archs(single_arch)
 
     build_args = _merge_build_args(
-        {"PYTHON_VERSION": python_version},
+        {
+            "PYTHON_VERSION": python_version,
+            "PYTHON_VARIANT": get_python_variant(),
+        },
         extra_build_args,
     )
     if cache_id_suffix:

{common_python_tasks-0.9.0 → common_python_tasks-0.10.1}/src/common_python_tasks/docker_compose.py

@@ -5,9 +5,10 @@ import logging
 import os
 import platform
 import tempfile
+from collections.abc import Sequence
 from pathlib import Path
 from shlex import quote
-from typing import NoReturn, Sequence
+from typing import NoReturn
 
 from jinja2 import Template
 from poethepoet_tasks import TaskCollection
@@ -113,16 +114,15 @@ def render_file(
         if extra_template_vars:
             template_vars.update(extra_template_vars)
         rendered = Template(path_obj.read_text()).render(**template_vars)
-        tf = tempfile.NamedTemporaryFile(
+        with tempfile.NamedTemporaryFile(
             mode="w",
             encoding="utf-8",
             delete=False,
             prefix=path_obj.stem + ".",
             suffix=suffix,
-        )
-        temp_path = Path(tf.name)
-        tf.write(rendered)
-        tf.close()
+        ) as temp_file:
+            temp_path = Path(temp_file.name)
+            temp_file.write(rendered)
         return temp_path, True
 
     return path_obj, False
@@ -154,7 +154,7 @@ def read_dotenv(path: Path, error_on_fail: bool = False) -> dict[str, str]:
             value = value.strip().strip('"').strip("'")
             if key:
                 env[key] = value
-    except Exception as exc:
+    except (OSError, UnicodeError) as exc:
         if error_on_fail:
             utils.fatal(f"Failed to parse .env file {path}: {exc}")
         else:
@@ -169,9 +169,9 @@ def append_dotenv(path: Path, items: dict[str, str]) -> None:
         path: Path to the `.env` file.
         items: Environment variables to append to the file.
     """
-    from datetime import datetime
+    from datetime import UTC, datetime
 
-    header = f"\n# Auto-generated by common_python_tasks on {datetime.now().isoformat(timespec='seconds')}\n"
+    header = f"\n# Auto-generated by common_python_tasks on {datetime.now(UTC).astimezone().isoformat(timespec='seconds')}\n"
     with path.open("a", encoding="utf-8") as f:
         f.write(header)
         for k, v in items.items():
@@ -214,7 +214,7 @@ def get_or_generate_secret(
     try:
         append_dotenv(dotenv_path, {key_name: token})
         LOGGER.info("Generated %s and stored it in .env", key_name)
-    except Exception as exc:
+    except OSError as exc:
         LOGGER.warning(
             "Failed to persist %s to .env (%s); using in-memory only", key_name, exc
         )
@@ -590,14 +590,14 @@ def build_exec_script(
     Returns:
         Absolute path to the temporary script file.
     """
-    script_fd = tempfile.NamedTemporaryFile(
+    with tempfile.NamedTemporaryFile(
         mode="w",
         encoding="utf-8",
         delete=False,
         prefix="compose-exec.",
         suffix=".sh",
-    )
-    script_path = Path(script_fd.name)
+    ) as temp_file:
+        script_path = Path(temp_file.name)
     script_path_str = str(script_path.resolve())
 
     lines = [

{common_python_tasks-0.9.0 → common_python_tasks-0.10.1}/src/common_python_tasks/env.py

@@ -1,5 +1,6 @@
 import logging
 import os
+import re
 import secrets
 import shlex
 from pathlib import Path
@@ -21,6 +22,82 @@ TRUTHY_VALUES = {
 WORKDIR_PATH_ENV_VAR = "WORKDIR_PATH"
 WORKDIR_PATH_DEFAULT = "/workspace"
 _AUTO_INJECTED_BUILD_ARG_ENV_VARS = (WORKDIR_PATH_ENV_VAR,)
+_UV_INDEX_CREDENTIAL_PATTERN = re.compile(r"^UV_INDEX_(.+)_(USERNAME|PASSWORD)$")
+
+
+def collect_uv_index_credentials() -> list[dict[str, str | None]]:
+    """Collect present `UV_INDEX_{name}_{USERNAME,PASSWORD}` host env vars.
+
+    Returns:
+        A list of dicts with keys `index_name`, `username_env`, and
+        `password_env`. Only indices with at least one credential set are
+        included, sorted by index name.
+    """
+    found = {}
+    for key in os.environ:
+        match = _UV_INDEX_CREDENTIAL_PATTERN.match(key)
+        if match:
+            found.setdefault(match.group(1), set()).add(match.group(2))
+
+    return [
+        {
+            "index_name": name,
+            "username_env": f"UV_INDEX_{name}_USERNAME"
+            if "USERNAME" in found[name]
+            else None,
+            "password_env": f"UV_INDEX_{name}_PASSWORD"
+            if "PASSWORD" in found[name]
+            else None,
+        }
+        for name in sorted(found)
+    ]
+
+
+def uv_index_secret_mounts(credentials: list[dict[str, str | None]]) -> list[str]:
+    """Return Dockerfile ``--mount`` strings for UV index credentials.
+
+    Args:
+        credentials: Output of `collect_uv_index_credentials`.
+
+    Returns:
+        A list of ``type=secret,...`` strings for Dockerfile ``RUN --mount=``
+        directives.
+    """
+    mounts = []
+    for cred in credentials:
+        name = cred["index_name"].lower()
+        if cred["username_env"]:
+            mounts.append(
+                f"type=secret,id=uv_index_{name}_username,env={cred['username_env']}"
+            )
+        if cred["password_env"]:
+            mounts.append(
+                f"type=secret,id=uv_index_{name}_password,env={cred['password_env']}"
+            )
+    return mounts
+
+
+def uv_index_secret_build_args(credentials: list[dict[str, str | None]]) -> list[str]:
+    """Return ``docker build --secret`` arg pairs for UV index credentials.
+
+    Args:
+        credentials: Output of `collect_uv_index_credentials`.
+
+    Returns:
+        A flat list of ``--secret`` flag-value pairs for the docker build command.
+    """
+    args = []
+    for cred in credentials:
+        name = cred["index_name"].lower()
+        if cred["username_env"]:
+            args.extend(
+                ["--secret", f"id=uv_index_{name}_username,env={cred['username_env']}"]
+            )
+        if cred["password_env"]:
+            args.extend(
+                ["--secret", f"id=uv_index_{name}_password,env={cred['password_env']}"]
+            )
+    return args
 
 
 def env_truthy(env_var: str) -> bool:
@@ -44,6 +121,16 @@ def get_workdir_path() -> str:
     return os.getenv(WORKDIR_PATH_ENV_VAR, WORKDIR_PATH_DEFAULT)
 
 
+def get_python_variant() -> str:
+    """Return the Python image variant for container builds.
+
+    Returns:
+        The variant from `CONTAINER_PYTHON_VARIANT`, or 'slim' by default.
+        An empty string disables the variant (e.g., `FROM python:3.11`).
+    """
+    return os.getenv("CONTAINER_PYTHON_VARIANT", "slim").strip()
+
+
 def inject_auto_build_args_from_env(
     build_args: dict[str, str] | None,
 ) -> dict[str, str]:
@@ -454,7 +541,7 @@ def render_container_deps_move_script(mappings: dict[str, str]) -> str:
         "import shutil",
         "import sys",
         "",
-        f"mappings = {repr(mappings)}",
+        f"mappings = {mappings!r}",
         'source_root = pathlib.Path("/tmp/deps")',
         "",
         "for name, dest in mappings.items():",
@@ -523,7 +610,7 @@ def get_prune_keep() -> int:
         return -1
     try:
         return int(raw)
-    except Exception:
+    except ValueError:
         LOGGER.warning(
             "Invalid CONTAINER_PRUNE_KEEP value '%s' - defaulting to -1 (no prune)",
             raw,

{common_python_tasks-0.9.0 → common_python_tasks-0.10.1}/src/common_python_tasks/git.py

@@ -178,13 +178,13 @@ def infer_bump_component_from_git_cliff() -> ReleaseComponent:
     normalized_version = version_text.lstrip("v")
     try:
         bumped = Version.parse(normalized_version)
-    except Exception:
+    except ValueError:
         utils.fatal(f"Unable to parse bumped version from git-cliff: {version_text!r}")
 
     current_version = project.get_project_version()
     try:
         current = Version.parse(current_version)
-    except Exception:
+    except ValueError:
         utils.fatal(f"Unable to parse current project version: {current_version!r}")
 
     def _parse_semver(version_value: str | Any) -> tuple[int, int, int]:

{common_python_tasks-0.9.0 → common_python_tasks-0.10.1}/src/common_python_tasks/project.py

@@ -3,10 +3,11 @@ import logging
 import os
 import re
 import tomllib
+from collections.abc import Sequence
 from functools import lru_cache
 from importlib import metadata
 from pathlib import Path
-from typing import Any, Sequence
+from typing import Any
 
 from packaging.specifiers import InvalidSpecifier, SpecifierSet
 from packaging.version import Version
@@ -513,7 +514,7 @@ def get_project_version_from_vcs() -> str | None:
         from dunamai import Style, Version
 
         return Version.from_git().serialize(style=Style.Pep440, dirty=False)
-    except Exception:
+    except (OSError, RuntimeError, ValueError):
         return None
 
 

{common_python_tasks-0.9.0 → common_python_tasks-0.10.1}/src/common_python_tasks/tasks.py

@@ -4,9 +4,10 @@ import logging
 import os
 import re
 import shlex
+from collections.abc import Callable
 from functools import partial, wraps
 from pathlib import Path
-from typing import Callable, NamedTuple
+from typing import ClassVar, NamedTuple
 
 from poethepoet_tasks import TaskCollection
 
@@ -14,7 +15,7 @@ from common_python_tasks.utils import confirm
 
 
 class _ColoredFormatter(logging.Formatter):
-    COLORS = {
+    COLORS: ClassVar = {
         "WARNING": "\033[93m",
         "ERROR": "\033[91m",
         "CRITICAL": "\033[91m",
@@ -445,9 +446,11 @@ def build_image(
         prune_images_keep,
     )
     from .env import (
+        collect_uv_index_credentials,
         get_cache_id_suffix,
         get_container_deps_move_script,
         get_prune_keep,
+        get_python_variant,
         inject_auto_build_args_from_env,
         load_container_env_tokens,
         parse_container_deps_mappings,
@@ -457,6 +460,8 @@ def build_image(
         resolve_container_docker_build_args,
         resolve_container_dockerfile_hook_path,
         resolve_extension_content,
+        uv_index_secret_build_args,
+        uv_index_secret_mounts,
     )
     from .project import (
         has_debug_dependency_group,
@@ -486,6 +491,15 @@ def build_image(
         docker_build_args,
         os.getenv("CONTAINER_DOCKER_BUILD_ARGS"),
     )
+    uv_credentials = collect_uv_index_credentials()
+    if uv_credentials:
+        LOGGER.debug(
+            "Passing UV index credentials for: %s",
+            ", ".join(c["index_name"] for c in uv_credentials),
+        )
+        resolved_docker_build_args = uv_index_secret_build_args(uv_credentials) + list(
+            resolved_docker_build_args
+        )
     resolved_dockerfile_hook_path = resolve_container_dockerfile_hook_path(
         dockerfile_hook_path,
         os.getenv("CONTAINER_DOCKERFILE_HOOK_PATH"),
@@ -513,7 +527,9 @@ def build_image(
             "Injecting builder-stage env vars: %s",
             ", ".join(container_env_vars),
         )
-    top_level_build_args = inject_auto_build_args_from_env({})
+    top_level_build_args = inject_auto_build_args_from_env(
+        {"PYTHON_VARIANT": get_python_variant()}
+    )
     external_deps_image = _get_container_build_setting("CONTAINER_DEPS_IMAGE")
     if external_deps_image:
         top_level_build_args["CONTAINER_DEPS_IMAGE"] = external_deps_image
@@ -534,7 +550,7 @@ def build_image(
                 continue
 
             arg_names = re.findall(
-                r"^\s*ARG\s+([A-Za-z_][A-Za-z0-9_]*)", fragment, re.M
+                r"^\s*ARG\s+([A-Za-z_][A-Za-z0-9_]*)", fragment, re.MULTILINE
             )
             if not arg_names:
                 LOGGER.warning(
@@ -606,6 +622,7 @@ def build_image(
             "ENTRYPOINT_COMMAND": entrypoint_command,
             "CONTAINER_ENV_VARS": container_env_vars,
             "CACHE_ID_SUFFIX": cache_id_suffix,
+            "UV_INDEX_SECRET_MOUNTS": uv_index_secret_mounts(uv_credentials),
         },
     )
 
@@ -1313,6 +1330,9 @@ def _run_release_flow(
                 repository,
                 repository_url,
             )
+        log_dry_run(
+            "Would publish GitHub Release %s with built assets", hook_env["RELEASE_TAG"]
+        )
         if include_containers:
             log_dry_run(
                 "Would build container image with debug=%s no_cache=%s plain=%s single_arch=%s",
@@ -1322,9 +1342,6 @@ def _run_release_flow(
                 single_arch,
             )
             log_dry_run("Would push container image with debug=%s", debug)
-        log_dry_run(
-            "Would publish GitHub Release %s with built assets", hook_env["RELEASE_TAG"]
-        )
         if post_script:
             run_command(["sh", "-lc", post_script], env=hook_env, dry_run=False)
         return
@@ -1333,17 +1350,6 @@ def _run_release_flow(
         hook_env["RELEASE_TAG"], repository=repository, repository_url=repository_url
     )
 
-    if include_containers:
-        build_image(
-            debug=debug,
-            no_cache=no_cache,
-            plain=plain,
-            single_arch=single_arch,
-            container_env=container_env,
-            container_envfile=container_envfile,
-        )
-        push_image(debug=debug)
-
     run_command(["git", "push", "origin", hook_env["RELEASE_TAG"]])
     try:
         publish_github_release(
@@ -1362,6 +1368,17 @@ def _run_release_flow(
         )
         raise
 
+    if include_containers:
+        build_image(
+            debug=debug,
+            no_cache=no_cache,
+            plain=plain,
+            single_arch=single_arch,
+            container_env=container_env,
+            container_envfile=container_envfile,
+        )
+        push_image(debug=debug)
+
     if post_script:
         run_command(["sh", "-lc", post_script], env=hook_env, dry_run=False)
 

{common_python_tasks-0.9.0 → common_python_tasks-0.10.1}/src/common_python_tasks/utils.py

@@ -6,12 +6,12 @@ import shutil
 import subprocess
 import sys
 import tomllib
+from collections.abc import Collection, Sequence
 from functools import lru_cache
 from getpass import getuser
 from importlib.resources import files
 from pathlib import Path
 from shlex import quote
-from typing import Collection, Sequence
 
 from jinja2 import Template
 
@@ -154,7 +154,11 @@ def run_command(
     merged_env = {**os.environ, **env} if env is not None else None
 
     out = subprocess.run(
-        command, capture_output=capture_output, text=True, env=merged_env
+        command,
+        capture_output=capture_output,
+        check=False,
+        text=True,
+        env=merged_env,
     )
     if out.returncode not in acceptable_returncodes:
         if capture_output:
@@ -234,8 +238,7 @@ def normalize_registry(registry: str | None) -> str | None:
         return None
 
     for prefix in ("https://", "http://"):
-        if registry.startswith(prefix):
-            registry = registry[len(prefix) :]
+        registry = registry.removeprefix(prefix)
 
     return registry.rstrip("/")
 
@@ -407,8 +410,13 @@ def get_package_name(use_underscores: bool = False) -> str | None:
                 name = (
                     tomllib.loads(pyproject.read_text()).get("project", {}).get("name")
                 )
-        except Exception as e:  # pragma: no cover - defensive logging
-            LOGGER.debug("Unable to read pyproject.toml: %s", e)
+        except (
+            AttributeError,
+            OSError,
+            UnicodeDecodeError,
+            tomllib.TOMLDecodeError,
+        ) as error:  # pragma: no cover - defensive logging
+            LOGGER.debug("Unable to read pyproject.toml: %s", error)
 
     if use_underscores and name:
         name = package_name_to_underscore(name)