Merge branch 'main' into feat/zenable-noninteractive

Author: JonZeolla

Taskfile.yml

@@ -36,7 +36,7 @@ tasks:
     status:
       # Don't do any of this if you aren't in a git repository; quote to avoid yaml intrepretering the ! as a node tag
       # https://yaml.org/spec/1.2.2/#691-node-tags
-      - '! test -d .git'
+      - '! git rev-parse --git-dir'
     cmds:
       - uv tool install pre-commit
       # Don't run this in pipelines
@@ -93,8 +93,8 @@ tasks:
   update:
     desc: Update the project dev and runtime dependencies
     cmds:
-      # Upgrade uv via brew on macOS/Linux when running locally (not CI)
-      - '{{if and (ne .GITHUB_ACTIONS "true") (ne OS "windows")}}brew upgrade uv{{end}}'
+      # Upgrade uv when running locally (not CI); use brew on macOS/Linux, uv self update on Windows
+      - '{{if ne .GITHUB_ACTIONS "true"}}{{if ne OS "windows"}}brew upgrade uv{{else}}uv self update{{end}}{{end}}'
       - uv tool upgrade --all
       - pre-commit autoupdate --freeze --jobs 4
       # Copy the newly updated config into the project template, excluding the exclude line
@@ -128,9 +128,9 @@ tasks:
     env:
       GH_TOKEN:
         sh: |
-          if [[ -n "${GH_TOKEN:-}" ]]; then
+          if [ -n "${GH_TOKEN:-}" ]; then
             echo "${GH_TOKEN}"
-          elif command -v gh &> /dev/null && gh auth token &> /dev/null; then
+          elif gh auth token > /dev/null 2>&1; then
             gh auth token
           fi
     cmds:

{{cookiecutter.project_name}}/Taskfile.yml

@@ -18,7 +18,7 @@ vars:
   VERSION:
     sh: "{{ '{{.RUN_SCRIPT}}' }} python -c \"import sys; sys.path.insert(0, 'src'); from {{ '{{.PROJECT_SLUG}}' }} import __version__; print(__version__)\""
   LOCAL_PLATFORM:
-    sh: "bash {{ '{{.SCRIPTS_DIR}}' }}/get_platform.sh"
+    sh: "{{ '{{.RUN_SCRIPT}}' }} {{ '{{.SCRIPTS_DIR}}' }}/get_platform.py"
   # Use PLATFORM if specified, otherwise use LOCAL_PLATFORM
   PLATFORM: '{{ '{{if .PLATFORM}}' }}{{ '{{.PLATFORM}}' }}{{ '{{else}}' }}{{ '{{.LOCAL_PLATFORM}}' }}{{ '{{end}}' }}'
   # Output redirect based on CI environment
@@ -34,7 +34,7 @@ tasks:
       - pyproject.toml
       - uv.lock
     preconditions:
-      - which uv
+      - uv --version
     cmds:
       # Sync dependencies with uv
       - uv sync --frozen --all-extras
@@ -47,7 +47,7 @@ tasks:
     status:
       # Don't do any of this if you aren't in a git repository; quote to avoid yaml intrepretering the ! as a node tag
       # https://yaml.org/spec/1.2.2/#691-node-tags
-      - '! test -d .git'
+      - '! git rev-parse --git-dir'
     cmds:
       - uv tool install pre-commit
       # Don't run this in pipelines
@@ -88,7 +88,7 @@ tasks:
       TIMESTAMP:
         sh: '{{ '{{.RUN_SCRIPT}}' }} {{ '{{.SCRIPTS_DIR}}' }}/get_rfc3339_timestamp.py'
       EPOCH:
-        sh: 'bash {{ '{{.SCRIPTS_DIR}}' }}/get_epoch.sh'
+        sh: '{{ '{{.RUN_SCRIPT}}' }} {{ '{{.SCRIPTS_DIR}}' }}/get_epoch.py'
       COMMIT_HASH:
         sh: git rev-parse HEAD
       BUILD_PLATFORM: '{{ '{{if eq .PLATFORM "all"}}' }}{{ '{{.SUPPORTED_PLATFORMS}}' }}{{ '{{else if .PLATFORM}}' }}{{ '{{.PLATFORM}}' }}{{ '{{else}}' }}{{ '{{.LOCAL_PLATFORM}}' }}{{ '{{end}}' }}'
@@ -173,8 +173,8 @@ tasks:
   update:
     desc: Update the project dev and runtime dependencies
     cmds:
