STYLE: Clear the review findings that were plainly correct

CONTRIBUTING.md told contributors to write Conventional Commits, but
commitizen enforces the ITK prefixes that every commit here uses, so the
documented rule rejected the commits it asked for.

The remote-module cross-dependency warning only recognised "== X.Y.*",
so a cross-dep pinned as "~= X.Y.Z" was neither rewritten nor reported.

Delete the commented-out functions in wheel_builder_utils.py (push_env,
debug, parse_kv_overrides, get_git_id, cmake_compiler_defaults), none of
which has a caller, and hoist the function-local imports to module
scope, dropping the tomli fallback that a Python 3.11+ project can never
reach.

Author: hjmjohnson

CONTRIBUTING.md

@@ -43,16 +43,19 @@ pre-commit run --all-files
 
 ### Commit Messages
 
-This project uses [Conventional Commits](https://www.conventionalcommits.org), enforced by Commitizen:
+This project uses the ITK commit message convention, `PREFIX: Description`,
+enforced by Commitizen:
 
 ```
-feat: add support for Python 3.12 wheels
-fix: correct cmake args not propagating to module builds
-chore: update pre-commit hook versions
-docs: clarify aarch64 build requirements
+ENH: Add support for Python 3.12 wheels
+BUG: Correct cmake args not propagating to module builds
+COMP: Update pre-commit hook versions
+DOC: Clarify aarch64 build requirements
 ```
 
-Commitizen will reject commits that don't follow this format.
+Valid prefixes are `BUG:`, `COMP:`, `DOC:`, `ENH:`, `PERF:` and `STYLE:`,
+and the description starts with a capital letter. Commitizen will reject
+commits that don't follow this format.
 
 ### Building Docs
 

scripts/build_python_instance_base.py

@@ -1,8 +1,10 @@
 import copy
 import os
+import re
 import shutil
 import subprocess
 import sys
+import tomllib
 from abc import ABC, abstractmethod
 from collections import OrderedDict
 from collections.abc import Callable
@@ -720,13 +722,6 @@ def _update_module_itk_deps(pyproject_path: Path, itk_version: str) -> bool:
         bool
             *True* if any dependency was rewritten.
         """
-        import re
-
-        try:
-            import tomllib
-        except ModuleNotFoundError:
-            import tomli as tomllib  # Python < 3.11
-
         with open(pyproject_path, "rb") as f:
             pyproject_data = tomllib.load(f)
 
@@ -775,7 +770,7 @@ def _update_module_itk_deps(pyproject_path: Path, itk_version: str) -> bool:
         # Warn about pinned remote-module cross-deps that may also need
         # attention but should not be auto-rewritten.
         cross_dep_pattern = re.compile(
-            r'"(itk-[a-z][a-z0-9-]*)\s*==\s*[\d]+\.[\d]+\.\*"'
+            r'"(itk-[a-z][a-z0-9-]*)\s*(?:==\s*\d+\.\d+\.\*|~=\s*\d+\.\d+(?:\.\d+)?)"'
         )
         for m in cross_dep_pattern.finditer(text):
             pkg = m.group(1)

scripts/wheel_builder_utils.py

@@ -17,20 +17,6 @@
 from os import environ
 from pathlib import Path
 
-# @contextmanager
-# def push_env(**kwargs):
-#     """This context manager allow to set/unset environment variables."""
-#     saved_env = dict(os_environ)
-#     for var, value in kwargs.items():
-#         if value is not None:
-#             os_environ[var] = value
-#         elif var in os_environ:
-#             del os_environ[var]
-#     yield
-#     os_environ.clear()
-#     for saved_var, saved_value in saved_env.items():
-#         os_environ[saved_var] = saved_value
-
 
 class ContextDecorator:
     """A base class or mixin that enables context managers to work as
@@ -391,122 +377,6 @@ def git_describe_to_pep440(desc: str) -> str:
     return semver_format
 
 
-# def debug(msg: str, do_print=False) -> None:
-#     """Print *msg* only when *do_print* is True."""
-#     if do_print:
-#         print(msg)
-#
-#
-# def parse_kv_overrides(pairs: list[str]) -> dict[str, str]:
-#     """Parse a list of ``KEY=VALUE`` strings into a dict.
-#
-#     A value of ``"UNSET"`` is stored as ``None`` so callers can remove
-#     the key from a target mapping.
-#
-#     Parameters
-#     ----------
-#     pairs : list[str]
-#         Strings of the form ``KEY=VALUE``.
-#
-#     Returns
-#     -------
-#     dict[str, str]
-#         Parsed overrides.
-#
-#     Raises
-#     ------
-#     SystemExit
-#         If an entry is not a valid ``KEY=VALUE`` pair or the key name
-#         is invalid.
-#     """
-#     result: dict[str, str] = {}
-#     for kv in pairs:
-#         if "=" not in kv:
-#             raise SystemExit(f"ERROR: Trailing argument '{kv}' is not KEY=VALUE")
-#         key, value = kv.split("=", 1)
-#         if not key or not re.match(r"^[A-Za-z_][A-Za-z0-9_]*$", key):
-#             raise SystemExit(f"ERROR: Invalid variable name '{key}' in '{kv}'")
-#         if value == "UNSET":
-#             # Explicitly remove if present later
-#             result[key] = None  # type: ignore
-#         else:
-#             result[key] = value
-#     return result
-
-
-# def get_git_id(
-#     repo_dir: Path, pixi_exec_path, env, backup_version: str = "v0.0.0"
-# ) -> str | None:
-#     """Return a human-readable Git identifier for *repo_dir*.
-#
-#     Tries, in order: exact tag, branch name, short commit hash.
-#     Falls back to *backup_version* when none of these succeed.
-#
-#     Parameters
-#     ----------
-#     repo_dir : Path
-#         Root of the Git repository.
-#     pixi_exec_path : Path or str
-#         Path to the pixi executable (unused but kept for API compat).
-#     env : dict
-#         Environment variables passed to Git subprocesses.
-#     backup_version : str, optional
-#         Fallback identifier returned when Git queries fail.
-#
-#     Returns
-#     -------
-#     str or None
-#         A tag, branch name, short hash, or *backup_version*.
-#     """
-#     # 1. exact tag
-#     try:
-#         run_result = run_commandLine_subprocess(
-#             ["git", "describe", "--tags", "--exact-match"],
-#             cwd=repo_dir,
-#             env=env,
-#             check=False,
-#         )
-#
-#         if run_result.returncode == 0:
-#             return run_result.stdout.strip()
-#     except subprocess.CalledProcessError:
-#         pass
-#     # 2. branch
-#     try:
-#         run_result = run_commandLine_subprocess(
-#             ["git", "rev-parse", "--abbrev-ref", "HEAD"],
-#             cwd=repo_dir,
-#             env=env,
-#         )
-#         branch = run_result.stdout.strip()
-#         if run_result.returncode == 0 and branch != "HEAD":
-#             return branch
-#     except subprocess.CalledProcessError:
-#         pass
-#     # 3. short hash
-#     try:
-#         run_result = run_commandLine_subprocess(
-#             ["git", "rev-parse", "--short", "HEAD"],
-#             cwd=repo_dir,
-#             env=env,
-#         )
-#         short_version = run_result.stdout.strip()
-#         if run_result.returncode == 0 and short_version != "HEAD":
-#             return short_version
-#     except subprocess.CalledProcessError:
-#         pass
-#
-#     # 4. punt and give dummy backup_version identifier
-#     if not (repo_dir / ".git").is_dir():
-#         if (repo_dir / ".git").is_file():
-#             print(
-#                 f"WARNING: {str(repo_dir)} is a secondary git worktree, and may not resolve from within dockcross build"
-#             )
-#             return backup_version
-#         print(f"ERROR: {repo_dir} is not a primary git repository")
-#     return backup_version
-
-
 def compute_itk_package_version(
     itk_dir: Path, itk_git_tag: str, pixi_exec_path, env
 ) -> str:
@@ -660,30 +530,6 @@ def resolve_oci_exe(env: dict[str, str]) -> str:
     return "docker"
 
 
-# def cmake_compiler_defaults(build_dir: Path) -> tuple[str | None, str | None]:
-#     info = build_dir / "cmake_system_information"
-#     if not info.exists():
-#         try:
-#             out = run_commandLine_subprocess(["cmake", "--system-information"]).stdout
-#             info.write_text(out, encoding="utf-8")
-#         except Exception as e:
-#             print(f"WARNING: Failed to generate cmake_system_information: {e}")
-#             return None, None
-#     text = info.read_text(encoding="utf-8", errors="ignore")
-#     cc = None
-#     cxx = None
-#     for line in text.splitlines():
-#         if "CMAKE_C_COMPILER == " in line:
-#             parts = re.split(r"\s+", line.strip())
-#             if len(parts) >= 4:
-#                 cc = parts[3]
-#         if "CMAKE_CXX_COMPILER == " in line:
-#             parts = re.split(r"\s+", line.strip())
-#             if len(parts) >= 4:
-#                 cxx = parts[3]
-#     return cc, cxx
-
-
 def give_relative_path(bin_exec: Path, build_dir_root: Path) -> str:
     bin_exec = Path(bin_exec).resolve()
     build_dir_root = Path(build_dir_root).resolve()

scripts/windows_build_python_instance.py

@@ -1,4 +1,5 @@
 import re
+import shutil
 from pathlib import Path
 
 from build_python_instance_base import BuildPythonInstanceBase
@@ -135,9 +136,7 @@ def build_tarball(self):
 
         if seven_zip is None:
             # Try PATH lookup using where/which behavior from shutil
-            import shutil as _shutil
-
-            found = _shutil.which("7z.exe") or _shutil.which("7z")
+            found = shutil.which("7z.exe") or shutil.which("7z")
             if found:
                 seven_zip = Path(found)
 
@@ -169,8 +168,6 @@ def build_tarball(self):
 
         # 3) Fallback: create a .zip using Python's shutil
         # This will create a zip archive named ITKPythonBuilds-windows.zip
-        import shutil as _shutil
-
         if out_zip.exists():
             try:
                 out_zip.unlink()
@@ -179,7 +176,7 @@ def build_tarball(self):
         # make_archive requires base name without extension
         base_name = str(out_zip.with_suffix("").with_suffix(""))
         # shutil.make_archive will append .zip
-        _shutil.make_archive(
+        shutil.make_archive(
             base_name,
             "zip",
             root_dir=str(self.build_dir_root),