common-python-tasks 0.8.0__tar.gz → 0.10.0__tar.gz

{common_python_tasks-0.8.0 → common_python_tasks-0.10.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.5
 Name: common-python-tasks
-Version: 0.8.0
+Version: 0.10.0
 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,9 +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.8.0
-# or, for Poetry projects
-poetry add --group dev common-python-tasks==0.8.0
+uv add --dev common-python-tasks==0.10.0
 ```
 
 Configure Poe the Poet to expose the default `common` task set.
@@ -70,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.8.0/scripts/add_common_python_tasks.py
+  https://raw.githubusercontent.com/ci-sourcerer/common-python-tasks/v0.10.0/scripts/add_common_python_tasks.py
 ```
 
 Review the downloaded script before executing it.
@@ -82,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.8.0 python3 /tmp/add_common_python_tasks.py
+COMMON_PYTHON_TASKS_VERSION=0.10.0 python3 /tmp/add_common_python_tasks.py
 ```
 
-To install another release, replace both occurrences of `0.8.0` with that release's version.
+To install another release, replace both occurrences of `0.10.0` with that release's version.
 
 ## Available tasks
 
@@ -108,7 +106,7 @@ The generated tables below list public tasks only. Tags identify which tasks are
 | --- | --- | --- |
 | `publish-package` | Publish the package to the PyPI server. | common, packaging |
 | `publish-github-release` | Publish or update a GitHub Release for the current repository. | common, packaging, release |
-| `update-dependencies` | Update project dependencies with Poetry or uv. | common, packaging |
+| `update-dependencies` | Update project dependencies with uv. | common, packaging |
 | `build-package` | Build the package (wheel and sdist). | build, common, packaging |
 | `bump-version` | Bump the project version. | common, packaging |
 | `changelog` | Print the changelog for the current version based on git history and git-cliff. | common, packaging, release |
@@ -143,7 +141,7 @@ The generated tables below list public tasks only. Tags identify which tasks are
 
 Every project needs a `pyproject.toml` file at its root and Poe the Poet available in its development environment.
 
-Tasks that install, build, publish, or update dependencies also require either Poetry or uv. Package and release tasks need a resolvable project version from `project.version`, Poetry's version resolution, or Git tags. Dynamic-versioning plugins are supported but are not a baseline requirement.
+Tasks that install, build, publish, or update dependencies require uv. Package and release tasks need a resolvable project version from `project.version` or Git tags. Dynamic versioning is supported but is not a baseline requirement.
 
 ### Task selection
 
@@ -163,18 +161,27 @@ include_script = "common_python_tasks:tasks(include_tags=['common', 'containers'
 
 The `containers` tag also includes container-based development-stack tasks. Use the tags in the task tables to tailor a smaller task set.
 
-### Package manager backend selection
+### Package management
 
-Packaging-related tasks, including `build-package`, `publish-package`, release version resolution, and container build metadata, support Poetry and uv.
+Packaging-related tasks, including `build-package`, `publish-package`, dependency updates, release version resolution, and container build metadata, use uv exclusively. The `uv` executable must be available on `PATH`.
 
-Backend selection uses this precedence.
+### Publish target selection
 
-1. `COMMON_PYTHON_TASKS_PACKAGE_MANAGER`
-2. `COMMON_PYTHON_TASKS_BUILD_TOOL`
-3. `PACKAGE_MANAGER`
-4. Auto-discovery (`auto`) based on installed tools and project metadata
+The `publish-package` task resolves publish targets with this precedence.
 
-Supported values are `poetry`, `uv`, and `auto`.
+1. Explicit task arguments (`repository` or `repository_url`)
+2. Environment-variable fallback
+3. uv project configuration fallback from `[[tool.uv.index]]`
+4. The `uv publish` default
+
+uv prefers named publish indexes.
+
+- `COMMON_PYTHON_TASKS_PUBLISH_REPOSITORY`
+- `UV_PUBLISH_INDEX`
+- `COMMON_PYTHON_TASKS_PUBLISH_URL`
+- `UV_PUBLISH_URL`
+
+When using uv project configuration fallback, `[[tool.uv.index]]` must include both `name` and `publish-url` for publish selection. If multiple publishable indexes exist, set exactly one `default = true` or pass an explicit repository.
 
 ### Configuration precedence
 
@@ -196,7 +203,7 @@ After installing the package, a minimal project configuration looks like this.
 ```toml
 [project]
 name = "simple-cli-tool"
-version = "0.8.0"
+version = "0.10.0"
 
 [tool.poe]
 include_script = "common_python_tasks:tasks()"
@@ -232,14 +239,16 @@ addopts = "-ra"
 #### Project and package settings
 
 - `PACKAGE_NAME`: Overrides the package name inferred from `pyproject.toml`
-- `COMMON_PYTHON_TASKS_PACKAGE_MANAGER`: Selects the package-manager backend as `poetry`, `uv`, or `auto`
-- `COMMON_PYTHON_TASKS_BUILD_TOOL`: Alias for `COMMON_PYTHON_TASKS_PACKAGE_MANAGER`
-- `PACKAGE_MANAGER`: Alias for `COMMON_PYTHON_TASKS_PACKAGE_MANAGER`
+- `COMMON_PYTHON_TASKS_PUBLISH_REPOSITORY`: Preferred publish repository/index name for `publish-package`
+- `COMMON_PYTHON_TASKS_PUBLISH_URL`: Preferred uv publish upload URL for `publish-package` when no repository/index is selected
+- `UV_PUBLISH_INDEX`: uv publish-index fallback for `publish-package`
+- `UV_PUBLISH_URL`: uv publish upload-url fallback for `publish-package`
 
 #### Container image settings
 
 - `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
@@ -255,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
 
@@ -386,7 +396,7 @@ GITHUB_RELEASE_ASSETS="dist/*.whl:dist/*.tar.gz" poe publish-github-release
 
 ### Container build fails with "unable to find package"
 
-Check that `pyproject.toml` has a correct package name and the package-discovery settings required by its build backend. For Poetry projects, this commonly includes `[tool.poetry] packages = [{ include = "your_package", from = "src" }]`.
+Check that `pyproject.toml` has a correct package name and the package-discovery settings required by its build backend. For a `src` layout built with Hatch, configure `[tool.hatch.build.targets.wheel] packages = ["src/your_package"]`.
 
 ### Stack fails to start or services cannot connect
 
@@ -411,9 +421,9 @@ Ensure the project-root `.env` file is writable and inspect its permissions with
 
 See the [standard Dockerfile template](src/common_python_tasks/data/generic/Dockerfile.j2) for the implementation.
 
-- Multi-stage build: The build stage installs the selected package-manager backend and builds a wheel. The runtime stage installs only the wheel to keep the final image slim and reproducible.
-- Cache mounts: Pip and package-manager cache mounts speed up iterative builds without bloating the final image.
-- Explicit build metadata: `PYTHON_VERSION`, `PACKAGE_MANAGER`, `PACKAGE_MANAGER_VERSION`, `PACKAGE_NAME`, `AUTHORS`, and `GIT_COMMIT` make image metadata predictable and auditable.
+- Multi-stage build: The build stage installs uv and builds a wheel. The runtime stage installs only the wheel to keep the final image slim and reproducible.
+- Cache mounts: Pip and uv cache mounts speed up iterative builds without bloating the final image.
+- Explicit build metadata: `PYTHON_VERSION`, `UV_VERSION`, `PACKAGE_VERSION`, `PACKAGE_NAME`, `AUTHORS`, and `GIT_COMMIT` make image metadata predictable and auditable.
 - Project-level build settings: `CONTAINER_APT_PACKAGES`, `CONTAINER_CUSTOM_ENTRYPOINT`, and `CONTAINER_DEPS_IMAGE` configure generated image behavior without being encoded as generic Docker arguments.
 - Optional debug stage: The image exports and installs the `debug` dependency group only when present and does not include it in the default final image.
 - Stable package path: Symlinks give entrypoints and consumers consistent `/pkg` and `/_$PACKAGE_NAME` paths regardless of wheel layout.

{common_python_tasks-0.8.0 → common_python_tasks-0.10.0}/README.md

@@ -11,9 +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.8.0
-# or, for Poetry projects
-poetry add --group dev common-python-tasks==0.8.0
+uv add --dev common-python-tasks==0.10.0
 ```
 
 Configure Poe the Poet to expose the default `common` task set.
@@ -38,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.8.0/scripts/add_common_python_tasks.py
+  https://raw.githubusercontent.com/ci-sourcerer/common-python-tasks/v0.10.0/scripts/add_common_python_tasks.py
 ```
 
 Review the downloaded script before executing it.
@@ -50,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.8.0 python3 /tmp/add_common_python_tasks.py
+COMMON_PYTHON_TASKS_VERSION=0.10.0 python3 /tmp/add_common_python_tasks.py
 ```
 
-To install another release, replace both occurrences of `0.8.0` with that release's version.
+To install another release, replace both occurrences of `0.10.0` with that release's version.
 
 ## Available tasks
 
@@ -76,7 +74,7 @@ The generated tables below list public tasks only. Tags identify which tasks are
 | --- | --- | --- |
 | `publish-package` | Publish the package to the PyPI server. | common, packaging |
 | `publish-github-release` | Publish or update a GitHub Release for the current repository. | common, packaging, release |
-| `update-dependencies` | Update project dependencies with Poetry or uv. | common, packaging |
+| `update-dependencies` | Update project dependencies with uv. | common, packaging |
 | `build-package` | Build the package (wheel and sdist). | build, common, packaging |
 | `bump-version` | Bump the project version. | common, packaging |
 | `changelog` | Print the changelog for the current version based on git history and git-cliff. | common, packaging, release |
@@ -111,7 +109,7 @@ The generated tables below list public tasks only. Tags identify which tasks are
 
 Every project needs a `pyproject.toml` file at its root and Poe the Poet available in its development environment.
 
-Tasks that install, build, publish, or update dependencies also require either Poetry or uv. Package and release tasks need a resolvable project version from `project.version`, Poetry's version resolution, or Git tags. Dynamic-versioning plugins are supported but are not a baseline requirement.
+Tasks that install, build, publish, or update dependencies require uv. Package and release tasks need a resolvable project version from `project.version` or Git tags. Dynamic versioning is supported but is not a baseline requirement.
 
 ### Task selection
 
@@ -131,18 +129,27 @@ include_script = "common_python_tasks:tasks(include_tags=['common', 'containers'
 
 The `containers` tag also includes container-based development-stack tasks. Use the tags in the task tables to tailor a smaller task set.
 
-### Package manager backend selection
+### Package management
 
-Packaging-related tasks, including `build-package`, `publish-package`, release version resolution, and container build metadata, support Poetry and uv.
+Packaging-related tasks, including `build-package`, `publish-package`, dependency updates, release version resolution, and container build metadata, use uv exclusively. The `uv` executable must be available on `PATH`.
 
-Backend selection uses this precedence.
+### Publish target selection
 
-1. `COMMON_PYTHON_TASKS_PACKAGE_MANAGER`
-2. `COMMON_PYTHON_TASKS_BUILD_TOOL`
-3. `PACKAGE_MANAGER`
-4. Auto-discovery (`auto`) based on installed tools and project metadata
+The `publish-package` task resolves publish targets with this precedence.
 
-Supported values are `poetry`, `uv`, and `auto`.
+1. Explicit task arguments (`repository` or `repository_url`)
+2. Environment-variable fallback
+3. uv project configuration fallback from `[[tool.uv.index]]`
+4. The `uv publish` default
+
+uv prefers named publish indexes.
+
+- `COMMON_PYTHON_TASKS_PUBLISH_REPOSITORY`
+- `UV_PUBLISH_INDEX`
+- `COMMON_PYTHON_TASKS_PUBLISH_URL`
+- `UV_PUBLISH_URL`
+
+When using uv project configuration fallback, `[[tool.uv.index]]` must include both `name` and `publish-url` for publish selection. If multiple publishable indexes exist, set exactly one `default = true` or pass an explicit repository.
 
 ### Configuration precedence
 
@@ -164,7 +171,7 @@ After installing the package, a minimal project configuration looks like this.
 ```toml
 [project]
 name = "simple-cli-tool"
-version = "0.8.0"
+version = "0.10.0"
 
 [tool.poe]
 include_script = "common_python_tasks:tasks()"
@@ -200,14 +207,16 @@ addopts = "-ra"
 #### Project and package settings
 
 - `PACKAGE_NAME`: Overrides the package name inferred from `pyproject.toml`
-- `COMMON_PYTHON_TASKS_PACKAGE_MANAGER`: Selects the package-manager backend as `poetry`, `uv`, or `auto`
-- `COMMON_PYTHON_TASKS_BUILD_TOOL`: Alias for `COMMON_PYTHON_TASKS_PACKAGE_MANAGER`
-- `PACKAGE_MANAGER`: Alias for `COMMON_PYTHON_TASKS_PACKAGE_MANAGER`
+- `COMMON_PYTHON_TASKS_PUBLISH_REPOSITORY`: Preferred publish repository/index name for `publish-package`
+- `COMMON_PYTHON_TASKS_PUBLISH_URL`: Preferred uv publish upload URL for `publish-package` when no repository/index is selected
+- `UV_PUBLISH_INDEX`: uv publish-index fallback for `publish-package`
+- `UV_PUBLISH_URL`: uv publish upload-url fallback for `publish-package`
 
 #### Container image settings
 
 - `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
@@ -223,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
 
@@ -354,7 +364,7 @@ GITHUB_RELEASE_ASSETS="dist/*.whl:dist/*.tar.gz" poe publish-github-release
 
 ### Container build fails with "unable to find package"
 
-Check that `pyproject.toml` has a correct package name and the package-discovery settings required by its build backend. For Poetry projects, this commonly includes `[tool.poetry] packages = [{ include = "your_package", from = "src" }]`.
+Check that `pyproject.toml` has a correct package name and the package-discovery settings required by its build backend. For a `src` layout built with Hatch, configure `[tool.hatch.build.targets.wheel] packages = ["src/your_package"]`.
 
 ### Stack fails to start or services cannot connect
 
@@ -379,9 +389,9 @@ Ensure the project-root `.env` file is writable and inspect its permissions with
 
 See the [standard Dockerfile template](src/common_python_tasks/data/generic/Dockerfile.j2) for the implementation.
 
-- Multi-stage build: The build stage installs the selected package-manager backend and builds a wheel. The runtime stage installs only the wheel to keep the final image slim and reproducible.
-- Cache mounts: Pip and package-manager cache mounts speed up iterative builds without bloating the final image.
-- Explicit build metadata: `PYTHON_VERSION`, `PACKAGE_MANAGER`, `PACKAGE_MANAGER_VERSION`, `PACKAGE_NAME`, `AUTHORS`, and `GIT_COMMIT` make image metadata predictable and auditable.
+- Multi-stage build: The build stage installs uv and builds a wheel. The runtime stage installs only the wheel to keep the final image slim and reproducible.
+- Cache mounts: Pip and uv cache mounts speed up iterative builds without bloating the final image.
+- Explicit build metadata: `PYTHON_VERSION`, `UV_VERSION`, `PACKAGE_VERSION`, `PACKAGE_NAME`, `AUTHORS`, and `GIT_COMMIT` make image metadata predictable and auditable.
 - Project-level build settings: `CONTAINER_APT_PACKAGES`, `CONTAINER_CUSTOM_ENTRYPOINT`, and `CONTAINER_DEPS_IMAGE` configure generated image behavior without being encoded as generic Docker arguments.
 - Optional debug stage: The image exports and installs the `debug` dependency group only when present and does not include it in the default final image.
 - Stable package path: Symlinks give entrypoints and consumers consistent `/pkg` and `/_$PACKAGE_NAME` paths regardless of wheel layout.

{common_python_tasks-0.8.0 → common_python_tasks-0.10.0}/pyproject.toml

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

{common_python_tasks-0.8.0 → common_python_tasks-0.10.0}/scripts/add_common_python_tasks.py

@@ -10,11 +10,6 @@ import tomllib
 from pathlib import Path
 
 PACKAGE_NAME = "common-python-tasks"
-PACKAGE_MANAGER_ENV_VARS = (
-    "COMMON_PYTHON_TASKS_PACKAGE_MANAGER",
-    "COMMON_PYTHON_TASKS_BUILD_TOOL",
-    "PACKAGE_MANAGER",
-)
 PYPROJECT_PATH = Path("pyproject.toml")
 TOOL_POE_PATTERN = re.compile(r"^\s*\[tool\.poe\]\s*(?:#.*)?$")
 TABLE_PATTERN = re.compile(r"^\s*\[")
@@ -26,47 +21,18 @@ def _require_command(command: str) -> None:
         sys.exit(f"Required command not found: {command}")
 
 
-def _get_requested_package_manager() -> str:
-    for env_var in PACKAGE_MANAGER_ENV_VARS:
-        if os.getenv(env_var, "").strip():
-            return os.environ[env_var].strip().lower()
-    return "auto"
-
-
-def _select_package_manager() -> str:
-    requested_manager = _get_requested_package_manager()
-    if requested_manager in {"poetry", "uv"}:
-        _require_command(requested_manager)
-        return requested_manager
-    if requested_manager != "auto":
-        sys.exit(f"Unsupported package manager: {requested_manager}")
-
-    for lock_file, package_manager in (
-        (Path("uv.lock"), "uv"),
-        (Path("poetry.lock"), "poetry"),
-    ):
-        if lock_file.is_file() and shutil.which(package_manager) is not None:
-            return package_manager
-
-    for package_manager in ("uv", "poetry"):
-        if shutil.which(package_manager) is not None:
-            return package_manager
-
-    sys.exit("Neither uv nor Poetry is installed.")
-
-
 def _get_package_requirement() -> str:
     if os.getenv("COMMON_PYTHON_TASKS_VERSION", "").strip():
         return f"{PACKAGE_NAME}=={os.environ['COMMON_PYTHON_TASKS_VERSION'].strip()}"
     return PACKAGE_NAME
 
 
-def _install_package(package_manager: str) -> None:
-    if package_manager == "uv":
-        command = ["uv", "add", "--dev", _get_package_requirement()]
-    else:
-        command = ["poetry", "add", "--group", "dev", _get_package_requirement()]
-    subprocess.run(command, check=True, shell=False)
+def _install_package() -> None:
+    subprocess.run(
+        ["uv", "add", "--dev", _get_package_requirement()],
+        check=True,
+        shell=False,
+    )
 
 
 def _get_include_script() -> str:
@@ -132,7 +98,8 @@ def _print_available_tasks() -> None:
 
 def main() -> None:
     """Install common tasks and configure Poe in the current project."""
-    _install_package(_select_package_manager())
+    _require_command("uv")
+    _install_package()
     _configure_poe()
     print("\n\033[1;32mCommon Python tasks added to project.\033[0m")
     print("\n\033[1mAvailable tasks:\033[0m")

{common_python_tasks-0.8.0 → common_python_tasks-0.10.0}/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.8.0 → common_python_tasks-0.10.0}/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.8.0 → common_python_tasks-0.10.0}/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.8.0 → common_python_tasks-0.10.0}/src/common_python_tasks/data/fastapi/compose-base.yml.j2

