mirror of
https://github.com/Akkudoktor-EOS/EOS.git
synced 2026-02-24 09:56:20 +00:00
fix: Adapt versioning scheme to Home Assistant and switch to uv (#896)
Some checks failed
Bump Version / Bump Version Workflow (push) Has been cancelled
docker-build / platform-excludes (push) Has been cancelled
docker-build / build (push) Has been cancelled
docker-build / merge (push) Has been cancelled
pre-commit / pre-commit (push) Has been cancelled
Run Pytest on Pull Request / test (push) Has been cancelled
Some checks failed
Bump Version / Bump Version Workflow (push) Has been cancelled
docker-build / platform-excludes (push) Has been cancelled
docker-build / build (push) Has been cancelled
docker-build / merge (push) Has been cancelled
pre-commit / pre-commit (push) Has been cancelled
Run Pytest on Pull Request / test (push) Has been cancelled
Home Assistant expects versioning always increases numbers. Add a date component to the development version to comply with this expectation. The scheme is now 0.0.0.dev<date><hash>. Use uv for creating and managing the virtual environment for developement. This enourmously speeds up dependency updates. For this change dependency requirements are now solely handled in pyproject.toml. requirements.tx and requirements-dev.txt are deleted. Signed-off-by: Bobby Noelte <b0661n0e17e@gmail.com>
This commit is contained in:
58
scripts/cz_check_new_commits.py
Normal file → Executable file
58
scripts/cz_check_new_commits.py
Normal file → Executable file
@@ -1,10 +1,11 @@
|
||||
#!/usr/bin/env python3
|
||||
"""Pre-push hook: Commitizen check for *new commits only*.
|
||||
|
||||
Cross-platform + virtualenv-aware:
|
||||
Cross-platform + uv/.venv aware:
|
||||
- Prefers activated virtual environment (VIRTUAL_ENV)
|
||||
- Falls back to ./.venv if found
|
||||
- Falls back to global cz otherwise
|
||||
- Falls back to uv-managed .uv/venv
|
||||
- Falls back to .venv
|
||||
- Falls back to global cz
|
||||
"""
|
||||
|
||||
import os
|
||||
@@ -13,23 +14,40 @@ import sys
|
||||
from pathlib import Path
|
||||
|
||||
|
||||
def find_cz_executable() -> str:
|
||||
"""Return path to Commitizen executable, preferring virtual environments."""
|
||||
# 1️⃣ Active virtual environment (if running inside one)
|
||||
venv_env = os.getenv("VIRTUAL_ENV")
|
||||
if venv_env:
|
||||
cz_path = Path(venv_env) / ("Scripts" if os.name == "nt" else "bin") / ("cz.exe" if os.name == "nt" else "cz")
|
||||
def find_cz() -> list[str]:
|
||||
"""Return command to invoke Commitizen via virtualenv or globally."""
|
||||
candidates = []
|
||||
|
||||
# 1️⃣ Currently active virtualenv
|
||||
venv = os.getenv("VIRTUAL_ENV")
|
||||
if venv:
|
||||
candidates.append(Path(venv))
|
||||
|
||||
# 2️⃣ uv-managed virtualenv
|
||||
uv_venv = Path(".uv") / "venv"
|
||||
if uv_venv.exists():
|
||||
candidates.append(uv_venv)
|
||||
|
||||
# 3️⃣ traditional .venv
|
||||
dot_venv = Path(".venv")
|
||||
if dot_venv.exists():
|
||||
candidates.append(dot_venv)
|
||||
|
||||
# Check each candidate for Commitizen binary
|
||||
for base in candidates:
|
||||
cz_path = base / ("Scripts" if os.name == "nt" else "bin") / ("cz.exe" if os.name == "nt" else "cz")
|
||||
if cz_path.exists():
|
||||
return str(cz_path)
|
||||
return [str(cz_path)]
|
||||
|
||||
# 2️⃣ Local .venv in repo root
|
||||
repo_venv = Path.cwd() / ".venv"
|
||||
cz_path = repo_venv / ("Scripts" if os.name == "nt" else "bin") / ("cz.exe" if os.name == "nt" else "cz")
|
||||
if cz_path.exists():
|
||||
return str(cz_path)
|
||||
# 4️⃣ fallback to uv run cz
|
||||
try:
|
||||
subprocess.run(["uv", "run", "cz", "--version"], check=True, stdout=subprocess.DEVNULL)
|
||||
return ["uv", "run", "cz"]
|
||||
except (subprocess.CalledProcessError, FileNotFoundError):
|
||||
pass
|
||||
|
||||
# 3️⃣ Global fallback
|
||||
return "cz"
|
||||
# 5️⃣ fallback to system cz
|
||||
return ["cz"]
|
||||
|
||||
|
||||
def get_merge_base() -> str | None:
|
||||
@@ -48,17 +66,17 @@ def get_merge_base() -> str | None:
|
||||
|
||||
|
||||
def main() -> int:
|
||||
cz = find_cz_executable()
|
||||
cz = find_cz()
|
||||
base = get_merge_base()
|
||||
|
||||
if not base:
|
||||
print("⚠️ No upstream found; skipping Commitizen check for new commits.")
|
||||
print("⚠️ No upstream found; skipping Commitizen check {cz} for new commits.")
|
||||
return 0
|
||||
|
||||
print(f"🔍 Using {cz} to check new commits from {base}..HEAD ...")
|
||||
|
||||
try:
|
||||
subprocess.check_call([cz, "check", "--rev-range", f"{base}..HEAD"])
|
||||
subprocess.check_call(cz + ["check", "--rev-range", f"{base}..HEAD"])
|
||||
print("✅ All new commits follow Commitizen conventions.")
|
||||
return 0
|
||||
except subprocess.CalledProcessError as e:
|
||||
|
||||
Reference in New Issue
Block a user