common-python-tasks 0.10.2__tar.gz → 0.10.3__tar.gz

{common_python_tasks-0.10.2 → common_python_tasks-0.10.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.5
 Name: common-python-tasks
-Version: 0.10.2
+Version: 0.10.3
 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.10.2
+uv add --dev common-python-tasks==0.10.3
 ```
 
 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.10.2/scripts/add_common_python_tasks.py
+  https://raw.githubusercontent.com/ci-sourcerer/common-python-tasks/v0.10.3/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.10.2 python3 /tmp/add_common_python_tasks.py
+COMMON_PYTHON_TASKS_VERSION=0.10.3 python3 /tmp/add_common_python_tasks.py
 ```
 
-To install another release, replace both occurrences of `0.10.2` with that release's version.
+To install another release, replace both occurrences of `0.10.3` 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.10.2"
+version = "0.10.3"
 
 [tool.poe]
 include_script = "common_python_tasks:tasks()"
@@ -256,7 +256,7 @@ addopts = "-ra"
 - `CONTAINER_DEPS_IMAGE`: Existing dependency image used when neither `CONTAINER_DEPS_CONTENT` nor `CONTAINER_DEPS_FILE` is configured
 - `CONTAINER_EXTENSION_FILES`: Colon-delimited local extension Dockerfile paths. Escape literal colons as `\:` or quote the complete path.
 - `CONTAINER_EXTENSIONS`: Colon-delimited extension-bundle names or parameterized values. Escape literal colons as `\:` or quote the complete value.
-- `CONTAINER_ENV`: Colon-delimited `KEY=VALUE` declarations injected into the rendered Dockerfile's builder stage. Escape literal colons as `\:` or quote the complete value.
+- `CONTAINER_ENV`: Colon-delimited `KEY=VALUE` declarations injected into both the builder and runtime stages. These variables are available to package build commands and runtime-stage build commands, and persist in the final and debug images for running containers. The `container_env` and `container_envfile` task arguments use the same behavior. Escape literal colons as `\:` or quote the complete value. Use `run-container --env` or `--envfile` to override values when starting a container.
 - `.containerenv`: A project-root file that can supply the same declarations. It is loaded before the `container_envfile` task argument, `CONTAINER_ENV`, and the `container_env` task argument.
 - `CONTAINER_PRUNE_KEEP`: Image-pruning policy after builds. `-1` keeps all images, `0` keeps only the latest, and `N` keeps the latest plus `N` prior images.
 - `CONTAINER_DEPS_CONTENT`: Inline Dockerfile instructions for a dependency image that installs artifacts into `/tmp/deps`
@@ -291,7 +291,7 @@ addopts = "-ra"
 - `SECRET_KEY`: Application secret key generated automatically when unset
 - `ENVIRONMENT`: Environment name with a default of `production`
 - `DEBUG_PORT`: Python debugger port in debug mode with a default of `5678`
-- `DB_PORT`: PostgreSQL port with a default of `5432`
+- `DB_PORT`: Published host port for PostgreSQL, defaulting to `5432`. The API and migrator connect to the database container on port `5432` regardless of this setting.
 - `DB_USER`: Database user with a default of the package name
 - `DB_BASE`: Database name with a default of the package name
 - `DB_PASS`: Database password generated automatically when unset

{common_python_tasks-0.10.2 → common_python_tasks-0.10.3}/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.10.2
+uv add --dev common-python-tasks==0.10.3
 ```
 
 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.10.2/scripts/add_common_python_tasks.py
+  https://raw.githubusercontent.com/ci-sourcerer/common-python-tasks/v0.10.3/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.10.2 python3 /tmp/add_common_python_tasks.py
+COMMON_PYTHON_TASKS_VERSION=0.10.3 python3 /tmp/add_common_python_tasks.py
 ```
 
-To install another release, replace both occurrences of `0.10.2` with that release's version.
+To install another release, replace both occurrences of `0.10.3` 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.10.2"
+version = "0.10.3"
 
 [tool.poe]
 include_script = "common_python_tasks:tasks()"
@@ -224,7 +224,7 @@ addopts = "-ra"
 - `CONTAINER_DEPS_IMAGE`: Existing dependency image used when neither `CONTAINER_DEPS_CONTENT` nor `CONTAINER_DEPS_FILE` is configured
 - `CONTAINER_EXTENSION_FILES`: Colon-delimited local extension Dockerfile paths. Escape literal colons as `\:` or quote the complete path.
 - `CONTAINER_EXTENSIONS`: Colon-delimited extension-bundle names or parameterized values. Escape literal colons as `\:` or quote the complete value.
-- `CONTAINER_ENV`: Colon-delimited `KEY=VALUE` declarations injected into the rendered Dockerfile's builder stage. Escape literal colons as `\:` or quote the complete value.
+- `CONTAINER_ENV`: Colon-delimited `KEY=VALUE` declarations injected into both the builder and runtime stages. These variables are available to package build commands and runtime-stage build commands, and persist in the final and debug images for running containers. The `container_env` and `container_envfile` task arguments use the same behavior. Escape literal colons as `\:` or quote the complete value. Use `run-container --env` or `--envfile` to override values when starting a container.
 - `.containerenv`: A project-root file that can supply the same declarations. It is loaded before the `container_envfile` task argument, `CONTAINER_ENV`, and the `container_env` task argument.
 - `CONTAINER_PRUNE_KEEP`: Image-pruning policy after builds. `-1` keeps all images, `0` keeps only the latest, and `N` keeps the latest plus `N` prior images.
 - `CONTAINER_DEPS_CONTENT`: Inline Dockerfile instructions for a dependency image that installs artifacts into `/tmp/deps`
@@ -259,7 +259,7 @@ addopts = "-ra"
 - `SECRET_KEY`: Application secret key generated automatically when unset
 - `ENVIRONMENT`: Environment name with a default of `production`
 - `DEBUG_PORT`: Python debugger port in debug mode with a default of `5678`
-- `DB_PORT`: PostgreSQL port with a default of `5432`
+- `DB_PORT`: Published host port for PostgreSQL, defaulting to `5432`. The API and migrator connect to the database container on port `5432` regardless of this setting.
 - `DB_USER`: Database user with a default of the package name
 - `DB_BASE`: Database name with a default of the package name
 - `DB_PASS`: Database password generated automatically when unset

{common_python_tasks-0.10.2 → common_python_tasks-0.10.3}/src/common_python_tasks/data/fastapi/compose-db.yml.j2

@@ -1,7 +1,7 @@
 x-common-environment: &common-environment
   {{ ENV_PREFIX }}_DB_BASE: ${DB_BASE}
   {{ ENV_PREFIX }}_DB_HOST: db
-  {{ ENV_PREFIX }}_DB_PORT: ${DB_PORT}
+  {{ ENV_PREFIX }}_DB_PORT: 5432
   {{ ENV_PREFIX }}_DB_PASS: ${DB_PASS}
   {{ ENV_PREFIX }}_DB_USER: ${DB_USER}
 

{common_python_tasks-0.10.2 → common_python_tasks-0.10.3}/src/common_python_tasks/data/generic/Dockerfile.j2

@@ -12,6 +12,13 @@ FROM python:${PYTHON_VERSION} AS builder
 ARG PACKAGE_VERSION
 ARG UV_VERSION
 
+{% if CONTAINER_ENV_VARS %}
+# Make configured variables available to package build commands.
+{% for env_var in CONTAINER_ENV_VARS -%}
+ENV {{ env_var }}
+{% endfor %}
+{%- endif %}
+
 # 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.
@@ -60,7 +67,7 @@ ARG NONROOT_UID=1000
 ARG NONROOT_GID=1000
 
 {% if CONTAINER_ENV_VARS %}
-# Inject custom builder stage environment variables
+# Persist the same variables for runtime build commands and running containers.
 {% for env_var in CONTAINER_ENV_VARS -%}
 ENV {{ env_var }}
 {% endfor %}

{common_python_tasks-0.10.2 → common_python_tasks-0.10.3}/src/common_python_tasks/docker_compose.py

@@ -606,6 +606,7 @@ def build_exec_script(
         "trap 'rm -f \"$SCRIPT_PATH\"' EXIT",
         "",
         " ".join(quote(str(arg)) for arg in command),
+        "command_status=$?",
     ]
 
     if teardown_command:
@@ -619,7 +620,7 @@ def build_exec_script(
         for path in cleanup_paths:
             lines.append(f"rm -f {quote(str(path))}")
 
-    lines.append("")
+    lines.extend(['exit "$command_status"', ""])
 
     script_path.write_text("\n".join(lines), encoding="utf-8")
     script_path.chmod(0o700)

{common_python_tasks-0.10.2 → common_python_tasks-0.10.3}/src/common_python_tasks/env.py

@@ -537,6 +537,7 @@ def render_container_deps_move_script(mappings: dict[str, str]) -> str:
     import textwrap
 
     script_lines = [
+        "#!/usr/bin/env python3",
         "import pathlib",
         "import shutil",
         "import sys",

{common_python_tasks-0.10.2 → common_python_tasks-0.10.3}/src/common_python_tasks/git.py

@@ -335,7 +335,14 @@ def has_tags_later_in_history() -> bool:
             capture_output=True,
             acceptable_returncodes={0, 1},
         )
-        if check_result.returncode == 1:
+        if (
+            check_result.returncode == 0
+            and utils.run_command(
+                ["git", "rev-list", "--count", f"HEAD..{tag}"],
+                capture_output=True,
+            ).stdout.strip()
+            != "0"
+        ):
             return True
 
     return False

{common_python_tasks-0.10.2 → common_python_tasks-0.10.3}/src/common_python_tasks/project.py

@@ -154,7 +154,9 @@ def get_dependency_update_command(
     if dependencies is None:
         dependencies = []
 
-    command = ["uv", "sync", "--upgrade"]
+    command = ["uv", "sync"]
+    if not dependencies:
+        command.append("--upgrade")
     for dependency in dependencies:
         command.extend(["--upgrade-package", dependency])
     return command

{common_python_tasks-0.10.2 → common_python_tasks-0.10.3}/src/common_python_tasks/tasks.py

@@ -430,9 +430,9 @@ def build_image(
         dockerfile_hook_path: Optional executable script path that can mutate
             the generated Dockerfile before build. Overrides
             CONTAINER_DOCKERFILE_HOOK_PATH if provided.
-        container_env: Builder-stage environment declarations as repeated
+        container_env: Builder and runtime environment declarations as repeated
             KEY=VALUE values.
-        container_envfile: Optional repeated list of files containing builder-stage
+        container_envfile: Optional repeated list of files containing builder and runtime
             environment declarations.
 
     Precedence for container env declarations is: .containerenv, container_envfile,
@@ -524,7 +524,7 @@ def build_image(
     )
     if container_env_vars:
         LOGGER.debug(
-            "Injecting builder-stage env vars: %s",
+            "Injecting builder and runtime env vars: %s",
             ", ".join(container_env_vars),
         )
     top_level_build_args = inject_auto_build_args_from_env(
@@ -1731,26 +1731,49 @@ def fastapi_run_db_migrations() -> None:
     """Run database migrations."""
     from .docker_compose import (
         cleanup_temp_files,
+        ensure_secrets_generated,
         load_and_prepare_compose,
         run_docker_compose_command,
     )
 
-    services = ["db", "migrator"]
-    fastapi_stack_up(debug=False, detach=True, services=services)
+    container_build = build_image(single_arch=True)
+    ensure_secrets_generated()
+    compose_files, temp_compose_files, temp_config_files, compose_env = (
+        load_and_prepare_compose(image_tag=container_build.commit_tag)
+    )
     try:
-        compose_files, temp_compose_files, _, compose_env = load_and_prepare_compose()
+        run_docker_compose_command(
+            "up",
+            "-d",
+            "--no-build",
+            "db",
+            compose_files=compose_files,
+            compose_env=compose_env,
+            tasks=tasks,
+        )
+        run_docker_compose_command(
+            "run",
+            "--rm",
+            "migrator",
+            compose_files=compose_files,
+            compose_env=compose_env,
+            tasks=tasks,
+        )
+    finally:
         try:
             run_docker_compose_command(
-                "logs",
+                "rm",
+                "-f",
+                "-s",
+                "-v",
+                "db",
                 "migrator",
                 compose_files=compose_files,
                 compose_env=compose_env,
                 tasks=tasks,
             )
         finally:
-            cleanup_temp_files(temp_compose_files)
-    finally:
-        fastapi_stack_down()
+            cleanup_temp_files(temp_compose_files, temp_config_files)
 
 
 @tasks.script(task_name="db-shell", tags=["web", "containers", "database", "fastapi"])