itw-python-builder 0.2.2__tar.gz → 0.2.5__tar.gz

{itw_python_builder-0.2.2 → itw_python_builder-0.2.5}/PKG-INFO

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

@@ -358,7 +358,7 @@ def _ensure_unique_tag(ctx: Context, version: Version) -> None:
 @task
 def incrementrc(ctx: Context, skip_pipeline=False, pylintrc=None, ssr=False) -> None:
     """Increment release candidate version and deploy. Use --ssr for Angular SSR builds."""
-    check_branch(ctx)
+    check_branch(ctx, required='staging')
     ensure_gitlab_auth(ctx)
     project_type = detect_project_type()
     version = read_version(ctx)
@@ -427,7 +427,7 @@ def incrementmajor(ctx: Context, skip_pipeline=False, ssr=False) -> None:
 @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."""
-    production = check_branch(ctx)
+    production = check_branch(ctx, required='master')
     ensure_gitlab_auth(ctx)
     version = read_version(ctx)
     version.reset_release_candidate(release=True)
@@ -510,8 +510,12 @@ def analyze(ctx: Context):
 
     if not sonar_host or not sonar_token:
         raise RuntimeError('SONAR_HOST_URL and SONAR_TOKEN environment variables must be set.')
+
+    sonar_cache_dir = os.path.join(os.path.expanduser('~'), '.sonar', 'cache')
+    os.makedirs(sonar_cache_dir, exist_ok=True)
+
     ctx.run(
-        f'podman run --rm -e SONAR_HOST_URL={sonar_host} -e SONAR_TOKEN={sonar_token} -e GIT_DEPTH={git_depth} --user=root -v "$(pwd)":/usr/src:Z docker.io/sonarsource/sonar-scanner-cli:latest -X -Dsonar.projectVersion={sonar_version}')
+        f'podman run --rm -e SONAR_HOST_URL={sonar_host} -e SONAR_TOKEN={sonar_token} -e GIT_DEPTH={git_depth} --user=root -v "$(pwd)":/usr/src:Z -v $HOME/.sonar/cache:/opt/sonar-scanner/.sonar/cache:Z docker.io/sonarsource/sonar-scanner-cli:latest -Dsonar.projectVersion={sonar_version}')
 
 
 @task

{itw_python_builder-0.2.2 → itw_python_builder-0.2.5}/itw_python_builder/templates/new_version_email.html

@@ -26,8 +26,7 @@
                 {COMMIT_MESSAGE}
               </div>
               <p style="margin:0 0 8px 0;font-size:15px;"><strong>Komanda për të bërë upgrade:</strong></p>
-              <p style="margin:0 0 6px 0;font-size:12px;color:#6b7280;">Klikoni mbi komandën për ta zgjedhur, pastaj Ctrl+C (ose ⌘+C).</p>
-              <pre style="background:#0f172a;color:#f9fafb;padding:14px 16px;border-radius:6px;font-size:13px;overflow-x:auto;margin:0 0 20px 0;-webkit-user-select:all;-moz-user-select:all;-ms-user-select:all;user-select:all;cursor:text;">pip install itw-python-builder=={VERSION} --no-cache-dir</pre>
+              <pre style="background:#0f172a;color:#f9fafb;padding:14px 16px;border-radius:6px;font-size:13px;overflow-x:auto;margin:0 0 20px 0;">pip install itw-python-builder=={VERSION} --no-cache-dir</pre>
               <p style="margin:0;font-size:13px;color:#6b7280;">Faleminderit</p>
             </td>
           </tr>

{itw_python_builder-0.2.2 → itw_python_builder-0.2.5}/itw_python_builder/utils.py

@@ -160,19 +160,27 @@ def is_branch_production(branch: str) -> bool:
     return branch == 'master'
 
 
-def check_branch(ctx: Context) -> bool:
+def check_branch(ctx: Context, required: str = None) -> bool:
     current_branch = get_current_branch(ctx)
-    production = is_branch_production(current_branch)
+    if required == 'master' and current_branch != 'master':
+        raise RuntimeError(
+            f'This command is production-only and must be run from master. '
+            f'Current branch: {current_branch}.'
+        )
+    if required == 'staging' and current_branch != 'staging':
+        raise RuntimeError(
+            f'This command is staging-only and must be run from staging. '
+            f'Current branch: {current_branch}.'
+        )
+    if required is None and current_branch not in ('master', 'staging'):
+        raise RuntimeError(
+            f'Cannot tag in branch {current_branch}. Must be on master or staging.'
+        )
     changed_result = ctx.run('git diff --quiet HEAD $REF -- $DIR || echo changed')
     changed = changed_result.stdout.splitlines()
     if len(changed) > 0:
         raise RuntimeError(f'You have uncommitted changes in branch {current_branch}.')
-    if production and current_branch != 'master':
-        raise RuntimeError('You must be in master branch to release in production.')
-    elif not production and current_branch != 'staging':
-        raise RuntimeError(f'Cannot tag in branch {current_branch}.')
-    else:
-        return production
+    return is_branch_production(current_branch)
 
 
 def get_latest_tag(ctx: Context) -> Version:

{itw_python_builder-0.2.2 → itw_python_builder-0.2.5}/itw_python_builder/version.py

@@ -32,10 +32,13 @@ class Version:
 
     def increment_minor(self, release: bool = False) -> None:
         self.minor += 1
+        self.patch = 0
         self.reset_release_candidate(release)
 
     def increment_major(self, release: bool = False) -> None:
         self.major += 1
+        self.minor = 0
+        self.patch = 0
         self.reset_release_candidate(release)
 
     def save_to_file(self) -> None:

{itw_python_builder-0.2.2 → itw_python_builder-0.2.5}/itw_python_builder.egg-info/PKG-INFO

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

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