diff --git a/CHANGELOG.md b/CHANGELOG.md index f9f1672..616b85f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,8 @@ # Changelog -## Unreleased +## 0.7.19 - 2026-11-15 + +对使用者的影响:修复 `line merge` / `line sync` / `task merge` 的 `--push` 在 `push.default=upstream` 且分支上游指向别的远端分支时,会把合并结果推到那个分支(例如 `main`)的问题;新增 `dyro line add-repo`、`dyro line push` 与 `line merge --abort`。推送说明有改动,已 seed 的工作区升级后运行一次 `dyro host seed --force`。 - 新增 `dyro line merge --abort` 与 `dyro line merge-into-base --abort`:放弃未完成的合并操作,清理遗留 `MERGE_HEAD`,并在未推送时用 `reset --keep` 撤回本地合并提交。`--recover` 仍只对账、不改 Git;遇到未确认的回滚意图时,不再把该仓记成合并成功。 - 新增 `dyro line add-repo`:把一个已经登记的仓库加入现有开发线。已有子线保持不变;子线只能加入父线里已经有的仓库。 diff --git a/pyproject.toml b/pyproject.toml index 769ddf1..0201cdf 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta" [project] name = "dyro" -version = "0.7.18" +version = "0.7.19" description = "DyroEngineeringFlow: local-first automation and delivery control for multi-repository teams" readme = "README.md" requires-python = ">=3.11" diff --git a/src/dyro/bridge/skill/SKILL.md b/src/dyro/bridge/skill/SKILL.md index 8855d02..cff633c 100644 --- a/src/dyro/bridge/skill/SKILL.md +++ b/src/dyro/bridge/skill/SKILL.md @@ -50,7 +50,7 @@ release, publish, console, install, or any confirmation/approval field. ```json { "protocol": {"major": 1, "minor": 0}, - "client": {"name": "dyro-agent-bridge-skill", "version": "0.7.18"}, + "client": {"name": "dyro-agent-bridge-skill", "version": "0.7.19"}, "operation": "bridge.capabilities.compact", "input": {} } diff --git a/tests/test_cli.py b/tests/test_cli.py index abc1bc2..9dd4750 100644 --- a/tests/test_cli.py +++ b/tests/test_cli.py @@ -2278,6 +2278,6 @@ def test_package_version_matches_pyproject(self) -> None: from dyro import __version__ metadata = tomllib.loads(Path("pyproject.toml").read_text(encoding="utf-8")) - self.assertEqual(metadata["project"]["version"], "0.7.18") - self.assertEqual(__version__, "0.7.18") + self.assertEqual(metadata["project"]["version"], "0.7.19") + self.assertEqual(__version__, "0.7.19") self.assertEqual(__version__, metadata["project"]["version"]) diff --git a/tests/test_console_artifacts.py b/tests/test_console_artifacts.py index cfca6d0..ac3f404 100644 --- a/tests/test_console_artifacts.py +++ b/tests/test_console_artifacts.py @@ -230,7 +230,7 @@ def test_package_version_is_0_7_16(self) -> None: from pathlib import Path metadata = tomllib.loads(Path("pyproject.toml").read_text(encoding="utf-8")) - self.assertEqual(metadata["project"]["version"], "0.7.18") + self.assertEqual(metadata["project"]["version"], "0.7.19") class ConsoleArtifactServiceTests(WorkspaceCase): diff --git a/tests/test_release_gates.py b/tests/test_release_gates.py index 616a42e..8de678e 100644 --- a/tests/test_release_gates.py +++ b/tests/test_release_gates.py @@ -32,7 +32,7 @@ def test_physics_train_refuses_published_0_6_9_tag(self) -> None: def test_0_7_release_runs_gates_without_claiming_1_0(self) -> None: stdout = StringIO() with redirect_stdout(stdout): - code = main(["--root", str(ROOT), "--release-tag", "v0.7.18"]) + code = main(["--root", str(ROOT), "--release-tag", "v0.7.19"]) self.assertEqual(code, 0) self.assertIn("0.7 gates present", stdout.getvalue()) self.assertNotIn("1.0 gates present", stdout.getvalue()) diff --git a/uv.lock b/uv.lock index 0b3e48c..4f6f654 100644 --- a/uv.lock +++ b/uv.lock @@ -286,7 +286,7 @@ wheels = [ [[package]] name = "dyro" -version = "0.7.18" +version = "0.7.19" source = { editable = "." } dependencies = [ { name = "cryptography" },