-      # Upgrade uv via brew on macOS/Linux when running locally (not CI)
-      - '{{ '{{if and (ne .GITHUB_ACTIONS "true") (ne OS "windows")}}' }}brew upgrade uv{{ '{{end}}' }}'
+      # Upgrade uv when running locally (not CI); use brew on macOS/Linux, uv self update on Windows
+      - '{{ '{{if ne .GITHUB_ACTIONS "true"}}{{if ne OS "windows"}}' }}brew upgrade uv{{ '{{else}}' }}uv self update{{ '{{end}}{{end}}' }}'
       - uv tool upgrade --all
       - pre-commit autoupdate --freeze --jobs 4
       - uv lock --upgrade
@@ -187,27 +187,16 @@ tasks:
   clean:
     desc: Clean up build artifacts, cache files/directories, temp files, etc.
     cmds:
-      - rm -rf .pytest_cache
-      - rm -rf htmlcov
-      - rm -rf .coverage
-      - rm -rf dist
-      - rm -rf build
-      - rm -rf *.egg-info
-      - rm -f sbom.*.json
-      - rm -f vulns.*.json
-      - rm -f license-check.*.json
-      - rm -f {{ cookiecutter.github_org }}_{{ cookiecutter.project_slug }}_*_*.tar
-      - find . -type d -name __pycache__ -exec rm -rf {} + || true
-      - find . -type f -name '*.pyc' -delete || true
+      - '{{ '{{.RUN_SCRIPT}}' }} {{ '{{.SCRIPTS_DIR}}' }}/clean.py'
 
   release:
     desc: Cut a project release
     env:
       GH_TOKEN:
         sh: |
-          if [[ -n "${GH_TOKEN:-}" ]]; then
+          if [ -n "${GH_TOKEN:-}" ]; then
             echo "${GH_TOKEN}"
-          elif command -v gh &> /dev/null && gh auth token &> /dev/null; then
+          elif gh auth token > /dev/null 2>&1; then
             gh auth token
           fi
     cmds:

{{cookiecutter.project_name}}/scripts/clean.py

@@ -0,0 +1,49 @@
+#!/usr/bin/env python3
+"""Cross-platform cleanup of build artifacts, cache files, and temp files."""
+
+import glob
+import shutil
+import sys
+from pathlib import Path
+
+
+def main() -> int:
+    """Remove build artifacts, cache directories, and temporary files."""
+    root = Path(".")
+
+    # Paths to remove (may be files or directories)
+    for name in [".pytest_cache", "htmlcov", ".coverage", "dist", "build"]:
+        path = root / name
+        if path.is_dir():
+            shutil.rmtree(path)
+        elif path.is_file():
+            path.unlink()
+
+    # Glob patterns for directories
+    for path in glob.glob("*.egg-info"):
+        shutil.rmtree(path)
+
+    # Glob patterns for files
+    for pattern in [
+        "sbom.*.json",
+        "vulns.*.json",
+        "license-check.*.json",
+        "{{ cookiecutter.github_org }}_{{ cookiecutter.project_slug }}_*_*.tar",
+    ]:
+        for path in glob.glob(pattern):
+            Path(path).unlink()
+
+    # Recursively remove __pycache__ directories
+    for path in root.rglob("__pycache__"):
+        if path.is_dir():
+            shutil.rmtree(path)
+
+    # Recursively remove .pyc files
+    for path in root.rglob("*.pyc"):
+        path.unlink()
+
+    return 0
+
+
+if __name__ == "__main__":
+    sys.exit(main())

{{cookiecutter.project_name}}/scripts/get_epoch.py

@@ -0,0 +1,6 @@
+#!/usr/bin/env python3
+"""Get the current Unix epoch timestamp."""
+
+import time
+
+print(int(time.time()))

{{cookiecutter.project_name}}/scripts/get_epoch.sh

@@ -0,0 +1,28 @@
+#!/usr/bin/env python3
+"""Get the Docker platform string for the current machine.
+
+Always uses 'linux' as the OS since container builds target Linux.
+"""
+
+import platform
+import sys
+
+# Always use linux for container builds
+os_name = "linux"
+machine = platform.machine().lower()
+
+# Inspired by https://github.com/containerd/containerd/blob/e0912c068b131b33798ae45fd447a1624a6faf0a/platforms/database.go#L76
+arch_map = {
+    # AMD64
+    "x86_64": "amd64",
+    "amd64": "amd64",
+    # ARM64
+    "aarch64": "arm64",
+    "arm64": "arm64",
+}
+
+if machine not in arch_map:
+    print(f"Unsupported architecture: {machine}", file=sys.stderr)
+    sys.exit(1)
+
+print(f"{os_name}/{arch_map[machine]}")