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

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: itw_python_builder
-Version: 0.1.44
+Version: 0.1.46
 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.44 → itw_python_builder-0.1.46}/itw_python_builder/tasks.py

@@ -22,6 +22,7 @@ from itw_python_builder.utils import (
     save_token_to_cache,
     probe_gitlab_token,
     TOKEN_CACHE_PATH,
+    maybe_override_release_version,
 )
 from itw_python_builder.ssr_tasks import *  # noqa: F401,F403  — exposes ssr-init
 
@@ -169,6 +170,54 @@ def push_version(ctx: Context) -> None:
     ctx.run(f'git push origin {get_current_branch(ctx)}')
 
 
+_CHANGELOG_TARGETS = {
+    'master': ['staging', 'develop'],
+    'staging': ['develop'],
+}
+
+
+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}')
+
+
+def propagate_changelog(ctx: Context) -> None:
+    """Push CHANGELOG.md from current branch to develop (+ staging on master)."""
+    source = get_current_branch(ctx)
+    targets = _CHANGELOG_TARGETS.get(source)
+    if not targets:
+        return
+    if not os.path.exists('CHANGELOG.md'):
+        print('[itw] No CHANGELOG.md to propagate — skipping.')
+        return
+    dirty = ctx.run('git status --porcelain', hide=True).stdout.strip()
+    if dirty:
+        print('[itw] Working tree not clean — skipping CHANGELOG propagation.')
+        return
+    for target in targets:
+        try:
+            _sync_changelog_to_branch(ctx, source, target)
+        except Exception as exc:
+            print(f'[itw] Failed to propagate CHANGELOG.md to {target}: {exc}')
+            ctx.run(f'git checkout {source}', warn=True, hide=True)
+
+
 def tag(ctx: Context, version: Version) -> None:
     ctx.run(f'git tag {version}')
 
@@ -245,6 +294,7 @@ def incrementrc(ctx: Context, skip_pipeline=False, pylintrc=None, ssr=False) ->
     save_version(version)
     commit_version(ctx, version)
     push_version(ctx)
+    propagate_changelog(ctx)
 
 
 @task
@@ -254,11 +304,14 @@ def incrementpatch(ctx: Context, skip_pipeline=False, ssr=False) -> None:
     ensure_gitlab_auth(ctx)
     version = read_version(ctx)
     version.increment_patch(release=production)
+    if production and detect_project_type() == 'frontend':
+        version = maybe_override_release_version(version)
     _ensure_unique_tag(ctx, version)
     tag_build_push(ctx, version, skip_pipeline, ssr=ssr)
     save_version(version)
     commit_version(ctx, version)
     push_version(ctx)
+    propagate_changelog(ctx)
 
 
 @task
@@ -268,11 +321,14 @@ def incrementminor(ctx: Context, skip_pipeline=False, ssr=False) -> None:
     ensure_gitlab_auth(ctx)
     version = read_version(ctx)
     version.increment_minor(release=production)
+    if production and detect_project_type() == 'frontend':
+        version = maybe_override_release_version(version)
     _ensure_unique_tag(ctx, version)
     tag_build_push(ctx, version, skip_pipeline, ssr=ssr)
     save_version(version)
     commit_version(ctx, version)
     push_version(ctx)
+    propagate_changelog(ctx)
 
 
 @task
@@ -282,25 +338,31 @@ def incrementmajor(ctx: Context, skip_pipeline=False, ssr=False) -> None:
     ensure_gitlab_auth(ctx)
     version = read_version(ctx)
     version.increment_major(release=production)
+    if production and detect_project_type() == 'frontend':
+        version = maybe_override_release_version(version)
     _ensure_unique_tag(ctx, version)
     tag_build_push(ctx, version, skip_pipeline, ssr=ssr)
     save_version(version)
     commit_version(ctx, version)
     push_version(ctx)
+    propagate_changelog(ctx)
 
 
 @task
 def release(ctx: Context, skip_pipeline=False, ssr=False) -> None:
     """Promote release candidate to stable release and deploy. Use --ssr for Angular SSR builds."""
-    _ = check_branch(ctx)
+    production = check_branch(ctx)
     ensure_gitlab_auth(ctx)
     version = read_version(ctx)
     version.reset_release_candidate(release=True)