@@ -9,8 +9,7 @@ x-common-environment: &common-environment
 x-common-build-args: &common-build-args
   PACKAGE_NAME: ${PACKAGE_NAME}
   PYTHON_VERSION: ${PYTHON_VERSION}
-  PACKAGE_MANAGER: ${PACKAGE_MANAGER}
-  PACKAGE_MANAGER_VERSION: ${PACKAGE_MANAGER_VERSION}
+  UV_VERSION: ${UV_VERSION}
 
 services:
   api:

{common_python_tasks-0.8.0 → common_python_tasks-0.10.0}/src/common_python_tasks/data/fastapi/compose-db.yml.j2

@@ -8,8 +8,7 @@ x-common-environment: &common-environment
 x-common-build-args: &common-build-args
   PACKAGE_NAME: ${PACKAGE_NAME}
   PYTHON_VERSION: ${PYTHON_VERSION}
-  PACKAGE_MANAGER: ${PACKAGE_MANAGER}
-  PACKAGE_MANAGER_VERSION: ${PACKAGE_MANAGER_VERSION}
+  UV_VERSION: ${UV_VERSION}
   WORKDIR_PATH: ${WORKDIR_PATH}
 
 services:

{common_python_tasks-0.8.0 → common_python_tasks-0.10.0}/src/common_python_tasks/data/fastapi/compose-debug.yml.j2

