itw-python-builder 0.1.46__tar.gz → 0.1.48__tar.gz

{itw_python_builder-0.1.46 → itw_python_builder-0.1.48}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: itw_python_builder
-Version: 0.1.46
+Version: 0.1.48
 Summary: Standardized Django deployment pipeline with Docker, testing, and SonarQube integration
 Author-email: IT-Works <contact@it-works.io>
 License: MIT

{itw_python_builder-0.1.46 → itw_python_builder-0.1.48}/itw_python_builder/tasks.py

@@ -1,7 +1,11 @@
-from invoke import task, Context
-from itw_python_builder.version import Version
+import getpass
+import io
+import shutil
+import tempfile
+from datetime import datetime
+
+from itw_python_builder.ssr_tasks import *  # noqa: F401,F403  — exposes ssr-init
 from itw_python_builder.utils import (
-    detect_project_type,
     detect_and_activate_venv,
     load_env,
     get_current_branch,
@@ -11,9 +15,7 @@ from itw_python_builder.utils import (
     generate_image_path,
     get_gitlab_username,
     _parse_gitlab_remote,
-    is_ssr_project,
     install_sigint_guard,
-    abort_if_interrupted,
     step,
     safe_remove,
     ensure_gitignored,
@@ -24,13 +26,7 @@ from itw_python_builder.utils import (
     TOKEN_CACHE_PATH,
     maybe_override_release_version,
 )
-from itw_python_builder.ssr_tasks import *  # noqa: F401,F403  — exposes ssr-init
-
-import getpass
-import io
-import os
-from datetime import datetime
-from pathlib import Path
+from itw_python_builder.version import Version
 
 PYLINTRC = Path(__file__).parent / ".pylintrc"
 
@@ -177,24 +173,29 @@ _CHANGELOG_TARGETS = {
 
 
 def _sync_changelog_to_branch(ctx: Context, source: str, target: str) -> None:
-    """Apply CHANGELOG.md from source onto target, commit, push, then return to source."""
-    print(f'[itw] Propagating CHANGELOG.md to {target}...')
-    checkout = ctx.run(f'git checkout {target}', warn=True, hide=True)
-    if not checkout.ok:
-        fetch = ctx.run(f'git fetch origin {target}:{target}', warn=True, hide=True)
-        if not fetch.ok:
-            raise RuntimeError(f'branch {target!r} not found locally or on origin')
-        ctx.run(f'git checkout {target}')
-    ctx.run(f'git pull --rebase origin {target}', warn=True)
-    ctx.run(f'git checkout {source} -- CHANGELOG.md')
-    diff = ctx.run('git diff --cached --quiet CHANGELOG.md', warn=True, hide=True)
-    if diff.ok:
-        print(f'[itw] CHANGELOG.md already up to date on {target} — nothing to commit.')
-    else:
-        ctx.run(f'git commit -m "changelog sync from {source}"')
-        ctx.run(f'git push origin {target}')
-        print(f'[itw] CHANGELOG.md pushed to {target}.')
-    ctx.run(f'git checkout {source}')
+    """Sync CHANGELOG.md onto target branch using a temporary git worktree."""
+    print(f'[itw] Propagating CHANGELOG.md to {target} via temporary worktree...')
+
+    temp_dir = tempfile.mkdtemp()
+    try:
+        ctx.run(f'git worktree add {temp_dir} {target}')
+        pull = ctx.run(f'git -C {temp_dir} pull --rebase origin {target}', warn=True)
+        if not pull.ok:
+            ctx.run(f'git -C {temp_dir} rebase --abort', warn=True)
+            raise RuntimeError(f"Failed to pull latest changes for target branch '{target}'")
+        shutil.copy2('CHANGELOG.md', os.path.join(temp_dir, 'CHANGELOG.md'))
+        diff = ctx.run(f'git -C {temp_dir} diff --quiet CHANGELOG.md', warn=True, hide=True)
+        if diff.ok:
+            print(f'[itw] CHANGELOG.md already up to date on {target}.')
+        else:
+            ctx.run(f'git -C {temp_dir} add CHANGELOG.md')
+            ctx.run(f'git -C {temp_dir} commit -m "changelog sync from {source}"')
+            ctx.run(f'git -C {temp_dir} push origin {target}')
+            print(f'[itw] CHANGELOG.md successfully pushed to {target}.')
+
+    finally:
+        ctx.run(f'git worktree remove --force {temp_dir}', warn=True)
+        shutil.rmtree(temp_dir, ignore_errors=True)
 
 
 def propagate_changelog(ctx: Context) -> None:

{itw_python_builder-0.1.46 → itw_python_builder-0.1.48}/itw_python_builder/utils.py

@@ -1,4 +1,3 @@
-import getpass
 import io
 import json
 import os
@@ -178,9 +177,10 @@ def check_branch(ctx: Context) -> bool:
 
 def get_latest_tag(ctx: Context) -> Version:
     """Read latest tag for current branch — release tags on master, RC tags elsewhere."""
+    ctx.run('git fetch origin --tags', warn=True, hide=True)
     branch = get_current_branch(ctx)
     pattern = 'v.*-release' if is_branch_production(branch) else 'v.*-rc*'
-    result = ctx.run(f'git tag --list "{pattern}" --sort=-v:refname', hide=True)
+    result = ctx.run(f'git tag --list "{pattern}" --merged HEAD --sort=-v:refname', hide=True)
     tags = [line.strip() for line in result.stdout.splitlines() if line.strip()]
     if not tags:
         raise RuntimeError(
@@ -381,6 +381,9 @@ def maybe_override_release_version(default: Version, timeout: float = 5.0) -> Ve
     old = termios.tcgetattr(fd)
     try:
         tty.setcbreak(fd)
+        cb = termios.tcgetattr(fd)
+        cb[3] = cb[3] & ~termios.ECHO
+        termios.tcsetattr(fd, termios.TCSADRAIN, cb)
         ready, _, _ = select.select([sys.stdin], [], [], timeout)
         if not ready:
             print(f'[itw] No input within {int(timeout)}s — using default {default}.')
@@ -393,6 +396,8 @@ def maybe_override_release_version(default: Version, timeout: float = 5.0) -> Ve
         print(f'[itw] Empty input — using default {default}.')
         return default
 
+    sys.stdout.write(first)
+    sys.stdout.flush()
     rest = sys.stdin.readline().rstrip('\r\n')
     raw = (first + rest).strip()
     if not raw:

{itw_python_builder-0.1.46 → itw_python_builder-0.1.48}/itw_python_builder.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: itw_python_builder
-Version: 0.1.46
+Version: 0.1.48
 Summary: Standardized Django deployment pipeline with Docker, testing, and SonarQube integration
 Author-email: IT-Works <contact@it-works.io>
 License: MIT

{itw_python_builder-0.1.46 → itw_python_builder-0.1.48}/pyproject.toml

@@ -4,13 +4,13 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "itw_python_builder"
-version = "0.1.46"
+version = "0.1.48"
 description = "Standardized Django deployment pipeline with Docker, testing, and SonarQube integration"
 readme = "README.md"
 requires-python = ">=3.10"
-license = {text = "MIT"}
+license = { text = "MIT" }
 authors = [
-    {name = "IT-Works", email = "contact@it-works.io"}
+    { name = "IT-Works", email = "contact@it-works.io" }
 ]
 keywords = ["django", "deployment", "docker", "ci-cd", "sonarqube"]
 classifiers = [