Your lightweight open-source personal agent.
Python agent-frameworkai-agentai-agentschatbotchatopsdiscord-botllm-agentsllmslocal-llmmcpmodel-context-protocolmulti-agentopenai-compatibleopenclawpersonal-ai-assistantpythonself-hostedtelegram-bot-ai-assistantwebuiworkflow-automation
fix(release): support zero-patch candidates in upgrade acceptance
Xubin Ren4574a9b85993
diff --git a/scripts/verify_packaged_update.py b/scripts/verify_packaged_update.pyindex c98e89194..7a0ec8fbd 100644--- a/scripts/verify_packaged_update.py+++ b/scripts/verify_packaged_update.py@@ -804,15 +804,20 @@ def run_serial(args, root: Path, target: Path, version: str, original_hash: str,environment = root / "managed"python = environment / ("Scripts/python.exe" if os.name == "nt" else "bin/python")- base = Version(version).release- baseline_version = ".".join(map(str, (*base[:-1], max(0, base[-1] - 1))))- if Version(baseline_version) >= Version(version):- raise ValueError("Select a baseline wheel for this candidate version")baseline_source = args.baseline_wheel.resolve(strict=True) if args.baseline_wheel else targetif args.baseline_wheel:baseline_version = str(parse_wheel_filename(baseline_source.name)[1])- if Version(baseline_version) >= Version(version):- raise ValueError("Baseline must precede the target")+ else:+ # A version-only fixture, not a claim about a published predecessor.+ # Minor/major releases have a zero patch component (e.g. 0.4.0).+ base = list(Version(version).release)+ for index in reversed(range(len(base))):+ if base[index]:+ base[index] -= 1+ break+ baseline_version = ".".join(map(str, base))+ if Version(baseline_version) >= Version(version):+ raise ValueError("Baseline must precede the target; select an earlier baseline wheel")results = []system = isolated_environment(root)# Install once per lane, without inherited user pip settings; every casediff --git a/tests/test_packaged_update_probe.py b/tests/test_packaged_update_probe.pyindex 1c20b88aa..78fbc06fc 100644--- a/tests/test_packaged_update_probe.py+++ b/tests/test_packaged_update_probe.py@@ -531,10 +531,17 @@ def test_controller_error_does_not_print_exception_values_or_commands(tmp_path):assert "Traceback" not in result.stderr-def test_serial_lanes_install_dependencies_once_and_keep_recovery_chains_on_the_same_venv(tmp_path, monkeypatch):[email protected]("version,baseline_version", [+ ("0.3.6", None), ("0.4.0", None), ("1.0.0", None), ("0.4.0", "0.3.5"),+])+def test_serial_lanes_install_dependencies_once_and_keep_recovery_chains_on_the_same_venv(+ tmp_path, monkeypatch, version, baseline_version,+):package = Path(__file__).resolve().parents[1] / "nanobot"- target = wheel(tmp_path, "0.3.6", worker=(package / "update_worker.py").read_bytes(),+ target = wheel(tmp_path, version, worker=(package / "update_worker.py").read_bytes(),fallback=(package / "update_fallback.py").read_bytes())+ baseline = (wheel(tmp_path, baseline_version, worker=(package / "update_worker.py").read_bytes(),+ fallback=(package / "update_fallback.py").read_bytes()) if baseline_version else None)original_hash = digest(target)installations, dependencies, baselines, stages = [], [], [], {}def execute(command, **options):@@ -573,13 +580,19 @@ def test_serial_lanes_install_dependencies_once_and_keep_recovery_chains_on_the_for worker, scenarios in enumerate(probe.scenario_groups(list(probe.SCENARIOS), 2), 1):root = tmp_path / f"lane-{worker}/run"root.mkdir(parents=True)- args = Namespace(baseline_wheel=None, commit="a" * 40, dock=False)- results.extend(probe.run_serial(args, root, target, "0.3.6", original_hash, scenarios,+ args = Namespace(baseline_wheel=baseline, commit="a" * 40, dock=False)+ results.extend(probe.run_serial(args, root, target, version, original_hash, scenarios,Timings(root / "packaged-update-timings.json")))assert len(installations) == len(dependencies) == 2 and len(set(installations)) == 2assert len(baselines) == 9 and len(stages) == 9assert sum(1 + ("subsequent_update" in result) for result in results) == 15assert digest(target) == original_hash+ upgrade = next(result for result in results if result["scenario"] == "upgrade")+ assert upgrade["baseline_source_sha256"] == digest(baseline or target)+ assert upgrade["target_version"] == version+ if baseline_version:+ assert upgrade["baseline_version"] == baseline_version+ assert upgrade["baseline_kind"] == "instrumented historical wheel"for case_root, rows in stages.items():journeys = 1 + (case_root.name in probe.TWO_JOURNEY_SCENARIOS)assert [stage for stage, _ in rows] == ["prepare", "worker", "verify"] * journeys + ["cleanup"]