@@ -22,7 +22,7 @@ services:
           path: ./src/${PACKAGE_UNDERSCORE_NAME}
           target: /${PACKAGE_UNDERSCORE_NAME}
         - action: rebuild
-          path: poetry.lock
+          path: uv.lock
     ports:
       - mode: ingress
         target: 5678

{common_python_tasks-0.8.0 → common_python_tasks-0.10.0}/src/common_python_tasks/data/generic/.dockerignore

@@ -1,7 +1,7 @@
 *
 !dist/*.whl
 !pyproject.toml
-!poetry.lock
+!uv.lock
 !README.md
 !LICENSE
 

{common_python_tasks-0.8.0 → common_python_tasks-0.10.0}/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.8.0 → common_python_tasks-0.10.0}/src/common_python_tasks/data/generic/Dockerfile.j2

@@ -4,36 +4,12 @@
 # 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
-{% set package_manager = PACKAGE_MANAGER|default('poetry') %}
 
 FROM python:${PYTHON_VERSION} AS builder
 
 ARG PACKAGE_VERSION
-
-{% if package_manager == 'poetry' %}
-ARG POETRY_VERSION
-ARG POETRY_DYNAMIC_VERSIONING_PLUGIN_VERSION
-ARG POETRY_PLUGIN_EXPORT_VERSION
-
-# Bypass VCS-based version detection: use the host-computed version directly.
-# This avoids requiring a .git directory in the build context and prevents
-# false dirty-version detection from a partial working tree.
-ENV POETRY_DYNAMIC_VERSIONING_BYPASS=${PACKAGE_VERSION}
-
-# Install Poetry and required Poetry plugins for package build
-RUN --mount=type=cache,target=/root/.cache/pip,id=pip-cache{{ CACHE_ID_SUFFIX }} \
-    sh -c 'set -eu; \
-    poetry_spec="poetry"; \
-    if [ -n "${POETRY_VERSION:-}" ]; then poetry_spec="poetry==$POETRY_VERSION"; fi; \
-    dynamic_spec="poetry-dynamic-versioning[plugin]"; \
-    if [ -n "${POETRY_DYNAMIC_VERSIONING_PLUGIN_VERSION:-}" ]; then dynamic_spec="poetry-dynamic-versioning[plugin]==$POETRY_DYNAMIC_VERSIONING_PLUGIN_VERSION"; fi; \
-    export_spec="poetry-plugin-export"; \
-    if [ -n "${POETRY_PLUGIN_EXPORT_VERSION:-}" ]; then export_spec="poetry-plugin-export==$POETRY_PLUGIN_EXPORT_VERSION"; fi; \
-    pip install --root-user-action=ignore "$poetry_spec" "$dynamic_spec" "$export_spec"'
-{% else %}
 ARG UV_VERSION
 
 # Bypass VCS-based version detection: use the host-computed version directly.
@@ -48,7 +24,6 @@ RUN --mount=type=cache,target=/root/.cache/pip,id=pip-cache{{ CACHE_ID_SUFFIX }}
     else \
         pip install --root-user-action=ignore uv; \
     fi'
-{% endif %}
 
 # Build package
 WORKDIR /tmp/build
@@ -56,28 +31,27 @@ COPY . /tmp/build/
 
 {% if HAS_DEBUG_DEPS %}
 # Export debug requirements when the project defines a debug dependency group
-{% if package_manager == 'poetry' %}
-RUN --mount=type=cache,target=/root/.cache/pip,id=pip-cache{{ CACHE_ID_SUFFIX }} \
-    poetry export --only debug --without-hashes -f requirements.txt --output requirements-debug.txt
-{% else %}
-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 %}
-{% endif %}
 
-# Build the wheel, caching the package-manager cache directory to speed up subsequent builds.
+# Build the wheel, caching the uv cache directory to speed up subsequent builds.
 # 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
-{% if package_manager == 'poetry' %}
-RUN --mount=type=cache,target=/root/.cache/pypoetry,id=pypoetry-cache{{ CACHE_ID_SUFFIX }} poetry build --format=wheel
-{% else %}
-RUN --mount=type=cache,target=/root/.cache/uv,id=uv-cache{{ CACHE_ID_SUFFIX }} uv build --wheel
-{% endif %}
+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.10.0/src/common_python_tasks/data/generic/ruff.toml

@@ -0,0 +1,2 @@
+line-length = 88
+extend-exclude = [".dist", "build"]