+    if production and detect_project_type() == 'frontend':
+        version = maybe_override_release_version(version)
     _ensure_unique_tag(ctx, version)
     tag_build_push(ctx, version, skip_pipeline, ssr=ssr)
     save_version(version)
     commit_version(ctx, version)
     push_version(ctx)
+    propagate_changelog(ctx)
 
 
 @task

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

@@ -177,9 +177,17 @@ def check_branch(ctx: Context) -> bool:
 
 
 def get_latest_tag(ctx: Context) -> Version:
-    result = ctx.run('git describe --tags $(git rev-list --tags --max-count=1)')
-    latest_tag = result.stdout.splitlines()[0]
-    return Version.parse(latest_tag)
+    """Read latest tag for current branch — release tags on master, RC tags elsewhere."""
+    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)
+    tags = [line.strip() for line in result.stdout.splitlines() if line.strip()]
+    if not tags:
+        raise RuntimeError(
+            f'No tags matching {pattern!r} found on branch {branch!r}. '
+            'Run `itw tag-init` first if this is a new project.'
+        )
+    return Version.parse(tags[0])
 
 
 def _update_package_json_version(version: Version) -> None:
@@ -334,7 +342,10 @@ def probe_gitlab_token(ctx: Context, project_type: str, api_host: str, username:
     import urllib.request
     req = urllib.request.Request(
         f'https://{api_host}/api/v4/user',
-        headers={'PRIVATE-TOKEN': token},
+        headers={
+            'PRIVATE-TOKEN': token,
+            'User-Agent': 'Mozilla/5.0 (Windows NT 10.0; Win64; x64)'
+        },
     )
     ssl_ctx = ssl.create_default_context()
     ssl_ctx.check_hostname = False
@@ -348,6 +359,55 @@ def probe_gitlab_token(ctx: Context, project_type: str, api_host: str, username:
         return 'unreachable'
 
 
+def maybe_override_release_version(default: Version, timeout: float = 5.0) -> Version:
+    """Offer a 5s window to override the computed release version via TTY (POSIX only)."""
+    print(f'[itw] Next release tag will be: {default}')
+    print(f'[itw] Press any key within {int(timeout)}s to enter a custom version (e.g. 2.3.0), or wait to accept.')
+    sys.stdout.flush()
+
+    if not sys.stdin.isatty():
+        print(f'[itw] Non-interactive stdin — using default {default}.')
+        return default
+
+    try:
+        import select
+        import termios
+        import tty
+    except ImportError:
+        print(f'[itw] Interactive override unsupported on this platform — using default {default}.')
+        return default
+
+    fd = sys.stdin.fileno()
+    old = termios.tcgetattr(fd)
+    try:
+        tty.setcbreak(fd)
+        ready, _, _ = select.select([sys.stdin], [], [], timeout)
+        if not ready:
+            print(f'[itw] No input within {int(timeout)}s — using default {default}.')
+            return default
+        first = sys.stdin.read(1)
+    finally:
+        termios.tcsetattr(fd, termios.TCSADRAIN, old)
+
+    if first in ('\n', '\r'):
+        print(f'[itw] Empty input — using default {default}.')
+        return default
+
+    rest = sys.stdin.readline().rstrip('\r\n')
+    raw = (first + rest).strip()
+    if not raw:
+        print(f'[itw] Empty input — using default {default}.')
+        return default
+
+    candidate = f'v.{raw}-release'
+    try:
+        return Version.parse(candidate)
+    except ValueError as exc:
+        raise RuntimeError(
+            f'Invalid version input {raw!r} (must be like 2.3.0). Aborting.'
+        ) from exc
+
+
 def is_ssr_project() -> bool:
     """Return True if the current frontend project already has SSR scaffolding."""
     cwd = os.getcwd()

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: itw_python_builder
-Version: 0.1.44
+Version: 0.1.46
 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.44 → itw_python_builder-0.1.46}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "itw_python_builder"
-version = "0.1.44"
+version = "0.1.46"
 description = "Standardized Django deployment pipeline with Docker, testing, and SonarQube integration"
 readme = "README.md"
 requires-python = ">=3.10"